commit f42c58d2ef60918da6bbcab8f690271c61ce3aa1
author Rafael Espindola <rafael.espindola@gmail.com> Tue Feb 04 23:53:15 2014 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Tue Feb 04 23:53:15 2014 +0000
tree 95aea9b119b61963515b04bb781f61cb2829ab56
parent 81f136f94a0a72706b0b670b0022fffe52dd3da1

Small fix for llvm-nm handling of weak symbols on ELF (print 'v').

llvm-svn: 200808

llvm/test/Object/Inputs/weak.elf-x86-64

diff --git a/llvm/test/Object/Inputs/weak.elf-x86-64 b/llvm/test/Object/Inputs/weak.elf-x86-64
new file mode 100644
index 0000000..e45f988
--- /dev/null
+++ b/llvm/test/Object/Inputs/weak.elf-x86-64
Binary files differ

llvm/test/Object/nm-trivial-object.test

diff --git a/llvm/test/Object/nm-trivial-object.test b/llvm/test/Object/nm-trivial-object.test
index d13d217..c2d2ebb 100644
--- a/llvm/test/Object/nm-trivial-object.test
+++ b/llvm/test/Object/nm-trivial-object.test
@@ -6,6 +6,8 @@
 RUN:         | FileCheck %s -check-prefix ELF
 RUN: llvm-nm %p/Inputs/trivial-object-test.elf-x86-64 \
 RUN:         | FileCheck %s -check-prefix ELF
+RUN: llvm-nm %p/Inputs/weak.elf-x86-64 \
+RUN:         | FileCheck %s -check-prefix WEAK-ELF
 RUN: llvm-nm %p/Inputs/trivial-object-test.macho-i386 \
 RUN:         | FileCheck %s -check-prefix macho
 RUN: llvm-nm %p/Inputs/trivial-object-test.macho-x86-64 \
@@ -34,6 +36,10 @@
 ELF: 00000000 T main
 ELF:          U puts
 
+WEAK-ELF:          w f1
+WEAK-ELF: 00000000 W f2
+WEAK-ELF:          v x1
+WEAK-ELF: 00000000 V x2
 
 macho: 00000000 U _SomeOtherFunction
 macho: 00000000 T _main

llvm/tools/llvm-nm/llvm-nm.cpp

diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp
index 5b8bafc..8d1fa72 100644
--- a/llvm/tools/llvm-nm/llvm-nm.cpp
+++ b/llvm/tools/llvm-nm/llvm-nm.cpp
@@ -360,8 +360,12 @@
     Ret = ::toupper(Ret);
     break;
   case ELF::STB_WEAK:
-    if (EF.getSymbolTableIndex(ESym) == ELF::SHN_UNDEF)
-      Ret = 'w';
+    if (EF.getSymbolTableIndex(ESym) == ELF::SHN_UNDEF) {
+      if (ESym->getType() == ELF::STT_OBJECT)
+        Ret = 'v';
+      else
+        Ret = 'w';
+    }
     else if (ESym->getType() == ELF::STT_OBJECT)
       Ret = 'V';
     else