[uClibc-cvs] uClibc/ldso/ldso/powerpc ld_sysdep.h,1.8,1.9
Erik Andersen
andersen at uclibc.org
Thu Jan 29 08:20:14 UTC 2004
Update of /var/cvs/uClibc/ldso/ldso/powerpc
In directory nail:/tmp/cvs-serv9617
Modified Files:
ld_sysdep.h
Log Message:
Patch from Joakim Tjernlund:
Removed R_PPC_NONE and R_PPC_REL24 as these does not seem to be used.
Corrected R_PPC_ADDR32 and R_PPC_JMP_SLOT
Index: ld_sysdep.h
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/powerpc/ld_sysdep.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ld_sysdep.h 17 Dec 2003 08:05:42 -0000 1.8
+++ ld_sysdep.h 29 Jan 2004 08:20:11 -0000 1.9
@@ -70,30 +70,21 @@
* SYMBOL is the symbol involved in the relocation, and LOAD is the
* load address.
*/
-// finaladdr = LOAD ?
#define PERFORM_BOOTSTRAP_RELOC(RELP,REL,SYMBOL,LOAD,SYMTAB) \
{int type=ELF32_R_TYPE((RELP)->r_info); \
- if(type==R_PPC_NONE){ \
- }else if(type==R_PPC_ADDR32){ \
- *REL += (SYMBOL); \
- }else if(type==R_PPC_RELATIVE){ \
- *REL = (Elf32_Word)(LOAD) + (RELP)->r_addend; \
- }else if(type==R_PPC_REL24){ \
- Elf32_Sword delta = (Elf32_Word)(SYMBOL) - (Elf32_Word)(REL); \
- *REL &= 0xfc000003; \
- *REL |= (delta & 0x03fffffc); \
- }else if(type==R_PPC_JMP_SLOT){ \
- Elf32_Sword delta = (Elf32_Word)(SYMBOL) - (Elf32_Word)(REL); \
- /*if (delta << 6 >> 6 != delta)_dl_exit(99);*/ \
- *REL = OPCODE_B(delta); \
- }else{ \
+ Elf32_Addr finaladdr=(SYMBOL)+(RELP)->r_addend;\
+ if (type==R_PPC_RELATIVE) { \
+ *REL=(Elf32_Word)(LOAD)+(RELP)->r_addend;\
+ } else if (type==R_PPC_JMP_SLOT) { \
+ Elf32_Sword delta=finaladdr-(Elf32_Word)(REL);\
+ *REL=OPCODE_B(delta); \
+ } else if (type==R_PPC_ADDR32) { \
+ *REL=finaladdr; \
+ } else { \
_dl_exit(100+ELF32_R_TYPE((RELP)->r_info)); \
} \
- if(type!=R_PPC_NONE){ \
- PPC_DCBST(REL); PPC_SYNC; PPC_ICBI(REL);\
- } \
+ PPC_DCBST(REL); PPC_SYNC; PPC_ICBI(REL); \
}
-
/*
* Transfer control to the user's application, once the dynamic loader
* is done. This routine has to exit the current function, then
More information about the uClibc-cvs
mailing list