aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--elf/dl-runtime.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 53bfab3..95e1809 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-11-17 Joseph Myers <joseph@codesourcery.com>
+ * elf/dl-runtime.c [!ELF_MACHINE_NO_PLT]: Make code unconditional.
+
* posix/getconf-speclist.c: New file.
* posix/posix-envs.def: Likewise.
* posix/confstr.c (START_ENV_GROUP): New macro.
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>