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,7 +68,7 @@ # CHECK-NEXT: ) # CHECK-NEXT: } - .section .data.1,"aM",@progbits,4 + .section .data.1,"awM",@progbits,4 .align 4 .global foo foo: @@ -74,7 +76,7 @@ .long 0x42 .long 0x42 - .section .data.2,"aM",@progbits,8 + .section .data.2,"awM",@progbits,8 .align 8 .global bar bar: 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",@progbits +.section .rodata.a,"a",@progbits .byte 1 -.section .data.ams,"aMS",@progbits,1 +.section .rodata.ams,"aMS",@progbits,1 .asciz "a" -.section .data.am,"aM",@progbits,1 +.section .rodata.am,"aM",@progbits,1 .byte 3