From patchwork Fri Dec 2 19:00:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 61385 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 999EE384F489 for ; Fri, 2 Dec 2022 19:01:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 999EE384F489 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670007675; bh=w3lLDPtW8cX+kXeXMqUUglECzqFRXQB0Cl5wyMaMsLI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=EwN2oxlsXKkj8CszuZkT2Bx7lWD+77s5cSEuR2fsVneqyk4xQl9gdjXoAH9V+HvEW hlEPDQi8g2lArWeIbvdB5+3rfw66yIPLSFWLkWD0kKpZIsdCDNip9KzKw9zl3bbrjh R68SR7RphY6n8cybkQcN8uzluUp4ceaU+7a0oG54= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by sourceware.org (Postfix) with ESMTPS id 0553D3855174 for ; Fri, 2 Dec 2022 19:00:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0553D3855174 Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-142b72a728fso6537821fac.9 for ; Fri, 02 Dec 2022 11:00:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w3lLDPtW8cX+kXeXMqUUglECzqFRXQB0Cl5wyMaMsLI=; b=FY4xM9uq09F83zfn8fK4ddah0YyX12f1wiTec94JFm3nxv8mPqch1qaKa1juqEGHqs AqUdlHqW0YgpT7HRufVIyvdCyZl/omQPSIeB1DPV5wr1G+qJsm/oG36sqcZiOeyFRFWu eQ1VwTpwK4Blbcat/yfNOvlbiAl2FqTEKPqQOR+fsJ3HAj4rgi4bxKwirb6AP5HFixgw aKdblqR+lyOfq/3BFlTLGyGUQWrFb1ufl0J8y0N/lpl8Wp/E8GLwzSN6t7oT1fJED5Wx 6K+XwVRnc3flI9KidHyyUBu0WryZZ6CXV6HJjO31sLrmoa1P/Nwd0q/aY3QeklCmTaa8 7JXA== X-Gm-Message-State: ANoB5plUleBRiQy+ouLjoZ/5RgDWGfElNfG7MRyfy29CKqa3agiG+mu4 vt5XclsgPjG36395JhsAg1bNs5eLFs914551IMc= X-Google-Smtp-Source: AA0mqf4NZm0+22zgIVQYa0qvf9sdpilwv3VkLkeDNxcY+xB8UoIenfA4pAypTm/dVCIGGUasyAb+kg== X-Received: by 2002:a05:6870:47a0:b0:13b:6648:8a46 with SMTP id c32-20020a05687047a000b0013b66488a46mr33725858oaq.86.1670007641073; Fri, 02 Dec 2022 11:00:41 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:f215:6472:4682:7ef0:a0a8]) by smtp.gmail.com with ESMTPSA id k60-20020a9d19c2000000b0066ca9001e68sm2218159otk.5.2022.12.02.11.00.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 11:00:40 -0800 (PST) To: libc-alpha@sourceware.org, Vineet Gupta , =?utf-8?q?Ludovic_Court=C3=A8s?= Subject: [PATCH 4/6] configure: Remove AS check Date: Fri, 2 Dec 2022 16:00:28 -0300 Message-Id: <20221202190030.1671870-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221202190030.1671870-1-adhemerval.zanella@linaro.org> References: <20221202190030.1671870-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The assembler is not issued directly, but rather always through CC wrapper. The binutils version check if done with LD instead. Reviewed-by: Carlos O'Donell --- aclocal.m4 | 1 - configure | 66 ------------------------------------ configure.ac | 5 --- scripts/build-many-glibcs.py | 1 - sysdeps/x86/configure | 4 +-- sysdeps/x86/configure.ac | 2 +- 6 files changed, 3 insertions(+), 76 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 88db64a683..7ab8ac023b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -118,7 +118,6 @@ case "$CC" in *fuse-ld=lld*) LDNAME=ld.lld;; *) LDNAME=ld;; esac -AS=`$CC -print-prog-name=as` LD=`$CC -print-prog-name=$LDNAME` AR=`$CC -print-prog-name=ar` AC_SUBST(AR) diff --git a/configure b/configure index 086d6fba7a..62c2581cb0 100755 --- a/configure +++ b/configure @@ -654,7 +654,6 @@ MAKEINFO MSGFMT MAKE LD -AS GPROF OBJCOPY AR @@ -4146,7 +4145,6 @@ case "$CC" in *fuse-ld=lld*) LDNAME=ld.lld;; *) LDNAME=ld;; esac -AS=`$CC -print-prog-name=as` LD=`$CC -print-prog-name=$LDNAME` AR=`$CC -print-prog-name=ar` @@ -4157,70 +4155,6 @@ GPROF=`$CC -print-prog-name=gprof` # Accept binutils 2.25 or newer. -for ac_prog in $AS -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AS+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AS="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AS=$ac_cv_prog_AS -if test -n "$AS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 -$as_echo "$AS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AS" && break -done - -if test -z "$AS"; then - ac_verc_fail=yes -else - # Found it, now check the version. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $AS" >&5 -$as_echo_n "checking version of $AS... " >&6; } - ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 2.1[0-9][0-9]*|2.2[5-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5 -$as_echo "$ac_prog_version" >&6; } -fi -if test $ac_verc_fail = yes; then - AS=: critic_missing="$critic_missing as" -fi - - libc_cv_with_lld=no case $($LD --version) in "GNU gold"*) diff --git a/configure.ac b/configure.ac index 5709c7a0cf..022b8f68bc 100644 --- a/configure.ac +++ b/configure.ac @@ -572,11 +572,6 @@ AC_PROG_LN_S LIBC_PROG_BINUTILS # Accept binutils 2.25 or newer. -AC_CHECK_PROG_VER(AS, $AS, --version, - [GNU assembler.* \([0-9]*\.[0-9.]*\)], - [2.1[0-9][0-9]*|2.2[5-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], - AS=: critic_missing="$critic_missing as") - libc_cv_with_lld=no case $($LD --version) in "GNU gold"*) diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py index 5af6f369ae..9292a0d3ff 100755 --- a/scripts/build-many-glibcs.py +++ b/scripts/build-many-glibcs.py @@ -1522,7 +1522,6 @@ class GlibcPolicyDefault(object): 'CC=%s' % glibc.tool_name('gcc'), 'CXX=%s' % glibc.tool_name('g++'), 'AR=%s' % glibc.tool_name('ar'), - 'AS=%s' % glibc.tool_name('as'), 'LD=%s' % glibc.tool_name('ld'), 'NM=%s' % glibc.tool_name('nm'), 'OBJCOPY=%s' % glibc.tool_name('objcopy'), diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure index a9c8c2ef67..f80fedd9dd 100644 --- a/sysdeps/x86/configure +++ b/sysdeps/x86/configure @@ -33,8 +33,8 @@ $as_echo "$libc_cv_x86_cet_available" >&6; } fi if test $enable_cet != no; then # Check if assembler supports CET. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $AS supports CET" >&5 -$as_echo_n "checking whether $AS supports CET... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports CET" >&5 +$as_echo_n "checking whether compiler supports CET... " >&6; } if ${libc_cv_x86_cet_as+:} false; then : $as_echo_n "(cached) " >&6 else diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac index edd43a2551..ac55dc674a 100644 --- a/sysdeps/x86/configure.ac +++ b/sysdeps/x86/configure.ac @@ -22,7 +22,7 @@ EOF fi if test $enable_cet != no; then # Check if assembler supports CET. - AC_CACHE_CHECK(whether $AS supports CET, + AC_CACHE_CHECK(whether compiler supports CET, libc_cv_x86_cet_as, [dnl cat > conftest.s <