Fix ELF/linkerscript/input-archive.s w/ @ in path

[thopre]

Summary

Lld test ELF/linkerscript/input-archive.s fails when path contain a @
because is not accepted in unquoted token in linker scripts which leads
to the path being broken in 2 around the @. This commit quotes the path
used in the linker script created by this and similar testcases allowing
the test to pass even in the presence of an @ sign in the path.

[MaskRay]

This is ok, but can you fix all tests in one patch? For example, linkerscript/thunk-gen-mips.s has the same problem.

because @ is a keyword in linker script which leads to the path being broken in 2 around the @

@ is not a keyword.

@ is not considered part of an unquoted token.

[thopre]

Also fix thunk-gen-mips test

[MaskRay]

You did not fix lld/test/ELF/linkerscript/thunk-gen-mips.s initially. This made me wonder how you found the issue of lld/test/ELF/linkerscript/input-archive.s.

Have you invoked ninja check-lld to ensure every test is good now?

[jhenderson]

In D79103#2010743, @MaskRay wrote:

You did not fix lld/test/ELF/linkerscript/thunk-gen-mips.s initially. This made me wonder how you found the issue of lld/test/ELF/linkerscript/input-archive.s.

Have you invoked ninja check-lld to ensure every test is good now?

Wild guess: @thopre doesn't have all targets enabled?

[thopre]

In D79103#2012071, @jhenderson wrote:

In D79103#2010743, @MaskRay wrote:

You did not fix lld/test/ELF/linkerscript/thunk-gen-mips.s initially. This made me wonder how you found the issue of lld/test/ELF/linkerscript/input-archive.s.

Have you invoked ninja check-lld to ensure every test is good now?

Wild guess: @thopre doesn't have all targets enabled?

Indeed, but that wouldn't have caught it anyway. See comment I've added on thunk-gen-mips.s

lld/test/ELF/linkerscript/thunk-gen-mips.s

18–20

CHECK-ANY is not a valid FileCheck directive and the FileCheck invocation uses the default prefix. This test is only testing the presence of SYMBOL TABLE in the output of llvm-objdump -t :-)

[thopre]

lld/test/ELF/linkerscript/thunk-gen-mips.s

18–20

The test seems to have bitrotted as a result. This is the output of objdump -t I get when I run it manually:

SYMBOL TABLE:
00000001 l *ABS* 00000000 MAIN
00000001 l *ABS* 00000000 TARGET
00108050 l .got 00000000 .hidden _gp
0010003c l F .text 00000010 __LA25Thunk_too_far
00000030 g .text 00000000 _start
00100050 g F .text 0000000c too_far

So wrong address and flag for _start, wrong address and size for too_far.

I presume CHECK-ANY was meant to be CHECK-DAG and thus the order does not matter.

[thopre]

Fix quoting in ELF/linkerscript/thunk-gen-mips.s

[MaskRay]

lld/test/ELF/linkerscript/thunk-gen-mips.s

7

A better fix is to change the outermost " to ' and use unescaped "%t"

[thopre]

Use single quoting for linker script

[MaskRay]

Please add [test] to the commit subject. You can do this before committing arcfilter; git pull --rebase origin master; last-minute-testing(ninja check-lld-elf) && git push origin HEAD:master where arcfilter is a shell function which drops unneeded Phabricator tags (Subscribers:, Summary:, Tags:, Reviewers:) but keeps Differential Revision: and Reviewed By:

arcfilter () {
  arc amend
  git log -1 --pretty=%B | awk '/Reviewers:|Subscribers:/{p=1} /Reviewed By:|Differential Revision:/{p=0} !p && !/^Summary:$/ {sub(/^Summary: /,"");print}' | git commit --amend -F -
}

lld/test/ELF/linkerscript/input-archive.s

 # REQUIRES: x86
 # UNSUPPORTED: system-windows
 ## Test that archive:file is supported in an input section description.
 
 # RUN: mkdir -p %t.dir
 # RUN: echo '.data; .byte 1' | llvm-mc -filetype=obj -triple=x86_64 - -o %t.dir/a.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.dir/b.o
 # RUN: rm -f %t.a
 # RUN: llvm-ar rc %t.a %t.dir/a.o %t.dir/b.o
 
 ## *.a:b.o matches /path/to/input-archive.s.tmp.a:b.o
 ## *b.o matches /path/to/input-archive.s.tmp.a:b.o
 # RUN: echo 'SECTIONS { \
-# RUN:   .foo : { %t.a:a.o(.data) } \
+# RUN:   .foo : { "%t.a:a.o"(.data) } \
 # RUN:   .bar : { *.a:b.o(.data) } \
 # RUN:   .qux : { *b.o(.data1) } \
 # RUN:   }' > %t.script
 # RUN: ld.lld -T %t.script --whole-archive %t.a -o %t
 # RUN: llvm-readelf -x .foo -x .bar -x .qux %t | FileCheck %s
 
 # CHECK:      Hex dump of section '.foo':
 # CHECK-NEXT: 0x00000000 01

lld/test/ELF/linkerscript/thunk-gen-mips.s

 # REQUIRES: mips
 # RUN:  llvm-mc -filetype=obj -defsym=MAIN=1 -triple=mips-unknown-freebsd %s -o %t
 # RUN:  llvm-mc -filetype=obj -defsym=TARGET=1 -triple=mips-unknown-freebsd %s -o %t1
 
 # SECTIONS command with the first pattern that does not match.
 # Linking a PIC and non-PIC object files triggers the LA25 thunk generation.
-# RUN:    echo "SECTIONS { \
+# RUN:    echo 'SECTIONS { \
 # RUN:    .text : { \
 # RUN:      *(.nomatch) \
-# RUN:      %t(.text) \
+# RUN:      "%t"(.text) \
 # RUN:      . = . + 0x100000 ; \
-# RUN:      %t1(.text) \
+# RUN:      "%t1"(.text) \
 # RUN:    } \
-# RUN:  }" > %t.script
+# RUN:  }' > %t.script
 # RUN: ld.lld -o %t.exe --script %t.script %t %t1
 # RUN: llvm-objdump -t %t.exe | FileCheck %s
 # CHECK: SYMBOL TABLE:
 # CHECK-ANY: 00000000         .text           00000000 _start
 # CHECK-ANY: 0010000c l     F .text           00000010 __LA25Thunk_too_far
 # CHECK-ANY: 00100020 g     F .text           00000024 too_far
 
 .ifdef MAIN
 .global _start
 _start:
   j too_far
   nop
 .endif