Index: lld/trunk/test/ELF/edata-etext.s =================================================================== --- lld/trunk/test/ELF/edata-etext.s +++ lld/trunk/test/ELF/edata-etext.s @@ -13,7 +13,7 @@ # CHECK: Sections: # CHECK-NEXT: Idx Name Size Address Type # CHECK-NEXT: 0 00000000 0000000000000000 -# CHECK-NEXT: 1 .text 00000001 0000000000201000 TEXT DATA +# CHECK-NEXT: 1 .text 00000001 0000000000201000 TEXT # CHECK-NEXT: 2 .data 00000002 0000000000202000 DATA # CHECK-NEXT: 3 .bss 00000006 0000000000202004 BSS # CHECK: SYMBOL TABLE: Index: lld/trunk/test/ELF/linkerscript/addr.test =================================================================== --- lld/trunk/test/ELF/linkerscript/addr.test +++ lld/trunk/test/ELF/linkerscript/addr.test @@ -6,7 +6,7 @@ # CHECK: Sections: # CHECK-NEXT: Idx Name Size Address Type # CHECK-NEXT: 0 00000000 0000000000000000 -# CHECK-NEXT: 1 .text 00000000 0000000000001000 TEXT DATA +# CHECK-NEXT: 1 .text 00000000 0000000000001000 TEXT # CHECK-NEXT: 2 .foo.1 00000008 0000000000001000 DATA # CHECK-NEXT: 3 .foo.2 00000008 0000000000001100 DATA # CHECK-NEXT: 4 .foo.3 00000008 0000000000001108 DATA Index: lld/trunk/test/ELF/linkerscript/define.test =================================================================== --- lld/trunk/test/ELF/linkerscript/define.test +++ lld/trunk/test/ELF/linkerscript/define.test @@ -12,4 +12,4 @@ # CHECK: 1 .foo 00000008 0000000000011000 DATA # CHECK: 2 .bar 00000008 0000000000013000 DATA -# CHECK: 3 .text 00000000 0000000000013008 TEXT DATA +# CHECK: 3 .text 00000000 0000000000013008 TEXT Index: lld/trunk/test/ELF/linkerscript/expr-sections.test =================================================================== --- lld/trunk/test/ELF/linkerscript/expr-sections.test +++ lld/trunk/test/ELF/linkerscript/expr-sections.test @@ -13,7 +13,7 @@ } }; -# CHECK: 3 .text 00000000 00000000000000d0 TEXT DATA +# CHECK: 3 .text 00000000 00000000000000d0 TEXT # CHECK: 00000000000000d1 .text 00000000 foo1 # CHECK: 00000000000000d1 .text 00000000 bar1 Index: lld/trunk/test/ELF/linkerscript/insert-after.test =================================================================== --- lld/trunk/test/ELF/linkerscript/insert-after.test +++ lld/trunk/test/ELF/linkerscript/insert-after.test @@ -18,8 +18,8 @@ # CHECK: Sections: # CHECK-NEXT: Idx Name Size Address Type # CHECK-NEXT: 0 00000000 0000000000000000 -# CHECK-NEXT: 1 .text 00000008 0000000000000000 TEXT DATA -# CHECK-NEXT: 2 .foo.text 00000008 0000000000000008 TEXT DATA +# CHECK-NEXT: 1 .text 00000008 0000000000000000 TEXT +# CHECK-NEXT: 2 .foo.text 00000008 0000000000000008 TEXT # CHECK-NEXT: 3 .data 00000008 0000000000000010 DATA # CHECK-NEXT: 4 .foo.data 00000008 0000000000000018 DATA Index: lld/trunk/test/ELF/linkerscript/insert-before.test =================================================================== --- lld/trunk/test/ELF/linkerscript/insert-before.test +++ lld/trunk/test/ELF/linkerscript/insert-before.test @@ -18,8 +18,8 @@ # CHECK: Sections: # CHECK-NEXT: Idx Name Size Address Type # CHECK-NEXT: 0 00000000 0000000000000000 -# CHECK-NEXT: 1 .foo.text 00000008 0000000000000000 TEXT DATA -# CHECK-NEXT: 2 .text 00000008 0000000000000008 TEXT DATA +# CHECK-NEXT: 1 .foo.text 00000008 0000000000000000 TEXT +# CHECK-NEXT: 2 .text 00000008 0000000000000008 TEXT # CHECK-NEXT: 3 .foo.data 00000008 0000000000000010 DATA # CHECK-NEXT: 4 .data 00000008 0000000000000018 DATA Index: lld/trunk/test/ELF/linkerscript/memory.s =================================================================== --- lld/trunk/test/ELF/linkerscript/memory.s +++ lld/trunk/test/ELF/linkerscript/memory.s @@ -11,7 +11,7 @@ # RUN: ld.lld -o %t1 --script %t.script %t # RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix=RAM %s -# RAM: 1 .text 00000001 0000000000008000 TEXT DATA +# RAM: 1 .text 00000001 0000000000008000 TEXT # RAM-NEXT: 2 .data 00001000 0000000000008001 DATA ## Check RAM and ROM memory regions. @@ -27,7 +27,7 @@ # RUN: ld.lld -o %t1 --script %t.script %t # RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix=RAMROM %s -# RAMROM: 1 .text 00000001 0000000080000000 TEXT DATA +# RAMROM: 1 .text 00000001 0000000080000000 TEXT # RAMROM-NEXT: 2 .data 00001000 0000000000000000 DATA ## Check memory region placement by attributes. @@ -43,7 +43,7 @@ # RUN: ld.lld -o %t1 --script %t.script %t # RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix=ATTRS %s -# ATTRS: 1 .text 00000001 0000000080000000 TEXT DATA +# ATTRS: 1 .text 00000001 0000000080000000 TEXT # ATTRS: 2 .data 00001000 0000000000000000 DATA ## Check bad `ORIGIN`. Index: lld/trunk/test/ELF/linkerscript/orphan.s =================================================================== --- lld/trunk/test/ELF/linkerscript/orphan.s +++ lld/trunk/test/ELF/linkerscript/orphan.s @@ -13,7 +13,7 @@ ## .bss is SHT_NOBITS section and should be last RW section, so some space ## in ELF file could be saved. # CHECK: 0 00000000 0000000000000000 -# CHECK-NEXT: 1 .text 00000000 0000000000000000 TEXT DATA +# CHECK-NEXT: 1 .text 00000000 0000000000000000 TEXT # CHECK-NEXT: 2 .rw1 00000008 0000000000000000 DATA # CHECK-NEXT: 3 .rw2 00000008 0000000000000008 DATA # CHECK-NEXT: 4 .rw3 00000008 0000000000000010 DATA Index: lld/trunk/test/ELF/linkerscript/region-alias.s =================================================================== --- lld/trunk/test/ELF/linkerscript/region-alias.s +++ lld/trunk/test/ELF/linkerscript/region-alias.s @@ -15,7 +15,7 @@ # RUN: echo "REGION_ALIAS (\"ALIAS_DATA\", RAM);" >> %t.script.inc # RUN: ld.lld %t --script %t.script -o %t2 # RUN: llvm-objdump -section-headers %t2 | FileCheck %s -# CHECK: .text 00000001 0000000000001000 TEXT DATA +# CHECK: .text 00000001 0000000000001000 TEXT # CHECK: .data 00000008 0000000000002000 DATA ## All to ROM. @@ -23,7 +23,7 @@ # RUN: echo "REGION_ALIAS (\"ALIAS_DATA\", ROM);" >> %t.script.inc # RUN: ld.lld %t --script %t.script -o %t2 # RUN: llvm-objdump -section-headers %t2 | FileCheck %s --check-prefix=RAM -# RAM: .text 00000001 0000000000001000 TEXT DATA +# RAM: .text 00000001 0000000000001000 TEXT # RAM: .data 00000008 0000000000001001 DATA ## Redefinition of region. Index: lld/trunk/test/ELF/linkerscript/sections-keep.s =================================================================== --- lld/trunk/test/ELF/linkerscript/sections-keep.s +++ lld/trunk/test/ELF/linkerscript/sections-keep.s @@ -44,7 +44,7 @@ # MIXED1-NEXT: Idx Name Size # MIXED1-NEXT: 0 00000000 # MIXED1-NEXT: 1 .keep 00000004 -# MIXED1-NEXT: 2 .text 00000007 00000000000000ec TEXT DATA +# MIXED1-NEXT: 2 .text 00000007 00000000000000ec TEXT # MIXED1-NEXT: 3 .temp 00000004 00000000000000f3 DATA # MIXED1-NEXT: 4 .comment 00000008 0000000000000000 # MIXED1-NEXT: 5 .symtab 00000060 0000000000000000 @@ -65,7 +65,7 @@ # MIXED2-NEXT: Idx Name Size # MIXED2-NEXT: 0 00000000 # MIXED2-NEXT: 1 .nokeep 00000004 00000000000000e8 DATA -# MIXED2-NEXT: 2 .text 00000007 00000000000000ec TEXT DATA +# MIXED2-NEXT: 2 .text 00000007 00000000000000ec TEXT # MIXED2-NEXT: 3 .temp 00000004 00000000000000f3 DATA # MIXED2-NEXT: 4 .comment 00000008 0000000000000000 # MIXED2-NEXT: 5 .symtab 00000060 0000000000000000 Index: lld/trunk/test/ELF/linkerscript/sections.s =================================================================== --- lld/trunk/test/ELF/linkerscript/sections.s +++ lld/trunk/test/ELF/linkerscript/sections.s @@ -16,7 +16,7 @@ # RUN: FileCheck -check-prefix=SEC-DEFAULT %s # Idx Name Size -# SEC-DEFAULT: 1 .text 0000000e {{[0-9a-f]*}} TEXT DATA +# SEC-DEFAULT: 1 .text 0000000e {{[0-9a-f]*}} TEXT # SEC-DEFAULT: 2 .data 00000020 {{[0-9a-f]*}} DATA # SEC-DEFAULT: 3 other 00000003 {{[0-9a-f]*}} DATA # SEC-DEFAULT: 4 .bss 00000002 {{[0-9a-f]*}} BSS @@ -47,7 +47,7 @@ # SEC-ORDER: 5 .strtab 00000008 {{[0-9a-f]*}} # SEC-ORDER: 6 .comment 00000008 {{[0-9a-f]*}} # SEC-ORDER: 7 .data 00000020 {{[0-9a-f]*}} DATA -# SEC-ORDER: 8 .text 0000000e {{[0-9a-f]*}} TEXT DATA +# SEC-ORDER: 8 .text 0000000e {{[0-9a-f]*}} TEXT # .text and .data have swapped names but proper sizes and types. # RUN: echo "SECTIONS { \ @@ -58,7 +58,7 @@ # RUN: FileCheck -check-prefix=SEC-SWAP-NAMES %s # Idx Name Size -# SEC-SWAP-NAMES: 1 .data 0000000e {{[0-9a-f]*}} TEXT DATA +# SEC-SWAP-NAMES: 1 .data 0000000e {{[0-9a-f]*}} TEXT # SEC-SWAP-NAMES: 2 .text 00000020 {{[0-9a-f]*}} DATA # SEC-SWAP-NAMES: 3 other 00000003 {{[0-9a-f]*}} DATA # SEC-SWAP-NAMES: 4 .bss 00000002 {{[0-9a-f]*}} BSS @@ -80,7 +80,7 @@ # RUN: FileCheck -check-prefix=SEC-MULTI %s # Idx Name Size -# SEC-MULTI: 1 .text 0000000e {{[0-9a-f]*}} TEXT DATA +# SEC-MULTI: 1 .text 0000000e {{[0-9a-f]*}} TEXT # SEC-MULTI-NEXT: .data 00000020 {{[0-9a-f]*}} DATA # SEC-MULTI-NEXT: .data 00000003 {{[0-9a-f]*}} DATA # SEC-MULTI-NEXT: .bss 00000002 {{[0-9a-f]*}} BSS Index: lld/trunk/test/ELF/linkerscript/va.s =================================================================== --- lld/trunk/test/ELF/linkerscript/va.s +++ lld/trunk/test/ELF/linkerscript/va.s @@ -7,7 +7,7 @@ # CHECK: Sections: # CHECK-NEXT: Idx Name Size Address Type # CHECK-NEXT: 0 00000000 0000000000000000 -# CHECK-NEXT: 1 .text 00000001 0000000000000000 TEXT DATA +# CHECK-NEXT: 1 .text 00000001 0000000000000000 TEXT # CHECK-NEXT: 2 .foo 00000004 0000000000000001 DATA # CHECK-NEXT: 3 .boo 00000004 0000000000000005 DATA Index: lld/trunk/test/ELF/relro-omagic.s =================================================================== --- lld/trunk/test/ELF/relro-omagic.s +++ lld/trunk/test/ELF/relro-omagic.s @@ -14,8 +14,8 @@ # NORELRO-NEXT: 3 .hash 00000020 000000000020018c # NORELRO-NEXT: 4 .rela.dyn 00000018 00000000002001b0 # NORELRO-NEXT: 5 .rela.plt 00000018 00000000002001c8 -# NORELRO-NEXT: 6 .text 0000000a 00000000002001e0 TEXT DATA -# NORELRO-NEXT: 7 .plt 00000020 00000000002001f0 TEXT DATA +# NORELRO-NEXT: 6 .text 0000000a 00000000002001e0 TEXT +# NORELRO-NEXT: 7 .plt 00000020 00000000002001f0 TEXT # NORELRO-NEXT: 8 .data 00000008 0000000000200210 DATA # NORELRO-NEXT: 9 .foo 00000004 0000000000200218 DATA # NORELRO-NEXT: 10 .dynamic 000000f0 0000000000200220 Index: lld/trunk/test/ELF/sectionstart-noallochdr.s =================================================================== --- lld/trunk/test/ELF/sectionstart-noallochdr.s +++ lld/trunk/test/ELF/sectionstart-noallochdr.s @@ -7,7 +7,7 @@ # CHECK: Sections: # CHECK-NEXT: Idx Name Size Address Type # CHECK-NEXT: 0 00000000 0000000000000000 -# CHECK-NEXT: 1 .text 00000001 0000000000000010 TEXT DATA +# CHECK-NEXT: 1 .text 00000001 0000000000000010 TEXT # CHECK-NEXT: 2 .data 00000004 0000000000000020 DATA # CHECK-NEXT: 3 .bss 00000004 0000000000000030 BSS Index: lld/trunk/test/ELF/sectionstart.s =================================================================== --- lld/trunk/test/ELF/sectionstart.s +++ lld/trunk/test/ELF/sectionstart.s @@ -7,7 +7,7 @@ # CHECK: Sections: # CHECK-NEXT: Idx Name Size Address Type # CHECK-NEXT: 0 00000000 0000000000000000 -# CHECK-NEXT: 1 .text 00000001 0000000000100000 TEXT DATA +# CHECK-NEXT: 1 .text 00000001 0000000000100000 TEXT # CHECK-NEXT: 2 .data 00000004 0000000000110000 DATA # CHECK-NEXT: 3 .bss 00000004 0000000000200000 BSS