[uClibc-cvs] svn commit: trunk/uClibc/ldso/ldso/mips

andersen at uclibc.org andersen at uclibc.org
Sun May 1 07:13:10 UTC 2005


Author: andersen
Date: 2005-05-01 01:13:09 -0600 (Sun, 01 May 2005)
New Revision: 10221

Log:
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.


Modified:
   trunk/uClibc/ldso/ldso/mips/dl-sysdep.h
   trunk/uClibc/ldso/ldso/mips/elfinterp.c
   trunk/uClibc/ldso/ldso/mips/resolve.S


Changeset:
Modified: trunk/uClibc/ldso/ldso/mips/dl-sysdep.h
===================================================================
--- trunk/uClibc/ldso/ldso/mips/dl-sysdep.h	2005-05-01 05:31:44 UTC (rev 10220)
+++ trunk/uClibc/ldso/ldso/mips/dl-sysdep.h	2005-05-01 07:13:09 UTC (rev 10221)
@@ -37,7 +37,7 @@
 		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 @@
 #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;

Modified: trunk/uClibc/ldso/ldso/mips/elfinterp.c
===================================================================
--- trunk/uClibc/ldso/ldso/mips/elfinterp.c	2005-05-01 05:31:44 UTC (rev 10220)
+++ trunk/uClibc/ldso/ldso/mips/elfinterp.c	2005-05-01 07:13:09 UTC (rev 10221)
@@ -103,11 +103,11 @@
 }
 #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);

Modified: trunk/uClibc/ldso/ldso/mips/resolve.S
===================================================================
--- trunk/uClibc/ldso/ldso/mips/resolve.S	2005-05-01 05:31:44 UTC (rev 10220)
+++ trunk/uClibc/ldso/ldso/mips/resolve.S	2005-05-01 07:13:09 UTC (rev 10221)
@@ -13,10 +13,10 @@
  */
 .text
 .align	2
-.globl	_dl_linux_resolve
-.type	_dl_linux_resolve, at function
-.ent	_dl_linux_resolve
-_dl_linux_resolve:
+.globl	_dl_runtime_resolve
+.type	_dl_runtime_resolve, at function
+.ent	_dl_runtime_resolve
+_dl_runtime_resolve:
 	.frame	$29, 40, $31
 	.set noreorder
 	move	$3, $28		# Save GP
@@ -32,7 +32,7 @@
 	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 @@
 	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




More information about the uClibc-cvs mailing list