diff options
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/config/m68k/st2000.mt | 1 | ||||
| -rw-r--r-- | gdb/config/m68k/tm-cisco.h | 9 | ||||
| -rw-r--r-- | gdb/config/m68k/tm-m68k.h | 22 | ||||
| -rw-r--r-- | gdb/config/m68k/tm-monitor.h | 2 | ||||
| -rw-r--r-- | gdb/config/m68k/tm-os68k.h | 2 | ||||
| -rw-r--r-- | gdb/config/m68k/tm-vx68.h | 8 | ||||
| -rw-r--r-- | gdb/m68k-tdep.c | 2 |
8 files changed, 11 insertions, 45 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4381370..b631f54 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2004-09-02 Andrew Cagney <cagney@gnu.org> + * config/m68k/tm-vx68.h: Do not include "tm-m68k.h". + * config/m68k/tm-os68k.h: Ditto. + * config/m68k/tm-monitor.h: Ditto. + * config/m68k/tm-cisco.h: Ditto. + * config/m68k/st2000.mt (TM_FILE): Delete. + * config/m68k/tm-vx68.h (GET_LONGJMP_TARGET): Delete. + * config/m68k/tm-cisco.h (GET_LONGJMP_TARGET): Delete. + * config/m68k/tm-m68k.h (m68k_get_longjmp_target): Delete file. + * m68k-tdep.c (m68k_get_longjmp_target): Make static. + * config/m68k/tm-st2000.h: Delete. * config/m68k/st2000.mt (TM_FILE): Set to tm-m68k.h. * config/sparc/fbsd.mt (TM_FILE): Delete. diff --git a/gdb/config/m68k/st2000.mt b/gdb/config/m68k/st2000.mt index e71d8b4..8c503a4 100644 --- a/gdb/config/m68k/st2000.mt +++ b/gdb/config/m68k/st2000.mt @@ -1,3 +1,2 @@ # Target: Tandem ST-2000 phone switch TDEPFILES= m68k-tdep.o remote-st.o -TM_FILE= tm-m68k.h diff --git a/gdb/config/m68k/tm-cisco.h b/gdb/config/m68k/tm-cisco.h index 51e2cdc..0b60444 100644 --- a/gdb/config/m68k/tm-cisco.h +++ b/gdb/config/m68k/tm-cisco.h @@ -22,8 +22,6 @@ #define DEFAULT_PROMPT "(cisco-68k-gdb) " /* Default prompt */ -#include "m68k/tm-m68k.h" - /* Offsets (in target ints) into jmp_buf. Defined in /csc/sys/sun/asm.S. */ #define JB_ELEMENT_SIZE 4 @@ -42,13 +40,6 @@ #define JB_A6 11 #define JB_SP 12 -/* 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) m68k_get_longjmp_target(ADDR) - /* BFD handles finding the registers in the core file, so they are at the start of the BFD .reg section. */ #define REGISTER_U_ADDR(addr,blockend,regno) (addr = DEPRECATED_REGISTER_BYTE (regno)) diff --git a/gdb/config/m68k/tm-m68k.h b/gdb/config/m68k/tm-m68k.h deleted file mode 100644 index 17b3198..0000000 --- a/gdb/config/m68k/tm-m68k.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Parameters for execution on a 68000 series machine. - Copyright 1986, 1987, 1989, 1990, 1992, 1993, 1994, 1995, 1996, 1998, - 1999, 2000, 2003 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. */ - -extern int m68k_get_longjmp_target (CORE_ADDR *); diff --git a/gdb/config/m68k/tm-monitor.h b/gdb/config/m68k/tm-monitor.h index 1b00a8f..02d550d 100644 --- a/gdb/config/m68k/tm-monitor.h +++ b/gdb/config/m68k/tm-monitor.h @@ -36,6 +36,4 @@ /*#define NUM_REGS 18 */ -#include "m68k/tm-m68k.h" - /* FIXME, should do GET_LONGJMP_TARGET for newlib. */ diff --git a/gdb/config/m68k/tm-os68k.h b/gdb/config/m68k/tm-os68k.h index 815efff..8787624 100644 --- a/gdb/config/m68k/tm-os68k.h +++ b/gdb/config/m68k/tm-os68k.h @@ -23,8 +23,6 @@ #define DEFAULT_PROMPT "(os68k) " -#include "m68k/tm-m68k.h" - /* We have more complex, useful breakpoints on the target. */ #undef DECR_PC_AFTER_BREAK #define DECR_PC_AFTER_BREAK 0 diff --git a/gdb/config/m68k/tm-vx68.h b/gdb/config/m68k/tm-vx68.h index ab00246..93d4954 100644 --- a/gdb/config/m68k/tm-vx68.h +++ b/gdb/config/m68k/tm-vx68.h @@ -30,7 +30,6 @@ /* We have more complex, useful breakpoints on the target. */ #define DECR_PC_AFTER_BREAK 0 -#include "m68k/tm-m68k.h" #include "config/tm-vxworks.h" /* Takes the current frame-struct pointer and returns the chain-pointer @@ -64,10 +63,3 @@ #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) m68k_get_longjmp_target(ADDR) diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index 8760797..1ada90a 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -1047,7 +1047,7 @@ fill_fpregset (fpregset_t *fpregsetp, int regno) we extract the pc (JB_PC) that we will land at. The pc is copied into PC. This routine returns true on success. */ -int +static int m68k_get_longjmp_target (CORE_ADDR *pc) { char *buf; |