Revert "Fix a nomenclature error in llvm-nm."

[oota-llvm.git] / test / Object / nm-trivial-object.test

diff --git a/test/Object/nm-trivial-object.test b/test/Object/nm-trivial-object.test
index 6de1780a1608dd0840ea15a2ad1d8def3cbc12dd..ee0c3ffd8e19f5aa0a255644ef3a3a3824b9a719 100644 (file)
--- a/test/Object/nm-trivial-object.test
+++ b/test/Object/nm-trivial-object.test
@@ -1,11 +1,23 @@
-RUN: llvm-nm %p/TestObjectFiles/trivial-object-test.coff-i386 \
+RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-nm \
 RUN:         | FileCheck %s -check-prefix COFF
-RUN: llvm-nm %p/TestObjectFiles/trivial-object-test.coff-x86-64 \
+RUN: yaml2obj %p/Inputs/COFF/x86-64.yaml | llvm-nm \
 RUN:         | FileCheck %s -check-prefix COFF
-RUN: llvm-nm %p/TestObjectFiles/trivial-object-test.elf-i386 \
+RUN: llvm-nm %p/Inputs/trivial-object-test.elf-i386 \
 RUN:         | FileCheck %s -check-prefix ELF
-RUN: llvm-nm %p/TestObjectFiles/trivial-object-test.elf-x86-64 \
+RUN: llvm-nm %p/Inputs/trivial-object-test.elf-x86-64 \
 RUN:         | FileCheck %s -check-prefix ELF
+RUN: llvm-nm %p/Inputs/weak.elf-x86-64 \
+RUN:         | FileCheck %s -check-prefix WEAK-ELF
+RUN: llvm-nm %p/Inputs/absolute.elf-x86-64 \
+RUN:         | FileCheck %s -check-prefix ABSOLUTE-ELF
+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/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
 
 COFF: 00000000 d .data
 COFF: 00000000 t .text
@@ -14,6 +26,41 @@ COFF:          U {{_?}}SomeOtherFunction
 COFF: 00000000 T {{_?}}main
 COFF:          U {{_?}}puts
 
+COFF-COMMON: 00000000 b .bss
+COFF-COMMON-NEXT: 00000000 d .data
+COFF-COMMON-NEXT: 00000000 d .drectve
+COFF-COMMON-NEXT: 00000000 n .file
+COFF-COMMON-NEXT: 00000000 r .rdata$zzz
+COFF-COMMON-NEXT: 00000000 t .text
+COFF-COMMON-NEXT:          C _a
+
+
+ELF-NOT:      U
 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
+
+ABSOLUTE-ELF: 00000123 a a1
+ABSOLUTE-ELF: 00000123 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
+
+
+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