This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[COMMIT] Some NetBSD/mips shared library tweaks
- From: Mark Kettenis <kettenis at gnu dot org>
- To: gdb-patches at sources dot redhat dot com
- Date: Sun, 7 Nov 2004 18:57:14 +0100 (CET)
- Subject: [COMMIT] Some NetBSD/mips shared library tweaks
This brings things more in line with the generic code in solib-svr4.c.
Committed,
Mark
Index: ChangeLog from Mark Kettenis <kettenis@gnu.org>
* mipsnbsd-tdep.c (mipsnbsd_ilp32_fetch_link_map_offsets): Renamed
from mipsnbsd_ilp32_solib_svr4_fetch_link_map_offsets. Trim sizes
to only include the structure members we actually need.
(mipsnbsd_lp64_fetch_link_map_offsets): Renamed from
mipsnbsd_lp64_solib_svr4_fetch_link_map_offsets. Trim sizes to
only include the structure members we actually need.
(mipsnbsd_init_abi): Update.
Index: mipsnbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mipsnbsd-tdep.c,v
retrieving revision 1.18
diff -u -p -r1.18 mipsnbsd-tdep.c
--- mipsnbsd-tdep.c 30 Oct 2004 21:40:48 -0000 1.18
+++ mipsnbsd-tdep.c 7 Nov 2004 17:48:45 -0000
@@ -312,10 +312,13 @@ mipsnbsd_cannot_store_register (int regn
|| regno == mips_regnum (current_gdbarch)->fp_implementation_revision);
}
-/* NetBSD/mips uses a slightly different link_map structure from the
+/* Shared library support. */
+
+/* NetBSD/mips uses a slightly different `struct link_map' than the
other NetBSD platforms. */
+
static struct link_map_offsets *
-mipsnbsd_ilp32_solib_svr4_fetch_link_map_offsets (void)
+mipsnbsd_ilp32_fetch_link_map_offsets (void)
{
static struct link_map_offsets lmo;
static struct link_map_offsets *lmp = NULL;
@@ -324,22 +327,19 @@ mipsnbsd_ilp32_solib_svr4_fetch_link_map
{
lmp = &lmo;
- lmo.r_debug_size = 16;
-
+ /* Everything we need is in the first 8 bytes. */
+ lmo.r_debug_size = 8;
lmo.r_map_offset = 4;
lmo.r_map_size = 4;
+ /* Everything we need is in the first 24 bytes. */
lmo.link_map_size = 24;
-
lmo.l_addr_offset = 4;
lmo.l_addr_size = 4;
-
lmo.l_name_offset = 8;
lmo.l_name_size = 4;
-
lmo.l_next_offset = 16;
lmo.l_next_size = 4;
-
lmo.l_prev_offset = 20;
lmo.l_prev_size = 4;
}
@@ -348,7 +348,7 @@ mipsnbsd_ilp32_solib_svr4_fetch_link_map
}
static struct link_map_offsets *
-mipsnbsd_lp64_solib_svr4_fetch_link_map_offsets (void)
+mipsnbsd_lp64_fetch_link_map_offsets (void)
{
static struct link_map_offsets lmo;
static struct link_map_offsets *lmp = NULL;
@@ -357,28 +357,26 @@ mipsnbsd_lp64_solib_svr4_fetch_link_map_
{
lmp = &lmo;
- lmo.r_debug_size = 32;
-
+ /* Everything we need is in the first 16 bytes. */
+ lmo.r_debug_size = 16;
lmo.r_map_offset = 8;
lmo.r_map_size = 8;
+ /* Everything we need is in the first 40 bytes. */
lmo.link_map_size = 48;
-
lmo.l_addr_offset = 0;
lmo.l_addr_size = 8;
-
lmo.l_name_offset = 16;
lmo.l_name_size = 8;
-
lmo.l_next_offset = 32;
lmo.l_next_size = 8;
-
lmo.l_prev_offset = 40;
lmo.l_prev_size = 8;
}
return lmp;
}
+
static void
mipsnbsd_init_abi (struct gdbarch_info info,
@@ -394,10 +392,11 @@ mipsnbsd_init_abi (struct gdbarch_info i
set_gdbarch_software_single_step (gdbarch, mips_software_single_step);
- set_solib_svr4_fetch_link_map_offsets (gdbarch,
- gdbarch_ptr_bit (gdbarch) == 32 ?
- mipsnbsd_ilp32_solib_svr4_fetch_link_map_offsets :
- mipsnbsd_lp64_solib_svr4_fetch_link_map_offsets);
+ /* NetBSD/mips has SVR4-style shared libraries. */
+ set_solib_svr4_fetch_link_map_offsets
+ (gdbarch, (gdbarch_ptr_bit (gdbarch) == 32 ?
+ mipsnbsd_ilp32_fetch_link_map_offsets :
+ mipsnbsd_lp64_fetch_link_map_offsets));
}