diff mbox series

[v3,3/3] elf: tst-dlmopen4: use target specific r_debug_offset function

Message ID 0a20f5ff9eba19fcf874932315e21f4cb1c1be14.camel@mengyan1223.wang
State Superseded
Headers show
Series mips: add target-specific r_debug offset | expand

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit fail Patch series failed to apply

Commit Message

Xi Ruoyao Jan. 28, 2022, 10:08 p.m. UTC
Fix the test failure on MIPS.
---
 elf/tst-dlmopen4.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/elf/tst-dlmopen4.c b/elf/tst-dlmopen4.c
index d8bcf7e9d5..28e052f199 100644
--- a/elf/tst-dlmopen4.c
+++ b/elf/tst-dlmopen4.c
@@ -25,16 +25,10 @@ 
 #include <support/check.h>
 #include <support/test-driver.h>
 
-#ifndef ELF_MACHINE_GET_R_DEBUG
-# define ELF_MACHINE_GET_R_DEBUG(d) \
-    (__extension__ ({ 						\
-      struct r_debug_extended *debug;				\
-      if ((d)->d_tag == DT_DEBUG)				\
-	debug = (struct r_debug_extended *) (d)->d_un.d_ptr;	\
-      else							\
-	debug = NULL;						\
-      debug; }))
-#endif
+#define E(x) x
+#define EW(x) ElfW(x)
+#define R_DEBUG_IN_PROCESS
+#include <elfxx-r_debug.h>
 
 static int
 do_test (void)
@@ -44,7 +38,7 @@  do_test (void)
 
   for (d = _DYNAMIC; d->d_tag != DT_NULL; ++d)
     {
-      debug = ELF_MACHINE_GET_R_DEBUG (d);
+      debug = (struct r_debug_extended *) r_debug_offset (d, 0, 0);
       if (debug != NULL)
 	break;
     }