diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp --- a/lld/ELF/Relocations.cpp +++ b/lld/ELF/Relocations.cpp @@ -1079,7 +1079,15 @@ return; } - bool canWrite = (sec->flags & SHF_WRITE) || !config->zText; + // Use a simple -z notext rule that treats all sections except .eh_frame + // writable. GNU ld does not reproduce dynamic relocations in .eh_frame (and + // our SectionBase::getOffset would incorrectly adjust the offset). + // + // For MIPS, we don't implement GNU ld's DW_EH_PE_absptr to DW_EH_PE_pcrel + // conversion. We still emit a dynamic relocation. + bool canWrite = (sec->flags & SHF_WRITE) || + !(config->zText || + (isa(sec) && config->emachine != EM_MIPS)); if (canWrite) { RelType rel = target->getDynRel(type); if (expr == R_GOT || (rel == target->symbolicRel && !sym.isPreemptible)) { diff --git a/lld/test/ELF/eh-frame-znotext.s b/lld/test/ELF/eh-frame-znotext.s new file mode 100644 --- /dev/null +++ b/lld/test/ELF/eh-frame-znotext.s @@ -0,0 +1,30 @@ +# REQUIRES: aarch64 +## While a symbolic relocation for -z notext can emit a dynamic relocation, we +## try avoiding that (https://github.com/llvm/llvm-project/issues/60392) and +## and use a canonical PLT entry instead. + +# RUN: rm -rf %t && split-file %s %t && cd %t +# RUN: llvm-mc -filetype=obj -triple=aarch64 a.s -o a.o +# RUN: llvm-mc -filetype=obj -triple=aarch64 abi.s -o abi.o +# RUN: ld.lld -shared abi.o -o abi.so + +# RUN: ld.lld a.o abi.so -o a +# RUN: llvm-readelf -r --dyn-syms a | FileCheck %s +# RUN: ld.lld -z notext a.o abi.so -o a +# RUN: llvm-readelf -r --dyn-syms a | FileCheck %s + +# CHECK: R_AARCH64_JUMP_SLOT {{.*}} __gxx_personality_v0 + 0 + +# CHECK: 1: 00000000002{{.*}} 0 FUNC GLOBAL DEFAULT UND __gxx_personality_v0 + +#--- a.s +foo: +.cfi_startproc +.cfi_personality 0, __gxx_personality_v0 + ret +.cfi_endproc + +#--- abi.s +.globl __gxx_personality_v0 +.type __gxx_personality_v0, @function +__gxx_personality_v0: