From patchwork Mon Dec 28 19:48:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 41571 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 8DBFC3844061; Mon, 28 Dec 2020 19:49:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8DBFC3844061 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1609184947; bh=TqVvpSQsdbsanTFopFzAAI/Hdm5ny0Mys0tZVbMO0zg=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=O8l+q7BmTb8/XYXmBwOZpxnKk3Mgb0h2dJ0dwPMld7RVpXOYF6eKTB3v2qAH3vQor FH/nOsuGpDoKFgtSVifgCKh1H5xsy2DBOlDoHsuEyrBLSK9xu6BkWBcJLiJv4TZkGc ARo6qLXURE3TUoB75JuTbJBlhIlr1NX+vs3zy2Jw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by sourceware.org (Postfix) with ESMTPS id C1CEA3858010 for ; Mon, 28 Dec 2020 19:49:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C1CEA3858010 Received: by mail-qk1-x749.google.com with SMTP id x74so8700536qkb.12 for ; Mon, 28 Dec 2020 11:49:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=TqVvpSQsdbsanTFopFzAAI/Hdm5ny0Mys0tZVbMO0zg=; b=pDg3TJ6kHiZlF+SLBgyS6X+rQrox4sYPGa7V2ZBlvErwAuc5A8ElXcERvzilzG4MA/ 8vrUJX/i/1YZRbVQpy9OlfLO9TrAowhkdGWX5zH9jTjxiPfIgDneTI7ocfxMVDDjuw3D 4WtAte9EITMWVqIHZf8MH79At6X5MtslrClBmLT4ZfmqDS+PYucQd3TDAJUkdmFOz1Ja qxw4LsXfBwMFflsMAePXACvTROhOdcNEeplm3eFfLyStAe84dMcHuibKhZ2qof8Ai0jt sMC7NVYUgBXHgvvx2DYk8xl5Ms4RHQX6YXWjxfEiisGgcNo/HxGtDeCUtpkD3Uc+v6uz 0phA== X-Gm-Message-State: AOAM5329XPGZWx9Ts/5ZJWMNmL5HKiqKYQ1iIAfQR1mi8Pz57iPxGkF+ l27vy2jBmdFprEnNPamxW8a64KvppibecTQ1O8vX5DU8upyxaCK6msNZBpAQERJVcWQ1jpOhQ1P 7eUlyX2BCzT4wR1tEk0/0xB4ijNLDdvrzoZ6XrB4UEFIHmYXrtAtOcW0uHSUtP96sGzMp X-Google-Smtp-Source: ABdhPJxMTHT8n9JEfUG7TSz6xBRsvfWsujy8r3YmYVkx8sgmptxDVgRRcNtug73itnNtO1v9Wyzpc4r4ifEh X-Received: from maskray1.svl.corp.google.com ([2620:15c:2ce:0:a6ae:11ff:fe11:4abb]) (user=maskray job=sendgmr) by 2002:ad4:4c50:: with SMTP id cs16mr48745369qvb.33.1609184944270; Mon, 28 Dec 2020 11:49:04 -0800 (PST) Date: Mon, 28 Dec 2020 11:48:53 -0800 In-Reply-To: <20201228194855.510315-1-maskray@google.com> Message-Id: <20201228194855.510315-2-maskray@google.com> Mime-Version: 1.0 References: <20201228194855.510315-1-maskray@google.com> X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog Subject: [PATCH 1/3] configure: Allow LD to be a linker other than GNU ld and gold To: libc-alpha@sourceware.org X-Spam-Status: No, score=-19.4 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_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-Patchwork-Original-From: Fangrui Song via Libc-alpha From: Fangrui Song Reply-To: Fangrui Song Cc: Fangrui Song Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 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. --- configure | 13 ++++++++----- configure.ac | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 6a35553805..6dcd2270f8 100755 --- a/configure +++ b/configure @@ -4601,9 +4601,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 @@ -4666,8 +4667,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 @@ -4730,7 +4732,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 43cfac9d48..1a2054cd1a 100644 --- a/configure.ac +++ b/configure.ac @@ -979,18 +979,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