From patchwork Tue Mar 28 23:20:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 76303 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp41629vqo; Tue, 28 Mar 2023 16:39:25 -0700 (PDT) X-Google-Smtp-Source: AKy350bvg4Cjbxm4yDMN0UICiFTzNr+o/8OUP6SYb8Hs9vwmseOgwSt6ZBdNFpAJp0XTogwPOsXe X-Received: by 2002:aa7:d44c:0:b0:502:52dd:57a2 with SMTP id q12-20020aa7d44c000000b0050252dd57a2mr3448212edr.24.1680046765110; Tue, 28 Mar 2023 16:39:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680046765; cv=none; d=google.com; s=arc-20160816; b=HVeXmSvEv0dqubH2DeFNt79kCz3ExCMLhbxgvhZfo4BVCqtjBsmC/PN53fZg5CMbqq /eEpRYtuQO3ItNe3BDBNjwW0WqU2HmnYvZ1X6LJns53WIG0lXKXDva8FWtmdlKDFR+OD cRMnyXSI8j9SLo7/v/tag542Q/BuKbqKnB3KPWokneIq230gxxCCNAkzBLYdW5SlAT5Z xZYdZ5V/Md8CnYR1BCkEq4iVjrdrnLWeou0L1HX57b2euC5VNUJY/TqYsO/WfO1NoWX/ uvvo/z7/SzeCYFEuOClC84EZKCmKg4J/d4gQof0BPTfz3PT7siN9cHCwO1UARZV88d8z A74A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=2bBYUIjovCCPOQqolmFmow3m4rDrMlcn8UmCUssCjVw=; b=cv9FwelM2C6fKZYBZoCiBctxySwAny/YeT7avDw8T1OZ2OWbmXRN0UgvMS7UQm8f8m 41IgQ/LSJpi6a7vplKjlq10iv6s4DF9JqYZgaJwLfGRf/nryIf5jJNfwzsleHA1uEtSh geBAH+wg9dzmfeQUouSSMKsRsWCprtRY0h7T8yiJ4uaPsusv/586iKp/AyuXgJiMzF2o 90kKuTFEcKE/LggCLQRb2h6qjOqIC5RI+97CvXK0SRIx//x4hWJK7WCdNuMvDAk8o/nt ARGzLzsdAB2SINtKMOq+YfRpZGJgILt1RmlNWHMmTcbhU6aF3y9hakLLjVTquNXXnfv7 n0yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=t4m3uomV; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id r10-20020a056402018a00b005023e76e28fsi7440887edv.268.2023.03.28.16.39.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 16:39:25 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=t4m3uomV; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5EB423882061 for ; Tue, 28 Mar 2023 23:36:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5EB423882061 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680046573; bh=2bBYUIjovCCPOQqolmFmow3m4rDrMlcn8UmCUssCjVw=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=t4m3uomVUMTKDjtXQa2hg3zhDz5XTELyfyHNwvksK6oNnx24iqYTaiYu9Dl/UZphL dOEiHDgoKnna11hzB0l3hrneWbGDdLiXoFaGZ5wZsTAfQKtfSSNHsGbj9ho8GKbI8N NslLIQ7vxXJwbwtXg2V2aloi33yYSMf04WNVVmHw= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by sourceware.org (Postfix) with ESMTPS id CB3023896C07 for ; Tue, 28 Mar 2023 23:35:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CB3023896C07 Received: by mail-pf1-x42e.google.com with SMTP id bt19so9145862pfb.3 for ; Tue, 28 Mar 2023 16:35:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680046553; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2bBYUIjovCCPOQqolmFmow3m4rDrMlcn8UmCUssCjVw=; b=I6xALwKpwOx3rf2GejJwJ1q5psn6CBYTsVVwKihoFhgvjvxL9lMawFT86HOSHKD6us vBFk5GzK2L3oQ+hpqKskdpcuzMOm5zM9h9eSzneB14o3LZ42eLTyFqwlkNnUlDwQD+zP SU4N/UdYKCK+h0zgT7rJkUYyUl0phb19+eEUJEZ3whxrcAi14+EyfR6suqfHpX+zcnl/ 2KKEa13V6TCnAKspImnfAN/UjIi8fr7kU9vttHQnpVuA7b/GGVNUMtm9UYLT5sjq+YeV mtHOAbhLpfkRjJaP9tAM7Yz6v3JfrCi02Kgj/pzyaXTlIIpPHAj3ADbifKTX6V8kIPxL /2YA== X-Gm-Message-State: AAQBX9fvYkho+uJneNjvq0C97k5nnOw0+IdmMrMJ00+TTWy50dY44wsJ dzfLICeQSjcxObgwNlXyInRlwffszi0= X-Received: by 2002:a62:585:0:b0:592:de72:4750 with SMTP id 127-20020a620585000000b00592de724750mr14568699pff.23.1680046552652; Tue, 28 Mar 2023 16:35:52 -0700 (PDT) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id f19-20020aa78b13000000b0062cb3c8896dsm7335038pfd.142.2023.03.28.16.35.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 16:35:52 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 32F8D1142C5E; Wed, 29 Mar 2023 09:50:07 +1030 (ACDT) Date: Wed, 29 Mar 2023 09:50:07 +1030 To: binutils@sourceware.org Subject: ld testsuite CFLAGS_FOR_TARGET Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3035.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761656716864047580?= X-GMAIL-MSGID: =?utf-8?q?1761656716864047580?= run_host_cmd adds $gcc_B_opt and $ld_L_opt to the command line if it detects the program being run is a compiler. Since the program being run in lto.exp linking pr28138 is "sh", we need to add these by hand. This isn't exactly as run_host_cmd does, as it lacks reordering of any user -B option in $CC_FOR_TARGET, but it's better than ignoring gcc_B_opt. This fixes a mips64 testsuite fail. ld_compile adds CFLAGS_FOR_TARGET and other flags as well, so there is no need for the ld_compile command line to include CFLAGS_FOR_TARGET. Fixing this is just a tidy. * testsuite/ld-plugin/lto.exp: Add gcc_B_opt, CFLAGS_FOR_TARGET and $ld_L_opt to pr28138 link line. * testsuite/lib/ld-lib.exp (run_ld_link_tests): Don't pass unnecessary flags to ld_compile. (run_ld_link_exec_tests, run_cc_link_tests): Likewise. diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp index 6c1322e43e0..98e811177ef 100644 --- a/ld/testsuite/ld-plugin/lto.exp +++ b/ld/testsuite/ld-plugin/lto.exp @@ -773,7 +773,8 @@ run_cc_link_tests [list \ set exec_output [run_host_cmd "sh" \ "-c \"ulimit -n 20; \ - $CC_FOR_TARGET -Btmpdir/ld -o tmpdir/pr28138 \ + $CC_FOR_TARGET $gcc_B_opt $CFLAGS_FOR_TARGET \ + $ld_L_opt -o tmpdir/pr28138 \ tmpdir/pr28138.o tmpdir/pr28138.a\""] set exec_output [prune_warnings $exec_output] if [string match "" $exec_output] then { diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 47e86a7b27c..918464069a9 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -467,7 +467,6 @@ proc run_ld_link_tests { ldtests args } { global subdir global env global CC_FOR_TARGET - global CFLAGS_FOR_TARGET global runtests global exec_output @@ -534,7 +533,7 @@ proc run_ld_link_tests { ldtests args } { set objfile "tmpdir/$fileroot.o" if { [file extension $src_file] == ".c" } { set as_file "tmpdir/$fileroot.s" - if ![ld_compile "$CC_FOR_TARGET -S $CFLAGS_FOR_TARGET $cflags" $srcdir/$subdir/$src_file $as_file] { + if ![ld_compile "$CC_FOR_TARGET -S $cflags" $srcdir/$subdir/$src_file $as_file] { set is_unsupported 1 break } @@ -685,8 +684,6 @@ proc run_ld_link_exec_tests { ldtests args } { global env global CC_FOR_TARGET global CXX_FOR_TARGET - global CFLAGS_FOR_TARGET - global CXXFLAGS_FOR_TARGET global errcnt global exec_output global board_cflags @@ -753,9 +750,9 @@ proc run_ld_link_exec_tests { ldtests args } { lappend objfiles $objfile if { [ string match "c++" $lang ] } { - set cmd "$CXX_FOR_TARGET -c $CXXFLAGS_FOR_TARGET $cflags" + set cmd "$CXX_FOR_TARGET -c $cflags" } else { - set cmd "$CC_FOR_TARGET -c $CFLAGS_FOR_TARGET $cflags" + set cmd "$CC_FOR_TARGET -c $cflags" } if ![ld_compile $cmd $srcdir/$subdir/$src_file $objfile] { set failed 1 @@ -860,8 +857,6 @@ proc run_cc_link_tests { ldtests } { global env global CC_FOR_TARGET global CXX_FOR_TARGET - global CFLAGS_FOR_TARGET - global CXXFLAGS_FOR_TARGET global ar global exec_output global board_cflags @@ -950,9 +945,9 @@ proc run_cc_link_tests { ldtests } { lappend objfiles $objfile if { [ string match "c++" $lang ] } { - set cmd "$CXX_FOR_TARGET -c $CXXFLAGS_FOR_TARGET $cflags" + set cmd "$CXX_FOR_TARGET -c $cflags" } else { - set cmd "$CC_FOR_TARGET -c $CFLAGS_FOR_TARGET $cflags" + set cmd "$CC_FOR_TARGET -c $cflags" } if ![ld_compile $cmd $srcdir/$subdir/$src_file $objfile] { set failed 1