[lld] r253437 - Rename ld.lld2 to ld.lld since it is the default.

Rafael Espindola via llvm-commits llvm-commits at lists.llvm.org
Tue Nov 17 22:11:02 PST 2015


Author: rafael
Date: Wed Nov 18 00:11:01 2015
New Revision: 253437

URL: http://llvm.org/viewvc/llvm-project?rev=253437&view=rev
Log:
Rename ld.lld2 to ld.lld since it is the default.

Modified:
    lld/trunk/lib/Driver/UniversalDriver.cpp
    lld/trunk/test/ELF/aarch64-abs16-error.s
    lld/trunk/test/ELF/aarch64-abs32-error.s
    lld/trunk/test/ELF/aarch64-call26-error.s
    lld/trunk/test/ELF/aarch64-data-relocs.s
    lld/trunk/test/ELF/aarch64-hi21-error.s
    lld/trunk/test/ELF/aarch64-jump26-error.s
    lld/trunk/test/ELF/aarch64-lo21-error.s
    lld/trunk/test/ELF/aarch64-prel16-error.s
    lld/trunk/test/ELF/aarch64-prel32-error.s
    lld/trunk/test/ELF/aarch64-relocs.s
    lld/trunk/test/ELF/allow-multiple-definition.s
    lld/trunk/test/ELF/allow-shlib-undefined.s
    lld/trunk/test/ELF/archive.s
    lld/trunk/test/ELF/as-needed.s
    lld/trunk/test/ELF/basic-aarch64.s
    lld/trunk/test/ELF/basic-freebsd.s
    lld/trunk/test/ELF/basic-mips.s
    lld/trunk/test/ELF/basic.s
    lld/trunk/test/ELF/basic32.s
    lld/trunk/test/ELF/basic64be.s
    lld/trunk/test/ELF/bss.s
    lld/trunk/test/ELF/comdat.s
    lld/trunk/test/ELF/common.s
    lld/trunk/test/ELF/default-output.s
    lld/trunk/test/ELF/discard-locals.s
    lld/trunk/test/ELF/discard-none.s
    lld/trunk/test/ELF/dt_flags.s
    lld/trunk/test/ELF/dynamic-reloc-index.s
    lld/trunk/test/ELF/dynamic-reloc-weak.s
    lld/trunk/test/ELF/dynamic-reloc.s
    lld/trunk/test/ELF/eh-frame-merge.s
    lld/trunk/test/ELF/eh-frame-plt.s
    lld/trunk/test/ELF/eh-frame-type.test
    lld/trunk/test/ELF/empty-archive.s
    lld/trunk/test/ELF/emulation.s
    lld/trunk/test/ELF/entry.s
    lld/trunk/test/ELF/gc-sections-eh.s
    lld/trunk/test/ELF/gc-sections.s
    lld/trunk/test/ELF/global_offset_table.s
    lld/trunk/test/ELF/gnu-hash-table.s
    lld/trunk/test/ELF/gnu-unique.s
    lld/trunk/test/ELF/gnustack.s
    lld/trunk/test/ELF/got.s
    lld/trunk/test/ELF/incompatible-ar-first.s
    lld/trunk/test/ELF/incompatible.s
    lld/trunk/test/ELF/init-fini.s
    lld/trunk/test/ELF/invalid-cie-length.s
    lld/trunk/test/ELF/invalid-cie-length2.s
    lld/trunk/test/ELF/invalid-cie-reference.s
    lld/trunk/test/ELF/invalid-elf.test
    lld/trunk/test/ELF/invalid-fde-rel.s
    lld/trunk/test/ELF/invalid-relocations.test
    lld/trunk/test/ELF/libsearch.s
    lld/trunk/test/ELF/linkerscript-ouputformat.s
    lld/trunk/test/ELF/linkerscript-outputarch.s
    lld/trunk/test/ELF/linkerscript-sections.s
    lld/trunk/test/ELF/linkerscript.s
    lld/trunk/test/ELF/linkerscript2.s
    lld/trunk/test/ELF/local-dynamic.s
    lld/trunk/test/ELF/local-got-shared.s
    lld/trunk/test/ELF/local-got.s
    lld/trunk/test/ELF/local.s
    lld/trunk/test/ELF/many-sections.s
    lld/trunk/test/ELF/merge-invalid-size.s
    lld/trunk/test/ELF/merge-shared.s
    lld/trunk/test/ELF/merge-string-align.s
    lld/trunk/test/ELF/merge-string-error.s
    lld/trunk/test/ELF/merge-string-no-null.s
    lld/trunk/test/ELF/merge-string.s
    lld/trunk/test/ELF/merge-sym.s
    lld/trunk/test/ELF/merge.s
    lld/trunk/test/ELF/mips-dynamic.s
    lld/trunk/test/ELF/mips-dynsym-sort.s
    lld/trunk/test/ELF/mips-gnu-hash.s
    lld/trunk/test/ELF/mips-got-relocs.s
    lld/trunk/test/ELF/mips-relocs.s
    lld/trunk/test/ELF/new-dtags.test
    lld/trunk/test/ELF/no-inhibit-exec.s
    lld/trunk/test/ELF/no-obj.s
    lld/trunk/test/ELF/no-symtab.s
    lld/trunk/test/ELF/no-undefined.s
    lld/trunk/test/ELF/output-section.s
    lld/trunk/test/ELF/plt-aarch64.s
    lld/trunk/test/ELF/plt-i686.s
    lld/trunk/test/ELF/plt.s
    lld/trunk/test/ELF/ppc64-addr16-error.s
    lld/trunk/test/ELF/ppc64-rel-calls.s
    lld/trunk/test/ELF/ppc64-relocs.s
    lld/trunk/test/ELF/ppc64-shared-rel-toc.s
    lld/trunk/test/ELF/ppc64-toc-restore.s
    lld/trunk/test/ELF/ppc64-weak-undef-call-shared.s
    lld/trunk/test/ELF/ppc64-weak-undef-call.s
    lld/trunk/test/ELF/pre_init_fini_array.s
    lld/trunk/test/ELF/pre_init_fini_array_missing.s
    lld/trunk/test/ELF/progname.s
    lld/trunk/test/ELF/program-header-layout.s
    lld/trunk/test/ELF/relative-dynamic-reloc-ppc64.s
    lld/trunk/test/ELF/relative-dynamic-reloc.s
    lld/trunk/test/ELF/relocatable.s
    lld/trunk/test/ELF/relocation-absolute.s
    lld/trunk/test/ELF/relocation-common.s
    lld/trunk/test/ELF/relocation-copy.s
    lld/trunk/test/ELF/relocation-i686.s
    lld/trunk/test/ELF/relocation-in-merge.s
    lld/trunk/test/ELF/relocation-local.s
    lld/trunk/test/ELF/relocation-past-merge-end.s
    lld/trunk/test/ELF/relocation-undefined-weak.s
    lld/trunk/test/ELF/relocation.s
    lld/trunk/test/ELF/resolution.s
    lld/trunk/test/ELF/section-align-0.test
    lld/trunk/test/ELF/section-layout.s
    lld/trunk/test/ELF/section-name.s
    lld/trunk/test/ELF/section-symbol.s
    lld/trunk/test/ELF/shared-be.s
    lld/trunk/test/ELF/shared.s
    lld/trunk/test/ELF/soname.s
    lld/trunk/test/ELF/soname2.s
    lld/trunk/test/ELF/startstop-shared.s
    lld/trunk/test/ELF/startstop.s
    lld/trunk/test/ELF/string-table.s
    lld/trunk/test/ELF/strip-all.s
    lld/trunk/test/ELF/symbols.s
    lld/trunk/test/ELF/sysroot.s
    lld/trunk/test/ELF/tls-align.s
    lld/trunk/test/ELF/tls-dynamic.s
    lld/trunk/test/ELF/tls-error.s
    lld/trunk/test/ELF/tls-got.s
    lld/trunk/test/ELF/tls-mismatch.s
    lld/trunk/test/ELF/tls-static.s
    lld/trunk/test/ELF/tls.s
    lld/trunk/test/ELF/undef-start.s
    lld/trunk/test/ELF/undef.s
    lld/trunk/test/ELF/undefined-opt.s
    lld/trunk/test/ELF/visibility.s
    lld/trunk/test/ELF/whole-archive.s
    lld/trunk/test/ELF/writable-merge.s
    lld/trunk/test/ELF/x86-64-reloc-32-error.s
    lld/trunk/test/ELF/x86-64-reloc-32S-error.s
    lld/trunk/tools/lld/CMakeLists.txt

Modified: lld/trunk/lib/Driver/UniversalDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/UniversalDriver.cpp?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/lib/Driver/UniversalDriver.cpp (original)
+++ lld/trunk/lib/Driver/UniversalDriver.cpp Wed Nov 18 00:11:01 2015
@@ -86,7 +86,7 @@ static Flavor strToFlavor(StringRef str)
   return llvm::StringSwitch<Flavor>(str)
       .Case("old-gnu", Flavor::old_gnu_ld)
       .Case("gnu", Flavor::gnu_ld)
-      .Case("ld.lld2", Flavor::gnu_ld)
+      .Case("ld.lld", Flavor::gnu_ld)
       .Case("link", Flavor::win_link)
       .Case("lld-link", Flavor::win_link)
       .Case("darwin", Flavor::darwin_ld)

Modified: lld/trunk/test/ELF/aarch64-abs16-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-abs16-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-abs16-error.s (original)
+++ lld/trunk/test/ELF/aarch64-abs16-error.s Wed Nov 18 00:11:01 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 ld.lld -shared %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: aarch64
 
 .hword sym+65539

Modified: lld/trunk/test/ELF/aarch64-abs32-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-abs32-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-abs32-error.s (original)
+++ lld/trunk/test/ELF/aarch64-abs32-error.s Wed Nov 18 00:11:01 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 ld.lld -shared %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: aarch64
 
 .word sym+99999999999

Modified: lld/trunk/test/ELF/aarch64-call26-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-call26-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-call26-error.s (original)
+++ lld/trunk/test/ELF/aarch64-call26-error.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-freebsd %S/Inputs/abs.s -o %tabs
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-freebsd %s -o %t
-// RUN: not ld.lld2 %t %tabs -o %t2 2>&1 | FileCheck %s
+// RUN: not ld.lld %t %tabs -o %t2 2>&1 | FileCheck %s
 // REQUIRES: aarch64
 
 .text

Modified: lld/trunk/test/ELF/aarch64-data-relocs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-data-relocs.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-data-relocs.s (original)
+++ lld/trunk/test/ELF/aarch64-data-relocs.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t
-// RUN: ld.lld2 -shared %t -o %t2
+// RUN: ld.lld -shared %t -o %t2
 // RUN: llvm-objdump -d %t2 | FileCheck %s
 // REQUIRES: aarch64
 

Modified: lld/trunk/test/ELF/aarch64-hi21-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-hi21-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-hi21-error.s (original)
+++ lld/trunk/test/ELF/aarch64-hi21-error.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-freebsd %S/Inputs/abs.s -o %tabs
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-freebsd %s -o %t
-// RUN: not ld.lld2 %tabs -shared %t -o %t2 2>&1 | FileCheck %s
+// RUN: not ld.lld %tabs -shared %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: aarch64
 
 adrp x0, big

Modified: lld/trunk/test/ELF/aarch64-jump26-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-jump26-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-jump26-error.s (original)
+++ lld/trunk/test/ELF/aarch64-jump26-error.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-freebsd %S/Inputs/abs.s -o %tabs
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-freebsd %s -o %t
-// RUN: not ld.lld2 %t %tabs -o %t2 2>&1 | FileCheck %s
+// RUN: not ld.lld %t %tabs -o %t2 2>&1 | FileCheck %s
 // REQUIRES: aarch64
 
 .text

Modified: lld/trunk/test/ELF/aarch64-lo21-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-lo21-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-lo21-error.s (original)
+++ lld/trunk/test/ELF/aarch64-lo21-error.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-freebsd %S/Inputs/abs.s -o %tabs
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-freebsd %s -o %t
-// RUN: not ld.lld2 %tabs -shared %t -o %t2 2>&1 | FileCheck %s
+// RUN: not ld.lld %tabs -shared %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: aarch64
 
 adr x0, big

Modified: lld/trunk/test/ELF/aarch64-prel16-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-prel16-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-prel16-error.s (original)
+++ lld/trunk/test/ELF/aarch64-prel16-error.s Wed Nov 18 00:11:01 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 ld.lld -shared %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: aarch64
 
 .hword sym + 65539 - .

Modified: lld/trunk/test/ELF/aarch64-prel32-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-prel32-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-prel32-error.s (original)
+++ lld/trunk/test/ELF/aarch64-prel32-error.s Wed Nov 18 00:11:01 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 ld.lld -shared %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: aarch64
 
 .word sym + 99999999999 - .

Modified: lld/trunk/test/ELF/aarch64-relocs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-relocs.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-relocs.s (original)
+++ lld/trunk/test/ELF/aarch64-relocs.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %t
-# RUN: ld.lld2 %t -o %t2
+# RUN: ld.lld %t -o %t2
 # RUN: llvm-objdump -d %t2 | FileCheck %s
 # REQUIRES: aarch64
 

Modified: lld/trunk/test/ELF/allow-multiple-definition.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/allow-multiple-definition.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/allow-multiple-definition.s (original)
+++ lld/trunk/test/ELF/allow-multiple-definition.s Wed Nov 18 00:11:01 2015
@@ -2,9 +2,9 @@
 
 # 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: ld.lld2 --allow-multiple-definition %t1 %t2 -o %t3
-# RUN: ld.lld2 --allow-multiple-definition %t2 %t1 -o %t4
+# RUN: not ld.lld %t1 %t2 -o %t3
+# RUN: ld.lld --allow-multiple-definition %t1 %t2 -o %t3
+# RUN: ld.lld --allow-multiple-definition %t2 %t1 -o %t4
 # RUN: llvm-objdump -d %t3 | FileCheck %s
 # RUN: llvm-objdump -d %t4 | FileCheck -check-prefix=REVERT %s
 

Modified: lld/trunk/test/ELF/allow-shlib-undefined.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/allow-shlib-undefined.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/allow-shlib-undefined.s (original)
+++ lld/trunk/test/ELF/allow-shlib-undefined.s Wed Nov 18 00:11:01 2015
@@ -3,22 +3,22 @@
 # --allow-shlib-undefined is set by default
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
 # RUN: %p/Inputs/allow-shlib-undefined.s -o %t
-# RUN: ld.lld2 -shared %t -o %t.so
+# RUN: ld.lld -shared %t -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 
 # Executable: should link with DSO containing undefined symbols in any case.
-# RUN: ld.lld2 %t1 %t.so -o %t2
-# RUN: ld.lld2 --no-allow-shlib-undefined %t1 %t.so -o %t2
-# RUN: ld.lld2 --allow-shlib-undefined %t1 %t.so -o %t2
+# RUN: ld.lld %t1 %t.so -o %t2
+# RUN: ld.lld --no-allow-shlib-undefined %t1 %t.so -o %t2
+# RUN: ld.lld --allow-shlib-undefined %t1 %t.so -o %t2
 
 # DSO with undefines:
 # should link with or without any of these options.
-# RUN: ld.lld2 -shared %t -o %t.so
-# RUN: ld.lld2 -shared --allow-shlib-undefined %t -o %t.so
-# RUN: ld.lld2 -shared --no-allow-shlib-undefined %t -o %t.so
+# RUN: ld.lld -shared %t -o %t.so
+# RUN: ld.lld -shared --allow-shlib-undefined %t -o %t.so
+# RUN: ld.lld -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 ld.lld %t -o %t.so
 
 .globl _start
 _start:

Modified: lld/trunk/test/ELF/archive.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/archive.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/archive.s (original)
+++ lld/trunk/test/ELF/archive.s Wed Nov 18 00:11:01 2015
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/archive3.s -o %t4
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/archive4.s -o %t5
 # RUN: llvm-ar rcs %tar %t2 %t3 %t4
-# RUN: ld.lld2 %t %tar %t5 -o %tout
+# RUN: ld.lld %t %tar %t5 -o %tout
 # RUN: llvm-nm %tout | FileCheck %s
 # REQUIRES: x86
 
@@ -27,7 +27,7 @@
 
 # Test that the hitting the first object file after having a lazy symbol for
 # _start is handled correctly.
-# RUN: ld.lld2 %tar %t -o %tout
+# RUN: ld.lld %tar %t -o %tout
 # RUN: llvm-nm %tout | FileCheck --check-prefix=AR-FIRST %s
 
 # AR-FIRST:      T _start

Modified: lld/trunk/test/ELF/as-needed.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/as-needed.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/as-needed.s (original)
+++ lld/trunk/test/ELF/as-needed.s Wed Nov 18 00:11:01 2015
@@ -3,29 +3,29 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared2.s -o %t3.o
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared3.s -o %t4.o
-// RUN: ld.lld2 -shared %t2.o -soname shared1 -o %t2.so
-// RUN: ld.lld2 -shared %t3.o -soname shared2 -o %t3.so
-// RUN: ld.lld2 -shared %t4.o -soname shared3 -o %t4.so
+// RUN: ld.lld -shared %t2.o -soname shared1 -o %t2.so
+// RUN: ld.lld -shared %t3.o -soname shared2 -o %t3.so
+// RUN: ld.lld -shared %t4.o -soname shared3 -o %t4.so
 
 /// Check if --as-needed actually works.
 
-// RUN: ld.lld2 %t.o %t2.so %t3.so %t4.so -o %t2
+// RUN: ld.lld %t.o %t2.so %t3.so %t4.so -o %t2
 // RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
 
-// RUN: ld.lld2 --as-needed %t.o %t2.so %t3.so %t4.so -o %t2
+// RUN: ld.lld --as-needed %t.o %t2.so %t3.so %t4.so -o %t2
 // RUN: llvm-readobj -dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
 
-// RUN: ld.lld2 --as-needed %t.o %t2.so --no-as-needed %t3.so %t4.so -o %t2
+// RUN: ld.lld --as-needed %t.o %t2.so --no-as-needed %t3.so %t4.so -o %t2
 // RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
 
 /// GROUP directive is the same as --as-needed.
 
 // RUN: echo "GROUP(" %t2.so %t3.so %t4.so ")" > %t.script
-// RUN: ld.lld2 %t.o %t.script -o %t2
+// RUN: ld.lld %t.o %t.script -o %t2
 // RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
 
 // RUN: echo "GROUP(AS_NEEDED(" %t2.so %t3.so %t4.so "))" > %t.script
-// RUN: ld.lld2 %t.o %t.script -o %t2
+// RUN: ld.lld %t.o %t.script -o %t2
 // RUN: llvm-readobj -dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
 
 // CHECK: NEEDED SharedLibrary (shared1)

Modified: lld/trunk/test/ELF/basic-aarch64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic-aarch64.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic-aarch64.s (original)
+++ lld/trunk/test/ELF/basic-aarch64.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %t
-# RUN: ld.lld2 %t -o %t2
+# RUN: ld.lld %t -o %t2
 # RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
 # RUN:   | FileCheck %s
 # REQUIRES: aarch64

Modified: lld/trunk/test/ELF/basic-freebsd.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic-freebsd.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic-freebsd.s (original)
+++ lld/trunk/test/ELF/basic-freebsd.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 # Verify that OSABI is set to the correct value.
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %t
-# RUN: ld.lld2 %t -o %t2
+# RUN: ld.lld %t -o %t2
 # RUN: llvm-readobj -file-headers %t2 | FileCheck %s
 # REQUIRES: x86
 

Modified: lld/trunk/test/ELF/basic-mips.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic-mips.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic-mips.s (original)
+++ lld/trunk/test/ELF/basic-mips.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t.o
-# RUN: ld.lld2 %t.o -o %t.exe
+# RUN: ld.lld %t.o -o %t.exe
 # RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t.exe \
 # RUN:   | FileCheck %s
 

Modified: lld/trunk/test/ELF/basic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic.s (original)
+++ lld/trunk/test/ELF/basic.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld2 %t -o %t2
+# RUN: ld.lld %t -o %t2
 # RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
 # RUN:   | FileCheck %s
 
@@ -186,31 +186,31 @@ _start:
 
 # Test for the response file
 # RUN: echo " -o %t2" > %t.responsefile
-# RUN: ld.lld2 %t @%t.responsefile
+# RUN: ld.lld %t @%t.responsefile
 # 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 ld.lld %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 ld.lld -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 ld.lld %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 ld.lld %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 ld.lld --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 ld.lld %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 ld.lld %t -o %t -m wrong_emul 2>&1 | FileCheck --check-prefix=UNKNOWN_EMUL %s
 # UNKNOWN_EMUL: Unknown emulation: wrong_emul

Modified: lld/trunk/test/ELF/basic32.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic32.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic32.s (original)
+++ lld/trunk/test/ELF/basic32.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t
-# RUN: ld.lld2 %t -o %t2
+# RUN: ld.lld %t -o %t2
 # RUN: llvm-readobj -file-headers -sections -program-headers %t2 | FileCheck %s
 # REQUIRES: x86
 

Modified: lld/trunk/test/ELF/basic64be.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic64be.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic64be.s (original)
+++ lld/trunk/test/ELF/basic64be.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
-# RUN: ld.lld2 -discard-all %t -o %t2
+# RUN: ld.lld -discard-all %t -o %t2
 # RUN: llvm-readobj -file-headers -sections -section-data -program-headers %t2 | FileCheck %s
 # REQUIRES: ppc
 

Modified: lld/trunk/test/ELF/bss.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/bss.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/bss.s (original)
+++ lld/trunk/test/ELF/bss.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: ld.lld2 %t -o %t2
+// RUN: ld.lld %t -o %t2
 // RUN: llvm-readobj -sections %t2 | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/comdat.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/comdat.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/comdat.s (original)
+++ lld/trunk/test/ELF/comdat.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/comdat.s -o %t2.o
-// RUN: ld.lld2 -shared %t.o %t.o %t2.o -o %t
+// RUN: ld.lld -shared %t.o %t.o %t2.o -o %t
 // RUN: llvm-objdump -d %t | FileCheck %s
 // RUN: llvm-readobj -s -t %t | FileCheck --check-prefix=READ %s
 // REQUIRES: x86

Modified: lld/trunk/test/ELF/common.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/common.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/common.s (original)
+++ lld/trunk/test/ELF/common.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/common.s -o %t2
-// RUN: ld.lld2 %t %t2 -o %t3
+// RUN: ld.lld %t %t2 -o %t3
 // RUN: llvm-readobj -t -s %t3 | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/default-output.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/default-output.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/default-output.s (original)
+++ lld/trunk/test/ELF/default-output.s Wed Nov 18 00:11:01 2015
@@ -6,7 +6,7 @@
 # RUN: cd %t.dir
 # RUN: rm -f a.out
 # RUN: not llvm-readobj a.out > /dev/null 2>&1
-# RUN: ld.lld2 %t
+# RUN: ld.lld %t
 # RUN: llvm-readobj a.out > /dev/null 2>&1
 
 .globl _start;

Modified: lld/trunk/test/ELF/discard-locals.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/discard-locals.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/discard-locals.s (original)
+++ lld/trunk/test/ELF/discard-locals.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux -save-temp-labels %s -o %t
-// RUN: ld.lld2 -discard-locals %t -o %t2
+// RUN: ld.lld -discard-locals %t -o %t2
 // RUN: llvm-readobj -s -sd -t %t2 | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/discard-none.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/discard-none.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/discard-none.s (original)
+++ lld/trunk/test/ELF/discard-none.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux -save-temp-labels %s -o %t
-// RUN: ld.lld2 -discard-none -shared %t -o %t2
+// RUN: ld.lld -discard-none -shared %t -o %t2
 // RUN: llvm-readobj -s -sd -t %t2 | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/dt_flags.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dt_flags.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/dt_flags.s (original)
+++ lld/trunk/test/ELF/dt_flags.s Wed Nov 18 00:11:01 2015
@@ -1,9 +1,9 @@
 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld2 -shared %t -o %t.so
-# RUN: ld.lld2 -z now -z nodelete -z origin -Bsymbolic %t %t.so -o %t1
-# RUN: ld.lld2 %t %t.so -o %t2
+# RUN: ld.lld -shared %t -o %t.so
+# RUN: ld.lld -z now -z nodelete -z origin -Bsymbolic %t %t.so -o %t1
+# RUN: ld.lld %t %t.so -o %t2
 # RUN: llvm-readobj -dynamic-table %t1 | FileCheck -check-prefix=FLAGS %s
 # RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
 

Modified: lld/trunk/test/ELF/dynamic-reloc-index.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynamic-reloc-index.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynamic-reloc-index.s (original)
+++ lld/trunk/test/ELF/dynamic-reloc-index.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 %t.o %t2.so -o %t
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld %t.o %t2.so -o %t
 // RUN: llvm-readobj -r %t | FileCheck %s
 
 // We used to record the wrong symbol index for this test

Modified: lld/trunk/test/ELF/dynamic-reloc-weak.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynamic-reloc-weak.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynamic-reloc-weak.s (original)
+++ lld/trunk/test/ELF/dynamic-reloc-weak.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 %t.o %t2.so -o %t
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld %t.o %t2.so -o %t
 // RUN: llvm-readobj -r  %t | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/dynamic-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynamic-reloc.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynamic-reloc.s (original)
+++ lld/trunk/test/ELF/dynamic-reloc.s Wed Nov 18 00:11:01 2015
@@ -1,8 +1,8 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/dynamic-reloc.s -o %t3.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 %t.o %t3.o %t2.so -o %t
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld %t.o %t3.o %t2.so -o %t
 // RUN: llvm-readobj -dynamic-table -r --expand-relocs -s %t | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/eh-frame-merge.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-merge.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-merge.s (original)
+++ lld/trunk/test/ELF/eh-frame-merge.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: ld.lld2 %t.o %t.o -o %t -shared
+// RUN: ld.lld %t.o %t.o -o %t -shared
 // RUN: llvm-readobj -s -section-data %t | FileCheck %s
 
         .section	foo,"ax", at progbits

Modified: lld/trunk/test/ELF/eh-frame-plt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-plt.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-plt.s (original)
+++ lld/trunk/test/ELF/eh-frame-plt.s Wed Nov 18 00:11:01 2015
@@ -1,8 +1,8 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/shared.s -o %t.o
-// RUN: ld.lld2 %t.o -o %t.so -shared
+// RUN: ld.lld %t.o -o %t.so -shared
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t2.o
-// RUN: ld.lld2 %t2.o %t.so -o %t
+// RUN: ld.lld %t2.o %t.so -o %t
 // RUN: llvm-readobj -r %t | FileCheck %s
 
 	.globl	_start

Modified: lld/trunk/test/ELF/eh-frame-type.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-type.test?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-type.test (original)
+++ lld/trunk/test/ELF/eh-frame-type.test Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: yaml2obj -format elf %s -o %t.o
-# RUN: ld.lld2 %t.o -o %t -shared
+# RUN: ld.lld %t.o -o %t -shared
 # RUN: llvm-readobj -s %t | FileCheck %s
 
 # CHECK:      Name: .eh_frame

Modified: lld/trunk/test/ELF/empty-archive.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/empty-archive.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/empty-archive.s (original)
+++ lld/trunk/test/ELF/empty-archive.s Wed Nov 18 00:11:01 2015
@@ -1,3 +1,3 @@
 // RUN: llvm-ar rc %t.a
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: ld.lld2 -shared %t.o %t.a -o t
+// RUN: ld.lld -shared %t.o %t.a -o t

Modified: lld/trunk/test/ELF/emulation.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emulation.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/emulation.s (original)
+++ lld/trunk/test/ELF/emulation.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %tx64
-# RUN: ld.lld2 -m elf_x86_64 %tx64 -o %t2x64
+# RUN: ld.lld -m elf_x86_64 %tx64 -o %t2x64
 # RUN: llvm-readobj -file-headers %t2x64 | FileCheck --check-prefix=X86-64 %s
-# RUN: ld.lld2 %tx64 -o %t3x64
+# RUN: ld.lld %tx64 -o %t3x64
 # RUN: llvm-readobj -file-headers %t3x64 | FileCheck --check-prefix=X86-64 %s
 # X86-64:      ElfHeader {
 # X86-64-NEXT:   Ident {
@@ -30,9 +30,9 @@
 # X86-64-NEXT: }
 
 # RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %tx86
-# RUN: ld.lld2 -m elf_i386 %tx86 -o %t2x86
+# RUN: ld.lld -m elf_i386 %tx86 -o %t2x86
 # RUN: llvm-readobj -file-headers %t2x86 | FileCheck --check-prefix=X86 %s
-# RUN: ld.lld2 %tx86 -o %t3x86
+# RUN: ld.lld %tx86 -o %t3x86
 # RUN: llvm-readobj -file-headers %t3x86 | FileCheck --check-prefix=X86 %s
 # X86:      ElfHeader {
 # X86-NEXT:   Ident {
@@ -61,9 +61,9 @@
 # X86-NEXT: }
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %tppc64
-# RUN: ld.lld2 -m elf64ppc %tppc64 -o %t2ppc64
+# RUN: ld.lld -m elf64ppc %tppc64 -o %t2ppc64
 # RUN: llvm-readobj -file-headers %t2ppc64 | FileCheck --check-prefix=PPC64 %s
-# RUN: ld.lld2 %tppc64 -o %t3ppc64
+# RUN: ld.lld %tppc64 -o %t3ppc64
 # RUN: llvm-readobj -file-headers %t3ppc64 | FileCheck --check-prefix=PPC64 %s
 # PPC64:      ElfHeader {
 # PPC64-NEXT:   Ident {
@@ -92,9 +92,9 @@
 # PPC64-NEXT: }
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %tmips
-# RUN: ld.lld2 -m elf32btsmip -e _start %tmips -o %t2mips
+# RUN: ld.lld -m elf32btsmip -e _start %tmips -o %t2mips
 # RUN: llvm-readobj -file-headers %t2mips | FileCheck --check-prefix=MIPS %s
-# RUN: ld.lld2 %tmips -e _start -o %t3mips
+# RUN: ld.lld %tmips -e _start -o %t3mips
 # RUN: llvm-readobj -file-headers %t3mips | FileCheck --check-prefix=MIPS %s
 # MIPS:      ElfHeader {
 # MIPS-NEXT:   Ident {
@@ -116,11 +116,11 @@
 # MIPS-NEXT:   ]
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %tmipsel
-# RUN: ld.lld2 -m elf32ltsmip -e _start %tmipsel -o %t2mipsel
+# RUN: ld.lld -m elf32ltsmip -e _start %tmipsel -o %t2mipsel
 # RUN: llvm-readobj -file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s
-# RUN: ld.lld2 -melf32ltsmip -e _start %tmipsel -o %t2mipsel
+# RUN: ld.lld -melf32ltsmip -e _start %tmipsel -o %t2mipsel
 # RUN: llvm-readobj -file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s
-# RUN: ld.lld2 %tmipsel -e _start -o %t3mipsel
+# RUN: ld.lld %tmipsel -e _start -o %t3mipsel
 # RUN: llvm-readobj -file-headers %t3mipsel | FileCheck --check-prefix=MIPSEL %s
 # MIPSEL:      ElfHeader {
 # MIPSEL-NEXT:   Ident {

Modified: lld/trunk/test/ELF/entry.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/entry.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/entry.s (original)
+++ lld/trunk/test/ELF/entry.s Wed Nov 18 00:11:01 2015
@@ -1,12 +1,12 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
-# RUN: not ld.lld2 %t1 -o %t2
-# RUN: ld.lld2 %t1 -o %t2 -e _end
+# RUN: not ld.lld %t1 -o %t2
+# RUN: ld.lld %t1 -o %t2 -e _end
 
-# RUN: ld.lld2 %t1 -o %t2 -e 4096
+# RUN: ld.lld %t1 -o %t2 -e 4096
 # RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=DEC %s
-# RUN: ld.lld2 %t1 -o %t2 -e 0xcafe
+# RUN: ld.lld %t1 -o %t2 -e 0xcafe
 # RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=HEX %s
-# RUN: ld.lld2 %t1 -o %t2 -e 0777
+# RUN: ld.lld %t1 -o %t2 -e 0777
 # RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=OCT %s
 
 # DEC: Entry: 0x1000

Modified: lld/trunk/test/ELF/gc-sections-eh.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-eh.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-eh.s (original)
+++ lld/trunk/test/ELF/gc-sections-eh.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld2 %t -o %t2 --gc-sections
+# RUN: ld.lld %t -o %t2 --gc-sections
 # RUN: llvm-readobj -t %t2 | FileCheck %s
 
 # CHECK-NOT: foo

Modified: lld/trunk/test/ELF/gc-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections.s (original)
+++ lld/trunk/test/ELF/gc-sections.s Wed Nov 18 00:11:01 2015
@@ -1,11 +1,11 @@
 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld2 %t -o %t2
+# RUN: ld.lld %t -o %t2
 # RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=NOGC %s
-# RUN: ld.lld2 --gc-sections %t -o %t2
+# RUN: ld.lld --gc-sections %t -o %t2
 # RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=GC1 %s
-# RUN: ld.lld2 --export-dynamic --gc-sections %t -o %t2
+# RUN: ld.lld --export-dynamic --gc-sections %t -o %t2
 # RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=GC2 %s
 
 # NOGC: Name: .eh_frame

Modified: lld/trunk/test/ELF/global_offset_table.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/global_offset_table.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/global_offset_table.s (original)
+++ lld/trunk/test/ELF/global_offset_table.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: ld.lld2 %t -o %t2
+// RUN: ld.lld %t -o %t2
 .global _start
 _start:
 .long _GLOBAL_OFFSET_TABLE_

Modified: lld/trunk/test/ELF/gnu-hash-table.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-hash-table.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-hash-table.s (original)
+++ lld/trunk/test/ELF/gnu-hash-table.s Wed Nov 18 00:11:01 2015
@@ -6,10 +6,10 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux    %s    -o %t-x86_64.o
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-pc-linux %s    -o %t-ppc64.o
 
-# RUN: ld.lld2 -shared --hash-style=gnu  -o %te-i386.so  %te-i386.o
-# RUN: ld.lld2 -shared  -hash-style=gnu  -o %t-i386.so   %t-i386.o
-# RUN: ld.lld2 -shared  -hash-style=gnu  -o %t-x86_64.so %t-x86_64.o
-# RUN: ld.lld2 -shared --hash-style both -o %t-ppc64.so  %t-ppc64.o
+# RUN: ld.lld -shared --hash-style=gnu  -o %te-i386.so  %te-i386.o
+# RUN: ld.lld -shared  -hash-style=gnu  -o %t-i386.so   %t-i386.o
+# RUN: ld.lld -shared  -hash-style=gnu  -o %t-x86_64.so %t-x86_64.o
+# RUN: ld.lld -shared --hash-style both -o %t-ppc64.so  %t-ppc64.o
 
 # RUN: llvm-readobj -dyn-symbols -gnu-hash-table %te-i386.so \
 # RUN:   | FileCheck %s -check-prefix=EMPTY

Modified: lld/trunk/test/ELF/gnu-unique.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-unique.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-unique.s (original)
+++ lld/trunk/test/ELF/gnu-unique.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: ld.lld2 %t -shared -o %tout.so
+// RUN: ld.lld %t -shared -o %tout.so
 // RUN: llvm-readobj -dyn-symbols %tout.so | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/gnustack.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnustack.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnustack.s (original)
+++ lld/trunk/test/ELF/gnustack.s Wed Nov 18 00:11:01 2015
@@ -1,8 +1,8 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
-# RUN: ld.lld2 %t1 -z execstack -o %t
+# RUN: ld.lld %t1 -z execstack -o %t
 # RUN: llvm-readobj --program-headers -s %t | FileCheck --check-prefix=CHECK_RWX %s
-# RUN: ld.lld2 %t1 -o %t
+# RUN: ld.lld %t1 -o %t
 # RUN: llvm-readobj --program-headers -s %t | FileCheck --check-prefix=CHECK_RW %s
 
 # CHECK_RW:       Sections [

Modified: lld/trunk/test/ELF/got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/got.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/got.s (original)
+++ lld/trunk/test/ELF/got.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 %t.o %t2.so -o %t
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld %t.o %t2.so -o %t
 // RUN: llvm-readobj -s -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 // REQUIRES: x86

Modified: lld/trunk/test/ELF/incompatible-ar-first.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/incompatible-ar-first.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/incompatible-ar-first.s (original)
+++ lld/trunk/test/ELF/incompatible-ar-first.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/archive.s -o %ta.o
 // RUN: llvm-ar rc %t.a %ta.o
 // RUN: llvm-mc -filetype=obj -triple=i686-linux %s -o %tb.o
-// RUN: not ld.lld2 %t.a %tb.o 2>&1 | FileCheck %s
+// RUN: not ld.lld %t.a %tb.o 2>&1 | FileCheck %s
 
 // We used to crash when
 // * The first object seen by the symbol table is from an archive.

Modified: lld/trunk/test/ELF/incompatible.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/incompatible.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/incompatible.s (original)
+++ lld/trunk/test/ELF/incompatible.s Wed Nov 18 00:11:01 2015
@@ -1,45 +1,45 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %ta.o
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %tb.o
-// RUN: ld.lld2 -shared %tb.o -o %ti686.so
+// RUN: ld.lld -shared %tb.o -o %ti686.so
 // RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %tc.o
 
-// RUN: not ld.lld2 %ta.o %tb.o -o %t 2>&1 | \
+// RUN: not ld.lld %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 ld.lld %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 ld.lld %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 ld.lld %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 ld.lld %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 ld.lld -m elf64ppc %ta.o -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=A-ONLY %s
 // A-ONLY: a.o is incompatible with elf64ppc
 
-// RUN: not ld.lld2 -m elf64ppc %tb.o -o %t 2>&1 | \
+// RUN: not ld.lld -m elf64ppc %tb.o -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=B-ONLY %s
 // B-ONLY: b.o is incompatible with elf64ppc
 
-// RUN: not ld.lld2 -m elf64ppc %tc.o -o %t 2>&1 | \
+// RUN: not ld.lld -m elf64ppc %tc.o -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=C-ONLY %s
 // C-ONLY: c.o is incompatible with elf64ppc
 
-// RUN: not ld.lld2 -m elf_i386 %tc.o %ti686.so -o %t 2>&1 | \
+// RUN: not ld.lld -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 elf_i386
 
-// RUN: not ld.lld2 -m elf_i386 %ti686.so %tc.o -o %t 2>&1 | \
+// RUN: not ld.lld -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 elf_i386
 
@@ -49,7 +49,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/archive2.s -o %ta.o
 // RUN: llvm-ar rc %t.a %ta.o
 // RUN: llvm-mc -filetype=obj -triple=i686-linux %s -o %tb.o
-// RUN: not ld.lld2 %t.a %tb.o 2>&1 | FileCheck --check-prefix=ARCHIVE %s
+// RUN: not ld.lld %t.a %tb.o 2>&1 | FileCheck --check-prefix=ARCHIVE %s
 // ARCHIVE: a.o is incompatible with {{.*}}b.o
 .global _start
 _start:

Modified: lld/trunk/test/ELF/init-fini.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/init-fini.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/init-fini.s (original)
+++ lld/trunk/test/ELF/init-fini.s Wed Nov 18 00:11:01 2015
@@ -2,30 +2,30 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 
 // Should use "_init" and "_fini" by default when fills dynamic table
-// RUN: ld.lld2 -shared %t -o %t2
+// RUN: ld.lld -shared %t -o %t2
 // RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=BYDEF %s
 // BYDEF: INIT 0x11010
 // BYDEF: FINI 0x11020
 
 // -init and -fini override symbols to use
-// RUN: ld.lld2 -shared %t -o %t2 -init _foo -fini _bar
+// RUN: ld.lld -shared %t -o %t2 -init _foo -fini _bar
 // RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=OVR %s
 // OVR: INIT 0x11030
 // OVR: FINI 0x11040
 
 // Check aliases as well
-// RUN: ld.lld2 -shared %t -o %t2 -init=_foo -fini=_bar
+// RUN: ld.lld -shared %t -o %t2 -init=_foo -fini=_bar
 // RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=OVR %s
 
 // Should add a dynamic table entry even if a given symbol stay undefined
-// RUN: ld.lld2 -shared %t -o %t2 -init=_undef -fini=_undef
+// RUN: ld.lld -shared %t -o %t2 -init=_undef -fini=_undef
 // RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=UNDEF %s
 // UNDEF: INIT 0x0
 // UNDEF: FINI 0x0
 
 // Should not add new entries to the symbol table
 // and should not require given symbols to be resolved
-// RUN: ld.lld2 -shared %t -o %t2 -init=_unknown -fini=_unknown
+// RUN: ld.lld -shared %t -o %t2 -init=_unknown -fini=_unknown
 // RUN: llvm-readobj -symbols -dynamic-table %t2 | FileCheck --check-prefix=NOENTRY %s
 // NOENTRY: Symbols [
 // NOENTRY-NOT: Name: _unknown

Modified: lld/trunk/test/ELF/invalid-cie-length.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid-cie-length.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/invalid-cie-length.s (original)
+++ lld/trunk/test/ELF/invalid-cie-length.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 
 // 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 ld.lld %t -o %t2 2>&1 | FileCheck %s
 
         .section .eh_frame
         .byte 0

Modified: lld/trunk/test/ELF/invalid-cie-length2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid-cie-length2.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/invalid-cie-length2.s (original)
+++ lld/trunk/test/ELF/invalid-cie-length2.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 
 // 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 ld.lld %t -o %t2 2>&1 | FileCheck %s
 
         .section .eh_frame
         .long 42

Modified: lld/trunk/test/ELF/invalid-cie-reference.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid-cie-reference.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/invalid-cie-reference.s (original)
+++ lld/trunk/test/ELF/invalid-cie-reference.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 
 // 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 ld.lld %t -o %t2 2>&1 | FileCheck %s
 
         .section .eh_frame
         .long 0x14

Modified: lld/trunk/test/ELF/invalid-elf.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid-elf.test?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/invalid-elf.test (original)
+++ lld/trunk/test/ELF/invalid-elf.test Wed Nov 18 00:11:01 2015
@@ -1,33 +1,33 @@
 # 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 ld.lld %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 ld.lld %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 ld.lld %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 ld.lld %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 ld.lld %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 ld.lld %p/Inputs/invalid-shstrndx.so -o %t2 2>&1 | \
 # RUN:   FileCheck --check-prefix=INVALID-SECTION-INDEX %s
 
-# RUN: not ld.lld2 %p/Inputs/invalid-shentsize-zero.elf -o %t2 2>&1 | \
+# RUN: not ld.lld %p/Inputs/invalid-shentsize-zero.elf -o %t2 2>&1 | \
 # RUN:   FileCheck --check-prefix=INVALID-SHENTSIZE-ZERO %s
 # INVALID-SHENTSIZE-ZERO: SHF_MERGE section size must be a multiple of sh_entsize
 
-# RUN: not ld.lld2 %p/Inputs/invalid-multiple-eh-relocs.elf -o %t2 2>&1 | \
+# RUN: not ld.lld %p/Inputs/invalid-multiple-eh-relocs.elf -o %t2 2>&1 | \
 # RUN:   FileCheck --check-prefix=INVALID-EH-RELOCS %s
 # INVALID-EH-RELOCS: Multiple relocation sections to .eh_frame are not supported
 

Modified: lld/trunk/test/ELF/invalid-fde-rel.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid-fde-rel.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/invalid-fde-rel.s (original)
+++ lld/trunk/test/ELF/invalid-fde-rel.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 
 // 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 ld.lld %t -o %t2 2>&1 | FileCheck %s
 
         .section .eh_frame
         .long 0x14

Modified: lld/trunk/test/ELF/invalid-relocations.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid-relocations.test?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/invalid-relocations.test (original)
+++ lld/trunk/test/ELF/invalid-relocations.test Wed Nov 18 00:11:01 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 ld.lld %t -o %tout 2>&1 | FileCheck %s
 
 FileHeader:
   Class:           ELFCLASS64

Modified: lld/trunk/test/ELF/libsearch.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/libsearch.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/libsearch.s (original)
+++ lld/trunk/test/ELF/libsearch.s Wed Nov 18 00:11:01 2015
@@ -4,79 +4,79 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
 // RUN:   %p/Inputs/libsearch-st.s -o %tst.o
 // RUN: mkdir -p %t.dir
-// RUN: ld.lld2 -shared %tdyn.o -o %t.dir/libls.so
+// RUN: ld.lld -shared %tdyn.o -o %t.dir/libls.so
 // RUN: cp -f %t.dir/libls.so %t.dir/libls2.so
 // RUN: rm -f %t.dir/libls.a
 // RUN: llvm-ar rcs %t.dir/libls.a %tst.o
 // REQUIRES: x86
 
 // Should fail if no library specified
-// RUN: not ld.lld2 -l 2>&1 \
+// RUN: not ld.lld -l 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOLIBRARY %s
 // NOLIBRARY: missing arg value for "-l", expected 1 argument.
 
 // Should not link because of undefined symbol _bar
-// RUN: not ld.lld2 -o %t3 %t.o 2>&1 \
+// RUN: not ld.lld -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 ld.lld -o %t3 %t.o -lls 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOLIB %s
 // NOLIB: Unable to find library -lls
 
 // Should use explicitly specified static library
 // Also ensure that we accept -L <arg>
-// RUN: ld.lld2 -o %t3 %t.o -L %t.dir -l:libls.a
+// RUN: ld.lld -o %t3 %t.o -L %t.dir -l:libls.a
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=STATIC %s
 // STATIC: Symbols [
 // STATIC: Name: _static
 // STATIC: ]
 
 // Should use explicitly specified dynamic library
-// RUN: ld.lld2 -o %t3 %t.o -L%t.dir -l:libls.so
+// RUN: ld.lld -o %t3 %t.o -L%t.dir -l:libls.so
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=DYNAMIC %s
 // DYNAMIC: Symbols [
 // DYNAMIC-NOT: Name: _static
 // DYNAMIC: ]
 
 // Should prefer dynamic to static
-// RUN: ld.lld2 -o %t3 %t.o -L%t.dir -lls
+// RUN: ld.lld -o %t3 %t.o -L%t.dir -lls
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=DYNAMIC %s
 
 // -L can be placed after -l
-// RUN: ld.lld2 -o %t3 %t.o -lls -L%t.dir
+// RUN: ld.lld -o %t3 %t.o -lls -L%t.dir
 
 // Check long forms as well
-// RUN: ld.lld2 -o %t3 %t.o --library-path=%t.dir --library=ls
+// RUN: ld.lld -o %t3 %t.o --library-path=%t.dir --library=ls
 
 // Should not search for dynamic libraries if -Bstatic is specified
-// RUN: ld.lld2 -o %t3 %t.o -L%t.dir -Bstatic -lls
+// RUN: ld.lld -o %t3 %t.o -L%t.dir -Bstatic -lls
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=STATIC %s
-// RUN: not ld.lld2 -o %t3 %t.o -L%t.dir -Bstatic -lls2 2>&1 \
+// RUN: not ld.lld -o %t3 %t.o -L%t.dir -Bstatic -lls2 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOLIB2 %s
 // NOLIB2: Unable to find library -lls2
 
 // -Bdynamic should restore default behaviour
-// RUN: ld.lld2 -o %t3 %t.o -L%t.dir -Bstatic -Bdynamic -lls
+// RUN: ld.lld -o %t3 %t.o -L%t.dir -Bstatic -Bdynamic -lls
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=DYNAMIC %s
 
 // -Bstatic and -Bdynamic should affect only libraries which follow them
-// RUN: ld.lld2 -o %t3 %t.o -L%t.dir -lls -Bstatic -Bdynamic
+// RUN: ld.lld -o %t3 %t.o -L%t.dir -lls -Bstatic -Bdynamic
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=DYNAMIC %s
-// RUN: ld.lld2 -o %t3 %t.o -L%t.dir -Bstatic -lls -Bdynamic
+// RUN: ld.lld -o %t3 %t.o -L%t.dir -Bstatic -lls -Bdynamic
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=STATIC %s
 
 // Check aliases as well
-// RUN: ld.lld2 -o %t3 %t.o -L%t.dir -dn -lls
+// RUN: ld.lld -o %t3 %t.o -L%t.dir -dn -lls
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=STATIC %s
-// RUN: ld.lld2 -o %t3 %t.o -L%t.dir -non_shared -lls
+// RUN: ld.lld -o %t3 %t.o -L%t.dir -non_shared -lls
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=STATIC %s
-// RUN: ld.lld2 -o %t3 %t.o -L%t.dir -static -lls
+// RUN: ld.lld -o %t3 %t.o -L%t.dir -static -lls
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=STATIC %s
-// RUN: ld.lld2 -o %t3 %t.o -L%t.dir -Bstatic -dy -lls
+// RUN: ld.lld -o %t3 %t.o -L%t.dir -Bstatic -dy -lls
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=DYNAMIC %s
-// RUN: ld.lld2 -o %t3 %t.o -L%t.dir -Bstatic -call_shared -lls
+// RUN: ld.lld -o %t3 %t.o -L%t.dir -Bstatic -call_shared -lls
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=DYNAMIC %s
 
 .globl _start,_bar;

Modified: lld/trunk/test/ELF/linkerscript-ouputformat.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript-ouputformat.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript-ouputformat.s (original)
+++ lld/trunk/test/ELF/linkerscript-ouputformat.s Wed Nov 18 00:11:01 2015
@@ -1,10 +1,10 @@
 # REQUIRES: x86
 # RUN: echo "OUTPUT_FORMAT(x, y, z)" > %t.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %t1
-# RUN: ld.lld2 -shared -o %t2 %t1 %t.script
+# RUN: ld.lld -shared -o %t2 %t1 %t.script
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "OUTPUT_FORMAT(x, y)" > %t.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %t1
-# RUN: not ld.lld2 -shared -o %t2 %t1 %t.script
+# RUN: not ld.lld -shared -o %t2 %t1 %t.script
 # RUN: llvm-readobj %t2 > /dev/null

Modified: lld/trunk/test/ELF/linkerscript-outputarch.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript-outputarch.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript-outputarch.s (original)
+++ lld/trunk/test/ELF/linkerscript-outputarch.s Wed Nov 18 00:11:01 2015
@@ -1,10 +1,10 @@
 # REQUIRES: x86
 # RUN: echo "OUTPUT_ARCH(x)" > %t.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %t1
-# RUN: ld.lld2 -shared -o %t2 %t1 %t.script
+# RUN: ld.lld -shared -o %t2 %t1 %t.script
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "OUTPUT_ARCH(x, y)" > %t.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %t1
-# RUN: not ld.lld2 -shared -o %t2 %t1 %t.script
+# RUN: not ld.lld -shared -o %t2 %t1 %t.script
 # RUN: llvm-readobj %t2 > /dev/null

Modified: lld/trunk/test/ELF/linkerscript-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript-sections.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript-sections.s (original)
+++ lld/trunk/test/ELF/linkerscript-sections.s Wed Nov 18 00:11:01 2015
@@ -3,7 +3,7 @@
 
 # Empty SECTIONS command.
 # RUN: echo "SECTIONS {}" > %t.script
-# RUN: ld.lld2 -o %t1 --script %t.script %t
+# RUN: ld.lld -o %t1 --script %t.script %t
 # RUN: llvm-objdump -section-headers %t1 | \
 # RUN:   FileCheck -check-prefix=SEC-DEFAULT %s
 
@@ -11,7 +11,7 @@
 # RUN: echo "SECTIONS { \
 # RUN:          .text : { *(.text) } \
 # RUN:          .data : { *(.data) } }" > %t.script
-# RUN: ld.lld2 -o %t2 --script %t.script %t
+# RUN: ld.lld -o %t2 --script %t.script %t
 # RUN: llvm-objdump -section-headers %t2 | \
 # RUN:   FileCheck -check-prefix=SEC-DEFAULT %s
 
@@ -34,7 +34,7 @@
 # RUN:          .strtab : { *(.strtab) } \
 # RUN:          .data : { *(.data) } \
 # RUN:          .text : { *(.text) } }" > %t.script
-# RUN: ld.lld2 -o %t3 --script %t.script %t
+# RUN: ld.lld -o %t3 --script %t.script %t
 # RUN: llvm-objdump -section-headers %t3 | \
 # RUN:   FileCheck -check-prefix=SEC-ORDER %s
 
@@ -52,7 +52,7 @@
 # RUN: echo "SECTIONS { \
 # RUN:          .data : { *(.text) } \
 # RUN:          .text : { *(.data) } }" > %t.script
-# RUN: ld.lld2 -o %t4 --script %t.script %t
+# RUN: ld.lld -o %t4 --script %t.script %t
 # RUN: llvm-objdump -section-headers %t4 | \
 # RUN:   FileCheck -check-prefix=SEC-SWAP-NAMES %s
 
@@ -69,7 +69,7 @@
 # .shstrtab from the input object file is discarded.
 # RUN: echo "SECTIONS { \
 # RUN:          /DISCARD/ : { *(.shstrtab) } }" > %t.script
-# RUN: ld.lld2 -o %t5 --script %t.script %t
+# RUN: ld.lld -o %t5 --script %t.script %t
 # RUN: llvm-objdump -section-headers %t5 | \
 # RUN:   FileCheck -check-prefix=SEC-DISCARD %s
 
@@ -90,7 +90,7 @@
 # RUN:          .data : { *(.data) } } \
 # RUN:       SECTIONS { \
 # RUN:          .data : { *(other) } }" > %t.script
-# RUN: ld.lld2 -o %t6 --script %t.script %t
+# RUN: ld.lld -o %t6 --script %t.script %t
 # RUN: llvm-objdump -section-headers %t6 | \
 # RUN:   FileCheck -check-prefix=SEC-MULTI %s
 

Modified: lld/trunk/test/ELF/linkerscript.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript.s (original)
+++ lld/trunk/test/ELF/linkerscript.s Wed Nov 18 00:11:01 2015
@@ -7,55 +7,55 @@
 # RUN: llvm-ar rcs %t.dir/libxyz.a %t2.o
 
 # RUN: echo "EXTERN( undef undef2 )" > %t.script
-# RUN: ld.lld2 %t -o %t2 %t.script
+# RUN: ld.lld %t -o %t2 %t.script
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "GROUP(" %t ")" > %t.script
-# RUN: ld.lld2 -o %t2 %t.script
+# RUN: ld.lld -o %t2 %t.script
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "INPUT(" %t ")" > %t.script
-# RUN: ld.lld2 -o %t2 %t.script
+# RUN: ld.lld -o %t2 %t.script
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "GROUP(" %t libxyz.a ")" > %t.script
-# RUN: not ld.lld2 -o %t2 %t.script
-# RUN: ld.lld2 -o %t2 %t.script -L%t.dir
+# RUN: not ld.lld -o %t2 %t.script
+# RUN: ld.lld -o %t2 %t.script -L%t.dir
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "GROUP(" %t =libxyz.a ")" > %t.script
-# RUN: not ld.lld2 -o %t2 %t.script
-# RUN: ld.lld2 -o %t2 %t.script --sysroot=%t.dir
+# RUN: not ld.lld -o %t2 %t.script
+# RUN: ld.lld -o %t2 %t.script --sysroot=%t.dir
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "GROUP(" %t -lxyz ")" > %t.script
-# RUN: not ld.lld2 -o %t2 %t.script
-# RUN: ld.lld2 -o %t2 %t.script -L%t.dir
+# RUN: not ld.lld -o %t2 %t.script
+# RUN: ld.lld -o %t2 %t.script -L%t.dir
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "GROUP(" %t libxyz.a ")" > %t.script
-# RUN: not ld.lld2 -o %t2 %t.script
-# RUN: ld.lld2 -o %t2 %t.script -L%t.dir
+# RUN: not ld.lld -o %t2 %t.script
+# RUN: ld.lld -o %t2 %t.script -L%t.dir
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "GROUP(" %t.script2 ")" > %t.script1
 # RUN: echo "GROUP(" %t ")" > %t.script2
-# RUN: ld.lld2 -o %t2 %t.script1
+# RUN: ld.lld -o %t2 %t.script1
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "ENTRY(_label)" > %t.script
-# RUN: ld.lld2 -o %t2 %t.script %t
+# RUN: ld.lld -o %t2 %t.script %t
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "ENTRY(_wrong_label)" > %t.script
-# RUN: not ld.lld2 -o %t2 %t.script %t > %t.log 2>&1
+# RUN: not ld.lld -o %t2 %t.script %t > %t.log 2>&1
 # RUN: FileCheck -check-prefix=ERR-ENTRY %s < %t.log
 
 # ERR-ENTRY: undefined symbol: _wrong_label
 
 # -e has precedence over linker script's ENTRY.
 # RUN: echo "ENTRY(_label)" > %t.script
-# RUN: ld.lld2 -e _start -o %t2 %t.script %t
+# RUN: ld.lld -e _start -o %t2 %t.script %t
 # RUN: llvm-readobj -file-headers -symbols %t2 | \
 # RUN:   FileCheck -check-prefix=ENTRY-OVERLOAD %s
 
@@ -64,37 +64,37 @@
 # ENTRY-OVERLOAD-NEXT: Value: [[ENTRY]]
 
 # RUN: echo "OUTPUT_FORMAT(\"elf64-x86-64\") /*/*/ GROUP(" %t ")" > %t.script
-# RUN: ld.lld2 -o %t2 %t.script
+# RUN: ld.lld -o %t2 %t.script
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "GROUP(AS_NEEDED(" %t "))" > %t.script
-# RUN: ld.lld2 -o %t2 %t.script
+# RUN: ld.lld -o %t2 %t.script
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: rm -f %t.out
 # RUN: echo "OUTPUT(" %t.out ")" > %t.script
-# RUN: ld.lld2 %t.script %t
+# RUN: ld.lld %t.script %t
 # RUN: llvm-readobj %t.out > /dev/null
 
 # RUN: echo "SEARCH_DIR(/lib/foo/blah)" > %t.script
-# RUN: ld.lld2 %t.script %t
+# RUN: ld.lld %t.script %t
 # RUN: llvm-readobj %t.out > /dev/null
 
 # RUN: echo ";SEARCH_DIR(x);SEARCH_DIR(y);" > %t.script
-# RUN: ld.lld2 %t.script %t
+# RUN: ld.lld %t.script %t
 # RUN: llvm-readobj %t.out > /dev/null
 
 # RUN: echo ";" > %t.script
-# RUN: ld.lld2 %t.script %t
+# RUN: ld.lld %t.script %t
 # RUN: llvm-readobj %t.out > /dev/null
 
 # RUN: echo "INCLUDE " %t.script2 "OUTPUT(" %t.out ")" > %t.script1
 # RUN: echo "GROUP(" %t ")" > %t.script2
-# RUN: ld.lld2 %t.script1
+# RUN: ld.lld %t.script1
 # RUN: llvm-readobj %t2 > /dev/null
 
 # RUN: echo "FOO(BAR)" > %t.script
-# RUN: not ld.lld2 -o foo %t.script > %t.log 2>&1
+# RUN: not ld.lld -o foo %t.script > %t.log 2>&1
 # RUN: FileCheck -check-prefix=ERR1 %s < %t.log
 
 # ERR1: unknown directive: FOO

Modified: lld/trunk/test/ELF/linkerscript2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript2.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript2.s (original)
+++ lld/trunk/test/ELF/linkerscript2.s Wed Nov 18 00:11:01 2015
@@ -3,9 +3,9 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd \
 # RUN:   %p/Inputs/libsearch-dyn.s -o %tdyn.o
 # RUN: mkdir -p %t.dir
-# RUN: ld.lld2 -shared %tdyn.o -o %t.dir/libls.so
+# RUN: ld.lld -shared %tdyn.o -o %t.dir/libls.so
 # RUN: echo "SEARCH_DIR(" %t.dir ")" > %t.script
-# RUN: ld.lld2 -o %t2 --script %t.script -lls %t
+# RUN: ld.lld -o %t2 --script %t.script -lls %t
 
 .globl _start,_bar
 _start:

Modified: lld/trunk/test/ELF/local-dynamic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/local-dynamic.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/local-dynamic.s (original)
+++ lld/trunk/test/ELF/local-dynamic.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // Check that local symbols are not inserted into dynamic table.
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: ld.lld2 %t -shared -o %t1.so
+// RUN: ld.lld %t -shared -o %t1.so
 // RUN: llvm-readobj -t -dyn-symbols %t1.so | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/local-got-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/local-got-shared.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/local-got-shared.s (original)
+++ lld/trunk/test/ELF/local-got-shared.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
-// RUN: ld.lld2 %t.o -o %t -shared
+// RUN: ld.lld %t.o -o %t -shared
 // RUN: llvm-readobj -s -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 

Modified: lld/trunk/test/ELF/local-got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/local-got.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/local-got.s (original)
+++ lld/trunk/test/ELF/local-got.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 %t.o %t2.so -o %t
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld %t.o %t2.so -o %t
 // RUN: llvm-readobj -s -r -section-data %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 

Modified: lld/trunk/test/ELF/local.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/local.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/local.s (original)
+++ lld/trunk/test/ELF/local.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // Check that symbol table is correctly populated with local symbols.
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: ld.lld2 %t -o %t1
+// RUN: ld.lld %t -o %t1
 // RUN: llvm-readobj -t -s %t1 | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/many-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/many-sections.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/many-sections.s (original)
+++ lld/trunk/test/ELF/many-sections.s Wed Nov 18 00:11:01 2015
@@ -11,7 +11,7 @@
 // CHECK-NEXT: Section: dm (0xFF00)
 
 
-// RUN: ld.lld2 %t -o %t2
+// RUN: ld.lld %t -o %t2
 // RUN: llvm-readobj -t %t2 | FileCheck --check-prefix=LINKED %s
 
 // Test that _start is in the correct section.

Modified: lld/trunk/test/ELF/merge-invalid-size.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-invalid-size.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-invalid-size.s (original)
+++ lld/trunk/test/ELF/merge-invalid-size.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
-// RUN: not ld.lld2 %t.o -o %t.so 2>&1 | FileCheck %s
+// RUN: not ld.lld %t.o -o %t.so 2>&1 | FileCheck %s
 // CHECK: SHF_MERGE section size must be a multiple of sh_entsize
 
         .section	.foo,"aM", at progbits,4

Modified: lld/trunk/test/ELF/merge-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-shared.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-shared.s (original)
+++ lld/trunk/test/ELF/merge-shared.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: ld.lld2 %t.o -o %t.so -shared
+// RUN: ld.lld %t.o -o %t.so -shared
 // RUN: llvm-readobj -r -s %t.so | FileCheck %s
 
 	.section	foo,"aM", at progbits,4

Modified: lld/trunk/test/ELF/merge-string-align.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-string-align.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-string-align.s (original)
+++ lld/trunk/test/ELF/merge-string-align.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: ld.lld2 %t.o -o %t.so -shared
+// RUN: ld.lld %t.o -o %t.so -shared
 // RUN: llvm-readobj -s %t.so | FileCheck %s
 
         .section        .rodata.str1.16,"aMS", at progbits,1

Modified: lld/trunk/test/ELF/merge-string-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-string-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-string-error.s (original)
+++ lld/trunk/test/ELF/merge-string-error.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: not ld.lld2 %t.o -o %t.so -shared 2>&1 | FileCheck %s
+// RUN: not ld.lld %t.o -o %t.so -shared 2>&1 | FileCheck %s
 
         .section	.rodata.str1.1,"aMS", at progbits,1
 	.asciz	"abc"

Modified: lld/trunk/test/ELF/merge-string-no-null.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-string-no-null.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-string-no-null.s (original)
+++ lld/trunk/test/ELF/merge-string-no-null.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: not ld.lld2 %t.o -o %t.so -shared 2>&1 | FileCheck %s
+// RUN: not ld.lld %t.o -o %t.so -shared 2>&1 | FileCheck %s
 
 	.section	.rodata.str1.1,"aMS", at progbits,1
 	.ascii	"abc"

Modified: lld/trunk/test/ELF/merge-string.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-string.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-string.s (original)
+++ lld/trunk/test/ELF/merge-string.s Wed Nov 18 00:11:01 2015
@@ -1,8 +1,8 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: ld.lld2 -O2 %t.o -o %t.so -shared
+// RUN: ld.lld -O2 %t.o -o %t.so -shared
 // RUN: llvm-readobj -s -section-data -t %t.so | FileCheck %s
-// RUN: ld.lld2 -O1 %t.o -o %t.so -shared
+// RUN: ld.lld -O1 %t.o -o %t.so -shared
 // RUN: llvm-readobj -s -section-data -t %t.so | FileCheck --check-prefix=NOTAIL %s
 
         .section	.rodata.str1.1,"aMS", at progbits,1

Modified: lld/trunk/test/ELF/merge-sym.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-sym.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-sym.s (original)
+++ lld/trunk/test/ELF/merge-sym.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: ld.lld2 %t.o -o %t.so -shared
+// RUN: ld.lld %t.o -o %t.so -shared
 // RUN: llvm-readobj -t -s %t.so | FileCheck %s
 
         .section        .rodata.cst4,"aM", at progbits,4

Modified: lld/trunk/test/ELF/merge.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge.s (original)
+++ lld/trunk/test/ELF/merge.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/merge.s -o %t2.o
-// RUN: ld.lld2 %t.o %t2.o -o %t
+// RUN: ld.lld %t.o %t2.o -o %t
 // RUN: llvm-readobj -s -section-data -t %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 

Modified: lld/trunk/test/ELF/mips-dynamic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-dynamic.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-dynamic.s (original)
+++ lld/trunk/test/ELF/mips-dynamic.s Wed Nov 18 00:11:01 2015
@@ -2,13 +2,13 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %p/Inputs/mips-dynamic.s -o %td.o
-# RUN: ld.lld2 -shared %td.o -o %td.so
+# RUN: ld.lld -shared %td.o -o %td.so
 
-# RUN: ld.lld2 %t.o %td.so -o %t.exe
+# RUN: ld.lld %t.o %td.so -o %t.exe
 # RUN: llvm-readobj -sections -dynamic-table %t.exe \
 # RUN:   | FileCheck -check-prefix=EXE %s
 
-# RUN: ld.lld2 -shared %t.o %td.so -o %t.so
+# RUN: ld.lld -shared %t.o %td.so -o %t.so
 # RUN: llvm-readobj -sections -dyn-symbols -dynamic-table %t.so \
 # RUN:   | FileCheck -check-prefix=DSO %s
 

Modified: lld/trunk/test/ELF/mips-dynsym-sort.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-dynsym-sort.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-dynsym-sort.s (original)
+++ lld/trunk/test/ELF/mips-dynsym-sort.s Wed Nov 18 00:11:01 2015
@@ -1,11 +1,11 @@
 # Check the order of dynamic symbols for the MIPS target.
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t-be.o
-# RUN: ld.lld2 -shared %t-be.o -o %t-be.so
+# RUN: ld.lld -shared %t-be.o -o %t-be.so
 # RUN: llvm-readobj -symbols -dyn-symbols %t-be.so | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t-el.o
-# RUN: ld.lld2 -shared %t-el.o -o %t-el.so
+# RUN: ld.lld -shared %t-el.o -o %t-el.so
 # RUN: llvm-readobj -symbols -dyn-symbols %t-el.so | FileCheck %s
 
 # REQUIRES: mips

Modified: lld/trunk/test/ELF/mips-gnu-hash.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-gnu-hash.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-gnu-hash.s (original)
+++ lld/trunk/test/ELF/mips-gnu-hash.s Wed Nov 18 00:11:01 2015
@@ -1,10 +1,10 @@
 # Shouldn't allow the GNU hash style to be selected with the MIPS target.
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t-be.o
-# RUN: not ld.lld2 -shared -hash-style=gnu %t-be.o -o %t-be.so 2>&1 | FileCheck %s
+# RUN: not ld.lld -shared -hash-style=gnu %t-be.o -o %t-be.so 2>&1 | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t-el.o
-# RUN: not ld.lld2 -shared -hash-style=gnu %t-el.o -o %t-el.so 2>&1 | FileCheck %s
+# RUN: not ld.lld -shared -hash-style=gnu %t-el.o -o %t-el.so 2>&1 | FileCheck %s
 
 # CHECK: The .gnu.hash section is not compatible with the MIPS target.
 

Modified: lld/trunk/test/ELF/mips-got-relocs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-relocs.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-relocs.s (original)
+++ lld/trunk/test/ELF/mips-got-relocs.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 # Check R_MIPS_GOT16 relocation calculation.
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t-be.o
-# RUN: ld.lld2 %t-be.o -o %t-be.exe
+# RUN: ld.lld %t-be.o -o %t-be.exe
 # RUN: llvm-objdump -section-headers -t %t-be.exe | FileCheck -check-prefix=EXE_SYM %s
 # RUN: llvm-objdump -s -section=.got %t-be.exe | FileCheck -check-prefix=EXE_GOT_BE %s
 # RUN: llvm-objdump -d %t-be.exe | FileCheck -check-prefix=EXE_DIS_BE %s
@@ -9,21 +9,21 @@
 # RUN: llvm-readobj -sections %t-be.exe | FileCheck -check-prefix=SHFLAGS %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t-el.o
-# RUN: ld.lld2 %t-el.o -o %t-el.exe
+# RUN: ld.lld %t-el.o -o %t-el.exe
 # RUN: llvm-objdump -section-headers -t %t-el.exe | FileCheck -check-prefix=EXE_SYM %s
 # RUN: llvm-objdump -s -section=.got %t-el.exe | FileCheck -check-prefix=EXE_GOT_EL %s
 # RUN: llvm-objdump -d %t-el.exe | FileCheck -check-prefix=EXE_DIS_EL %s
 # RUN: llvm-readobj -relocations %t-el.exe | FileCheck -check-prefix=NORELOC %s
 # RUN: llvm-readobj -sections %t-el.exe | FileCheck -check-prefix=SHFLAGS %s
 
-# RUN: ld.lld2 -shared %t-be.o -o %t-be.so
+# RUN: ld.lld -shared %t-be.o -o %t-be.so
 # RUN: llvm-objdump -section-headers -t %t-be.so | FileCheck -check-prefix=DSO_SYM %s
 # RUN: llvm-objdump -s -section=.got %t-be.so | FileCheck -check-prefix=DSO_GOT_BE %s
 # RUN: llvm-objdump -d %t-be.so | FileCheck -check-prefix=DSO_DIS_BE %s
 # RUN: llvm-readobj -relocations %t-be.so | FileCheck -check-prefix=NORELOC %s
 # RUN: llvm-readobj -sections %t-be.so | FileCheck -check-prefix=SHFLAGS %s
 
-# RUN: ld.lld2 -shared %t-el.o -o %t-el.so
+# RUN: ld.lld -shared %t-el.o -o %t-el.so
 # RUN: llvm-objdump -section-headers -t %t-el.so | FileCheck -check-prefix=DSO_SYM %s
 # RUN: llvm-objdump -s -section=.got %t-el.so | FileCheck -check-prefix=DSO_GOT_EL %s
 # RUN: llvm-objdump -d %t-el.so | FileCheck -check-prefix=DSO_DIS_EL %s

Modified: lld/trunk/test/ELF/mips-relocs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-relocs.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-relocs.s (original)
+++ lld/trunk/test/ELF/mips-relocs.s Wed Nov 18 00:11:01 2015
@@ -1,12 +1,12 @@
 # Check R_MIPS_32 relocation calculation.
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t-be.o
-# RUN: ld.lld2 %t-be.o -o %t-be.exe
+# RUN: ld.lld %t-be.o -o %t-be.exe
 # RUN: llvm-objdump -t %t-be.exe | FileCheck %s
 # RUN: llvm-objdump -s %t-be.exe | FileCheck -check-prefix=BE %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t-el.o
-# RUN: ld.lld2 %t-el.o -o %t-el.exe
+# RUN: ld.lld %t-el.o -o %t-el.exe
 # RUN: llvm-objdump -t %t-el.exe | FileCheck %s
 # RUN: llvm-objdump -s %t-el.exe | FileCheck -check-prefix=EL %s
 

Modified: lld/trunk/test/ELF/new-dtags.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/new-dtags.test?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/new-dtags.test (original)
+++ lld/trunk/test/ELF/new-dtags.test Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: ld.lld2 %t.o -rpath=/somepath -shared --disable-new-dtags -o %t
-// RUN: ld.lld2 %t.o -rpath=/somepath -shared --enable-new-dtags -o %t2
+// RUN: ld.lld %t.o -rpath=/somepath -shared --disable-new-dtags -o %t
+// RUN: ld.lld %t.o -rpath=/somepath -shared --enable-new-dtags -o %t2
 // RUN: llvm-readobj --dynamic-table %t | FileCheck --check-prefix=DISABLE %s
 // RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=ENABLE %s
 

Modified: lld/trunk/test/ELF/no-inhibit-exec.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/no-inhibit-exec.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/no-inhibit-exec.s (original)
+++ lld/trunk/test/ELF/no-inhibit-exec.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: not ld.lld2 %t -o %t2
-# RUN: ld.lld2 %t --noinhibit-exec -o %t2
+# RUN: not ld.lld %t -o %t2
+# RUN: ld.lld %t --noinhibit-exec -o %t2
 # RUN: llvm-objdump -d %t2 | FileCheck %s
 # REQUIRES: x86
 

Modified: lld/trunk/test/ELF/no-obj.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/no-obj.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/no-obj.s (original)
+++ lld/trunk/test/ELF/no-obj.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-ar rcs %t.a %t.o
-// RUN: not ld.lld2 -o %t2 -u _start %t.a 2>&1 | FileCheck %s
+// RUN: not ld.lld -o %t2 -u _start %t.a 2>&1 | FileCheck %s
 
 // CHECK: -m or at least a .o file required
 

Modified: lld/trunk/test/ELF/no-symtab.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/no-symtab.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/no-symtab.s (original)
+++ lld/trunk/test/ELF/no-symtab.s Wed Nov 18 00:11:01 2015
@@ -1,4 +1,4 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: ld.lld2 %t.o %p/Inputs/no-symtab.o -o %t
+// RUN: ld.lld %t.o %p/Inputs/no-symtab.o -o %t
 .global _start
 _start:

Modified: lld/trunk/test/ELF/no-undefined.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/no-undefined.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/no-undefined.s (original)
+++ lld/trunk/test/ELF/no-undefined.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 # 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: ld.lld2 -shared %t -o %t1.so
+# RUN: not ld.lld --no-undefined -shared %t -o %t.so
+# RUN: ld.lld -shared %t -o %t1.so
 
 .globl _shared
 _shared:

Modified: lld/trunk/test/ELF/output-section.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/output-section.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/output-section.s (original)
+++ lld/trunk/test/ELF/output-section.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: ld.lld2 %t -o %t2
+// RUN: ld.lld %t -o %t2
 // RUN: llvm-readobj -t %t2 | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/plt-aarch64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/plt-aarch64.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/plt-aarch64.s (original)
+++ lld/trunk/test/ELF/plt-aarch64.s Wed Nov 18 00:11:01 2015
@@ -1,8 +1,8 @@
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-freebsd %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-freebsd %p/Inputs/shared.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 -shared %t.o %t2.so -o %t.so
-// RUN: ld.lld2 %t.o %t2.so -o %t.exe
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld -shared %t.o %t2.so -o %t.so
+// RUN: ld.lld %t.o %t2.so -o %t.exe
 // RUN: llvm-readobj -s -r %t.so | FileCheck --check-prefix=CHECKDSO %s
 // RUN: llvm-objdump -s -section=.got.plt %t.so | FileCheck --check-prefix=DUMPDSO %s
 // RUN: llvm-objdump -d %t.so | FileCheck --check-prefix=DISASMDSO %s

Modified: lld/trunk/test/ELF/plt-i686.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/plt-i686.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/plt-i686.s (original)
+++ lld/trunk/test/ELF/plt-i686.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 %t.o %t2.so -o %t
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld %t.o %t2.so -o %t
 // RUN: llvm-readobj -s -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 // REQUIRES: x86

Modified: lld/trunk/test/ELF/plt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/plt.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/plt.s (original)
+++ lld/trunk/test/ELF/plt.s Wed Nov 18 00:11:01 2015
@@ -1,8 +1,8 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 -shared %t.o %t2.so -o %t
-// RUN: ld.lld2 %t.o %t2.so -o %t3
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld -shared %t.o %t2.so -o %t
+// RUN: ld.lld %t.o %t2.so -o %t3
 // RUN: llvm-readobj -s -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 // RUN: llvm-readobj -s -r %t3 | FileCheck --check-prefix=CHECK2 %s

Modified: lld/trunk/test/ELF/ppc64-addr16-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64-addr16-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/ppc64-addr16-error.s (original)
+++ lld/trunk/test/ELF/ppc64-addr16-error.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
-// RUN: not ld.lld2 -shared %t -o %t2 2>&1 | FileCheck %s
+// RUN: not ld.lld -shared %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: ppc
 
 .short sym+65539

Modified: lld/trunk/test/ELF/ppc64-rel-calls.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64-rel-calls.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/ppc64-rel-calls.s (original)
+++ lld/trunk/test/ELF/ppc64-rel-calls.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
-# RUN: ld.lld2 %t -o %t2
+# RUN: ld.lld %t -o %t2
 # RUN: llvm-objdump -d %t2 | FileCheck %s
 # REQUIRES: ppc
 

Modified: lld/trunk/test/ELF/ppc64-relocs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64-relocs.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/ppc64-relocs.s (original)
+++ lld/trunk/test/ELF/ppc64-relocs.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
-# RUN: ld.lld2 %t -o %t2
+# RUN: ld.lld %t -o %t2
 # RUN: llvm-objdump -d %t2 | FileCheck %s
 # REQUIRES: ppc
 

Modified: lld/trunk/test/ELF/ppc64-shared-rel-toc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64-shared-rel-toc.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/ppc64-shared-rel-toc.s (original)
+++ lld/trunk/test/ELF/ppc64-shared-rel-toc.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-// RUN: ld.lld2 -shared %t.o -o %t.so
+// RUN: ld.lld -shared %t.o -o %t.so
 // RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
 // REQUIRES: ppc
 

Modified: lld/trunk/test/ELF/ppc64-toc-restore.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64-toc-restore.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/ppc64-toc-restore.s (original)
+++ lld/trunk/test/ELF/ppc64-toc-restore.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 %t.o %t2.so -o %t
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld %t.o %t2.so -o %t
 // RUN: llvm-objdump -d %t | FileCheck %s
 // REQUIRES: ppc
 

Modified: lld/trunk/test/ELF/ppc64-weak-undef-call-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64-weak-undef-call-shared.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/ppc64-weak-undef-call-shared.s (original)
+++ lld/trunk/test/ELF/ppc64-weak-undef-call-shared.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: ld.lld2 -shared %t.o -o %t.so
+# RUN: ld.lld -shared %t.o -o %t.so
 # RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
 # REQUIRES: ppc
 

Modified: lld/trunk/test/ELF/ppc64-weak-undef-call.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64-weak-undef-call.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/ppc64-weak-undef-call.s (original)
+++ lld/trunk/test/ELF/ppc64-weak-undef-call.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
-# RUN: ld.lld2 %t -o %t2
+# RUN: ld.lld %t -o %t2
 # RUN: llvm-objdump -d %t2 | FileCheck %s
 # REQUIRES: ppc
 

Modified: lld/trunk/test/ELF/pre_init_fini_array.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/pre_init_fini_array.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/pre_init_fini_array.s (original)
+++ lld/trunk/test/ELF/pre_init_fini_array.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2
-// RUN: ld.lld2 %t2 -o %t2.so -shared
-// RUN: ld.lld2 %t %t2.so -o %t2
+// RUN: ld.lld %t2 -o %t2.so -shared
+// RUN: ld.lld %t %t2.so -o %t2
 // RUN: llvm-readobj -r -symbols -sections -dynamic-table %t2 | FileCheck %s
 // RUN: llvm-objdump -d %t2 | FileCheck --check-prefix=DISASM %s
 // REQUIRES: x86

Modified: lld/trunk/test/ELF/pre_init_fini_array_missing.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/pre_init_fini_array_missing.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/pre_init_fini_array_missing.s (original)
+++ lld/trunk/test/ELF/pre_init_fini_array_missing.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: ld.lld2 %t -o %t2
+// RUN: ld.lld %t -o %t2
 // RUN: llvm-objdump -d %t2 | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/progname.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/progname.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/progname.s (original)
+++ lld/trunk/test/ELF/progname.s Wed Nov 18 00:11:01 2015
@@ -1,8 +1,8 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o
 // RUN: echo '.global __progname' > %t2.s
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %t2.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 -o %t %t.o %t2.so
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld -o %t %t.o %t2.so
 // RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
 
 // CHECK:      Name:     __progname@

Modified: lld/trunk/test/ELF/program-header-layout.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/program-header-layout.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/program-header-layout.s (original)
+++ lld/trunk/test/ELF/program-header-layout.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld2 %t -o %t2
+# RUN: ld.lld %t -o %t2
 # RUN: llvm-readobj -sections -program-headers %t2 | FileCheck %s
 # REQUIRES: x86
 

Modified: lld/trunk/test/ELF/relative-dynamic-reloc-ppc64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relative-dynamic-reloc-ppc64.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/relative-dynamic-reloc-ppc64.s (original)
+++ lld/trunk/test/ELF/relative-dynamic-reloc-ppc64.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-// RUN: ld.lld2 -shared %t.o -o %t.so
+// RUN: ld.lld -shared %t.o -o %t.so
 // RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
 // REQUIRES: ppc
 

Modified: lld/trunk/test/ELF/relative-dynamic-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relative-dynamic-reloc.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/relative-dynamic-reloc.s (original)
+++ lld/trunk/test/ELF/relative-dynamic-reloc.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
-// RUN: ld.lld2 -shared %t.o -o %t.so
+// RUN: ld.lld -shared %t.o -o %t.so
 // RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
 
 // Test that we create R_X86_64_RELATIVE relocations but don't put any

Modified: lld/trunk/test/ELF/relocatable.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable.s (original)
+++ lld/trunk/test/ELF/relocatable.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: not ld.lld2 -r %t -o %t2 2>&1 | FileCheck %s
+# RUN: not ld.lld -r %t -o %t2 2>&1 | FileCheck %s
 
 # CHECK: -r option is not supported. Use 'ar' command instead.
 

Modified: lld/trunk/test/ELF/relocation-absolute.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-absolute.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-absolute.s (original)
+++ lld/trunk/test/ELF/relocation-absolute.s Wed Nov 18 00:11:01 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: ld.lld2 %tabs %t -o %tout
+// RUN: ld.lld %tabs %t -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/relocation-common.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-common.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-common.s (original)
+++ lld/trunk/test/ELF/relocation-common.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: ld.lld2 %t -o %tout
+// RUN: ld.lld %t -o %tout
 // RUN: llvm-objdump -t -d %tout | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/relocation-copy.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-copy.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-copy.s (original)
+++ lld/trunk/test/ELF/relocation-copy.s Wed Nov 18 00:11:01 2015
@@ -1,8 +1,8 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/relocation-copy.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t.so
-// RUN: ld.lld2 -e main %t.o %t.so -o %t3
+// RUN: ld.lld -shared %t2.o -o %t.so
+// RUN: ld.lld -e main %t.o %t.so -o %t3
 // RUN: llvm-readobj -s -r --expand-relocs %t3 | FileCheck %s
 // RUN: llvm-objdump -d %t3 | FileCheck -check-prefix=CODE %s
 

Modified: lld/trunk/test/ELF/relocation-i686.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-i686.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-i686.s (original)
+++ lld/trunk/test/ELF/relocation-i686.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 %t %t2.so -o %t2
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld %t %t2.so -o %t2
 // RUN: llvm-readobj -s %t2 | FileCheck --check-prefix=ADDR %s
 // RUN: llvm-objdump -d %t2 | FileCheck %s
 // REQUIRES: x86

Modified: lld/trunk/test/ELF/relocation-in-merge.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-in-merge.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-in-merge.s (original)
+++ lld/trunk/test/ELF/relocation-in-merge.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
-// RUN: not ld.lld2 %t.o -o %t 2>&1 | FileCheck %s
+// RUN: not ld.lld %t.o -o %t 2>&1 | FileCheck %s
 // CHECK: Relocations pointing to SHF_MERGE are not supported
 
         .section	.foo,"aM", at progbits,4

Modified: lld/trunk/test/ELF/relocation-local.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-local.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-local.s (original)
+++ lld/trunk/test/ELF/relocation-local.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // Test that relocation of local symbols is working.
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: ld.lld2 %t -o %t2
+// RUN: ld.lld %t -o %t2
 // RUN: llvm-objdump -s -d %t2 | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/relocation-past-merge-end.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-past-merge-end.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-past-merge-end.s (original)
+++ lld/trunk/test/ELF/relocation-past-merge-end.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
-// RUN: not ld.lld2 %t.o -o %t.so -shared 2>&1 | FileCheck %s
+// RUN: not ld.lld %t.o -o %t.so -shared 2>&1 | FileCheck %s
 // CHECK: Entry is past the end of the section
 
         .long .foo + 1

Modified: lld/trunk/test/ELF/relocation-undefined-weak.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-undefined-weak.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-undefined-weak.s (original)
+++ lld/trunk/test/ELF/relocation-undefined-weak.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: ld.lld2 %t -o %tout
+// RUN: ld.lld %t -o %tout
 // RUN: llvm-readobj -sections %tout | FileCheck %s
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix DISASM
 // REQUIRES: x86

Modified: lld/trunk/test/ELF/relocation.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation.s (original)
+++ lld/trunk/test/ELF/relocation.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/shared.s -o %t2
-// RUN: ld.lld2 %t2 -o %t2.so -shared
-// RUN: ld.lld2 %t %t2.so -o %t3
+// RUN: ld.lld %t2 -o %t2.so -shared
+// RUN: ld.lld %t %t2.so -o %t3
 // RUN: llvm-readobj -s  %t3 | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -s -d %t3 | FileCheck %s
 // REQUIRES: x86

Modified: lld/trunk/test/ELF/resolution.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/resolution.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/resolution.s (original)
+++ lld/trunk/test/ELF/resolution.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/resolution.s -o %t2
-// RUN: ld.lld2 -discard-all %t %t2 -o %t3
+// RUN: ld.lld -discard-all %t %t2 -o %t3
 // RUN: llvm-readobj -t %t3 | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/section-align-0.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/section-align-0.test?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/section-align-0.test (original)
+++ lld/trunk/test/ELF/section-align-0.test Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: yaml2obj -format elf %s -o %t
-# RUN: ld.lld2 %t -o %tout
+# RUN: ld.lld %t -o %tout
 
 # Verify that lld can handle sections with an alignment of zero.
 

Modified: lld/trunk/test/ELF/section-layout.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/section-layout.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/section-layout.s (original)
+++ lld/trunk/test/ELF/section-layout.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld2 %t -o %tout
+# RUN: ld.lld %t -o %tout
 # RUN: llvm-readobj -sections %tout | FileCheck %s
 # REQUIRES: x86
 

Modified: lld/trunk/test/ELF/section-name.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/section-name.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/section-name.s (original)
+++ lld/trunk/test/ELF/section-name.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld2 %t -o %tout
+# RUN: ld.lld %t -o %tout
 # RUN: llvm-readobj -sections %tout | FileCheck %s
 # REQUIRES: x86
 

Modified: lld/trunk/test/ELF/section-symbol.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/section-symbol.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/section-symbol.s (original)
+++ lld/trunk/test/ELF/section-symbol.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: ld.lld2 %t -o %t.so -shared -discard-none
+// RUN: ld.lld %t -o %t.so -shared -discard-none
 // RUN: llvm-readobj -t %t.so | FileCheck %s
 
 // Test that we don't include the section symbols from the .o in the .so

Modified: lld/trunk/test/ELF/shared-be.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/shared-be.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/shared-be.s (original)
+++ lld/trunk/test/ELF/shared-be.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 -dynamic-linker /lib64/ld64.so.1 -rpath foo -rpath bar --export-dynamic %t.o %t2.so -o %t
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld -dynamic-linker /lib64/ld64.so.1 -rpath foo -rpath bar --export-dynamic %t.o %t2.so -o %t
 // RUN: llvm-readobj --dynamic-table -s %t | FileCheck %s
 // REQUIRES: ppc
 

Modified: lld/trunk/test/ELF/shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/shared.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/shared.s (original)
+++ lld/trunk/test/ELF/shared.s Wed Nov 18 00:11:01 2015
@@ -1,10 +1,10 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
+// RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: llvm-readobj -s %t2.so | FileCheck --check-prefix=SO %s
-// RUN: ld.lld2 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -rpath foo -rpath bar --export-dynamic %t.o %t2.so -o %t
+// RUN: ld.lld -dynamic-linker /lib64/ld-linux-x86-64.so.2 -rpath foo -rpath bar --export-dynamic %t.o %t2.so -o %t
 // RUN: llvm-readobj --program-headers --dynamic-table -t -s -dyn-symbols -section-data -hash-table %t | FileCheck %s
-// RUN: ld.lld2 %t.o %t2.so %t2.so -o %t2
+// RUN: ld.lld %t.o %t2.so %t2.so -o %t2
 // RUN: llvm-readobj -dyn-symbols %t2 | FileCheck --check-prefix=DONT_EXPORT %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/soname.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/soname.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/soname.s (original)
+++ lld/trunk/test/ELF/soname.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: ld.lld2 %t.o -shared -soname=bar -o %t.so
-// RUN: ld.lld2 %t.o -shared -soname=bar -o %t2.so
-// RUN: ld.lld2 %t.o %t.so %t2.so -o %t
+// RUN: ld.lld %t.o -shared -soname=bar -o %t.so
+// RUN: ld.lld %t.o -shared -soname=bar -o %t2.so
+// RUN: ld.lld %t.o %t.so %t2.so -o %t
 // RUN: llvm-readobj --dynamic-table %t | FileCheck %s
 
 // CHECK:  0x0000000000000001 NEEDED               SharedLibrary (bar)

Modified: lld/trunk/test/ELF/soname2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/soname2.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/soname2.s (original)
+++ lld/trunk/test/ELF/soname2.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: ld.lld2 %t.o -shared -soname=foo.so -o %t
+// RUN: ld.lld %t.o -shared -soname=foo.so -o %t
 // RUN: llvm-readobj --dynamic-table %t | FileCheck %s
 
 // CHECK: 0x000000000000000E SONAME  LibrarySoname (foo.so)

Modified: lld/trunk/test/ELF/startstop-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/startstop-shared.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/startstop-shared.s (original)
+++ lld/trunk/test/ELF/startstop-shared.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
-// RUN: ld.lld2 %t.o -o %t.so -shared
+// RUN: ld.lld %t.o -o %t.so -shared
 // RUN: llvm-readobj -r -t %t.so | FileCheck  %s
 
         .quad __start_foo

Modified: lld/trunk/test/ELF/startstop.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/startstop.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/startstop.s (original)
+++ lld/trunk/test/ELF/startstop.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: ld.lld2 %t -o %tout -shared
+// RUN: ld.lld %t -o %tout -shared
 // RUN: llvm-objdump -d %tout | FileCheck -check-prefix=DISASM %s
 // RUN: llvm-readobj -symbols -r %tout | FileCheck -check-prefix=SYMBOL %s
 

Modified: lld/trunk/test/ELF/string-table.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/string-table.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/string-table.s (original)
+++ lld/trunk/test/ELF/string-table.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: ld.lld2 %t -o %t2
+// RUN: ld.lld %t -o %t2
 // RUN: llvm-readobj -sections -section-data %t2 | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/strip-all.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/strip-all.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/strip-all.s (original)
+++ lld/trunk/test/ELF/strip-all.s Wed Nov 18 00:11:01 2015
@@ -1,20 +1,20 @@
 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
-# RUN: ld.lld2 %t.o -o %t1
+# RUN: ld.lld %t.o -o %t1
 #RUN: llvm-objdump -section-headers %t1 | FileCheck %s -check-prefix BEFORE
 #BEFORE:       .symtab
 #BEFORE-NEXT:  .shstrtab
 #BEFORE-NEXT:  .strtab
 
-#RUN: ld.lld2 %t.o --strip-all -o %t1
+#RUN: ld.lld %t.o --strip-all -o %t1
 #RUN: llvm-objdump -section-headers %t1 | FileCheck %s -check-prefix AFTER
 #AFTER-NOT: .symtab
 #AFTER:     .shstrtab
 #AFTER-NOT: .strtab
 
 # Test alias -s
-#RUN: ld.lld2 %t.o -s -o %t1
+#RUN: ld.lld %t.o -s -o %t1
 #RUN: llvm-objdump -section-headers %t1 | FileCheck %s -check-prefix AFTER
 
 # exits with return code 42 on linux

Modified: lld/trunk/test/ELF/symbols.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/symbols.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/symbols.s (original)
+++ lld/trunk/test/ELF/symbols.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: ld.lld2 %t -o %t2
+// RUN: ld.lld %t -o %t2
 // RUN: llvm-readobj -symbols -sections %t2 | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/sysroot.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/sysroot.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/sysroot.s (original)
+++ lld/trunk/test/ELF/sysroot.s Wed Nov 18 00:11:01 2015
@@ -7,30 +7,30 @@
 // REQUIRES: x86
 
 // Should not link because of undefined symbol _bar
-// RUN: not ld.lld2 -o %t/r %t/m.o 2>&1 \
+// RUN: not ld.lld -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 ld.lld -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
 
 // Should just remove the '=' symbol if --sysroot is not specified.
 // Case 1: relative path
-// RUN: cd %t && ld.lld2 -o %t/r %t/m.o -L=lib -l:libls.a
+// RUN: cd %t && ld.lld -o %t/r %t/m.o -L=lib -l:libls.a
 // Case 2: absolute path
-// RUN: cd %p && ld.lld2 -o %t/r %t/m.o -L=%t/lib -l:libls.a
+// RUN: cd %p && ld.lld -o %t/r %t/m.o -L=%t/lib -l:libls.a
 
 // RUN: cd %p
 
 // Should substitute SysRoot if specified
-// RUN: ld.lld2 -o %t/r %t/m.o --sysroot=%t -L=lib -l:libls.a
-// RUN: ld.lld2 -o %t/r %t/m.o --sysroot=%t -L=/lib -l:libls.a
+// RUN: ld.lld -o %t/r %t/m.o --sysroot=%t -L=lib -l:libls.a
+// RUN: ld.lld -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 ld.lld -o %t/r %r/m.o --sysroot=%t -Llib -l:libls.a
+// RUN: not ld.lld -o %t/r %r/m.o --sysroot=%t -L/lib -l:libls.a
 
 .globl _start,_bar;
 _start:

Modified: lld/trunk/test/ELF/tls-align.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-align.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-align.s (original)
+++ lld/trunk/test/ELF/tls-align.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: ld.lld2 %t -o %tout -shared
+// RUN: ld.lld %t -o %tout -shared
 // RUN: llvm-readobj -program-headers %tout | FileCheck %s
 
         .section        .tbss,"awT", at nobits

Modified: lld/trunk/test/ELF/tls-dynamic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-dynamic.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-dynamic.s (original)
+++ lld/trunk/test/ELF/tls-dynamic.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: ld.lld2 -shared %t -o %tout
+// RUN: ld.lld -shared %t -o %tout
 // RUN: llvm-readobj -sections -relocations %tout | FileCheck %s
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DIS
 

Modified: lld/trunk/test/ELF/tls-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-error.s (original)
+++ lld/trunk/test/ELF/tls-error.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: not ld.lld2 %t -o %tout 2>&1 | FileCheck %s
+// RUN: not ld.lld %t -o %tout 2>&1 | FileCheck %s
 // CHECK: R_X86_64_TPOFF32 out of range
 
 .global _start

Modified: lld/trunk/test/ELF/tls-got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-got.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-got.s (original)
+++ lld/trunk/test/ELF/tls-got.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/tls-got.s -o %t2.o
-// RUN: ld.lld2 -shared %t2.o -o %t2.so
-// RUN: ld.lld2 -e main %t1.o %t2.so -o %t3
+// RUN: ld.lld -shared %t2.o -o %t2.so
+// RUN: ld.lld -e main %t1.o %t2.so -o %t3
 // RUN: llvm-readobj -s -r %t3 | FileCheck %s
 // RUN: llvm-objdump -d %t3 | FileCheck --check-prefix=DISASM %s
 

Modified: lld/trunk/test/ELF/tls-mismatch.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-mismatch.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-mismatch.s (original)
+++ lld/trunk/test/ELF/tls-mismatch.s Wed Nov 18 00:11:01 2015
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/tls-mismatch.s -o %t2
-// RUN: not ld.lld2 %t %t2 -o %t3 2>&1 | FileCheck %s
+// RUN: not ld.lld %t %t2 -o %t3 2>&1 | FileCheck %s
 // CHECK: TLS attribute mismatch for symbol: tlsvar
 
 .globl _start,tlsvar

Modified: lld/trunk/test/ELF/tls-static.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-static.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-static.s (original)
+++ lld/trunk/test/ELF/tls-static.s Wed Nov 18 00:11:01 2015
@@ -1,9 +1,9 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/shared.s -o %tso
-// 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 2>&1 | FileCheck %s
+// RUN: ld.lld -static %t -o %tout
+// RUN: ld.lld %t -o %tout
+// RUN: ld.lld -shared %tso -o %tshared
+// RUN: not ld.lld -static %t %tshared -o %tout 2>&1 | FileCheck %s
 // REQUIRES: x86
 
 .global _start

Modified: lld/trunk/test/ELF/tls.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls.s (original)
+++ lld/trunk/test/ELF/tls.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: ld.lld2 %t -o %tout
+// RUN: ld.lld %t -o %tout
 // RUN: llvm-readobj -symbols -sections -program-headers %tout | FileCheck %s
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DIS
 

Modified: lld/trunk/test/ELF/undef-start.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/undef-start.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/undef-start.s (original)
+++ lld/trunk/test/ELF/undef-start.s Wed Nov 18 00:11:01 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 ld.lld %t -o %t2 2>&1 | FileCheck %s
 # CHECK: undefined symbol: _start
 # REQUIRES: x86

Modified: lld/trunk/test/ELF/undef.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/undef.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/undef.s (original)
+++ lld/trunk/test/ELF/undef.s Wed Nov 18 00:11:01 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 ld.lld %t -o %t2 2>&1 | FileCheck %s
 # CHECK: undefined symbol: foo in {{.*}}
 # REQUIRES: x86
 

Modified: lld/trunk/test/ELF/undefined-opt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/undefined-opt.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/undefined-opt.s (original)
+++ lld/trunk/test/ELF/undefined-opt.s Wed Nov 18 00:11:01 2015
@@ -8,7 +8,7 @@
 # REQUIRES: x86
 
 # Symbols from the archive are not in if not needed
-# RUN: ld.lld2 -o %t1 %t.o %tar.a
+# RUN: ld.lld -o %t1 %t.o %tar.a
 # RUN: llvm-readobj --symbols %t1 | FileCheck --check-prefix=NO-UNDEFINED %s
 # NO-UNDEFINED: Symbols [
 # NO-UNDEFINED-NOT: Name: abs
@@ -19,7 +19,7 @@
 
 # Symbols from the archive are in if needed, but only from the
 # containing object file
-# RUN: ld.lld2 -o %t2 %t.o %tar.a -u bar
+# RUN: ld.lld -o %t2 %t.o %tar.a -u bar
 # RUN: llvm-readobj --symbols %t2 | FileCheck --check-prefix=ONE-UNDEFINED %s
 # ONE-UNDEFINED: Symbols [
 # ONE-UNDEFINED-NOT: Name: abs
@@ -29,7 +29,7 @@
 # ONE-UNDEFINED: ]
 
 # Use the option couple of times, both short and long forms
-# RUN: ld.lld2 -o %t3 %t.o %tar.a -u bar --undefined=abs
+# RUN: ld.lld -o %t3 %t.o %tar.a -u bar --undefined=abs
 # RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=TWO-UNDEFINED %s
 # TWO-UNDEFINED: Symbols [
 # TWO-UNDEFINED: Name: abs
@@ -39,12 +39,12 @@
 # TWO-UNDEFINED: ]
 # Now the same logic but linker script is used to set undefines
 # RUN: echo "EXTERN( bar abs )" > %t.script
-# RUN: ld.lld2 -o %t3 %t.o %tar.a %t.script
+# RUN: ld.lld -o %t3 %t.o %tar.a %t.script
 # RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=TWO-UNDEFINED %s
 
 # Added undefined symbol may be left undefined without error, but
 # shouldn't show up in the dynamic table.
-# RUN: ld.lld2 -shared -o %t4 %t.o %tar.a -u unknown
+# RUN: ld.lld -shared -o %t4 %t.o %tar.a -u unknown
 # RUN: llvm-readobj --dyn-symbols %t4 | \
 # RUN:     FileCheck --check-prefix=UNK-UNDEFINED-SO %s
 # UNK-UNDEFINED-SO: DynamicSymbols [

Modified: lld/trunk/test/ELF/visibility.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/visibility.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/visibility.s (original)
+++ lld/trunk/test/ELF/visibility.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/visibility.s -o %t2
-// RUN: ld.lld2 -shared %t %t2 -o %t3
+// RUN: ld.lld -shared %t %t2 -o %t3
 // RUN: llvm-readobj -t -dyn-symbols %t3 | FileCheck %s
 // REQUIRES: x86
 

Modified: lld/trunk/test/ELF/whole-archive.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/whole-archive.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/whole-archive.s (original)
+++ lld/trunk/test/ELF/whole-archive.s Wed Nov 18 00:11:01 2015
@@ -7,27 +7,27 @@
 // RUN: llvm-ar rcs %t.a %ta.o
 
 // Should not add symbols from the archive by default as they are not required
-// RUN: ld.lld2 -o %t3 %t.o %t.a
+// RUN: ld.lld -o %t3 %t.o %t.a
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=NOTADDED %s
 // NOTADDED: Symbols [
 // NOTADDED-NOT: Name: _bar
 // NOTADDED: ]
 
 // Should add symbols from the archive if --whole-archive is used
-// RUN: ld.lld2 -o %t3 %t.o --whole-archive %t.a
+// RUN: ld.lld -o %t3 %t.o --whole-archive %t.a
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=ADDED %s
 // ADDED: Symbols [
 // ADDED: Name: _bar
 // ADDED: ]
 
 // --no-whole-archive should restore default behaviour
-// RUN: ld.lld2 -o %t3 %t.o --whole-archive --no-whole-archive %t.a
+// RUN: ld.lld -o %t3 %t.o --whole-archive --no-whole-archive %t.a
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=NOTADDED %s
 
 // --whole-archive and --no-whole-archive should affect only archives which follow them
-// RUN: ld.lld2 -o %t3 %t.o %t.a --whole-archive --no-whole-archive
+// RUN: ld.lld -o %t3 %t.o %t.a --whole-archive --no-whole-archive
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=NOTADDED %s
-// RUN: ld.lld2 -o %t3 %t.o --whole-archive %t.a --no-whole-archive
+// RUN: ld.lld -o %t3 %t.o --whole-archive %t.a --no-whole-archive
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=ADDED %s
 
 .globl _start;

Modified: lld/trunk/test/ELF/writable-merge.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/writable-merge.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/writable-merge.s (original)
+++ lld/trunk/test/ELF/writable-merge.s Wed Nov 18 00:11:01 2015
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
-// RUN: not ld.lld2 %t.o -o %t 2>&1 | FileCheck %s
+// RUN: not ld.lld %t.o -o %t 2>&1 | FileCheck %s
 // CHECK: Writable SHF_MERGE sections are not supported
 
         .section	.foo,"awM", at progbits,4

Modified: lld/trunk/test/ELF/x86-64-reloc-32-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/x86-64-reloc-32-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/x86-64-reloc-32-error.s (original)
+++ lld/trunk/test/ELF/x86-64-reloc-32-error.s Wed Nov 18 00:11:01 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 -shared %tabs %t -o %t2 2>&1 | FileCheck %s
+// RUN: not ld.lld -shared %tabs %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: x86
 
   movl $big, %edx

Modified: lld/trunk/test/ELF/x86-64-reloc-32S-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/x86-64-reloc-32S-error.s?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/test/ELF/x86-64-reloc-32S-error.s (original)
+++ lld/trunk/test/ELF/x86-64-reloc-32S-error.s Wed Nov 18 00:11:01 2015
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: not ld.lld2 -shared %t -o %t2 2>&1 | FileCheck %s
+// RUN: not ld.lld -shared %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: x86
 
   movq _start - 0x1000000000000, %rdx

Modified: lld/trunk/tools/lld/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/tools/lld/CMakeLists.txt?rev=253437&r1=253436&r2=253437&view=diff
==============================================================================
--- lld/trunk/tools/lld/CMakeLists.txt (original)
+++ lld/trunk/tools/lld/CMakeLists.txt Wed Nov 18 00:11:01 2015
@@ -12,7 +12,7 @@ install(TARGETS lld
   RUNTIME DESTINATION bin)
 
 if(NOT LLD_SYMLINKS_TO_CREATE)
-  set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld2)
+  set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld)
 endif()
 
 foreach(link ${LLD_SYMLINKS_TO_CREATE})




More information about the llvm-commits mailing list