From 86f6f8e7fd201cfa655f25e6066220f14602e19f Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 22 Feb 2004 16:48:24 +0000 Subject: [PATCH] Remove old 386BSD support. * configure.host: Remove i[34567]86-*-bsd*. * configure.tgt: Remove i[34567]86-*-bsd*. * i386b-nat.c: Removed. * Makefile.in (ALLDEPFILES): Remove i386b-nat.c. * config/i386/i386bsd.mh: Removed. * config/i386/i386bsd.mt: Removed. * config/i386/nm-i386bsd.h: Removed. * config/i386/tm-i386bsd.h: Removed. * config/i386/xm-i386bsd.h: Removed. --- gdb/ChangeLog | 11 ++++++ gdb/Makefile.in | 13 +++---- gdb/config/i386/i386bsd.mh | 6 --- gdb/config/i386/i386bsd.mt | 3 -- gdb/config/i386/nm-i386bsd.h | 38 ------------------- gdb/config/i386/tm-i386bsd.h | 40 -------------------- gdb/config/i386/xm-i386bsd.h | 22 ----------- gdb/configure.host | 1 - gdb/configure.tgt | 1 - gdb/i386b-nat.c | 72 ------------------------------------ 10 files changed, 17 insertions(+), 190 deletions(-) delete mode 100644 gdb/config/i386/i386bsd.mh delete mode 100644 gdb/config/i386/i386bsd.mt delete mode 100644 gdb/config/i386/nm-i386bsd.h delete mode 100644 gdb/config/i386/tm-i386bsd.h delete mode 100644 gdb/config/i386/xm-i386bsd.h delete mode 100644 gdb/i386b-nat.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7a372b30ff..e3aead891b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,16 @@ 2004-02-22 Mark Kettenis + Remove old 386BSD support. + * configure.host: Remove i[34567]86-*-bsd*. + * configure.tgt: Remove i[34567]86-*-bsd*. + * i386b-nat.c: Removed. + * Makefile.in (ALLDEPFILES): Remove i386b-nat.c. + * config/i386/i386bsd.mh: Removed. + * config/i386/i386bsd.mt: Removed. + * config/i386/nm-i386bsd.h: Removed. + * config/i386/tm-i386bsd.h: Removed. + * config/i386/xm-i386bsd.h: Removed. + * x86-64-tdep.h (amd64obsd_r_reg_offset): New extern declaration. * amd64fbsd-tdep.c: Include "solib-svr4.h". diff --git a/gdb/Makefile.in b/gdb/Makefile.in index b1e4e4c4a1..5665885d63 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1319,7 +1319,7 @@ ALLDEPFILES = \ go32-nat.c h8300-tdep.c \ hppa-tdep.c hppa-hpux-tdep.c \ hppah-nat.c hpread.c \ - i386-tdep.c i386b-nat.c i386v-nat.c i386-linux-nat.c \ + i386-tdep.c i386v-nat.c i386-linux-nat.c \ i386v4-nat.c i386ly-tdep.c i386-cygwin-tdep.c \ i386bsd-nat.c i386bsd-tdep.c i386fbsd-nat.c i386fbsd-tdep.c \ i387-tdep.c \ @@ -1524,19 +1524,19 @@ amd64fbsd-nat.o: amd64fbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ $(gdb_assert_h) $(gregset_h) $(x86_64_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) + $(x86_64_tdep_h) $(solib_svr4_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) \ $(amd64_nat_h) amd64nbsd-tdep.o: amd64nbsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \ - $(gdbcore_h) $(osabi_h) $(gdb_assert_h) $(nbsd_tdep_h) \ - $(x86_64_tdep_h) + $(gdbcore_h) $(osabi_h) $(gdb_assert_h) $(x86_64_tdep_h) \ + $(nbsd_tdep_h) $(solib_svr4_h) amd64obsd-nat.o: amd64nbsd-nat.c $(defs_h) $(gdb_assert_h) $(x86_64_tdep_h) \ $(amd64_nat_h) amd64obsd-tdep.o: amd64nbsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \ $(gdbcore_h) $(osabi_h) $(regset_h) $(target_h) $(gdb_assert_h) \ - $(gdb_string_h) $(x86_64_tdep_h) $(i387_tdep_h) + $(gdb_string_h) $(x86_64_tdep_h) $(i387_tdep_h) $(solib_svr4_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) \ @@ -1809,7 +1809,6 @@ hpread.o: hpread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(hp_symtab_h) \ $(somsolib_h) $(gdb_assert_h) $(gdb_string_h) hpux-thread.o: hpux-thread.c $(defs_h) $(gdbthread_h) $(target_h) \ $(inferior_h) $(regcache_h) $(gdb_stat_h) $(gdbcore_h) -i386b-nat.o: i386b-nat.c $(defs_h) i386bsd-nat.o: i386bsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ $(gdb_assert_h) $(gregset_h) $(i386_tdep_h) $(i387_tdep_h) i386bsd-tdep.o: i386bsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \ @@ -1819,7 +1818,7 @@ i386-cygwin-tdep.o: i386-cygwin-tdep.c $(defs_h) $(osabi_h) $(gdb_string_h) \ i386fbsd-nat.o: i386fbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ $(i386_tdep_h) i386fbsd-tdep.o: i386fbsd-tdep.c $(defs_h) $(arch_utils_h) $(osabi_h) \ - $(i386_tdep_h) $(i387_tdep_h) + $(i386_tdep_h) $(i387_tdep_h) $(solib_svr4_h) i386gnu-nat.o: i386gnu-nat.c $(defs_h) $(inferior_h) $(floatformat_h) \ $(regcache_h) $(gdb_assert_h) $(i386_tdep_h) $(gnu_nat_h) \ $(i387_tdep_h) $(gregset_h) diff --git a/gdb/config/i386/i386bsd.mh b/gdb/config/i386/i386bsd.mh deleted file mode 100644 index 01457d479b..0000000000 --- a/gdb/config/i386/i386bsd.mh +++ /dev/null @@ -1,6 +0,0 @@ -# Host: Intel 386 running 386BSD - -XM_FILE= xm-i386bsd.h - -NAT_FILE= nm-i386bsd.h -NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o core-aout.o i386b-nat.o diff --git a/gdb/config/i386/i386bsd.mt b/gdb/config/i386/i386bsd.mt deleted file mode 100644 index ef61731111..0000000000 --- a/gdb/config/i386/i386bsd.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: Intel 386 running BSD -TM_FILE= tm-i386bsd.h -TDEPFILES= i386-tdep.o diff --git a/gdb/config/i386/nm-i386bsd.h b/gdb/config/i386/nm-i386bsd.h deleted file mode 100644 index 628c648bf7..0000000000 --- a/gdb/config/i386/nm-i386bsd.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Native-dependent definitions for Intel 386 running BSD Unix, for GDB. - Copyright 1986, 1987, 1989, 1992, 1993, 2000 - Free Software Foundation, Inc. - - 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_I386BSD_H -#define NM_I386BSD_H - -/* This is the amount to subtract from u.u_ar0 - to get the offset in the core file of the register values. */ - -#include -#define KERNEL_U_ADDR USRSTACK - -#define REGISTER_U_ADDR(addr, blockend, regno) \ - (addr) = i386_register_u_addr ((blockend),(regno)); - -extern int i386_register_u_addr (int, int); - -#define PTRACE_ARG3_TYPE char* - -#endif /* NM_I386BSD_H */ diff --git a/gdb/config/i386/tm-i386bsd.h b/gdb/config/i386/tm-i386bsd.h deleted file mode 100644 index fef009ec01..0000000000 --- a/gdb/config/i386/tm-i386bsd.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Macro definitions for i386 running under BSD Unix. - Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996 - Free Software Foundation, Inc. - - 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_I386BSD_H -#define TM_I386BSD_H 1 - -#include "i386/tm-i386.h" - -/* 386BSD cannot handle the segment registers. */ -/* BSDI can't handle them either. */ - -#undef NUM_REGS -#define NUM_REGS 10 - -/* On 386 bsd, sigtramp is above the user stack and immediately below - the user area. Using constants here allows for cross debugging. - These are tested for BSDI but should work on 386BSD. */ - -#define SIGTRAMP_START(pc) 0xfdbfdfc0 -#define SIGTRAMP_END(pc) 0xfdbfe000 - -#endif /* ifndef TM_I386BSD_H */ diff --git a/gdb/config/i386/xm-i386bsd.h b/gdb/config/i386/xm-i386bsd.h deleted file mode 100644 index ca0ffb2ab8..0000000000 --- a/gdb/config/i386/xm-i386bsd.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Host-dependent definitions for Intel 386 running BSD Unix, for GDB. - Copyright 1986, 1987, 1989, 1992, 1995, 1996 - Free Software Foundation, Inc. - - 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. */ - -#include /* for INT_MIN */ diff --git a/gdb/configure.host b/gdb/configure.host index d637568263..5dc20da4db 100644 --- a/gdb/configure.host +++ b/gdb/configure.host @@ -50,7 +50,6 @@ hppa*-*-hpux11*) gdb_host=hpux11 ;; hppa*-*-hpux*) gdb_host=hppahpux ;; i[34567]86-ncr-*) gdb_host=ncr3000 ;; -i[34567]86-*-bsd*) gdb_host=i386bsd ;; i[34567]86-*-dgux*) gdb_host=i386v4 ;; i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu) gdb_host=fbsd ;; diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 76eb8ec1ac..102701370c 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -77,7 +77,6 @@ hppa*-*-hiux*) gdb_target=hppahpux ;; hppa*-*-*) gdb_target=hppa ;; i[34567]86-ncr-*) gdb_target=ncr3000 ;; -i[34567]86-*-bsd*) gdb_target=i386bsd ;; i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu) gdb_target=nbsd ;; i[34567]86-*-openbsd*) gdb_target=obsd ;; diff --git a/gdb/i386b-nat.c b/gdb/i386b-nat.c deleted file mode 100644 index 7c2a7d8deb..0000000000 --- a/gdb/i386b-nat.c +++ /dev/null @@ -1,72 +0,0 @@ -/* Native-dependent code for BSD Unix running on i386's, for GDB. - Copyright 1988, 1989, 1991, 1992, 1994, 1995, 1996, 1998, 1999, 2000, - 2001 Free Software Foundation, Inc. - - 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. */ - -#include "defs.h" - -#include - -/* This table must line up with REGISTER_NAME in "i386-tdep.c". */ -/* symbols like 'tEAX' come from */ -static int tregmap[] = -{ - tEAX, tECX, tEDX, tEBX, - tESP, tEBP, tESI, tEDI, - tEIP, tEFLAGS, tCS, tSS -}; - -#ifdef sEAX -static int sregmap[] = -{ - sEAX, sECX, sEDX, sEBX, - sESP, sEBP, sESI, sEDI, - sEIP, sEFLAGS, sCS, sSS -}; -#else /* No sEAX */ - -/* FreeBSD has decided to collapse the s* and t* symbols. So if the s* - ones aren't around, use the t* ones for sregmap too. */ - -static int sregmap[] = -{ - tEAX, tECX, tEDX, tEBX, - tESP, tEBP, tESI, tEDI, - tEIP, tEFLAGS, tCS, tSS -}; -#endif /* No sEAX */ - -/* blockend is the value of u.u_ar0, and points to the - place where ES is stored. */ - -int -i386_register_u_addr (int blockend, int regnum) -{ - /* The following condition is a kludge to get at the proper register map - depending upon the state of pcb_flag. - The proper condition would be - if (u.u_pcb.pcb_flag & FM_TRAP) - but that would require a ptrace call here and wouldn't work - for corefiles. */ - - if (blockend < 0x1fcc) - return (blockend + 4 * tregmap[regnum]); - else - return (blockend + 4 * sregmap[regnum]); -}