On mips, gdb explicitly looks for the symbol "__dl_runtime_resolve" so change

the name of our mips resolver function to match gdb's expectations.

diff --git a/ldso/ldso/mips/dl-sysdep.h b/ldso/ldso/mips/dl-sysdep.h
index 7fc75b7..ed11ae9 100644 (file)
--- a/ldso/ldso/mips/dl-sysdep.h
+++ b/ldso/ldso/mips/dl-sysdep.h
@@ -37,7 +37,7 @@ do {                                                                          \
                continue;                                                       \
                                                                                \
        /* Fill in first two GOT entries according to the ABI */                \
-       GOT_BASE[0] = (unsigned long) _dl_linux_resolve;                        \
+       GOT_BASE[0] = (unsigned long) _dl_runtime_resolve;                      \
        GOT_BASE[1] = (unsigned long) MODULE;                                   \
                                                                                \
        /* Add load address displacement to all local GOT entries */            \
@@ -57,7 +57,7 @@ do {                                                                          \
 #define ELF_TARGET "MIPS"
 
 
-unsigned long _dl_linux_resolver(unsigned long sym_index,
+unsigned long __dl_runtime_resolve(unsigned long sym_index,
        unsigned long old_gpreg);
 
 struct elf_resolve;

diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c
index c551d6c..5956530 100644 (file)
--- a/ldso/ldso/mips/elfinterp.c
+++ b/ldso/ldso/mips/elfinterp.c
@@ -103,11 +103,11 @@ static void debug_reloc(Elf32_Sym *symtab,char *strtab, ELF_RELOC *rpnt)
 }
 #endif
 
-extern int _dl_linux_resolve(void);
+extern int _dl_runtime_resolve(void);
 
 #define OFFSET_GP_GOT 0x7ff0
 
-unsigned long _dl_linux_resolver(unsigned long sym_index,
+unsigned long __dl_runtime_resolve(unsigned long sym_index,
        unsigned long old_gpreg)
 {
        unsigned long *got = (unsigned long *) (old_gpreg - OFFSET_GP_GOT);

diff --git a/ldso/ldso/mips/resolve.S b/ldso/ldso/mips/resolve.S
index 293e4a6..8b49294 100644 (file)
--- a/ldso/ldso/mips/resolve.S
+++ b/ldso/ldso/mips/resolve.S
@@ -13,10 +13,10 @@
  */
 .text
 .align 2
-.globl _dl_linux_resolve
-.type  _dl_linux_resolve,@function
-.ent   _dl_linux_resolve
-_dl_linux_resolve:
+.globl _dl_runtime_resolve
+.type  _dl_runtime_resolve,@function
+.ent   _dl_runtime_resolve
+_dl_runtime_resolve:
        .frame  $29, 40, $31
        .set noreorder
        move    $3, $28         # Save GP
@@ -32,7 +32,7 @@ _dl_linux_resolve:
        sw      $7, 28($29)
        move    $4, $24
        move    $5, $3
-       jal     _dl_linux_resolver
+       jal     __dl_runtime_resolve
        lw      $31, 36($29)
        lw      $4, 16($29)
        lw      $5, 20($29)
@@ -41,5 +41,5 @@ _dl_linux_resolve:
        addu    $29, 40
        move    $25, $2
        jr      $25
-.size _dl_linux_resolve,.-_dl_linux_resolve
-.end _dl_linux_resolve
+.size _dl_runtime_resolve,.-_dl_runtime_resolve
+.end _dl_runtime_resolve