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-696-g786b0b6
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 18 Nov 2012 15:31:50 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-696-g786b0b6
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 786b0b67a3019e84988a6d5a79fd97801580a1cd (commit)
from 67f2b51c62cb0367e30f26a8865d77fc6461bdb3 (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=786b0b67a3019e84988a6d5a79fd97801580a1cd
commit 786b0b67a3019e84988a6d5a79fd97801580a1cd
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Tue Oct 30 21:51:58 2012 +0100
Fix ifunc configure check for 64-bit targets
diff --git a/ChangeLog b/ChangeLog
index 9bdff02..de3de3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-18 Andreas Schwab <schwab@linux-m68k.org>
+
+ * configure.in (libc_cv_ld_gnu_indirect_function): Use .quad on
+ 64-bit targets.
+ * configure: Regenerated.
+
2012-11-17 David S. Miller <davem@davemloft.net>
[BZ #14811]
diff --git a/configure b/configure
index 980f25f..1927ce8 100755
--- a/configure
+++ b/configure
@@ -4217,7 +4217,7 @@ $as_echo_n "checking for assembler and linker STT_GNU_IFUNC support... " >&6; }
if ${libc_cv_ld_gnu_indirect_function+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat > conftest.s <<EOF
+ cat > conftest.S <<EOF
.type foo,%gnu_indirect_function
foo:
.globl _start
@@ -4225,12 +4225,16 @@ _start:
.globl __start
__start:
.data
+#ifdef _LP64
+.quad foo
+#else
.long foo
+#endif
EOF
libc_cv_ld_gnu_indirect_function=no
if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
-nostartfiles -nostdlib \
- -o conftest conftest.s 1>&5 2>&5; then
+ -o conftest conftest.S 1>&5 2>&5; then
# Do a link to see if the backend supports IFUNC relocs.
$READELF -r conftest 1>&5
LC_ALL=C $READELF -r conftest | grep 'no relocations' >/dev/null || {
diff --git a/configure.in b/configure.in
index 7c05903..9decd7d 100644
--- a/configure.in
+++ b/configure.in
@@ -577,7 +577,7 @@ fi
# For the multi-arch option we need support in the assembler & linker.
AC_CACHE_CHECK([for assembler and linker STT_GNU_IFUNC support],
libc_cv_ld_gnu_indirect_function, [dnl
-cat > conftest.s <<EOF
+cat > conftest.S <<EOF
.type foo,%gnu_indirect_function
foo:
.globl _start
@@ -585,12 +585,16 @@ _start:
.globl __start
__start:
.data
+#ifdef _LP64
+.quad foo
+#else
.long foo
+#endif
EOF
libc_cv_ld_gnu_indirect_function=no
if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
-nostartfiles -nostdlib \
- -o conftest conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
+ -o conftest conftest.S 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
# Do a link to see if the backend supports IFUNC relocs.
$READELF -r conftest 1>&AS_MESSAGE_LOG_FD
LC_ALL=C $READELF -r conftest | grep 'no relocations' >/dev/null || {
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
configure | 8 ++++++--
configure.in | 8 ++++++--
3 files changed, 18 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources