50 files changed, 12 insertions, 12 deletions
diff --git a/lld/test/ELF/linkerscript/Inputs/linkerscript-filename-spec.s b/lld/test/ELF/linkerscript/Inputs/filename-spec.s
index a688b4db4b6..a688b4db4b6 100644
--- a/lld/test/ELF/linkerscript/Inputs/linkerscript-filename-spec.s
+++ b/lld/test/ELF/linkerscript/Inputs/filename-spec.s
diff --git a/lld/test/ELF/linkerscript/Inputs/linkerscript-merge-sections-reloc.s b/lld/test/ELF/linkerscript/Inputs/merge-sections-reloc.s
index 07e599b2820..07e599b2820 100644
--- a/lld/test/ELF/linkerscript/Inputs/linkerscript-merge-sections-reloc.s
+++ b/lld/test/ELF/linkerscript/Inputs/merge-sections-reloc.s
diff --git a/lld/test/ELF/linkerscript/Inputs/linkerscript-sort-nested.s b/lld/test/ELF/linkerscript/Inputs/sort-nested.s
index c42fa9cd7ed..c42fa9cd7ed 100644
--- a/lld/test/ELF/linkerscript/Inputs/linkerscript-sort-nested.s
+++ b/lld/test/ELF/linkerscript/Inputs/sort-nested.s
diff --git a/lld/test/ELF/linkerscript/Inputs/linkerscript-sort.s b/lld/test/ELF/linkerscript/Inputs/sort.s
index 22e65ad19e1..22e65ad19e1 100644
--- a/lld/test/ELF/linkerscript/Inputs/linkerscript-sort.s
+++ b/lld/test/ELF/linkerscript/Inputs/sort.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-addr.s b/lld/test/ELF/linkerscript/addr.s
index 2d3a7ab3576..2d3a7ab3576 100644
--- a/lld/test/ELF/linkerscript/linkerscript-addr.s
+++ b/lld/test/ELF/linkerscript/addr.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-align.s b/lld/test/ELF/linkerscript/align.s
index ac2908a9a7e..ac2908a9a7e 100644
--- a/lld/test/ELF/linkerscript/linkerscript-align.s
+++ b/lld/test/ELF/linkerscript/align.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-assert.s b/lld/test/ELF/linkerscript/assert.s
index 9d24c47f724..9d24c47f724 100644
--- a/lld/test/ELF/linkerscript/linkerscript-assert.s
+++ b/lld/test/ELF/linkerscript/assert.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-at.s b/lld/test/ELF/linkerscript/at.s
index c26461c9d27..c26461c9d27 100644
--- a/lld/test/ELF/linkerscript/linkerscript-at.s
+++ b/lld/test/ELF/linkerscript/at.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-common.s b/lld/test/ELF/linkerscript/common.s
index c04c129dabc..c04c129dabc 100644
--- a/lld/test/ELF/linkerscript/linkerscript-common.s
+++ b/lld/test/ELF/linkerscript/common.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-data-segment-relro.s b/lld/test/ELF/linkerscript/data-segment-relro.s
index 94734110ca0..94734110ca0 100644
--- a/lld/test/ELF/linkerscript/linkerscript-data-segment-relro.s
+++ b/lld/test/ELF/linkerscript/data-segment-relro.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-diagnostic.s b/lld/test/ELF/linkerscript/diagnostic.s
index c0aaa9f4d64..c0aaa9f4d64 100644
--- a/lld/test/ELF/linkerscript/linkerscript-diagnostic.s
+++ b/lld/test/ELF/linkerscript/diagnostic.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-discard-interp.s b/lld/test/ELF/linkerscript/discard-interp.s
index 5f2d82ea4ab..5f2d82ea4ab 100644
--- a/lld/test/ELF/linkerscript/linkerscript-discard-interp.s
+++ b/lld/test/ELF/linkerscript/discard-interp.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-dynamic.s b/lld/test/ELF/linkerscript/dynamic.s
index ab65ab831f8..ab65ab831f8 100644
--- a/lld/test/ELF/linkerscript/linkerscript-dynamic.s
+++ b/lld/test/ELF/linkerscript/dynamic.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-edata-etext.s b/lld/test/ELF/linkerscript/edata-etext.s
index d5891ee0b9f..d5891ee0b9f 100644
--- a/lld/test/ELF/linkerscript/linkerscript-edata-etext.s
+++ b/lld/test/ELF/linkerscript/edata-etext.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-eh-frame-hdr.s b/lld/test/ELF/linkerscript/eh-frame-hdr.s
index 51e0b484c99..51e0b484c99 100644
--- a/lld/test/ELF/linkerscript/linkerscript-eh-frame-hdr.s
+++ b/lld/test/ELF/linkerscript/eh-frame-hdr.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-ehdr_start.s b/lld/test/ELF/linkerscript/ehdr_start.s
index ef3dc597cb8..ef3dc597cb8 100644
--- a/lld/test/ELF/linkerscript/linkerscript-ehdr_start.s
+++ b/lld/test/ELF/linkerscript/ehdr_start.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-excludefile.s b/lld/test/ELF/linkerscript/excludefile.s
index 565851dab13..565851dab13 100644
--- a/lld/test/ELF/linkerscript/linkerscript-excludefile.s
+++ b/lld/test/ELF/linkerscript/excludefile.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-filename-spec.s b/lld/test/ELF/linkerscript/filename-spec.s
index 4c3f9494e61..be1755815bb 100644
--- a/lld/test/ELF/linkerscript/linkerscript-filename-spec.s
+++ b/lld/test/ELF/linkerscript/filename-spec.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %tfirst.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
-# RUN:   %p/Inputs/linkerscript-filename-spec.s -o %tsecond.o
+# RUN:   %p/Inputs/filename-spec.s -o %tsecond.o
 
 # RUN: echo "SECTIONS { .foo : { \
 # RUN:   KEEP(*first.o(.foo)) \
@@ -33,22 +33,22 @@
 # RUN: ld.lld -o %t4 --script %t4.script %tfirst.o %tsecond.o
 # RUN: llvm-objdump -s %t4 | FileCheck --check-prefix=SECONDFIRST %s
 
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %T/linkerscript-filename-spec1.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %T/filename-spec1.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
-# RUN:   %p/Inputs/linkerscript-filename-spec.s -o %T/linkerscript-filename-spec2.o
+# RUN:   %p/Inputs/filename-spec.s -o %T/filename-spec2.o
 
 # RUN: echo "SECTIONS { .foo : { \
-# RUN:   linkerscript-filename-spec2.o(.foo) \
-# RUN:   linkerscript-filename-spec1.o(.foo) } }" > %t5.script
+# RUN:   filename-spec2.o(.foo) \
+# RUN:   filename-spec1.o(.foo) } }" > %t5.script
 # RUN: ld.lld -o %t5 --script %t5.script \
-# RUN:   %T/linkerscript-filename-spec1.o %T/linkerscript-filename-spec2.o
+# RUN:   %T/filename-spec1.o %T/filename-spec2.o
 # RUN: llvm-objdump -s %t5 | FileCheck --check-prefix=SECONDFIRST %s
 
 # RUN: echo "SECTIONS { .foo : { \
-# RUN:   linkerscript-filename-spec1.o(.foo) \
-# RUN:   linkerscript-filename-spec2.o(.foo) } }" > %t6.script
+# RUN:   filename-spec1.o(.foo) \
+# RUN:   filename-spec2.o(.foo) } }" > %t6.script
 # RUN: ld.lld -o %t6 --script %t6.script \
-# RUN:   %T/linkerscript-filename-spec1.o %T/linkerscript-filename-spec2.o
+# RUN:   %T/filename-spec1.o %T/filename-spec2.o
 # RUN: llvm-objdump -s %t6 | FileCheck --check-prefix=FIRSTSECOND %s
 
 .global _start
diff --git a/lld/test/ELF/linkerscript/linkerscript-input-order.s b/lld/test/ELF/linkerscript/input-order.s
index cb9ea354cdb..cb9ea354cdb 100644
--- a/lld/test/ELF/linkerscript/linkerscript-input-order.s
+++ b/lld/test/ELF/linkerscript/input-order.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-input-sec-dup.s b/lld/test/ELF/linkerscript/input-sec-dup.s
index f6f8c9c8d4e..f6f8c9c8d4e 100644
--- a/lld/test/ELF/linkerscript/linkerscript-input-sec-dup.s
+++ b/lld/test/ELF/linkerscript/input-sec-dup.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-locationcounter.s b/lld/test/ELF/linkerscript/locationcounter.s
index 94af0ce3840..94af0ce3840 100644
--- a/lld/test/ELF/linkerscript/linkerscript-locationcounter.s
+++ b/lld/test/ELF/linkerscript/locationcounter.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-merge-sections-reloc.s b/lld/test/ELF/linkerscript/merge-sections-reloc.s
index 9d8089a5f18..63934154035 100644
--- a/lld/test/ELF/linkerscript/linkerscript-merge-sections-reloc.s
+++ b/lld/test/ELF/linkerscript/merge-sections-reloc.s
@@ -1,5 +1,5 @@
 # REQUIRES: x86
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/linkerscript-merge-sections-reloc.s -o %t1.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/merge-sections-reloc.s -o %t1.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2.o
 # RUN: echo "SECTIONS {}" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t1.o %t2.o
diff --git a/lld/test/ELF/linkerscript/linkerscript-merge-sections.s b/lld/test/ELF/linkerscript/merge-sections.s
index bb3849a861c..bb3849a861c 100644
--- a/lld/test/ELF/linkerscript/linkerscript-merge-sections.s
+++ b/lld/test/ELF/linkerscript/merge-sections.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-multi-sections-constraint.s b/lld/test/ELF/linkerscript/multi-sections-constraint.s
index e13121504d8..e13121504d8 100644
--- a/lld/test/ELF/linkerscript/linkerscript-multi-sections-constraint.s
+++ b/lld/test/ELF/linkerscript/multi-sections-constraint.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-numbers.s b/lld/test/ELF/linkerscript/numbers.s
index 1738ad4aa33..1738ad4aa33 100644
--- a/lld/test/ELF/linkerscript/linkerscript-numbers.s
+++ b/lld/test/ELF/linkerscript/numbers.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-orphans.s b/lld/test/ELF/linkerscript/orphans.s
index fa7d30bf7f7..fa7d30bf7f7 100644
--- a/lld/test/ELF/linkerscript/linkerscript-orphans.s
+++ b/lld/test/ELF/linkerscript/orphans.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-ouputformat.s b/lld/test/ELF/linkerscript/ouputformat.s
index 7d4402a557a..7d4402a557a 100644
--- a/lld/test/ELF/linkerscript/linkerscript-ouputformat.s
+++ b/lld/test/ELF/linkerscript/ouputformat.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-outputarch.s b/lld/test/ELF/linkerscript/outputarch.s
index 99089615cb1..99089615cb1 100644
--- a/lld/test/ELF/linkerscript/linkerscript-outputarch.s
+++ b/lld/test/ELF/linkerscript/outputarch.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-phdr-check.s b/lld/test/ELF/linkerscript/phdr-check.s
index c7229ed3312..c7229ed3312 100644
--- a/lld/test/ELF/linkerscript/linkerscript-phdr-check.s
+++ b/lld/test/ELF/linkerscript/phdr-check.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-phdrs-flags.s b/lld/test/ELF/linkerscript/phdrs-flags.s
index d90c0423921..d90c0423921 100644
--- a/lld/test/ELF/linkerscript/linkerscript-phdrs-flags.s
+++ b/lld/test/ELF/linkerscript/phdrs-flags.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-phdrs.s b/lld/test/ELF/linkerscript/phdrs.s
index 775e002506b..775e002506b 100644
--- a/lld/test/ELF/linkerscript/linkerscript-phdrs.s
+++ b/lld/test/ELF/linkerscript/phdrs.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-repsection-va.s b/lld/test/ELF/linkerscript/repsection-va.s
index 29ecdf84a8b..29ecdf84a8b 100644
--- a/lld/test/ELF/linkerscript/linkerscript-repsection-va.s
+++ b/lld/test/ELF/linkerscript/repsection-va.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-sections-constraint.s b/lld/test/ELF/linkerscript/sections-constraint.s
index 75c192c32a5..75c192c32a5 100644
--- a/lld/test/ELF/linkerscript/linkerscript-sections-constraint.s
+++ b/lld/test/ELF/linkerscript/sections-constraint.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-sections-keep.s b/lld/test/ELF/linkerscript/sections-keep.s
index fae6383ca49..fae6383ca49 100644
--- a/lld/test/ELF/linkerscript/linkerscript-sections-keep.s
+++ b/lld/test/ELF/linkerscript/sections-keep.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-sections-padding.s b/lld/test/ELF/linkerscript/sections-padding.s
index eb7c8d62e16..eb7c8d62e16 100644
--- a/lld/test/ELF/linkerscript/linkerscript-sections-padding.s
+++ b/lld/test/ELF/linkerscript/sections-padding.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-sections.s b/lld/test/ELF/linkerscript/sections.s
index b68dac765a7..b68dac765a7 100644
--- a/lld/test/ELF/linkerscript/linkerscript-sections.s
+++ b/lld/test/ELF/linkerscript/sections.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-sizeof.s b/lld/test/ELF/linkerscript/sizeof.s
index f7420ddfe64..f7420ddfe64 100644
--- a/lld/test/ELF/linkerscript/linkerscript-sizeof.s
+++ b/lld/test/ELF/linkerscript/sizeof.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-sizeofheaders.s b/lld/test/ELF/linkerscript/sizeofheaders.s
index f98cd8a2763..f98cd8a2763 100644
--- a/lld/test/ELF/linkerscript/linkerscript-sizeofheaders.s
+++ b/lld/test/ELF/linkerscript/sizeofheaders.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-sort-constructors.s b/lld/test/ELF/linkerscript/sort-constructors.s
index a0c23af6de7..a0c23af6de7 100644
--- a/lld/test/ELF/linkerscript/linkerscript-sort-constructors.s
+++ b/lld/test/ELF/linkerscript/sort-constructors.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-sort-nested.s b/lld/test/ELF/linkerscript/sort-nested.s
index bb89da99bb2..21ddddf9909 100644
--- a/lld/test/ELF/linkerscript/linkerscript-sort-nested.s
+++ b/lld/test/ELF/linkerscript/sort-nested.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
-# RUN:   %p/Inputs/linkerscript-sort-nested.s -o %t2.o
+# RUN:   %p/Inputs/sort-nested.s -o %t2.o
 
 ## Check sorting first by alignment and then by name.
 # RUN: echo "SECTIONS { .aaa : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.aaa.*))) } }" > %t1.script
diff --git a/lld/test/ELF/linkerscript/linkerscript-sort.s b/lld/test/ELF/linkerscript/sort.s
index 2e3b63b7d32..31df7a3ea41 100644
--- a/lld/test/ELF/linkerscript/linkerscript-sort.s
+++ b/lld/test/ELF/linkerscript/sort.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
-# RUN:   %p/Inputs/linkerscript-sort.s -o %t2.o
+# RUN:   %p/Inputs/sort.s -o %t2.o
 
 # RUN: echo "SECTIONS { .aaa : { *(.aaa.*) } }" > %t1.script
 # RUN: ld.lld -o %t1 --script %t1.script %t2.o %t1.o
diff --git a/lld/test/ELF/linkerscript/linkerscript-start-end.s b/lld/test/ELF/linkerscript/start-end.s
index b68606abc18..b68606abc18 100644
--- a/lld/test/ELF/linkerscript/linkerscript-start-end.s
+++ b/lld/test/ELF/linkerscript/start-end.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-subalign.s b/lld/test/ELF/linkerscript/subalign.s
index 8b441d440b0..8b441d440b0 100644
--- a/lld/test/ELF/linkerscript/linkerscript-subalign.s
+++ b/lld/test/ELF/linkerscript/subalign.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-symbol-assignexpr.s b/lld/test/ELF/linkerscript/symbol-assignexpr.s
index 80c4e89424e..80c4e89424e 100644
--- a/lld/test/ELF/linkerscript/linkerscript-symbol-assignexpr.s
+++ b/lld/test/ELF/linkerscript/symbol-assignexpr.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-symbol-conflict.s b/lld/test/ELF/linkerscript/symbol-conflict.s
index 30186ed5cb8..30186ed5cb8 100644
--- a/lld/test/ELF/linkerscript/linkerscript-symbol-conflict.s
+++ b/lld/test/ELF/linkerscript/symbol-conflict.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-symbolreferenced.s b/lld/test/ELF/linkerscript/symbolreferenced.s
index c2925b179ad..c2925b179ad 100644
--- a/lld/test/ELF/linkerscript/linkerscript-symbolreferenced.s
+++ b/lld/test/ELF/linkerscript/symbolreferenced.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-symbols-synthetic.s b/lld/test/ELF/linkerscript/symbols-synthetic.s
index 2ab7e6896f9..2ab7e6896f9 100644
--- a/lld/test/ELF/linkerscript/linkerscript-symbols-synthetic.s
+++ b/lld/test/ELF/linkerscript/symbols-synthetic.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-symbols.s b/lld/test/ELF/linkerscript/symbols.s
index f8b0a31e3b9..f8b0a31e3b9 100644
--- a/lld/test/ELF/linkerscript/linkerscript-symbols.s
+++ b/lld/test/ELF/linkerscript/symbols.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-undef.s b/lld/test/ELF/linkerscript/undef.s
index 85ad0767b5e..85ad0767b5e 100644
--- a/lld/test/ELF/linkerscript/linkerscript-undef.s
+++ b/lld/test/ELF/linkerscript/undef.s
diff --git a/lld/test/ELF/linkerscript/linkerscript-va.s b/lld/test/ELF/linkerscript/va.s
index 25d0bd2268c..25d0bd2268c 100644
--- a/lld/test/ELF/linkerscript/linkerscript-va.s
+++ b/lld/test/ELF/linkerscript/va.s