From 4b17b3897bf45ea21ed2de1743c063765e9dcf2f Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 15 Jan 2006 19:45:28 +0000 Subject: [PATCH] * alphafbsd-tdep.c: Include "solib-svr4.h". (alphafbsd_init_abi): Set solib_svr4_fetch_link_map_offsets to svr4_lp64_fetch_link_map_offsets. * Makefile.in (alphafbsd-tdep.o): Update dependencies. * config/alpha/fbsd.mt (TDEPFILES): Add corelow.o, solib.o and solib-svr4.o. * config/alpha/fbsd.mh (NATDEPFILES): Remove solib.o, solib-svr4.o and solib-legacy.o. * config/alpha/nm-fbsd.h: Don't include "solib.h". --- gdb/ChangeLog | 12 ++++++++++++ gdb/Makefile.in | 2 +- gdb/alphafbsd-tdep.c | 13 ++++++++++--- gdb/config/alpha/fbsd.mh | 3 +-- gdb/config/alpha/fbsd.mt | 3 ++- gdb/config/alpha/nm-fbsd.h | 7 +------ 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3a6921ad0b..c1e929593c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2006-01-15 Mark Kettenis + + * alphafbsd-tdep.c: Include "solib-svr4.h". + (alphafbsd_init_abi): Set solib_svr4_fetch_link_map_offsets to + svr4_lp64_fetch_link_map_offsets. + * Makefile.in (alphafbsd-tdep.o): Update dependencies. + * config/alpha/fbsd.mt (TDEPFILES): Add corelow.o, solib.o and + solib-svr4.o. + * config/alpha/fbsd.mh (NATDEPFILES): Remove solib.o, solib-svr4.o + and solib-legacy.o. + * config/alpha/nm-fbsd.h: Don't include "solib.h". + 2006-01-15 Daniel Jacobowitz * source.c (_initialize_source): Use add_setshow_integer_cmd. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index d3dfb28dba..4c13ea00c3 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1673,7 +1673,7 @@ alphabsd-nat.o: alphabsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ alphabsd-tdep.o: alphabsd-tdep.c $(defs_h) $(alpha_tdep_h) \ $(alphabsd_tdep_h) alphafbsd-tdep.o: alphafbsd-tdep.c $(defs_h) $(value_h) $(osabi_h) \ - $(alpha_tdep_h) + $(alpha_tdep_h) $(solib_svr4_h) alpha-linux-nat.o: alpha-linux-nat.c $(defs_h) $(target_h) $(linux_nat_h) alpha-linux-tdep.o: alpha-linux-tdep.c $(defs_h) $(frame_h) $(gdb_assert_h) \ $(osabi_h) $(solib_svr4_h) $(alpha_tdep_h) diff --git a/gdb/alphafbsd-tdep.c b/gdb/alphafbsd-tdep.c index 14d0c8db7d..08d38629e1 100644 --- a/gdb/alphafbsd-tdep.c +++ b/gdb/alphafbsd-tdep.c @@ -1,5 +1,6 @@ -/* Target-dependent code for FreeBSD/Alpha. - Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +/* Target-dependent code for FreeBSD/alpha. + + Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc. This file is part of GDB. @@ -23,6 +24,7 @@ #include "osabi.h" #include "alpha-tdep.h" +#include "solib-svr4.h" static int alphafbsd_use_struct_convention (int gcc_p, struct type *type) @@ -98,7 +100,12 @@ alphafbsd_init_abi (struct gdbarch_info info, /* Hook into the MDEBUG frame unwinder. */ alpha_mdebug_init_abi (info, gdbarch); - set_gdbarch_deprecated_use_struct_convention (gdbarch, alphafbsd_use_struct_convention); + /* FreeBSD/alpha has SVR4-style shared libraries. */ + set_solib_svr4_fetch_link_map_offsets + (gdbarch, svr4_lp64_fetch_link_map_offsets); + + set_gdbarch_deprecated_use_struct_convention + (gdbarch, alphafbsd_use_struct_convention); tdep->dynamic_sigtramp_offset = alphafbsd_sigtramp_offset; tdep->sigcontext_addr = alphafbsd_sigcontext_addr; diff --git a/gdb/config/alpha/fbsd.mh b/gdb/config/alpha/fbsd.mh index a30dd454f8..3ffac4bcbd 100644 --- a/gdb/config/alpha/fbsd.mh +++ b/gdb/config/alpha/fbsd.mh @@ -1,6 +1,5 @@ # Host: FreeBSD/alpha NATDEPFILES= fork-child.o inf-ptrace.o \ fbsd-nat.o alphabsd-nat.o \ - gcore.o solib.o solib-svr4.o solib-legacy.o \ - corelow.o core-regset.o + gcore.o corelow.o core-regset.o NAT_FILE= nm-fbsd.h diff --git a/gdb/config/alpha/fbsd.mt b/gdb/config/alpha/fbsd.mt index 7c6892d29f..5b8a2723c3 100644 --- a/gdb/config/alpha/fbsd.mt +++ b/gdb/config/alpha/fbsd.mt @@ -1,3 +1,4 @@ # Target: FreeBSD/alpha -TDEPFILES= alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o alphafbsd-tdep.o +TDEPFILES= alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o alphafbsd-tdep.o \ + corelow.o solib.o solib-svr4.o DEPRECATED_TM_FILE= tm-alpha.h diff --git a/gdb/config/alpha/nm-fbsd.h b/gdb/config/alpha/nm-fbsd.h index 5cc2fefa28..b466167a6d 100644 --- a/gdb/config/alpha/nm-fbsd.h +++ b/gdb/config/alpha/nm-fbsd.h @@ -1,6 +1,6 @@ /* Native-dependent definitions for FreeBSD/alpha. - Copyright 1986, 1987, 1989, 1992, 1996, 2000, 2004, 2005 + Copyright 1986, 1987, 1989, 1992, 1996, 2000, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GDB. @@ -25,10 +25,5 @@ /* The Alpha does not step over a breakpoint. */ #define CANNOT_STEP_BREAKPOINT 1 - - -/* Shared library support. */ - -#include "solib.h" /* Support for shared libraries. */ #endif /* nm-fbsd.h */ -- 2.34.1