From patchwork Thu Jan 5 00:27:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Harmstone X-Patchwork-Id: 39188 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp41146wrt; Wed, 4 Jan 2023 16:27:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXtirn2JHuJHxDXB3DkG6giNJ14IGY9A4grw8fCohPoK1Ds6d/3bRaeFy/7aGntKrz1TAD/S X-Received: by 2002:a05:6402:5145:b0:462:7b85:33aa with SMTP id n5-20020a056402514500b004627b8533aamr41855460edd.2.1672878477671; Wed, 04 Jan 2023 16:27:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672878477; cv=none; d=google.com; s=arc-20160816; b=NqcYZSSsotyD+Xb1/ZdYKR5LevAY/3zCX8uVcLqSQKpXETKypAw/vixYGm7PrNn5EQ EtLj42PjZG8wJbMAowm7m8CUltZ0euyte0aZmLVYeiFfH6PZ+dA7CCcB1CGUUrI0v4xX kFPN4Sq15afPQ9OJiJr+3TaRN3Tt2JIN89gbuSvaIVYY0Ws/vzsgK5ypgvUrKASt4v5Z U4ttfH0bWi+RSe3F6KI2ag5VT3RqzSGBcRfLlJfeDnPbp8dPE+U2rtrd9K4+nM7OhRQw Fbi8rTyZ87KsBcISbxQpimP/G/EtLvDOQJm6Q3QUVT0O65mW0HF73WJioNPGNi1MWjvA kdAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :dmarc-filter:delivered-to; bh=x616Qe7ez1hXXqZ9Eom8SCcpLDB4Tbs5jcxUA2vgiRU=; b=IIilvLNVU8Dksy6Cvadpd2ZyHuWimhXiFmcmdWzJl2I3nUn5xz01IJv8QlELCxB/54 QtPDiV7k/2I387vfd+IuOnrrC9Z7i+9X9Y7D9czb9sjZrpcF0G/ylC/woQ3AWUrvk123 DgLHk9i4fqBDzn2ujMKZi5/mBJt5rAkN4N/l5XCJpP0AxKNLthzl2ysz9fAL/vaat3Or MPgIy1URuQeGupsQWKSm3/Q+SBN63PRFNDH59EHDjDT22tVWn4O2YbrI5FX000P85RXN ppq+mQCGtq5EX01BV+Rh5E0Nr0QJzFUIVZ1goCEoDzT0FfGM9l3PSGkkIeYBPb7XoBsf 9Vgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20210112 header.b=brfPbRSy; 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" Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id z37-20020a509e28000000b004534c6c4bd7si32562451ede.433.2023.01.04.16.27.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 16:27:57 -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; dkim=fail header.i=@gmail.com header.s=20210112 header.b=brfPbRSy; 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" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8D21C3858C39 for ; Thu, 5 Jan 2023 00:27:56 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id E62F23858D39 for ; Thu, 5 Jan 2023 00:27:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E62F23858D39 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=harmstone.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-x42d.google.com with SMTP id bn26so15210215wrb.0 for ; Wed, 04 Jan 2023 16:27:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=x616Qe7ez1hXXqZ9Eom8SCcpLDB4Tbs5jcxUA2vgiRU=; b=brfPbRSydm31Ng1wZ7O4s4+HyoLwUrefF+j1sefXWpDdFRFy4k5m9nMcMRK1pEuD0y oqdRCtN57EhL+oU30dP1UrMU6zF+KGqO59Di2szOLIGN0pZ/lOJzVjlPrby0X9++H74C FnZ9gwe403AoOsYrreChcnwBvXocvBNNxSHeLQ+dZ+blC94ucl3RpKHskrFJhmbNHfL7 PnXREzOqhokBUdaPl+jzhgrTsO5IQxYUpwmyrYDYMfLKLMlnKI/1y7DnMa2HB6ez7DJR IO6j6CNQFGmpcwpSA7CmQ6Latwn+ufrhDQswbQhEsju3m2H/xAtg3wz9kspbhMMo3vT6 LNvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=x616Qe7ez1hXXqZ9Eom8SCcpLDB4Tbs5jcxUA2vgiRU=; b=WjRFnT2weW34mnndV6ai5XvYGV3F8Q/6LBYAkwOwLcK7s24pmMosdP+3+ArGy2+HsR DelTvsKRBK+ZTJMKOOPj5VQ0l0rbrXrYtNWK14xrnzGtq9/TJiJosYpQvsWBBfarvphW WLn0XlmqP/WCglpUVEEFFFBN9ep3iLHT5dhERVs8zIhywOAYe0vx8T0C2sunf3rZbtEg 7DYxZ2lN6ma31OEIaO6OwCCy+0pl6tDjfX9khuuO7wzWZ0RhC0yH885IFS2XDD4q8A0T rrtbLt4wHJEcITIiA7oUj0pJTxJEHqtyl1OPfBlqosSD3a78At4OcY5iMAr46g6OoZrg c2sQ== X-Gm-Message-State: AFqh2kqQYcqCdVHDVYvf7vH5aiy9HAI9elupAXwFdY4DNV6Qp1x7FY2R Cz4r3mO/ZphUgKjI7AK+x5ovIJUhOSqHng== X-Received: by 2002:adf:fec6:0:b0:242:6e5d:c0fb with SMTP id q6-20020adffec6000000b002426e5dc0fbmr31827476wrs.28.1672878466269; Wed, 04 Jan 2023 16:27:46 -0800 (PST) Received: from beren.harmstone.com ([2a02:8010:64ea:0:8eb8:7eff:fe53:9d5f]) by smtp.gmail.com with ESMTPSA id g3-20020a5d6983000000b00287da7ee033sm20672664wru.46.2023.01.04.16.27.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 16:27:45 -0800 (PST) From: Mark Harmstone To: binutils@sourceware.org Cc: Mark Harmstone Subject: [PATCH] ld/testsuite: Fix test failures in pe.exp caused by 8819b236 Date: Thu, 5 Jan 2023 00:27:43 +0000 Message-Id: <20230105002743.25019-1-mark@harmstone.com> X-Mailer: git-send-email 2.37.4 MIME-Version: 1.0 X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_NUMSUBJECT, 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: , 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?1754140222599279482?= X-GMAIL-MSGID: =?utf-8?q?1754140222599279482?= This fixes three test failures caused by the change in .idata alignment on x86_64-w64-mingw32. The secrel and secidx tests were dumping .idata, so this is easy enough to solve - it's irrelevant to the tests anyway. As for the CFI test, it looks like the debug_frame code inserts an empty entry at the beginning to pad this to an 8-byte boundary, so I've changed the section alignment for the test to fix this. --- ld/testsuite/ld-pe/cfi.d | 6 +++--- ld/testsuite/ld-pe/secidx_64.d | 2 +- ld/testsuite/ld-pe/secrel_64.d | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ld/testsuite/ld-pe/cfi.d b/ld/testsuite/ld-pe/cfi.d index 55ebaca1aef..c4d9b6ef2c3 100644 --- a/ld/testsuite/ld-pe/cfi.d +++ b/ld/testsuite/ld-pe/cfi.d @@ -1,10 +1,10 @@ #source: cfia.s #source: cfib.s -#ld: --file-align 1 --section-align 1 +#ld: --file-align 8 --section-align 8 #objdump: -Wf #... -0+4 0+14 0*ffffffff CIE +0+ 0+14 0*ffffffff CIE Version: 1 Augmentation: "" Code alignment factor: 1 @@ -20,7 +20,7 @@ DW_CFA_nop DW_CFA_nop -0+1c 0+24 0+4 FDE cie=0+4 pc=.* +0+18 0+24 0+ FDE cie=0+ pc=.* DW_CFA_advance_loc: 4 to .* DW_CFA_def_cfa_offset: 16 DW_CFA_offset: r6 \(rbp\) at cfa\-16 diff --git a/ld/testsuite/ld-pe/secidx_64.d b/ld/testsuite/ld-pe/secidx_64.d index ddf4aec74f9..6f034f7ac9e 100644 --- a/ld/testsuite/ld-pe/secidx_64.d +++ b/ld/testsuite/ld-pe/secidx_64.d @@ -24,4 +24,4 @@ Contents of section \.rdata: .*3030 3c3c3c3e 3e3e3e3e 3e000000 00000000 <<<>>>>>>....... Contents of section \.idata: .*4000 00000000 00000000 00000000 00000000 ................ - .*4010 00000000 .... + .*4010 00000000 .* diff --git a/ld/testsuite/ld-pe/secrel_64.d b/ld/testsuite/ld-pe/secrel_64.d index aba1bf11c69..2997cac691f 100644 --- a/ld/testsuite/ld-pe/secrel_64.d +++ b/ld/testsuite/ld-pe/secrel_64.d @@ -25,4 +25,4 @@ Contents of section \.rdata: .*3020 3e3e3e3e 00000000 00000000 00000000 >>>>............ Contents of section \.idata: .*4000 00000000 00000000 00000000 00000000 ................ - .*4010 00000000 .... + .*4010 00000000 .* \ No newline at end of file