From 84a05e5253714e3943cd86a48e2f57d05a984f1a Mon Sep 17 00:00:00 2001 From: John Gilmore Date: Sun, 14 Mar 1993 10:49:01 +0000 Subject: [PATCH] Remove a few remaining underscore/no-underscore remnants from config files. * config/{m68k-un.mt, sparc-un.mt}: Remove. * config/m68k-noun.mt: Rename to m68k-fp.mt. * config/sparc-noun.mt: Rename to sparc-em.mt. * tm-68k-noun.h, tm-spc-noun.h: Remove. * tm-68k-un.h: Rename to tm-68k-fp.h. * tm-spc-un.h: Rename to tm-spc-em.h. * tm-sun4sol2.h: Cleanup. * configure.in (m68k-*, sparc-* targets): Corresponding changes. --- gdb/ChangeLog | 19 ++++++++++-- gdb/config/m68k-fp.mt | 3 ++ gdb/config/m68k-noun.mt | 4 --- gdb/config/m68k-un.mt | 4 --- gdb/config/sparc-em.mt | 3 ++ gdb/config/sparc-noun.mt | 4 --- gdb/config/sparc-un.mt | 4 --- gdb/configure.in | 14 ++++----- gdb/tm-68k-fp.h | 66 +++++++++++++++++++++++++++++++++++++++ gdb/tm-68k-noun.h | 67 ---------------------------------------- gdb/tm-68k-un.h | 21 ------------- gdb/tm-spc-em.h | 46 +++++++++++++++++++++++++++ gdb/tm-spc-noun.h | 47 ---------------------------- gdb/tm-spc-un.h | 21 ------------- gdb/tm-sun4sol2.h | 4 +-- 15 files changed, 143 insertions(+), 184 deletions(-) create mode 100644 gdb/config/m68k-fp.mt delete mode 100644 gdb/config/m68k-noun.mt delete mode 100644 gdb/config/m68k-un.mt create mode 100644 gdb/config/sparc-em.mt delete mode 100644 gdb/config/sparc-noun.mt delete mode 100644 gdb/config/sparc-un.mt create mode 100644 gdb/tm-68k-fp.h create mode 100644 gdb/tm-spc-em.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c61200b26d..f112d00ebb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +Sun Mar 14 02:30:08 1993 John Gilmore (gnu@cygnus.com) + + Remove a few remaining underscore/no-underscore remnants from + config files. + + * config/{m68k-un.mt, sparc-un.mt}: Remove. + * config/m68k-noun.mt: Rename to m68k-fp.mt. + * config/sparc-noun.mt: Rename to sparc-em.mt. + * tm-68k-noun.h, tm-spc-noun.h: Remove. + * tm-68k-un.h: Rename to tm-68k-fp.h. + * tm-spc-un.h: Rename to tm-spc-em.h. + * tm-sun4sol2.h: Cleanup. + * configure.in (m68k-*, sparc-* targets): Corresponding changes. + Sat Mar 13 14:58:22 1993 John Gilmore (gnu@cygnus.com) * symmisc.c (std_in, std_out, std_err): Move initializations @@ -1530,8 +1544,7 @@ Thu Dec 17 00:44:57 1992 John Gilmore (gnu@cygnus.com) * solib.c: Replace NAMES_HAVE_UNDERSCORE. * stabsread.h: Remove NAMES_HAVE_UNDERSCORE and HASH_OFFSET. * symfile.c (syms_from_objfile): Insert debugging check to test - NAMES_HAVE_UNDERSCORE setting against the BFD support. FIXME, - remove this (and all tm-*.h NAMES_HAVE_UNDERSCORE) soon. + NAMES_HAVE_UNDERSCORE setting against the BFD support. * doc/gdbint.texinfo (Host Conditionals): Remove NAMES_HAVE_UNDERSCORE, SOME_NAMES_HAVE_DOT, document @@ -3575,7 +3588,7 @@ Wed Sep 2 00:10:43 1992 John Gilmore (gnu@cygnus.com) * tm-68k-un.h, tm-68k-noun.h, tm-spc-un.h, tm-spc-noun.h: New target definitions for embedded with and without underlines on - identifiers. FIXME -- this ought to be known by BFD instead. + identifiers. * tm-sparc.h, tm-sun2.h, tm-sun3.h: Delete NAMES_HAVE_UNDERSCORE: not a parameter of the CPU, but of the development environment. diff --git a/gdb/config/m68k-fp.mt b/gdb/config/m68k-fp.mt new file mode 100644 index 0000000000..139595b723 --- /dev/null +++ b/gdb/config/m68k-fp.mt @@ -0,0 +1,3 @@ +# Target: Motorola 68xxx with floating point +TDEPFILES= exec.o m68k-pinsn.o m68k-tdep.o +TM_FILE= tm-68k-fp.h diff --git a/gdb/config/m68k-noun.mt b/gdb/config/m68k-noun.mt deleted file mode 100644 index 201c576708..0000000000 --- a/gdb/config/m68k-noun.mt +++ /dev/null @@ -1,4 +0,0 @@ -# Target: Motorola 68xxx, in a file format that uses no leading underlines. -# (such as COFF or ELF) -TDEPFILES= exec.o m68k-pinsn.o m68k-tdep.o -TM_FILE= tm-68k-noun.h diff --git a/gdb/config/m68k-un.mt b/gdb/config/m68k-un.mt deleted file mode 100644 index 95ded7a165..0000000000 --- a/gdb/config/m68k-un.mt +++ /dev/null @@ -1,4 +0,0 @@ -# Target: Motorola 68xxx, in a file format that uses leading underlines. -# (such as a.out) -TDEPFILES= exec.o m68k-pinsn.o m68k-tdep.o -TM_FILE= tm-68k-un.h diff --git a/gdb/config/sparc-em.mt b/gdb/config/sparc-em.mt new file mode 100644 index 0000000000..97b2476aca --- /dev/null +++ b/gdb/config/sparc-em.mt @@ -0,0 +1,3 @@ +# Target: SPARC embedded +TDEPFILES= exec.o sparc-tdep.o sparc-pinsn.o +TM_FILE= tm-spc-em.h diff --git a/gdb/config/sparc-noun.mt b/gdb/config/sparc-noun.mt deleted file mode 100644 index 7e290b45c2..0000000000 --- a/gdb/config/sparc-noun.mt +++ /dev/null @@ -1,4 +0,0 @@ -# Target: SPARC using an object file format with no leading underbars -# (like elf) -TDEPFILES= exec.o sparc-tdep.o sparc-pinsn.o -TM_FILE= tm-spc-noun.h diff --git a/gdb/config/sparc-un.mt b/gdb/config/sparc-un.mt deleted file mode 100644 index 8bf3d93c17..0000000000 --- a/gdb/config/sparc-un.mt +++ /dev/null @@ -1,4 +0,0 @@ -# Target: SPARC using an object file format with leading underbars -# (like a.out) -TDEPFILES= exec.o sparc-tdep.o sparc-pinsn.o -TM_FILE= tm-spc-un.h diff --git a/gdb/configure.in b/gdb/configure.in index 16619fbc48..0ced7b231f 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -159,9 +159,9 @@ m68*-netx-*) gdb_target=vxworks68 ;; m68*-sony-*) gdb_target=news ;; m68*-tandem-*) gdb_target=st2000 ;; -m68*-*-aout) gdb_target=m68k-un ;; -m68*-*-coff) gdb_target=m68k-noun ;; -m68*-*-elf) gdb_target=m68k-noun ;; +m68*-*-aout) gdb_target=m68k-fp ;; +m68*-*-coff) gdb_target=m68k-fp ;; +m68*-*-elf) gdb_target=m68k-fp ;; m68*-*-os68k) gdb_target=os68k ;; m68*-*-sunos3*) gdb_target=sun3os3 ;; m68*-*-sunos4*) gdb_target=sun3os4 ;; @@ -190,12 +190,12 @@ pyramid-*-*) gdb_target=pyramid ;; rs6000-*-*) gdb_target=rs6000 ;; -sparc-*-aout) gdb_target=sparc-un ;; -sparc-*-coff) gdb_target=sparc-noun ;; -sparc-*-elf) gdb_target=sparc-noun ;; +sparc-*-aout) gdb_target=sparc-em ;; +sparc-*-coff) gdb_target=sparc-em ;; +sparc-*-elf) gdb_target=sparc-em ;; sparc-*-solaris2*) gdb_target=sun4sol2 ;; sparc-*-sunos4*) gdb_target=sun4os4 ;; -sparc-*-vxworks*) gdb_target=sparc-un ;; +sparc-*-vxworks*) gdb_target=sparc-em ;; sparc-*-*) gdb_target=sun4os4 ;; sparclite*-*-*) gdb_target=sun4os4 ;; diff --git a/gdb/tm-68k-fp.h b/gdb/tm-68k-fp.h new file mode 100644 index 0000000000..19d0120800 --- /dev/null +++ b/gdb/tm-68k-fp.h @@ -0,0 +1,66 @@ +/* Target machine parameters for embedded m68k with 6888x float, for GDB. + Copyright 1986, 1987, 1989, 1992, 1993 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#define HAVE_68881 + +#include "tm-68k.h" + +/* Longjmp info comes from the Sun-3 machine description. Might as well + guess... */ + +/* Offsets (in target ints) into jmp_buf. Not defined by Sun, but at least + documented in a comment in ! */ + +#define JB_ELEMENT_SIZE 4 + +#define JB_ONSSTACK 0 +#define JB_SIGMASK 1 +#define JB_SP 2 +#define JB_PC 3 +#define JB_PSL 4 +#define JB_D2 5 +#define JB_D3 6 +#define JB_D4 7 +#define JB_D5 8 +#define JB_D6 9 +#define JB_D7 10 +#define JB_A2 11 +#define JB_A3 12 +#define JB_A4 13 +#define JB_A5 14 +#define JB_A6 15 + +/* Figure out where the longjmp will land. Slurp the args out of the stack. + We expect the first arg to be a pointer to the jmp_buf structure from which + we extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. + This routine returns true on success */ + +#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) + +/* Where is the PC after a call? */ + +#ifdef __STDC__ +struct frame_info; +#endif + +extern CORE_ADDR m68k_saved_pc_after_call PARAMS ((struct frame_info *)); + +#undef SAVED_PC_AFTER_CALL +#define SAVED_PC_AFTER_CALL(frame) \ + m68k_saved_pc_after_call(frame) diff --git a/gdb/tm-68k-noun.h b/gdb/tm-68k-noun.h index aaaa5e9756..e69de29bb2 100644 --- a/gdb/tm-68k-noun.h +++ b/gdb/tm-68k-noun.h @@ -1,67 +0,0 @@ -/* Target machine parameters for an embedded m68k, for GDB, the GNU debugger. - This is for object file formats that don't have underlines on symbols. - Copyright 1986, 1987, 1989, 1992 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#define HAVE_68881 - -#include "tm-68k.h" - -/* Longjmp info comes from the Sun-3 machine description. Might as well - guess... */ - -/* Offsets (in target ints) into jmp_buf. Not defined by Sun, but at least - documented in a comment in ! */ - -#define JB_ELEMENT_SIZE 4 - -#define JB_ONSSTACK 0 -#define JB_SIGMASK 1 -#define JB_SP 2 -#define JB_PC 3 -#define JB_PSL 4 -#define JB_D2 5 -#define JB_D3 6 -#define JB_D4 7 -#define JB_D5 8 -#define JB_D6 9 -#define JB_D7 10 -#define JB_A2 11 -#define JB_A3 12 -#define JB_A4 13 -#define JB_A5 14 -#define JB_A6 15 - -/* Figure out where the longjmp will land. Slurp the args out of the stack. - We expect the first arg to be a pointer to the jmp_buf structure from which - we extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. - This routine returns true on success */ - -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) - -/* Where is the PC after a call? */ - -#ifdef __STDC__ -struct frame_info; -#endif - -extern CORE_ADDR m68k_saved_pc_after_call PARAMS ((struct frame_info *)); - -#undef SAVED_PC_AFTER_CALL -#define SAVED_PC_AFTER_CALL(frame) \ - m68k_saved_pc_after_call(frame) diff --git a/gdb/tm-68k-un.h b/gdb/tm-68k-un.h index 51054ffece..e69de29bb2 100644 --- a/gdb/tm-68k-un.h +++ b/gdb/tm-68k-un.h @@ -1,21 +0,0 @@ -/* Target machine parameters for an embedded m68k, for GDB, the GNU debugger. - This is for object file formats that do have underlines on symbols. - Copyright 1992, 1993 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#include "tm-68k-noun.h" diff --git a/gdb/tm-spc-em.h b/gdb/tm-spc-em.h new file mode 100644 index 0000000000..4b888e0380 --- /dev/null +++ b/gdb/tm-spc-em.h @@ -0,0 +1,46 @@ +/* Target machine definitions for GDB for an embedded SPARC. + Copyright 1989, 1992, 1993 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#include "tm-sparc.h" + +/* Offsets into jmp_buf. Not defined by Sun, but at least documented in a + comment in ! */ + +#define JB_ELEMENT_SIZE 4 /* Size of each element in jmp_buf */ + +#define JB_ONSSTACK 0 +#define JB_SIGMASK 1 +#define JB_SP 2 +#define JB_PC 3 +#define JB_NPC 4 +#define JB_PSR 5 +#define JB_G1 6 +#define JB_O0 7 +#define JB_WBCNT 8 + +/* Figure out where the longjmp will land. We expect that we have just entered + longjmp and haven't yet setup the stack frame, so the args are still in the + output regs. %o0 (O0_REGNUM) points at the jmp_buf structure from which we + extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. + This routine returns true on success */ + +extern int +get_longjmp_target PARAMS ((CORE_ADDR *)); + +#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) diff --git a/gdb/tm-spc-noun.h b/gdb/tm-spc-noun.h index ab5a6a66a4..e69de29bb2 100644 --- a/gdb/tm-spc-noun.h +++ b/gdb/tm-spc-noun.h @@ -1,47 +0,0 @@ -/* Target machine definitions for GDB for an embedded SPARC, that uses - a file format where symbols have no leading underscore. - Copyright 1989, 1992 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#include "tm-sparc.h" - -/* Offsets into jmp_buf. Not defined by Sun, but at least documented in a - comment in ! */ - -#define JB_ELEMENT_SIZE 4 /* Size of each element in jmp_buf */ - -#define JB_ONSSTACK 0 -#define JB_SIGMASK 1 -#define JB_SP 2 -#define JB_PC 3 -#define JB_NPC 4 -#define JB_PSR 5 -#define JB_G1 6 -#define JB_O0 7 -#define JB_WBCNT 8 - -/* Figure out where the longjmp will land. We expect that we have just entered - longjmp and haven't yet setup the stack frame, so the args are still in the - output regs. %o0 (O0_REGNUM) points at the jmp_buf structure from which we - extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. - This routine returns true on success */ - -extern int -get_longjmp_target PARAMS ((CORE_ADDR *)); - -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) diff --git a/gdb/tm-spc-un.h b/gdb/tm-spc-un.h index 128399b472..e69de29bb2 100644 --- a/gdb/tm-spc-un.h +++ b/gdb/tm-spc-un.h @@ -1,21 +0,0 @@ -/* Target machine definitions for GDB for an embedded SPARC, that - uses a file format where symbols have a leading underscore. - Copyright 1989, 1992, 1993 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#include "tm-spc-noun.h" diff --git a/gdb/tm-sun4sol2.h b/gdb/tm-sun4sol2.h index dbf9ffbb38..5d6da56408 100644 --- a/gdb/tm-sun4sol2.h +++ b/gdb/tm-sun4sol2.h @@ -1,5 +1,5 @@ /* Macro definitions for GDB for a Sun 4 running Solaris 2 - Copyright 1989, 1992 Free Software Foundation, Inc. + Copyright 1989, 1992, 1993 Free Software Foundation, Inc. This file is part of GDB. @@ -37,7 +37,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define SUN_FIXED_LBRAC_BUG -#if 0 /* Setjmp/longjmp are not as well doc'd in SunOS 5.x yet */ +#if 0 /* FIXME Setjmp/longjmp are not as well doc'd in SunOS 5.x yet */ /* Offsets into jmp_buf. Not defined by Sun, but at least documented in a comment in ! */