Define SVR4 link map offset fetcher for Linux/ARM.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7078df567a9c5736f2fdad0335a0ba8b024b357c..aa767ca1b12e1b8ca9e2fdf1f9b642011a2f54c6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-30  Kevin Buettner  <kevinb@redhat.com>
+
+       From Louis Hamilton  <hamilton@redhat.com>:
+       * arm-tdep.c (solib-svr4.h): Include.
+       (arm_linux_svr4_fetch_link_map_offsets): New function.
+       * config/arm/tm-linux.h (SVR4_FETCH_LINK_MAP_OFFSETS): Define.
+       (arm_linux_svr4_fetch_link_map_offsets): Declare.
+
 2001-11-30  Daniel Jacobowitz  <drow@mvista.com>
 
        * values.c (value_primitive_field): Add embedded_offset to the

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 4243fd7758c1ae4012e9067ea0091b3d0289c653..f7d91eda05bc82c442a439299c74e9939fafccdc 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -32,6 +32,7 @@
 #include "regcache.h"
 #include "doublest.h"
 #include "value.h"
+#include "solib-svr4.h"
 
 /* Each OS has a different mechanism for accessing the various
    registers stored in the sigcontext structure.
@@ -2068,6 +2069,49 @@ arm_othernames (char *names, int n)
   set_disassembly_flavor (); 
 }
 
+/* Fetch, and possibly build, an appropriate link_map_offsets structure
+   for ARM linux targets using the struct offsets defined in <link.h>.
+   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.)  */
+
+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;
+}
+
 void
 _initialize_arm_tdep (void)
 {

diff --git a/gdb/config/arm/tm-linux.h b/gdb/config/arm/tm-linux.h
index 8f18e00371681e0e9e245adc9719d1875be25a72..4ef05bb813c561a44811ce0ff78f5e602e62aa85 100644 (file)
--- a/gdb/config/arm/tm-linux.h
+++ b/gdb/config/arm/tm-linux.h
@@ -26,6 +26,10 @@
 
 #include "tm-linux.h"
 
+/* Use target-specific function to define link map offsets.  */
+extern struct link_map_offsets *arm_linux_svr4_fetch_link_map_offsets (void);
+#define SVR4_FETCH_LINK_MAP_OFFSETS() arm_linux_svr4_fetch_link_map_offsets ()
+
 /* Target byte order on ARM Linux is little endian and not selectable.  */
 #undef TARGET_BYTE_ORDER_SELECTABLE_P
 #define TARGET_BYTE_ORDER_SELECTABLE_P 0