[lld] r293583 - Make the test future proof.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Mon Jan 30 19:38:48 2017
New Revision: 293583

URL: http://llvm.org/viewvc/llvm-project?rev=293583&view=rev
Log:
Make the test future proof.

It currently depends on the fact that we don't concatenate merge
sections with the same name but different properties.

Modified:
    lld/trunk/test/ELF/merge-string.s

Modified: lld/trunk/test/ELF/merge-string.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-string.s?rev=293583&r1=293582&r2=293583&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-string.s (original)
+++ lld/trunk/test/ELF/merge-string.s Mon Jan 30 19:38:48 2017
@@ -7,7 +7,7 @@
 // RUN: ld.lld -O0 %t.o -o %t.so -shared
 // RUN: llvm-readobj -s -section-data -t %t.so | FileCheck --check-prefix=NOMERGE %s
 
-        .section	.rodata.str1.1,"aMS", at progbits,1
+        .section	.rodata1,"aMS", at progbits,1
 	.asciz	"abc"
 foo:
 	.ascii	"a"
@@ -15,13 +15,13 @@ bar:
         .asciz  "bc"
         .asciz  "bc"
 
-        .section        .rodata.str2.2,"aMS", at progbits,2
+        .section        .rodata2,"aMS", at progbits,2
         .align  2
 zed:
         .short  20
         .short  0
 
-// CHECK:      Name:    .rodata
+// CHECK:      Name:    .rodata1
 // CHECK-NEXT: Type:    SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
@@ -39,7 +39,7 @@ zed:
 // CHECK-NEXT:   0000: 61626300                             |abc.|
 // CHECK-NEXT: )
 
-// NOTAIL:      Name:    .rodata
+// NOTAIL:      Name:    .rodata1
 // NOTAIL-NEXT: Type:    SHT_PROGBITS
 // NOTAIL-NEXT: Flags [
 // NOTAIL-NEXT:   SHF_ALLOC
@@ -57,23 +57,23 @@ zed:
 // NOTAIL-NEXT:   0000: 61626300 626300                     |abc.bc.|
 // NOTAIL-NEXT: )
 
-// NOMERGE:      Name:    .rodata
+// NOMERGE:      Name:    .rodata1
 // NOMERGE-NEXT: Type:    SHT_PROGBITS
 // NOMERGE-NEXT: Flags [
 // NOMERGE-NEXT:   SHF_ALLOC
 // NOMERGE-NEXT: ]
 // NOMERGE-NEXT: Address:         0x1C8
 // NOMERGE-NEXT: Offset:  0x1C8
-// NOMERGE-NEXT: Size:    16
+// NOMERGE-NEXT: Size:    11
 // NOMERGE-NEXT: Link: 0
 // NOMERGE-NEXT: Info: 0
-// NOMERGE-NEXT: AddressAlignment: 2
+// NOMERGE-NEXT: AddressAlignment: 1
 // NOMERGE-NEXT: EntrySize: 0
 // NOMERGE-NEXT: SectionData (
-// NOMERGE-NEXT:   0000: 61626300 61626300 62630000 14000000  |abc.abc.bc......|
+// NOMERGE-NEXT:   0000: 61626300 61626300 626300 |abc.abc.bc.|
 // NOMERGE-NEXT: )
 
-// CHECK:      Name: .rodata
+// CHECK:      Name: .rodata2
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC