[lld] r249630 - ELF2: Use `-flavor gnu2` after `not` to fix Windows buildbot.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Wed Oct 7 15:20:43 PDT 2015


Author: ruiu
Date: Wed Oct  7 17:20:43 2015
New Revision: 249630

URL: http://llvm.org/viewvc/llvm-project?rev=249630&view=rev
Log:
ELF2: Use `-flavor gnu2` after `not` to fix Windows buildbot.

`not` command on Windows is not able to find an executable from PATH
if a given command already has an extension even if the extension is
not ".exe".

Modified:
    lld/trunk/test/elf2/aarch64-abs16-error.s
    lld/trunk/test/elf2/aarch64-abs32-error.s
    lld/trunk/test/elf2/allow-multiple-definition.s
    lld/trunk/test/elf2/allow-shlib-undefined.s
    lld/trunk/test/elf2/basic.s
    lld/trunk/test/elf2/entry.s
    lld/trunk/test/elf2/incompatible.s
    lld/trunk/test/elf2/invalid-elf.test
    lld/trunk/test/elf2/invalid-relocations.test
    lld/trunk/test/elf2/libsearch.s
    lld/trunk/test/elf2/linkerscript.s
    lld/trunk/test/elf2/no-inhibit-exec.s
    lld/trunk/test/elf2/no-undefined.s
    lld/trunk/test/elf2/relocation-32S-error.s
    lld/trunk/test/elf2/relocation-errors.s
    lld/trunk/test/elf2/sysroot.s
    lld/trunk/test/elf2/tls-static.s
    lld/trunk/test/elf2/undef-start.s
    lld/trunk/test/elf2/undef.s

Modified: lld/trunk/test/elf2/aarch64-abs16-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/aarch64-abs16-error.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/aarch64-abs16-error.s (original)
+++ lld/trunk/test/elf2/aarch64-abs16-error.s Wed Oct  7 17:20:43 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t
-// RUN: not ld.lld2 -shared %t -o %t2 2>&1 | FileCheck %s
+// RUN: not lld -flavor gnu2 -shared %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: aarch64
 
 .hword sym+65539

Modified: lld/trunk/test/elf2/aarch64-abs32-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/aarch64-abs32-error.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/aarch64-abs32-error.s (original)
+++ lld/trunk/test/elf2/aarch64-abs32-error.s Wed Oct  7 17:20:43 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t
-// RUN: not ld.lld2 -shared %t -o %t2 2>&1 | FileCheck %s
+// RUN: not lld -flavor gnu2 -shared %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: aarch64
 
 .word sym+99999999999

Modified: lld/trunk/test/elf2/allow-multiple-definition.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/allow-multiple-definition.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/allow-multiple-definition.s (original)
+++ lld/trunk/test/elf2/allow-multiple-definition.s Wed Oct  7 17:20:43 2015
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/allow-multiple-definition.s -o %t2
-# RUN: not ld.lld2 %t1 %t2 -o %t3
+# RUN: not lld -flavor gnu2 %t1 %t2 -o %t3
 # RUN: ld.lld2 --allow-multiple-definition %t1 %t2 -o %t3
 # RUN: ld.lld2 --allow-multiple-definition %t2 %t1 -o %t4
 # RUN: llvm-objdump -d %t3 | FileCheck %s

Modified: lld/trunk/test/elf2/allow-shlib-undefined.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/allow-shlib-undefined.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/allow-shlib-undefined.s (original)
+++ lld/trunk/test/elf2/allow-shlib-undefined.s Wed Oct  7 17:20:43 2015
@@ -18,7 +18,7 @@
 # RUN: ld.lld2 -shared --no-allow-shlib-undefined %t -o %t.so
 
 # Executable still should not link when have undefines inside.
-# RUN: not ld.lld2 %t -o %t.so
+# RUN: not lld -flavor gnu2 %t -o %t.so
 
 .globl _start
 _start:

Modified: lld/trunk/test/elf2/basic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/basic.s (original)
+++ lld/trunk/test/elf2/basic.s Wed Oct  7 17:20:43 2015
@@ -184,27 +184,27 @@ _start:
 # RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
 # RUN:   | FileCheck %s
 
-# RUN: not ld.lld2 %t.foo -o %t2 2>&1 | \
+# RUN: not lld -flavor gnu2 %t.foo -o %t2 2>&1 | \
 # RUN:  FileCheck --check-prefix=MISSING %s
 # MISSING: cannot open {{.*}}.foo: {{[Nn]}}o such file or directory
 
-# RUN: not ld.lld2 -o %t2 2>&1 | \
+# RUN: not lld -flavor gnu2 -o %t2 2>&1 | \
 # RUN:  FileCheck --check-prefix=NO_INPUT %s
 # NO_INPUT: no input files.
 
-# RUN: not ld.lld2 %t.no.such.file -o %t2 2>&1 | \
+# RUN: not lld -flavor gnu2 %t.no.such.file -o %t2 2>&1 | \
 # RUN:  FileCheck --check-prefix=CANNOT_OPEN %s
 # CANNOT_OPEN: cannot open {{.*}}.no.such.file: {{[Nn]}}o such file or directory
 
-# RUN: not ld.lld2 %t -o 2>&1 | FileCheck --check-prefix=NO_O_VAL %s
+# RUN: not lld -flavor gnu2 %t -o 2>&1 | FileCheck --check-prefix=NO_O_VAL %s
 # NO_O_VAL: missing arg value for "-o", expected 1 argument.
 
-# RUN: not ld.lld2 --foo 2>&1 | FileCheck --check-prefix=UNKNOWN %s
+# RUN: not lld -flavor gnu2 --foo 2>&1 | FileCheck --check-prefix=UNKNOWN %s
 # UNKNOWN: unknown argument: --foo
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: not ld.lld2 %t %t -o %t2 2>&1 | FileCheck --check-prefix=DUP %s
+# RUN: not lld -flavor gnu2 %t %t -o %t2 2>&1 | FileCheck --check-prefix=DUP %s
 # DUP: duplicate symbol: _start in {{.*}} and {{.*}}
 
-# RUN: not ld.lld2 %t -o %t -m wrong_emul 2>&1 | FileCheck --check-prefix=UNKNOWN_EMUL %s
+# RUN: not lld -flavor gnu2 %t -o %t -m wrong_emul 2>&1 | FileCheck --check-prefix=UNKNOWN_EMUL %s
 # UNKNOWN_EMUL: Unknown emulation: wrong_emul

Modified: lld/trunk/test/elf2/entry.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/entry.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/entry.s (original)
+++ lld/trunk/test/elf2/entry.s Wed Oct  7 17:20:43 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
-# RUN: not ld.lld2 %t1 -o %t2
+# RUN: not lld -flavor gnu2 %t1 -o %t2
 # RUN: ld.lld2 %t1 -o %t2 -e _end
 
 .globl _end;

Modified: lld/trunk/test/elf2/incompatible.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/incompatible.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/incompatible.s (original)
+++ lld/trunk/test/elf2/incompatible.s Wed Oct  7 17:20:43 2015
@@ -3,43 +3,43 @@
 // RUN: ld.lld2 -shared %tb.o -o %ti686.so
 // RUN: llvm-mc -filetype=obj -triple=arm-unknown-linux %s -o %tc.o
 
-// RUN: not ld.lld2 %ta.o %tb.o -o %t 2>&1 | \
+// RUN: not lld -flavor gnu2 %ta.o %tb.o -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=A-AND-B %s
 // A-AND-B: b.o is incompatible with {{.*}}a.o
 
-// RUN: not ld.lld2 %tb.o %tc.o -o %t 2>&1 | \
+// RUN: not lld -flavor gnu2 %tb.o %tc.o -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=B-AND-C %s
 // B-AND-C: c.o is incompatible with {{.*}}b.o
 
-// RUN: not ld.lld2 %ta.o %ti686.so -o %t 2>&1 | \
+// RUN: not lld -flavor gnu2 %ta.o %ti686.so -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=A-AND-SO %s
 // A-AND-SO: i686.so is incompatible with {{.*}}a.o
 
-// RUN: not ld.lld2 %tc.o %ti686.so -o %t 2>&1 | \
+// RUN: not lld -flavor gnu2 %tc.o %ti686.so -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=C-AND-SO %s
 // C-AND-SO: i686.so is incompatible with {{.*}}c.o
 
-// RUN: not ld.lld2 %ti686.so %tc.o -o %t 2>&1 | \
+// RUN: not lld -flavor gnu2 %ti686.so %tc.o -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=SO-AND-C %s
 // SO-AND-C: c.o is incompatible with {{.*}}i686.so
 
-// RUN: not ld.lld2 -m elf64ppc %ta.o -o %t 2>&1 | \
+// RUN: not lld -flavor gnu2 -m elf64ppc %ta.o -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=A-ONLY %s
 // A-ONLY: a.o is incompatible with target architecture
 
-// RUN: not ld.lld2 -m elf64ppc %tb.o -o %t 2>&1 | \
+// RUN: not lld -flavor gnu2 -m elf64ppc %tb.o -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=B-ONLY %s
 // B-ONLY: b.o is incompatible with target architecture
 
-// RUN: not ld.lld2 -m elf64ppc %tc.o -o %t 2>&1 | \
+// RUN: not lld -flavor gnu2 -m elf64ppc %tc.o -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=C-ONLY %s
 // C-ONLY: c.o is incompatible with target architecture
 
-// RUN: not ld.lld2 -m elf_i386 %tc.o %ti686.so -o %t 2>&1 | \
+// RUN: not lld -flavor gnu2 -m elf_i386 %tc.o %ti686.so -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=C-AND-SO-I386 %s
 // C-AND-SO-I386: c.o is incompatible with target architecture
 
-// RUN: not ld.lld2 -m elf_i386 %ti686.so %tc.o -o %t 2>&1 | \
+// RUN: not lld -flavor gnu2 -m elf_i386 %ti686.so %tc.o -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=SO-AND-C-I386 %s
 // SO-AND-C-I386: c.o is incompatible with {{.*}}i686.so
 

Modified: lld/trunk/test/elf2/invalid-elf.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/invalid-elf.test?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/invalid-elf.test (original)
+++ lld/trunk/test/elf2/invalid-elf.test Wed Oct  7 17:20:43 2015
@@ -1,26 +1,26 @@
 # RUN: llvm-mc %s -o %t -filetype=obj -triple x86_64-pc-linux
 
-# RUN: not ld.lld2 %t %p/Inputs/invalid-data-encoding.a -o %t2 2>&1 | \
+# RUN: not lld -flavor gnu2 %t %p/Inputs/invalid-data-encoding.a -o %t2 2>&1 | \
 # RUN:   FileCheck --check-prefix=INVALID-DATA-ENC %s
 # INVALID-DATA-ENC: Invalid data encoding: test.o
 
-# RUN: not ld.lld2 %t %p/Inputs/invalid-file-class.a -o %t2 2>&1 | \
+# RUN: not lld -flavor gnu2 %t %p/Inputs/invalid-file-class.a -o %t2 2>&1 | \
 # RUN:   FileCheck --check-prefix=INVALID-FILE-CLASS %s
 # INVALID-FILE-CLASS: Invalid file class: test.o
 
-# RUN: not ld.lld2 %p/Inputs/invalid-symtab-sh_info.elf -o %t2 2>&1 | \
+# RUN: not lld -flavor gnu2 %p/Inputs/invalid-symtab-sh_info.elf -o %t2 2>&1 | \
 # RUN:   FileCheck --check-prefix=INVALID-SYMTAB-SHINFO %s
 # INVALID-SYMTAB-SHINFO: Invalid sh_info in symbol table
 
-# RUN: not ld.lld2 %p/Inputs/invalid-binding.elf -o %t2 2>&1 | \
+# RUN: not lld -flavor gnu2 %p/Inputs/invalid-binding.elf -o %t2 2>&1 | \
 # RUN:   FileCheck --check-prefix=INVALID-BINDING %s
 # INVALID-BINDING: unexpected binding
 
-# RUN: not ld.lld2 %p/Inputs/invalid-section-index.elf -o %t2 2>&1 | \
+# RUN: not lld -flavor gnu2 %p/Inputs/invalid-section-index.elf -o %t2 2>&1 | \
 # RUN:   FileCheck --check-prefix=INVALID-SECTION-INDEX %s
 # INVALID-SECTION-INDEX: Invalid section index
 
-# RUN: not ld.lld2 %p/Inputs/invalid-shstrndx.so -o %t2 2>&1 | \
+# RUN: not lld -flavor gnu2 %p/Inputs/invalid-shstrndx.so -o %t2 2>&1 | \
 # RUN:   FileCheck --check-prefix=INVALID-SECTION-INDEX %s
 
 .long foo

Modified: lld/trunk/test/elf2/invalid-relocations.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/invalid-relocations.test?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/invalid-relocations.test (original)
+++ lld/trunk/test/elf2/invalid-relocations.test Wed Oct  7 17:20:43 2015
@@ -1,5 +1,5 @@
 # RUN: yaml2obj -format elf %s -o %t
-# RUN: not ld.lld2 %t -o %tout 2>&1 | FileCheck %s
+# RUN: not lld -flavor gnu2 %t -o %tout 2>&1 | FileCheck %s
 
 FileHeader:
   Class:           ELFCLASS64

Modified: lld/trunk/test/elf2/libsearch.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/libsearch.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/libsearch.s (original)
+++ lld/trunk/test/elf2/libsearch.s Wed Oct  7 17:20:43 2015
@@ -10,12 +10,12 @@
 // REQUIRES: x86
 
 // Should not link because of undefined symbol _bar
-// RUN: not ld.lld2 -o %t3 %t.o 2>&1 \
+// RUN: not lld -flavor gnu2 -o %t3 %t.o 2>&1 \
 // RUN:   | FileCheck --check-prefix=UNDEFINED %s
 // UNDEFINED: undefined symbol: _bar
 
 // Should fail if cannot find specified library (without -L switch)
-// RUN: not ld.lld2 -o %t3 %t.o -lls 2>&1 \
+// RUN: not lld -flavor gnu2 -o %t3 %t.o -lls 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOLIB %s
 // NOLIB: Unable to find library -lls
 
@@ -46,7 +46,7 @@
 // Should not search for dynamic libraries if -Bstatic is specified
 // RUN: ld.lld2 -o %t3 %t.o -L%T -Bstatic -lls
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=STATIC %s
-// RUN: not ld.lld2 -o %t3 %t.o -L%T -Bstatic -lls2 2>&1 \
+// RUN: not lld -flavor gnu2 -o %t3 %t.o -L%T -Bstatic -lls2 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOLIB2 %s
 // NOLIB2: Unable to find library -lls2
 

Modified: lld/trunk/test/elf2/linkerscript.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/linkerscript.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/linkerscript.s (original)
+++ lld/trunk/test/elf2/linkerscript.s Wed Oct  7 17:20:43 2015
@@ -24,7 +24,7 @@
 # RUN: llvm-readobj %t.out > /dev/null
 
 # RUN: echo "FOO(BAR)" > %t.script
-# RUN: not ld.lld2 -o foo %t.script > %t.log 2>&1
+# RUN: not lld -flavor gnu2 -o foo %t.script > %t.log 2>&1
 # RUN: FileCheck -check-prefix=ERR1 %s < %t.log
 
 # ERR1: unknown directive: FOO

Modified: lld/trunk/test/elf2/no-inhibit-exec.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/no-inhibit-exec.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/no-inhibit-exec.s (original)
+++ lld/trunk/test/elf2/no-inhibit-exec.s Wed Oct  7 17:20:43 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: not ld.lld2 %t -o %t2
+# RUN: not lld -flavor gnu2 %t -o %t2
 # RUN: ld.lld2 %t --noinhibit-exec -o %t2
 # RUN: llvm-objdump -d %t2 | FileCheck %s
 # REQUIRES: x86

Modified: lld/trunk/test/elf2/no-undefined.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/no-undefined.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/no-undefined.s (original)
+++ lld/trunk/test/elf2/no-undefined.s Wed Oct  7 17:20:43 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: not ld.lld2 --no-undefined -shared %t -o %t.so
+# RUN: not lld -flavor gnu2 --no-undefined -shared %t -o %t.so
 # RUN: ld.lld2 -shared %t -o %t1.so
 
 .globl _shared

Modified: lld/trunk/test/elf2/relocation-32S-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/relocation-32S-error.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/relocation-32S-error.s (original)
+++ lld/trunk/test/elf2/relocation-32S-error.s Wed Oct  7 17:20:43 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: not ld.lld2 %t -o %t2 2>&1 | FileCheck %s
+// RUN: not lld -flavor gnu2 %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: x86
 
 .global _start

Modified: lld/trunk/test/elf2/relocation-errors.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/relocation-errors.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/relocation-errors.s (original)
+++ lld/trunk/test/elf2/relocation-errors.s Wed Oct  7 17:20:43 2015
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/abs.s -o %tabs
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: not ld.lld2 %tabs %t -o %t2 2>&1 | FileCheck %s
+// RUN: not lld -flavor gnu2 %tabs %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: x86
 
 .global _start

Modified: lld/trunk/test/elf2/sysroot.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/sysroot.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/sysroot.s (original)
+++ lld/trunk/test/elf2/sysroot.s Wed Oct  7 17:20:43 2015
@@ -7,12 +7,12 @@
 // REQUIRES: x86
 
 // Should not link because of undefined symbol _bar
-// RUN: not ld.lld2 -o %t/r %t/m.o 2>&1 \
+// RUN: not lld -flavor gnu2 -o %t/r %t/m.o 2>&1 \
 // RUN:     | FileCheck --check-prefix=UNDEFINED %s
 // UNDEFINED: undefined symbol: _bar
 
 // We need to be sure that there is no suitable library in the /lib directory
-// RUN: not ld.lld2 -o %t/r %t/m.o -L/lib -l:libls.a 2>&1 \
+// RUN: not lld -flavor gnu2 -o %t/r %t/m.o -L/lib -l:libls.a 2>&1 \
 // RUN:     | FileCheck --check-prefix=NOLIB %s
 // NOLIB: Unable to find library -l:libls.a
 
@@ -29,8 +29,8 @@
 // RUN: ld.lld2 -o %t/r %t/m.o --sysroot=%t -L=/lib -l:libls.a
 
 // Should not substitute SysRoot if the directory name does not start with '='
-// RUN: not ld.lld2 -o %t/r %r/m.o --sysroot=%t -Llib -l:libls.a
-// RUN: not ld.lld2 -o %t/r %r/m.o --sysroot=%t -L/lib -l:libls.a
+// RUN: not lld -flavor gnu2 -o %t/r %r/m.o --sysroot=%t -Llib -l:libls.a
+// RUN: not lld -flavor gnu2 -o %t/r %r/m.o --sysroot=%t -L/lib -l:libls.a
 
 .globl _start,_bar;
 _start:

Modified: lld/trunk/test/elf2/tls-static.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/tls-static.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/tls-static.s (original)
+++ lld/trunk/test/elf2/tls-static.s Wed Oct  7 17:20:43 2015
@@ -3,7 +3,7 @@
 // RUN: ld.lld2 -static %t -o %tout
 // RUN: ld.lld2 %t -o %tout
 // RUN: ld.lld2 -shared %tso -o %tshared
-// RUN: not ld.lld2 -static %t %tshared -o %tout
+// RUN: not lld -flavor gnu2 -static %t %tshared -o %tout
 // REQUIRES: x86
 
 .global _start

Modified: lld/trunk/test/elf2/undef-start.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/undef-start.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/undef-start.s (original)
+++ lld/trunk/test/elf2/undef-start.s Wed Oct  7 17:20:43 2015
@@ -1,4 +1,4 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: not ld.lld2 %t -o %t2 2>&1 | FileCheck %s
+# RUN: not lld -flavor gnu2 %t -o %t2 2>&1 | FileCheck %s
 # CHECK: undefined symbol: _start
 # REQUIRES: x86

Modified: lld/trunk/test/elf2/undef.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/undef.s?rev=249630&r1=249629&r2=249630&view=diff
==============================================================================
--- lld/trunk/test/elf2/undef.s (original)
+++ lld/trunk/test/elf2/undef.s Wed Oct  7 17:20:43 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: not ld.lld2 %t -o %t2 2>&1 | FileCheck %s
+# RUN: not lld -flavor gnu2 %t -o %t2 2>&1 | FileCheck %s
 # CHECK: undefined symbol: foo in {{.*}}
 # REQUIRES: x86
 




More information about the llvm-commits mailing list