Mark the first dynamic elf symbol as SF_FormatSpecific.
authorRafael Espindola <rafael.espindola@gmail.com>
Fri, 31 Jan 2014 21:40:13 +0000 (21:40 +0000)
committerRafael Espindola <rafael.espindola@gmail.com>
Fri, 31 Jan 2014 21:40:13 +0000 (21:40 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200578 91177308-0d34-0410-b5e6-96231b3b80d8

include/llvm/Object/ELFObjectFile.h
test/Object/nm-shared-object.test

index 5433a7a1b3ffb80fc1a838255efa64963c168fd4..f4f688ae7937ffbf11a90f1f90db44334c9a4135 100644 (file)
@@ -379,7 +379,8 @@ error_code ELFObjectFile<ELFT>::getSymbolType(DataRefImpl Symb,
 
 template <class ELFT>
 uint32_t ELFObjectFile<ELFT>::getSymbolFlags(DataRefImpl Symb) const {
-  const Elf_Sym *ESym = getSymbol(Symb);
+  Elf_Sym_Iter EIter = toELFSymIter(Symb);
+  const Elf_Sym *ESym = &*EIter;
 
   uint32_t Result = SymbolRef::SF_None;
 
@@ -393,7 +394,7 @@ uint32_t ELFObjectFile<ELFT>::getSymbolFlags(DataRefImpl Symb) const {
     Result |= SymbolRef::SF_Absolute;
 
   if (ESym->getType() == ELF::STT_FILE || ESym->getType() == ELF::STT_SECTION ||
-      ESym == &*EF.begin_symbols())
+      EIter == EF.begin_symbols() || EIter == EF.begin_dynamic_symbols())
     Result |= SymbolRef::SF_FormatSpecific;
 
   if (EF.getSymbolTableIndex(ESym) == ELF::SHN_UNDEF)
index 319ed14ceed58f5da786b76ce636e8f34ce5bda2..b77b2ce41a0a8f4d7b1c29faf4f2267e505af030 100644 (file)
@@ -1,6 +1,7 @@
 RUN: llvm-nm -D %p/Inputs/shared-object-test.elf-i386 \
 RUN:         | FileCheck %s -check-prefix ELF-32
 
+ELF-32-NOT: U
 ELF-32: 0012c8 A __bss_start
 ELF-32: 0012c8 A _edata
 ELF-32: 0012cc A _end
@@ -12,6 +13,7 @@ ELF-32: 000000 D tls_sym
 RUN: llvm-nm -D %p/Inputs/shared-object-test.elf-x86-64 \
 RUN:         | FileCheck %s -check-prefix ELF-64
 
+ELF-64-NOT: U
 ELF-64: 200454 A __bss_start
 ELF-64: 200454 A _edata
 ELF-64: 200458 A _end