Skip to content

Commit ac2224c

Browse files
committed
[ELF] --exclude-libs: localize defined libcall symbols referenced by lto.tmp
Fixes PR48681: after LTO, lto.tmp may reference a libcall symbol not in an IR symbol table of any bitcode file. If such a symbol is defined in an archive matched by a --exclude-libs, we don't correctly localize the symbol. Add another `excludeLibs` after `compileBitcodeFiles` to localize such libcall symbols. Unfortunately we have keep the existing one for D43126. Using VER_NDX_LOCAL is an implementation detail of `--exclude-libs`, it does not necessarily tie to the "localize" behavior. `local:` patterns in a version script can be omitted. The `symbol ... has undefined version ...` error should not be exempted. Ideally we should error as GNU ld does. https://issuetracker.google.com/issues/73020933 Reviewed By: psmith Differential Revision: https://reviews.llvm.org/D94280
1 parent be179b9 commit ac2224c

File tree

2 files changed

+38
-1
lines changed

2 files changed

+38
-1
lines changed

lld/ELF/Driver.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2146,7 +2146,11 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &args) {
21462146
// They also might be exported if referenced by DSOs.
21472147
script->declareSymbols();
21482148

2149-
// Handle the -exclude-libs option.
2149+
// Handle --exclude-libs. This is before scanVersionScript() due to a
2150+
// workaround for Android ndk: for a defined versioned symbol in an archive
2151+
// without a version node in the version script, Android does not expect a
2152+
// 'has undefined version' error in -shared --exclude-libs=ALL mode (PR36295).
2153+
// GNU ld errors in this case.
21502154
if (args.hasArg(OPT_exclude_libs))
21512155
excludeLibs(args);
21522156

@@ -2179,6 +2183,11 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &args) {
21792183
// except a few linker-synthesized ones will be added to the symbol table.
21802184
compileBitcodeFiles<ELFT>();
21812185

2186+
// Handle --exclude-libs again because lto.tmp may reference additional
2187+
// libcalls symbols defined in an excluded archive.
2188+
if (args.hasArg(OPT_exclude_libs))
2189+
excludeLibs(args);
2190+
21822191
// Symbol resolution finished. Report backward reference problems.
21832192
reportBackrefs();
21842193
if (errorCount())
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
; REQUIRES: x86
2+
; RUN: rm -rf %t && split-file %s %t
3+
; RUN: llvm-as %t/a.ll -o %t/a.bc
4+
; RUN: llvm-mc -filetype=obj -triple=x86_64 %t/b.s -o %t/b.o
5+
; RUN: llvm-ar rc %t/b.a %t/b.o
6+
; RUN: ld.lld -shared --exclude-libs=b.a %t/a.bc %t/b.a -o %t.so -y __divti3 2>&1 | FileCheck %s --check-prefix=TRACE
7+
; RUN: llvm-readelf --dyn-syms %t.so | FileCheck %s
8+
9+
; TRACE: {{.*}}/b.a: lazy definition of __divti3
10+
; TRACE-NEXT: lto.tmp: reference to __divti3
11+
; TRACE-NEXT: {{.*}}/b.a(b.o): definition of __divti3
12+
13+
; CHECK: Symbol table '.dynsym' contains 2 entries:
14+
; CHECK-NOT: __divti3
15+
16+
;--- a.ll
17+
target triple = "x86_64-unknown-linux"
18+
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
19+
20+
define i128 @foo(i128 %x, i128 %y) {
21+
entry:
22+
%div = sdiv i128 %x, %y
23+
ret i128 %div
24+
}
25+
26+
;--- b.s
27+
.globl __divti3
28+
__divti3:

0 commit comments

Comments
 (0)