From patchwork Sat Dec 16 04:01:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 179800 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp24624dyi; Fri, 15 Dec 2023 20:04:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IEPywIV0wzcyTe9MYtkQGlKsOOngx2us+EkzOoLPsCp7NUCJIC4uzOdUPAp8NtrsxJ6ZwwJ X-Received: by 2002:ac8:5fce:0:b0:425:a82a:3016 with SMTP id k14-20020ac85fce000000b00425a82a3016mr18405146qta.77.1702699458970; Fri, 15 Dec 2023 20:04:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702699458; cv=pass; d=google.com; s=arc-20160816; b=qzhLYaLAbuDrPxoTXohN3BbMCQRWZmnjDEhrny767bN0X8svk5aUyrneuNATOb6vhY hV+U2QNhu5Rlubwps5CcXdj8XNbF/tpsYOlEvgPtlk22nrvRxmq4koFx60PWgTczu9nG 73Qz0ETSlW8UxKqswPseU2K0UKKzK/qME6Yv81b0ojgSWA3Xu+UfinCgNoFeJT/bjwCU dyDXUipq700JJTJd7idtU9UA4QOed8EDRQj/bSqYIyY8+GbnY/zLcmRPKXj0rHKdnHpN ua+AL3IQFJmy2qV0+68iRHPa5CsE2P+ipbwG/agF3pzvy1sgsYqZhMlELJ5uPqbLYcML OIXQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=Moz5hjWPdzA8rihLTnNsr6JTcbEOO9WPVIzJ6SKed/E=; fh=K6PyHuw3ZXsdAJsiwR1V00MJz/XCQlRStXtMmfw3mzI=; b=OIF8XvAFEeXq4RyfCNq9M8YHuOYmzzdYlTaekWg+FPPRFoz4Bi8yK+qrYpUvVjmha8 Hl7aO0FpKSpyIeGRU8sSkXiO3PqACtm3Gc41WMPAgq9rksJkE4nCPWoBZuFN0WYq+ixD qaidcCFRxCxzTgwO2BPnoWJ5Hp8gYJZGQ4FBSzQo+8kM6CW12dOv2ShYKPLuk48hmFy3 AEuGPze6e56JLWV85lbNa2wMtD2A3YgGJudd0jTBrUoRMxWy+0qEWJ7h6A86zD54qw/B n4TmDTvKK6Z+/e3aeyZ+NIgRNZknw3YHMOoLCKWbVJWewmczkAS6uMOcUCECuCEHS/MX ZOOQ== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); 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=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id bt14-20020ac8690e000000b0042586375f66si20832015qtb.124.2023.12.15.20.04.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 20:04:18 -0800 (PST) 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; arc=pass (i=1); 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=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 799AC383CA8F for ; Sat, 16 Dec 2023 04:03:47 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 5E523385773F for ; Sat, 16 Dec 2023 04:03:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5E523385773F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5E523385773F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699383; cv=none; b=qq/OEa+kprwD5QUg8jbyJ7u8IQ3D4Vzysy9zTwjxw2C4JMDvvAylZmAiTUNWWh/+eWcFzT2Kto8gzXGQ2cGmV3MiPbzx3DUUsbqWcj+E1foBurCaJkgzmWp1nTuJ49BK3es+eziBBUxqumqEGUOR8fA5N2hXdoJbwkMBCc/eaZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699383; c=relaxed/simple; bh=7vhFHzkXcN2k8dTaJcWEOz2yD4ceEpz9lbFf1sU6I/k=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=R+x3+f8zIcIxHCX8u3TLhZCZS8j0mjY2YucGReZDI5l9Mr7YzEEMuTNHm0UPghgYu5d6c/bF8SoAxgVpcgTEZwr46+MwD5jojwVoAo3EqiIgDhImPXbZYofCY0XTfv1r5v/ogHjt868sKE5mh7KPPFjH9CUUMW53+ZV7vajiYxA= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: binutils@sourceware.org Cc: nickc@redhat.com, "H.J. Lu" Subject: [2.41 PATCH 09/10] Fix ld/x86: reduce testsuite dependency on system object files Date: Sat, 16 Dec 2023 04:01:32 +0000 Message-ID: <20231216040239.1981071-10-sam@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216040239.1981071-1-sam@gentoo.org> References: <20231216040239.1981071-1-sam@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785409787977960642 X-GMAIL-MSGID: 1785409787977960642 From: "H.J. Lu" commit eab996435fe65a421541f59557c5f1fd427573a3 Author: Jan Beulich Date: Tue Nov 7 13:58:32 2023 +0100 ld/x86: reduce testsuite dependency on system object files changed some C compiler tests to assembler/linker tests which introduced 2 problems: 1. It broke x32 binutils tests since --64 was passed to assembler, but -m elf_x86_64 wasn't passed to linker. 2. -nostdlib was passed to C compiler driver to exclude standard run-time files which should be avoided with -r option for linker tests. Fix them by passing -m elf_x86_64 to linker and removing -nostdlib for linker tests with -r. PR ld/30722 * testsuite/ld-x86-64/x86-64.exp: Pass -m elf_x86_64 to linker for tests with --64. Remove -nostdlib for tests with -r. (cherry picked from commit 260aa570edcf120332daefb4a102a08c90e4d9b4) --- ld/testsuite/ld-x86-64/x86-64.exp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 123152df5b0..bc736696cd0 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -2100,7 +2100,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 3" \ - "" \ + "-m elf_x86_64" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-stk.s property-x86-1.s} \ @@ -2109,7 +2109,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 3 (.o)" \ - "-r -nostdlib" \ + "-m elf_x86_64 -r" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-1.s property-stk.s} \ @@ -2118,7 +2118,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 3 (.so)" \ - "-shared" \ + "-m elf_x86_64 -shared" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-1.s property-stk.s} \ @@ -2127,7 +2127,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 4" \ - "" \ + "-m elf_x86_64" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-stk.s property-x86-1.s property-x86-2.s} \ @@ -2136,7 +2136,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 4 (.o)" \ - "-r -nostdlib" \ + "-m elf_x86_64 -r" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-2.s property-x86-1.s property-stk.s} \ @@ -2145,7 +2145,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 4 (.so)" \ - "-shared" \ + "-m elf_x86_64 -shared" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-2.s property-x86-1.s property-stk.s} \ @@ -2154,7 +2154,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 4 (-z stack-size=0)" \ - "-z stack-size=0" \ + "-m elf_x86_64 -z stack-size=0" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-stk.s property-x86-1.s property-x86-2.s} \ @@ -2163,7 +2163,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 5" \ - "-z stack-size=0x900000" \ + "-m elf_x86_64 -z stack-size=0x900000" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-stk.s property-x86-1.s property-x86-2.s} \ @@ -2172,7 +2172,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 5 (.o)" \ - "-r -nostdlib -z stack-size=0x900000" \ + "-m elf_x86_64 -r -z stack-size=0x900000" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-2.s property-x86-1.s property-stk.s} \ @@ -2181,7 +2181,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 5 (.so)" \ - "-shared -z stack-size=0x900000" \ + "-m elf_x86_64 -shared -z stack-size=0x900000" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-2.s property-x86-1.s property-stk.s} \