diff options
| author | Kuba Brecka <kuba.brecka@gmail.com> | 2015-11-12 09:40:29 +0000 |
|---|---|---|
| committer | Kuba Brecka <kuba.brecka@gmail.com> | 2015-11-12 09:40:29 +0000 |
| commit | de8332257b9c170c5ca5ed5063e43278bf86d2dd (patch) | |
| tree | 8161471ffdcfdbe8dd4deaf8be7dbfdbb80c5ddd /llvm | |
| parent | e59cc3e540ee7b9840f4bdbe334179340feca6da (diff) | |
| download | bcm5719-llvm-de8332257b9c170c5ca5ed5063e43278bf86d2dd.tar.gz bcm5719-llvm-de8332257b9c170c5ca5ed5063e43278bf86d2dd.zip | |
[Object, MachO] Mark symbols from DATA and BSS sections as ST_Data
In `MachOObjectFile::getSymbolType` we currently always return `SymbolRef::ST_Function` for symbols from any section. In order for llvm-symbolizer to correctly symbolize Mach-O globals, symbols from data and BSS sections should return `SymbolRef::ST_Data`.
Differential Revision: http://reviews.llvm.org/D14576
llvm-svn: 252867
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Object/MachOObjectFile.cpp | 3 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-objdump/X86/macho-symbol-table.test | 6 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/MachODump.cpp | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index 4f9ccedd0c6..e34c86542ab 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -401,6 +401,9 @@ SymbolRef::Type MachOObjectFile::getSymbolType(DataRefImpl Symb) const { case MachO::N_UNDF : return SymbolRef::ST_Unknown; case MachO::N_SECT : + section_iterator Sec = *getSymbolSection(Symb); + if (Sec->isData() || Sec->isBSS()) + return SymbolRef::ST_Data; return SymbolRef::ST_Function; } return SymbolRef::ST_Other; diff --git a/llvm/test/tools/llvm-objdump/X86/macho-symbol-table.test b/llvm/test/tools/llvm-objdump/X86/macho-symbol-table.test index 826d78af68b..19c619e73d0 100644 --- a/llvm/test/tools/llvm-objdump/X86/macho-symbol-table.test +++ b/llvm/test/tools/llvm-objdump/X86/macho-symbol-table.test @@ -1,8 +1,8 @@ RUN: llvm-objdump -macho -t %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s CHECK: SYMBOL TABLE: -CHECK: 000000000000003b l F __TEXT,__cstring L_.str -CHECK: 0000000000000068 l F __TEXT,__eh_frame EH_frame0 +CHECK: 000000000000003b l __TEXT,__cstring L_.str +CHECK: 0000000000000068 l __TEXT,__eh_frame EH_frame0 CHECK: 0000000000000000 g F __TEXT,__text _main -CHECK: 0000000000000080 g F __TEXT,__eh_frame _main.eh +CHECK: 0000000000000080 g __TEXT,__eh_frame _main.eh CHECK: 0000000000000000 *UND* _printf diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index a5895ee3caa..3fea0b2a4ee 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -6173,7 +6173,7 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF, StringRef SymName = *SymNameOrErr; SymbolRef::Type ST = Symbols[SymIdx].getType(); - if (ST != SymbolRef::ST_Function) + if (ST != SymbolRef::ST_Function && ST != SymbolRef::ST_Data) continue; // Make sure the symbol is defined in this section. |
