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

[jocke at uclibc.org]

Author: jocke
Date: 2005-03-10 09:29:22 -0700 (Thu, 10 Mar 2005)
New Revision: 9992

Log:
Use DT_RELCONT_IDX to optimize the relocation of R_PPC_RELATIVE
relocs. All RELA arches can probably copy this. REL archs
will have to delete the "+ rpnt->r_addend" from the loop.


Modified:
   trunk/uClibc/ldso/ldso/powerpc/elfinterp.c


Changeset:
Modified: trunk/uClibc/ldso/ldso/powerpc/elfinterp.c
===================================================================
--- trunk/uClibc/ldso/ldso/powerpc/elfinterp.c	2005-03-09 17:45:21 UTC (rev 9991)
+++ trunk/uClibc/ldso/ldso/powerpc/elfinterp.c	2005-03-10 16:29:22 UTC (rev 9992)
@@ -421,7 +421,7 @@
 	  int (*reloc_fnc) (struct elf_resolve *tpnt, struct dyn_elf *scope,
 			    ELF_RELOC *rpnt, Elf32_Sym *symtab, char *strtab))
 {
-	unsigned int i;
+	unsigned int i, relative_count;
 	char *strtab;
 	Elf32_Sym *symtab;
 	ELF_RELOC *rpnt;
@@ -433,7 +433,19 @@
 
 	symtab = (Elf32_Sym *)(intptr_t) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr);
 	strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
+	
+	relative_count = tpnt->dynamic_info[DT_RELCONT_IDX];
+	if (relative_count) { /* Optimize the  R_PPC_RELATIVE relocations if possible */
+		Elf32_Addr loadaddr = tpnt->loadaddr;
+		rel_size -= relative_count;
+		--rpnt;
+		do {     /* PowerPC handles pre increment/decrement better */ 
+			Elf32_Addr *const reloc_addr = (void *) (loadaddr + (++rpnt)->r_offset);
 
+			*reloc_addr =  loadaddr + rpnt->r_addend;
+		} while (--relative_count);
+	}
+
 	  for (i = 0; i < rel_size; i++, rpnt++) {
 	        int res;