[lld] a71c1e2 - [ELF] Support input section description .rel[a].dyn in /DISCARD/

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2019-11-25T21:49:46-08:00
New Revision: a71c1e2a576a6b0f85cab2bef12446b0e3967853

URL: https://github.com/llvm/llvm-project/commit/a71c1e2a576a6b0f85cab2bef12446b0e3967853
DIFF: https://github.com/llvm/llvm-project/commit/a71c1e2a576a6b0f85cab2bef12446b0e3967853.diff

LOG: [ELF] Support input section description .rel[a].dyn in /DISCARD/

Reviewed By: ruiu

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

Added: 
    

Modified: 
    lld/ELF/LinkerScript.cpp
    lld/test/ELF/linkerscript/discard-section-err.s

Removed: 
    


################################################################################
diff  --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index cebbd89168be..a1561d2d4159 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -442,7 +442,7 @@ LinkerScript::computeInputSections(const InputSectionDescription *cmd) {
 }
 
 void LinkerScript::discard(InputSectionBase *s) {
-  if (s == in.shStrTab || s == mainPart->relaDyn || s == mainPart->relrDyn)
+  if (s == in.shStrTab || s == mainPart->relrDyn)
     error("discarding " + s->name + " section is not allowed");
 
   // You can discard .hash and .gnu.hash sections by linker scripts. Since

diff  --git a/lld/test/ELF/linkerscript/discard-section-err.s b/lld/test/ELF/linkerscript/discard-section-err.s
index bb77dbb087da..dd3c666e115b 100644
--- a/lld/test/ELF/linkerscript/discard-section-err.s
+++ b/lld/test/ELF/linkerscript/discard-section-err.s
@@ -20,8 +20,19 @@
 # RUN: ld.lld -pie -o %t --script %t.script %t.o
 
 # RUN: echo "SECTIONS { /DISCARD/ : { *(.rela.dyn) } }" > %t.script
-# RUN: not ld.lld -pie -o %t --script %t.script %t.o 2>&1 | \
-# RUN:   FileCheck -check-prefix=RELADYN %s
-# RELADYN: discarding .rela.dyn section is not allowed
+# RUN: ld.lld -pie -o %t %t.o
+# RUN: llvm-readobj -S %t | FileCheck --check-prefix=RELADYN %s
+# RELADYN: Name: .rela.dyn
+# RUN: ld.lld -pie -o %t --script %t.script %t.o
+# RUN: llvm-readobj -S %t | FileCheck /dev/null --implicit-check-not='Name: .rela.dyn'
+
+# RUN: echo "SECTIONS { /DISCARD/ : { *(.relr.dyn) } }" > %t.script
+# RUN: not ld.lld -pie --pack-dyn-relocs=relr -o %t --script %t.script %t.o 2>&1 | \
+# RUN:   FileCheck -check-prefix=RELRDYN %s
+# RELRDYN: discarding .relr.dyn section is not allowed
 
-.comm foo,4,4
+.data
+.align 8
+foo:
+## Emits an R_X86_64_RELATIVE in -pie mode.
+.quad foo