diff options
author | Kevin Enderby <enderby@apple.com> | 2014-06-19 22:49:21 +0000 |
---|---|---|
committer | Kevin Enderby <enderby@apple.com> | 2014-06-19 22:49:21 +0000 |
commit | f7b992bdcd05fd6844f96e0431505d0b9c9956f9 (patch) | |
tree | 10fe195d6305d9261ad418489f6cec9446e0b724 | |
parent | 7c9dcfb29e5095d560206973c40e6a33ba108c21 (diff) | |
download | llvm-f7b992bdcd05fd6844f96e0431505d0b9c9956f9.tar.gz llvm-f7b992bdcd05fd6844f96e0431505d0b9c9956f9.tar.bz2 llvm-f7b992bdcd05fd6844f96e0431505d0b9c9956f9.tar.xz |
Fix the output of llvm-nm for Mach-O files to use the characters ‘d’ and ‘b’ for
data and bss symbols instead of the generic ’s’ for a symbol in a section.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211321 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | test/Object/nm-trivial-object.test | 7 | ||||
-rw-r--r-- | test/Object/nm-universal-binary.test | 2 | ||||
-rw-r--r-- | tools/llvm-nm/llvm-nm.cpp | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/test/Object/nm-trivial-object.test b/test/Object/nm-trivial-object.test index 20ac6621e7..c53dc91ecd 100644 --- a/test/Object/nm-trivial-object.test +++ b/test/Object/nm-trivial-object.test @@ -14,6 +14,8 @@ 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 \ RUN: | FileCheck %s -check-prefix macho64 +RUN: llvm-nm %p/Inputs/macho-text-data-bss.macho-x86_64 \ +RUN: | FileCheck %s -check-prefix macho-tdb RUN: llvm-nm %p/Inputs/common.coff-i386 \ RUN: | FileCheck %s -check-prefix COFF-COMMON RUN: llvm-nm %p/Inputs/relocatable-with-section-address.elf-x86-64 \ @@ -64,6 +66,11 @@ macho64: U _SomeOtherFunction macho64: 0000000000000000 T _main macho64: U _puts +macho-tdb: 0000000000000030 s EH_frame0 +macho-tdb: 0000000000000070 b _b +macho-tdb: 000000000000000c D _d +macho-tdb: 0000000000000000 T _t +macho-tdb: 0000000000000048 S _t.eh Test that nm uses addresses even with ELF .o files. ELF-SEC-ADDR64: 0000000000000058 D a diff --git a/test/Object/nm-universal-binary.test b/test/Object/nm-universal-binary.test index 52781267c5..8992359a79 100644 --- a/test/Object/nm-universal-binary.test +++ b/test/Object/nm-universal-binary.test @@ -15,5 +15,5 @@ CHECK-AR: 0000000000000000 T _main CHECK-AR: 0000000000000080 S _main.eh CHECK-AR: U _printf CHECK-AR: macho-universal-archive.x86_64.i386(foo.o) (for architecture i386): -CHECK-AR: 00000008 S _bar +CHECK-AR: 00000008 D _bar CHECK-AR: 00000000 T _foo diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp index c6b80d1dd9..5062435d89 100644 --- a/tools/llvm-nm/llvm-nm.cpp +++ b/tools/llvm-nm/llvm-nm.cpp @@ -577,6 +577,10 @@ static char getSymbolNMTypeChar(MachOObjectFile &Obj, basic_symbol_iterator I) { StringRef SegmentName = Obj.getSectionFinalSegmentName(Ref); if (SegmentName == "__TEXT" && SectionName == "__text") return 't'; + else if (SegmentName == "__DATA" && SectionName == "__data") + return 'd'; + else if (SegmentName == "__DATA" && SectionName == "__bss") + return 'b'; else return 's'; } |