From patchwork Tue Jun 13 11:54:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 20987 Received: (qmail 59967 invoked by alias); 13 Jun 2017 11:54:10 -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 59957 invoked by uid 89); 13 Jun 2017 11:54:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:2698, 11879 X-HELO: mail-qt0-f193.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=eZ5YWSId5zL3FVy7++nnLtsxlUfThiDjEDuA2gE8cI8=; b=rlw2rNs+jIJRt6BhdIvE8vQHqOSR1zztkA6OpbpnT31xM9nBvNs0THa7vbsup66fR1 ltVeuBBiQqt47tXun14XcWnjTNKZ1xs2KkSQK68ngxnxB2yglRL1DpVvUnCAp+JzPZ+r SNHxOHNlkG3JNe+54jFtYSJRJT3bnqF5tjC0FoqTkxXWI14EpXcAzhLbyIrS3xsPJlPP wKOrUrYI4R5x7bBw5lpboZuuZzb1cADO4HDHd0Bh1vO0lo4IHi+1BvKEt4Pmr6NmocNl nORi/C/nfUDsTjFtdN6YcWCB+difQQlC2S9N1dpWVUtIot0Rn7NDXC3kFUIPJaGQL8Wh X3MQ== X-Gm-Message-State: AKS2vOyKYFKuVnWvUiXoGTwge0K6E1nwH9JtDP1EHA1vqjMZ8Z10EmiO o/VSd8/1nmIuCfQvF1Jf7EYRaYLFew== X-Received: by 10.55.105.133 with SMTP id e127mr72255039qkc.19.1497354849448; Tue, 13 Jun 2017 04:54:09 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: <20170613113813.GA7656@gmail.com> From: "H.J. Lu" Date: Tue, 13 Jun 2017 04:54:08 -0700 Message-ID: Subject: Re: [PATCH] Make copy of from GCC 7 [BZ #21573] To: Andreas Schwab Cc: GNU C Library On Tue, Jun 13, 2017 at 4:46 AM, Andreas Schwab wrote: > On Jun 13 2017, "H.J. Lu" wrote: > >> The first / in "/$1:/{s/:\$//;p}" is a command: > > It's not a command, it's an address. > >> [hjl@gnu-tools-1 glibc-test]$ echo "#include " | >> /usr/gcc-7.1.1-x32/bin/c++ -M -MP -x c++ - | sed -n >> ",/bits/std_abs.h:,{s/:\$//;p}" >> sed: -e expression #1, char 1: unknown command: `,' >> >> What options do I have? > > \,$1, Here is the updated patch. OK for master? Thanks. From 5b55c60163f4c99301c4c8fe2504a195620d828a Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 13 Jun 2017 04:30:26 -0700 Subject: [PATCH] Make copy of from GCC 7 [BZ #21573] from GCC 7 will include /usr/include/stdlib.h from "#include_next" (instead of stdlib/stdlib.h in the glibc source directory), and this turns up as a make dependency. Also make a copy of to prevent it from including /usr/include/stdlib.h. [BZ #21573] * configure.ac (find_cxx_header): Use "\,$1," with sed. (CXX_CSTDLIB_HEADER): Also make a copy of . * configure: Regenerated. --- configure | 5 ++++- configure.ac | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 422482f..524a8bc 100755 --- a/configure +++ b/configure @@ -5336,9 +5336,12 @@ fi # copy of those headers in Makerules. if test -n "$CXX"; then find_cxx_header () { - echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$1:/{s/:\$//;p}" + echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "\,$1:,{s/:\$//;p}" } CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)" + # Also make a copy of from GCC 7 to prevent it from + # including /usr/include/stdlib.h. + CXX_CSTDLIB_HEADER="$CXX_CSTDLIB_HEADER $(find_cxx_header bits/std_abs.h)" CXX_CMATH_HEADER="$(find_cxx_header cmath)" fi diff --git a/configure.ac b/configure.ac index 7f43042..213a436 100644 --- a/configure.ac +++ b/configure.ac @@ -1187,9 +1187,12 @@ AC_SUBST(CXX_SYSINCLUDES) # copy of those headers in Makerules. if test -n "$CXX"; then find_cxx_header () { - echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$1:/{s/:\$//;p}" + echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "\,$1:,{s/:\$//;p}" } CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)" + # Also make a copy of from GCC 7 to prevent it from + # including /usr/include/stdlib.h. + CXX_CSTDLIB_HEADER="$CXX_CSTDLIB_HEADER $(find_cxx_header bits/std_abs.h)" CXX_CMATH_HEADER="$(find_cxx_header cmath)" fi AC_SUBST(CXX_CSTDLIB_HEADER) -- 2.9.4