diff options
-rw-r--r-- | ELF/Driver.cpp | 7 | ||||
-rw-r--r-- | test/ELF/relocatable-versioned.s | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ELF/Driver.cpp b/ELF/Driver.cpp index 6de8ed59e..3f7da67c2 100644 --- a/ELF/Driver.cpp +++ b/ELF/Driver.cpp @@ -1061,7 +1061,12 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &Args) { addReservedSymbols(); // Apply version scripts. - Symtab->scanVersionScript(); + // + // For a relocatable output, version scripts don't make sense, and + // parsing a symbol version string (e.g. dropping "@ver1" from a symbol + // name "foo@ver1") rather do harm, so we don't call this if -r is given. + if (!Config->Relocatable) + Symtab->scanVersionScript(); // Create wrapped symbols for -wrap option. for (auto *Arg : Args.filtered(OPT_wrap)) diff --git a/test/ELF/relocatable-versioned.s b/test/ELF/relocatable-versioned.s new file mode 100644 index 000000000..2b6c49eb5 --- /dev/null +++ b/test/ELF/relocatable-versioned.s @@ -0,0 +1,9 @@ +# REQUIRES: x86 +# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o +# RUN: ld.lld -o %t2.o -r %t1.o +# RUN: llvm-nm %t2.o | FileCheck %s +# CHECK: foo@VERSION + +.global "foo@VERSION" +"foo@VERSION": + ret |