From patchwork Fri Mar 13 20:46:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 38561 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by sourceware.org (Postfix) with ESMTPS id A1B2738A2417 for ; Fri, 13 Mar 2020 20:46:39 +0000 (GMT) Received: by mail-pl1-x643.google.com with SMTP id w12so4818801pll.13 for ; Fri, 13 Mar 2020 13:46:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=Xrj9QuR72TCaKowyiTwTB0U4OabqwfHMjggI6buT7ns=; b=tvI7iAkyQ5lEaZ+fckIg+kN+Mg40FiAhCNa4tcj46+/y4NvBfAW30Z0H2okVzjOe4c HyfSj9UbJuM5MEOI0xMO8IJ4YYONU+Ari5LI8L0eIr1LUb7A2QOltuycZu2Bi/RgRi0W ssfyQGqH9IEonDTOJPSfMFae4uwacm/qqH/zBI5FkEtkzqRskqJt1g7eAY4lvX4Xnw02 Ebz59G81MhVjHEan16A+OAXwYe9snC3n6FnsVxOW3Wxa0j2FISsxpjeQ13mhi2/ZlGoq mWFDcs4Ghqt04ikIDa/nSPLeRN2bUo8+kMOyKccD/uDia2d0DSw7lZNaSPgXKA13uUmW HMnA== X-Gm-Message-State: ANhLgQ302kjaXUszMhb8qujNtJpxN9CEP/rZUAKPMFhEFUpJ7ZKEL/W1 Y+GKjXz7BmnjsRuMWkJc+8EloEUZU/zccQ== X-Google-Smtp-Source: ADFU+vsnORHXiVad/XQ2+lYDekQ/tQuizhr0g2GMwcw7nnvQ2W1EJDN3uxVtEZDjKsPkMMctVD9A/Q== X-Received: by 2002:a17:902:710c:: with SMTP id a12mr14767906pll.283.1584132398009; Fri, 13 Mar 2020 13:46:38 -0700 (PDT) Received: from google.com ([2620:15c:2ce:0:9efe:9f1:9267:2b27]) by smtp.gmail.com with ESMTPSA id e4sm3053783pgc.60.2020.03.13.13.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 13:46:37 -0700 (PDT) Date: Fri, 13 Mar 2020 13:46:34 -0700 From: Fangrui Song To: libc-alpha@sourceware.org Subject: [PATCH] configure: Allow LD to be a linker other than GNU ld and gold Message-ID: <20200313204634.7jrgd2m5ga3l5drk@google.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-39.0 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH, FSL_HELO_FAKE, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, USER_IN_DEF_DKIM_WL, USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Fri, 13 Mar 2020 20:46:43 -0000 When using lld as the linker, configure prints a confusing message. *** These critical programs are missing or too old: GNU ld lld>=8 can build glibc with very few patches. lld may be built with a custom version information (e.g. git commit ID), so a version check is not useful at all. Reviewed-By: Adhemerval Zanella --- configure | 13 ++++++++----- configure.ac | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 8df47d61f8..e3922b6d5d 100755 --- a/configure +++ b/configure @@ -4615,9 +4615,10 @@ if test $ac_verc_fail = yes; then fi -if test -n "`$LD --version | sed -n 's/^GNU \(gold\).*$/\1/p'`"; then +case $($LD --version) in + "GNU gold"*) # Accept gold 1.14 or higher - for ac_prog in $LD + 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 @@ -4680,8 +4681,9 @@ if test $ac_verc_fail = yes; then LD=: critic_missing="$critic_missing GNU gold" fi -else - for ac_prog in $LD + ;; + "GNU ld"*) + 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 @@ -4744,7 +4746,8 @@ if test $ac_verc_fail = yes; then LD=: critic_missing="$critic_missing GNU ld" fi -fi + ;; +esac # These programs are version sensitive. diff --git a/configure.ac b/configure.ac index 5f229679a9..faa45946ad 100644 --- a/configure.ac +++ b/configure.ac @@ -986,18 +986,21 @@ AC_CHECK_PROG_VER(AS, $AS, --version, [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 +case $($LD --version) in + "GNU gold"*) # Accept gold 1.14 or higher - AC_CHECK_PROG_VER(LD, $LD, --version, + 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"*) + 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 + ;; +esac # These programs are version sensitive. AC_CHECK_TOOL_PREFIX