This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Fix configure logic for disabling multi-arch
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: libc-alpha at sourceware dot org
- Date: Fri, 24 Feb 2012 22:07:10 +0000 (UTC)
- Subject: Fix configure logic for disabling multi-arch
When testing building with old binutils versions in preparation for
increasing the minimum binutils version for building glibc, I found
that the configure test for whether multi-arch can be supported was
broken. It uses
if test x"$libc_cv_asm_gnu_indirect_function" != xyes -a x"$libc_cv_asm_type_prefix" = xno; then
meaning that if gnu_indirect_function is unsupported, but a type
prefix is identified, then multi-arch will wrongly be considered to be
supported; it appears it should use -o not -a. This patch fixes this
(tested both with the old non-multi-arch assembler, where the build
fails for other reasons, and with a new multi-arch supporting
assembler, where the build works; in both cases the configure tests
give the right results for enabling multi-arch).
2012-02-24 Joseph Myers <joseph@codesourcery.com>
* configure.in: Use -o not -a in test for unsupported multi-arch.
* configure: Regenerated.
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
--
Joseph S. Myers
joseph@codesourcery.com