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

[Rafael Espindola]

Author: rafael
Date: Tue Feb  4 17:53:15 2014
New Revision: 200808

URL: http://llvm.org/viewvc/llvm-project?rev=200808&view=rev
Log:
Small fix for llvm-nm handling of weak symbols on ELF (print 'v').

Added:
    llvm/trunk/test/Object/Inputs/weak.elf-x86-64
Modified:
    llvm/trunk/test/Object/nm-trivial-object.test
    llvm/trunk/tools/llvm-nm/llvm-nm.cpp

Added: llvm/trunk/test/Object/Inputs/weak.elf-x86-64
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/Inputs/weak.elf-x86-64?rev=200808&view=auto
==============================================================================
Binary files llvm/trunk/test/Object/Inputs/weak.elf-x86-64 (added) and llvm/trunk/test/Object/Inputs/weak.elf-x86-64 Tue Feb  4 17:53:15 2014 differ

Modified: llvm/trunk/test/Object/nm-trivial-object.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/nm-trivial-object.test?rev=200808&r1=200807&r2=200808&view=diff
==============================================================================
--- llvm/trunk/test/Object/nm-trivial-object.test (original)
+++ llvm/trunk/test/Object/nm-trivial-object.test Tue Feb  4 17:53:15 2014
@@ -6,6 +6,8 @@ RUN: llvm-nm %p/Inputs/trivial-object-te
 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:          U SomeOtherFunction
 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

Modified: llvm/trunk/tools/llvm-nm/llvm-nm.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-nm/llvm-nm.cpp?rev=200808&r1=200807&r2=200808&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-nm/llvm-nm.cpp (original)
+++ llvm/trunk/tools/llvm-nm/llvm-nm.cpp Tue Feb  4 17:53:15 2014
@@ -360,8 +360,12 @@ static char getSymbolNMTypeChar(ELFObjec
     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