From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by sourceware.org (Postfix) with ESMTPS id 34C133858292 for ; Tue, 5 Jul 2022 19:50:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 34C133858292 Received: by mail-pg1-x52b.google.com with SMTP id g4so12302646pgc.1 for ; Tue, 05 Jul 2022 12:50:25 -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:subject:date:message-id:mime-version :content-transfer-encoding; bh=i55xgfN+a/NpsR9yOAfbADKQxZcBSiTJ8dFTO2IFB78=; b=zzdqENtxHLvXfro31ntVqTgNXYIdGHpRvEHiqd1WqbYwlk0quGCgLMwTnGdXJjVQro EwwrGiQuQuUoFcgFfE04c/TiGUMtLoNjg6A45D7cPUTlGlAQv0+OT7HTtzo3S9emFFIP qqQrBvPY3d2KPtQXSJNstgABugpxxPQLHsha/uhhBzqQgTHInwRE9H8JNc/Ph9Dv13fT Yfl+ILkNDjMM7CbCaSPAr2aZ1skIb1zLPUa7p+ckRLWNrXAWQO8YNm93uGpUZjbUEVv/ jV6Fhgj6mQHUICHOXGxhYVcjMDSQuhkEvI/2DH9Os57cjC0DKjn/l8qJkE1zRyOs4YLP SDLQ== X-Gm-Message-State: AJIora+74coiBoaBbikFNv2A652sOWlDVPEd7NsW6NAUh9m22+Mr9bL/ cShEGrDPA3QTbiBTEsRrOPoQh0Tu5i8= X-Google-Smtp-Source: AGRyM1u6fVBLuclMC1P6EgHuIuwvxp7VeRWRfYDKlFSKxvwcSmjO/SAGlVzAgEXVrzD9GLvy7//M8Q== X-Received: by 2002:a05:6a00:1a46:b0:525:82e2:a0d3 with SMTP id h6-20020a056a001a4600b0052582e2a0d3mr43069341pfv.48.1657050624031; Tue, 05 Jul 2022 12:50:24 -0700 (PDT) Received: from gnu-tgl-3.localdomain ([172.58.37.183]) by smtp.gmail.com with ESMTPSA id v3-20020aa799c3000000b005284d0fc634sm7167089pfi.97.2022.07.05.12.50.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 12:50:23 -0700 (PDT) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 6C654C0375 for ; Tue, 5 Jul 2022 12:50:22 -0700 (PDT) From: "H.J. Lu" To: binutils@sourceware.org Subject: [PATCH] elf: Copy p_align of PT_GNU_STACK for stack alignment Date: Tue, 5 Jul 2022 12:50:22 -0700 Message-Id: <20220705195022.346635-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3027.3 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, 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.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2022 19:50:26 -0000 commit 74e315dbfe5200c473b226e937935fb8ce391489 Author: H.J. Lu Date: Mon Dec 13 19:46:04 2021 -0800 elf: Set p_align to the minimum page size if possible may ignore p_align of PT_GNU_STACK when copying ELF program header if the maximum page size is larger than p_align of PT_LOAD segments. Copy p_align of PT_GNU_STACK since p_align of PT_GNU_STACK describes stack alignment, not page size, PR binutils/29319 * elf.c (copy_elf_program_header): Copy p_align of PT_GNU_STACK for stack alignment. --- bfd/elf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bfd/elf.c b/bfd/elf.c index 468d37f5028..89484ceb233 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -7685,7 +7685,9 @@ copy_elf_program_header (bfd *ibfd, bfd *obfd) map->p_paddr = segment->p_paddr; map->p_paddr_valid = p_paddr_valid; map->p_align = segment->p_align; - map->p_align_valid = p_palign_valid; + /* Keep p_align of PT_GNU_STACK for stack alignment. */ + map->p_align_valid = (map->p_type == PT_GNU_STACK + || p_palign_valid); map->p_vaddr_offset = 0; if (map->p_type == PT_GNU_RELRO -- 2.36.1