From patchwork Mon Aug 25 04:07:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Esquivel X-Patchwork-Id: 382797 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3E96F1400A3 for ; Tue, 26 Aug 2014 02:09:03 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=sgt0KJLpTuQANC9y7aQp77h01GC3xOO6C+CNg1Tv+jlSvyAC4yHPR cIp8MP2Bqpk+POBJBtvQaJupF4zVxpO/jGxtgad+DxiLQ/kKsMxHBB++73/8Kgz1 ++RZBn0h3EKLteeO/l/jiBgBVy+UtxxeWpHRGnvqOaKwYEnXna5XBI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=kqR/WxziKRoBFr8E93gG+z6IcnU=; b=EzMY1Gn/5Etr0CgeCbnD/Qr6fs9S b+1osxkdIQG29xOLepUApCo7H+MFfwwvKPslPZJ4gIBCYL3lFjahq3U1G48bI8Li CEsGc8qHo9irxBdBvCdV6agSuZxSBLoAUMmxRGNmbGXRly/bpkQnBjeE9nQS4lnI hKhgzDhTXcue/G0= Received: (qmail 19619 invoked by alias); 25 Aug 2014 16:08:55 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 19608 invoked by uid 89); 25 Aug 2014 16:08:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.4 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mga09.intel.com X-ExtLoop1: 1 From: Benjamin Esquivel To: libc-alpha@sourceware.org Cc: Benjamin Esquivel Subject: [PATCH] Fix to egrep for yes$ to avoid matching it on include paths Date: Sun, 24 Aug 2014 23:07:24 -0500 Message-Id: <1408939644-79389-1-git-send-email-benjamin.esquivel@linux.intel.com> For the pre-processed output of conftest.c when it contains an include dir and if the path of it contains a 'yes' it will cause some variables to be wrongly set because of the way it greps for it. Fix is to egrep for yes$ instead --- sysdeps/aarch64/configure | 2 +- sysdeps/aarch64/configure.ac | 2 +- sysdeps/arm/configure | 2 +- sysdeps/arm/configure.ac | 2 +- sysdeps/mips/configure | 2 +- sysdeps/mips/configure.ac | 2 +- sysdeps/unix/sysv/linux/mips/configure | 2 +- sysdeps/unix/sysv/linux/mips/configure.ac | 2 +- sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | 4 ++-- sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure index af870b7..57ffe64 100644 --- a/sysdeps/aarch64/configure +++ b/sysdeps/aarch64/configure @@ -153,7 +153,7 @@ else _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : + $EGREP "yes$" >/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 7851dd4..6002697 100644 --- a/sysdeps/aarch64/configure.ac +++ b/sysdeps/aarch64/configure.ac @@ -10,7 +10,7 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # the dynamic linker via %ifdef. AC_CACHE_CHECK([for big endian], [libc_cv_aarch64_be], - [AC_EGREP_CPP(yes,[#ifdef __AARCH64EB__ + [AC_EGREP_CPP(yes$$,[#ifdef __AARCH64EB__ yes #endif ], libc_cv_aarch64_be=yes, libc_cv_aarch64_be=no)]) diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure index fe86006..2eeb596 100644 --- a/sysdeps/arm/configure +++ b/sysdeps/arm/configure @@ -155,7 +155,7 @@ else _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : + $EGREP "yes$" >/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 86c0c08..afc5eab 100644 --- a/sysdeps/arm/configure.ac +++ b/sysdeps/arm/configure.ac @@ -16,7 +16,7 @@ dnl it. Until we do, don't define it. # 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 + [AC_EGREP_CPP(yes$$,[#ifdef __ARM_PCS_VFP yes #endif ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)]) diff --git a/sysdeps/mips/configure b/sysdeps/mips/configure index f3f5d2e..46cccd6 100644 --- a/sysdeps/mips/configure +++ b/sysdeps/mips/configure @@ -147,7 +147,7 @@ yes #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : + $EGREP "yes$" >/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 bcbdaff..7ed1d3b 100644 --- a/sysdeps/mips/configure.ac +++ b/sysdeps/mips/configure.ac @@ -6,7 +6,7 @@ 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(yes$$, [dnl #ifdef __mips_nan2008 yes #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)]) diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure index 7fac4f4..97d11b5 100644 --- a/sysdeps/unix/sysv/linux/mips/configure +++ b/sysdeps/unix/sysv/linux/mips/configure @@ -249,7 +249,7 @@ yes #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : + $EGREP "yes$" >/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 c3f217a..ea5726b 100644 --- a/sysdeps/unix/sysv/linux/mips/configure.ac +++ b/sysdeps/unix/sysv/linux/mips/configure.ac @@ -45,7 +45,7 @@ if test -z "$libc_mips_float"; then fi 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(yes$$, [dnl #ifdef __mips_nan2008 yes #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)]) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure index aa1302a..14c91b5 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure @@ -160,7 +160,7 @@ else _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : + $EGREP "yes$" >/dev/null 2>&1; then : libc_cv_ppc64_elfv2_abi=yes else libc_cv_ppc64_elfv2_abi=no @@ -190,7 +190,7 @@ else _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : + $EGREP "yes$" >/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 de04689..1d8aeb7 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac @@ -6,7 +6,7 @@ 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 + [AC_EGREP_CPP(yes$$,[#if _CALL_ELF == 2 yes #endif ], libc_cv_ppc64_elfv2_abi=yes, libc_cv_ppc64_elfv2_abi=no)]) @@ -17,7 +17,7 @@ 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 + [AC_EGREP_CPP(yes$$,[#ifdef _CALL_ELF yes #endif ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)])