summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-01-29 08:20:11 +0000
committerEric Andersen <andersen@codepoet.org>2004-01-29 08:20:11 +0000
commit33d52740fa760777d694879fc842e6a8e9ece0e3 (patch)
tree89957de34a1c5f8fed6e2f3f530bd9d77c2b3c55 /ldso
parent442057f0d3f933fda14a3cdde19349211f763b4c (diff)
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
Diffstat (limited to 'ldso')
-rw-r--r--ldso/ldso/powerpc/dl-sysdep.h29
-rw-r--r--ldso/ldso/powerpc/ld_sysdep.h29
2 files changed, 20 insertions, 38 deletions
diff --git a/ldso/ldso/powerpc/dl-sysdep.h b/ldso/ldso/powerpc/dl-sysdep.h
index da6630428..8768c9ac4 100644
--- a/ldso/ldso/powerpc/dl-sysdep.h
+++ b/ldso/ldso/powerpc/dl-sysdep.h
@@ -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
diff --git a/ldso/ldso/powerpc/ld_sysdep.h b/ldso/ldso/powerpc/ld_sysdep.h
index da6630428..8768c9ac4 100644
--- a/ldso/ldso/powerpc/ld_sysdep.h
+++ b/ldso/ldso/powerpc/ld_sysdep.h
@@ -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