From 9c1488cbbce26c9b9bdf5d0f9d515c272a6dc48c Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Wed, 25 Feb 2004 20:45:31 +0000 Subject: * 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/config/i386/fbsd64.mt | 2 +- gdb/config/i386/linux64.mh | 10 ++++++ gdb/config/i386/linux64.mt | 5 +++ gdb/config/i386/nbsd64.mt | 2 +- gdb/config/i386/nm-linux64.h | 69 ++++++++++++++++++++++++++++++++++++++++ gdb/config/i386/nm-x86-64linux.h | 69 ---------------------------------------- gdb/config/i386/obsd64.mt | 2 +- gdb/config/i386/tm-linux64.h | 36 +++++++++++++++++++++ gdb/config/i386/tm-x86-64linux.h | 36 --------------------- gdb/config/i386/x86-64linux.mh | 13 -------- gdb/config/i386/x86-64linux.mt | 6 ---- 11 files changed, 123 insertions(+), 127 deletions(-) create mode 100644 gdb/config/i386/linux64.mh create mode 100644 gdb/config/i386/linux64.mt create mode 100644 gdb/config/i386/nm-linux64.h delete mode 100644 gdb/config/i386/nm-x86-64linux.h create mode 100644 gdb/config/i386/tm-linux64.h delete mode 100644 gdb/config/i386/tm-x86-64linux.h delete mode 100644 gdb/config/i386/x86-64linux.mh delete mode 100644 gdb/config/i386/x86-64linux.mt (limited to 'gdb/config') diff --git a/gdb/config/i386/fbsd64.mt b/gdb/config/i386/fbsd64.mt index 4f8501e..d4cb24b 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/linux64.mh b/gdb/config/i386/linux64.mh new file mode 100644 index 0000000..c02e864 --- /dev/null +++ b/gdb/config/i386/linux64.mh @@ -0,0 +1,10 @@ +# Host: GNU/Linux x86-64 +NATDEPFILES= infptrace.o inftarg.o fork-child.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. +LOADLIBES = -ldl -rdynamic diff --git a/gdb/config/i386/linux64.mt b/gdb/config/i386/linux64.mt new file mode 100644 index 0000000..f642e31 --- /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 9f2a1eb..3c98211 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-linux64.h b/gdb/config/i386/nm-linux64.h new file mode 100644 index 0000000..1764758 --- /dev/null +++ b/gdb/config/i386/nm-linux64.h @@ -0,0 +1,69 @@ +/* Native support for GNU/Linux x86-64. + + Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + + Contributed by Jiri Smid, SuSE Labs. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef NM_LINUX64_H +#define NM_LINUX64_H + +/* GNU/Linux supports the i386 hardware debugging registers. */ +#define I386_USE_GENERIC_WATCHPOINTS + +#include "i386/nm-i386.h" +#include "config/nm-linux.h" + +/* Support for 8-byte wide hardware watchpoints. */ +#define TARGET_HAS_DR_LEN_8 1 + +/* Provide access to the i386 hardware debugging registers. */ + +extern void amd64_linux_dr_set_control (unsigned long control); +#define I386_DR_LOW_SET_CONTROL(control) \ + amd64_linux_dr_set_control (control) + +extern void amd64_linux_dr_set_addr (int regnum, CORE_ADDR addr); +#define I386_DR_LOW_SET_ADDR(regnum, addr) \ + amd64_linux_dr_set_addr (regnum, addr) + +extern void amd64_linux_dr_reset_addr (int regnum); +#define I386_DR_LOW_RESET_ADDR(regnum) \ + amd64_linux_dr_reset_addr (regnum) + +extern unsigned long amd64_linux_dr_get_status (void); +#define I386_DR_LOW_GET_STATUS() \ + amd64_linux_dr_get_status () + + +/* Type of the third argument to the `ptrace' system call. */ +#define PTRACE_ARG3_TYPE long + +/* Type of the fourth argument to the `ptrace' system call. */ +#define PTRACE_XFER_TYPE long + +/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ +#define FETCH_INFERIOR_REGISTERS + +/* `linux-nat.c' and `i386-nat.c' have their own versions of + child_post_startup_inferior. Define this to use the copy in + `x86-86-linux-nat.c' instead, which calls both. */ +#define LINUX_CHILD_POST_STARTUP_INFERIOR + +#endif /* nm-linux64.h */ diff --git a/gdb/config/i386/nm-x86-64linux.h b/gdb/config/i386/nm-x86-64linux.h deleted file mode 100644 index 28194e9..0000000 --- a/gdb/config/i386/nm-x86-64linux.h +++ /dev/null @@ -1,69 +0,0 @@ -/* Native support for GNU/Linux x86-64. - - Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. - - Contributed by Jiri Smid, SuSE Labs. - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef NM_X86_64_LINUX_H -#define NM_X86_64_LINUX_H - -/* GNU/Linux supports the i386 hardware debugging registers. */ -#define I386_USE_GENERIC_WATCHPOINTS - -#include "i386/nm-i386.h" -#include "config/nm-linux.h" - -/* Support for 8-byte wide hardware watchpoints. */ -#define TARGET_HAS_DR_LEN_8 1 - -/* Provide access to the i386 hardware debugging registers. */ - -extern void amd64_linux_dr_set_control (unsigned long control); -#define I386_DR_LOW_SET_CONTROL(control) \ - amd64_linux_dr_set_control (control) - -extern void amd64_linux_dr_set_addr (int regnum, CORE_ADDR addr); -#define I386_DR_LOW_SET_ADDR(regnum, addr) \ - amd64_linux_dr_set_addr (regnum, addr) - -extern void amd64_linux_dr_reset_addr (int regnum); -#define I386_DR_LOW_RESET_ADDR(regnum) \ - amd64_linux_dr_reset_addr (regnum) - -extern unsigned long amd64_linux_dr_get_status (void); -#define I386_DR_LOW_GET_STATUS() \ - amd64_linux_dr_get_status () - - -/* Type of the third argument to the `ptrace' system call. */ -#define PTRACE_ARG3_TYPE long - -/* Type of the fourth argument to the `ptrace' system call. */ -#define PTRACE_XFER_TYPE long - -/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ -#define FETCH_INFERIOR_REGISTERS - -/* `linux-nat.c' and `i386-nat.c' have their own versions of - child_post_startup_inferior. Define this to use the copy in - `x86-86-linux-nat.c' instead, which calls both. */ -#define LINUX_CHILD_POST_STARTUP_INFERIOR - -#endif /* NM_X86_64_LINUX_H */ diff --git a/gdb/config/i386/obsd64.mt b/gdb/config/i386/obsd64.mt index 0e6a38d..16be079 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-linux64.h b/gdb/config/i386/tm-linux64.h new file mode 100644 index 0000000..c3ff352 --- /dev/null +++ b/gdb/config/i386/tm-linux64.h @@ -0,0 +1,36 @@ +/* Target-dependent definitions for GNU/Linux x86-64. + + Copyright 2002, 2003, 2004 Free Software Foundation, Inc. + + Contributed by Michal Ludvig, SuSE Labs. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#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 + hard-code the information rather than use link.h anyway (for the + benefit of cross-debugging). We may move to doing that for other + architectures as well. */ + +#define SVR4_SHARED_LIBS +#include "solib.h" /* Support for shared libraries. */ + +#endif /* tm-linux64.h */ diff --git a/gdb/config/i386/tm-x86-64linux.h b/gdb/config/i386/tm-x86-64linux.h deleted file mode 100644 index cc61d65..0000000 --- a/gdb/config/i386/tm-x86-64linux.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Target-dependent definitions for GNU/Linux x86-64. - - Copyright 2002, 2003, 2004 Free Software Foundation, Inc. - - Contributed by Michal Ludvig, SuSE Labs. - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef TM_X86_64LINUX_H -#define TM_X86_64LINUX_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 - hard-code the information rather than use link.h anyway (for the - benefit of cross-debugging). We may move to doing that for other - architectures as well. */ - -#define SVR4_SHARED_LIBS -#include "solib.h" /* Support for shared libraries. */ - -#endif /* tm-x86-64linux.h */ diff --git a/gdb/config/i386/x86-64linux.mh b/gdb/config/i386/x86-64linux.mh deleted file mode 100644 index ed563cb..0000000 --- a/gdb/config/i386/x86-64linux.mh +++ /dev/null @@ -1,13 +0,0 @@ -# Host: AMD x86-64 running GNU/Linux - -XM_FILE= xm-i386.h - -NAT_FILE= nm-x86-64linux.h -NATDEPFILES= infptrace.o inftarg.o fork-child.o \ - i386-nat.o amd64-nat.o x86-64-linux-nat.o \ - linux-nat.o \ - proc-service.o thread-db.o lin-lwp.o linux-proc.o gcore.o - -# The dynamically loaded libthread_db needs access to symbols in the -# gdb executable. -LOADLIBES = -ldl -rdynamic diff --git a/gdb/config/i386/x86-64linux.mt b/gdb/config/i386/x86-64linux.mt deleted file mode 100644 index 8bc4adb..0000000 --- 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 -- cgit v1.1