Changed test output comparison to be consistent with the way llvm-objdump and llvm...

llvm-svn: 165048

diff --git a/lld/test/elf/reloc.objtxt b/lld/test/elf/reloc.objtxt
index 1fc3713..2d6c338 100644 (file)
--- a/lld/test/elf/reloc.objtxt
+++ b/lld/test/elf/reloc.objtxt
@@ -3,28 +3,27 @@ RUN: lld-core -reader ELF %p/Inputs/reloc-test.elf-i386 | FileCheck %s -check-pr
 ELF-i386:---
 ELF-i386:atoms:
 ELF-i386:    - name:              .text
-ELF-i386:      type:              unknown
+ELF-i386:      type:              code
 ELF-i386:      section-choice:    custom-required
 ELF-i386:      section-name:      .text
 
 ELF-i386:    - name:              .data
-ELF-i386:      type:              unknown
 ELF-i386:      section-choice:    custom-required
 ELF-i386:      section-name:      .data
 
 ELF-i386:    - name:              .bss
-ELF-i386:      type:              unknown
+ELF-i386:      type:              zero-fill
 ELF-i386:      section-choice:    custom-required
 ELF-i386:      section-name:      .bss
 
 ELF-i386:    - name:              .rodata.str1.1
-ELF-i386:      type:              unknown
+ELF-i386:      type:              constant
 ELF-i386:      section-choice:    custom-required
 ELF-i386:      section-name:      .rodata.str1.1
 ELF-i386:      content:           [ 68, 65, 6C, 6C, 6F, 20, 77, 6F, 72, 6C, 64, 00 ]
 
 ELF-i386:    - name:              .text.startup
-ELF-i386:      type:              unknown
+ELF-i386:      type:              code
 ELF-i386:      section-choice:    custom-required
 ELF-i386:      section-name:      .text.startup
 
@@ -57,7 +56,7 @@ ELF-i386:      section-choice:    custom-required
 ELF-i386:      section-name:      .note.GNU-stack
 
 ELF-i386:    - name:              .eh_frame
-ELF-i386:      type:              unknown
+ELF-i386:      type:              constant
 ELF-i386:      section-choice:    custom-required
 ELF-i386:      section-name:      .eh_frame
 ELF-i386:      content:           [ 14, 00, 00, 00, 00, 00, 00, 00, 01, 7A, 52, 00, 

diff --git a/lld/test/elf/rodata.objtxt b/lld/test/elf/rodata.objtxt
index 4773e0c..a40e9dd 100644 (file)
--- a/lld/test/elf/rodata.objtxt
+++ b/lld/test/elf/rodata.objtxt
@@ -1,7 +1,7 @@
 RUN: lld-core -reader ELF -writer ELF -o %t1 %p/Inputs/rodata-test.i386 | llvm-objdump -section-headers %t1 |  FileCheck -check-prefix=i386 %s
 RUN: lld-core -arch hexagon -reader ELF -writer ELF -o %t2 %p/Inputs/rodata-test.hexagon | llvm-objdump -section-headers %t2 |  FileCheck -check-prefix=hexagon %s
 
-  i386: 4 .rodata       000000004
+  i386: 1 .rodata       000000004
 
-  hexagon: 5 .rodata       000000004
+  hexagon: 1 .rodata       000000004
 

diff --git a/lld/test/elf/sections.objtxt b/lld/test/elf/sections.objtxt
index 4c6ec28..152c249 100644 (file)
--- a/lld/test/elf/sections.objtxt
+++ b/lld/test/elf/sections.objtxt
@@ -17,8 +17,8 @@ READOBJ: Address Size: 32 bits
 READOBJ: Symbols
 READOBJ: .anotherspecial                   DBG                1c8                 0               1c8  formatspecific
 READOBJ: .symtab                           DBG                1e0                 0               1e0  formatspecific
-READOBJ: baz                               FUNC               1d0                 a               1d0  global
-READOBJ:  z                                 DATA               1c8                 4               1c8  global
+READOBJ: baz                               FUNC               0                 a               1d0  global
+READOBJ:  z                                 DATA               0                 4               1c8  global
 READOBJ: Total: 20
 
 ED: 'e_indent[EI_DATA]', 0x01