diff options
author | Kevin Enderby <enderby@apple.com> | 2014-05-09 23:57:49 +0000 |
---|---|---|
committer | Kevin Enderby <enderby@apple.com> | 2014-05-09 23:57:49 +0000 |
commit | ae417592a5cc33d2e0110cc98403e64301b23c73 (patch) | |
tree | df7a9fa4877da632f8054f2b976b83b11a2e3aec /test/Object/nm-trivial-object.test | |
parent | 3ae331d81a8f9e477df10ab86dca999d9f136a26 (diff) | |
download | llvm-ae417592a5cc33d2e0110cc98403e64301b23c73.tar.gz llvm-ae417592a5cc33d2e0110cc98403e64301b23c73.tar.bz2 llvm-ae417592a5cc33d2e0110cc98403e64301b23c73.tar.xz |
Fix llvm-nm to print the full 64-bit address for symbols in 64-bit object files.
The implementation might be better to have a method is64Bit() in the class
SymbolicFile instead of having the static routine isSymbolList64Bit() in
llvm-nm.cpp . But this is very much in the sprit of isObject() and
getNMTypeChar() in llvm-nm.cpp that has a series of if else statements
based on the specific class of the SymbolicFile. I can update this if
folks would like.
Also the tests were updated to be explicit about checking the address for
64-bits or 32-bits from object files.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208463 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Object/nm-trivial-object.test')
-rw-r--r-- | test/Object/nm-trivial-object.test | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/test/Object/nm-trivial-object.test b/test/Object/nm-trivial-object.test index 4e90f9609c..1117492898 100644 --- a/test/Object/nm-trivial-object.test +++ b/test/Object/nm-trivial-object.test @@ -5,11 +5,11 @@ RUN: | FileCheck %s -check-prefix COFF RUN: llvm-nm %p/Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF RUN: llvm-nm %p/Inputs/trivial-object-test.elf-x86-64 \ -RUN: | FileCheck %s -check-prefix ELF +RUN: | FileCheck %s -check-prefix ELF64 RUN: llvm-nm %p/Inputs/weak.elf-x86-64 \ -RUN: | FileCheck %s -check-prefix WEAK-ELF +RUN: | FileCheck %s -check-prefix WEAK-ELF64 RUN: llvm-nm %p/Inputs/absolute.elf-x86-64 \ -RUN: | FileCheck %s -check-prefix ABSOLUTE-ELF +RUN: | FileCheck %s -check-prefix ABSOLUTE-ELF64 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 \ @@ -17,7 +17,7 @@ RUN: | FileCheck %s -check-prefix macho64 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 \ -RUN: | FileCheck %s -check-prefix ELF-SEC-ADDR +RUN: | FileCheck %s -check-prefix ELF-SEC-ADDR64 RUN: llvm-nm %p/Inputs/thumb-symbols.elf.arm \ RUN: | FileCheck %s -check-prefix ELF-THUMB @@ -43,30 +43,34 @@ 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 +ELF64: U SomeOtherFunction +ELF64: 0000000000000000 T main +ELF64: U puts + +WEAK-ELF64: w f1 +WEAK-ELF64: 0000000000000000 W f2 +WEAK-ELF64: v x1 +WEAK-ELF64: 0000000000000000 V x2 -ABSOLUTE-ELF: 00000123 a a1 -ABSOLUTE-ELF: 00000123 A a2 +ABSOLUTE-ELF64: 0000000000000123 a a1 +ABSOLUTE-ELF64: 0000000000000123 A a2 macho: 00000000 U _SomeOtherFunction macho: 00000000 T _main macho: 00000000 U _puts -macho64: 00000028 s L_.str -macho64: 00000000 U _SomeOtherFunction -macho64: 00000000 T _main -macho64: 00000000 U _puts +macho64: 0000000000000028 s L_.str +macho64: 0000000000000000 U _SomeOtherFunction +macho64: 0000000000000000 T _main +macho64: 0000000000000000 U _puts Test that nm uses addresses even with ELF .o files. -ELF-SEC-ADDR: 00000058 D a -ELF-SEC-ADDR-NEXT: 0000005c D b -ELF-SEC-ADDR-NEXT: 00000040 T f -ELF-SEC-ADDR-NEXT: 00000050 T g -ELF-SEC-ADDR-NEXT: 00000060 D p +ELF-SEC-ADDR64: 0000000000000058 D a +ELF-SEC-ADDR64-NEXT: 000000000000005c D b +ELF-SEC-ADDR64-NEXT: 0000000000000040 T f +ELF-SEC-ADDR64-NEXT: 0000000000000050 T g +ELF-SEC-ADDR64-NEXT: 0000000000000060 D p Test that we drop the thumb bit only from function addresses. |