[PATCH] D120600: [ELF][X86] Don't create IBT .plt if there is no PLT entry

[Joao Moreira via Phabricator via llvm-commits]

joaomoreira updated this revision to Diff 411567.
joaomoreira added a comment.

No problem! And thanks! The test looks better than the one I had half-way implemented. I'm also updating the test which got broken by this fix... let me know if you see a problem with it!


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D120600/new/

https://reviews.llvm.org/D120600

Files:
  lld/ELF/SyntheticSections.cpp
  lld/ELF/SyntheticSections.h
  lld/test/ELF/format-binary.test
  lld/test/ELF/x86-64-feature-cet.s


Index: lld/test/ELF/x86-64-feature-cet.s
===================================================================
--- lld/test/ELF/x86-64-feature-cet.s
+++ lld/test/ELF/x86-64-feature-cet.s
@@ -91,6 +91,17 @@
 # DISASM-NEXT:               jmpq    *0x2126(%rip)
 # DISASM-NEXT:               nopw    (%rax,%rax)
 
+## If there is no PLT entry, don't create .plt section.
+# RUN: ld.lld -e 0 %t1.o -o %t.noplt
+# RUN: llvm-readelf -S %t.noplt | FileCheck %s --check-prefix=NOPLT
+# RUN: ld.lld -r %t1.o -o %t.noplt
+# RUN: llvm-readelf -S %t.noplt | FileCheck %s --check-prefix=NOPLT
+
+# NOPLT:     [Nr] Name
+# NOPLT-NOT: .plt
+# NOPLT:     .note.gnu.property
+# NOPLT-NOT: .plt
+
 .section ".note.gnu.property", "a"
 .long 4
 .long 0x10
Index: lld/test/ELF/format-binary.test
===================================================================
--- lld/test/ELF/format-binary.test
+++ lld/test/ELF/format-binary.test
@@ -31,10 +31,10 @@
 
 # EXE:      Machine: Advanced Micro Devices X86-64
 # EXE:      [Nr] Name         Type     Address          Off    Size   ES Flg Lk Inf Al
-# EXE:      [ 3] .data        PROGBITS {{.*}}                  00000c 00  WA  0   0  8
+# EXE:      [ 2] .data        PROGBITS {{.*}}                  00000c 00  WA  0   0  8
 # EXE:      Size Type    Bind   Vis      Ndx Name
-# EXE:         0 OBJECT  GLOBAL DEFAULT    3 _binary_d_t_txt_start
-# EXE-NEXT:    0 OBJECT  GLOBAL DEFAULT    3 _binary_d_t_txt_end
+# EXE:         0 OBJECT  GLOBAL DEFAULT    2 _binary_d_t_txt_start
+# EXE-NEXT:    0 OBJECT  GLOBAL DEFAULT    2 _binary_d_t_txt_end
 # EXE-NEXT:    0 OBJECT  GLOBAL DEFAULT  ABS _binary_d_t_txt_size
 
 # RUN: not ld.lld -b foo 2>&1 | FileCheck --check-prefix=ERR %s
Index: lld/ELF/SyntheticSections.h
===================================================================
--- lld/ELF/SyntheticSections.h
+++ lld/ELF/SyntheticSections.h
@@ -761,6 +761,7 @@
 public:
   IBTPltSection();
   void writeTo(uint8_t *Buf) override;
+  bool isNeeded() const override;
   size_t getSize() const override;
 };
 
Index: lld/ELF/SyntheticSections.cpp
===================================================================
--- lld/ELF/SyntheticSections.cpp
+++ lld/ELF/SyntheticSections.cpp
@@ -2696,6 +2696,8 @@
   return 16 + in.plt->getNumEntries() * target->pltEntrySize;
 }
 
+bool IBTPltSection::isNeeded() const { return in.plt->getNumEntries() > 0; }
+
 // The string hash function for .gdb_index.
 static uint32_t computeGdbHash(StringRef s) {
   uint32_t h = 0;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D120600.411567.patch
Type: text/x-patch
Size: 2490 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220226/1df46906/attachment.bin>