[lld] r346164 - [lld][NFC] Update tests to use -S instead of -s when using llvm-readelf.
Jordan Rupprecht via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 5 12:39:06 PST 2018
Author: rupprecht
Date: Mon Nov 5 12:39:06 2018
New Revision: 346164
URL: http://llvm.org/viewvc/llvm-project?rev=346164&view=rev
Log:
[lld][NFC] Update tests to use -S instead of -s when using llvm-readelf.
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.
Reviewers: MaskRay, espindola
Reviewed By: MaskRay
Subscribers: emaste, arichardson, steven_wu, dexonsmith, llvm-commits
Differential Revision: https://reviews.llvm.org/D54118
Modified:
lld/trunk/test/ELF/got32-i386-pie-rw.s
lld/trunk/test/ELF/linkerscript/align-r.test
lld/trunk/test/ELF/linkerscript/non-alloc-segment.s
lld/trunk/test/ELF/linkerscript/non-alloc.s
lld/trunk/test/ELF/linkerscript/orphan-discard.s
lld/trunk/test/ELF/linkerscript/orphan-phdrs.s
lld/trunk/test/ELF/linkerscript/segment-none.s
lld/trunk/test/ELF/linkerscript/sort-non-script.s
lld/trunk/test/ELF/linkerscript/unused-synthetic.s
lld/trunk/test/ELF/lto/section-name.ll
lld/trunk/test/ELF/sort-norosegment.s
lld/trunk/test/ELF/x86-64-reloc-gotoff64.s
lld/trunk/test/ELF/x86-64-reloc-gotpc64.s
Modified: lld/trunk/test/ELF/got32-i386-pie-rw.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/got32-i386-pie-rw.s?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/got32-i386-pie-rw.s (original)
+++ lld/trunk/test/ELF/got32-i386-pie-rw.s Mon Nov 5 12:39:06 2018
@@ -1,7 +1,7 @@
# 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.
Modified: lld/trunk/test/ELF/linkerscript/align-r.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/align-r.test?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/align-r.test (original)
+++ lld/trunk/test/ELF/linkerscript/align-r.test Mon Nov 5 12:39:06 2018
@@ -4,7 +4,7 @@
# 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
Modified: lld/trunk/test/ELF/linkerscript/non-alloc-segment.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/non-alloc-segment.s?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/non-alloc-segment.s (original)
+++ lld/trunk/test/ELF/linkerscript/non-alloc-segment.s Mon Nov 5 12:39:06 2018
@@ -16,7 +16,7 @@
# 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:
Modified: lld/trunk/test/ELF/linkerscript/non-alloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/non-alloc.s?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/non-alloc.s (original)
+++ lld/trunk/test/ELF/linkerscript/non-alloc.s Mon Nov 5 12:39:06 2018
@@ -3,7 +3,7 @@
# 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.
Modified: lld/trunk/test/ELF/linkerscript/orphan-discard.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/orphan-discard.s?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/orphan-discard.s (original)
+++ lld/trunk/test/ELF/linkerscript/orphan-discard.s Mon Nov 5 12:39:06 2018
@@ -10,7 +10,7 @@
# 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
Modified: lld/trunk/test/ELF/linkerscript/orphan-phdrs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/orphan-phdrs.s?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/orphan-phdrs.s (original)
+++ lld/trunk/test/ELF/linkerscript/orphan-phdrs.s Mon Nov 5 12:39:06 2018
@@ -10,7 +10,7 @@
# 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.
Modified: lld/trunk/test/ELF/linkerscript/segment-none.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/segment-none.s?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/segment-none.s (original)
+++ lld/trunk/test/ELF/linkerscript/segment-none.s Mon Nov 5 12:39:06 2018
@@ -9,7 +9,7 @@
# 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.
@@ -19,7 +19,7 @@
# 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...
Modified: lld/trunk/test/ELF/linkerscript/sort-non-script.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/sort-non-script.s?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/sort-non-script.s (original)
+++ lld/trunk/test/ELF/linkerscript/sort-non-script.s Mon Nov 5 12:39:06 2018
@@ -3,7 +3,7 @@
# 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
Modified: lld/trunk/test/ELF/linkerscript/unused-synthetic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/unused-synthetic.s?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/unused-synthetic.s (original)
+++ lld/trunk/test/ELF/linkerscript/unused-synthetic.s Mon Nov 5 12:39:06 2018
@@ -7,7 +7,7 @@
# 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
Modified: lld/trunk/test/ELF/lto/section-name.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/section-name.ll?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/section-name.ll (original)
+++ lld/trunk/test/ELF/lto/section-name.ll Mon Nov 5 12:39:06 2018
@@ -1,9 +1,9 @@
; 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"
Modified: lld/trunk/test/ELF/sort-norosegment.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/sort-norosegment.s?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/sort-norosegment.s (original)
+++ lld/trunk/test/ELF/sort-norosegment.s Mon Nov 5 12:39:06 2018
@@ -2,7 +2,7 @@
# 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
Modified: lld/trunk/test/ELF/x86-64-reloc-gotoff64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/x86-64-reloc-gotoff64.s?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/x86-64-reloc-gotoff64.s (original)
+++ lld/trunk/test/ELF/x86-64-reloc-gotoff64.s Mon Nov 5 12:39:06 2018
@@ -1,7 +1,7 @@
// 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
Modified: lld/trunk/test/ELF/x86-64-reloc-gotpc64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/x86-64-reloc-gotpc64.s?rev=346164&r1=346163&r2=346164&view=diff
==============================================================================
--- lld/trunk/test/ELF/x86-64-reloc-gotpc64.s (original)
+++ lld/trunk/test/ELF/x86-64-reloc-gotpc64.s Mon Nov 5 12:39:06 2018
@@ -1,7 +1,7 @@
// 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
More information about the llvm-commits
mailing list