From patchwork Tue Aug 24 08:34:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Galibert X-Patchwork-Id: 44778 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 AF5403857C7A for ; Tue, 24 Aug 2021 08:35:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AF5403857C7A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1629794128; bh=4SbbWokCFa6hDgFAP92GPnuZZHXuQT/bdk6jm+Lj4wE=; 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=M2zJkHSrKJBUrXYH6TYH6G3xqa20RlkN6LjvFIzB15oc1ABw0pLv73i2+/c50Lifn jPimoMlPcJPzCc0Fgcw3mEUElWJfmVtz4xhjRabz03yuPrqOmDW0SSw4m/FxabJjDc QeN5MVTSMDolqCGFk7IUjl3aXwt9zn8LyOh2/Ua8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) by sourceware.org (Postfix) with ESMTPS id C613A3858C3B for ; Tue, 24 Aug 2021 08:34:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C613A3858C3B Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 8452013EE14; Tue, 24 Aug 2021 04:34:55 -0400 (EDT) (envelope-from galibert@pobox.com) Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 7CE3313EE13; Tue, 24 Aug 2021 04:34:55 -0400 (EDT) (envelope-from galibert@pobox.com) Received: from localhost.localdomain (unknown [78.197.126.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id CD0E713EE12; Tue, 24 Aug 2021 04:34:51 -0400 (EDT) (envelope-from galibert@pobox.com) To: libc-alpha@sourceware.org Subject: [PATCH] Make using non-default as/ld/etc easier. Date: Tue, 24 Aug 2021 10:34:02 +0200 Message-Id: <20210824083401.619318-1-galibert@pobox.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: References: MIME-Version: 1.0 X-Pobox-Relay-ID: 2712F136-04B6-11EC-A540-FA9E2DDBB1FC-92059326!pb-smtp21.pobox.com X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Olivier Galibert via Libc-alpha From: Olivier Galibert Reply-To: Olivier Galibert Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Add the configure parameters {AS,LD,AR,OBJDUMP,OBJCOPY,GPROF}=path to optionally force the path for these programs without having to tweak the output of $CC -print-prog-name in some way. In addition, when {AS,LD}=... is used the corresponding program version is not check. The user gets to keep all the pieces if it blows. In practice, according to a build log on x86-64, $AS and $LD are never used directly. $AR, $OBJDUMP and $OBJCOPY are though, and the llvm variants don't seem to have any issue. v2: Use variable assignments instead of --with-xxx v3: Denitsify Signed-off-by: Olivier Galibert --- aclocal.m4 | 41 +++++++++++++++++++++------ configure | 80 +++++++++++++++++++++++++++++++++++++++------------- configure.ac | 38 ++++++++++++++----------- 3 files changed, 113 insertions(+), 46 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index c195c4db56..6852875469 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -110,19 +110,42 @@ rm -fr contest*]) AC_DEFUN([LIBC_PROG_BINUTILS], [# Was a --with-binutils option given? if test -n "$path_binutils"; then - # Make absolute; ensure a single trailing slash. - path_binutils=`(cd $path_binutils; pwd) | sed 's%/*$%/%'` - CC="$CC -B$path_binutils" + # Make absolute; ensure a single trailing slash. + path_binutils=`(cd $path_binutils; pwd) | sed 's%/*$%/%'` + CC="$CC -B$path_binutils" fi -AS=`$CC -print-prog-name=as` -LD=`$CC -print-prog-name=ld` -AR=`$CC -print-prog-name=ar` +check_as_version=0 +AC_ARG_VAR([AS], [as program to use]) +if test -z "$AS"; then + AS=`$CC -print-prog-name=as` + check_as_version=1 +fi +check_ld_version=0 +AC_ARG_VAR([LD], [ld program to use]) +if test -z "$LD"; then + LD=`$CC -print-prog-name=ld` + check_ld_version=1 +fi +AC_ARG_VAR([AR], [ar program to use]) +if test -z "$AR"; then + AR=`$CC -print-prog-name=ar` +fi +AC_ARG_VAR([OBJDUMP], [objdump program to use]) +if test -z "$OBJDUMP"; then + OBJDUMP=`$CC -print-prog-name=objdump` +fi +AC_ARG_VAR([OBJCOPY], [objcopy program to use]) +if test -z "$OBJCOPY"; then + OBJCOPY=`$CC -print-prog-name=objcopy` +fi +AC_ARG_VAR([GPROF], [gprof program to use]) +if test -z "$GPROF"; then + GPROF=`$CC -print-prog-name=gprof` +fi + AC_SUBST(AR) -OBJDUMP=`$CC -print-prog-name=objdump` AC_SUBST(OBJDUMP) -OBJCOPY=`$CC -print-prog-name=objcopy` AC_SUBST(OBJCOPY) -GPROF=`$CC -print-prog-name=gprof` AC_SUBST(GPROF) # Determine whether we are using GNU binutils. diff --git a/configure b/configure index 7272fbf6ea..58a23f9b84 100755 --- a/configure +++ b/configure @@ -651,12 +651,12 @@ SED MAKEINFO MSGFMT MAKE -LD -AS GPROF OBJCOPY OBJDUMP AR +LD +AS LN_S INSTALL_DATA INSTALL_SCRIPT @@ -805,7 +805,13 @@ CPPFLAGS CPP CXX CXXFLAGS -CCC' +CCC +AS +LD +AR +OBJDUMP +OBJCOPY +GPROF' ac_subdirs_all='' # Initialize some variables set by options. @@ -1495,6 +1501,12 @@ Some influential environment variables: CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags + AS as program to use + LD ld program to use + AR ar program to use + OBJDUMP objdump program to use + OBJCOPY objcopy program to use + GPROF gprof program to use Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -4545,19 +4557,42 @@ fi # Was a --with-binutils option given? if test -n "$path_binutils"; then - # Make absolute; ensure a single trailing slash. - path_binutils=`(cd $path_binutils; pwd) | sed 's%/*$%/%'` - CC="$CC -B$path_binutils" + # Make absolute; ensure a single trailing slash. + path_binutils=`(cd $path_binutils; pwd) | sed 's%/*$%/%'` + CC="$CC -B$path_binutils" fi -AS=`$CC -print-prog-name=as` -LD=`$CC -print-prog-name=ld` -AR=`$CC -print-prog-name=ar` +check_as_version=0 + +if test -z "$AS"; then + AS=`$CC -print-prog-name=as` + check_as_version=1 +fi +check_ld_version=0 + +if test -z "$LD"; then + LD=`$CC -print-prog-name=ld` + check_ld_version=1 +fi + +if test -z "$AR"; then + AR=`$CC -print-prog-name=ar` +fi + +if test -z "$OBJDUMP"; then + OBJDUMP=`$CC -print-prog-name=objdump` +fi + +if test -z "$OBJCOPY"; then + OBJCOPY=`$CC -print-prog-name=objcopy` +fi + +if test -z "$GPROF"; then + GPROF=`$CC -print-prog-name=gprof` +fi + -OBJDUMP=`$CC -print-prog-name=objdump` -OBJCOPY=`$CC -print-prog-name=objcopy` -GPROF=`$CC -print-prog-name=gprof` # Determine whether we are using GNU binutils. @@ -4599,8 +4634,8 @@ $as_echo "$libc_cv_prog_ld_gnu" >&6; } gnu_ld=$libc_cv_prog_ld_gnu -# Accept binutils 2.25 or newer. -for ac_prog in $AS +if test $check_as_version = 1; then : + 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 @@ -4660,13 +4695,16 @@ $as_echo_n "checking version of $AS... " >&6; } $as_echo "$ac_prog_version" >&6; } fi if test $ac_verc_fail = yes; then - AS=: critic_missing="$critic_missing as" + AS=: critic_missing="$critic_missing GNU as" fi -if test -n "`$LD --version | sed -n 's/^GNU \(gold\).*$/\1/p'`"; then - # Accept gold 1.14 or higher - for ac_prog in $LD +fi + +if test $check_ld_version = 1; then : + if test -n "`$LD --version | sed -n 's/^GNU \(gold\).*$/\1/p'`"; then + # Accept gold 1.14 or higher + for ac_prog in $LD do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4729,8 +4767,8 @@ if test $ac_verc_fail = yes; then LD=: critic_missing="$critic_missing GNU gold" fi -else - for ac_prog in $LD + else + for ac_prog in $LD do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4793,6 +4831,8 @@ if test $ac_verc_fail = yes; then LD=: critic_missing="$critic_missing GNU ld" fi + fi + fi # These programs are version sensitive. diff --git a/configure.ac b/configure.ac index af47cd51e6..a40652ad3c 100644 --- a/configure.ac +++ b/configure.ac @@ -989,24 +989,28 @@ 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") - -if test -n "`$LD --version | sed -n 's/^GNU \(gold\).*$/\1/p'`"; then - # Accept gold 1.14 or higher - AC_CHECK_PROG_VER(LD, $LD, --version, - [GNU gold.* \([0-9][0-9]*\.[0-9.]*\)], - [1.1[4-9]*|1.[2-9][0-9]*|1.1[0-9][0-9]*|[2-9].*|[1-9][0-9]*], - LD=: critic_missing="$critic_missing GNU gold") -else - AC_CHECK_PROG_VER(LD, $LD, --version, - [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], +dnl Accept binutils 2.25 or newer. Don't check version if the path is forced. +AS_IF([test $check_as_version = 1], + [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]*], - LD=: critic_missing="$critic_missing GNU ld") -fi + AS=: critic_missing="$critic_missing GNU as") +]) + +AS_IF([test $check_ld_version = 1], + [if test -n "`$LD --version | sed -n 's/^GNU \(gold\).*$/\1/p'`"; then + # Accept gold 1.14 or higher + AC_CHECK_PROG_VER(LD, $LD, --version, + [GNU gold.* \([0-9][0-9]*\.[0-9.]*\)], + [1.1[4-9]*|1.[2-9][0-9]*|1.1[0-9][0-9]*|[2-9].*|[1-9][0-9]*], + LD=: critic_missing="$critic_missing GNU gold") + else + AC_CHECK_PROG_VER(LD, $LD, --version, + [GNU ld.* \([0-9][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]*], + LD=: critic_missing="$critic_missing GNU ld") + fi +]) # These programs are version sensitive. AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,