From 57b29be766028ff8110a89efefc3fda4379b6279 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 3 Sep 2003 15:02:51 +0000 Subject: [PATCH] 2003-09-03 Andrew Cagney * 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. --- gdb/ChangeLog | 27 +++++++++++++ gdb/config.in | 3 -- gdb/config/alpha/tm-alpha.h | 2 - gdb/config/frv/tm-frv.h | 3 -- gdb/config/h8300/tm-h8300.h | 2 - gdb/config/i386/tm-i386.h | 2 - gdb/config/i386/x86-64linux.mt | 2 - gdb/config/m68hc11/m68hc11.mt | 1 - gdb/config/m68k/tm-m68k.h | 2 - gdb/config/ns32k/tm-ns32k.h | 2 - gdb/config/pa/tm-hppa64.h | 1 - gdb/config/s390/s390.mt | 1 - gdb/config/s390/s390x.mt | 1 - gdb/config/sparc/tm-linux.h | 2 - gdb/config/sparc/tm-nbsd.h | 2 - gdb/config/sparc/tm-sp64.h | 2 - gdb/config/sparc/tm-sparc.h | 2 - gdb/config/sparc/tm-sun4sol2.h | 2 - gdb/config/v850/v850.mt | 1 - gdb/config/vax/tm-vax.h | 2 - gdb/configure | 70 +++++++++------------------------- gdb/configure.in | 31 --------------- gdb/configure.tgt | 23 +---------- gdb/defs.h | 15 +++++--- 24 files changed, 56 insertions(+), 145 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f8f4565b8e9..e4a36eafa78 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,30 @@ +2003-09-03 Andrew Cagney + + * 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 * Makefile.in: Remove tm-hp300bsd.h, tm-hp300hpux.h. diff --git a/gdb/config.in b/gdb/config.in index 787afb26ce4..4acf3e7bc65 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -167,9 +167,6 @@ /* Define if defines the PT_GETXMMREGS request. */ #undef HAVE_PT_GETXMMREGS -/* Multi-arch enabled. */ -#undef GDB_MULTI_ARCH - /* hostfile */ #undef GDB_XM_FILE diff --git a/gdb/config/alpha/tm-alpha.h b/gdb/config/alpha/tm-alpha.h index 9ced4f238ed..1b93e76b799 100644 --- a/gdb/config/alpha/tm-alpha.h +++ b/gdb/config/alpha/tm-alpha.h @@ -24,8 +24,6 @@ #ifndef TM_ALPHA_H #define TM_ALPHA_H -#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL - #include "bfd.h" #include "coff/sym.h" /* Needed for PDR below. */ #include "coff/symconst.h" diff --git a/gdb/config/frv/tm-frv.h b/gdb/config/frv/tm-frv.h index 303d1d31339..a08f2d3d4bc 100644 --- a/gdb/config/frv/tm-frv.h +++ b/gdb/config/frv/tm-frv.h @@ -20,9 +20,6 @@ /* 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_WATCH_LIMIT 4 diff --git a/gdb/config/h8300/tm-h8300.h b/gdb/config/h8300/tm-h8300.h index e560c644c8d..5d1aaa723b9 100644 --- a/gdb/config/h8300/tm-h8300.h +++ b/gdb/config/h8300/tm-h8300.h @@ -20,8 +20,6 @@ Boston, MA 02111-1307, USA. */ /* 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 in sim/h8300/compile.c. They really should not be used this way. Because of this we cannot get rid of the macro diff --git a/gdb/config/i386/tm-i386.h b/gdb/config/i386/tm-i386.h index 395c9b259b1..e2bd81fdaa8 100644 --- a/gdb/config/i386/tm-i386.h +++ b/gdb/config/i386/tm-i386.h @@ -22,6 +22,4 @@ #ifndef TM_I386_H #define TM_I386_H 1 -#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL - #endif /* ifndef TM_I386_H */ diff --git a/gdb/config/i386/x86-64linux.mt b/gdb/config/i386/x86-64linux.mt index bb33978de3f..9ef593844e2 100644 --- a/gdb/config/i386/x86-64linux.mt +++ b/gdb/config/i386/x86-64linux.mt @@ -3,6 +3,4 @@ TDEPFILES= x86-64-tdep.o x86-64-linux-tdep.o \ i386-tdep.o i387-tdep.o i386-linux-tdep.o \ solib.o solib-svr4.o solib-legacy.o corelow.o -GDB_MULTI_ARCH=GDB_MULTI_ARCH_TM - TM_FILE=tm-x86-64linux.h diff --git a/gdb/config/m68hc11/m68hc11.mt b/gdb/config/m68hc11/m68hc11.mt index 5e25eeec673..0f1f0019eaa 100644 --- a/gdb/config/m68hc11/m68hc11.mt +++ b/gdb/config/m68hc11/m68hc11.mt @@ -1,6 +1,5 @@ # Target: Motorola 68HC11 processor TDEPFILES= m68hc11-tdep.o -TM_FILE= tm-m68hc11.h SIM_OBS= remote-sim.o SIM= ../sim/m68hc11/libsim.a -lm diff --git a/gdb/config/m68k/tm-m68k.h b/gdb/config/m68k/tm-m68k.h index f773428a2f0..17b31981f19 100644 --- a/gdb/config/m68k/tm-m68k.h +++ b/gdb/config/m68k/tm-m68k.h @@ -19,6 +19,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL - extern int m68k_get_longjmp_target (CORE_ADDR *); diff --git a/gdb/config/ns32k/tm-ns32k.h b/gdb/config/ns32k/tm-ns32k.h index cd1594294fc..96dd2cb26bf 100644 --- a/gdb/config/ns32k/tm-ns32k.h +++ b/gdb/config/ns32k/tm-ns32k.h @@ -22,8 +22,6 @@ #ifndef 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 record, not using x_fsize field. */ #define FUNCTION_EPILOGUE_SIZE 4 diff --git a/gdb/config/pa/tm-hppa64.h b/gdb/config/pa/tm-hppa64.h index 8999edf2dcb..f9e5b9e66e9 100644 --- a/gdb/config/pa/tm-hppa64.h +++ b/gdb/config/pa/tm-hppa64.h @@ -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 switch and a other recent tweaks, 64 bit PA hadn't been building for some months, this is probably the lesser of several evils. */ -#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL #include "pa/tm-hppah.h" diff --git a/gdb/config/s390/s390.mt b/gdb/config/s390/s390.mt index 6b8d91fc83f..86b6a3371cc 100644 --- a/gdb/config/s390/s390.mt +++ b/gdb/config/s390/s390.mt @@ -3,4 +3,3 @@ TM_FILE= tm-linux.h TDEPFILES=s390-tdep.o solib.o # Post 5.0 tdep-files TDEPFILES+=solib-svr4.o solib-legacy.o -GDB_MULTI_ARCH=GDB_MULTI_ARCH_PARTIAL diff --git a/gdb/config/s390/s390x.mt b/gdb/config/s390/s390x.mt index 7b23cad60cb..d0c8262f72d 100644 --- a/gdb/config/s390/s390x.mt +++ b/gdb/config/s390/s390x.mt @@ -3,7 +3,6 @@ TM_FILE= tm-linux.h TDEPFILES=s390-tdep.o solib.o # Post 5.0 tdep-files TDEPFILES+=solib-svr4.o solib-legacy.o -GDB_MULTI_ARCH=GDB_MULTI_ARCH_PARTIAL # needed for gdbserver. MT_CFLAGS= -DCONFIG_ARCH_S390X diff --git a/gdb/config/sparc/tm-linux.h b/gdb/config/sparc/tm-linux.h index 31eeff9e206..63be2b885a5 100644 --- a/gdb/config/sparc/tm-linux.h +++ b/gdb/config/sparc/tm-linux.h @@ -23,8 +23,6 @@ #ifndef TM_SPARCLINUX_H #define TM_SPARCLINUX_H -#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL - #include "sparc/tm-sparc.h" #define SIGCONTEXT_PC_OFFSET 12 diff --git a/gdb/config/sparc/tm-nbsd.h b/gdb/config/sparc/tm-nbsd.h index bd9845029b5..c82c3154088 100644 --- a/gdb/config/sparc/tm-nbsd.h +++ b/gdb/config/sparc/tm-nbsd.h @@ -21,8 +21,6 @@ #ifndef TM_NBSD_H #define TM_NBSD_H -#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL - #include "sparc/tm-sparc.h" #include "solib.h" diff --git a/gdb/config/sparc/tm-sp64.h b/gdb/config/sparc/tm-sp64.h index 203f65607f9..960cc0b9d97 100644 --- a/gdb/config/sparc/tm-sp64.h +++ b/gdb/config/sparc/tm-sp64.h @@ -25,8 +25,6 @@ struct type; -#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL - #ifndef GDB_TARGET_IS_SPARC64 #define GDB_TARGET_IS_SPARC64 1 #endif diff --git a/gdb/config/sparc/tm-sparc.h b/gdb/config/sparc/tm-sparc.h index 4355c8e302a..a18e20317d5 100644 --- a/gdb/config/sparc/tm-sparc.h +++ b/gdb/config/sparc/tm-sparc.h @@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL - #include "regcache.h" struct type; diff --git a/gdb/config/sparc/tm-sun4sol2.h b/gdb/config/sparc/tm-sun4sol2.h index eb253b1c29f..506e9370de6 100644 --- a/gdb/config/sparc/tm-sun4sol2.h +++ b/gdb/config/sparc/tm-sun4sol2.h @@ -19,8 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL - #include "sparc/tm-sparc.h" #include "config/tm-sysv4.h" diff --git a/gdb/config/v850/v850.mt b/gdb/config/v850/v850.mt index 867f8e68429..701a24098b0 100644 --- a/gdb/config/v850/v850.mt +++ b/gdb/config/v850/v850.mt @@ -1,5 +1,4 @@ # Target: NEC V850 processor TDEPFILES= v850-tdep.o -# TM_FILE= tm-v850.h SIM_OBS = remote-sim.o SIM = ../sim/v850/libsim.a diff --git a/gdb/config/vax/tm-vax.h b/gdb/config/vax/tm-vax.h index f1ed146fe8e..b5e1ac22a1d 100644 --- a/gdb/config/vax/tm-vax.h +++ b/gdb/config/vax/tm-vax.h @@ -22,6 +22,4 @@ #ifndef TM_VAX_H #define TM_VAX_H -#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL - #endif /* TM_VAX_H */ diff --git a/gdb/configure b/gdb/configure index 1a9a877ddab..f2015caca5a 100755 --- a/gdb/configure +++ b/gdb/configure @@ -10239,10 +10239,6 @@ targetfile=`sed -n ' s/TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p ' ${target_makefile_frag}` -GDB_MULTI_ARCH=`sed -n ' -s/GDB_MULTI_ARCH[ ]*=[ ]*\([^ ]*\)[ ]*/\1/p -' ${target_makefile_frag}` - if test "${target}" = "${host}"; then # We pick this up from the host configuration file (.mh) because we # do not have a native configuration Makefile fragment. @@ -10252,36 +10248,6 @@ s/NAT_FILE[ ]*=[ ]*\([^ ]*\)/\1/p 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 <&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 cat >> confdefs.h <&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 configdirs="$configdirs gdbserver" echo "$ac_t""yes" 1>&6 @@ -10371,12 +10337,12 @@ fi 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&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* ac_cv_cygwin=yes else @@ -10404,19 +10370,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&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* ac_cv_mingw32=yes else @@ -10435,7 +10401,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes 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 echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10445,10 +10411,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext 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 case $file in - *.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj | *.ilk | *.pdb) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -10487,7 +10453,7 @@ fi 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 echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10495,7 +10461,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -10505,7 +10471,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } 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* am_cv_func_iconv=yes else @@ -10517,7 +10483,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -10527,7 +10493,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } 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* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -10548,13 +10514,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10573,7 +10539,7 @@ int main() { ; return 0; } 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* am_cv_proto_iconv_arg1="" else diff --git a/gdb/configure.in b/gdb/configure.in index e14e10294b1..544b6de01d4 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -1306,10 +1306,6 @@ targetfile=`sed -n ' s/TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p ' ${target_makefile_frag}` -GDB_MULTI_ARCH=`sed -n ' -s/GDB_MULTI_ARCH[ ]*=[ ]*\([^ ]*\)[ ]*/\1/p -' ${target_makefile_frag}` - if test "${target}" = "${host}"; then # We pick this up from the host configuration file (.mh) because we # do not have a native configuration Makefile fragment. @@ -1319,33 +1315,6 @@ s/NAT_FILE[ ]*=[ ]*\([^ ]*\)/\1/p fi 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 AC_DEFINE_UNQUOTED(GDB_OSABI_DEFAULT, $gdb_osabi, [Define to the default OS ABI for this configuration.]) diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 48b516fd146..810b27e18f4 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -50,8 +50,7 @@ arm*-wince-pe) gdb_target=wince ;; arm*-*-linux*) gdb_target=linux build_gdbserver=yes ;; -arm*-*-netbsd*) gdb_target=nbsd - gdb_multi_arch=yes ;; +arm*-*-netbsd*) gdb_target=nbsd ;; arm-*-nto*) gdb_target=nto ;; arm*-*-* | thumb*-*-* | strongarm*-*-*) gdb_target=embed @@ -61,9 +60,7 @@ xscale-*-*) gdb_target=embed configdirs="$configdirs rdi-share" ;; -avr-*-*) gdb_target=avr - gdb_multi_arch=yes - ;; +avr-*-*) gdb_target=avr ;; cris*) gdb_target=cris ;; @@ -131,7 +128,6 @@ m68*-*-aout*) gdb_target=monitor ;; m68*-*-coff*) gdb_target=monitor ;; m68*-*-elf*) gdb_target=monitor ;; m68*-*-linux*) gdb_target=linux - gdb_multi_arch=1 build_gdbserver=yes ;; m68*-*-lynxos*) gdb_target=m68klynx ;; @@ -266,21 +262,6 @@ x86_64-*-linux*) gdb_target=x86-64linux 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 case "${target}" in diff --git a/gdb/defs.h b/gdb/defs.h index 778f5579e53..39b27cb9477 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -1086,14 +1086,17 @@ extern void *alloca (); #endif /* Not GNU C */ #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. */ #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 all known ISAs. If it turns out to be too small, make it bigger. */ -- 2.30.2