svn commit: r209239 - head/libexec/rtld-elf/mips

Jayachandran C. jchandra at FreeBSD.org
Wed Jun 16 16:39:02 UTC 2010


Author: jchandra
Date: Wed Jun 16 16:39:01 2010
New Revision: 209239
URL: http://svn.freebsd.org/changeset/base/209239

Log:
  Merge jmallett@'s n64 work into HEAD - changeset 3
  
  Update rtld MIPS code to use assembly macros that work on o32/n64.
  
  Changes from http://svn.freebsd.org/base/user/jmallett/octeon
  
  Approved by:	rrs(mentor), jmallett

Modified:
  head/libexec/rtld-elf/mips/rtld_start.S

Modified: head/libexec/rtld-elf/mips/rtld_start.S
==============================================================================
--- head/libexec/rtld-elf/mips/rtld_start.S	Wed Jun 16 16:37:36 2010	(r209238)
+++ head/libexec/rtld-elf/mips/rtld_start.S	Wed Jun 16 16:39:01 2010	(r209239)
@@ -68,7 +68,8 @@ LEAF(rtld_start)
 	move	a0, s0			/* sp */
 	PTR_ADDU a1, sp, 2*PTR_SIZE	/* &our atexit function */
 	PTR_ADDU a2, sp, 3*PTR_SIZE	/* obj_main entry */
-	jal	_C_LABEL(_rtld)		/* v0 = _rtld(sp, cleanup, objp) */
+	PTR_LA	t9, _C_LABEL(_rtld)
+	jalr	t9			/* v0 = _rtld(sp, cleanup, objp) */
 	 nop
 
 	PTR_L	a1, 2*PTR_SIZE(sp)	/* our atexit function */
@@ -123,7 +124,7 @@ _rtld_bind_start:
 	move	s0, sp
 
 	move	a0, v1			/* old GP */
-	subu	a0, a0, 0x7ff0		/* The offset of $gp from the	*/
+	PTR_SUBU	a0, a0, 0x7ff0		/* The offset of $gp from the	*/
        					/* beginning of the .got section: */
 					/* $gp = .got + 0x7ff0, so	*/
 					/* .got = $gp - 0x7ff0		*/
@@ -136,7 +137,8 @@ _rtld_bind_start:
 	and	a0, a0, 0x7fffffff
 	move	a1, t8			/* symbol index */
 
-	jal	_C_LABEL(_mips_rtld_bind)
+	PTR_LA	t9, _C_LABEL(_mips_rtld_bind)
+	jalr	t9
 	 nop
 
 	move	sp, s0


More information about the svn-src-head mailing list