diff options
| author | Kevin Enderby <enderby@apple.com> | 2014-06-19 22:03:18 +0000 |
|---|---|---|
| committer | Kevin Enderby <enderby@apple.com> | 2014-06-19 22:03:18 +0000 |
| commit | c28016e4131bdd50c23510adb3a0254b7fb5adc6 (patch) | |
| tree | a3189bf985158cb78e2ca2b9ac6613fb53febced /test | |
| parent | 0b5745abd8e46ac60cd16f949a2fd5a581fc8fd4 (diff) | |
| download | llvm-c28016e4131bdd50c23510adb3a0254b7fb5adc6.tar.gz llvm-c28016e4131bdd50c23510adb3a0254b7fb5adc6.tar.bz2 llvm-c28016e4131bdd50c23510adb3a0254b7fb5adc6.tar.xz | |
Change the output of llvm-nm and llvm-size for Mach-O universal files (aka
fat files) to print “ (for architecture XYZ)” for fat files with more than
one architecture to be like what the darwin tools do for fat files.
Also clean up the Mach-O printing of archive membernames in llvm-nm to use
the darwin form of "libx.a(foo.o)".
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211316 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
| -rw-r--r-- | test/Object/nm-universal-binary.test | 8 | ||||
| -rw-r--r-- | test/Object/size-trivial-macho.test | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/Object/nm-universal-binary.test b/test/Object/nm-universal-binary.test index c20c733dcd..52781267c5 100644 --- a/test/Object/nm-universal-binary.test +++ b/test/Object/nm-universal-binary.test @@ -3,17 +3,17 @@ RUN: | FileCheck %s -check-prefix CHECK-OBJ RUN: llvm-nm %p/Inputs/macho-universal-archive.x86_64.i386 \ RUN: | FileCheck %s -check-prefix CHECK-AR -CHECK-OBJ: macho-universal.x86_64.i386:x86_64 +CHECK-OBJ: macho-universal.x86_64.i386 (for architecture x86_64): CHECK-OBJ: 0000000100000f60 T _main -CHECK-OBJ: macho-universal.x86_64.i386:i386 +CHECK-OBJ: macho-universal.x86_64.i386 (for architecture i386): CHECK-OBJ: 00001fa0 T _main -CHECK-AR: macho-universal-archive.x86_64.i386:x86_64:hello.o: +CHECK-AR: macho-universal-archive.x86_64.i386(hello.o) (for architecture x86_64): CHECK-AR: 0000000000000068 s EH_frame0 CHECK-AR: 000000000000003b s L_.str CHECK-AR: 0000000000000000 T _main CHECK-AR: 0000000000000080 S _main.eh CHECK-AR: U _printf -CHECK-AR: macho-universal-archive.x86_64.i386:i386:foo.o: +CHECK-AR: macho-universal-archive.x86_64.i386(foo.o) (for architecture i386): CHECK-AR: 00000008 S _bar CHECK-AR: 00000000 T _foo diff --git a/test/Object/size-trivial-macho.test b/test/Object/size-trivial-macho.test index 1ed611b0de..6602d56518 100644 --- a/test/Object/size-trivial-macho.test +++ b/test/Object/size-trivial-macho.test @@ -71,9 +71,9 @@ mxl: Segment __LINKEDIT: 0x1000 (vmaddr 0x100002000 fileoff 8192) mxl: total 0x100003000 u: __TEXT __DATA __OBJC others dec hex -u: 4096 0 0 4294971392 4294975488 100002000 {{.*}}/macho-universal.x86_64.i386:x86_64 -u: 4096 0 0 8192 12288 3000 {{.*}}/macho-universal.x86_64.i386:i386 +u: 4096 0 0 4294971392 4294975488 100002000 {{.*}}/macho-universal.x86_64.i386 (for architecture x86_64) +u: 4096 0 0 8192 12288 3000 {{.*}}/macho-universal.x86_64.i386 (for architecture i386) uAR: __TEXT __DATA __OBJC others dec hex -uAR: 136 0 0 32 168 a8 {{.*}}/macho-universal-archive.x86_64.i386:x86_64(hello.o) -uAR: 5 4 0 0 9 9 {{.*}}/macho-universal-archive.x86_64.i386:i386(foo.o) +uAR: 136 0 0 32 168 a8 {{.*}}/macho-universal-archive.x86_64.i386(hello.o) (for architecture x86_64) +uAR: 5 4 0 0 9 9 {{.*}}/macho-universal-archive.x86_64.i386(foo.o) (for architecture i386) |