From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by sourceware.org (Postfix) with ESMTPS id CBC603858D26 for ; Mon, 7 Nov 2022 17:53:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CBC603858D26 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-13ba86b5ac0so13545994fac.1 for ; Mon, 07 Nov 2022 09:53:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=3N3e+IxKCevM2ZnwhFNENTG3y77hS9NZwXvrfmFUCn4=; b=HlJH6qhisswcgeWTtb78/qi5Nxio07EBsB1okJl3L7ZbxRGnkhE2odmPUJG6yjVU0W vZ/BXZFHsmkVWHt3AXpfUgnDOkZBynr5ckZTEYQy4vy3B5JHkOS7Ealmra8vXY78b55A 04/BewpNxePl3L+ezXilKxjybMZD8BpkD2U7R8yi7BgRsL+RIEK3l6U1PuhdAg8fMEcl uQDPbdLxVPeLuXpM7MtWvNQYbp8K+qABlQxqjQs2Lq8iT1Gpz/OUupdC0TB+MkQ308Hn 74vwQ0AArgUqZBN1imFk4VfX/7UjD/payG3WLuVavu/Zpe4ijkfBF5ws64uv/noy40Ux o7/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3N3e+IxKCevM2ZnwhFNENTG3y77hS9NZwXvrfmFUCn4=; b=dbosrCpvS0smsc2CQFJSk3A73VJxD46oN7Y27CcRzJpKrn53B60xuE4TqZ+WiGa71P tb5Si2icL128TP4A1qAweCM5A/o/br3cY6izp3rJ0JV9Kqx2UYIZZYtA8xKnMivhJ/Kl 2/AmHUQxZ6nNsUB1Qx8gCxxyuJjNtmj3ONlLnhfX57dK4FxP/ShXqJm2KUzLnpI3zE1i 110ogRosjSl4PQon8GZVVZyg/XDTqKPMXRLYk+7Jv6bLfRyvN/I7JFybUAT9ioly7Vz5 Y4xX7VeRr1/48Cz6OF847f3YUL16zyCNfVWTvYGMy4twiNowLTjb2X+S7Pi0egO+GcTj lrAw== X-Gm-Message-State: ACrzQf1MH8PCh51ddINBfgpWDZ9AfSQ/PWDaIiJvxBov5ctQCz0xMgVr x2rLCwulgeLLTxjEvjJBPnyWIP+0718e4a9XVjOiuLY0+HhF0Q== X-Google-Smtp-Source: AMsMyM4HwOKniJjqRxANG/9b2znui9FYamBdd2FtbruBd2F6/aKymjwkeyCpeYiLMv4YvmLq6D21Z/iWkt/dS7M7nRk= X-Received: by 2002:a05:6870:f627:b0:13b:b20d:5c6d with SMTP id ek39-20020a056870f62700b0013bb20d5c6dmr580210oab.250.1667843626913; Mon, 07 Nov 2022 09:53:46 -0800 (PST) MIME-Version: 1.0 From: Zac Walker Date: Mon, 7 Nov 2022 18:53:35 +0100 Message-ID: Subject: [PATCH] GAS fix section alignment for aarch64-pe To: binutils@sourceware.org Content-Type: multipart/mixed; boundary="000000000000ec766a05ece51a94" X-Spam-Status: No, score=-10.1 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --000000000000ec766a05ece51a94 Content-Type: text/plain; charset="UTF-8" For the aarch64-pe target, section alignment for various values of '.align' causes writing of coff files to fail. This patch performs aligning in md_section_align as opposed to the original approach in aarch64_handle_align. The change is specific to the aarch64-pe target. Thanks, Zac --- gas/config/tc-aarch64.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index f6fa158583..44ad510209 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -8290,13 +8290,22 @@ md_estimate_size_before_relax (fragS * fragp, segT segtype ATTRIBUTE_UNUSED) return 4; } -/* Round up a section size to the appropriate boundary. */ - +/* Round up a COFF section size not needed for ELF */ +#ifdef OBJ_COFF +valueT +md_section_align (segT segment, valueT size) +{ + int align = bfd_section_alignment (segment); + valueT mask = ((valueT) 1 << align) - 1; + return (size + mask) & ~mask; +} +#else /* !OBJ_COFF */ valueT md_section_align (segT segment ATTRIBUTE_UNUSED, valueT size) { return size; } +#endif /* !OBJ_COFF */ /* This is called from HANDLE_ALIGN in write.c. Fill in the contents of an rs_align_code fragment. @@ -8353,7 +8362,11 @@ aarch64_handle_align (fragS * fragP) if (noop_size) memcpy (p, aarch64_noop, noop_size); + +/* COFF sections may have unaligned fr_var and then be aligned in md_section_align */ +#ifndef OBJ_COFF fragP->fr_var = noop_size; +#endif } /* Perform target specific initialisation of a frag. -- 2.25.1 --000000000000ec766a05ece51a94 Content-Type: application/octet-stream; name="0001-GAS-fix-section-alignment-for-aarch64-pe.patch" Content-Disposition: attachment; filename="0001-GAS-fix-section-alignment-for-aarch64-pe.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_la71m13v0 RnJvbSAxNDk0M2Q4YjQ1YzlmZmI0YjQ2M2Y3ZjEyYjYwZTZlNzllMGJhNjgxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBaYWMgV2Fsa2VyIDx6YWMud2Fsa2VyQGxpbmFyby5vcmc+CkRh dGU6IE1vbiwgMjQgT2N0IDIwMjIgMjI6MjE6MzkgKzAyMDAKU3ViamVjdDogW1BBVENIXSBHQVMg Zml4IHNlY3Rpb24gYWxpZ25tZW50IGZvciBhYXJjaDY0LXBlCgotLS0KIGdhcy9jb25maWcvdGMt YWFyY2g2NC5jIHwgMTcgKysrKysrKysrKysrKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNl cnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dhcy9jb25maWcvdGMtYWFy Y2g2NC5jIGIvZ2FzL2NvbmZpZy90Yy1hYXJjaDY0LmMKaW5kZXggZjZmYTE1ODU4My4uNDRhZDUx MDIwOSAxMDA2NDQKLS0tIGEvZ2FzL2NvbmZpZy90Yy1hYXJjaDY0LmMKKysrIGIvZ2FzL2NvbmZp Zy90Yy1hYXJjaDY0LmMKQEAgLTgyOTAsMTMgKzgyOTAsMjIgQEAgbWRfZXN0aW1hdGVfc2l6ZV9i ZWZvcmVfcmVsYXggKGZyYWdTICogZnJhZ3AsIHNlZ1Qgc2VndHlwZSBBVFRSSUJVVEVfVU5VU0VE KQogICByZXR1cm4gNDsKIH0KIAotLyogUm91bmQgdXAgYSBzZWN0aW9uIHNpemUgdG8gdGhlIGFw cHJvcHJpYXRlIGJvdW5kYXJ5LgkgKi8KLQorLyogUm91bmQgdXAgYSBDT0ZGIHNlY3Rpb24gc2l6 ZSBub3QgbmVlZGVkIGZvciBFTEYgKi8KKyNpZmRlZiBPQkpfQ09GRgordmFsdWVUCittZF9zZWN0 aW9uX2FsaWduIChzZWdUIHNlZ21lbnQsIHZhbHVlVCBzaXplKQoreworICBpbnQgYWxpZ24gPSBi ZmRfc2VjdGlvbl9hbGlnbm1lbnQgKHNlZ21lbnQpOworICB2YWx1ZVQgbWFzayA9ICgodmFsdWVU KSAxIDw8IGFsaWduKSAtIDE7CisgIHJldHVybiAoc2l6ZSArIG1hc2spICYgfm1hc2s7Cit9Cisj ZWxzZSAvKiAhT0JKX0NPRkYgKi8KIHZhbHVlVAogbWRfc2VjdGlvbl9hbGlnbiAoc2VnVCBzZWdt ZW50IEFUVFJJQlVURV9VTlVTRUQsIHZhbHVlVCBzaXplKQogewogICByZXR1cm4gc2l6ZTsKIH0K KyNlbmRpZiAvKiAhT0JKX0NPRkYgKi8KIAogLyogVGhpcyBpcyBjYWxsZWQgZnJvbSBIQU5ETEVf QUxJR04gaW4gd3JpdGUuYy4JIEZpbGwgaW4gdGhlIGNvbnRlbnRzCiAgICBvZiBhbiByc19hbGln bl9jb2RlIGZyYWdtZW50LgpAQCAtODM1Myw3ICs4MzYyLDExIEBAIGFhcmNoNjRfaGFuZGxlX2Fs aWduIChmcmFnUyAqIGZyYWdQKQogCiAgIGlmIChub29wX3NpemUpCiAgICAgbWVtY3B5IChwLCBh YXJjaDY0X25vb3AsIG5vb3Bfc2l6ZSk7CisKKy8qIENPRkYgc2VjdGlvbnMgbWF5IGhhdmUgdW5h bGlnbmVkIGZyX3ZhciBhbmQgdGhlbiBiZSBhbGlnbmVkIGluIG1kX3NlY3Rpb25fYWxpZ24gKi8K KyNpZm5kZWYgT0JKX0NPRkYKICAgZnJhZ1AtPmZyX3ZhciA9IG5vb3Bfc2l6ZTsKKyNlbmRpZgog fQogCiAvKiBQZXJmb3JtIHRhcmdldCBzcGVjaWZpYyBpbml0aWFsaXNhdGlvbiBvZiBhIGZyYWcu Ci0tIAoyLjI1LjEKCg== --000000000000ec766a05ece51a94--