From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 2FA753858C31 for ; Fri, 22 Mar 2024 08:29:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2FA753858C31 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2FA753858C31 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711096175; cv=none; b=WQpHs7Qt+sMfiVbl2G0io8UdGjpE+clcFQh1RGGBcPRPc/lMyWQrG9MAVVPlfbpiXvZ5d9GG9VT0au95wOEHjN4sKSUfC5SeV/r3dDtrJrY/YnvzdadWe9ElMY9b+URDMpeyEam7rsEvx1URB5GAmtxjNvh/XXrnoh/DFFcGgNY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711096175; c=relaxed/simple; bh=RogfY0CUzWnCV8AsMj6P5sK7AxNYwmoJFx3cmIFV95U=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=vZjO2Oljzc7buUtWKTchTvBo+VoL/fUe+H1bxXV1lyfhmm5ombik3kTYqXgE5/1wwcGXjysTvnMeAwQ64GQYhNQvszhJqIjV9xZdvVjVXAL23lAEN/nwBCgUBxB5QFDfC/BmVAgRDFaw/NIHTMLSxvQ8pIYGWUguvaX6EMCIPCM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [10.2.6.5]) by gateway (Coremail) with SMTP id _____8Cx77teQf1lp1ocAA--.47762S3; Fri, 22 Mar 2024 16:29:18 +0800 (CST) Received: from 5.5.5 (unknown [10.2.6.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8AxX89dQf1lArphAA--.58979S2; Fri, 22 Mar 2024 16:29:17 +0800 (CST) From: mengqinggang To: binutils@sourceware.org Cc: xuchenghua@loongson.cn, chenglulu@loongson.cn, liuzhensong@loongson.cn, cailulu@loongson.cn, xry111@xry111.site, i.swmail@xen0n.name, maskray@google.com, luweining@loongson.cn, wanglei@loongson.cn, hejinyang@loongson.cn, mengqinggang@loongson.cn Subject: [PATCH v2] BFD: Fix the bug of R_LARCH_AGLIN caused by discard section Date: Fri, 22 Mar 2024 16:29:15 +0800 Message-Id: <20240322082915.3900449-1-mengqinggang@loongson.cn> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:AQAAf8AxX89dQf1lArphAA--.58979S2 X-CM-SenderInfo: 5phqw15lqjwttqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBj93XoW3GrWxuFyDGF4kKFWrZr4xGrX_yoWfZryDpr y5Zr45CFW8AF18Ww1DZ3y5AF43Wws7uF4jqa4xtw409rs8tryFqF40krWfGFWDG34kCryr Xr1vv3WjvFWvkagCm3ZEXasCq-sJn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUkFb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07jUsqXUUUUU= X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,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: To represent the first and third expression of .align, R_LARCH_ALIGN need to associate with a symbol. We defind a local symbol for R_LARCH_AGLIN. But if the section of the local symbo is discarded, it may result in a undefined symbol error. Instead, we use the section name symbols, and this does not need to add extra symbols. During partial linking (ld -r), if the symbol associated with a relocation is STT_SECTION type, the addend of relocation needs to add the section output offset. We prevent it for R_LARCH_ALIGN. The elf_backend_data.rela_normal only can set all relocations of a target to rela_normal. Add a new function is_rela_normal to elf_backend_data, it can set part of relocations to rela_normal. --- bfd/elf-bfd.h | 4 ++ bfd/elflink.c | 5 +- bfd/elfnn-loongarch.c | 16 ++++++ bfd/elfxx-target.h | 5 ++ gas/config/tc-loongarch.c | 5 +- gas/testsuite/gas/loongarch/relax_align.d | 56 ++++++++----------- .../ld-loongarch-elf/relax-align-discard.lds | 4 ++ .../ld-loongarch-elf/relax-align-discard.s | 17 ++++++ ld/testsuite/ld-loongarch-elf/relax.exp | 12 ++++ 9 files changed, 86 insertions(+), 38 deletions(-) create mode 100644 ld/testsuite/ld-loongarch-elf/relax-align-discard.lds create mode 100644 ld/testsuite/ld-loongarch-elf/relax-align-discard.s diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index c5d325435b6..af507b93df5 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -1721,6 +1721,10 @@ struct elf_backend_data backend relocate_section routine for relocatable linking. */ unsigned rela_normal : 1; + /* Whether a relocation is rela_normal. Compared with rela_normal, + is_rela_normal can set part of relocations to rela_normal. */ + bool (*is_rela_normal) (Elf_Internal_Rela *); + /* Set if DT_REL/DT_RELA/DT_RELSZ/DT_RELASZ should not include PLT relocations. */ unsigned dtrel_excludes_plt : 1; diff --git a/bfd/elflink.c b/bfd/elflink.c index 5a6cb07b2ce..8223db98186 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -11692,7 +11692,10 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd) { rel_hash = PTR_ADD (esdo->rela.hashes, esdo->rela.count); rela_hash_list = rel_hash; - rela_normal = bed->rela_normal; + if (bed->is_rela_normal != NULL) + rela_normal = bed->is_rela_normal (irela); + else + rela_normal = bed->rela_normal; } irela->r_offset = _bfd_elf_section_offset (output_bfd, diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c index c42052f9321..1679aa5da7d 100644 --- a/bfd/elfnn-loongarch.c +++ b/bfd/elfnn-loongarch.c @@ -5454,6 +5454,21 @@ elf_loongarch64_hash_symbol (struct elf_link_hash_entry *h) return _bfd_elf_hash_symbol (h); } +/* If a relocation is rela_normal and the symbol associated with the + relocation is STT_SECTION type, the addend of the relocation would add + sec->output_offset when partial linking (ld -r). + See elf_backend_data.rela_normal and elf_link_input_bfd(). + The addend of R_LARCH_ALIGN is used to represent the first and third + expression of .align, it should be a constant when linking. */ + +static bool +loongarch_elf_is_rela_normal (Elf_Internal_Rela *rel) +{ + if (R_LARCH_ALIGN == ELFNN_R_TYPE (rel->r_info)) + return false; + return true; +} + #define TARGET_LITTLE_SYM loongarch_elfNN_vec #define TARGET_LITTLE_NAME "elfNN-loongarch" #define ELF_ARCH bfd_arch_loongarch @@ -5489,6 +5504,7 @@ elf_loongarch64_hash_symbol (struct elf_link_hash_entry *h) #define elf_backend_grok_psinfo loongarch_elf_grok_psinfo #define elf_backend_hash_symbol elf_loongarch64_hash_symbol #define bfd_elfNN_bfd_relax_section loongarch_elf_relax_section +#define elf_backend_is_rela_normal loongarch_elf_is_rela_normal #define elf_backend_dtrel_excludes_plt 1 diff --git a/bfd/elfxx-target.h b/bfd/elfxx-target.h index 1e6992b5793..6e2d948b69b 100644 --- a/bfd/elfxx-target.h +++ b/bfd/elfxx-target.h @@ -709,6 +709,10 @@ #define elf_backend_rela_normal 0 #endif +#ifndef elf_backend_is_rela_normal +#define elf_backend_is_rela_normal NULL +#endif + #ifndef elf_backend_dtrel_excludes_plt #define elf_backend_dtrel_excludes_plt 0 #endif @@ -955,6 +959,7 @@ static const struct elf_backend_data elfNN_bed = elf_backend_default_use_rela_p, elf_backend_rela_plts_and_copies_p, elf_backend_rela_normal, + elf_backend_is_rela_normal, elf_backend_dtrel_excludes_plt, elf_backend_sign_extend_vma, elf_backend_want_got_plt, diff --git a/gas/config/tc-loongarch.c b/gas/config/tc-loongarch.c index 30aefce36fd..6b1a89738ef 100644 --- a/gas/config/tc-loongarch.c +++ b/gas/config/tc-loongarch.c @@ -1791,10 +1791,7 @@ loongarch_frag_align_code (int n, int max) if (fragP->fr_subtype != 0 && offset > fragP->fr_subtype). */ if (max > 0 && (bfd_vma) max < worst_case_bytes) { - s = symbol_find (".Lla-relax-align"); - if (s == NULL) - s = (symbolS *)local_symbol_make (".Lla-relax-align", now_seg, - &zero_address_frag, 0); + s = symbol_find (now_seg->name); ex.X_add_symbol = s; ex.X_op = O_symbol; ex.X_add_number = (max << 8) | n; diff --git a/gas/testsuite/gas/loongarch/relax_align.d b/gas/testsuite/gas/loongarch/relax_align.d index fc1fd032611..6710927be1b 100644 --- a/gas/testsuite/gas/loongarch/relax_align.d +++ b/gas/testsuite/gas/loongarch/relax_align.d @@ -7,40 +7,30 @@ Disassembly of section .text: -[ ]*0000000000000000 <.Lla-relax-align>: -[ ]+0:[ ]+4c000020[ ]+ret -[ ]+4:[ ]+03400000[ ]+nop -[ ]+4: R_LARCH_ALIGN[ ]+\*ABS\*\+0xc +[ ]*0000000000000000 <.text>: +[ ]+0:[ ]+1a000004[ ]+pcalau12i[ ]+\$a0, 0 +[ ]+0: R_LARCH_PCALA_HI20[ ]+L1 +[ ]+0: R_LARCH_RELAX[ ]+\*ABS\* +[ ]+4:[ ]+02c00084[ ]+addi.d[ ]+\$a0, \$a0, 0 +[ ]+4: R_LARCH_PCALA_LO12[ ]+L1 +[ ]+4: R_LARCH_RELAX[ ]+\*ABS\* [ ]+8:[ ]+03400000[ ]+nop +[ ]+8: R_LARCH_ALIGN[ ]+.text\+0x4 [ ]+c:[ ]+03400000[ ]+nop -[ ]+10:[ ]+4c000020[ ]+ret -[ ]+14:[ ]+03400000[ ]+nop -[ ]+14: R_LARCH_ALIGN[ ]+\*ABS\*\+0xc -[ ]+18:[ ]+03400000[ ]+nop +[ ]+10:[ ]+03400000[ ]+nop +[ ]+14:[ ]+1a000004[ ]+pcalau12i[ ]+\$a0, 0 +[ ]+14: R_LARCH_PCALA_HI20[ ]+L1 +[ ]+14: R_LARCH_RELAX[ ]+\*ABS\* +[ ]+18:[ ]+02c00084[ ]+addi.d[ ]+\$a0, \$a0, 0 +[ ]+18: R_LARCH_PCALA_LO12[ ]+L1 +[ ]+18: R_LARCH_RELAX[ ]+\*ABS\* [ ]+1c:[ ]+03400000[ ]+nop -[ ]+20:[ ]+4c000020[ ]+ret +[ ]+1c: R_LARCH_ALIGN[ ]+.text\+0x404 +[ ]+20:[ ]+03400000[ ]+nop [ ]+24:[ ]+03400000[ ]+nop -[ ]+24: R_LARCH_ALIGN[ ]+.Lla-relax-align\+0x104 -[ ]+28:[ ]+03400000[ ]+nop -[ ]+2c:[ ]+03400000[ ]+nop -[ ]+30:[ ]+4c000020[ ]+ret -[ ]+34:[ ]+03400000[ ]+nop -[ ]+34: R_LARCH_ALIGN[ ]+.Lla-relax-align\+0xb04 -[ ]+38:[ ]+03400000[ ]+nop -[ ]+3c:[ ]+03400000[ ]+nop -[ ]+40:[ ]+4c000020[ ]+ret -[ ]+44:[ ]+03400000[ ]+nop -[ ]+44: R_LARCH_ALIGN[ ]+\*ABS\*\+0xc -[ ]+48:[ ]+03400000[ ]+nop -[ ]+4c:[ ]+03400000[ ]+nop -[ ]+50:[ ]+4c000020[ ]+ret -[ ]+54:[ ]+03400000[ ]+nop -[ ]+54: R_LARCH_ALIGN[ ]+\*ABS\*\+0xc -[ ]+58:[ ]+03400000[ ]+nop -[ ]+5c:[ ]+03400000[ ]+nop -[ ]+60:[ ]+4c000020[ ]+ret -[ ]+64:[ ]+03400000[ ]+nop -[ ]+64: R_LARCH_ALIGN[ ]+\*ABS\*\+0xc -[ ]+68:[ ]+03400000[ ]+nop -[ ]+6c:[ ]+03400000[ ]+nop -[ ]+70:[ ]+4c000020[ ]+ret +[ ]+28:[ ]+1a000004[ ]+pcalau12i[ ]+\$a0, 0 +[ ]+28: R_LARCH_PCALA_HI20[ ]+L1 +[ ]+28: R_LARCH_RELAX[ ]+\*ABS\* +[ ]+2c:[ ]+02c00084[ ]+addi.d[ ]+\$a0, \$a0, 0 +[ ]+2c: R_LARCH_PCALA_LO12[ ]+L1 +[ ]+2c: R_LARCH_RELAX[ ]+\*ABS\* diff --git a/ld/testsuite/ld-loongarch-elf/relax-align-discard.lds b/ld/testsuite/ld-loongarch-elf/relax-align-discard.lds new file mode 100644 index 00000000000..4a81323d926 --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/relax-align-discard.lds @@ -0,0 +1,4 @@ +SECTIONS +{ + /DISCARD/ : { *(.another.*) } +} diff --git a/ld/testsuite/ld-loongarch-elf/relax-align-discard.s b/ld/testsuite/ld-loongarch-elf/relax-align-discard.s new file mode 100644 index 00000000000..b65d63f370f --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/relax-align-discard.s @@ -0,0 +1,17 @@ +# Use the section name symbol for R_LARCH_ALIGN to avoid discard section problem +.section ".another.text", "ax" +.cfi_startproc +break 0 +.cfi_def_cfa_offset 16 +.p2align 5 +break 1 +.cfi_endproc + +.text +.cfi_startproc +break 0 +.cfi_def_cfa_offset 16 +.p2align 5 +break 1 +.cfi_endproc + diff --git a/ld/testsuite/ld-loongarch-elf/relax.exp b/ld/testsuite/ld-loongarch-elf/relax.exp index 7d95a9ca41d..ed71fb45b46 100644 --- a/ld/testsuite/ld-loongarch-elf/relax.exp +++ b/ld/testsuite/ld-loongarch-elf/relax.exp @@ -295,6 +295,18 @@ if [istarget loongarch64-*-*] { "relax-align" \ ] \ ] + + run_ld_link_tests \ + [list \ + [list \ + "loongarch relax align discard" \ + "-e 0x0 -T relax-align-discard.lds -r" "" \ + "" \ + {relax-align-discard.s} \ + {} \ + "relax-align-discard" \ + ] \ + ] } set objdump_flags "-s -j .data" -- 2.36.0