[PATCH] D30967: [ELF] Update tests to work even with modified defaults

[Petr Hosek via Phabricator via llvm-commits]

phosek created this revision.
phosek added a project: lld.

https://reviews.llvm.org/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.


Repository:
  rL LLVM

https://reviews.llvm.org/D30967

Files:
  test/ELF/merge-reloc.s
  test/ELF/no-merge.s


Index: test/ELF/no-merge.s
===================================================================
--- test/ELF/no-merge.s
+++ test/ELF/no-merge.s
@@ -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
Index: test/ELF/merge-reloc.s
===================================================================
--- test/ELF/merge-reloc.s
+++ test/ELF/merge-reloc.s
@@ -15,6 +15,7 @@
 # CHECK-NEXT:   Flags [
 # CHECK-NEXT:     SHF_ALLOC
 # CHECK-NEXT:     SHF_MERGE
+# CHECK-NEXT:     SHF_WRITE
 # CHECK-NEXT:   ]
 # CHECK-NEXT:   Address:
 # CHECK-NEXT:   Offset:
@@ -34,6 +35,7 @@
 # CHECK-NEXT:   Flags [
 # CHECK-NEXT:     SHF_ALLOC
 # CHECK-NEXT:     SHF_MERGE
+# CHECK-NEXT:     SHF_WRITE
 # CHECK-NEXT:   ]
 # CHECK-NEXT:   Address:
 # CHECK-NEXT:   Offset:
@@ -66,15 +68,15 @@
 # CHECK-NEXT:   )
 # CHECK-NEXT: }
 
-        .section        .data.1,"aM", at progbits,4
+        .section        .data.1,"awM", at progbits,4
         .align  4
         .global foo
 foo:
         .long   0x42
         .long   0x42
         .long   0x42
 
-        .section        .data.2,"aM", at progbits,8
+        .section        .data.2,"awM", at progbits,8
         .align  8
         .global bar
 bar:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D30967.91813.patch
Type: text/x-patch
Size: 1923 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170315/88028f71/attachment.bin>