[ELF] Update tests to work even with modified defaults

[phosek]

Summary

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.

[ruiu]

LGTM

test/ELF/merge-reloc.s

71 ↗

(On Diff #91813)

LLD does not accept writable mergeable sections (*). Even though this test does not depend on that limitation (because you are passing the -r option), it doesn't make much sense to pass an object file that is considered invalid by LLD.

• https://github.com/llvm-project/llvm-project/blob/7744f439b1ad2abd6228f4b291202f7ad73c5814/lld/ELF/InputFiles.cpp#L254

You want to change this to .rodata instead to keep the original intention of this test.

[ruiu]

test/ELF/merge-reloc.s

51 ↗

(On Diff #91815)

This

55 ↗

(On Diff #91815)

this

85 ↗

(On Diff #91815)

and this are unnecessary changes, no?

[ruiu]

LGTM

lld/trunk/test/ELF/merge-reloc.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -r -o %t-rel
 # RUN: llvm-readobj -s -section-data %t-rel | FileCheck %s
 
 # When linker generates a relocatable object it should keep "merge"
 # sections as-is: do not merge content, do not join regular and
 # "merge" sections, do not joint "merge" sections with different
 # entry size.
 
 # CHECK:      Section {
 # CHECK:        Index:
-# CHECK:        Name: .data
+# CHECK:        Name: .rodata
 # CHECK-NEXT:   Type: SHT_PROGBITS
 # CHECK-NEXT:   Flags [
 # CHECK-NEXT:     SHF_ALLOC
 # CHECK-NEXT:     SHF_MERGE
 # CHECK-NEXT:   ]
 # CHECK-NEXT:   Address:
 # CHECK-NEXT:   Offset:
 # CHECK-NEXT:   Size: 12
 # CHECK-NEXT:   Link: 0
 # CHECK-NEXT:   Info: 0
 # CHECK-NEXT:   AddressAlignment: 4
 # CHECK-NEXT:   EntrySize: 4
 # CHECK-NEXT:   SectionData (
 # CHECK-NEXT:     0000: 42000000 42000000 42000000
 # CHECK-NEXT:   )
 # CHECK-NEXT: }
 # CHECK:      Section {
 # CHECK:        Index:
-# CHECK:        Name: .data
+# CHECK:        Name: .rodata
 # CHECK-NEXT:   Type: SHT_PROGBITS
 # CHECK-NEXT:   Flags [
 # CHECK-NEXT:     SHF_ALLOC
 # CHECK-NEXT:     SHF_MERGE
 # CHECK-NEXT:   ]
 # CHECK-NEXT:   Address:
 # CHECK-NEXT:   Offset:
 # CHECK-NEXT:   Size: 16

 # CHECK-NEXT:   Info: 0
 # CHECK-NEXT:   AddressAlignment: 1
 # CHECK-NEXT:   EntrySize: 0
 # CHECK-NEXT:   SectionData (
 # CHECK-NEXT:     0000: 42000000 42000000 42000000 42000000
 # CHECK-NEXT:   )
 # CHECK-NEXT: }
 
-        .section        .data.1,"aM",@progbits,4
+        .section        .rodata.1,"aM",@progbits,4
         .align  4
         .global foo
 foo:
         .long   0x42
         .long   0x42
         .long   0x42
 
-        .section        .data.2,"aM",@progbits,8
+        .section        .rodata.2,"aM",@progbits,8
         .align  8
         .global bar
 bar:
         .long   0x42
         .long   0x42
         .long   0x42
         .long   0x42
 
         .data
         .global gar
 zed:
         .long   0x42
         .long   0x42
         .long   0x42
         .long   0x42

lld/trunk/test/ELF/no-merge.s

 # 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