123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260 |
- From 7be3e82b66394a7b242e56c6fc609e858b8e2436 Mon Sep 17 00:00:00 2001
- From: Khem Raj <raj.khem@gmail.com>
- 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 <benjamin.esquivel@linux.intel.com>
- Signed-off-by: Khem Raj <raj.khem@gmail.com>
- ---
- 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/nios2/configure | 4 ++--
- sysdeps/nios2/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 ++++----
- 12 files changed, 28 insertions(+), 28 deletions(-)
- diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure
- index 4c1fac49f3..597314f476 100644
- --- a/sysdeps/aarch64/configure
- +++ b/sysdeps/aarch64/configure
- @@ -157,12 +157,12 @@ else
- 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 "yes" >/dev/null 2>&1; then :
- + $EGREP "is_aarch64_be" >/dev/null 2>&1; then :
- libc_cv_aarch64_be=yes
- else
- libc_cv_aarch64_be=no
- diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac
- index 3347c13fa1..4af163c0b6 100644
- --- a/sysdeps/aarch64/configure.ac
- +++ b/sysdeps/aarch64/configure.ac
- @@ -17,8 +17,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
- index 431e843b2b..e152461138 100644
- --- a/sysdeps/arm/configure
- +++ b/sysdeps/arm/configure
- @@ -151,12 +151,12 @@ else
- 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 "yes" >/dev/null 2>&1; then :
- + $EGREP "use_arm_pcs_vfp" >/dev/null 2>&1; then :
- libc_cv_arm_pcs_vfp=yes
- else
- libc_cv_arm_pcs_vfp=no
- diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac
- index 90cdd69c75..05a262ba00 100644
- --- a/sysdeps/arm/configure.ac
- +++ b/sysdeps/arm/configure.ac
- @@ -15,8 +15,8 @@ AC_DEFINE(PI_STATIC_AND_HIDDEN)
- # 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
- index 4e13248c03..f14af952d0 100644
- --- a/sysdeps/mips/configure
- +++ b/sysdeps/mips/configure
- @@ -143,11 +143,11 @@ else
- /* end confdefs.h. */
- dnl
- #ifdef __mips_nan2008
- -yes
- +use_mips_nan2008
- #endif
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- - $EGREP "yes" >/dev/null 2>&1; then :
- + $EGREP "use_mips_nan2008" >/dev/null 2>&1; then :
- libc_cv_mips_nan2008=yes
- else
- libc_cv_mips_nan2008=no
- diff --git a/sysdeps/mips/configure.ac b/sysdeps/mips/configure.ac
- index bcbdaffd9f..ad3057f4cc 100644
- --- a/sysdeps/mips/configure.ac
- +++ b/sysdeps/mips/configure.ac
- @@ -6,9 +6,9 @@ dnl position independent way.
- dnl AC_DEFINE(PI_STATIC_AND_HIDDEN)
-
- 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/nios2/configure b/sysdeps/nios2/configure
- index 14c8a3a014..dde3814ef2 100644
- --- a/sysdeps/nios2/configure
- +++ b/sysdeps/nios2/configure
- @@ -142,12 +142,12 @@ else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #ifdef __nios2_big_endian__
- - yes
- + is_nios2_be
- #endif
-
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- - $EGREP "yes" >/dev/null 2>&1; then :
- + $EGREP "is_nios2_be" >/dev/null 2>&1; then :
- libc_cv_nios2_be=yes
- else
- libc_cv_nios2_be=no
- diff --git a/sysdeps/nios2/configure.ac b/sysdeps/nios2/configure.ac
- index f05f43802b..dc8639902d 100644
- --- a/sysdeps/nios2/configure.ac
- +++ b/sysdeps/nios2/configure.ac
- @@ -4,8 +4,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
- # Nios II big endian is not yet supported.
- AC_CACHE_CHECK([for big endian],
- [libc_cv_nios2_be],
- - [AC_EGREP_CPP(yes,[#ifdef __nios2_big_endian__
- - yes
- + [AC_EGREP_CPP(is_nios2_be,[#ifdef __nios2_big_endian__
- + is_nios2_be
- #endif
- ], libc_cv_nios2_be=yes, libc_cv_nios2_be=no)])
- if test $libc_cv_nios2_be = yes; then
- diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure
- index f25f2a3a65..1b7483e6c6 100644
- --- a/sysdeps/unix/sysv/linux/mips/configure
- +++ b/sysdeps/unix/sysv/linux/mips/configure
- @@ -414,11 +414,11 @@ else
- /* end confdefs.h. */
- dnl
- #ifdef __mips_nan2008
- -yes
- +use_mips_nan2008
- #endif
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- - $EGREP "yes" >/dev/null 2>&1; then :
- + $EGREP "use_mips_nan2008" >/dev/null 2>&1; then :
- libc_cv_mips_nan2008=yes
- else
- libc_cv_mips_nan2008=no
- 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
- index ae7f254da4..874519000b 100644
- --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
- +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
- @@ -155,12 +155,12 @@ else
- 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 "yes" >/dev/null 2>&1; then :
- + $EGREP "use_ppc_elfv2_abi" >/dev/null 2>&1; then :
- libc_cv_ppc64_elfv2_abi=yes
- else
- libc_cv_ppc64_elfv2_abi=no
- @@ -188,12 +188,12 @@ else
- 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 "yes" >/dev/null 2>&1; then :
- + $EGREP "is_def_call_elf" >/dev/null 2>&1; then :
- libc_cv_ppc64_def_call_elf=yes
- else
- libc_cv_ppc64_def_call_elf=no
- 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
|