From 9c1488cbbce26c9b9bdf5d0f9d515c272a6dc48c Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Wed, 25 Feb 2004 20:45:31 +0000 Subject: [PATCH] * amd64-tdep.h: Renamed from x86-64-tdep.h. * amd64-tdep.c: Renamed from x86-64-tdep.c. Include "amd64-tdep.h" instead of "x86-64-tdep.h". * amd64-nat.c: Include "amd64-tdep.h" instead of "x86-64-tdep.h". * amd64-linux-tdep.h: Renamed from x86-64-linux.h. * amd64-linux-tdep.c: Renamed from x86-64-linux-tdep.c. Include "amd64-tdep.h" and "amd64-linux-tdep.h" instead of "x86-64-tdep.h" and "x86-64-tdep.c". * amd64-linux-nat.c: Renamed from x86-64-linux-nat.c. Include "amd64-tdep.h" and "amd64-linux-tdep.h" instead of "x86-64-tdep.h" and "x86-64-tdep.c". * amd64bsd-nat.c: Update copyright year. Include "amd64-tdep.h" instead of "x86-64-tdep.h". * amd64fbsd-tdep.c: Include "amd64-tdep.h" instead of "x86-64-tdep.h". * amd64fbsd-nat.c: Include "amd64-tdep.h" instead of "x86-64-tdep.h". * amd64nbsd-tdep.c: Include "amd64-tdep.h" instead of "x86-64-tdep.h". * amd64nbsd-nat.c: Include "amd64-tdep.h" instead of "x86-64-tdep.h". * amd64obsd-tdep.c: Include "amd64-tdep.h" instead of "x86-64-tdep.h". * amd64obsd-nat.c: Include "amd64-tdep.h" instead of "x86-64-tdep.h". * configure.host: (x86_64-*-linux*): Set gdb_target to linux64. * configure.tgt (x86_64-*-linux*): Set gdb_target to linux64. * Makefile.in (amd64_linux_tdep_h): Renamed from x86_64_linux_tdep_h. (amd64_tdep_h): Renamed from x86_64_tdep_h. (amd64bsd-nat.o, amd64fbsd-nat.o, amd64fbsd-tdep.o, amd64-nat.o) (amd64nbsd-nat.o, amd64nbsd-tdep.o, amd64obsd-nat.o) (amd64obsd-tdep.o): Update dependencies. (amd64-tdep.o, amd64-linux-nat.o, amd64-linux-tdep.o): New dependencies. (x86-64-linux-nat.o, x86-64-linux-tdep.o, x86-64-tdep.o): Remove dependencies. (ALLDEPFILES): Add amd64-tdep.c, amd64obsd-nat.c, amd64obsd-nat.c, amd64-linux-nat.c amd64-linux-tdep.c. * config/i386/tm-linux64.h: Renamed from tm-x86-64linux.h * config/i386/nm-linux64.h: Renamed from nm-x86-64linux.h. * config/i386/linux64.mt: Renamed from x86-64linux.mt. (TDEPFILES): Replace x86-64-tdep.o and x86-64-linux-tdep.o with amd64-tdep.o and amd64-linux-tdep.o. (TM_FILE): Set to tm-linux64.h. * config/i386/linux64.mh: Renamed from x86-64linux.mh. (NAT_FILE): Set to nm-linux64.h. (NATDEPFILES): Replace x86-64-linux-nat.o with amd64-linux-nat.o. * config/i386/fbsd64.mt (TDEPFILES): Replace x86-64-tdep.o with amd64-tdep.o. * config/i386/nbsd64.mt (TDEPFILES): Replace x86-64-tdep.o with amd64-tdep.o. * config/i386/obsd64.mt (TDEPFILES): Replace x86-64-tdep.o with amd64-tdep.o. --- gdb/ChangeLog | 57 +++++++++++++++++++ gdb/Makefile.in | 49 ++++++++-------- gdb/{x86-64-linux-nat.c => amd64-linux-nat.c} | 4 +- ...x86-64-linux-tdep.c => amd64-linux-tdep.c} | 4 +- ...x86-64-linux-tdep.h => amd64-linux-tdep.h} | 6 +- gdb/{x86-64-tdep.c => amd64-tdep.c} | 2 +- gdb/{x86-64-tdep.h => amd64-tdep.h} | 6 +- gdb/config/i386/fbsd64.mt | 2 +- .../i386/{x86-64linux.mh => linux64.mh} | 11 ++-- gdb/config/i386/linux64.mt | 5 ++ gdb/config/i386/nbsd64.mt | 2 +- .../i386/{nm-x86-64linux.h => nm-linux64.h} | 6 +- gdb/config/i386/obsd64.mt | 2 +- .../i386/{tm-x86-64linux.h => tm-linux64.h} | 6 +- gdb/config/i386/x86-64linux.mt | 6 -- gdb/configure.host | 2 +- gdb/configure.tgt | 2 +- 17 files changed, 114 insertions(+), 58 deletions(-) rename gdb/{x86-64-linux-nat.c => amd64-linux-nat.c} (99%) rename gdb/{x86-64-linux-tdep.c => amd64-linux-tdep.c} (99%) rename gdb/{x86-64-linux-tdep.h => amd64-linux-tdep.h} (93%) rename gdb/{x86-64-tdep.c => amd64-tdep.c} (99%) rename gdb/{x86-64-tdep.h => amd64-tdep.h} (97%) rename gdb/config/i386/{x86-64linux.mh => linux64.mh} (65%) create mode 100644 gdb/config/i386/linux64.mt rename gdb/config/i386/{nm-x86-64linux.h => nm-linux64.h} (96%) rename gdb/config/i386/{tm-x86-64linux.h => tm-linux64.h} (94%) delete mode 100644 gdb/config/i386/x86-64linux.mt diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 69acdb350fa..93800b94c7e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,60 @@ +2004-02-25 Mark Kettenis + + * amd64-tdep.h: Renamed from x86-64-tdep.h. + * amd64-tdep.c: Renamed from x86-64-tdep.c. Include + "amd64-tdep.h" instead of "x86-64-tdep.h". + * amd64-nat.c: Include "amd64-tdep.h" instead of "x86-64-tdep.h". + * amd64-linux-tdep.h: Renamed from x86-64-linux.h. + * amd64-linux-tdep.c: Renamed from x86-64-linux-tdep.c. Include + "amd64-tdep.h" and "amd64-linux-tdep.h" instead of "x86-64-tdep.h" + and "x86-64-tdep.c". + * amd64-linux-nat.c: Renamed from x86-64-linux-nat.c. Include + "amd64-tdep.h" and "amd64-linux-tdep.h" instead of "x86-64-tdep.h" + and "x86-64-tdep.c". + * amd64bsd-nat.c: Update copyright year. + Include "amd64-tdep.h" instead of "x86-64-tdep.h". + * amd64fbsd-tdep.c: Include "amd64-tdep.h" instead of + "x86-64-tdep.h". + * amd64fbsd-nat.c: Include "amd64-tdep.h" instead of + "x86-64-tdep.h". + * amd64nbsd-tdep.c: Include "amd64-tdep.h" instead of + "x86-64-tdep.h". + * amd64nbsd-nat.c: Include "amd64-tdep.h" instead of + "x86-64-tdep.h". + * amd64obsd-tdep.c: Include "amd64-tdep.h" instead of + "x86-64-tdep.h". + * amd64obsd-nat.c: Include "amd64-tdep.h" instead of + "x86-64-tdep.h". + * configure.host: (x86_64-*-linux*): Set gdb_target to linux64. + * configure.tgt (x86_64-*-linux*): Set gdb_target to linux64. + * Makefile.in (amd64_linux_tdep_h): Renamed from + x86_64_linux_tdep_h. + (amd64_tdep_h): Renamed from x86_64_tdep_h. + (amd64bsd-nat.o, amd64fbsd-nat.o, amd64fbsd-tdep.o, amd64-nat.o) + (amd64nbsd-nat.o, amd64nbsd-tdep.o, amd64obsd-nat.o) + (amd64obsd-tdep.o): Update dependencies. + (amd64-tdep.o, amd64-linux-nat.o, amd64-linux-tdep.o): New + dependencies. + (x86-64-linux-nat.o, x86-64-linux-tdep.o, x86-64-tdep.o): Remove + dependencies. + (ALLDEPFILES): Add amd64-tdep.c, amd64obsd-nat.c, amd64obsd-nat.c, + amd64-linux-nat.c amd64-linux-tdep.c. + * config/i386/tm-linux64.h: Renamed from tm-x86-64linux.h + * config/i386/nm-linux64.h: Renamed from nm-x86-64linux.h. + * config/i386/linux64.mt: Renamed from x86-64linux.mt. + (TDEPFILES): Replace x86-64-tdep.o and x86-64-linux-tdep.o with + amd64-tdep.o and amd64-linux-tdep.o. + (TM_FILE): Set to tm-linux64.h. + * config/i386/linux64.mh: Renamed from x86-64linux.mh. + (NAT_FILE): Set to nm-linux64.h. + (NATDEPFILES): Replace x86-64-linux-nat.o with amd64-linux-nat.o. + * config/i386/fbsd64.mt (TDEPFILES): Replace x86-64-tdep.o with + amd64-tdep.o. + * config/i386/nbsd64.mt (TDEPFILES): Replace x86-64-tdep.o with + amd64-tdep.o. + * config/i386/obsd64.mt (TDEPFILES): Replace x86-64-tdep.o with + amd64-tdep.o. + 2004-02-25 Roland McGrath * remote.c (remote_protocol_qPart_auxv): New variable. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 5deb7a524b5..955352059a6 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -770,8 +770,8 @@ vax_tdep_h = vax-tdep.h version_h = version.h wince_stub_h = wince-stub.h wrapper_h = wrapper.h $(gdb_h) -x86_64_linux_tdep_h = x86-64-linux-tdep.h -x86_64_tdep_h = x86-64-tdep.h $(i386_tdep_h) +amd64_linux_tdep_h = amd64-linux-tdep.h +amd64_tdep_h = amd64-tdep.h $(i386_tdep_h) xcoffsolib_h = xcoffsolib.h xmodem_h = xmodem.h @@ -1307,8 +1307,11 @@ ALLDEPFILES = \ alpha-nat.c alphabsd-nat.c \ alpha-tdep.c alpha-linux-tdep.c alphabsd-tdep.c alphanbsd-tdep.c \ alpha-osf1-tdep.c alphafbsd-tdep.c alpha-mdebug-tdep.c \ - amd64-nat.c amd64bsd-nat.c amdfbsd-nat.c amd64-fbsd-tdep.c \ + amd64-nat.c amd64-tdep.c \ + amd64bsd-nat.c amdfbsd-nat.c amd64fbsd-tdep.c \ amd64nbsd-nat.c amd64nbsd-tdep.c \ + amd64obsd-nat.c amd64obsd-tdep.c \ + amd64-linux-nat.c amd64-linux-tdep.c \ arm-linux-nat.c arm-linux-tdep.c arm-tdep.c \ armnbsd-nat.c armnbsd-tdep.c \ avr-tdep.c \ @@ -1519,24 +1522,36 @@ alpha-tdep.o: alpha-tdep.c $(defs_h) $(doublest_h) $(frame_h) \ $(regcache_h) $(reggroups_h) $(arch_utils_h) $(osabi_h) $(block_h) \ $(elf_bfd_h) $(alpha_tdep_h) amd64bsd-nat.o: amd64bsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ - $(gdb_assert_h) $(x86_64_tdep_h) $(amd64_nat_h) + $(gdb_assert_h) $(amd64_tdep_h) $(amd64_nat_h) amd64fbsd-nat.o: amd64fbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ - $(gdb_assert_h) $(gregset_h) $(x86_64_tdep_h) $(amd64_nat_h) + $(gdb_assert_h) $(gregset_h) $(amd64_tdep_h) $(amd64_nat_h) amd64fbsd-tdep.o: amd64fbsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \ $(gdbcore_h) $(regcache_h) $(osabi_h) $(gdb_string_h) \ - $(x86_64_tdep_h) $(solib_svr4_h) + $(amd64_tdep_h) $(solib_svr4_h) +amd64-linux-nat.o: amd64-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \ + $(regcache_h) $(linux_nat_h) $(gdb_assert_h) $(gdb_string_h) \ + $(gdb_proc_service_h) $(gregset_h) $(amd64_tdep_h) \ + $(amd64_linux_tdep_h) $(i386_linux_tdep_h) $(amd64_nat_h) +amd64-linux-tdep.o: amd64-linux-tdep.c $(defs_h) $(inferior_h) \ + $(gdbcore_h) $(regcache_h) $(osabi_h) $(gdb_string_h) \ + $(amd64_tdep_h) $(amd64_linux_tdep_h) amd64-nat.o: amd64-nat.c $(defs_h) $(gdbarch_h) $(regcache_h) \ - $(gdb_assert_h) $(i386_tdep_h) $(x86_64_tdep_h) -amd64nbsd-nat.o: amd64nbsd-nat.c $(defs_h) $(gdb_assert_h) $(x86_64_tdep_h) \ + $(gdb_assert_h) $(i386_tdep_h) $(amd64_tdep_h) +amd64nbsd-nat.o: amd64nbsd-nat.c $(defs_h) $(gdb_assert_h) $(amd64_tdep_h) \ $(amd64_nat_h) amd64nbsd-tdep.o: amd64nbsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \ - $(gdbcore_h) $(osabi_h) $(gdb_assert_h) $(x86_64_tdep_h) \ + $(gdbcore_h) $(osabi_h) $(gdb_assert_h) $(amd64_tdep_h) \ $(nbsd_tdep_h) $(solib_svr4_h) -amd64obsd-nat.o: amd64obsd-nat.c $(defs_h) $(gdb_assert_h) $(x86_64_tdep_h) \ +amd64obsd-nat.o: amd64obsd-nat.c $(defs_h) $(gdb_assert_h) $(amd64_tdep_h) \ $(amd64_nat_h) amd64obsd-tdep.o: amd64obsd-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \ $(osabi_h) $(regset_h) $(target_h) $(gdb_assert_h) $(gdb_string_h) \ - $(x86_64_tdep_h) $(i387_tdep_h) $(solib_svr4_h) + $(amd64_tdep_h) $(i387_tdep_h) $(solib_svr4_h) +amd64-tdep.o: amd64-tdep.c $(defs_h) $(arch_utils_h) $(block_h) \ + $(dummy_frame_h) $(frame_h) $(frame_base_h) $(frame_unwind_h) \ + $(inferior_h) $(gdbcmd_h) $(gdbcore_h) $(objfiles_h) $(regcache_h) \ + $(regset_h) $(symfile_h) $(gdb_assert_h) $(amd64_tdep_h) \ + $(i387_tdep_h) annotate.o: annotate.c $(defs_h) $(annotate_h) $(value_h) $(target_h) \ $(gdbtypes_h) $(breakpoint_h) arch-utils.o: arch-utils.c $(defs_h) $(arch_utils_h) $(buildsym_h) \ @@ -2472,18 +2487,6 @@ wince.o: wince.c $(defs_h) $(frame_h) $(inferior_h) $(target_h) $(gdbcore_h) \ $(regcache_h) $(mips_tdep_h) wince-stub.o: wince-stub.c $(wince_stub_h) wrapper.o: wrapper.c $(defs_h) $(value_h) $(wrapper_h) -x86-64-linux-nat.o: x86-64-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \ - $(regcache_h) $(linux_nat_h) $(gdb_assert_h) $(gdb_string_h) \ - $(gdb_proc_service_h) $(gregset_h) $(x86_64_tdep_h) \ - $(x86_64_linux_tdep_h) $(i386_linux_tdep_h) $(amd64_nat_h) -x86-64-linux-tdep.o: x86-64-linux-tdep.c $(defs_h) $(inferior_h) \ - $(gdbcore_h) $(regcache_h) $(osabi_h) $(gdb_string_h) \ - $(x86_64_tdep_h) $(x86_64_linux_tdep_h) -x86-64-tdep.o: x86-64-tdep.c $(defs_h) $(arch_utils_h) $(block_h) \ - $(dummy_frame_h) $(frame_h) $(frame_base_h) $(frame_unwind_h) \ - $(inferior_h) $(gdbcmd_h) $(gdbcore_h) $(objfiles_h) $(regcache_h) \ - $(regset_h) $(symfile_h) $(gdb_assert_h) $(x86_64_tdep_h) \ - $(i387_tdep_h) xcoffread.o: xcoffread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(gdb_stat_h) \ $(coff_internal_h) $(libcoff_h) $(coff_xcoff_h) $(libxcoff_h) \ $(coff_rs6000_h) $(symtab_h) $(gdbtypes_h) $(symfile_h) \ diff --git a/gdb/x86-64-linux-nat.c b/gdb/amd64-linux-nat.c similarity index 99% rename from gdb/x86-64-linux-nat.c rename to gdb/amd64-linux-nat.c index 109d3ce7c13..1b6d0c57e76 100644 --- a/gdb/x86-64-linux-nat.c +++ b/gdb/amd64-linux-nat.c @@ -47,8 +47,8 @@ /* Prototypes for supply_gregset etc. */ #include "gregset.h" -#include "x86-64-tdep.h" -#include "x86-64-linux-tdep.h" +#include "amd64-tdep.h" +#include "amd64-linux-tdep.h" #include "i386-linux-tdep.h" #include "amd64-nat.h" diff --git a/gdb/x86-64-linux-tdep.c b/gdb/amd64-linux-tdep.c similarity index 99% rename from gdb/x86-64-linux-tdep.c rename to gdb/amd64-linux-tdep.c index 4066b84f873..9a1636a8998 100644 --- a/gdb/x86-64-linux-tdep.c +++ b/gdb/amd64-linux-tdep.c @@ -28,8 +28,8 @@ #include "gdb_string.h" -#include "x86-64-tdep.h" -#include "x86-64-linux-tdep.h" +#include "amd64-tdep.h" +#include "amd64-linux-tdep.h" /* Register indexes to 'struct user' come from . */ diff --git a/gdb/x86-64-linux-tdep.h b/gdb/amd64-linux-tdep.h similarity index 93% rename from gdb/x86-64-linux-tdep.h rename to gdb/amd64-linux-tdep.h index ab7b2716b6c..5b960201f82 100644 --- a/gdb/x86-64-linux-tdep.h +++ b/gdb/amd64-linux-tdep.h @@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef X86_64_LINUX_TDEP_H -#define X86_64_LINUX_TDEP_H +#ifndef AMD64_LINUX_TDEP_H +#define AMD64_LINUX_TDEP_H /* Fill GDB's register array with the general-purpose register values in *GREGSETP. */ @@ -35,4 +35,4 @@ void amd64_linux_supply_gregset (char *regp); void amd64_linux_fill_gregset (char *regp, int regno); -#endif /* x86-64-linux-tdep.h */ +#endif /* amd64-linux-tdep.h */ diff --git a/gdb/x86-64-tdep.c b/gdb/amd64-tdep.c similarity index 99% rename from gdb/x86-64-tdep.c rename to gdb/amd64-tdep.c index 451c4af04f0..46ee806f6be 100644 --- a/gdb/x86-64-tdep.c +++ b/gdb/amd64-tdep.c @@ -37,7 +37,7 @@ #include "gdb_assert.h" -#include "x86-64-tdep.h" +#include "amd64-tdep.h" #include "i387-tdep.h" /* Note that the AMD64 architecture was previously known as x86-64. diff --git a/gdb/x86-64-tdep.h b/gdb/amd64-tdep.h similarity index 97% rename from gdb/x86-64-tdep.h rename to gdb/amd64-tdep.h index 8367709e39a..aff0c6a0389 100644 --- a/gdb/x86-64-tdep.h +++ b/gdb/amd64-tdep.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef X86_64_TDEP_H -#define X86_64_TDEP_H +#ifndef AMD64_TDEP_H +#define AMD64_TDEP_H struct gdbarch; struct frame_info; @@ -82,4 +82,4 @@ extern CORE_ADDR amd64fbsd_sigtramp_start_addr; extern CORE_ADDR amd64fbsd_sigtramp_end_addr; extern int amd64fbsd_sc_reg_offset[]; -#endif /* x86-64-tdep.h */ +#endif /* amd64-tdep.h */ diff --git a/gdb/config/i386/fbsd64.mt b/gdb/config/i386/fbsd64.mt index 4f8501ef827..d4cb24b76b8 100644 --- a/gdb/config/i386/fbsd64.mt +++ b/gdb/config/i386/fbsd64.mt @@ -1,5 +1,5 @@ # Target: FreeBSD/amd64 -TDEPFILES= x86-64-tdep.o amd64fbsd-tdep.o \ +TDEPFILES= amd64-tdep.o amd64fbsd-tdep.o \ i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \ corelow.o solib.o solib-svr4.o TM_FILE= tm-fbsd.h diff --git a/gdb/config/i386/x86-64linux.mh b/gdb/config/i386/linux64.mh similarity index 65% rename from gdb/config/i386/x86-64linux.mh rename to gdb/config/i386/linux64.mh index ed563cb0cf4..c02e864a347 100644 --- a/gdb/config/i386/x86-64linux.mh +++ b/gdb/config/i386/linux64.mh @@ -1,12 +1,9 @@ -# Host: AMD x86-64 running GNU/Linux - -XM_FILE= xm-i386.h - -NAT_FILE= nm-x86-64linux.h +# Host: GNU/Linux x86-64 NATDEPFILES= infptrace.o inftarg.o fork-child.o \ - i386-nat.o amd64-nat.o x86-64-linux-nat.o \ - linux-nat.o \ + i386-nat.o amd64-nat.o amd64-linux-nat.o linux-nat.o \ proc-service.o thread-db.o lin-lwp.o linux-proc.o gcore.o +NAT_FILE= nm-linux64.h +XM_FILE= xm-i386.h # The dynamically loaded libthread_db needs access to symbols in the # gdb executable. diff --git a/gdb/config/i386/linux64.mt b/gdb/config/i386/linux64.mt new file mode 100644 index 00000000000..f642e317a55 --- /dev/null +++ b/gdb/config/i386/linux64.mt @@ -0,0 +1,5 @@ +# Target: GNU/Linux x86-64 +TDEPFILES= amd64-tdep.o amd64-linux-tdep.o \ + i386-tdep.o i387-tdep.o i386-linux-tdep.o glibc-tdep.o \ + solib.o solib-svr4.o solib-legacy.o corelow.o +TM_FILE=tm-linux64.h diff --git a/gdb/config/i386/nbsd64.mt b/gdb/config/i386/nbsd64.mt index 9f2a1eb9cb6..3c982116a4c 100644 --- a/gdb/config/i386/nbsd64.mt +++ b/gdb/config/i386/nbsd64.mt @@ -1,4 +1,4 @@ # Target: NetBSD/amd64 -TDEPFILES= x86-64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o nbsd-tdep.o \ +TDEPFILES= amd64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o nbsd-tdep.o \ corelow.o solib.o solib-svr4.o TM_FILE= tm-nbsd.h diff --git a/gdb/config/i386/nm-x86-64linux.h b/gdb/config/i386/nm-linux64.h similarity index 96% rename from gdb/config/i386/nm-x86-64linux.h rename to gdb/config/i386/nm-linux64.h index 28194e905e0..1764758f3b9 100644 --- a/gdb/config/i386/nm-x86-64linux.h +++ b/gdb/config/i386/nm-linux64.h @@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef NM_X86_64_LINUX_H -#define NM_X86_64_LINUX_H +#ifndef NM_LINUX64_H +#define NM_LINUX64_H /* GNU/Linux supports the i386 hardware debugging registers. */ #define I386_USE_GENERIC_WATCHPOINTS @@ -66,4 +66,4 @@ extern unsigned long amd64_linux_dr_get_status (void); `x86-86-linux-nat.c' instead, which calls both. */ #define LINUX_CHILD_POST_STARTUP_INFERIOR -#endif /* NM_X86_64_LINUX_H */ +#endif /* nm-linux64.h */ diff --git a/gdb/config/i386/obsd64.mt b/gdb/config/i386/obsd64.mt index 0e6a38da07c..16be0798e7f 100644 --- a/gdb/config/i386/obsd64.mt +++ b/gdb/config/i386/obsd64.mt @@ -1,5 +1,5 @@ # Target: OpenBSD/amd64 -TDEPFILES= x86-64-tdep.o amd64obsd-tdep.o \ +TDEPFILES= amd64-tdep.o amd64obsd-tdep.o \ i386-tdep.o i387-tdep.o i386bsd-tdep.o \ corelow.o solib.o solib-svr4.o TM_FILE= tm-nbsd.h diff --git a/gdb/config/i386/tm-x86-64linux.h b/gdb/config/i386/tm-linux64.h similarity index 94% rename from gdb/config/i386/tm-x86-64linux.h rename to gdb/config/i386/tm-linux64.h index cc61d65ee97..c3ff3521ea8 100644 --- a/gdb/config/i386/tm-x86-64linux.h +++ b/gdb/config/i386/tm-linux64.h @@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef TM_X86_64LINUX_H -#define TM_X86_64LINUX_H +#ifndef TM_LINUX64_H +#define TM_LINUX64_H /* We define SVR4_SHARED_LIBS unconditionally, on the assumption that link.h is available on all linux platforms. For I386 and SH3/4, we @@ -33,4 +33,4 @@ #define SVR4_SHARED_LIBS #include "solib.h" /* Support for shared libraries. */ -#endif /* tm-x86-64linux.h */ +#endif /* tm-linux64.h */ diff --git a/gdb/config/i386/x86-64linux.mt b/gdb/config/i386/x86-64linux.mt deleted file mode 100644 index 8bc4adbad4d..00000000000 --- a/gdb/config/i386/x86-64linux.mt +++ /dev/null @@ -1,6 +0,0 @@ -# Target: AMD x86-64 running GNU/Linux -TDEPFILES= x86-64-tdep.o x86-64-linux-tdep.o \ - i386-tdep.o i387-tdep.o i386-linux-tdep.o glibc-tdep.o \ - solib.o solib-svr4.o solib-legacy.o corelow.o - -TM_FILE=tm-x86-64linux.h diff --git a/gdb/configure.host b/gdb/configure.host index 5dc20da4db4..d652e1f1c2f 100644 --- a/gdb/configure.host +++ b/gdb/configure.host @@ -144,7 +144,7 @@ vax-*-bsd*) gdb_host=vaxbsd ;; vax-*-ultrix2*) gdb_host=vaxult2 ;; vax-*-ultrix*) gdb_host=vaxult ;; -x86_64-*-linux*) gdb_host=x86-64linux ;; +x86_64-*-linux*) gdb_host=linux64 ;; x86_64-*-freebsd*) gdb_host=fbsd64 ;; x86_64-*-netbsd*) gdb_host=nbsd64 ;; x86_64-*-openbsd*) gdb_host=obsd64 ;; diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 102701370ca..c13bb71d4bf 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -211,7 +211,7 @@ v850*-*-*) gdb_target=v850 esac ;; -x86_64-*-linux*) gdb_target=x86-64linux +x86_64-*-linux*) gdb_target=linux64 build_gdbserver=yes ;; x86_64-*-netbsd*) gdb_target=nbsd64 ;; -- 2.30.2