From patchwork Tue Oct 26 20:03:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 46673 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 9B13F3858014 for ; Tue, 26 Oct 2021 20:07:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B13F3858014 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1635278826; bh=W3PKblVMl6yVhQIsUckj5HLhbIXsHi+jvHyAvCVADqQ=; 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=kys/pBg9dRuogyHfyFg66N/vjADCYZIN9xtdu9v1tsRmpkV1RSoylYITqEtJbV5m7 DkNaehm6XIJPXADd8GXC12DsxJXPlKDEnM79DyxD7aFtAQProxnAhl/jNOulhFtfVB +WylYO/7FbzqwiWYPC2Ws9R185fOhvnRlclyXqAQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by sourceware.org (Postfix) with ESMTPS id AD5283858405 for ; Tue, 26 Oct 2021 20:03:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AD5283858405 Received: by mail-oi1-x231.google.com with SMTP id z126so206102oiz.12 for ; Tue, 26 Oct 2021 13:03:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W3PKblVMl6yVhQIsUckj5HLhbIXsHi+jvHyAvCVADqQ=; b=2CfFwH6KaltWVXOT7Rk3fR/B+zI/UCT0Slsjr7ZLQbNz9TmtpRcZ2LUQmyoSSMlPzm O6TRkzbEIcbqLZsVnXT7QfRcrwKAzA2uSR2QB0DjcfcrdHT2OFOd3X9Xn/5KxKzAdmSw 3PGk9cWX9V8uQ7r+Avff00y4IoHQcC4/j1ZWoTzqJScU49GGxc3KlqJACKFv0S6AUFO8 4LbOPcwOrg9I8Xc4P9ePXdD9nRltNdg0wa+l812gi1c92nyC4XIwoCjYbtnDKAMnQJiE uKVk1ImlJV2Mm8dm8A8ERp2Brxf5pTc9N3ZwfC11YwAQmxmnuPuKLsrEFhAdUiY7fkbG W7Vw== X-Gm-Message-State: AOAM5307ozCcrBwIBZHniEt8A1L9KKZXCdxa4xzxNgYn675Zfen3zgOH 4e4uMtR2bwn9nU6NIj3J6ADzIbqpsy0mXw== X-Google-Smtp-Source: ABdhPJxZt64lAbVrlIW8k2XDppHbfRVnQSI38wX2tJvYswrfg/vcW/HwpspczffoOiY3I+khVQ9i6A== X-Received: by 2002:a05:6808:1287:: with SMTP id a7mr624836oiw.45.1635278632994; Tue, 26 Oct 2021 13:03:52 -0700 (PDT) Received: from birita.. ([2804:431:c7cb:6672:308c:d549:2f1f:5bb6]) by smtp.gmail.com with ESMTPSA id l3sm2689062otu.6.2021.10.26.13.03.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 13:03:52 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 2/3] Fix LIBC_PROG_BINUTILS for -fuse-ld=lld Date: Tue, 26 Oct 2021 17:03:45 -0300 Message-Id: <20211026200346.3371750-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211026200346.3371750-1-adhemerval.zanella@linaro.org> References: <20211026200346.3371750-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 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.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: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" GCC does not print the correct linker when -fuse-ld=lld is used with the -print-prog-name=ld: $ gcc -v 2>&1 | tail -n 1 gcc version 11.2.0 (Ubuntu 11.2.0-7ubuntu2) $ gcc ld This is different than for gold: $ gcc -fuse-ld=gold -print-prog-name=ld ld.gold Using ld.lld as the static linker name prints the expected result. This is only required when -fuse-ld=lld is used, if lld is used as the 'ld' programs (through a symlink) LIBC_PROG_BINUTILS works as expected. Checked on x86_64-linux-gnu. --- aclocal.m4 | 6 +++++- configure | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index c195c4db56..83da631822 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -114,8 +114,12 @@ if test -n "$path_binutils"; then path_binutils=`(cd $path_binutils; pwd) | sed 's%/*$%/%'` CC="$CC -B$path_binutils" fi +case "$CC" in + *fuse-ld=lld*) LDNAME=ld.lld;; + *) LDNAME=ld;; +esac AS=`$CC -print-prog-name=as` -LD=`$CC -print-prog-name=ld` +LD=`$CC -print-prog-name=$LDNAME` AR=`$CC -print-prog-name=ar` AC_SUBST(AR) OBJDUMP=`$CC -print-prog-name=objdump` diff --git a/configure b/configure index 39d75eb4ed..2a28c58cd6 100755 --- a/configure +++ b/configure @@ -4549,8 +4549,12 @@ if test -n "$path_binutils"; then path_binutils=`(cd $path_binutils; pwd) | sed 's%/*$%/%'` CC="$CC -B$path_binutils" fi +case "$CC" in + *fuse-ld=lld*) LDNAME=ld.lld;; + *) LDNAME=ld;; +esac AS=`$CC -print-prog-name=as` -LD=`$CC -print-prog-name=ld` +LD=`$CC -print-prog-name=$LDNAME` AR=`$CC -print-prog-name=ar` OBJDUMP=`$CC -print-prog-name=objdump`