[lld][NFC] Update tests to use -S instead of -s when using llvm-readelf.

[rupprecht]

Summary

llvm-readobj/readelf accepts both -s and -S as aliases for --sections. However with GNU readelf only -S means --section, and -s means --symbols. I would like to make llvm-readelf more compatible.

[MaskRay]

If the initial attempt to bring the -s incompatibility in llvm-readelf was inadvertent, let's improve it!

[rupprecht]

In D54118#1287750, @MaskRay wrote:

If the initial attempt to bring the -s incompatibility in llvm-readelf was inadvertent, let's improve it!

There are 455 failures when removing the alias :)
If we just change the aliases for llvm-readelf, not llvm-readobj, then these are pretty much the only failures.

test/ELF/got32-i386-pie-rw.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t -pie
-# RUN: llvm-readelf -r -s %t | FileCheck %s
+# RUN: llvm-readelf -r -S %t | FileCheck %s
 
 # Unlike bfd and gold we accept this.
 
 # CHECK: .foobar           PROGBITS        00001000
 # CHECK: .got              PROGBITS        [[GOT:[0-9a-z]*]]
 # CHECK-DAG: 00001002  00000008 R_386_RELATIVE
 # CHECK-DAG: [[GOT]]   00000008 R_386_RELATIVE
 foo:
 
 .section .foobar, "awx"
 .global _start
 _start:
  movl foo@GOT, %ebx

test/ELF/linkerscript/align-r.test

 # REQUIRES: x86
 
 ## Check output section ALIGN modifier with -r
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/align.s -o %t1.o
 # RUN: ld.lld -r -o %t2.o --script %s %t1.o
-# RUN: llvm-readelf -s %t2.o | FileCheck %s
+# RUN: llvm-readelf -S %t2.o | FileCheck %s
 
 # CHECK:      Section Headers:
 # CHECK-NEXT: Name Type     Address          Off    Size   ES Flg Lk Inf Al
 # CHECK-NEXT:      NULL     0000000000000000 000000 000000 00
 # CHECK-NEXT: .aaa PROGBITS 0000000000000000 000040 000008 00   A  0   0   1
 # CHECK-NEXT: .bbb PROGBITS 0000000000000000 001000 000008 00   A  0   0  4096
 # CHECK-NEXT: .ccc PROGBITS 0000000000000000 004000 000008 00   A  0   0  16384
 
 SECTIONS {
   . = 0x10000;
   .aaa : { *(.aaa) }
   .bbb : ALIGN(4096) { *(.bbb) }
   .ccc : ALIGN(4096 * 4) { *(.ccc) }
 }

test/ELF/linkerscript/non-alloc-segment.s

 ## the custom segment's PHDR. This is particularly important if section headers
 ## have been stripped.
 # RUN: echo "PHDRS {text PT_LOAD; foo 0x12345678;} \
 # RUN:       SECTIONS { \
 # RUN:           .text : {*(.text .text*)} :text \
 # RUN:           .foo : {*(.foo)} :foo \
 # RUN:       }" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readelf -s -l %t | FileCheck %s
+# RUN: llvm-readelf -S -l %t | FileCheck %s
 # RUN: llvm-readobj -l %t | FileCheck --check-prefix=PHDR %s
 
 # CHECK: Program Headers:
 # CHECK-NEXT:  Type
 # CHECK-NEXT:  LOAD
 # CHECK-NEXT:  <unknown>: 0x12345678
 
 # CHECK:      Section to Segment mapping:

test/ELF/linkerscript/non-alloc.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 # RUN: echo "SECTIONS { .foo 0 : {*(foo)} }" > %t.script
 # RUN: ld.lld --hash-style=sysv -o %t --script %t.script %t.o -shared
-# RUN: llvm-readelf -s -l %t | FileCheck %s
+# RUN: llvm-readelf -S -l %t | FileCheck %s
 
 # Test that we create all necessary PT_LOAD. We use to stop at the first
 # non-alloc, causing us to not create PT_LOAD for linker generated sections.
 
 # CHECK: Program Headers:
 # CHECK-NEXT:  Type
 # CHECK-NEXT:  LOAD {{.*}} R E
 # CHECK-NEXT:  LOAD {{.*}} RW

test/ELF/linkerscript/orphan-discard.s

 # REQUIRES: x86
 # RUN: llvm-mc -position-independent -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "SECTIONS { \
 # RUN:  . = 0xffffffff80000000; \
 # RUN:  .text : ALIGN(4096) { *(.text) } \
 # RUN:  .data : ALIGN(4096) { *(.data) } \
 # RUN:  .bss : ALIGN(4096) { *(.bss); } \
 # RUN:  . = ALIGN(4096); \
 # RUN:  _end = .; \
 # RUN:  /DISCARD/ : { *(.comment) } \
 # RUN: }" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readelf -s -symbols %t | FileCheck %s
+# RUN: llvm-readelf -S -symbols %t | FileCheck %s
 
 # CHECK: .bss NOBITS ffffffff80002000 002008 000002 00 WA 0 0 4096
 # CHECK: ffffffff80003000 0 NOTYPE GLOBAL DEFAULT 3 _end
 
 .section .text, "ax"
   ret
 
 .section .data, "aw"
   .quad 0
 
 .section .bss, "", @nobits
   .short 0

test/ELF/linkerscript/orphan-phdrs.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "PHDRS { \
 # RUN:   exec PT_LOAD FLAGS(0x4 | 0x1); \
 # RUN:   rw   PT_LOAD FLAGS(0x4 | 0x2); \
 # RUN: } \
 # RUN: SECTIONS { \
 # RUN:  .text : { *(.text) } :exec \
 # RUN:  .empty : { *(.empty) } :rw \
 # RUN:  .rw : { *(.rw) } \
 # RUN: }" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readelf -s -l %t | FileCheck %s
+# RUN: llvm-readelf -S -l %t | FileCheck %s
 
 ## Check that the orphan section is placed correctly and belongs to
 ## the correct segment.
 
 # CHECK: Section Headers
 # CHECK: .text
 # CHECK-NEXT: .orphan
 # CHECK-NEXT: .empty

test/ELF/linkerscript/segment-none.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 
 ## Test that section .foo is not placed in any segment when assigned to segment
 ## NONE in the linker script and segment NONE is not defined.
 # RUN: echo "PHDRS {text PT_LOAD;} \
 # RUN:       SECTIONS { \
 # RUN:           .text : {*(.text .text*)} :text \
 # RUN:           .foo : {*(.foo)} :NONE \
 # RUN:       }" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readelf -s -l %t | FileCheck %s
+# RUN: llvm-readelf -S -l %t | FileCheck %s
 
 ## Test that section .foo is placed in segment NONE when assigned to segment
 ## NONE in the linker script and segment NONE is defined.
 # RUN: echo "PHDRS {text PT_LOAD; NONE PT_LOAD;} \
 # RUN:       SECTIONS { \
 # RUN:           .text : {*(.text .text*)} :text \
 # RUN:           .foo : {*(.foo)} :NONE \
 # RUN:       }" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readelf -s -l %t | FileCheck --check-prefix=DEFINED %s
+# RUN: llvm-readelf -S -l %t | FileCheck --check-prefix=DEFINED %s
 
 # CHECK: Section to Segment mapping:
 # CHECK-NEXT: Segment Sections...
 # CHECK-NOT: .foo
 
 # DEFINED: Section to Segment mapping:
 # DEFINED-NEXT: Segment Sections...
 # DEFINED-NEXT:  00     .text

test/ELF/linkerscript/sort-non-script.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 # RUN: echo "SECTIONS { foo : {*(foo)} }" > %t.script
 # RUN: ld.lld --hash-style=sysv -o %t --script %t.script %t.o -shared
-# RUN: llvm-readelf -s %t | FileCheck %s
+# RUN: llvm-readelf -S %t | FileCheck %s
 
 # CHECK:      .dynsym  {{.*}}   A
 # CHECK-NEXT: .hash    {{.*}}   A
 # CHECK-NEXT: .dynstr  {{.*}}   A
 # CHECK-NEXT: .text    {{.*}}   AX
 # CHECK-NEXT: foo      {{.*}}  WA
 # CHECK-NEXT: .dynamic {{.*}}  WA
 
 .section foo, "aw"
 .byte 0

test/ELF/linkerscript/unused-synthetic.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "SECTIONS { \
 # RUN:    .got  : { *(.got) *(.got) } \
 # RUN:    .plt  : { *(.plt) } \
 # RUN:    .text : { *(.text) } \
 # RUN:  }" > %t.script
 # RUN: ld.lld -shared -o %t.so --script %t.script %t.o
 
-# RUN: llvm-readelf -s %t.so | FileCheck %s
+# RUN: llvm-readelf -S %t.so | FileCheck %s
 # CHECK-NOT:  .got
 # CHECK-NOT:  .plt
 # CHECK:      .dynsym
 # CHECK:      .text
 
 # Test that the size of a removed unused synthetic input section is not added
 # to the output section size. Adding a symbol assignment prevents removal of
 # the output section, but does not cause the section size to be recomputed.

test/ELF/lto/section-name.ll

 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o -o %t.so -shared
-; RUN: llvm-readelf -s %t.so | FileCheck %s
+; RUN: llvm-readelf -S %t.so | FileCheck %s
 ; RUN: ld.lld %t.o -o %t.so -shared --gc-sections
-; RUN: llvm-readelf -s %t.so | FileCheck --check-prefix=GC %s
+; RUN: llvm-readelf -S %t.so | FileCheck --check-prefix=GC %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @foo = hidden global i32 42, section "foo_section"
 @bar = hidden global i32 42, section "bar_section"
 @zed = hidden global i32 42, section "zed_section"
 

test/ELF/sort-norosegment.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 # RUN: ld.lld --hash-style=sysv -no-rosegment -o %t %t.o -shared
-# RUN: llvm-readelf -s %t | FileCheck %s
+# RUN: llvm-readelf -S %t | FileCheck %s
 
 # CHECK:      .dynsym  {{.*}}   A
 # CHECK-NEXT: .hash    {{.*}}   A
 # CHECK-NEXT: .dynstr  {{.*}}   A
 # CHECK-NEXT: .text    {{.*}}   AX
 # CHECK-NEXT: foo      {{.*}}  WA
 # CHECK-NEXT: .dynamic {{.*}}  WA
 
 .section foo, "aw"
 .byte 0

test/ELF/x86-64-reloc-gotoff64.s

 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -shared -o %t.so
-// RUN: llvm-readelf -s %t.so | FileCheck %s -check-prefix=SECTION
+// RUN: llvm-readelf -S %t.so | FileCheck %s -check-prefix=SECTION
 // RUN: llvm-objdump -d %t.so | FileCheck %s
 
 // SECTION: .dynamic DYNAMIC 0000000000003000
 // SECTION: .got PROGBITS 0000000000003070 003070 000000
 
 // All the _GLOBAL_OFFSET_TABLE_ occurrences below refer to the address
 // of GOT base, not the address of the symbol _GLOBAL_OFFSET_TABLE_. These
 // instructions are special and produce GOT base relative relocations. We

test/ELF/x86-64-reloc-gotpc64.s

 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -shared -o %t.so
-// RUN: llvm-readelf -s %t.so | FileCheck %s -check-prefix=SECTION
+// RUN: llvm-readelf -S %t.so | FileCheck %s -check-prefix=SECTION
 // RUN: llvm-objdump -d %t.so | FileCheck %s
 
 // SECTION: .got PROGBITS 0000000000003070 003070 000000
 
 // 0x3070 (.got end) - 0x1000 = 8304
 // CHECK: gotpc64:
 // CHECK-NEXT: 1000: {{.*}} movabsq $8304, %r11
 .global gotpc64
 gotpc64:
   movabsq $_GLOBAL_OFFSET_TABLE_-., %r11