[PATCH] D72943: [ELF] Allow R_PLT_PC (R_PC) to a hidden undefined weak symbol

Fangrui Song via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Fri Jan 17 12:09:11 PST 2020


MaskRay created this revision.
MaskRay added a reviewer: pcc.
Herald added subscribers: llvm-commits, arichardson, emaste.
Herald added a reviewer: espindola.
Herald added a project: LLVM.
pcc accepted this revision.
pcc added a comment.
This revision is now accepted and ready to land.

LGTM


This essentially reverts b841e119d77ed0502e3a2e710f26a899bef28b3c <https://reviews.llvm.org/rGb841e119d77ed0502e3a2e710f26a899bef28b3c>.

Such code construct can be used in the following way:

  // glibc/stdlib/exit.c
  // clang -fuse-ld=lld => succeeded
  // clang -fuse-ld=lld -fpie -pie => relocation R_PLT_PC cannot refer to absolute symbol
  __attribute__((weak, visibility("hidden"))) extern void __call_tls_dtors();
  void __run_exit_handlers() {
    if (__call_tls_dtors)
        __call_tls_dtors();
  }

Since we allow R_PLT_PC in -no-pie mode, it makes sense to allow it in
-pie mode as well.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D72943

Files:
  lld/ELF/Relocations.cpp
  lld/test/ELF/weak-undef-hidden.s


Index: lld/test/ELF/weak-undef-hidden.s
===================================================================
--- lld/test/ELF/weak-undef-hidden.s
+++ lld/test/ELF/weak-undef-hidden.s
@@ -2,6 +2,11 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
 // RUN: llvm-readobj -r -S --section-data %t.so | FileCheck %s
+// RUN: ld.lld %t.o -o %t -pie
+// RUN: llvm-readobj -r -S --section-data %t | FileCheck %s
+
+/// This is usually guarded with a comparison. Don't report an error.
+call g
 
 .data
 .weak g
Index: lld/ELF/Relocations.cpp
===================================================================
--- lld/ELF/Relocations.cpp
+++ lld/ELF/Relocations.cpp
@@ -408,6 +408,14 @@
 
   assert(absVal && relE);
 
+  // Allow R_PLT_PC (optimized to R_PC here) to a hidden undefined weak symbol
+  // in PIC mode. This is a little strange, but it allows us to link function
+  // calls to such symbols (e.g. glibc/stdlib/exit.c:__run_exit_handlers).
+  // Normally such a call will be guarded with a comparison, which will load a
+  // zero from the GOT.
+  if (sym.isUndefWeak())
+    return true;
+
   // We set the final symbols values for linker script defined symbols later.
   // They always can be computed as a link time constant.
   if (sym.scriptDefined)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D72943.238843.patch
Type: text/x-patch
Size: 1316 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200117/454e7534/attachment.bin>


More information about the llvm-commits mailing list