summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFangrui Song <maskray@google.com>2020-01-13 21:30:05 -0800
committerFangrui Song <maskray@google.com>2020-01-14 10:12:28 -0800
commit40c5bd4212a51216a489fdaaf59060921d677009 (patch)
tree957fa535155c20b252edbb62114193fbbba89c8f
parent2948ec5ca98f8593584f2117bc92fe8d75f6f098 (diff)
downloadbcm5719-llvm-40c5bd4212a51216a489fdaaf59060921d677009.tar.gz
bcm5719-llvm-40c5bd4212a51216a489fdaaf59060921d677009.zip
[ELF] --exclude-libs: don't assign VER_NDX_LOCAL to undefined symbols
Suggested by Peter Collingbourne. Non-VER_NDX_GLOBAL versions should not be assigned to defined symbols. --exclude-libs violates this and can cause a spurious error "cannot refer to absolute symbol" after D71795. excludeLibs incorrectly assigns VER_NDX_LOCAL to an undefined weak symbol => isPreemptible is false => R_PLT_PC is optimized to R_PC => in isStaticLinkTimeConstant, an error is emitted. Reviewed By: pcc, grimar Differential Revision: https://reviews.llvm.org/D72681
-rw-r--r--lld/ELF/Driver.cpp2
-rw-r--r--lld/test/ELF/exclude-libs-undef.s19
2 files changed, 20 insertions, 1 deletions
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index eadf06e8ef0..23da749d307 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -1375,7 +1375,7 @@ static void excludeLibs(opt::InputArgList &args) {
if (!file->archiveName.empty())
if (all || libs.count(path::filename(file->archiveName)))
for (Symbol *sym : file->getSymbols())
- if (!sym->isLocal() && sym->file == file)
+ if (!sym->isUndefined() && !sym->isLocal() && sym->file == file)
sym->versionId = VER_NDX_LOCAL;
};
diff --git a/lld/test/ELF/exclude-libs-undef.s b/lld/test/ELF/exclude-libs-undef.s
new file mode 100644
index 00000000000..712591e4f68
--- /dev/null
+++ b/lld/test/ELF/exclude-libs-undef.s
@@ -0,0 +1,19 @@
+# REQUIRES: x86
+## Test we don't assign VER_NDX_LOCAL to an undefined symbol.
+## If we do, an undefined weak will become non-preemptible,
+## and we will report an error when an R_PLT_PC (optimized to R_PC)
+## references the undefined weak (considered absolute).
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: rm -f %t.a
+# RUN: llvm-ar rc %t.a %t.o
+# RUN: ld.lld -shared --whole-archive --exclude-libs=ALL %t.a -o %t.so
+# RUN: llvm-readelf --dyn-syms %t.so | FileCheck %s
+
+# CHECK: 1: {{.*}} WEAK DEFAULT UND bar
+# CHECK-NOT: 2:
+
+.globl foo
+.weak bar
+foo:
+ call bar
OpenPOWER on IntegriCloud