From 5ea03926accff5b46afe33893076d101bc13fe2e Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Fri, 24 Nov 2006 18:23:34 +0000 Subject: [PATCH] * Makefile.in (mips-linux-tdep.o) Add $(solib_h) dependency. (nto-procfs.o): Likewise. * mips-linux-tdep.c: Include "solib.h". * nto-procfs.c: Likewise. * config/nm-linux.h: Do not include "solib.h". * config/nm-nbsd.h: Likewise. * config/tm-linux.h: Likewise. * config/alpha/nm-osf.h: Likewise. * config/frv/tm-frv.h: Likewise. * config/i386/nm-fbsh.h: Likewise. * config/i386/nm-i386gnu.h: Likewise. * config/i386/nm-i386sco5.h: Likewise. * config/i386/nm-i386sol2.h: Likewise. * config/i386/nm-i386v4.h: Likewise. * config/i386/nm-i386v42mp.h: Likewise. * config/i386/tm-i386sol2.h: Likewise. * config/i386/tm-nto.h: Likewise. * config/mips/nm-irix5.h: Likewise. * config/mips/tm-nbsd.h: Likewise. * config/pa/tm-hppah.h: Likewise. * config/powerpc/tm-ppc-eabi.h: Likewise. * config/rs6000/tm-rs6000.h: Likewise. * config/sh/tm-nbsd.h: Likewise. * config/sparc/nm-sol2.h: Likewise. * config/sparc/tm-sol2.h: Likewise. * config/arm/nbsdaout.mh: Remove NAT_FILE. * config/i386/nbsdaout.mh: Likewise. * config/i386/nbsdelf.mh: Likewise. * config/i386/obsdaout.mh: Likewise. * config/m68k/nbsdaout.mh: Likewise. * config/m68k/obsd.mh: Likewise. * config/sparc/nbsdaout.mh: Likewise. * config/cris/cris.mt: Remove DEPRECATED_TM_FILE. * config/i386/linux64.mt: Likewise. * config/m68k/linux.mt: Likewise. * config/m68k/nbsd.mt: Likewise. * config/sparc/linux.mt: Likewise. * config/sparc/linux64.mt: Likewise. * config/vax/nbsd.mt: Likewise. --- gdb/ChangeLog | 42 ++++++++++++++++++++++++++++++++ gdb/Makefile.in | 4 +-- gdb/config/alpha/nm-osf.h | 4 --- gdb/config/arm/nbsdaout.mh | 1 - gdb/config/cris/cris.mt | 1 - gdb/config/frv/tm-frv.h | 1 - gdb/config/i386/linux64.mt | 1 - gdb/config/i386/nbsdaout.mh | 1 - gdb/config/i386/nbsdelf.mh | 1 - gdb/config/i386/nm-fbsd.h | 4 --- gdb/config/i386/nm-i386gnu.h | 3 --- gdb/config/i386/nm-i386sco5.h | 3 --- gdb/config/i386/nm-i386sol2.h | 4 --- gdb/config/i386/nm-i386v4.h | 4 --- gdb/config/i386/nm-i386v42mp.h | 4 --- gdb/config/i386/obsdaout.mh | 1 - gdb/config/i386/tm-i386sol2.h | 2 -- gdb/config/i386/tm-nto.h | 2 -- gdb/config/m68k/linux.mt | 1 - gdb/config/m68k/nbsd.mt | 1 - gdb/config/m68k/nbsdaout.mh | 1 - gdb/config/m68k/obsd.mh | 1 - gdb/config/mips/nm-irix5.h | 4 --- gdb/config/mips/tm-nbsd.h | 2 -- gdb/config/nm-linux.h | 8 ------ gdb/config/nm-nbsd.h | 1 - gdb/config/pa/tm-hppah.h | 2 -- gdb/config/powerpc/tm-ppc-eabi.h | 3 --- gdb/config/rs6000/tm-rs6000.h | 6 ----- gdb/config/sh/tm-nbsd.h | 1 - gdb/config/sparc/linux.mt | 1 - gdb/config/sparc/linux64.mt | 1 - gdb/config/sparc/nbsdaout.mh | 1 - gdb/config/sparc/nm-sol2.h | 4 --- gdb/config/sparc/tm-sol2.h | 3 --- gdb/config/tm-linux.h | 1 - gdb/config/vax/nbsd.mt | 1 - gdb/mips-linux-tdep.c | 1 + gdb/nto-procfs.c | 1 + 39 files changed, 46 insertions(+), 82 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 28a997d417d..63d1f3dc939 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,45 @@ +2006-11-24 Ulrich Weigand + + * Makefile.in (mips-linux-tdep.o) Add $(solib_h) dependency. + (nto-procfs.o): Likewise. + * mips-linux-tdep.c: Include "solib.h". + * nto-procfs.c: Likewise. + * config/nm-linux.h: Do not include "solib.h". + * config/nm-nbsd.h: Likewise. + * config/tm-linux.h: Likewise. + * config/alpha/nm-osf.h: Likewise. + * config/frv/tm-frv.h: Likewise. + * config/i386/nm-fbsh.h: Likewise. + * config/i386/nm-i386gnu.h: Likewise. + * config/i386/nm-i386sco5.h: Likewise. + * config/i386/nm-i386sol2.h: Likewise. + * config/i386/nm-i386v4.h: Likewise. + * config/i386/nm-i386v42mp.h: Likewise. + * config/i386/tm-i386sol2.h: Likewise. + * config/i386/tm-nto.h: Likewise. + * config/mips/nm-irix5.h: Likewise. + * config/mips/tm-nbsd.h: Likewise. + * config/pa/tm-hppah.h: Likewise. + * config/powerpc/tm-ppc-eabi.h: Likewise. + * config/rs6000/tm-rs6000.h: Likewise. + * config/sh/tm-nbsd.h: Likewise. + * config/sparc/nm-sol2.h: Likewise. + * config/sparc/tm-sol2.h: Likewise. + * config/arm/nbsdaout.mh: Remove NAT_FILE. + * config/i386/nbsdaout.mh: Likewise. + * config/i386/nbsdelf.mh: Likewise. + * config/i386/obsdaout.mh: Likewise. + * config/m68k/nbsdaout.mh: Likewise. + * config/m68k/obsd.mh: Likewise. + * config/sparc/nbsdaout.mh: Likewise. + * config/cris/cris.mt: Remove DEPRECATED_TM_FILE. + * config/i386/linux64.mt: Likewise. + * config/m68k/linux.mt: Likewise. + * config/m68k/nbsd.mt: Likewise. + * config/sparc/linux.mt: Likewise. + * config/sparc/linux64.mt: Likewise. + * config/vax/nbsd.mt: Likewise. + 2006-11-22 Ulrich Weigand * NEWS: New port to Cell Broadband Engine SPU. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 6ec2d2e82c9..3782308b40f 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -2355,7 +2355,7 @@ mips-linux-nat.o: mips-linux-nat.c $(defs_h) $(mips_tdep_h) $(target_h) \ mips-linux-tdep.o: mips-linux-tdep.c $(defs_h) $(gdbcore_h) $(target_h) \ $(solib_svr4_h) $(osabi_h) $(mips_tdep_h) $(gdb_string_h) \ $(gdb_assert_h) $(frame_h) $(regcache_h) $(trad_frame_h) \ - $(tramp_frame_h) $(floatformat_h) $(mips_linux_tdep_h) + $(tramp_frame_h) $(floatformat_h) $(solib_h) $(mips_linux_tdep_h) mips-mdebug-tdep.o: mips-mdebug-tdep.c $(defs_h) $(frame_h) $(mips_tdep_h) \ $(trad_frame_h) $(block_h) $(symtab_h) $(objfiles_h) $(elf_mips_h) \ $(elf_bfd_h) $(gdb_assert_h) $(frame_unwind_h) $(frame_base_h) \ @@ -2404,7 +2404,7 @@ nlmread.o: nlmread.c $(defs_h) $(bfd_h) $(symtab_h) $(symfile_h) \ $(objfiles_h) $(buildsym_h) $(stabsread_h) $(block_h) nto-procfs.o: nto-procfs.c $(defs_h) $(gdb_dirent_h) $(exceptions_h) \ $(gdb_string_h) $(gdbcore_h) $(inferior_h) $(target_h) $(objfiles_h) \ - $(gdbthread_h) $(nto_tdep_h) $(command_h) $(regcache_h) + $(gdbthread_h) $(nto_tdep_h) $(command_h) $(regcache_h) $(solib_h) nto-tdep.o: nto-tdep.c $(gdb_stat_h) $(gdb_string_h) $(nto_tdep_h) $(top_h) \ $(cli_decode_h) $(cli_cmds_h) $(inferior_h) $(gdbarch_h) $(bfd_h) \ $(elf_bfd_h) $(solib_svr4_h) $(gdbcore_h) diff --git a/gdb/config/alpha/nm-osf.h b/gdb/config/alpha/nm-osf.h index 119a036b369..927558c7e14 100644 --- a/gdb/config/alpha/nm-osf.h +++ b/gdb/config/alpha/nm-osf.h @@ -33,10 +33,6 @@ #define PTRACE_XFER_TYPE long -/* Support for shared libraries. */ - -#include "solib.h" - /* Given a pointer to either a gregset_t or fpregset_t, return a pointer to the first register. */ #define ALPHA_REGSET_BASE(regsetp) ((regsetp)->regs) diff --git a/gdb/config/arm/nbsdaout.mh b/gdb/config/arm/nbsdaout.mh index 2e84c1b2d89..b06044b7cff 100644 --- a/gdb/config/arm/nbsdaout.mh +++ b/gdb/config/arm/nbsdaout.mh @@ -1,4 +1,3 @@ # Host: NetBSD/arm NATDEPFILES= fork-child.o inf-ptrace.o corelow.o armnbsd-nat.o \ solib-sunos.o -NAT_FILE= solib.h diff --git a/gdb/config/cris/cris.mt b/gdb/config/cris/cris.mt index 9f91915978f..a7f484f84d7 100644 --- a/gdb/config/cris/cris.mt +++ b/gdb/config/cris/cris.mt @@ -1,2 +1 @@ TDEPFILES= cris-tdep.o corelow.o solib.o solib-svr4.o -DEPRECATED_TM_FILE= solib.h diff --git a/gdb/config/frv/tm-frv.h b/gdb/config/frv/tm-frv.h index 437487218d0..2c65f2c48e7 100644 --- a/gdb/config/frv/tm-frv.h +++ b/gdb/config/frv/tm-frv.h @@ -40,4 +40,3 @@ extern int frv_have_stopped_data_address(void); #define target_stopped_data_address(target, x) frv_stopped_data_address(x) extern int frv_stopped_data_address(CORE_ADDR *addr_p); -#include "solib.h" /* Include support for shared libraries. */ diff --git a/gdb/config/i386/linux64.mt b/gdb/config/i386/linux64.mt index a5839dfb1a0..61167fb7532 100644 --- a/gdb/config/i386/linux64.mt +++ b/gdb/config/i386/linux64.mt @@ -2,4 +2,3 @@ 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 corelow.o symfile-mem.o -DEPRECATED_TM_FILE= solib.h diff --git a/gdb/config/i386/nbsdaout.mh b/gdb/config/i386/nbsdaout.mh index 1614c4d9017..a14130ad688 100644 --- a/gdb/config/i386/nbsdaout.mh +++ b/gdb/config/i386/nbsdaout.mh @@ -2,6 +2,5 @@ NATDEPFILES= fork-child.o inf-ptrace.o \ i386bsd-nat.o i386nbsd-nat.o bsd-kvm.o \ solib.o solib-sunos.o -NAT_FILE= solib.h LOADLIBES= -lkvm diff --git a/gdb/config/i386/nbsdelf.mh b/gdb/config/i386/nbsdelf.mh index e49a49aac42..be18b4df4ef 100644 --- a/gdb/config/i386/nbsdelf.mh +++ b/gdb/config/i386/nbsdelf.mh @@ -1,6 +1,5 @@ # Host: NetBSD/i386 ELF NATDEPFILES= fork-child.o inf-ptrace.o \ i386bsd-nat.o i386nbsd-nat.o bsd-kvm.o -NAT_FILE= solib.h LOADLIBES= -lkvm diff --git a/gdb/config/i386/nm-fbsd.h b/gdb/config/i386/nm-fbsd.h index 504bed57d22..e29d9e4ef3f 100644 --- a/gdb/config/i386/nm-fbsd.h +++ b/gdb/config/i386/nm-fbsd.h @@ -52,8 +52,4 @@ extern void i386bsd_dr_reset_addr (int regnum); extern unsigned long i386bsd_dr_get_status (void); -/* Shared library support. */ - -#include "solib.h" - #endif /* nm-fbsd.h */ diff --git a/gdb/config/i386/nm-i386gnu.h b/gdb/config/i386/nm-i386gnu.h index 8fe4d3ec882..e3b5eff7bab 100644 --- a/gdb/config/i386/nm-i386gnu.h +++ b/gdb/config/i386/nm-i386gnu.h @@ -34,9 +34,6 @@ extern char *gnu_target_pid_to_str (int pid); /* Don't do wait_for_inferior on attach. */ #define ATTACH_NO_WAIT -/* Use SVR4 style shared library support */ -#include "solib.h" - /* Thread flavors used in re-setting the T bit. */ #define THREAD_STATE_FLAVOR i386_REGS_SEGS_STATE #define THREAD_STATE_SIZE i386_THREAD_STATE_COUNT diff --git a/gdb/config/i386/nm-i386sco5.h b/gdb/config/i386/nm-i386sco5.h index aa9a910c87e..a19afe1c768 100644 --- a/gdb/config/i386/nm-i386sco5.h +++ b/gdb/config/i386/nm-i386sco5.h @@ -28,9 +28,6 @@ /* Basically, its a lot like the older versions ... */ #include "i386/nm-i386sco.h" -/* ... but it can do a lot of SVR4 type stuff too. */ -#include "solib.h" /* Pick up shared library support. */ - /* SCO is unlike other SVR4 systems in that it has SVR4 style shared libs, with a slight twist. We expect 3 traps (2 for the exec and one for the dynamic loader). After the third trap we insert the diff --git a/gdb/config/i386/nm-i386sol2.h b/gdb/config/i386/nm-i386sol2.h index b71ee82ca91..797b05ceb6a 100644 --- a/gdb/config/i386/nm-i386sol2.h +++ b/gdb/config/i386/nm-i386sol2.h @@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Use SVR4 style shared library support */ - -#include "solib.h" - /* SVR4 has /proc support, so use it instead of ptrace. */ #define USE_PROC_FS diff --git a/gdb/config/i386/nm-i386v4.h b/gdb/config/i386/nm-i386v4.h index c565c899d59..438dcac7f81 100644 --- a/gdb/config/i386/nm-i386v4.h +++ b/gdb/config/i386/nm-i386v4.h @@ -20,10 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Use SVR4 style shared library support */ - -#include "solib.h" - /* SVR4 has /proc support, so use it instead of ptrace. */ #define USE_PROC_FS diff --git a/gdb/config/i386/nm-i386v42mp.h b/gdb/config/i386/nm-i386v42mp.h index c5abdc3629c..a49c4db2a35 100644 --- a/gdb/config/i386/nm-i386v42mp.h +++ b/gdb/config/i386/nm-i386v42mp.h @@ -23,10 +23,6 @@ #ifndef NM_I386V42MP_H #define NM_I386V42MP_H -/* Use SVR4 style shared library support */ - -#include "solib.h" - /* SVR4 has /proc support, so use it instead of ptrace. */ #define USE_PROC_FS diff --git a/gdb/config/i386/obsdaout.mh b/gdb/config/i386/obsdaout.mh index 20b975aa187..d60758a1967 100644 --- a/gdb/config/i386/obsdaout.mh +++ b/gdb/config/i386/obsdaout.mh @@ -2,6 +2,5 @@ NATDEPFILES= fork-child.o inf-ptrace.o \ i386bsd-nat.o i386nbsd-nat.o i386obsd-nat.o bsd-kvm.o \ solib.o solib-sunos.o -NAT_FILE= solib.h LOADLIBES= -lkvm diff --git a/gdb/config/i386/tm-i386sol2.h b/gdb/config/i386/tm-i386sol2.h index 3dfbbbbb85d..fa5c8053a4d 100644 --- a/gdb/config/i386/tm-i386sol2.h +++ b/gdb/config/i386/tm-i386sol2.h @@ -22,8 +22,6 @@ #ifndef TM_I386SOL2_H #define TM_I386SOL2_H 1 -#include "solib.h" - /* The SunPRO compiler puts out 0 instead of the address in N_SO symbols, and for SunPRO 3.0, N_FUN symbols too. */ #define SOFUN_ADDRESS_MAYBE_MISSING diff --git a/gdb/config/i386/tm-nto.h b/gdb/config/i386/tm-nto.h index 670acc8d926..139167df4c7 100644 --- a/gdb/config/i386/tm-nto.h +++ b/gdb/config/i386/tm-nto.h @@ -26,6 +26,4 @@ #include "config/tm-nto.h" -#include "solib.h" - #endif /* TM_NTO_H */ diff --git a/gdb/config/m68k/linux.mt b/gdb/config/m68k/linux.mt index 2eba02b9876..1582635e238 100644 --- a/gdb/config/m68k/linux.mt +++ b/gdb/config/m68k/linux.mt @@ -1,3 +1,2 @@ # Target: Motorola m68k with a.out and ELF TDEPFILES= m68k-tdep.o m68klinux-tdep.o solib.o solib-svr4.o glibc-tdep.o symfile-mem.o -DEPRECATED_TM_FILE= solib.h diff --git a/gdb/config/m68k/nbsd.mt b/gdb/config/m68k/nbsd.mt index db3e3573d7f..6baefd9de11 100644 --- a/gdb/config/m68k/nbsd.mt +++ b/gdb/config/m68k/nbsd.mt @@ -1,3 +1,2 @@ # Target: NetBSD/m68k TDEPFILES= m68k-tdep.o m68kbsd-tdep.o corelow.o solib.o solib-svr4.o -DEPRECATED_TM_FILE= solib.h diff --git a/gdb/config/m68k/nbsdaout.mh b/gdb/config/m68k/nbsdaout.mh index 2ca3fa55605..09d2a1273e8 100644 --- a/gdb/config/m68k/nbsdaout.mh +++ b/gdb/config/m68k/nbsdaout.mh @@ -1,6 +1,5 @@ # Host: NetBSD/m68k a.out NATDEPFILES= m68kbsd-nat.o fork-child.o inf-ptrace.o \ solib.o solib-sunos.o -NAT_FILE= solib.h LOADLIBES= -lkvm diff --git a/gdb/config/m68k/obsd.mh b/gdb/config/m68k/obsd.mh index 2873d8b19da..6103c4134e4 100644 --- a/gdb/config/m68k/obsd.mh +++ b/gdb/config/m68k/obsd.mh @@ -1,6 +1,5 @@ # Host: OpenBSD/m68k NATDEPFILES= m68kbsd-nat.o bsd-kvm.o fork-child.o inf-ptrace.o \ solib.o solib-sunos.o -NAT_FILE= solib.h LOADLIBES= -lkvm diff --git a/gdb/config/mips/nm-irix5.h b/gdb/config/mips/nm-irix5.h index 7f9629373a9..a253973d5e8 100644 --- a/gdb/config/mips/nm-irix5.h +++ b/gdb/config/mips/nm-irix5.h @@ -19,10 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Use SVR4 style shared library support */ - -#include "solib.h" - /* SVR4 has /proc support, so use it instead of ptrace. */ #define USE_PROC_FS diff --git a/gdb/config/mips/tm-nbsd.h b/gdb/config/mips/tm-nbsd.h index c5da546d03c..4e490821ae2 100644 --- a/gdb/config/mips/tm-nbsd.h +++ b/gdb/config/mips/tm-nbsd.h @@ -22,8 +22,6 @@ #ifndef TM_NBSD_H #define TM_NBSD_H -#include "solib.h" - #undef SKIP_TRAMPOLINE_CODE #undef DEPRECATED_IGNORE_HELPER_CALL diff --git a/gdb/config/nm-linux.h b/gdb/config/nm-linux.h index 39e78cfa8e4..b866ea45526 100644 --- a/gdb/config/nm-linux.h +++ b/gdb/config/nm-linux.h @@ -35,14 +35,6 @@ struct target_ops; #define REALTIME_HI (__SIGRTMAX + 1) #endif -/* We define this if link.h is available, because with ELF we use SVR4 - style shared libraries. */ - -#ifdef HAVE_LINK_H -#include "solib.h" /* Support for shared libraries. */ -#endif - - extern void lin_lwp_attach_lwp (ptid_t ptid, int verbose); #define ATTACH_LWP(ptid, verbose) lin_lwp_attach_lwp ((ptid), (verbose)) diff --git a/gdb/config/nm-nbsd.h b/gdb/config/nm-nbsd.h index 72f49c971e9..311d450e0c7 100644 --- a/gdb/config/nm-nbsd.h +++ b/gdb/config/nm-nbsd.h @@ -21,4 +21,3 @@ #define FETCH_INFERIOR_REGISTERS -#include "solib.h" /* Support for shared libraries. */ diff --git a/gdb/config/pa/tm-hppah.h b/gdb/config/pa/tm-hppah.h index 8d2f518e6fa..aca4d161298 100644 --- a/gdb/config/pa/tm-hppah.h +++ b/gdb/config/pa/tm-hppah.h @@ -24,8 +24,6 @@ struct frame_info; -#include "solib.h" /* Support for shared libraries. */ - /* For HP-UX on PA-RISC we have an implementation for the exception handling target op (in hppa-tdep.c) */ #define CHILD_ENABLE_EXCEPTION_CALLBACK diff --git a/gdb/config/powerpc/tm-ppc-eabi.h b/gdb/config/powerpc/tm-ppc-eabi.h index d29b05ddcd0..009cb77cde6 100644 --- a/gdb/config/powerpc/tm-ppc-eabi.h +++ b/gdb/config/powerpc/tm-ppc-eabi.h @@ -34,7 +34,4 @@ it shouldn't be. */ #define SOFUN_ADDRESS_MAYBE_MISSING -/* Use generic shared library machinery. */ -#include "solib.h" - #endif /* TM_PPC_EABI_H */ diff --git a/gdb/config/rs6000/tm-rs6000.h b/gdb/config/rs6000/tm-rs6000.h index 8afd2cadc94..6fa16395af3 100644 --- a/gdb/config/rs6000/tm-rs6000.h +++ b/gdb/config/rs6000/tm-rs6000.h @@ -90,9 +90,3 @@ extern CORE_ADDR (*rs6000_find_toc_address_hook) (CORE_ADDR); extern void (*rs6000_set_host_arch_hook) (int); -/* We need solib.h for building cross debuggers. However, we don't want - to clobber any special solib support required by native debuggers, so - only include solib.h if SOLIB_ADD is not defined. */ -#ifndef SOLIB_ADD -#include "solib.h" -#endif diff --git a/gdb/config/sh/tm-nbsd.h b/gdb/config/sh/tm-nbsd.h index 37dfe3452e2..6aabe1ea056 100644 --- a/gdb/config/sh/tm-nbsd.h +++ b/gdb/config/sh/tm-nbsd.h @@ -23,6 +23,5 @@ #define TM_NBSD_H #include "sh/tm-sh.h" -#include "solib.h" #endif /* TM_NBSD_H */ diff --git a/gdb/config/sparc/linux.mt b/gdb/config/sparc/linux.mt index 2fc5e220d31..2aad58effc0 100644 --- a/gdb/config/sparc/linux.mt +++ b/gdb/config/sparc/linux.mt @@ -1,4 +1,3 @@ # Target: GNU/Linux SPARC TDEPFILES= sparc-tdep.o sparc-sol2-tdep.o sol2-tdep.o sparc-linux-tdep.o \ solib.o solib-svr4.o symfile-mem.o -DEPRECATED_TM_FILE= solib.h diff --git a/gdb/config/sparc/linux64.mt b/gdb/config/sparc/linux64.mt index be7cfff3b40..d9d0644e0ce 100644 --- a/gdb/config/sparc/linux64.mt +++ b/gdb/config/sparc/linux64.mt @@ -2,4 +2,3 @@ TDEPFILES= sparc64-tdep.o sparc64-sol2-tdep.o sol2-tdep.o sparc64-linux-tdep.o \ sparc-tdep.o sparc-sol2-tdep.o sparc-linux-tdep.o \ solib.o solib-svr4.o -DEPRECATED_TM_FILE= solib.h diff --git a/gdb/config/sparc/nbsdaout.mh b/gdb/config/sparc/nbsdaout.mh index bcfbbb388a0..e5f4f257ed0 100644 --- a/gdb/config/sparc/nbsdaout.mh +++ b/gdb/config/sparc/nbsdaout.mh @@ -1,6 +1,5 @@ # Host: NetBSD/sparc a.out NATDEPFILES= fork-child.o inf-ptrace.o \ sparc-nat.o sparcnbsd-nat.o bsd-kvm.o solib-sunos.o -NAT_FILE= solib.h LOADLIBES= -lkvm diff --git a/gdb/config/sparc/nm-sol2.h b/gdb/config/sparc/nm-sol2.h index bc9de3fdf80..d95fe6e0983 100644 --- a/gdb/config/sparc/nm-sol2.h +++ b/gdb/config/sparc/nm-sol2.h @@ -24,10 +24,6 @@ #define GDB_GREGSET_T prgregset_t #define GDB_FPREGSET_T prfpregset_t -/* Shared library support. */ - -#include "solib.h" - /* Hardware wactchpoints. */ /* Solaris 2.6 and above can do HW watchpoints. */ diff --git a/gdb/config/sparc/tm-sol2.h b/gdb/config/sparc/tm-sol2.h index d4ca102f225..26448835c8f 100644 --- a/gdb/config/sparc/tm-sol2.h +++ b/gdb/config/sparc/tm-sol2.h @@ -21,9 +21,6 @@ #ifndef TM_SOL2_H #define TM_SOL2_H -/* Shared library support. */ -#include "solib.h" - /* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop, SunPRO) compiler puts out 0 instead of the address in N_SO stabs. Starting with SunPRO 3.0, the compiler does this for N_FUN stabs diff --git a/gdb/config/tm-linux.h b/gdb/config/tm-linux.h index 942995fe6bf..7249893eb05 100644 --- a/gdb/config/tm-linux.h +++ b/gdb/config/tm-linux.h @@ -35,4 +35,3 @@ #define SKIP_TRAMPOLINE_CODE(pc) find_solib_trampoline_target (pc) -#include "solib.h" /* Support for shared libraries. */ diff --git a/gdb/config/vax/nbsd.mt b/gdb/config/vax/nbsd.mt index dfe746fd520..f4321f538d9 100644 --- a/gdb/config/vax/nbsd.mt +++ b/gdb/config/vax/nbsd.mt @@ -1,3 +1,2 @@ # Target: NetBSD/vax TDEPFILES= vax-tdep.o vaxnbsd-tdep.o corelow.o solib.o solib-svr4.o -DEPRECATED_TM_FILE= solib.h diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c index 5d789d24577..a9948d65df3 100644 --- a/gdb/mips-linux-tdep.c +++ b/gdb/mips-linux-tdep.c @@ -33,6 +33,7 @@ #include "trad-frame.h" #include "tramp-frame.h" #include "floatformat.h" +#include "solib.h" #include "mips-linux-tdep.h" /* Figure out where the longjmp will land. diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c index 6dc056a714f..6a848f83845 100644 --- a/gdb/nto-procfs.c +++ b/gdb/nto-procfs.c @@ -43,6 +43,7 @@ #include "nto-tdep.h" #include "command.h" #include "regcache.h" +#include "solib.h" #define NULL_PID 0 #define _DEBUG_FLAG_TRACE (_DEBUG_FLAG_TRACE_EXEC|_DEBUG_FLAG_TRACE_RD|\ -- 2.30.2