From 0b1b50c059c2bcf7315c607a3f34730ce0f3bd8c Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Fri, 20 Jun 2003 13:57:30 +0000 Subject: [PATCH] * config/arm/linux.mt: Remove code protected by GDBSERVER define. * config/arm/nm-linux.h: Likewise. * config/arm/tm-linux.h: Likewise. * config/ia64/nm-linux.h: Likewise. * config/ia64/tm-ia64.h: Likewise. * config/s390/tm-linux.h: Likewise. * config/s390/tm-s390.h: Likewise. * s390-nat.c: Likewise. * s390-tdep.c: Likewise. * config/i386/linux.mt: Don't set GDBSERVER_DEPFILES. * config/ia64/linux.mt: Likewise. * config/m68k/linux.mh: Likewise. * config/mips/linux.mt: Likewise. * config/powerpc/linux.mh: Likewise. * config/sh/linux.mt: Likewise. --- gdb/ChangeLog | 19 ++++++++++++++ gdb/config/arm/linux.mt | 2 -- gdb/config/arm/nm-linux.h | 5 ---- gdb/config/arm/tm-linux.h | 4 --- gdb/config/i386/linux.mt | 2 -- gdb/config/ia64/linux.mt | 2 -- gdb/config/ia64/nm-linux.h | 7 ----- gdb/config/ia64/tm-ia64.h | 51 ------------------------------------- gdb/config/m68k/linux.mh | 2 -- gdb/config/mips/linux.mt | 2 -- gdb/config/powerpc/linux.mh | 2 -- gdb/config/s390/tm-linux.h | 4 +-- gdb/config/s390/tm-s390.h | 37 --------------------------- gdb/config/sh/linux.mt | 2 -- gdb/s390-nat.c | 7 ----- gdb/s390-tdep.c | 3 --- 16 files changed, 20 insertions(+), 131 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cd076e82cfe..1d520472d9a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,22 @@ +2003-06-20 Daniel Jacobowitz + + * config/arm/linux.mt: Remove code protected by GDBSERVER define. + * config/arm/nm-linux.h: Likewise. + * config/arm/tm-linux.h: Likewise. + * config/ia64/nm-linux.h: Likewise. + * config/ia64/tm-ia64.h: Likewise. + * config/s390/tm-linux.h: Likewise. + * config/s390/tm-s390.h: Likewise. + * s390-nat.c: Likewise. + * s390-tdep.c: Likewise. + + * config/i386/linux.mt: Don't set GDBSERVER_DEPFILES. + * config/ia64/linux.mt: Likewise. + * config/m68k/linux.mh: Likewise. + * config/mips/linux.mt: Likewise. + * config/powerpc/linux.mh: Likewise. + * config/sh/linux.mt: Likewise. + 2003-06-19 Kris Warkentin * solib.c (solib_open): Change tests for whether to search diff --git a/gdb/config/arm/linux.mt b/gdb/config/arm/linux.mt index e1996ab0639..c17b2e5ec53 100644 --- a/gdb/config/arm/linux.mt +++ b/gdb/config/arm/linux.mt @@ -1,5 +1,3 @@ # Target: ARM based machine running GNU/Linux TM_FILE= tm-linux.h TDEPFILES= arm-tdep.o arm-linux-tdep.o solib.o solib-svr4.o solib-legacy.o - -GDBSERVER_DEPFILES = linux-low.o linux-arm-low.o reg-arm.o diff --git a/gdb/config/arm/nm-linux.h b/gdb/config/arm/nm-linux.h index 7e0156db43c..3de00c915ca 100644 --- a/gdb/config/arm/nm-linux.h +++ b/gdb/config/arm/nm-linux.h @@ -27,11 +27,6 @@ #define U_REGS_OFFSET 0 -#ifdef GDBSERVER -#define REGISTER_U_ADDR(addr,blockend,regno) \ - (addr) = arm_register_u_addr ((blockend),(regno)) -#endif /* GDBSERVER */ - /* Return sizeof user struct to callers in less machine dependent routines */ extern int kernel_u_size (void); #define KERNEL_U_SIZE arm_linux_kernel_u_size() diff --git a/gdb/config/arm/tm-linux.h b/gdb/config/arm/tm-linux.h index 51b9d708f32..995ba7312fb 100644 --- a/gdb/config/arm/tm-linux.h +++ b/gdb/config/arm/tm-linux.h @@ -21,10 +21,6 @@ #ifndef TM_ARMLINUX_H #define TM_ARMLINUX_H -#ifdef GDBSERVER -#define ARM_GNULINUX_TARGET -#endif - /* Include the common ARM target definitions. */ #include "arm/tm-arm.h" diff --git a/gdb/config/i386/linux.mt b/gdb/config/i386/linux.mt index 43bc2d26b73..2d27a02638e 100644 --- a/gdb/config/i386/linux.mt +++ b/gdb/config/i386/linux.mt @@ -2,5 +2,3 @@ TDEPFILES= i386-tdep.o i386-linux-tdep.o i387-tdep.o \ solib.o solib-svr4.o solib-legacy.o TM_FILE= tm-linux.h - -GDBSERVER_DEPFILES = linux-low.o linux-i386-low.o reg-i386.o diff --git a/gdb/config/ia64/linux.mt b/gdb/config/ia64/linux.mt index d841f75f37f..3a661b3d947 100644 --- a/gdb/config/ia64/linux.mt +++ b/gdb/config/ia64/linux.mt @@ -2,5 +2,3 @@ TDEPFILES= ia64-tdep.o ia64-aix-tdep.o ia64-linux-tdep.o \ solib.o solib-svr4.o solib-legacy.o TM_FILE= tm-linux.h - -GDBSERVER_DEPFILES = linux-low.o linux-ia64-low.o reg-ia64.o diff --git a/gdb/config/ia64/nm-linux.h b/gdb/config/ia64/nm-linux.h index e00d561b6a3..0418495c111 100644 --- a/gdb/config/ia64/nm-linux.h +++ b/gdb/config/ia64/nm-linux.h @@ -34,13 +34,6 @@ extern int ia64_cannot_fetch_register (int regno); #define CANNOT_STORE_REGISTER(regno) ia64_cannot_store_register(regno) extern int ia64_cannot_store_register (int regno); -#ifdef GDBSERVER -#define REGISTER_U_ADDR(addr, blockend, regno) \ - (addr) = ia64_register_u_addr ((blockend),(regno)); - -extern int ia64_register_u_addr(int, int); -#endif /* GDBSERVER */ - #define U_REGS_OFFSET 0 #define PTRACE_ARG3_TYPE long diff --git a/gdb/config/ia64/tm-ia64.h b/gdb/config/ia64/tm-ia64.h index 2445395974d..1b2baacd5a0 100644 --- a/gdb/config/ia64/tm-ia64.h +++ b/gdb/config/ia64/tm-ia64.h @@ -21,59 +21,8 @@ #ifndef TM_IA64_H #define TM_IA64_H -#if !defined(GDBSERVER) - #define GDB_MULTI_ARCH 1 -#else /* defines needed for GDBSERVER */ - -/* Say how long (ordinary) registers are. This is a piece of bogosity - used in push_word and a few other places; REGISTER_RAW_SIZE is the - real way to know how big a register is. */ - -#define DEPRECATED_REGISTER_SIZE 8 - -#undef NUM_REGS -#define NUM_REGS 590 - -/* Some pseudo register numbers */ - -#define PC_REGNUM IA64_IP_REGNUM -#define SP_REGNUM IA64_GR12_REGNUM -#define DEPRECATED_FP_REGNUM IA64_VFP_REGNUM - -/* Total amount of space needed to store our copies of the machine's - register state, the array `registers'. On the ia64, all registers - fit in 64 bits except for the floating point registers which require - 84 bits. But 84 isn't a nice number, so we'll just allocate 128 - bits for each of these. The expression below says that we - need 8 bytes for each register, plus an additional 8 bytes for each - of the 128 floating point registers. */ - -#define DEPRECATED_REGISTER_BYTES (NUM_REGS*8+128*8) - -/* Index within `registers' of the first byte of the space for - register N. */ - -#define REGISTER_BYTE(N) (((N) * 8) \ - + ((N) <= IA64_FR0_REGNUM ? 0 : 8 * (((N) > IA64_FR127_REGNUM) ? 128 : (N) - IA64_FR0_REGNUM))) - -/* Number of bytes of storage in the actual machine representation - for register N. */ - -#define REGISTER_RAW_SIZE(N) \ - ((IA64_FR0_REGNUM <= (N) && (N) <= IA64_FR127_REGNUM) ? 16 : 8) - -/* Largest value REGISTER_RAW_SIZE can have. */ - -#define DEPRECATED_MAX_REGISTER_RAW_SIZE 16 - - -#define GDBSERVER_RESUME_REGS { IA64_IP_REGNUM, IA64_PSR_REGNUM, SP_REGNUM, IA64_BSP_REGNUM, IA64_CFM_REGNUM } - -#endif /* GDBSERVER */ - - /* Register numbers of various important registers */ /* General registers; there are 128 of these 64 bit wide registers. The diff --git a/gdb/config/m68k/linux.mh b/gdb/config/m68k/linux.mh index d814b73a9e9..7de2c3f6e13 100644 --- a/gdb/config/m68k/linux.mh +++ b/gdb/config/m68k/linux.mh @@ -10,5 +10,3 @@ NATDEPFILES= infptrace.o inftarg.o fork-child.o \ # The dynamically loaded libthread_db needs access to symbols in the # gdb executable. LOADLIBES = -ldl -rdynamic - -GDBSERVER_DEPFILES = linux-low.o linux-m68k-low.o reg-m68k.o diff --git a/gdb/config/mips/linux.mt b/gdb/config/mips/linux.mt index 60bbfb25212..25d99b370ca 100644 --- a/gdb/config/mips/linux.mt +++ b/gdb/config/mips/linux.mt @@ -3,7 +3,5 @@ TDEPFILES= mips-tdep.o mips-linux-tdep.o corelow.o \ solib.o solib-svr4.o TM_FILE= tm-linux.h -GDBSERVER_DEPFILES = linux-low.o linux-mips-low.o reg-mips.o - SIM_OBS = remote-sim.o SIM = ../sim/mips/libsim.a diff --git a/gdb/config/powerpc/linux.mh b/gdb/config/powerpc/linux.mh index 240c4e0bc21..925650dd272 100644 --- a/gdb/config/powerpc/linux.mh +++ b/gdb/config/powerpc/linux.mh @@ -9,5 +9,3 @@ NATDEPFILES= infptrace.o inftarg.o fork-child.o linux-proc.o \ gcore.o linux-nat.o LOADLIBES = -ldl -rdynamic - -GDBSERVER_DEPFILES = linux-low.o linux-ppc-low.o reg-ppc.o diff --git a/gdb/config/s390/tm-linux.h b/gdb/config/s390/tm-linux.h index c1b4a294ad8..7b406e0dc0a 100644 --- a/gdb/config/s390/tm-linux.h +++ b/gdb/config/s390/tm-linux.h @@ -24,9 +24,7 @@ #ifndef TM_LINUX_H #define TM_LINUX_H -#ifdef GDBSERVER -#define S390_GNULINUX_TARGET -#endif /* GDBSERVER */ + #undef TARGET_ELF64 #define TARGET_ELF64 (gdbarch_tdep (current_gdbarch)->intreg_size==8) diff --git a/gdb/config/s390/tm-s390.h b/gdb/config/s390/tm-s390.h index c8a6e8d0323..d36c2798f4f 100644 --- a/gdb/config/s390/tm-s390.h +++ b/gdb/config/s390/tm-s390.h @@ -73,43 +73,6 @@ #define S390X_REGISTER_BYTES ((8+8)+(8*S390_NUM_GPRS)+(4*S390_NUM_ACRS)+ \ (8*S390_NUM_CRS)+(S390_FPC_SIZE+S390_FPC_PAD_SIZE)+(S390_FPR_SIZE*S390_NUM_FPRS)) -#ifdef GDBSERVER - -int s390_register_byte (int reg_nr); -#define REGISTER_BYTE(reg_nr) s390_register_byte(reg_nr) -#define PC_REGNUM S390_PC_REGNUM -#define NUM_REGS S390_NUM_REGS -#define NUM_FREGS S390_NUM_FPRS -#define DEPRECATED_FP_REGNUM S390_FP_REGNUM -#define SP_REGNUM S390_SP_REGNUM -/* Obviously ptrace for user program tracing cannot be allowed - mess with control registers (except per registers for hardware watchpoints), - when we add kernel debugging we may need to alter these macros. */ -int s390_cannot_fetch_register (int regno); -#define CANNOT_FETCH_REGISTER(regno) s390_cannot_fetch_register(regno) -#define CANNOT_STORE_REGISTER(regno) s390_cannot_fetch_register(regno) - -#if CONFIG_ARCH_S390X - -int s390x_register_raw_size (int reg_nr); -#define REGISTER_RAW_SIZE(reg_nr) s390x_register_raw_size(reg_nr) -#define GDB_TARGET_IS_ESAME (1) -#define DEPRECATED_REGISTER_SIZE (8) -#define DEPRECATED_REGISTER_BYTES S390X_REGISTER_BYTES - -#else /* CONFIG_ARCH_S390X */ - -int s390_register_raw_size (int reg_nr); -#define REGISTER_RAW_SIZE(reg_nr) s390_register_raw_size(reg_nr) -#define GDB_TARGET_IS_ESAME (0) -#define DEPRECATED_REGISTER_SIZE (4) -#define DEPRECATED_REGISTER_BYTES S390_REGISTER_BYTES - -#endif /* CONFIG_ARCH_S390X */ - -#else /* GDBSERVER */ - #define GDB_TARGET_IS_ESAME (TARGET_ARCHITECTURE->mach == bfd_mach_s390_64) -#endif /* GDBSERVER */ #endif /* ifndef TM_S390_H */ diff --git a/gdb/config/sh/linux.mt b/gdb/config/sh/linux.mt index ea8460cdee9..8f217cccb21 100644 --- a/gdb/config/sh/linux.mt +++ b/gdb/config/sh/linux.mt @@ -4,5 +4,3 @@ TM_FILE= tm-linux.h SIM_OBS = remote-sim.o SIM = ../sim/sh/libsim.a - -GDBSERVER_DEPFILES = linux-low.o linux-sh-low.o reg-sh.o diff --git a/gdb/s390-nat.c b/gdb/s390-nat.c index 4dc8045f35c..732cf94451a 100644 --- a/gdb/s390-nat.c +++ b/gdb/s390-nat.c @@ -60,20 +60,14 @@ s390_register_u_addr (int blockend, int regnum) retval = PT_CR_9 + ((regnum - (S390_FIRST_CR + 9)) * S390_CR_SIZE); else { -#ifdef GDBSERVER - error ("s390_register_u_addr invalid regnum %s %d regnum=%d", - __FILE__, (int) __LINE__, regnum); -#else internal_error (__FILE__, __LINE__, "s390_register_u_addr invalid regnum regnum=%d", regnum); -#endif retval = 0; } return retval + blockend; } -#ifndef GDBSERVER /* watch_areas are required if you put 2 or more watchpoints on the same address or overlapping areas gdb will call us to delete the watchpoint more than once when we try to delete them. @@ -362,4 +356,3 @@ fill_fpregset (fpregset_t * fpregsetp, int regno) #error "libc files are inconsistent with linux/include/asm-s390/" #error "3) you didn't do a completely clean build & delete config.cache." #endif -#endif /* GDBSERVER */ diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 10df09501b3..87ddef0de16 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -84,7 +84,6 @@ s390_register_byte (int reg_nr) return S390_FP0_OFFSET + (((reg_nr) - S390_FP0_REGNUM) * S390_FPR_SIZE); } -#ifndef GDBSERVER #define S390_MAX_INSTR_SIZE (6) #define S390_SYSCALL_OPCODE (0x0a) #define S390_SYSCALL_SIZE (2) @@ -1915,5 +1914,3 @@ _initialize_s390_tdep (void) if (!deprecated_tm_print_insn) /* Someone may have already set it */ deprecated_tm_print_insn = gdb_print_insn_s390; } - -#endif /* GDBSERVER */ -- 2.30.2