aboutsummaryrefslogtreecommitdiff
path: root/ld/emultempl
diff options
context:
space:
mode:
authorNelson Chu <nelson.chu@sifive.com>2021-05-12 08:26:33 -0700
committerNelson Chu <nelson.chu@sifive.com>2021-05-31 11:29:26 +0800
commitef9d25656226c46406293a70a81e564640973662 (patch)
treeea9f54191151e9395b01c6938aa0317588b61c76 /ld/emultempl
parentcc653233da3f9dade8b95be9a7286b95727408d6 (diff)
downloadgdb-ef9d25656226c46406293a70a81e564640973662.zip
gdb-ef9d25656226c46406293a70a81e564640973662.tar.gz
gdb-ef9d25656226c46406293a70a81e564640973662.tar.bz2
RISC-V: PR27566, Do not relax when data segment phase is exp_seg_relro_adjust.
2021-05-31 Nelson Chu <nelson.chu@sifive.com> Lifang Xia <lifang_xia@c-sky.com> The data segment phase exp_seg_relro_adjust means we are still adjusting the relro segments, so we will get the symbol values which havn't consider the relro. It is dangerous and we shouldn't do the relaxations at this stage. Otherwise, we may get the truncated fails when the relax range crossing the data segment. One of the solution is that, we use a pointer to monitor the data segment phase while relaxing, to know whether the relro has been handled or not. Once we check the phase is exp_seg_relro_adjust, we should skip this round of relaxations, since the incorrect symbol values will affect the correctness of relaxations. I think we probably need to record more information about data segment or alignments in the future, to make sure it is safe to doing relaxations. For the two new testcases, relro-relax-lui and relro-relax-pcrel, we get the following truncated errors when using toolchains, which enable relro: (.text+0x0): relocation truncated to fit: R_RISCV_GPREL_I against symbol `SymbolRodata' defined in .rodata section in test1.o After applying this patch, the truncated errors should be resolved. However, only linux toolchains support -z relro, so we only test these two testcases when supporting shared library. bfd/ PR 27566 * elfnn-riscv.c (struct riscv_elf_link_hash_table): New integer pointer to monitor the data segment phase. (bfd_elfNN_riscv_set_data_segment_info): New function called by after_allocation, to set the data_segment_phase from expld.dataseg. (_bfd_riscv_relax_section): Don't relax when data_segment_phase is exp_seg_relro_adjust (0x4). * elfxx-riscv.h (bfd_elf32_riscv_set_data_segment_info): New extern. (bfd_elf64_riscv_set_data_segment_info): Likewise. ld/ PR 27566 * emultempl/riscvelf.em (after_allocation): Call riscv_set_data_segment_info to set data segment phase before relaxing. * testsuite/ld-riscv-elf/ld-riscv-elf.exp: Updated. * testsuite/ld-riscv-elf/relro-relax-lui.d: New testcase. * testsuite/ld-riscv-elf/relro-relax-lui.s: Likewise. * testsuite/ld-riscv-elf/relro-relax-pcrel.d: Likewise. * testsuite/ld-riscv-elf/relro-relax-pcrel.s: Likewise.
Diffstat (limited to 'ld/emultempl')
-rw-r--r--ld/emultempl/riscvelf.em14
1 files changed, 14 insertions, 0 deletions
diff --git a/ld/emultempl/riscvelf.em b/ld/emultempl/riscvelf.em
index 5fa7c77..c625a63 100644
--- a/ld/emultempl/riscvelf.em
+++ b/ld/emultempl/riscvelf.em
@@ -62,6 +62,20 @@ gld${EMULATION_NAME}_after_allocation (void)
}
}
+ /* PR 27566, if the phase of data segment is exp_seg_relro_adjust,
+ that means we are still adjusting the relro, and shouldn't do the
+ relaxations at this stage. Otherwise, we will get the symbol
+ values beofore handling the relro, and may cause truncated fails
+ when the relax range crossing the data segment. One of the solution
+ is to monitor the data segment phase while relaxing, to know whether
+ the relro has been handled or not.
+
+ I think we probably need to record more information about data
+ segment or alignments in the future, to make sure it is safe
+ to doing relaxations. */
+ enum phase_enum *phase = &(expld.dataseg.phase);
+ bfd_elf${ELFSIZE}_riscv_set_data_segment_info (&link_info, (int *) phase);
+
do
{
ldelf_map_segments (need_layout);