From 4a1ff3c313645aa425a0a87459c907dad1b9ca4b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:31:06 +0000 Subject: [PATCH] 'yes' within the path sets wrong config variables It seems that the 'AC_EGREP_CPP(yes...' example is quite popular but being such a short word to grep it is likely to produce false-positive matches with the path it is configured into. The change is to use a more elaborated string to grep for. Upstream-Status: Submitted [libc-alpha@sourceware.org] Signed-off-by: Benjamin Esquivel Signed-off-by: Khem Raj --- sysdeps/aarch64/configure | 4 ++-- sysdeps/aarch64/configure.ac | 4 ++-- sysdeps/arm/configure | 4 ++-- sysdeps/arm/configure.ac | 4 ++-- sysdeps/mips/configure | 4 ++-- sysdeps/mips/configure.ac | 4 ++-- sysdeps/unix/sysv/linux/mips/configure | 4 ++-- sysdeps/unix/sysv/linux/mips/configure.ac | 4 ++-- sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | 8 ++++---- sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac | 8 ++++---- 10 files changed, 24 insertions(+), 24 deletions(-) mode change 100644 => 100755 sysdeps/arm/configure mode change 100644 => 100755 sysdeps/mips/configure mode change 100644 => 100755 sysdeps/unix/sysv/linux/mips/configure mode change 100644 => 100755 sysdeps/unix/sysv/linux/powerpc/powerpc64/configure diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure index 4bd5496a4a..6c051369fb 100755 --- a/sysdeps/aarch64/configure +++ b/sysdeps/aarch64/configure @@ -157,12 +157,12 @@ else case e in #( e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __AARCH64EB__ - yes + is_aarch64_be #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 + $EGREP_TRADITIONAL "is_aarch64_be" >/dev/null 2>&1 then : libc_cv_aarch64_be=yes else case e in #( diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac index 56d12d661d..80fca20873 100644 --- a/sysdeps/aarch64/configure.ac +++ b/sysdeps/aarch64/configure.ac @@ -13,8 +13,8 @@ AC_DEFINE(SUPPORT_STATIC_PIE) # the dynamic linker via %ifdef. AC_CACHE_CHECK([for big endian], [libc_cv_aarch64_be], - [AC_EGREP_CPP(yes,[#ifdef __AARCH64EB__ - yes + [AC_EGREP_CPP(is_aarch64_be,[#ifdef __AARCH64EB__ + is_aarch64_be #endif ], libc_cv_aarch64_be=yes, libc_cv_aarch64_be=no)]) if test $libc_cv_aarch64_be = yes; then diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure old mode 100644 new mode 100755 index 935e022c74..9f7c98bcd3 --- a/sysdeps/arm/configure +++ b/sysdeps/arm/configure @@ -153,12 +153,12 @@ else case e in #( e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __ARM_PCS_VFP - yes + use_arm_pcs_vfp #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 + $EGREP_TRADITIONAL "use_arm_pcs_vfp" >/dev/null 2>&1 then : libc_cv_arm_pcs_vfp=yes else case e in #( diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac index cd00ddc9d9..d3831867ac 100644 --- a/sysdeps/arm/configure.ac +++ b/sysdeps/arm/configure.ac @@ -10,8 +10,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # the dynamic linker via %ifdef. AC_CACHE_CHECK([whether the compiler is using the ARM hard-float ABI], [libc_cv_arm_pcs_vfp], - [AC_EGREP_CPP(yes,[#ifdef __ARM_PCS_VFP - yes + [AC_EGREP_CPP(use_arm_pcs_vfp,[#ifdef __ARM_PCS_VFP + use_arm_pcs_vfp #endif ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)]) if test $libc_cv_arm_pcs_vfp = yes; then diff --git a/sysdeps/mips/configure b/sysdeps/mips/configure old mode 100644 new mode 100755 index 60dbd947e2..e3d10d7b96 --- a/sysdeps/mips/configure +++ b/sysdeps/mips/configure @@ -150,11 +150,11 @@ else case e in #( /* end confdefs.h. */ dnl #ifdef __mips_nan2008 -yes +use_mips_nan2008 #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 + $EGREP_TRADITIONAL "use_mips_nan2008" >/dev/null 2>&1 then : libc_cv_mips_nan2008=yes else case e in #( diff --git a/sysdeps/mips/configure.ac b/sysdeps/mips/configure.ac index d3cd780d78..250223d206 100644 --- a/sysdeps/mips/configure.ac +++ b/sysdeps/mips/configure.ac @@ -6,9 +6,9 @@ dnl position independent way. AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC) AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding], - libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl + libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl #ifdef __mips_nan2008 -yes +use_mips_nan2008 #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)]) if test x$libc_cv_mips_nan2008 = xyes; then AC_DEFINE(HAVE_MIPS_NAN2008) diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure old mode 100644 new mode 100755 index 6e3402c111..a23f24ef8e --- a/sysdeps/unix/sysv/linux/mips/configure +++ b/sysdeps/unix/sysv/linux/mips/configure @@ -443,11 +443,11 @@ else case e in #( /* end confdefs.h. */ dnl #ifdef __mips_nan2008 -yes +use_mips_nan2008 #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 + $EGREP_TRADITIONAL "use_mips_nan2008" >/dev/null 2>&1 then : libc_cv_mips_nan2008=yes else case e in #( diff --git a/sysdeps/unix/sysv/linux/mips/configure.ac b/sysdeps/unix/sysv/linux/mips/configure.ac index 049a0f4bdf..005526d4e8 100644 --- a/sysdeps/unix/sysv/linux/mips/configure.ac +++ b/sysdeps/unix/sysv/linux/mips/configure.ac @@ -105,9 +105,9 @@ AC_COMPILE_IFELSE( LIBC_CONFIG_VAR([mips-mode-switch],[${libc_mips_mode_switch}]) AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding], - libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl + libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl #ifdef __mips_nan2008 -yes +use_mips_nan2008 #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)]) libc_mips_nan= diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure old mode 100644 new mode 100755 index 5dd70689fc..7d6c2322d3 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure @@ -160,12 +160,12 @@ else case e in #( e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if _CALL_ELF == 2 - yes + use_ppc_elfv2_abi #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 + $EGREP_TRADITIONAL "use_ppc_elfv2_abi" >/dev/null 2>&1 then : libc_cv_ppc64_elfv2_abi=yes else case e in #( @@ -197,12 +197,12 @@ else case e in #( e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef _CALL_ELF - yes + is_def_call_elf #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 + $EGREP_TRADITIONAL "is_def_call_elf" >/dev/null 2>&1 then : libc_cv_ppc64_def_call_elf=yes else case e in #( diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac index f9cba6e15d..b21f72f1e4 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac @@ -6,8 +6,8 @@ LIBC_SLIBDIR_RTLDDIR([lib64], [lib64]) # Define default-abi according to compiler flags. AC_CACHE_CHECK([whether the compiler is using the PowerPC64 ELFv2 ABI], [libc_cv_ppc64_elfv2_abi], - [AC_EGREP_CPP(yes,[#if _CALL_ELF == 2 - yes + [AC_EGREP_CPP(use_ppc_elfv2_abi,[#if _CALL_ELF == 2 + use_ppc_elfv2_abi #endif ], libc_cv_ppc64_elfv2_abi=yes, libc_cv_ppc64_elfv2_abi=no)]) if test $libc_cv_ppc64_elfv2_abi = yes; then @@ -19,8 +19,8 @@ else # Compiler that do not support ELFv2 ABI does not define _CALL_ELF AC_CACHE_CHECK([whether the compiler defines _CALL_ELF], [libc_cv_ppc64_def_call_elf], - [AC_EGREP_CPP(yes,[#ifdef _CALL_ELF - yes + [AC_EGREP_CPP(is_def_call_elf,[#ifdef _CALL_ELF + is_def_call_elf #endif ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)]) if test $libc_cv_ppc64_def_call_elf = no; then