about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-11-17 01:51:20 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-11-17 01:51:20 +0000
commit150dc1a05a8028efb5bfdc79158e631384d1cd5b (patch)
tree5389557a56295c1f8fded098e9f9faaca0c144ee /elf
parent531f1ae0a79b9c3a91654750b11d25b256d7215f (diff)
downloadglibc-150dc1a05a8028efb5bfdc79158e631384d1cd5b.tar.gz
glibc-150dc1a05a8028efb5bfdc79158e631384d1cd5b.tar.xz
glibc-150dc1a05a8028efb5bfdc79158e631384d1cd5b.zip
Remove ELF_MACHINE_NO_PLT conditionals.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-runtime.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index 7a3bc9ed9d..19543aa44b 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>