diff options
140 files changed, 312 insertions, 312 deletions
diff --git a/lld/lib/Driver/UniversalDriver.cpp b/lld/lib/Driver/UniversalDriver.cpp index 6f4465044a6..3dea7ebfae8 100644 --- a/lld/lib/Driver/UniversalDriver.cpp +++ b/lld/lib/Driver/UniversalDriver.cpp @@ -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) diff --git a/lld/test/ELF/aarch64-abs16-error.s b/lld/test/ELF/aarch64-abs16-error.s index b4240a5a443..927fb4adf0e 100644 --- a/lld/test/ELF/aarch64-abs16-error.s +++ b/lld/test/ELF/aarch64-abs16-error.s @@ -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 diff --git a/lld/test/ELF/aarch64-abs32-error.s b/lld/test/ELF/aarch64-abs32-error.s index 9c66c757a66..754d8821dd7 100644 --- a/lld/test/ELF/aarch64-abs32-error.s +++ b/lld/test/ELF/aarch64-abs32-error.s @@ -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 diff --git a/lld/test/ELF/aarch64-call26-error.s b/lld/test/ELF/aarch64-call26-error.s index 036c0c3abd0..4b666c69011 100644 --- a/lld/test/ELF/aarch64-call26-error.s +++ b/lld/test/ELF/aarch64-call26-error.s @@ -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 diff --git a/lld/test/ELF/aarch64-data-relocs.s b/lld/test/ELF/aarch64-data-relocs.s index a50763ad25b..65329b6fb35 100644 --- a/lld/test/ELF/aarch64-data-relocs.s +++ b/lld/test/ELF/aarch64-data-relocs.s @@ -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 diff --git a/lld/test/ELF/aarch64-hi21-error.s b/lld/test/ELF/aarch64-hi21-error.s index 626e0a087ce..c7a7f0b6b1b 100644 --- a/lld/test/ELF/aarch64-hi21-error.s +++ b/lld/test/ELF/aarch64-hi21-error.s @@ -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 diff --git a/lld/test/ELF/aarch64-jump26-error.s b/lld/test/ELF/aarch64-jump26-error.s index bb130298796..81fbba1f455 100644 --- a/lld/test/ELF/aarch64-jump26-error.s +++ b/lld/test/ELF/aarch64-jump26-error.s @@ -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 diff --git a/lld/test/ELF/aarch64-lo21-error.s b/lld/test/ELF/aarch64-lo21-error.s index ba3c1cce349..5049b99dab0 100644 --- a/lld/test/ELF/aarch64-lo21-error.s +++ b/lld/test/ELF/aarch64-lo21-error.s @@ -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 diff --git a/lld/test/ELF/aarch64-prel16-error.s b/lld/test/ELF/aarch64-prel16-error.s index 4836fe93a9c..c0dc1c20b5f 100644 --- a/lld/test/ELF/aarch64-prel16-error.s +++ b/lld/test/ELF/aarch64-prel16-error.s @@ -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 - . diff --git a/lld/test/ELF/aarch64-prel32-error.s b/lld/test/ELF/aarch64-prel32-error.s index 7983653946e..5dfaa1cc335 100644 --- a/lld/test/ELF/aarch64-prel32-error.s +++ b/lld/test/ELF/aarch64-prel32-error.s @@ -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 - . diff --git a/lld/test/ELF/aarch64-relocs.s b/lld/test/ELF/aarch64-relocs.s index 55bf63277e8..827b1228b97 100644 --- a/lld/test/ELF/aarch64-relocs.s +++ b/lld/test/ELF/aarch64-relocs.s @@ -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 diff --git a/lld/test/ELF/allow-multiple-definition.s b/lld/test/ELF/allow-multiple-definition.s index a7678dddba9..89ea8c86582 100644 --- a/lld/test/ELF/allow-multiple-definition.s +++ b/lld/test/ELF/allow-multiple-definition.s @@ -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 diff --git a/lld/test/ELF/allow-shlib-undefined.s b/lld/test/ELF/allow-shlib-undefined.s index c6510d301fa..541a7e12007 100644 --- a/lld/test/ELF/allow-shlib-undefined.s +++ b/lld/test/ELF/allow-shlib-undefined.s @@ -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: diff --git a/lld/test/ELF/archive.s b/lld/test/ELF/archive.s index 40e534b6f53..41d74451cdd 100644 --- a/lld/test/ELF/archive.s +++ b/lld/test/ELF/archive.s @@ -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 diff --git a/lld/test/ELF/as-needed.s b/lld/test/ELF/as-needed.s index 73199e5649c..2c5174d5407 100644 --- a/lld/test/ELF/as-needed.s +++ b/lld/test/ELF/as-needed.s @@ -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) diff --git a/lld/test/ELF/basic-aarch64.s b/lld/test/ELF/basic-aarch64.s index e0b9350f834..28fb10d82ed 100644 --- a/lld/test/ELF/basic-aarch64.s +++ b/lld/test/ELF/basic-aarch64.s @@ -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 diff --git a/lld/test/ELF/basic-freebsd.s b/lld/test/ELF/basic-freebsd.s index 10b71a62c5c..375fdb5f807 100644 --- a/lld/test/ELF/basic-freebsd.s +++ b/lld/test/ELF/basic-freebsd.s @@ -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 diff --git a/lld/test/ELF/basic-mips.s b/lld/test/ELF/basic-mips.s index ac81147a3e2..aa2eaf9f59e 100644 --- a/lld/test/ELF/basic-mips.s +++ b/lld/test/ELF/basic-mips.s @@ -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 diff --git a/lld/test/ELF/basic.s b/lld/test/ELF/basic.s index 0b612aa5407..47b28d41b5b 100644 --- a/lld/test/ELF/basic.s +++ b/lld/test/ELF/basic.s @@ -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 diff --git a/lld/test/ELF/basic32.s b/lld/test/ELF/basic32.s index f22a225c88f..e5b5c359d59 100644 --- a/lld/test/ELF/basic32.s +++ b/lld/test/ELF/basic32.s @@ -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 diff --git a/lld/test/ELF/basic64be.s b/lld/test/ELF/basic64be.s index e733ff161cd..9534e05b47e 100644 --- a/lld/test/ELF/basic64be.s +++ b/lld/test/ELF/basic64be.s @@ -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 diff --git a/lld/test/ELF/bss.s b/lld/test/ELF/bss.s index 77f5e77abd6..d0b43ec5a26 100644 --- a/lld/test/ELF/bss.s +++ b/lld/test/ELF/bss.s @@ -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 diff --git a/lld/test/ELF/comdat.s b/lld/test/ELF/comdat.s index 6da8a09be41..4f8955e289d 100644 --- a/lld/test/ELF/comdat.s +++ b/lld/test/ELF/comdat.s @@ -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 diff --git a/lld/test/ELF/common.s b/lld/test/ELF/common.s index e61a8153c7a..67cedbccb86 100644 --- a/lld/test/ELF/common.s +++ b/lld/test/ELF/common.s @@ -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 diff --git a/lld/test/ELF/default-output.s b/lld/test/ELF/default-output.s index 364cda9573e..8da3bb40eac 100644 --- a/lld/test/ELF/default-output.s +++ b/lld/test/ELF/default-output.s @@ -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; diff --git a/lld/test/ELF/discard-locals.s b/lld/test/ELF/discard-locals.s index f1beac6af99..073e891c314 100644 --- a/lld/test/ELF/discard-locals.s +++ b/lld/test/ELF/discard-locals.s @@ -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 diff --git a/lld/test/ELF/discard-none.s b/lld/test/ELF/discard-none.s index c43aecb7897..a9d54bae9ac 100644 --- a/lld/test/ELF/discard-none.s +++ b/lld/test/ELF/discard-none.s @@ -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 diff --git a/lld/test/ELF/dt_flags.s b/lld/test/ELF/dt_flags.s index 925a8f4303f..a1d8d77433a 100644 --- a/lld/test/ELF/dt_flags.s +++ b/lld/test/ELF/dt_flags.s @@ -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 diff --git a/lld/test/ELF/dynamic-reloc-index.s b/lld/test/ELF/dynamic-reloc-index.s index 3020ba700ce..43d9dbbde97 100644 --- a/lld/test/ELF/dynamic-reloc-index.s +++ b/lld/test/ELF/dynamic-reloc-index.s @@ -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 diff --git a/lld/test/ELF/dynamic-reloc-weak.s b/lld/test/ELF/dynamic-reloc-weak.s index 076ff5e3933..fe1b7eedb6d 100644 --- a/lld/test/ELF/dynamic-reloc-weak.s +++ b/lld/test/ELF/dynamic-reloc-weak.s @@ -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 diff --git a/lld/test/ELF/dynamic-reloc.s b/lld/test/ELF/dynamic-reloc.s index ecfe804e124..6de2fba9611 100644 --- a/lld/test/ELF/dynamic-reloc.s +++ b/lld/test/ELF/dynamic-reloc.s @@ -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 diff --git a/lld/test/ELF/eh-frame-merge.s b/lld/test/ELF/eh-frame-merge.s index bc879c59c26..2855a3469dc 100644 --- a/lld/test/ELF/eh-frame-merge.s +++ b/lld/test/ELF/eh-frame-merge.s @@ -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",@progbits diff --git a/lld/test/ELF/eh-frame-plt.s b/lld/test/ELF/eh-frame-plt.s index 7bc4356dfd5..e84d93c7f88 100644 --- a/lld/test/ELF/eh-frame-plt.s +++ b/lld/test/ELF/eh-frame-plt.s @@ -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 diff --git a/lld/test/ELF/eh-frame-type.test b/lld/test/ELF/eh-frame-type.test index e88ce64d383..f59ab116d7d 100644 --- a/lld/test/ELF/eh-frame-type.test +++ b/lld/test/ELF/eh-frame-type.test @@ -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 diff --git a/lld/test/ELF/empty-archive.s b/lld/test/ELF/empty-archive.s index e895a95d06f..ffb0a781441 100644 --- a/lld/test/ELF/empty-archive.s +++ b/lld/test/ELF/empty-archive.s @@ -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 diff --git a/lld/test/ELF/emulation.s b/lld/test/ELF/emulation.s index 685d19b6aa3..6db820934c3 100644 --- a/lld/test/ELF/emulation.s +++ b/lld/test/ELF/emulation.s @@ -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 { diff --git a/lld/test/ELF/entry.s b/lld/test/ELF/entry.s index 5f85f9e480b..53f2c7d4cc9 100644 --- a/lld/test/ELF/entry.s +++ b/lld/test/ELF/entry.s @@ -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 diff --git a/lld/test/ELF/gc-sections-eh.s b/lld/test/ELF/gc-sections-eh.s index 71a1c3a1712..042b68ebdfe 100644 --- a/lld/test/ELF/gc-sections-eh.s +++ b/lld/test/ELF/gc-sections-eh.s @@ -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 diff --git a/lld/test/ELF/gc-sections.s b/lld/test/ELF/gc-sections.s index eaa33de2a1d..5c27ad77f58 100644 --- a/lld/test/ELF/gc-sections.s +++ b/lld/test/ELF/gc-sections.s @@ -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 diff --git a/lld/test/ELF/global_offset_table.s b/lld/test/ELF/global_offset_table.s index f6998a580c6..47e95e9f9b8 100644 --- a/lld/test/ELF/global_offset_table.s +++ b/lld/test/ELF/global_offset_table.s @@ -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_ diff --git a/lld/test/ELF/gnu-hash-table.s b/lld/test/ELF/gnu-hash-table.s index d86cb77b81a..aae0ce3698b 100644 --- a/lld/test/ELF/gnu-hash-table.s +++ b/lld/test/ELF/gnu-hash-table.s @@ -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 diff --git a/lld/test/ELF/gnu-unique.s b/lld/test/ELF/gnu-unique.s index d5eafb2bb7a..f7206cf8c97 100644 --- a/lld/test/ELF/gnu-unique.s +++ b/lld/test/ELF/gnu-unique.s @@ -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 diff --git a/lld/test/ELF/gnustack.s b/lld/test/ELF/gnustack.s index d65f1250eea..261d4157506 100644 --- a/lld/test/ELF/gnustack.s +++ b/lld/test/ELF/gnustack.s @@ -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 [ diff --git a/lld/test/ELF/got.s b/lld/test/ELF/got.s index e12afe7b4d9..5fa1c2a7251 100644 --- a/lld/test/ELF/got.s +++ b/lld/test/ELF/got.s @@ -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 diff --git a/lld/test/ELF/incompatible-ar-first.s b/lld/test/ELF/incompatible-ar-first.s index f50f2c19fcd..8a8aaec220d 100644 --- a/lld/test/ELF/incompatible-ar-first.s +++ b/lld/test/ELF/incompatible-ar-first.s @@ -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. diff --git a/lld/test/ELF/incompatible.s b/lld/test/ELF/incompatible.s index 9ef866bff98..1696d83de7a 100644 --- a/lld/test/ELF/incompatible.s +++ b/lld/test/ELF/incompatible.s @@ -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: diff --git a/lld/test/ELF/init-fini.s b/lld/test/ELF/init-fini.s index bcca28ee55e..d2b24088d1e 100644 --- a/lld/test/ELF/init-fini.s +++ b/lld/test/ELF/init-fini.s @@ -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 diff --git a/lld/test/ELF/invalid-cie-length.s b/lld/test/ELF/invalid-cie-length.s index bc8edb03a95..36d1e03fb56 100644 --- a/lld/test/ELF/invalid-cie-length.s +++ b/lld/test/ELF/invalid-cie-length.s @@ -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 diff --git a/lld/test/ELF/invalid-cie-length2.s b/lld/test/ELF/invalid-cie-length2.s index 3eecd2ea6af..94a677eb891 100644 --- a/lld/test/ELF/invalid-cie-length2.s +++ b/lld/test/ELF/invalid-cie-length2.s @@ -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 diff --git a/lld/test/ELF/invalid-cie-reference.s b/lld/test/ELF/invalid-cie-reference.s index 34d02eb9fba..1b099d19b7e 100644 --- a/lld/test/ELF/invalid-cie-reference.s +++ b/lld/test/ELF/invalid-cie-reference.s @@ -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 diff --git a/lld/test/ELF/invalid-elf.test b/lld/test/ELF/invalid-elf.test index dd5776ffe50..05e95cab0d2 100644 --- a/lld/test/ELF/invalid-elf.test +++ b/lld/test/ELF/invalid-elf.test @@ -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 diff --git a/lld/test/ELF/invalid-fde-rel.s b/lld/test/ELF/invalid-fde-rel.s index 7d270256393..9fb73d2158d 100644 --- a/lld/test/ELF/invalid-fde-rel.s +++ b/lld/test/ELF/invalid-fde-rel.s @@ -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 diff --git a/lld/test/ELF/invalid-relocations.test b/lld/test/ELF/invalid-relocations.test index 3eb7eb7990a..2b4a6c4a421 100644 --- a/lld/test/ELF/invalid-relocations.test +++ b/lld/test/ELF/invalid-relocations.test @@ -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 diff --git a/lld/test/ELF/libsearch.s b/lld/test/ELF/libsearch.s index 8c32443f027..c965b9ba91f 100644 --- a/lld/test/ELF/libsearch.s +++ b/lld/test/ELF/libsearch.s @@ -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; diff --git a/lld/test/ELF/linkerscript-ouputformat.s b/lld/test/ELF/linkerscript-ouputformat.s index 9de9cc667b2..3c6cfdc8f96 100644 --- a/lld/test/ELF/linkerscript-ouputformat.s +++ b/lld/test/ELF/linkerscript-ouputformat.s @@ -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 diff --git a/lld/test/ELF/linkerscript-outputarch.s b/lld/test/ELF/linkerscript-outputarch.s index a25f5119bec..99089615cb1 100644 --- a/lld/test/ELF/linkerscript-outputarch.s +++ b/lld/test/ELF/linkerscript-outputarch.s @@ -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 diff --git a/lld/test/ELF/linkerscript-sections.s b/lld/test/ELF/linkerscript-sections.s index c4a68432ca2..ea9ae2b2726 100644 --- a/lld/test/ELF/linkerscript-sections.s +++ b/lld/test/ELF/linkerscript-sections.s @@ -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 diff --git a/lld/test/ELF/linkerscript.s b/lld/test/ELF/linkerscript.s index afd93ca726d..0e845b2bd79 100644 --- a/lld/test/ELF/linkerscript.s +++ b/lld/test/ELF/linkerscript.s @@ -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 diff --git a/lld/test/ELF/linkerscript2.s b/lld/test/ELF/linkerscript2.s index 6e09559b2f7..f83198f759f 100644 --- a/lld/test/ELF/linkerscript2.s +++ b/lld/test/ELF/linkerscript2.s @@ -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: diff --git a/lld/test/ELF/local-dynamic.s b/lld/test/ELF/local-dynamic.s index 39b763cb33c..162c58cb57e 100644 --- a/lld/test/ELF/local-dynamic.s +++ b/lld/test/ELF/local-dynamic.s @@ -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 diff --git a/lld/test/ELF/local-got-shared.s b/lld/test/ELF/local-got-shared.s index 179f2e0371c..08e6583f481 100644 --- a/lld/test/ELF/local-got-shared.s +++ b/lld/test/ELF/local-got-shared.s @@ -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 diff --git a/lld/test/ELF/local-got.s b/lld/test/ELF/local-got.s index 5187aa14584..015c058e2eb 100644 --- a/lld/test/ELF/local-got.s +++ b/lld/test/ELF/local-got.s @@ -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 diff --git a/lld/test/ELF/local.s b/lld/test/ELF/local.s index ec547edfd85..cc879e15c0d 100644 --- a/lld/test/ELF/local.s +++ b/lld/test/ELF/local.s @@ -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 diff --git a/lld/test/ELF/many-sections.s b/lld/test/ELF/many-sections.s index dde9d191e6c..77e76c20a60 100644 --- a/lld/test/ELF/many-sections.s +++ b/lld/test/ELF/many-sections.s @@ -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. diff --git a/lld/test/ELF/merge-invalid-size.s b/lld/test/ELF/merge-invalid-size.s index 7ae3a6721e6..2a99e14ad83 100644 --- a/lld/test/ELF/merge-invalid-size.s +++ b/lld/test/ELF/merge-invalid-size.s @@ -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",@progbits,4 diff --git a/lld/test/ELF/merge-shared.s b/lld/test/ELF/merge-shared.s index e80cafdafab..02ceb66493c 100644 --- a/lld/test/ELF/merge-shared.s +++ b/lld/test/ELF/merge-shared.s @@ -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",@progbits,4 diff --git a/lld/test/ELF/merge-string-align.s b/lld/test/ELF/merge-string-align.s index 97f084d2d4f..b06920ac0af 100644 --- a/lld/test/ELF/merge-string-align.s +++ b/lld/test/ELF/merge-string-align.s @@ -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",@progbits,1 diff --git a/lld/test/ELF/merge-string-error.s b/lld/test/ELF/merge-string-error.s index 9450f61fbf8..58a624329ed 100644 --- a/lld/test/ELF/merge-string-error.s +++ b/lld/test/ELF/merge-string-error.s @@ -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",@progbits,1 .asciz "abc" diff --git a/lld/test/ELF/merge-string-no-null.s b/lld/test/ELF/merge-string-no-null.s index 3b3cc59840d..70d6bbbc32e 100644 --- a/lld/test/ELF/merge-string-no-null.s +++ b/lld/test/ELF/merge-string-no-null.s @@ -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",@progbits,1 .ascii "abc" diff --git a/lld/test/ELF/merge-string.s b/lld/test/ELF/merge-string.s index c77c0201fb1..731190c8d75 100644 --- a/lld/test/ELF/merge-string.s +++ b/lld/test/ELF/merge-string.s @@ -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",@progbits,1 diff --git a/lld/test/ELF/merge-sym.s b/lld/test/ELF/merge-sym.s index c86eea4d7c9..9a47aa32547 100644 --- a/lld/test/ELF/merge-sym.s +++ b/lld/test/ELF/merge-sym.s @@ -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",@progbits,4 diff --git a/lld/test/ELF/merge.s b/lld/test/ELF/merge.s index 389da47f609..9cead642fa8 100644 --- a/lld/test/ELF/merge.s +++ b/lld/test/ELF/merge.s @@ -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 diff --git a/lld/test/ELF/mips-dynamic.s b/lld/test/ELF/mips-dynamic.s index ea031364151..54aa578f392 100644 --- a/lld/test/ELF/mips-dynamic.s +++ b/lld/test/ELF/mips-dynamic.s @@ -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 diff --git a/lld/test/ELF/mips-dynsym-sort.s b/lld/test/ELF/mips-dynsym-sort.s index bbd3282364c..7d4559cf933 100644 --- a/lld/test/ELF/mips-dynsym-sort.s +++ b/lld/test/ELF/mips-dynsym-sort.s @@ -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 diff --git a/lld/test/ELF/mips-gnu-hash.s b/lld/test/ELF/mips-gnu-hash.s index f42acaf6e8b..4b11f213518 100644 --- a/lld/test/ELF/mips-gnu-hash.s +++ b/lld/test/ELF/mips-gnu-hash.s @@ -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. diff --git a/lld/test/ELF/mips-got-relocs.s b/lld/test/ELF/mips-got-relocs.s index 67d56685f66..76b7d023e14 100644 --- a/lld/test/ELF/mips-got-relocs.s +++ b/lld/test/ELF/mips-got-relocs.s @@ -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 diff --git a/lld/test/ELF/mips-relocs.s b/lld/test/ELF/mips-relocs.s index 5d038faa958..c05b8fd3bdd 100644 --- a/lld/test/ELF/mips-relocs.s +++ b/lld/test/ELF/mips-relocs.s @@ -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 diff --git a/lld/test/ELF/new-dtags.test b/lld/test/ELF/new-dtags.test index 00e5bdc8ec0..334d477622a 100644 --- a/lld/test/ELF/new-dtags.test +++ b/lld/test/ELF/new-dtags.test @@ -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 diff --git a/lld/test/ELF/no-inhibit-exec.s b/lld/test/ELF/no-inhibit-exec.s index 0adf67326c2..fe2240b731f 100644 --- a/lld/test/ELF/no-inhibit-exec.s +++ b/lld/test/ELF/no-inhibit-exec.s @@ -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 diff --git a/lld/test/ELF/no-obj.s b/lld/test/ELF/no-obj.s index dee4979c9b4..68e9979e3ed 100644 --- a/lld/test/ELF/no-obj.s +++ b/lld/test/ELF/no-obj.s @@ -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 diff --git a/lld/test/ELF/no-symtab.s b/lld/test/ELF/no-symtab.s index cf75771574d..158bd727f25 100644 --- a/lld/test/ELF/no-symtab.s +++ b/lld/test/ELF/no-symtab.s @@ -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: diff --git a/lld/test/ELF/no-undefined.s b/lld/test/ELF/no-undefined.s index caa106c3eb7..94378bde40a 100644 --- a/lld/test/ELF/no-undefined.s +++ b/lld/test/ELF/no-undefined.s @@ -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: diff --git a/lld/test/ELF/output-section.s b/lld/test/ELF/output-section.s index aa1fda9bc1e..68505254686 100644 --- a/lld/test/ELF/output-section.s +++ b/lld/test/ELF/output-section.s @@ -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 diff --git a/lld/test/ELF/plt-aarch64.s b/lld/test/ELF/plt-aarch64.s index e693f39b655..3c58daee826 100644 --- a/lld/test/ELF/plt-aarch64.s +++ b/lld/test/ELF/plt-aarch64.s @@ -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 diff --git a/lld/test/ELF/plt-i686.s b/lld/test/ELF/plt-i686.s index b6a91cded23..3c001d4f313 100644 --- a/lld/test/ELF/plt-i686.s +++ b/lld/test/ELF/plt-i686.s @@ -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 diff --git a/lld/test/ELF/plt.s b/lld/test/ELF/plt.s index 0190c764cbe..01590913456 100644 --- a/lld/test/ELF/plt.s +++ b/lld/test/ELF/plt.s @@ -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 diff --git a/lld/test/ELF/ppc64-addr16-error.s b/lld/test/ELF/ppc64-addr16-error.s index 5cf4d216476..20693e30d81 100644 --- a/lld/test/ELF/ppc64-addr16-error.s +++ b/lld/test/ELF/ppc64-addr16-error.s @@ -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 diff --git a/lld/test/ELF/ppc64-rel-calls.s b/lld/test/ELF/ppc64-rel-calls.s index 6a5cb12d1a4..f3b309f33df 100644 --- a/lld/test/ELF/ppc64-rel-calls.s +++ b/lld/test/ELF/ppc64-rel-calls.s @@ -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 diff --git a/lld/test/ELF/ppc64-relocs.s b/lld/test/ELF/ppc64-relocs.s index 0d0e08dde20..61f9a1eb3ce 100644 --- a/lld/test/ELF/ppc64-relocs.s +++ b/lld/test/ELF/ppc64-relocs.s @@ -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 diff --git a/lld/test/ELF/ppc64-shared-rel-toc.s b/lld/test/ELF/ppc64-shared-rel-toc.s index 2f0119fc581..aa8654acb3c 100644 --- a/lld/test/ELF/ppc64-shared-rel-toc.s +++ b/lld/test/ELF/ppc64-shared-rel-toc.s @@ -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 diff --git a/lld/test/ELF/ppc64-toc-restore.s b/lld/test/ELF/ppc64-toc-restore.s index 43440f03dd7..cee105b35e6 100644 --- a/lld/test/ELF/ppc64-toc-restore.s +++ b/lld/test/ELF/ppc64-toc-restore.s @@ -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 diff --git a/lld/test/ELF/ppc64-weak-undef-call-shared.s b/lld/test/ELF/ppc64-weak-undef-call-shared.s index bb1abcc32b5..2c27a27c5a1 100644 --- a/lld/test/ELF/ppc64-weak-undef-call-shared.s +++ b/lld/test/ELF/ppc64-weak-undef-call-shared.s @@ -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 diff --git a/lld/test/ELF/ppc64-weak-undef-call.s b/lld/test/ELF/ppc64-weak-undef-call.s index 5bb12a5c557..55443cb55b9 100644 --- a/lld/test/ELF/ppc64-weak-undef-call.s +++ b/lld/test/ELF/ppc64-weak-undef-call.s @@ -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 diff --git a/lld/test/ELF/pre_init_fini_array.s b/lld/test/ELF/pre_init_fini_array.s index 7d00bedc22b..bf32283d257 100644 --- a/lld/test/ELF/pre_init_fini_array.s +++ b/lld/test/ELF/pre_init_fini_array.s @@ -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 diff --git a/lld/test/ELF/pre_init_fini_array_missing.s b/lld/test/ELF/pre_init_fini_array_missing.s index 0c0054f8898..02b83240193 100644 --- a/lld/test/ELF/pre_init_fini_array_missing.s +++ b/lld/test/ELF/pre_init_fini_array_missing.s @@ -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 diff --git a/lld/test/ELF/progname.s b/lld/test/ELF/progname.s index 18b1ef7ef96..5712b95d276 100644 --- a/lld/test/ELF/progname.s +++ b/lld/test/ELF/progname.s @@ -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@ diff --git a/lld/test/ELF/program-header-layout.s b/lld/test/ELF/program-header-layout.s index f6a752d7eef..8e32227ac74 100644 --- a/lld/test/ELF/program-header-layout.s +++ b/lld/test/ELF/program-header-layout.s @@ -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 diff --git a/lld/test/ELF/relative-dynamic-reloc-ppc64.s b/lld/test/ELF/relative-dynamic-reloc-ppc64.s index d1477676592..97f74ccab53 100644 --- a/lld/test/ELF/relative-dynamic-reloc-ppc64.s +++ b/lld/test/ELF/relative-dynamic-reloc-ppc64.s @@ -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 diff --git a/lld/test/ELF/relative-dynamic-reloc.s b/lld/test/ELF/relative-dynamic-reloc.s index c38125fc704..6760a4f796d 100644 --- a/lld/test/ELF/relative-dynamic-reloc.s +++ b/lld/test/ELF/relative-dynamic-reloc.s @@ -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 diff --git a/lld/test/ELF/relocatable.s b/lld/test/ELF/relocatable.s index 1a2f8939433..9fb171d4ed5 100644 --- a/lld/test/ELF/relocatable.s +++ b/lld/test/ELF/relocatable.s @@ -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. diff --git a/lld/test/ELF/relocation-absolute.s b/lld/test/ELF/relocation-absolute.s index 2c678ce9efd..20d54eca920 100644 --- a/lld/test/ELF/relocation-absolute.s +++ b/lld/test/ELF/relocation-absolute.s @@ -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 diff --git a/lld/test/ELF/relocation-common.s b/lld/test/ELF/relocation-common.s index 860d2e89b6b..d5d379a355a 100644 --- a/lld/test/ELF/relocation-common.s +++ b/lld/test/ELF/relocation-common.s @@ -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 diff --git a/lld/test/ELF/relocation-copy.s b/lld/test/ELF/relocation-copy.s index c4a4f0f27b0..17b3a645a8e 100644 --- a/lld/test/ELF/relocation-copy.s +++ b/lld/test/ELF/relocation-copy.s @@ -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 diff --git a/lld/test/ELF/relocation-i686.s b/lld/test/ELF/relocation-i686.s index 2daf671a6c1..d4f6d8cd4f6 100644 --- a/lld/test/ELF/relocation-i686.s +++ b/lld/test/ELF/relocation-i686.s @@ -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 diff --git a/lld/test/ELF/relocation-in-merge.s b/lld/test/ELF/relocation-in-merge.s index 64b54955745..820208a2caf 100644 --- a/lld/test/ELF/relocation-in-merge.s +++ b/lld/test/ELF/relocation-in-merge.s @@ -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",@progbits,4 diff --git a/lld/test/ELF/relocation-local.s b/lld/test/ELF/relocation-local.s index 58eaf450859..26e89fc12f8 100644 --- a/lld/test/ELF/relocation-local.s +++ b/lld/test/ELF/relocation-local.s @@ -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 diff --git a/lld/test/ELF/relocation-past-merge-end.s b/lld/test/ELF/relocation-past-merge-end.s index f0b57b42fe3..4dadea1e7ac 100644 --- a/lld/test/ELF/relocation-past-merge-end.s +++ b/lld/test/ELF/relocation-past-merge-end.s @@ -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 diff --git a/lld/test/ELF/relocation-undefined-weak.s b/lld/test/ELF/relocation-undefined-weak.s index 9d05159c467..f1cb706329a 100644 --- a/lld/test/ELF/relocation-undefined-weak.s +++ b/lld/test/ELF/relocation-undefined-weak.s @@ -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 diff --git a/lld/test/ELF/relocation.s b/lld/test/ELF/relocation.s index 68680dda78e..e201ee0577e 100644 --- a/lld/test/ELF/relocation.s +++ b/lld/test/ELF/relocation.s @@ -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 diff --git a/lld/test/ELF/resolution.s b/lld/test/ELF/resolution.s index 17e47ca8e72..ce275c2934a 100644 --- a/lld/test/ELF/resolution.s +++ b/lld/test/ELF/resolution.s @@ -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 diff --git a/lld/test/ELF/section-align-0.test b/lld/test/ELF/section-align-0.test index 1565a1720de..fc27ee95fd4 100644 --- a/lld/test/ELF/section-align-0.test +++ b/lld/test/ELF/section-align-0.test @@ -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. diff --git a/lld/test/ELF/section-layout.s b/lld/test/ELF/section-layout.s index 77ac72a3ef1..20480919956 100644 --- a/lld/test/ELF/section-layout.s +++ b/lld/test/ELF/section-layout.s @@ -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 diff --git a/lld/test/ELF/section-name.s b/lld/test/ELF/section-name.s index d9e3efedf75..7a528795c68 100644 --- a/lld/test/ELF/section-name.s +++ b/lld/test/ELF/section-name.s @@ -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 diff --git a/lld/test/ELF/section-symbol.s b/lld/test/ELF/section-symbol.s index a3284bffaa4..5f04606914f 100644 --- a/lld/test/ELF/section-symbol.s +++ b/lld/test/ELF/section-symbol.s @@ -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 diff --git a/lld/test/ELF/shared-be.s b/lld/test/ELF/shared-be.s index c3347d71827..1524d48b2ed 100644 --- a/lld/test/ELF/shared-be.s +++ b/lld/test/ELF/shared-be.s @@ -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 diff --git a/lld/test/ELF/shared.s b/lld/test/ELF/shared.s index a3c9bc50a4f..5485559bb41 100644 --- a/lld/test/ELF/shared.s +++ b/lld/test/ELF/shared.s @@ -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 diff --git a/lld/test/ELF/soname.s b/lld/test/ELF/soname.s index 909a72ce037..9d6fe7681da 100644 --- a/lld/test/ELF/soname.s +++ b/lld/test/ELF/soname.s @@ -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) diff --git a/lld/test/ELF/soname2.s b/lld/test/ELF/soname2.s index 1b8eacf0d17..d446766a799 100644 --- a/lld/test/ELF/soname2.s +++ b/lld/test/ELF/soname2.s @@ -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) diff --git a/lld/test/ELF/startstop-shared.s b/lld/test/ELF/startstop-shared.s index ba8c5bf554f..108184648f9 100644 --- a/lld/test/ELF/startstop-shared.s +++ b/lld/test/ELF/startstop-shared.s @@ -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 diff --git a/lld/test/ELF/startstop.s b/lld/test/ELF/startstop.s index 784c237bb31..d0e88df4e7e 100644 --- a/lld/test/ELF/startstop.s +++ b/lld/test/ELF/startstop.s @@ -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 diff --git a/lld/test/ELF/string-table.s b/lld/test/ELF/string-table.s index 2d8b3ac66ae..52a40d790d8 100644 --- a/lld/test/ELF/string-table.s +++ b/lld/test/ELF/string-table.s @@ -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 diff --git a/lld/test/ELF/strip-all.s b/lld/test/ELF/strip-all.s index a3acda74b9e..6d18431668a 100644 --- a/lld/test/ELF/strip-all.s +++ b/lld/test/ELF/strip-all.s @@ -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 diff --git a/lld/test/ELF/symbols.s b/lld/test/ELF/symbols.s index 9a01df61312..ccf83afdf56 100644 --- a/lld/test/ELF/symbols.s +++ b/lld/test/ELF/symbols.s @@ -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 diff --git a/lld/test/ELF/sysroot.s b/lld/test/ELF/sysroot.s index 576bf97ef2d..35154be125a 100644 --- a/lld/test/ELF/sysroot.s +++ b/lld/test/ELF/sysroot.s @@ -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: diff --git a/lld/test/ELF/tls-align.s b/lld/test/ELF/tls-align.s index e8055627b39..56b404e0851 100644 --- a/lld/test/ELF/tls-align.s +++ b/lld/test/ELF/tls-align.s @@ -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",@nobits diff --git a/lld/test/ELF/tls-dynamic.s b/lld/test/ELF/tls-dynamic.s index 03a52c4f24b..6bef5469994 100644 --- a/lld/test/ELF/tls-dynamic.s +++ b/lld/test/ELF/tls-dynamic.s @@ -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 diff --git a/lld/test/ELF/tls-error.s b/lld/test/ELF/tls-error.s index 21b455a69d7..b6178990104 100644 --- a/lld/test/ELF/tls-error.s +++ b/lld/test/ELF/tls-error.s @@ -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 diff --git a/lld/test/ELF/tls-got.s b/lld/test/ELF/tls-got.s index ed228fcee3c..10b9cf99457 100644 --- a/lld/test/ELF/tls-got.s +++ b/lld/test/ELF/tls-got.s @@ -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 diff --git a/lld/test/ELF/tls-mismatch.s b/lld/test/ELF/tls-mismatch.s index 0002c3a97c9..fb70229e1a5 100644 --- a/lld/test/ELF/tls-mismatch.s +++ b/lld/test/ELF/tls-mismatch.s @@ -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 diff --git a/lld/test/ELF/tls-static.s b/lld/test/ELF/tls-static.s index 0b8e235dfe7..4c515abb125 100644 --- a/lld/test/ELF/tls-static.s +++ b/lld/test/ELF/tls-static.s @@ -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 diff --git a/lld/test/ELF/tls.s b/lld/test/ELF/tls.s index f947839628c..525890b087e 100644 --- a/lld/test/ELF/tls.s +++ b/lld/test/ELF/tls.s @@ -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 diff --git a/lld/test/ELF/undef-start.s b/lld/test/ELF/undef-start.s index c05d6185f67..bf1d89853f5 100644 --- a/lld/test/ELF/undef-start.s +++ b/lld/test/ELF/undef-start.s @@ -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 diff --git a/lld/test/ELF/undef.s b/lld/test/ELF/undef.s index 63ed15e082c..374c9c884d5 100644 --- a/lld/test/ELF/undef.s +++ b/lld/test/ELF/undef.s @@ -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 diff --git a/lld/test/ELF/undefined-opt.s b/lld/test/ELF/undefined-opt.s index b986f89f8f2..97ab5a63490 100644 --- a/lld/test/ELF/undefined-opt.s +++ b/lld/test/ELF/undefined-opt.s @@ -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 [ diff --git a/lld/test/ELF/visibility.s b/lld/test/ELF/visibility.s index 9862a3ec233..d76ed0793eb 100644 --- a/lld/test/ELF/visibility.s +++ b/lld/test/ELF/visibility.s @@ -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 diff --git a/lld/test/ELF/whole-archive.s b/lld/test/ELF/whole-archive.s index fa5a327ba7d..0a6b30fd171 100644 --- a/lld/test/ELF/whole-archive.s +++ b/lld/test/ELF/whole-archive.s @@ -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; diff --git a/lld/test/ELF/writable-merge.s b/lld/test/ELF/writable-merge.s index fbb27d2bd76..dd7b8538e57 100644 --- a/lld/test/ELF/writable-merge.s +++ b/lld/test/ELF/writable-merge.s @@ -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",@progbits,4 diff --git a/lld/test/ELF/x86-64-reloc-32-error.s b/lld/test/ELF/x86-64-reloc-32-error.s index 24f52977439..b5d476bcf08 100644 --- a/lld/test/ELF/x86-64-reloc-32-error.s +++ b/lld/test/ELF/x86-64-reloc-32-error.s @@ -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 diff --git a/lld/test/ELF/x86-64-reloc-32S-error.s b/lld/test/ELF/x86-64-reloc-32S-error.s index f8eaf670148..aa19c2c32e9 100644 --- a/lld/test/ELF/x86-64-reloc-32S-error.s +++ b/lld/test/ELF/x86-64-reloc-32S-error.s @@ -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 diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt index 6cf72912947..5a0736e4c1e 100644 --- a/lld/tools/lld/CMakeLists.txt +++ b/lld/tools/lld/CMakeLists.txt @@ -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}) |
