summaryrefslogtreecommitdiff
path: root/ldso/ldso/ldso.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-01-29 11:42:46 +0000
committerEric Andersen <andersen@codepoet.org>2004-01-29 11:42:46 +0000
commit8391a5231556a37c6f7eef871c3e310e91623b00 (patch)
treec9db585d48ae03c1f37146720780f0f3e5c1cd31 /ldso/ldso/ldso.c
parent8e5b520d884b4793f69415b303d6f4447a7521c2 (diff)
Scrub up use of ELF_USES_RELOCA and eliminte some unsightly ifdefs
Diffstat (limited to 'ldso/ldso/ldso.c')
-rw-r--r--ldso/ldso/ldso.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index 8d5d08e1e..f563a570a 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -565,17 +565,10 @@ LD_BOOT(unsigned long args)
unsigned long rel_addr, rel_size;
-#ifdef ELF_USES_RELOCA
rel_addr = (indx ? tpnt->dynamic_info[DT_JMPREL] : tpnt->
- dynamic_info[DT_RELA]);
+ dynamic_info[DT_RELOC_TABLE_ADDR]);
rel_size = (indx ? tpnt->dynamic_info[DT_PLTRELSZ] : tpnt->
- dynamic_info[DT_RELASZ]);
-#else
- rel_addr = (indx ? tpnt->dynamic_info[DT_JMPREL] : tpnt->
- dynamic_info[DT_REL]);
- rel_size = (indx ? tpnt->dynamic_info[DT_PLTRELSZ] : tpnt->
- dynamic_info[DT_RELSZ]);
-#endif
+ dynamic_info[DT_RELOC_TABLE_SIZE]);
if (!rel_addr)
continue;