darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2003-09-03 Andrew Cagney <cagney@redhat.com>

Browse source 
* defs.h: Do not include "arch-utils.h".
	(GDB_MULTI_ARCH): If not defined, set to GDB_MULTI_ARCH_PARTIAL or
	GDB_MULTI_ARCH_PURE.
	* configure.in (GDB_MULTI_ARCH): Do not define.
	* configure, config.in: Regenerate.
	* configure.tgt: Do not set variable "gdb_multi_arch".
	* config/s390/s390x.mt (GDB_MULTI_ARCH): Delete.
	* config/s390/s390.mt (GDB_MULTI_ARCH): Delete.
	* config/i386/x86-64linux.mt (GDB_MULTI_ARCH): Delete.
	* config/v850/v850.mt (TM_FILE): Delete disabled definition.
	* config/m68hc11/m68hc11.mt (TM_FILE): Delete definition.
	* config/vax/tm-vax.h (GDB_MULTI_ARCH): Delete definition.
	* config/sparc/tm-sparc.h (GDB_MULTI_ARCH): Delete definition.
	* config/sparc/tm-sun4sol2.h (GDB_MULTI_ARCH): Delete definition.
	* config/sparc/tm-nbsd.h (GDB_MULTI_ARCH): Delete definition.
	* config/sparc/tm-linux.h (GDB_MULTI_ARCH): Delete definition.
	* config/sparc/tm-sp64.h (GDB_MULTI_ARCH): Delete definition.
	* config/pa/tm-hppa64.h (GDB_MULTI_ARCH): Delete definition.
	* config/ns32k/tm-ns32k.h (GDB_MULTI_ARCH): Delete definition.
	* config/m68k/tm-m68k.h (GDB_MULTI_ARCH): Delete definition.
	* config/i386/tm-i386.h (GDB_MULTI_ARCH): Delete definition.
	* config/h8300/tm-h8300.h (GDB_MULTI_ARCH): Delete definition.
	* config/frv/tm-frv.h (GDB_MULTI_ARCH): Delete definition.
	* config/alpha/tm-alpha.h (GDB_MULTI_ARCH): Delete definition.
This commit is contained in:
Andrew Cagney 2003-09-03 15:02:51 +00:00
parent 13dfd2d039
commit 57b29be766
24 changed files with 56 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gdb/ChangeLog
View file

@ -1,3 +1,30 @@
2003-09-03 Andrew Cagney <cagney@redhat.com>
* defs.h: Do not include "arch-utils.h".
(GDB_MULTI_ARCH): If not defined, set to GDB_MULTI_ARCH_PARTIAL or
GDB_MULTI_ARCH_PURE.
* configure.in (GDB_MULTI_ARCH): Do not define.
* configure, config.in: Regenerate.
* configure.tgt: Do not set variable "gdb_multi_arch".
* config/s390/s390x.mt (GDB_MULTI_ARCH): Delete.
* config/s390/s390.mt (GDB_MULTI_ARCH): Delete.
* config/i386/x86-64linux.mt (GDB_MULTI_ARCH): Delete.
* config/v850/v850.mt (TM_FILE): Delete disabled definition.
* config/m68hc11/m68hc11.mt (TM_FILE): Delete definition.
* config/vax/tm-vax.h (GDB_MULTI_ARCH): Delete definition.
* config/sparc/tm-sparc.h (GDB_MULTI_ARCH): Delete definition.
* config/sparc/tm-sun4sol2.h (GDB_MULTI_ARCH): Delete definition.
* config/sparc/tm-nbsd.h (GDB_MULTI_ARCH): Delete definition.
* config/sparc/tm-linux.h (GDB_MULTI_ARCH): Delete definition.
* config/sparc/tm-sp64.h (GDB_MULTI_ARCH): Delete definition.
* config/pa/tm-hppa64.h (GDB_MULTI_ARCH): Delete definition.
* config/ns32k/tm-ns32k.h (GDB_MULTI_ARCH): Delete definition.
* config/m68k/tm-m68k.h (GDB_MULTI_ARCH): Delete definition.
* config/i386/tm-i386.h (GDB_MULTI_ARCH): Delete definition.
* config/h8300/tm-h8300.h (GDB_MULTI_ARCH): Delete definition.
* config/frv/tm-frv.h (GDB_MULTI_ARCH): Delete definition.
* config/alpha/tm-alpha.h (GDB_MULTI_ARCH): Delete definition.
2003-08-30 Michael Chastain <mec@shout.net> 2003-08-30 Michael Chastain <mec@shout.net>
* Makefile.in: Remove tm-hp300bsd.h, tm-hp300hpux.h. * Makefile.in: Remove tm-hp300bsd.h, tm-hp300hpux.h.

3
gdb/config.in
View file

@ -167,9 +167,6 @@
/* Define if <sys/ptrace.h> defines the PT_GETXMMREGS request. */ /* Define if <sys/ptrace.h> defines the PT_GETXMMREGS request. */
#undef HAVE_PT_GETXMMREGS #undef HAVE_PT_GETXMMREGS
/* Multi-arch enabled. */
#undef GDB_MULTI_ARCH
/* hostfile */ /* hostfile */
#undef GDB_XM_FILE #undef GDB_XM_FILE

2
gdb/config/alpha/tm-alpha.h
View file

@ -24,8 +24,6 @@
#ifndef TM_ALPHA_H #ifndef TM_ALPHA_H
#define TM_ALPHA_H #define TM_ALPHA_H
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
#include "bfd.h" #include "bfd.h"
#include "coff/sym.h" /* Needed for PDR below. */ #include "coff/sym.h" /* Needed for PDR below. */
#include "coff/symconst.h" #include "coff/symconst.h"

3
gdb/config/frv/tm-frv.h
View file

@ -20,9 +20,6 @@
/* This target uses an architecture vector for most architecture methods. */ /* This target uses an architecture vector for most architecture methods. */
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
#define TARGET_HW_BREAK_LIMIT 4 #define TARGET_HW_BREAK_LIMIT 4
#define TARGET_HW_WATCH_LIMIT 4 #define TARGET_HW_WATCH_LIMIT 4

2
gdb/config/h8300/tm-h8300.h
View file

@ -20,8 +20,6 @@
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
/* Contributed by Steve Chamberlain sac@cygnus.com */ /* Contributed by Steve Chamberlain sac@cygnus.com */
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
/* NOTE: ezannoni 2000-07-18: these variables are part of sim, defined /* NOTE: ezannoni 2000-07-18: these variables are part of sim, defined
in sim/h8300/compile.c. They really should not be used this in sim/h8300/compile.c. They really should not be used this
way. Because of this we cannot get rid of the macro way. Because of this we cannot get rid of the macro

2
gdb/config/i386/tm-i386.h
View file

@ -22,6 +22,4 @@
#ifndef TM_I386_H #ifndef TM_I386_H
#define TM_I386_H 1 #define TM_I386_H 1
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
#endif /* ifndef TM_I386_H */ #endif /* ifndef TM_I386_H */

2
gdb/config/i386/x86-64linux.mt
View file

@ -3,6 +3,4 @@ TDEPFILES= x86-64-tdep.o x86-64-linux-tdep.o \
i386-tdep.o i387-tdep.o i386-linux-tdep.o \ i386-tdep.o i387-tdep.o i386-linux-tdep.o \
solib.o solib-svr4.o solib-legacy.o corelow.o solib.o solib-svr4.o solib-legacy.o corelow.o
GDB_MULTI_ARCH=GDB_MULTI_ARCH_TM
TM_FILE=tm-x86-64linux.h TM_FILE=tm-x86-64linux.h

1
gdb/config/m68hc11/m68hc11.mt
View file

@ -1,6 +1,5 @@
# Target: Motorola 68HC11 processor # Target: Motorola 68HC11 processor
TDEPFILES= m68hc11-tdep.o TDEPFILES= m68hc11-tdep.o
TM_FILE= tm-m68hc11.h
SIM_OBS= remote-sim.o SIM_OBS= remote-sim.o
SIM= ../sim/m68hc11/libsim.a -lm SIM= ../sim/m68hc11/libsim.a -lm

2
gdb/config/m68k/tm-m68k.h
View file

@ -19,6 +19,4 @@
Foundation, Inc., 59 Temple Place - Suite 330, Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
extern int m68k_get_longjmp_target (CORE_ADDR *); extern int m68k_get_longjmp_target (CORE_ADDR *);

2
gdb/config/ns32k/tm-ns32k.h
View file

@ -22,8 +22,6 @@
#ifndef TM_NS32K_H #ifndef TM_NS32K_H
#define TM_NS32K_H #define TM_NS32K_H
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
/* Need to get function ends by adding this to epilogue address from .bf /* Need to get function ends by adding this to epilogue address from .bf
record, not using x_fsize field. */ record, not using x_fsize field. */
#define FUNCTION_EPILOGUE_SIZE 4 #define FUNCTION_EPILOGUE_SIZE 4

1
gdb/config/pa/tm-hppa64.h
View file

@ -35,7 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
causing GDB to lose line number information. Since prior to this causing GDB to lose line number information. Since prior to this
switch and a other recent tweaks, 64 bit PA hadn't been building switch and a other recent tweaks, 64 bit PA hadn't been building
for some months, this is probably the lesser of several evils. */ for some months, this is probably the lesser of several evils. */
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
#include "pa/tm-hppah.h" #include "pa/tm-hppah.h"

1
gdb/config/s390/s390.mt
View file

@ -3,4 +3,3 @@ TM_FILE= tm-linux.h
TDEPFILES=s390-tdep.o solib.o TDEPFILES=s390-tdep.o solib.o
# Post 5.0 tdep-files # Post 5.0 tdep-files
TDEPFILES+=solib-svr4.o solib-legacy.o TDEPFILES+=solib-svr4.o solib-legacy.o
GDB_MULTI_ARCH=GDB_MULTI_ARCH_PARTIAL

1
gdb/config/s390/s390x.mt
View file

@ -3,7 +3,6 @@ TM_FILE= tm-linux.h
TDEPFILES=s390-tdep.o solib.o TDEPFILES=s390-tdep.o solib.o
# Post 5.0 tdep-files # Post 5.0 tdep-files
TDEPFILES+=solib-svr4.o solib-legacy.o TDEPFILES+=solib-svr4.o solib-legacy.o
GDB_MULTI_ARCH=GDB_MULTI_ARCH_PARTIAL
# needed for gdbserver. # needed for gdbserver.
MT_CFLAGS= -DCONFIG_ARCH_S390X MT_CFLAGS= -DCONFIG_ARCH_S390X

2
gdb/config/sparc/tm-linux.h
View file

@ -23,8 +23,6 @@
#ifndef TM_SPARCLINUX_H #ifndef TM_SPARCLINUX_H
#define TM_SPARCLINUX_H #define TM_SPARCLINUX_H
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
#include "sparc/tm-sparc.h" #include "sparc/tm-sparc.h"
#define SIGCONTEXT_PC_OFFSET 12 #define SIGCONTEXT_PC_OFFSET 12

2
gdb/config/sparc/tm-nbsd.h
View file

@ -21,8 +21,6 @@
#ifndef TM_NBSD_H #ifndef TM_NBSD_H
#define TM_NBSD_H #define TM_NBSD_H
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
#include "sparc/tm-sparc.h" #include "sparc/tm-sparc.h"
#include "solib.h" #include "solib.h"

2
gdb/config/sparc/tm-sp64.h
View file

@ -25,8 +25,6 @@
struct type; struct type;
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
#ifndef GDB_TARGET_IS_SPARC64 #ifndef GDB_TARGET_IS_SPARC64
#define GDB_TARGET_IS_SPARC64 1 #define GDB_TARGET_IS_SPARC64 1
#endif #endif

2
gdb/config/sparc/tm-sparc.h
View file

@ -22,8 +22,6 @@
Foundation, Inc., 59 Temple Place - Suite 330, Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
#include "regcache.h" #include "regcache.h"
struct type; struct type;

2
gdb/config/sparc/tm-sun4sol2.h
View file

@ -19,8 +19,6 @@
Foundation, Inc., 59 Temple Place - Suite 330, Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
#include "sparc/tm-sparc.h" #include "sparc/tm-sparc.h"
#include "config/tm-sysv4.h" #include "config/tm-sysv4.h"

1
gdb/config/v850/v850.mt
View file

@ -1,5 +1,4 @@
# Target: NEC V850 processor # Target: NEC V850 processor
TDEPFILES= v850-tdep.o TDEPFILES= v850-tdep.o
# TM_FILE= tm-v850.h
SIM_OBS = remote-sim.o SIM_OBS = remote-sim.o
SIM = ../sim/v850/libsim.a SIM = ../sim/v850/libsim.a

2
gdb/config/vax/tm-vax.h
View file

@ -22,6 +22,4 @@
#ifndef TM_VAX_H #ifndef TM_VAX_H
#define TM_VAX_H #define TM_VAX_H
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
#endif /* TM_VAX_H */ #endif /* TM_VAX_H */

70
gdb/configure vendored
View file

@ -10239,10 +10239,6 @@ targetfile=`sed -n '
s/TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p s/TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p
' ${target_makefile_frag}` ' ${target_makefile_frag}`
GDB_MULTI_ARCH=`sed -n '
s/GDB_MULTI_ARCH[ ]*=[ ]*\([^ ]*\)[ ]*/\1/p
' ${target_makefile_frag}`
if test "${target}" = "${host}"; then if test "${target}" = "${host}"; then
# We pick this up from the host configuration file (.mh) because we # We pick this up from the host configuration file (.mh) because we
# do not have a native configuration Makefile fragment. # do not have a native configuration Makefile fragment.
@ -10252,36 +10248,6 @@ s/NAT_FILE[ ]*=[ ]*\([^ ]*\)/\1/p
fi fi
# New targets should just set gdb_multi_arch=yes in configure.tgt.
# Old targets being converted can either do that or set GDB_MULTI_ARCH
# in the target specific makefile frag. Eventually gdb_multi_arch=yes
# will be the default.
if test x"${GDB_MULTI_ARCH}" = x ; then
case "${gdb_multi_arch}" in
yes ) GDB_MULTI_ARCH=GDB_MULTI_ARCH_PURE ;;
no ) GDB_MULTI_ARCH=0 ;;
0|1|2 ) GDB_MULTI_ARCH=${gdb_multi_arch} ;;
esac
fi
if test x"${GDB_MULTI_ARCH}" != x ; then
cat >> confdefs.h <<EOF
#define GDB_MULTI_ARCH ${GDB_MULTI_ARCH}
EOF
fi
# Warn the user when they use an old practice
case "${GDB_MULTI_ARCH}" in
"" ) ;;
0 | GDB_MULTI_ARCH_PARTIAL | 1 | GDB_MULTI_ARCH_TM | 2 )
echo "configure: warning: "GDB: Target is not pure multi-arch"" 1>&2 ;;
GDB_MULTI_ARCH_PURE )
if test x"${targetfile}" != x ; then
echo "configure: warning: "GDB: Ignoring TM_FILE in ${target_makefile_frag}"" 1>&2
targetfile=""
fi ;;
*) { echo "configure: error: "GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}"" 1>&2; exit 1; };;
esac
if test x"${gdb_osabi}" != x ; then if test x"${gdb_osabi}" != x ; then
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define GDB_OSABI_DEFAULT $gdb_osabi #define GDB_OSABI_DEFAULT $gdb_osabi
@ -10307,7 +10273,7 @@ fi
# We only build gdbserver automatically if host and target are the same. # We only build gdbserver automatically if host and target are the same.
if test "x$target" = "x$host"; then if test "x$target" = "x$host"; then
echo $ac_n "checking whether gdbserver is supported on this host""... $ac_c" 1>&6 echo $ac_n "checking whether gdbserver is supported on this host""... $ac_c" 1>&6
echo "configure:10311: checking whether gdbserver is supported on this host" >&5 echo "configure:10277: checking whether gdbserver is supported on this host" >&5
if test "x$build_gdbserver" = xyes; then if test "x$build_gdbserver" = xyes; then
configdirs="$configdirs gdbserver" configdirs="$configdirs gdbserver"
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
@ -10371,12 +10337,12 @@ fi
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
echo "configure:10375: checking for Cygwin environment" >&5 echo "configure:10341: checking for Cygwin environment" >&5
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10380 "configure" #line 10346 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
@ -10387,7 +10353,7 @@ int main() {
return __CYGWIN__; return __CYGWIN__;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:10391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:10357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_cygwin=yes ac_cv_cygwin=yes
else else
@ -10404,19 +10370,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
CYGWIN= CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
echo "configure:10408: checking for mingw32 environment" >&5 echo "configure:10374: checking for mingw32 environment" >&5
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10413 "configure" #line 10379 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
return __MINGW32__; return __MINGW32__;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:10420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:10386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_mingw32=yes ac_cv_mingw32=yes
else else
@ -10435,7 +10401,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
echo "configure:10439: checking for executable suffix" >&5 echo "configure:10405: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -10445,10 +10411,10 @@ else
rm -f conftest* rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext= ac_cv_exeext=
if { (eval echo configure:10449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then if { (eval echo configure:10415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do for file in conftest.*; do
case $file in case $file in
*.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;; *.c | *.o | *.obj | *.ilk | *.pdb) ;;
*) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
esac esac
done done
@ -10487,7 +10453,7 @@ fi
echo $ac_n "checking for iconv""... $ac_c" 1>&6 echo $ac_n "checking for iconv""... $ac_c" 1>&6
echo "configure:10491: checking for iconv" >&5 echo "configure:10457: checking for iconv" >&5
if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -10495,7 +10461,7 @@ else
am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no am_cv_lib_iconv=no
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10499 "configure" #line 10465 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
#include <iconv.h> #include <iconv.h>
@ -10505,7 +10471,7 @@ iconv_t cd = iconv_open("","");
iconv_close(cd); iconv_close(cd);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:10509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:10475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
am_cv_func_iconv=yes am_cv_func_iconv=yes
else else
@ -10517,7 +10483,7 @@ rm -f conftest*
am_save_LIBS="$LIBS" am_save_LIBS="$LIBS"
LIBS="$LIBS -liconv" LIBS="$LIBS -liconv"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10521 "configure" #line 10487 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
#include <iconv.h> #include <iconv.h>
@ -10527,7 +10493,7 @@ iconv_t cd = iconv_open("","");
iconv_close(cd); iconv_close(cd);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:10531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:10497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
am_cv_lib_iconv=yes am_cv_lib_iconv=yes
am_cv_func_iconv=yes am_cv_func_iconv=yes
@ -10548,13 +10514,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6
EOF EOF
echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
echo "configure:10552: checking for iconv declaration" >&5 echo "configure:10518: checking for iconv declaration" >&5
if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10558 "configure" #line 10524 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
@ -10573,7 +10539,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:10577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:10543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
am_cv_proto_iconv_arg1="" am_cv_proto_iconv_arg1=""
else else

31
gdb/configure.in
View file

@ -1306,10 +1306,6 @@ targetfile=`sed -n '
s/TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p s/TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p
' ${target_makefile_frag}` ' ${target_makefile_frag}`
GDB_MULTI_ARCH=`sed -n '
s/GDB_MULTI_ARCH[ ]*=[ ]*\([^ ]*\)[ ]*/\1/p
' ${target_makefile_frag}`
if test "${target}" = "${host}"; then if test "${target}" = "${host}"; then
# We pick this up from the host configuration file (.mh) because we # We pick this up from the host configuration file (.mh) because we
# do not have a native configuration Makefile fragment. # do not have a native configuration Makefile fragment.
@ -1319,33 +1315,6 @@ s/NAT_FILE[ ]*=[ ]*\([^ ]*\)/\1/p
fi fi
changequote([,]) changequote([,])
# New targets should just set gdb_multi_arch=yes in configure.tgt.
# Old targets being converted can either do that or set GDB_MULTI_ARCH
# in the target specific makefile frag. Eventually gdb_multi_arch=yes
# will be the default.
if test x"${GDB_MULTI_ARCH}" = x ; then
case "${gdb_multi_arch}" in
yes ) GDB_MULTI_ARCH=GDB_MULTI_ARCH_PURE ;;
no ) GDB_MULTI_ARCH=0 ;;
0|1|2 ) GDB_MULTI_ARCH=${gdb_multi_arch} ;;
esac
fi
if test x"${GDB_MULTI_ARCH}" != x ; then
AC_DEFINE_UNQUOTED(GDB_MULTI_ARCH, ${GDB_MULTI_ARCH})
fi
# Warn the user when they use an old practice
case "${GDB_MULTI_ARCH}" in
"" ) ;;
0 | GDB_MULTI_ARCH_PARTIAL | 1 | GDB_MULTI_ARCH_TM | 2 )
AC_MSG_WARN("GDB: Target is not pure multi-arch") ;;
GDB_MULTI_ARCH_PURE )
if test x"${targetfile}" != x ; then
AC_MSG_WARN("GDB: Ignoring TM_FILE in ${target_makefile_frag}")
targetfile=""
fi ;;
*) AC_MSG_ERROR("GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}");;
esac
if test x"${gdb_osabi}" != x ; then if test x"${gdb_osabi}" != x ; then
AC_DEFINE_UNQUOTED(GDB_OSABI_DEFAULT, $gdb_osabi, AC_DEFINE_UNQUOTED(GDB_OSABI_DEFAULT, $gdb_osabi,
[Define to the default OS ABI for this configuration.]) [Define to the default OS ABI for this configuration.])

23
gdb/configure.tgt
View file

@ -50,8 +50,7 @@ arm*-wince-pe) gdb_target=wince ;;
arm*-*-linux*) gdb_target=linux arm*-*-linux*) gdb_target=linux
build_gdbserver=yes build_gdbserver=yes
;; ;;
arm*-*-netbsd*) gdb_target=nbsd arm*-*-netbsd*) gdb_target=nbsd ;;
gdb_multi_arch=yes ;;
arm-*-nto*) gdb_target=nto ;; arm-*-nto*) gdb_target=nto ;;
arm*-*-* | thumb*-*-* | strongarm*-*-*) arm*-*-* | thumb*-*-* | strongarm*-*-*)
gdb_target=embed gdb_target=embed
@ -61,9 +60,7 @@ xscale-*-*) gdb_target=embed
configdirs="$configdirs rdi-share" configdirs="$configdirs rdi-share"
;; ;;
avr-*-*) gdb_target=avr avr-*-*) gdb_target=avr ;;
gdb_multi_arch=yes
;;
cris*) gdb_target=cris ;; cris*) gdb_target=cris ;;
@ -131,7 +128,6 @@ m68*-*-aout*) gdb_target=monitor ;;
m68*-*-coff*) gdb_target=monitor ;; m68*-*-coff*) gdb_target=monitor ;;
m68*-*-elf*) gdb_target=monitor ;; m68*-*-elf*) gdb_target=monitor ;;
m68*-*-linux*) gdb_target=linux m68*-*-linux*) gdb_target=linux
gdb_multi_arch=1
build_gdbserver=yes build_gdbserver=yes
;; ;;
m68*-*-lynxos*) gdb_target=m68klynx ;; m68*-*-lynxos*) gdb_target=m68klynx ;;
@ -266,21 +262,6 @@ x86_64-*-linux*) gdb_target=x86-64linux
esac esac
# map GDB target onto multi-arch support
case "${gdb_target}" in
d10v) gdb_multi_arch=yes ;;
fbsd64) gdb_multi_arch=yes ;;
m32r) gdb_multi_arch=yes ;;
m68hc11) gdb_multi_arch=yes ;;
mn10300) gdb_multi_arch=yes ;;
x86-64linux) gdb_multi_arch=yes ;;
v850) gdb_multi_arch=yes ;;
xstormy16) gdb_multi_arch=yes ;;
mcore) gdb_multi_arch=yes ;;
esac
# map target onto default OS ABI # map target onto default OS ABI
case "${target}" in case "${target}" in

15
gdb/defs.h
View file

@ -1086,14 +1086,17 @@ extern void *alloca ();
#endif /* Not GNU C */ #endif /* Not GNU C */
#endif /* alloca not defined */ #endif /* alloca not defined */
/* Is GDB multi-arch? If there's a "tm.h" file, it is not. */
#ifndef GDB_MULTI_ARCH
#ifdef GDB_TM_FILE
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
#else
#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PURE
#endif
#endif
/* Dynamic target-system-dependent parameters for GDB. */ /* Dynamic target-system-dependent parameters for GDB. */
#include "gdbarch.h" #include "gdbarch.h"
#if (GDB_MULTI_ARCH == 0)
/* Multi-arch targets _should_ be including "arch-utils.h" directly
into their *-tdep.c file. This is a prop to help old non-
multi-arch targets to continue to compile. */
#include "arch-utils.h"
#endif
/* Maximum size of a register. Something small, but large enough for /* Maximum size of a register. Something small, but large enough for
all known ISAs. If it turns out to be too small, make it bigger. */ all known ISAs. If it turns out to be too small, make it bigger. */