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.15-224-g6b1d1d4
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 Feb 2012 00:29:36 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-224-g6b1d1d4
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 6b1d1d46b9344dab2fb36734c61dc9d517214a6d (commit)
from 0f8bbd69cd95c8350571763d15554b9bc3c62226 (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=6b1d1d46b9344dab2fb36734c61dc9d517214a6d
commit 6b1d1d46b9344dab2fb36734c61dc9d517214a6d
Author: Joseph Myers <joseph@codesourcery.com>
Date: Sat Feb 25 00:29:19 2012 +0000
Fix configure logic for disabling multi-arch.
diff --git a/ChangeLog b/ChangeLog
index 035c25e..27a6337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-02-24 Joseph Myers <joseph@codesourcery.com>
+ * configure.in: Use -o not -a in test for unsupported multi-arch.
+ * configure: Regenerated.
+
+2012-02-24 Joseph Myers <joseph@codesourcery.com>
+
* manual/texinfo.tex: Update to version 2012-01-19.16.
2012-02-24 Joseph Myers <joseph@codesourcery.com>
diff --git a/configure b/configure
index ea02e72..c07f60e 100755
--- a/configure
+++ b/configure
@@ -4142,7 +4142,7 @@ _ACEOF
fi
-if test x"$libc_cv_asm_gnu_indirect_function" != xyes -a x"$libc_cv_asm_type_prefix" = xno; then
+if test x"$libc_cv_asm_gnu_indirect_function" != xyes -o x"$libc_cv_asm_type_prefix" = xno; then
if test x"$multi_arch" = xyes; then
as_fn_error $? "--enable-multi-arch support requires assembler and linker support" "$LINENO" 5
else
diff --git a/configure.in b/configure.in
index af42c8a..335c796 100644
--- a/configure.in
+++ b/configure.in
@@ -598,7 +598,7 @@ if test "x$libc_cv_asm_type_prefix" != xno; then
AC_DEFINE_UNQUOTED(ASM_TYPE_DIRECTIVE_PREFIX, ${libc_cv_asm_type_prefix})
fi
-if test x"$libc_cv_asm_gnu_indirect_function" != xyes -a x"$libc_cv_asm_type_prefix" = xno; then
+if test x"$libc_cv_asm_gnu_indirect_function" != xyes -o x"$libc_cv_asm_type_prefix" = xno; then
if test x"$multi_arch" = xyes; then
AC_MSG_ERROR([--enable-multi-arch support requires assembler and linker support])
else
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
configure | 2 +-
configure.in | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources