Skip to content

Commit

Permalink
[ELF] Suppress "STT_SECTION symbol should be defined" on .eh_frame, .…
Browse files Browse the repository at this point in the history
…debug*, .zdebug* and .gcc_except_table

Summary:
With -r or --emit-relocs, we warn `STT_SECTION symbol should be defined`
on relocations to discarded section symbol. This was added as an error
in rLLD319404, but was not so effective before D61583 (it turned the
error to a warning).

Relocations from .eh_frame .debug* .zdebug* .gcc_except_table to
discarded .text are very common and somewhat expected. Don't warn/error
on them. As a reference, ld.bfd has a similar logic in
_bfd_elf_default_action_discarded() to allow these cases.

Delete invalid-undef-section-symbol.test because what it intended to
check is now covered by the updated comdat-discarded-reloc.s

Delete relocatable-eh-frame.s because we allow relocations from
.eh_frame as a special case now.

Reviewers: grimar, phosek, ruiu, espindola

Reviewed By: ruiu

Subscribers: emaste, arichardson, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D62840

llvm-svn: 362497
  • Loading branch information
MaskRay committed Jun 4, 2019
1 parent a7f9f42 commit dcba482
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 62 deletions.
17 changes: 14 additions & 3 deletions lld/ELF/InputSection.cpp
Expand Up @@ -412,7 +412,8 @@ void InputSection::copyRelocations(uint8_t *Buf, ArrayRef<RelTy> Rels) {

for (const RelTy &Rel : Rels) {
RelType Type = Rel.getType(Config->IsMips64EL);
Symbol &Sym = getFile<ELFT>()->getRelocTargetSym(Rel);
const ObjFile<ELFT> *File = getFile<ELFT>();
Symbol &Sym = File->getRelocTargetSym(Rel);

auto *P = reinterpret_cast<typename ELFT::Rela *>(Buf);
Buf += sizeof(RelTy);
Expand All @@ -435,10 +436,20 @@ void InputSection::copyRelocations(uint8_t *Buf, ArrayRef<RelTy> Rels) {
// .eh_frame is horribly special and can reference discarded sections. To
// avoid having to parse and recreate .eh_frame, we just replace any
// relocation in it pointing to discarded sections with R_*_NONE, which
// hopefully creates a frame that is ignored at runtime.
// hopefully creates a frame that is ignored at runtime. Also, don't warn
// on .gcc_except_table and debug sections.
auto *D = dyn_cast<Defined>(&Sym);
if (!D) {
warn("STT_SECTION symbol should be defined");
if (!Sec->Name.startswith(".debug") &&
!Sec->Name.startswith(".zdebug") && Sec->Name != ".eh_frame" &&
Sec->Name != ".gcc_except_table") {
uint32_t SecIdx = cast<Undefined>(Sym).DiscardedSecIdx;
Elf_Shdr_Impl<ELFT> Sec =
CHECK(File->getObj().sections(), File)[SecIdx];
warn("relocation refers to a discarded section: " +
CHECK(File->getObj().getSectionName(&Sec), File) +
"\n>>> referenced by " + getObjMsg(P->r_offset));
}
P->setSymbolAndType(0, 0, false);
continue;
}
Expand Down
12 changes: 7 additions & 5 deletions lld/test/ELF/Inputs/comdat-discarded-reloc.s
@@ -1,6 +1,8 @@
.section .text.bar1,"aG",@progbits,group,comdat
.global bar, _start

.section .text.bar2
.global bar
bar:
.quad .text.bar1
.section .text.foo,"aG",@progbits,group,comdat

.section .text
_start:
.quad .text.foo
.quad bar
39 changes: 32 additions & 7 deletions lld/test/ELF/comdat-discarded-reloc.s
@@ -1,17 +1,42 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/comdat-discarded-reloc.s -o %t2.o
# RUN: ld.lld -gc-sections --noinhibit-exec %t.o %t2.o -o /dev/null
# RUN: ld.lld -gc-sections --noinhibit-exec %t2.o %t.o -o /dev/null
# RUN: ld.lld -r %t2.o %t.o -o %t 2>&1 | FileCheck --check-prefix=WARN %s
# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s

## ELF spec doesn't allow a relocation to point to a deduplicated
## COMDAT section. Unfortunately this happens in practice (e.g. .eh_frame)
## Test case checks we do not crash.

.global bar, _start
# WARN: warning: relocation refers to a discarded section: .text.bar1
# WARN-NEXT: >>> referenced by {{.*}}.o:(.rela.text.bar2+0x0)
# WARN-NOT: warning

.section .text.foo,"aG",@progbits,group,comdat
# RELOC: .rela.eh_frame {
# RELOC-NEXT: R_X86_64_NONE
# RELOC-NEXT: }
# RELOC-NEXT: .rela.debug_foo {
# RELOC-NEXT: R_X86_64_NONE
# RELOC-NEXT: }
# RELOC-NEXT: .rela.gcc_except_table {
# RELOC-NEXT: R_X86_64_NONE
# RELOC-NEXT: }

.section .text
_start:
.quad .text.foo
.quad bar
.section .text.bar1,"aG",@progbits,group,comdat

## .text.bar1 in this file is discarded. Warn on the relocation.
.section .text.bar2,"ax"
.globl bar
bar:
.quad .text.bar1

## Don't warn on .eh_frame, .debug*, .zdebug*, or .gcc_except_table
.section .eh_frame,"a"
.quad .text.bar1

.section .debug_foo
.quad .text.bar1

.section .gcc_except_table,"a"
.quad .text.bar1
26 changes: 0 additions & 26 deletions lld/test/ELF/invalid-undef-section-symbol.test

This file was deleted.

21 changes: 0 additions & 21 deletions lld/test/ELF/relocatable-eh-frame.s

This file was deleted.

0 comments on commit dcba482

Please sign in to comment.