This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-688-g150dc1a
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Nov 2012 01:51:32 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-688-g150dc1a
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 150dc1a05a8028efb5bfdc79158e631384d1cd5b (commit)
from 531f1ae0a79b9c3a91654750b11d25b256d7215f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=150dc1a05a8028efb5bfdc79158e631384d1cd5b
commit 150dc1a05a8028efb5bfdc79158e631384d1cd5b
Author: Joseph Myers <joseph@codesourcery.com>
Date: Sat Nov 17 01:51:20 2012 +0000
Remove ELF_MACHINE_NO_PLT conditionals.
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>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
elf/dl-runtime.c | 6 ++----
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources