[lld] r272270 - Fix global version handling.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Thu Jun  9 10:45:49 2016
New Revision: 272270

URL: http://llvm.org/viewvc/llvm-project?rev=272270&view=rev
Log:
Fix global version handling.

We should not ignore the symbol, just the version.

Fixes error with -z defs.

Modified:
    lld/trunk/ELF/InputFiles.cpp
    lld/trunk/test/ELF/version-use.s

Modified: lld/trunk/ELF/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=272270&r1=272269&r2=272270&view=diff
==============================================================================
--- lld/trunk/ELF/InputFiles.cpp (original)
+++ lld/trunk/ELF/InputFiles.cpp Thu Jun  9 10:45:49 2016
@@ -529,11 +529,13 @@ template <class ELFT> void SharedFile<EL
 
     if (Versym) {
       // Ignore local symbols and non-default versions.
-      if (VersymIndex == VER_NDX_LOCAL || VersymIndex == VER_NDX_GLOBAL ||
-          (VersymIndex & VERSYM_HIDDEN))
+      if (VersymIndex == VER_NDX_LOCAL || (VersymIndex & VERSYM_HIDDEN))
         continue;
     }
-    elf::Symtab<ELFT>::X->addShared(this, Name, Sym, Verdefs[VersymIndex]);
+
+    const Elf_Verdef *V =
+        VersymIndex == VER_NDX_GLOBAL ? nullptr : Verdefs[VersymIndex];
+    elf::Symtab<ELFT>::X->addShared(this, Name, Sym, V);
   }
 }
 

Modified: lld/trunk/test/ELF/version-use.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-use.s?rev=272270&r1=272269&r2=272270&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-use.s (original)
+++ lld/trunk/test/ELF/version-use.s Thu Jun  9 10:45:49 2016
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
-// RUN: ld.lld %t.o %p/Inputs/version-use.so -o %t.so -shared
+// RUN: ld.lld %t.o %p/Inputs/version-use.so -o %t.so -shared -z defs
 // RUN: llvm-readobj -s %t.so | FileCheck %s