From 76a9d10f5261cea3442e1b9e7239f1eef27959a8 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 15 Jan 2006 18:28:58 +0000 Subject: * arm-linux-tdep.c (arm_linux_svr4_fetch_link_map_offsets): Remove. (arm_linux_init_abi): Set solib_svr4_fetch_link_map_offsets to svr4_ilp32_fetch_link_map_offsets. * cris-tdep.c (cris_linux_svr4_fetch_link_map_offsets): Remove function. (cris_gdbarch_init): Set solib_svr4_fetch_link_map_offsets to svr4_ilp32_fetch_link_map_offsets. * mips-linux-tdep.c (mips_linux_svr4_fetch_link_map_offsets) (mips64_linux_svr4_fetch_link_map_offsets): Remove functions. (mips_linux_init_abi): Set solib_svr4_fetch_link_map_offsets to svr4_ilp32_fetch_link_map_offsets or svr4_lp64_fetch_link_map_offsets where appropriate. * nbsd-tdep.c (nbsd_ilp32_solib_svr4_fetch_link_map_offsets): Simply call svr4_ilp32_fetch_link_map_offsets. (nbsd_lp64_solib_svr4_fetch_link_map_offsets): Simply call svr4_lp64_fetch_link_map_offsets. * ppc-linux-tdep.c (ppc_linux_svr4_fetch_link_map_offsets): Remove function. (ppc_linux_init_abi): Set solib_svr4_fetch_link_map_offsets to svr4_ilp32_fetch_link_map_offsets. * s390-tdep.c (s390_svr4_fetch_link_map_offsets) (s390x_svr4_fetch_link_map_offsets): Remove functions. (s390_gdbarch_init): Set solib_svr4_fetch_link_map_offsets to svr4_ilp32_fetch_link_map_offsets or svr4_lp64_fetch_link_map_offsets where appropriate. --- gdb/arm-linux-tdep.c | 47 ++--------------------------------------------- 1 file changed, 2 insertions(+), 45 deletions(-) (limited to 'gdb/arm-linux-tdep.c') diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c index 93db35b..b8c0d25 100644 --- a/gdb/arm-linux-tdep.c +++ b/gdb/arm-linux-tdep.c @@ -1,6 +1,6 @@ /* GNU/Linux on ARM target support. - Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GDB. @@ -212,49 +212,6 @@ arm_linux_extract_return_value (struct type *type, with. Before the fixup/resolver code returns, it actually calls the requested function and repairs &GOT[n+3]. */ -/* Fetch, and possibly build, an appropriate link_map_offsets structure - for ARM linux targets using the struct offsets defined in . - Note, however, that link.h is not actually referred to in this file. - Instead, the relevant structs offsets were obtained from examining - link.h. (We can't refer to link.h from this file because the host - system won't necessarily have it, or if it does, the structs which - it defines will refer to the host system, not the target). */ - -static struct link_map_offsets * -arm_linux_svr4_fetch_link_map_offsets (void) -{ - static struct link_map_offsets lmo; - static struct link_map_offsets *lmp = 0; - - if (lmp == 0) - { - lmp = &lmo; - - lmo.r_debug_size = 8; /* Actual size is 20, but this is all we - need. */ - - lmo.r_map_offset = 4; - lmo.r_map_size = 4; - - lmo.link_map_size = 20; /* Actual size is 552, but this is all we - need. */ - - lmo.l_addr_offset = 0; - lmo.l_addr_size = 4; - - lmo.l_name_offset = 4; - lmo.l_name_size = 4; - - lmo.l_next_offset = 12; - lmo.l_next_size = 4; - - lmo.l_prev_offset = 16; - lmo.l_prev_size = 4; - } - - return lmp; -} - /* The constants below were determined by examining the following files in the linux kernel sources: @@ -391,7 +348,7 @@ arm_linux_init_abi (struct gdbarch_info info, tdep->jb_elt_size = ARM_LINUX_JB_ELEMENT_SIZE; set_solib_svr4_fetch_link_map_offsets - (gdbarch, arm_linux_svr4_fetch_link_map_offsets); + (gdbarch, svr4_ilp32_fetch_link_map_offsets); /* The following override shouldn't be needed. */ set_gdbarch_deprecated_extract_return_value (gdbarch, arm_linux_extract_return_value); -- cgit v1.1