[lld] r297803 - [ELF] Update tests to work even with modified defaults

[Petr Hosek via llvm-commits]

Author: phosek
Date: Tue Mar 14 22:38:48 2017
New Revision: 297803

URL: http://llvm.org/viewvc/llvm-project?rev=297803&view=rev
Log:
[ELF] Update tests to work even with modified defaults

D30229 changes the defaults based on section names to match the
GAS behavior, which breaks some of the tests that rely on the old
defaults.

Differential Revision: https://reviews.llvm.org/D30967

Modified:
    lld/trunk/test/ELF/merge-reloc.s
    lld/trunk/test/ELF/no-merge.s

Modified: lld/trunk/test/ELF/merge-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-reloc.s?rev=297803&r1=297802&r2=297803&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-reloc.s (original)
+++ lld/trunk/test/ELF/merge-reloc.s Tue Mar 14 22:38:48 2017
@@ -10,7 +10,7 @@
 
 # CHECK:      Section {
 # CHECK:        Index:
-# CHECK:        Name: .data
+# CHECK:        Name: .rodata
 # CHECK-NEXT:   Type: SHT_PROGBITS
 # CHECK-NEXT:   Flags [
 # CHECK-NEXT:     SHF_ALLOC
@@ -29,7 +29,7 @@
 # CHECK-NEXT: }
 # CHECK:      Section {
 # CHECK:        Index:
-# CHECK:        Name: .data
+# CHECK:        Name: .rodata
 # CHECK-NEXT:   Type: SHT_PROGBITS
 # CHECK-NEXT:   Flags [
 # CHECK-NEXT:     SHF_ALLOC
@@ -66,7 +66,7 @@
 # CHECK-NEXT:   )
 # CHECK-NEXT: }
 
-        .section        .data.1,"aM", at progbits,4
+        .section        .rodata.1,"aM", at progbits,4
         .align  4
         .global foo
 foo:
@@ -74,7 +74,7 @@ foo:
         .long   0x42
         .long   0x42
 
-        .section        .data.2,"aM", at progbits,8
+        .section        .rodata.2,"aM", at progbits,8
         .align  8
         .global bar
 bar:

Modified: lld/trunk/test/ELF/no-merge.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/no-merge.s?rev=297803&r1=297802&r2=297803&view=diff
==============================================================================
--- lld/trunk/test/ELF/no-merge.s (original)
+++ lld/trunk/test/ELF/no-merge.s Tue Mar 14 22:38:48 2017
@@ -1,19 +1,19 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
-# RUN: echo "SECTIONS { .data : {*(.data.*)} }" > %t0.script
+# RUN: echo "SECTIONS { .rodata : {*(.rodata.*)} }" > %t0.script
 # RUN: ld.lld %t.o -o %t0.out --script %t0.script
 # RUN: llvm-objdump -s %t0.out | FileCheck %s
 
 # RUN: ld.lld -O0 %t.o -o %t1.out --script %t0.script
 # RUN: llvm-objdump -s %t1.out | FileCheck %s
-# CHECK:      Contents of section .data:
+# CHECK:      Contents of section .rodata:
 # CHECK-NEXT:   0000 01610003
 
-.section .data.aw,"aw", at progbits
+.section .rodata.a,"a", at progbits
 .byte 1
 
-.section .data.ams,"aMS", at progbits,1
+.section .rodata.ams,"aMS", at progbits,1
 .asciz "a"
 
-.section .data.am,"aM", at progbits,1
+.section .rodata.am,"aM", at progbits,1
 .byte 3