This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Remove ELF_MACHINE_NO_PLT conditionals
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Fri, 16 Nov 2012 18:24:34 +0000
- Subject: Remove ELF_MACHINE_NO_PLT conditionals
The macro ELF_MACHINE_NO_PLT was formerly used to disable some dynamic
linker code for MIPS. MIPS no longer defines it, since 2008-10-01
(MIPS non-PIC ABI support), no other architecture defines it and I
don't think it's likely any other architecture will repeat the
peculiarities of MIPS ELF.
Thus I propose this patch to remove conditions on this unused macro.
Tested x86_64.
2012-11-16 Joseph Myers <joseph@codesourcery.com>
* elf/dl-runtime.c [!ELF_MACHINE_NO_PLT]: Make code unconditional.
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index 7a3bc9e..19543aa 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -56,7 +56,6 @@
to that address. Future calls will bounce directly from the PLT to the
function. */
-#ifndef ELF_MACHINE_NO_PLT
DL_FIXUP_VALUE_TYPE
__attribute ((noinline)) ARCH_FIXUP_ATTRIBUTE
_dl_fixup (
@@ -150,9 +149,8 @@ _dl_fixup (
return elf_machine_fixup_plt (l, result, reloc, rel_addr, value);
}
-#endif
-#if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__
+#if !defined PROF && !__BOUNDED_POINTERS__
DL_FIXUP_VALUE_TYPE
__attribute ((noinline)) ARCH_FIXUP_ATTRIBUTE
_dl_profile_fixup (
@@ -437,7 +435,7 @@ _dl_profile_fixup (
return value;
}
-#endif /* PROF && ELF_MACHINE_NO_PLT */
+#endif /* PROF */
#include <stdio.h>
--
Joseph S. Myers
joseph@codesourcery.com