From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 9FD9F3854164 for ; Thu, 6 Oct 2022 11:46:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9FD9F3854164 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x42d.google.com with SMTP id j7so2324582wrr.3 for ; Thu, 06 Oct 2022 04:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=fww+p/OHtQF3lNhRBehkAOkxgX9zFfq1+M1BQl/O2hY=; b=PhfxpTVzIqu8irr3MAFH7KEZu1nJR4ofaGvOiLgNqCroh7EwSWj/X7vvz1ZwlTLeHt XO72eVL7u7+lxupVhkdzBWZPT4xN1DOAa/ox7kHDo7gQhaG3Gfqo4xIp4E7HFsQlitn+ 8lhgC7mZSpEFYvq1H94kEmNsf53sZm5WQNOjLYYn2qe6xutjrv4wYa98cc9Zy7WDX31m WxTwPoBhdG9hd81UqZvLPklk+MYd9Gm+tp2h+AXKrrfxhRYBpHHjJDvar+QbDnh36mEX RYHveig7jxHHCM8Dq44kC7z178CKtvmoNP/cOhxiJ6LyxB1f5suSEg8CDK/5ntc0OvZI WUFQ== 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:x-gm-message-state:from:to:cc:subject:date; bh=fww+p/OHtQF3lNhRBehkAOkxgX9zFfq1+M1BQl/O2hY=; b=40gUZzHY3zvt1TTGzie5FJUl3gwk0dnTSxkXSmejUZo6V+v9rxTEAumfkSDEce8Cw7 24kvO/pt7TgyLF5DP0wqrCyKw/kIp5TkiwDBrCigWlRfnc7i3enFecbInLS+iqb9DytU jw0/UylShqzDOIaLjO5ugICOH+uvJVKoSzKT1HhRzNE1ZGp0bNKp1N0hBCBMtCXEF7uS aKCMgQeRC1MAlKvxoAXmmvaY/fMszrhDA1f1iSpPmWO2XTB9NVSZ+kdlHnZrhDQ45ZuM 99j6Vg/7yjo4NgjL3NFOAYJayjSrBv3AqN9XyvZAG94YzCOD9F9+iDOQjGvgtz9EmC1p U+rQ== X-Gm-Message-State: ACrzQf0fLBcyiL7lOgpMDOd77hQlxYE8DEQQJIP0fwBstlK6RYKwqMIT ehx3ug7ecByl48woHgbGPACVy5BCcnIIYQ== X-Google-Smtp-Source: AMsMyM6f2wMcAAfDZdN5BXWjeUnW3cNB+2zmZi/3dhJUCuoIS1ABBjD35MkXfU1gkURSsn2z6Mk+6Q== X-Received: by 2002:a05:6000:144f:b0:22a:7098:6472 with SMTP id v15-20020a056000144f00b0022a70986472mr2926334wrx.685.1665056811153; Thu, 06 Oct 2022 04:46:51 -0700 (PDT) Received: from chigot-Dell.home ([2a01:cb15:8123:8100:c0cd:af8a:42c9:f157]) by smtp.gmail.com with ESMTPSA id f6-20020a1c3806000000b003b3365b38f9sm4642364wma.10.2022.10.06.04.46.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 04:46:50 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= To: binutils@sourceware.org Cc: palmer@dabbelt.com, =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Subject: [PATCH] RISC-V: fix linker message when relaxation deletes bytes Date: Thu, 6 Oct 2022 13:46:28 +0200 Message-Id: <20221006114628.304185-1-chigot@adacore.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.3 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: The section relaxation can delete some bytes resulting in the symbols' value being modified. As the linker messages retrieve a symbol information using the outsymbols field of abfd, it must be updated as well. bfd/ChangeLog: * elfnn-riscv.c (riscv_relax_delete_bytes): Update abfd->outsymbols. ld/ChangeLog: * testsuite/ld-riscv-elf/ld-riscv-elf.exp: New test. * testsuite/ld-riscv-elf/undefined-align.d: New test. * testsuite/ld-riscv-elf/undefined-align.s: New test. --- bfd/elfnn-riscv.c | 23 +++++++++++++++++++++ ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp | 1 + ld/testsuite/ld-riscv-elf/undefined-align.d | 5 +++++ ld/testsuite/ld-riscv-elf/undefined-align.s | 10 +++++++++ 4 files changed, 39 insertions(+) create mode 100644 ld/testsuite/ld-riscv-elf/undefined-align.d create mode 100644 ld/testsuite/ld-riscv-elf/undefined-align.s diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index 3d2ddf4e651..7a6b66dcd8a 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -4060,6 +4060,7 @@ riscv_relax_delete_bytes (bfd *abfd, unsigned int sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec); struct bfd_elf_section_data *data = elf_section_data (sec); bfd_byte *contents = data->this_hdr.contents; + asymbol **outsyms = bfd_get_outsymbols (abfd); /* Actually delete the bytes. */ sec->size -= count; @@ -4158,6 +4159,28 @@ riscv_relax_delete_bytes (bfd *abfd, } } + /* As linker messages are getting symbols through outsymbols field of abfd, + it must be adjusted too. */ + if (outsyms == NULL) + { + if (!bfd_generic_link_read_symbols (abfd)) + link_info->callbacks->einfo (_("%F%P: %pB: could not read symbols: %E\n"), abfd); + outsyms = bfd_get_outsymbols (abfd); + } + + for (i = 0; i < bfd_get_symcount (abfd); i++) + { + asymbol *sym = outsyms[i]; + + if (sym->section != sec) + continue; + + /* If the symbol is in the range of memory we just moved, we + have to adjust its value. */ + if (sym->value > addr && sym->value <= toaddr) + sym->value -= count; + } + return true; } diff --git a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp index df89e0ee68b..86f1d05bc08 100644 --- a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp +++ b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp @@ -176,6 +176,7 @@ if [istarget "riscv*-*-*"] { [list "Weak reference 64" "-T weakref.ld -m[riscv_choose_lp64_emul]" "" \ "-march=rv64i -mabi=lp64" {weakref64.s} \ {{objdump -d weakref64.d}} "weakref64"]] + run_dump_test "undefined-align" # The following tests require shared library support. if ![check_shared_lib_support] { diff --git a/ld/testsuite/ld-riscv-elf/undefined-align.d b/ld/testsuite/ld-riscv-elf/undefined-align.d new file mode 100644 index 00000000000..c8cbb84ac7c --- /dev/null +++ b/ld/testsuite/ld-riscv-elf/undefined-align.d @@ -0,0 +1,5 @@ +#name: undefined with alignment +#source: undefined-align.s +#as: +#ld: --relax +#error: \A[^\n]*\.o: in function `_start':\n\(\.text\+0x0\): undefined reference to `foo'\Z diff --git a/ld/testsuite/ld-riscv-elf/undefined-align.s b/ld/testsuite/ld-riscv-elf/undefined-align.s new file mode 100644 index 00000000000..577557c663a --- /dev/null +++ b/ld/testsuite/ld-riscv-elf/undefined-align.s @@ -0,0 +1,10 @@ +# Make sure that the linker messages take into account the modification +# of a symbol's value made during the section relaxation. +# Here, "_start" will have an offset made by ".align 4" which will be +# removed during the relaxation of R_RISCV_ALIGN. + .text + .align 4 + .globl _start + .type _start, @function +_start: + call foo -- 2.25.1