From: Mark Kettenis Date: Sat, 15 Jul 2006 21:22:51 +0000 (+0000) Subject: * armnbsd-tdep.c: Don't include "nbsd-tdep.h". X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a4ab4a25cdacd569d6d8f25de7429426bb218b25;p=binutils-gdb.git * armnbsd-tdep.c: Don't include "nbsd-tdep.h". * config/arm/nbsd.mt (TDEPFILES): Remove nbsd-tdep.o. (DEPRECATED_TM_FILE): Remove. * Makefile.in (armnbsd-tdep.o): Update dependencies. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ea81997c66..287010027ed 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2006-07-15 Mark Kettenis + + * armnbsd-tdep.c: Don't include "nbsd-tdep.h". + * config/arm/nbsd.mt (TDEPFILES): Remove nbsd-tdep.o. + (DEPRECATED_TM_FILE): Remove. + * Makefile.in (armnbsd-tdep.o): Update dependencies. + 2006-07-14 Joel Brobecker * PROBLEMS: Document threads/2137. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index f19935b139a..5aab98fcb40 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1782,7 +1782,7 @@ arm-linux-tdep.o: arm-linux-tdep.c $(defs_h) $(target_h) $(value_h) \ armnbsd-nat.o: armnbsd-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) \ $(regcache_h) $(target_h) $(gdb_string_h) $(arm_tdep_h) $(inf_ptrace_h) armnbsd-tdep.o: armnbsd-tdep.c $(defs_h) $(osabi_h) $(gdb_string_h) \ - $(arm_tdep_h) $(nbsd_tdep_h) $(solib_svr4_h) + $(arm_tdep_h) $(solib_svr4_h) arm-tdep.o: arm-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(gdbcmd_h) \ $(gdbcore_h) $(gdb_string_h) $(dis_asm_h) $(regcache_h) \ $(doublest_h) $(value_h) $(arch_utils_h) $(osabi_h) \ diff --git a/gdb/armnbsd-tdep.c b/gdb/armnbsd-tdep.c index 2b878f296bb..34fa90666ae 100644 --- a/gdb/armnbsd-tdep.c +++ b/gdb/armnbsd-tdep.c @@ -1,6 +1,6 @@ -/* Target-specific functions for ARM running under NetBSD. +/* Target-specific functions for NetBSD/arm. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. This file is part of GDB. @@ -25,7 +25,6 @@ #include "gdb_string.h" #include "arm-tdep.h" -#include "nbsd-tdep.h" #include "solib-svr4.h" /* Description of the longjmp buffer. */ @@ -89,12 +88,12 @@ arm_netbsd_elf_init_abi (struct gdbarch_info info, struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); arm_netbsd_init_abi_common (info, gdbarch); - - set_solib_svr4_fetch_link_map_offsets (gdbarch, - nbsd_ilp32_solib_svr4_fetch_link_map_offsets); - if (tdep->fp_model == ARM_FLOAT_AUTO) tdep->fp_model = ARM_FLOAT_SOFT_VFP; + + /* NetBSD ELF uses SVR4-style shared libraries. */ + set_solib_svr4_fetch_link_map_offsets + (gdbarch, svr4_lp64_fetch_link_map_offsets); } static enum gdb_osabi diff --git a/gdb/config/arm/nbsd.mt b/gdb/config/arm/nbsd.mt index e9dd0d01496..75c07069d58 100644 --- a/gdb/config/arm/nbsd.mt +++ b/gdb/config/arm/nbsd.mt @@ -1,3 +1,2 @@ -# Target: ARM running NetBSD -TDEPFILES= arm-tdep.o armnbsd-tdep.o solib.o solib-svr4.o nbsd-tdep.o -DEPRECATED_TM_FILE=solib.h +# Target: NetBSD/arm +TDEPFILES= arm-tdep.o armnbsd-tdep.o solib.o solib-svr4.o