From patchwork Wed Aug 30 17:31:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 137177 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp4677912vqm; Wed, 30 Aug 2023 10:32:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEbcwSMpBIsMByMaL6fHMZk4SIaS/2orqTCEHNkLM/YLMaEcp4lAMo3F/FEclj1VaZ9Uhgl X-Received: by 2002:aa7:d997:0:b0:51e:4439:f474 with SMTP id u23-20020aa7d997000000b0051e4439f474mr2084885eds.35.1693416730041; Wed, 30 Aug 2023 10:32:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693416730; cv=none; d=google.com; s=arc-20160816; b=KWh9XTBaCHlBZyq2rT9iT2hLXPN07lB58ian29Q/Y2k+zVJCfx9Zf/98Pk7RNjpxpV 0iAvFY+duNkM5yFoMWWTbkNfmRKQ8NNgwh79EwSO0dpWf2mW2Y4Q4kHf/VvwCtg8C8Gf w3ZxQv2Dq6z6Pqbi8x3R4kBEv3BWTV+HSyApBoXWoBkqGsCI1Dxhkk37FoiZdfsxxoAc oy6qLn8LSpPCKeMYMDnvJM0X5Pb93qji0cGlegBoZUVi2uwN9LJuCkSe2U3Ttw6f4+E9 QBrev/WxfmoiFzEnpYpPa0zCjYNDEx0JPauwte92gex0Ngc3bnm4McEhbb/Q6i/aVk19 e6tg== 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-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=m4SeF/4oQ0HI7KG+pnIKtdNbHeRP1xYL5KuwhSUs20c=; fh=NLxAvL/bDfPg4AGOtxqvQlND8vazkZrNzKLY8+LAbBY=; b=HTfMyNS/IQwSU+Z8LM0sxHyMI4zBXRN0arQKsEBBkINnd+fEUg8oGXktaRMOobaY14 LxKgtlNBNZtaxvbP5dVX2MXE3nyzmS6xlaFr7MKeM3i7joGmPd8eSw4YhataFgrJUJoQ SVb0xGt4rc5aN/CJdLu6sZXHQObXm8NlmQIN8GBoSbcC4+RsBMMh/xLOSMNF7Fsl0ZXr LGxxsenLNm06dxWlAJa2z4AaiHwarfH8pE3yWgEEmnKhgGhHd7JisaS4oKRn0+KMWp9y Zb8cblv6Fj/TJ2Inwdc4EjjdVVVjAn1pfe0WCeeWzzCCCr0TGeIMpIjPe6o8t5OT+x3H PNhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=l5xobQz4; 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id r6-20020aa7d586000000b00523215dd857si7672481edq.52.2023.08.30.10.32.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 10:32:10 -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=l5xobQz4; 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 EB6FF3858C20 for ; Wed, 30 Aug 2023 17:32:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EB6FF3858C20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693416729; bh=m4SeF/4oQ0HI7KG+pnIKtdNbHeRP1xYL5KuwhSUs20c=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=l5xobQz40EeBBp8awYCpZ42cLQmrj+s5AFDm7VZl12btXShuzRaAYNjM6sKeaUnrX tJv1/By2WpdknD+MULO7g6mHWw0FeUeXfPySUfMKIcaJUBgeqJdQ8f9XtSu45Mxm6j VL9vhMQZriqF644aK9O790cw7G55yU43QebHYGGw= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id DBCC43857B9B for ; Wed, 30 Aug 2023 17:31:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DBCC43857B9B Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-68bed2c786eso4114666b3a.0 for ; Wed, 30 Aug 2023 10:31:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693416712; x=1694021512; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=m4SeF/4oQ0HI7KG+pnIKtdNbHeRP1xYL5KuwhSUs20c=; b=lzkKRXQX4hzuXO8IB8qsXCLAdhPVUz9V80s/t+6lX+YQdyVnclF0vSmpILRSAf4nd1 iNw3sEgBNr1TIdMhiqdKCsDzg9fpJFGF1rsSMY+k9buCCfwGGiI8FInHB8EMFbThB5JP WhBZmaag1URR/k8FoxDK9yuHdTE+PFXeIkUOvkGVgDYIOzatUjRLuYYSm04P7RgE3yFd 1rXdFYjdHTKu9outTyGXFJp4zkCfKiZoW3G9p2VMJ4mOcpSrwKWkJuNGkncWZ3tw5UEA JA8SJOwPMSRYizihBV436ZLLE3dcbjX5BWj0htnKl0CrOwfdAZo2PNmywxGFtOn6nJWU Z4Qw== X-Gm-Message-State: AOJu0YyBEDiSrj5YleimeNuRJfYI8Rw0XvEbOcgGQCMhUalTGiHEqbPd XFvZcjE29BFPXV7EAgvTlUCY3tpY+os= X-Received: by 2002:a05:6a21:71cb:b0:14c:d5c7:381b with SMTP id ay11-20020a056a2171cb00b0014cd5c7381bmr3235209pzc.36.1693416711577; Wed, 30 Aug 2023 10:31:51 -0700 (PDT) Received: from gnu-cfl-3.localdomain ([172.59.161.42]) by smtp.gmail.com with ESMTPSA id p9-20020a63b809000000b0055b61cd99a1sm10852444pge.81.2023.08.30.10.31.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 10:31:51 -0700 (PDT) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id DC6CF7401C1 for ; Wed, 30 Aug 2023 10:31:49 -0700 (PDT) To: binutils@sourceware.org Subject: [PATCH] elf: Don't merge sections with different SHF_LINK_ORDER Date: Wed, 30 Aug 2023 10:31:49 -0700 Message-ID: <20230830173149.757103-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3025.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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Binutils" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775676140837342496 X-GMAIL-MSGID: 1775676140837342496 For relocatable link, don't merge 2 SHF_LINK_ORDER sections if output sections of their linked to sections are different. * ldelf.c (elf_orphan_compatible): Don't merge sections with different SHF_LINK_ORDER. * testsuite/ld-elf/pr30791a.d: New file. * testsuite/ld-elf/pr30791a.s: Likewise. * testsuite/ld-elf/pr30791b.d: Likewise. * testsuite/ld-elf/pr30791b.s: Likewise. * testsuite/ld-elf/pr30791c.s: Likewise. * testsuite/ld-elf/pr30791d.s: Likewise. --- ld/ldelf.c | 7 ++++++- ld/testsuite/ld-elf/pr30791a.d | 16 ++++++++++++++++ ld/testsuite/ld-elf/pr30791a.s | 20 ++++++++++++++++++++ ld/testsuite/ld-elf/pr30791b.d | 11 +++++++++++ ld/testsuite/ld-elf/pr30791b.s | 20 ++++++++++++++++++++ ld/testsuite/ld-elf/pr30791c.s | 20 ++++++++++++++++++++ ld/testsuite/ld-elf/pr30791d.s | 20 ++++++++++++++++++++ 7 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 ld/testsuite/ld-elf/pr30791a.d create mode 100644 ld/testsuite/ld-elf/pr30791a.s create mode 100644 ld/testsuite/ld-elf/pr30791b.d create mode 100644 ld/testsuite/ld-elf/pr30791b.s create mode 100644 ld/testsuite/ld-elf/pr30791c.s create mode 100644 ld/testsuite/ld-elf/pr30791d.s diff --git a/ld/ldelf.c b/ld/ldelf.c index 4212075a0e2..d74354a9622 100644 --- a/ld/ldelf.c +++ b/ld/ldelf.c @@ -2080,9 +2080,14 @@ elf_orphan_compatible (asection *in, asection *out) return false; /* We can't merge with a member of an output section group or merge two sections with differing SHF_EXCLUDE or other processor and OS - specific flags when doing a relocatable link. */ + specific flags or with different SHF_LINK_ORDER when doing a + relocatable link. */ if (bfd_link_relocatable (&link_info) && (elf_next_in_group (out) != NULL + || ((elf_section_flags (in) & SHF_LINK_ORDER) != 0 + && (elf_section_flags (out) & SHF_LINK_ORDER) != 0 + && (elf_linked_to_section (in)->output_section + != elf_linked_to_section (out)->output_section)) || ((elf_section_flags (out) ^ elf_section_flags (in)) & (SHF_MASKPROC | SHF_MASKOS)) != 0)) return false; diff --git a/ld/testsuite/ld-elf/pr30791a.d b/ld/testsuite/ld-elf/pr30791a.d new file mode 100644 index 00000000000..2446b525fa9 --- /dev/null +++ b/ld/testsuite/ld-elf/pr30791a.d @@ -0,0 +1,16 @@ +#source: pr30791a.s +#source: pr30791b.s +#ld: -r +#readelf: -S --wide + +#... +Section Headers: +#... + \[[ 0-9]+\] __patchable_function_entries[ \t]+PROGBITS[ \t0-9a-f]+WAL.* +#... + \[[ 0-9]+\] __patchable_function_entries[ \t]+PROGBITS[ \t0-9a-f]+WAL.* +#... + \[[ 0-9]+\] __patchable_function_entries[ \t]+PROGBITS[ \t0-9a-f]+WAL.* +#... + \[[ 0-9]+\] __patchable_function_entries[ \t]+PROGBITS[ \t0-9a-f]+WAL.* +#pass diff --git a/ld/testsuite/ld-elf/pr30791a.s b/ld/testsuite/ld-elf/pr30791a.s new file mode 100644 index 00000000000..44b75db87d8 --- /dev/null +++ b/ld/testsuite/ld-elf/pr30791a.s @@ -0,0 +1,20 @@ + .section .text.a,"ax",%progbits + .globl a + .type a, %function +a: +.LFB0: + .section __patchable_function_entries,"awo",%progbits,.LPFE0 + .dc.a .LPFE0 + .section .text.a +.LPFE0: + .byte 0 + .section .text.b,"ax",%progbits + .globl b + .type b, %function +b: +.LFB1: + .section __patchable_function_entries,"awo",%progbits,.LPFE1 + .dc.a .LPFE1 + .section .text.b +.LPFE1: + .byte 0 diff --git a/ld/testsuite/ld-elf/pr30791b.d b/ld/testsuite/ld-elf/pr30791b.d new file mode 100644 index 00000000000..5013c240f8a --- /dev/null +++ b/ld/testsuite/ld-elf/pr30791b.d @@ -0,0 +1,11 @@ +#source: pr30791c.s +#source: pr30791d.s +#ld: -r +#readelf: -S --wide + +#failif +#... + \[[ 0-9]+\] __patchable_function_entries[ \t]+PROGBITS[ \t0-9a-f]+WAL.* +#... + \[[ 0-9]+\] __patchable_function_entries[ \t]+PROGBITS[ \t0-9a-f]+WAL.* +#... diff --git a/ld/testsuite/ld-elf/pr30791b.s b/ld/testsuite/ld-elf/pr30791b.s new file mode 100644 index 00000000000..3f97f6c979f --- /dev/null +++ b/ld/testsuite/ld-elf/pr30791b.s @@ -0,0 +1,20 @@ + .section .text.c,"ax",%progbits + .globl c + .type c, %function +c: +.LFB0: + .section __patchable_function_entries,"awo",%progbits,.LPFE0 + .dc.a .LPFE0 + .section .text.c +.LPFE0: + .byte 0 + .section .text.d,"ax",%progbits + .globl d + .type d, %function +d: +.LFB1: + .section __patchable_function_entries,"awo",%progbits,.LPFE1 + .dc.a .LPFE1 + .section .text.d +.LPFE1: + .byte 0 diff --git a/ld/testsuite/ld-elf/pr30791c.s b/ld/testsuite/ld-elf/pr30791c.s new file mode 100644 index 00000000000..71ef77bf5e9 --- /dev/null +++ b/ld/testsuite/ld-elf/pr30791c.s @@ -0,0 +1,20 @@ + .text + .globl a + .type a, %function +a: +.LFB0: + .section __patchable_function_entries,"awo",%progbits,.LPFE0 + .dc.a .LPFE0 + .text +.LPFE0: + .byte 0 + .text + .globl b + .type b, %function +b: +.LFB1: + .section __patchable_function_entries,"awo",%progbits,.LPFE1 + .dc.a .LPFE1 + .text +.LPFE1: + .byte 0 diff --git a/ld/testsuite/ld-elf/pr30791d.s b/ld/testsuite/ld-elf/pr30791d.s new file mode 100644 index 00000000000..5ca1c60bdb9 --- /dev/null +++ b/ld/testsuite/ld-elf/pr30791d.s @@ -0,0 +1,20 @@ + .text + .globl c + .type c, %function +c: +.LFB0: + .section __patchable_function_entries,"awo",%progbits,.LPFE0 + .dc.a .LPFE0 + .text +.LPFE0: + .byte 0 + .text + .globl d + .type d, %function +d: +.LFB1: + .section __patchable_function_entries,"awo",%progbits,.LPFE1 + .dc.a .LPFE1 + .text +.LPFE1: + .byte 0