[lld-macho] Switch default to new Darwin backend
The new Darwin backend for LLD is now able to link reasonably large
real-world programs on x86_64. For instance, we have achieved
self-hosting for the X86_64 target, where all LLD tests pass when
building lld with itself on macOS. As such, we would like to make it the
default back-end.
The new port is now named `ld64.lld`, and the old port remains
accessible as `ld64.lld.darwinold`
This [annoucement email][1] has some context. (But note that, unlike
what the email says, we are no longer doing this as part of the LLVM 12
branch cut -- instead we will go into LLVM 13.)
Numerous mechanical test changes were required to make this change; in
the interest of creating something that's reviewable on Phabricator,
I've split out the boring changes into a separate diff (D95905). I plan to
merge its contents with those in this diff before landing.
(@gkm made the original draft of this diff, and he has agreed to let me
take over.)
[1]: https://lists.llvm.org/pipermail/llvm-dev/2021-January/147665.html
Reviewed By: #lld-macho, thakis
Differential Revision: https://reviews.llvm.org/D95204
GitOrigin-RevId: 415c0cd698a8f0784172d19d542a3b525d1bb9b0
diff --git a/test/MachO/invalid/stub-link.s b/test/MachO/invalid/stub-link.s
index 4867732..7dfa319 100644
--- a/test/MachO/invalid/stub-link.s
+++ b/test/MachO/invalid/stub-link.s
@@ -6,7 +6,7 @@
# RUN: mkdir -p %t
#
# RUN: llvm-mc -filetype obj -triple x86_64-apple-ios %s -o %t/test.o
-# RUN: not lld -flavor darwinnew -o %t/test -syslibroot %S/../Inputs/iPhoneSimulator.sdk -lSystem %t/test.o 2>&1 | FileCheck %s
+# RUN: not ld64.lld -o %t/test -syslibroot %S/../Inputs/iPhoneSimulator.sdk -lSystem %t/test.o 2>&1 | FileCheck %s
# CHECK-DAG: error: undefined symbol: __cache_handle_memory_pressure_event
# CHECK-DAG: error: undefined symbol: _from_non_reexported_tapi_dylib
diff --git a/test/MachO/lit.local.cfg b/test/MachO/lit.local.cfg
index 64d2880..9394353 100644
--- a/test/MachO/lit.local.cfg
+++ b/test/MachO/lit.local.cfg
@@ -2,7 +2,7 @@
import os
-lld = ('lld -flavor darwinnew -syslibroot ' +
+lld = ('ld64.lld -syslibroot ' +
os.path.join(config.test_source_root, "MachO", "Inputs", "MacOSX.sdk"))
config.substitutions.append(('%lld', lld + ' -fatal_warnings'))
config.substitutions.append(('%no_fatal_warnings_lld', lld))
diff --git a/test/MachO/search-paths-darwin.test b/test/MachO/search-paths-darwin.test
index 85b7e30..4e11231 100644
--- a/test/MachO/search-paths-darwin.test
+++ b/test/MachO/search-paths-darwin.test
@@ -3,7 +3,7 @@
RUN: mkdir -p %t1 %t2
-RUN: lld -flavor darwinnew -arch x86_64 -v -L%t1 -F%t2 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 %s
+RUN: ld64.lld -arch x86_64 -v -L%t1 -F%t2 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 %s
CHECK: Library search paths:
CHECK-NEXT: [[LDIR]]
CHECK-NEXT: /usr/lib
@@ -13,7 +13,7 @@
CHECK-NEXT: /Library/Frameworks
CHECK-NEXT: /System/Library/Frameworks
-RUN: lld -flavor darwinnew -arch x86_64 -v -L%t1 -F%t2 -Z 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 --check-prefix=CHECK_Z %s
+RUN: ld64.lld -arch x86_64 -v -L%t1 -F%t2 -Z 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 --check-prefix=CHECK_Z %s
CHECK_Z: Library search paths:
CHECK_Z-NEXT: [[LDIR]]
CHECK_Z-NEXT: Framework search paths:
diff --git a/test/MachO/syslibroot.test b/test/MachO/syslibroot.test
index ade8652..42099a9 100644
--- a/test/MachO/syslibroot.test
+++ b/test/MachO/syslibroot.test
@@ -1,56 +1,56 @@
# Ensure that a nonexistent path is ignored with a syslibroot
-RUN: lld -flavor darwinnew -v -syslibroot /var/empty | FileCheck %s -check-prefix CHECK-NONEXISTENT-SYSLIBROOT
+RUN: ld64.lld -v -syslibroot /var/empty | FileCheck %s -check-prefix CHECK-NONEXISTENT-SYSLIBROOT
CHECK-NONEXISTENT-SYSLIBROOT: Library search paths:
CHECK-NONEXISTENT-SYSLIBROOT-NEXT: Framework search paths:
RUN: mkdir -p %t/usr/lib
-RUN: lld -flavor darwinnew -v -syslibroot %t 2>&1 | FileCheck %s -check-prefix CHECK-SYSLIBROOT -DROOT=%t
+RUN: ld64.lld -v -syslibroot %t 2>&1 | FileCheck %s -check-prefix CHECK-SYSLIBROOT -DROOT=%t
CHECK-SYSLIBROOT-NOT: directory not found{{.*}}usr/local/lib
CHECK-SYSLIBROOT: Library search paths:
CHECK-SYSLIBROOT-NEXT: [[ROOT]]/usr/lib
RUN: mkdir -p %t/Library/libxml2-development
-RUN: lld -flavor darwinnew -v -syslibroot %t -L /Library/libxml2-development | FileCheck %s -check-prefix CHECK-ABSOLUTE-PATH-REROOTED -DROOT=%t
+RUN: ld64.lld -v -syslibroot %t -L /Library/libxml2-development | FileCheck %s -check-prefix CHECK-ABSOLUTE-PATH-REROOTED -DROOT=%t
CHECK-ABSOLUTE-PATH-REROOTED: Library search paths:
CHECK-ABSOLUTE-PATH-REROOTED: [[ROOT]]/Library/libxml2-development
CHECK-ABSOLUTE-PATH-REROOTED: [[ROOT]]/usr/lib
-RUN: lld -flavor darwinnew -v -syslibroot %t -L %t/Library/libxml2-development | FileCheck %s -check-prefix CHECK-PATH-WITHOUT-REROOT -DPATH=%t/Library/libxml2-development
+RUN: ld64.lld -v -syslibroot %t -L %t/Library/libxml2-development | FileCheck %s -check-prefix CHECK-PATH-WITHOUT-REROOT -DPATH=%t/Library/libxml2-development
CHECK-PATH-WITHOUT-REROOT: Library search paths:
CHECK-PATH-WITHOUT-REROOT-NEXT: [[PATH]]
RUN: mkdir -p %t.2/usr/lib
-RUN: lld -flavor darwinnew -v -syslibroot %t -syslibroot %t.2 | FileCheck %s -check-prefix CHECK-SYSLIBROOT-MATRIX -DROOT=%t
+RUN: ld64.lld -v -syslibroot %t -syslibroot %t.2 | FileCheck %s -check-prefix CHECK-SYSLIBROOT-MATRIX -DROOT=%t
CHECK-SYSLIBROOT-MATRIX: Library search paths:
CHECK-SYSLIBROOT-MATRIX: [[ROOT]]/usr/lib
CHECK-SYSLIBROOT-MATRIX: [[ROOT]].2/usr/lib
-RUN: lld -flavor darwinnew -v -syslibroot %t -syslibroot %t.2 -syslibroot / | FileCheck %s -check-prefix CHECK-SYSLIBROOT-IGNORED -DROOT=%t
+RUN: ld64.lld -v -syslibroot %t -syslibroot %t.2 -syslibroot / | FileCheck %s -check-prefix CHECK-SYSLIBROOT-IGNORED -DROOT=%t
CHECK-SYSLIBROOT-IGNORED: Library search paths:
CHECK-SYSLIBROOT-IGNORED-NOT: [[ROOT]]/usr/lib
CHECK-SYSLIBROOT-IGNORED-NOT: [[ROOT]].2/usr/lib
RUN: mkdir -p %t/System/Library/Frameworks
-RUN: lld -flavor darwinnew -v -syslibroot %t | FileCheck %s -check-prefix CHECK-SYSLIBROOT-FRAMEWORK -DROOT=%t
+RUN: ld64.lld -v -syslibroot %t | FileCheck %s -check-prefix CHECK-SYSLIBROOT-FRAMEWORK -DROOT=%t
CHECK-SYSLIBROOT-FRAMEWORK: Framework search paths:
CHECK-SYSLIBROOT-FRAMEWORK: [[ROOT]]/System/Library/Frameworks
RUN: mkdir -p %t/Library/Frameworks
RUN: mkdir -p %t.2/Library/Frameworks
-RUN: lld -flavor darwinnew -v -syslibroot %t -syslibroot %t.2 -F /Library/Frameworks | FileCheck %s -check-prefix CHECK-SYSLIBROOT-FRAMEWORK-MATRIX -DROOT=%t
+RUN: ld64.lld -v -syslibroot %t -syslibroot %t.2 -F /Library/Frameworks | FileCheck %s -check-prefix CHECK-SYSLIBROOT-FRAMEWORK-MATRIX -DROOT=%t
CHECK-SYSLIBROOT-FRAMEWORK-MATRIX: Framework search paths:
CHECK-SYSLIBROOT-FRAMEWORK-MATRIX: [[ROOT]]/Library/Frameworks
CHECK-SYSLIBROOT-FRAMEWORK-MATRIX: [[ROOT]].2/Library/Frameworks
-RUN: lld -flavor darwinnew -v -syslibroot %t -syslibroot %t.2 -syslibroot / -F /Library/Frameworks | FileCheck %s -check-prefix CHECK-SYSLIBROOT-FRAMEWORK-IGNORED -DROOT=%t
+RUN: ld64.lld -v -syslibroot %t -syslibroot %t.2 -syslibroot / -F /Library/Frameworks | FileCheck %s -check-prefix CHECK-SYSLIBROOT-FRAMEWORK-IGNORED -DROOT=%t
CHECK-SYSLIBROOT-FRAMEWORK-IGNORED: Framework search paths:
CHECK-SYSLIBROOT-FRAMEWORK-IGNORED-NOT: [[ROOT]]/Library/Frameworks
diff --git a/test/darwin/cmdline-lto_library.objtxt b/test/darwin/cmdline-lto_library.objtxt
index 6b91235..48226ec 100644
--- a/test/darwin/cmdline-lto_library.objtxt
+++ b/test/darwin/cmdline-lto_library.objtxt
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -lto_library %t -print-atoms -r %s 2>&1 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -lto_library %t -print-atoms -r %s 2>&1 | FileCheck %s
#
# Test that the -lto_library option does not result in an error.
#
diff --git a/test/darwin/cmdline-objc_gc.objtxt b/test/darwin/cmdline-objc_gc.objtxt
index 4fff925..f6db8e0 100644
--- a/test/darwin/cmdline-objc_gc.objtxt
+++ b/test/darwin/cmdline-objc_gc.objtxt
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -objc_gc %s 2>&1 | FileCheck %s
+# RUN: not ld64.lld.darwinold -arch x86_64 -objc_gc %s 2>&1 | FileCheck %s
#
# Test that the -objc_gc is rejected.
#
diff --git a/test/darwin/cmdline-objc_gc_compaction.objtxt b/test/darwin/cmdline-objc_gc_compaction.objtxt
index 7cb7e82..47620b9 100644
--- a/test/darwin/cmdline-objc_gc_compaction.objtxt
+++ b/test/darwin/cmdline-objc_gc_compaction.objtxt
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -objc_gc_compaction %s 2>&1 | FileCheck %s
+# RUN: not ld64.lld.darwinold -arch x86_64 -objc_gc_compaction %s 2>&1 | FileCheck %s
#
# Test that the -objc_gc_compaction is rejected.
#
diff --git a/test/darwin/cmdline-objc_gc_only.objtxt b/test/darwin/cmdline-objc_gc_only.objtxt
index eb9f131..4c5f1b3 100644
--- a/test/darwin/cmdline-objc_gc_only.objtxt
+++ b/test/darwin/cmdline-objc_gc_only.objtxt
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -objc_gc_only %s 2>&1 | FileCheck %s
+# RUN: not ld64.lld.darwinold -arch x86_64 -objc_gc_only %s 2>&1 | FileCheck %s
#
# Test that the -objc_gc_only is rejected.
#
diff --git a/test/darwin/native-and-mach-o.objtxt b/test/darwin/native-and-mach-o.objtxt
index b4c0a40..41a9ef6 100644
--- a/test/darwin/native-and-mach-o.objtxt
+++ b/test/darwin/native-and-mach-o.objtxt
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s \
# RUN: %p/Inputs/native-and-mach-o.objtxt \
# RUN: %p/Inputs/native-and-mach-o2.objtxt -o %t && \
# RUN: llvm-nm %t | FileCheck %s
diff --git a/test/mach-o/Inputs/swift-version-1.yaml b/test/mach-o/Inputs/swift-version-1.yaml
index b555e47..5c59af7 100644
--- a/test/mach-o/Inputs/swift-version-1.yaml
+++ b/test/mach-o/Inputs/swift-version-1.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -r %s %p/Inputs/hello-world-x86_64.yaml 2>&1 | FileCheck %s
+# RUN: not ld64.lld.darwinold -arch x86_64 -r %s %p/Inputs/hello-world-x86_64.yaml 2>&1 | FileCheck %s
--- !mach-o
arch: x86_64
diff --git a/test/mach-o/Inputs/wrong-arch-error.yaml b/test/mach-o/Inputs/wrong-arch-error.yaml
index 39ef3c1..714ce9f 100644
--- a/test/mach-o/Inputs/wrong-arch-error.yaml
+++ b/test/mach-o/Inputs/wrong-arch-error.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -r %s 2> %t.err
+# RUN: not ld64.lld.darwinold -arch x86_64 -r %s 2> %t.err
# RUN: FileCheck %s < %t.err
--- !mach-o
diff --git a/test/mach-o/PIE.yaml b/test/mach-o/PIE.yaml
index ce6487c..0195f50 100644
--- a/test/mach-o/PIE.yaml
+++ b/test/mach-o/PIE.yaml
@@ -1,12 +1,12 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s \
# RUN: %p/Inputs/PIE.yaml -o %t && \
# RUN: llvm-objdump --macho --private-headers %t | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s \
# RUN: %p/Inputs/PIE.yaml -pie -o %t\
# RUN: && llvm-objdump --macho --private-headers %t | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s \
# RUN: %p/Inputs/PIE.yaml -no_pie -o %t\
# RUN: && llvm-objdump --macho --private-headers %t \
# RUN: | FileCheck --check-prefix=CHECK_NO_PIE %s
diff --git a/test/mach-o/align_text.yaml b/test/mach-o/align_text.yaml
index d633a8e..6278ee2 100644
--- a/test/mach-o/align_text.yaml
+++ b/test/mach-o/align_text.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch x86_64 -r %s -o %t -print_atoms | FileCheck %s
-# RUN: ld64.lld -arch x86_64 -r %t -o %t2 -print_atoms | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r %s -o %t -print_atoms | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r %t -o %t2 -print_atoms | FileCheck %s
#
# Test that alignment info round trips through -r
#
diff --git a/test/mach-o/arm-interworking-movw.yaml b/test/mach-o/arm-interworking-movw.yaml
index 6bad3a9..3f61faf 100644
--- a/test/mach-o/arm-interworking-movw.yaml
+++ b/test/mach-o/arm-interworking-movw.yaml
@@ -1,6 +1,6 @@
# REQUIRES: arm
-# RUN: ld64.lld -arch armv7 -r -print_atoms %s -o %t | FileCheck %s
-# RUN: ld64.lld -arch armv7 -dylib -print_atoms %t -o %t2 \
+# RUN: ld64.lld.darwinold -arch armv7 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch armv7 -dylib -print_atoms %t -o %t2 \
# RUN: %p/Inputs/armv7/libSystem.yaml -sectalign __TEXT __text 0x1000 | FileCheck %s
# RUN: llvm-objdump -d --macho --no-symbolic-operands %t2 | FileCheck --check-prefix=CODE %s
#
diff --git a/test/mach-o/arm-interworking.yaml b/test/mach-o/arm-interworking.yaml
index f58bff2..4196c12 100644
--- a/test/mach-o/arm-interworking.yaml
+++ b/test/mach-o/arm-interworking.yaml
@@ -1,6 +1,6 @@
-# RUN: ld64.lld -arch armv7 -r -print_atoms %s \
+# RUN: ld64.lld.darwinold -arch armv7 -r -print_atoms %s \
# RUN: %p/Inputs/arm-interworking.yaml -o %t | FileCheck %s \
-# RUN: && ld64.lld -arch armv7 -dylib -print_atoms \
+# RUN: && ld64.lld.darwinold -arch armv7 -dylib -print_atoms \
# RUN: %p/Inputs/armv7/libSystem.yaml %t -o %t2 | FileCheck %s \
# RUN: && llvm-readobj -S --section-data %t2 | FileCheck -check-prefix=CODE %s
#
diff --git a/test/mach-o/arm-shims.yaml b/test/mach-o/arm-shims.yaml
index e4e3528..7c4f046 100644
--- a/test/mach-o/arm-shims.yaml
+++ b/test/mach-o/arm-shims.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch armv7 %s %p/Inputs/arm-shims.yaml \
+# RUN: ld64.lld.darwinold -arch armv7 %s %p/Inputs/arm-shims.yaml \
# RUN: -dylib %p/Inputs/armv7/libSystem.yaml -o %t
# RUN: llvm-readobj -S --section-data %t | FileCheck %s
#
diff --git a/test/mach-o/arm-subsections-via-symbols.yaml b/test/mach-o/arm-subsections-via-symbols.yaml
index 63e23da..96346e8 100644
--- a/test/mach-o/arm-subsections-via-symbols.yaml
+++ b/test/mach-o/arm-subsections-via-symbols.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch armv7 %s -r -print_atoms -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch armv7 %s -r -print_atoms -o %t | FileCheck %s
#
# Test that assembly written without .subsections_via_symbols is parsed so
# that atoms are non-dead-strip and there is a layout-after references
diff --git a/test/mach-o/arm64-reloc-negDelta32-fixup.yaml b/test/mach-o/arm64-reloc-negDelta32-fixup.yaml
index b512bb7..0220090 100644
--- a/test/mach-o/arm64-reloc-negDelta32-fixup.yaml
+++ b/test/mach-o/arm64-reloc-negDelta32-fixup.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch arm64 -r %s -o %t
-# RUN: ld64.lld -arch arm64 -r %t -o %t2
+# RUN: ld64.lld.darwinold -arch arm64 -r %s -o %t
+# RUN: ld64.lld.darwinold -arch arm64 -r %t -o %t2
# RUN: llvm-objdump -s --section="__eh_frame" %t | FileCheck %s
# RUN: llvm-objdump -s --section="__eh_frame" %t2 | FileCheck %s
diff --git a/test/mach-o/arm64-relocs-errors-delta64-offset.yaml b/test/mach-o/arm64-relocs-errors-delta64-offset.yaml
index 01a3e1b..d0f7389 100644
--- a/test/mach-o/arm64-relocs-errors-delta64-offset.yaml
+++ b/test/mach-o/arm64-relocs-errors-delta64-offset.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch arm64 %s -r \
+# RUN: not ld64.lld.darwinold -arch arm64 %s -r \
# RUN: 2> %t.err
# RUN: FileCheck %s < %t.err
diff --git a/test/mach-o/arm64-section-order.yaml b/test/mach-o/arm64-section-order.yaml
index 6e88d6f..e4174b6 100644
--- a/test/mach-o/arm64-section-order.yaml
+++ b/test/mach-o/arm64-section-order.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch arm64 -r -print_atoms %s -o %t
-# RUN: ld64.lld -arch arm64 -r -print_atoms %t -o %t2
+# RUN: ld64.lld.darwinold -arch arm64 -r -print_atoms %s -o %t
+# RUN: ld64.lld.darwinold -arch arm64 -r -print_atoms %t -o %t2
# RUN: llvm-objdump --section-headers %t | FileCheck %s
# RUN: llvm-objdump --section-headers %t2 | FileCheck %s
diff --git a/test/mach-o/bind-opcodes.yaml b/test/mach-o/bind-opcodes.yaml
index 2b9496f..4a33b54 100644
--- a/test/mach-o/bind-opcodes.yaml
+++ b/test/mach-o/bind-opcodes.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch arm64 %s %p/Inputs/hello-world-arm64.yaml -o %t
+# RUN: ld64.lld.darwinold -arch arm64 %s %p/Inputs/hello-world-arm64.yaml -o %t
# RUN: obj2yaml %t | FileCheck %s
#
diff --git a/test/mach-o/cstring-sections.yaml b/test/mach-o/cstring-sections.yaml
index 2936ca9..251df8e 100644
--- a/test/mach-o/cstring-sections.yaml
+++ b/test/mach-o/cstring-sections.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r %s -o %t -print_atoms | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r %s -o %t -print_atoms | FileCheck %s
#
# Test -keep_private_externs in -r mode.
#
diff --git a/test/mach-o/data-in-code-load-command.yaml b/test/mach-o/data-in-code-load-command.yaml
index a99026b..e213178 100644
--- a/test/mach-o/data-in-code-load-command.yaml
+++ b/test/mach-o/data-in-code-load-command.yaml
@@ -1,11 +1,11 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump --private-headers %t | FileCheck %s
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -data_in_code_info && llvm-objdump --private-headers %t | FileCheck %s
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -no_data_in_code_info && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -data_in_code_info -no_data_in_code_info && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -r && llvm-objdump --private-headers %t | FileCheck %s
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -r -data_in_code_info && llvm-objdump --private-headers %t | FileCheck %s
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -r -no_data_in_code_info && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -data_in_code_info && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -no_data_in_code_info && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -data_in_code_info -no_data_in_code_info && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -r && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -r -data_in_code_info && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -r -no_data_in_code_info && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
--- !mach-o
arch: x86_64
diff --git a/test/mach-o/data-only-dylib.yaml b/test/mach-o/data-only-dylib.yaml
index a163609..f865755 100644
--- a/test/mach-o/data-only-dylib.yaml
+++ b/test/mach-o/data-only-dylib.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -dylib %s -o %t %p/Inputs/x86_64/libSystem.yaml
+# RUN: ld64.lld.darwinold -arch x86_64 -dylib %s -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-nm %t | FileCheck %s
#
# Test that a data-only dylib can be built.
diff --git a/test/mach-o/dead-strip-globals.yaml b/test/mach-o/dead-strip-globals.yaml
index 42edd19..cacc44f 100644
--- a/test/mach-o/dead-strip-globals.yaml
+++ b/test/mach-o/dead-strip-globals.yaml
@@ -1,8 +1,8 @@
-# RUN: ld64.lld -arch x86_64 -dead_strip -export_dynamic %s -dylib %p/Inputs/x86_64/libSystem.yaml -o %t.dylib -print_atoms | FileCheck -check-prefix=CHECK1 %s
-# RUN: ld64.lld -arch x86_64 -export_dynamic -dead_strip %s -dylib %p/Inputs/x86_64/libSystem.yaml -o %t.dylib -print_atoms | FileCheck -check-prefix=CHECK1 %s
-# RUN: ld64.lld -arch x86_64 -dead_strip %s -dylib %p/Inputs/x86_64/libSystem.yaml -o %t2.dylib -print_atoms | FileCheck -check-prefix=CHECK2 %s
+# RUN: ld64.lld.darwinold -arch x86_64 -dead_strip -export_dynamic %s -dylib %p/Inputs/x86_64/libSystem.yaml -o %t.dylib -print_atoms | FileCheck -check-prefix=CHECK1 %s
+# RUN: ld64.lld.darwinold -arch x86_64 -export_dynamic -dead_strip %s -dylib %p/Inputs/x86_64/libSystem.yaml -o %t.dylib -print_atoms | FileCheck -check-prefix=CHECK1 %s
+# RUN: ld64.lld.darwinold -arch x86_64 -dead_strip %s -dylib %p/Inputs/x86_64/libSystem.yaml -o %t2.dylib -print_atoms | FileCheck -check-prefix=CHECK2 %s
-# RUN: ld64.lld -arch x86_64 -r %s -dylib %p/Inputs/x86_64/libSystem.yaml -o %t3.o
+# RUN: ld64.lld.darwinold -arch x86_64 -r %s -dylib %p/Inputs/x86_64/libSystem.yaml -o %t3.o
# RUN: llvm-nm -m %t3.o | FileCheck -check-prefix=RELOCATABLE_SYMBOLS %s
#
diff --git a/test/mach-o/debug-syms.yaml b/test/mach-o/debug-syms.yaml
index cd61c87..54ea4dd 100644
--- a/test/mach-o/debug-syms.yaml
+++ b/test/mach-o/debug-syms.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -o %t %s -dylib %p/Inputs/x86_64/libSystem.yaml && \
+# RUN: ld64.lld.darwinold -arch x86_64 -o %t %s -dylib %p/Inputs/x86_64/libSystem.yaml && \
# RUN: llvm-nm -no-sort -debug-syms %t | FileCheck %s
# CHECK: 0000000000000000 - 00 0000 SO /Users/lhames/Projects/lld/lld-svn-tot/scratch/
diff --git a/test/mach-o/demangle.yaml b/test/mach-o/demangle.yaml
index cdd5e8a..2f1cba5 100644
--- a/test/mach-o/demangle.yaml
+++ b/test/mach-o/demangle.yaml
@@ -1,10 +1,10 @@
# REQUIRES: system-linker-mach-o
#
-# RUN: not ld64.lld -arch x86_64 -macosx_version_min 10.8 %s \
+# RUN: not ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s \
# RUN: -dylib -o %t %p/Inputs/x86_64/libSystem.yaml 2> %t.err
# RUN: FileCheck %s < %t.err
#
-# RUN: not ld64.lld -arch x86_64 -macosx_version_min 10.8 %s \
+# RUN: not ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s \
# RUN: -dylib -o %t %p/Inputs/x86_64/libSystem.yaml -demangle 2> %t.err2
# RUN: FileCheck %s --check-prefix=DCHECK < %t.err2
#
diff --git a/test/mach-o/dependency_info.yaml b/test/mach-o/dependency_info.yaml
index 06b269a..1195c9e 100644
--- a/test/mach-o/dependency_info.yaml
+++ b/test/mach-o/dependency_info.yaml
@@ -1,6 +1,6 @@
# Test -dependency_info option
#
-# RUN: ld64.lld -arch x86_64 -test_file_usage \
+# RUN: ld64.lld.darwinold -arch x86_64 -test_file_usage \
# RUN: -dependency_info %t.info \
# RUN: -path_exists /System/Library/Frameworks \
# RUN: -path_exists /System/Library/Frameworks/Foo.framework/Foo \
diff --git a/test/mach-o/do-not-emit-unwind-fde-arm64.yaml b/test/mach-o/do-not-emit-unwind-fde-arm64.yaml
index 5ad2815..0cb3655 100644
--- a/test/mach-o/do-not-emit-unwind-fde-arm64.yaml
+++ b/test/mach-o/do-not-emit-unwind-fde-arm64.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch arm64 -r -print_atoms %s -o %t | FileCheck %s
-# RUN: ld64.lld -arch arm64 -r -print_atoms %t -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch arm64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch arm64 -r -print_atoms %t -o %t2 | FileCheck %s
# RUN: llvm-objdump -r -s --section="__eh_frame" --macho %t | FileCheck --check-prefix=CODE %s
# RUN: llvm-objdump -r -s --section="__eh_frame" --macho %t2 | FileCheck --check-prefix=CODE %s
diff --git a/test/mach-o/dso_handle.yaml b/test/mach-o/dso_handle.yaml
index 6c74371..f35f8b1 100644
--- a/test/mach-o/dso_handle.yaml
+++ b/test/mach-o/dso_handle.yaml
@@ -1,13 +1,13 @@
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml -o %t1
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml -o %t1
# RUN: llvm-nm -m -n %t1 | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml -dead_strip -o %t2
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml -dead_strip -o %t2
# RUN: llvm-nm -m -n %t2 | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml -dylib -o %t3
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml -dylib -o %t3
# RUN: llvm-nm -m -n %t3 | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml -bundle -o %t4
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml -bundle -o %t4
# RUN: llvm-nm -m -n %t4 | FileCheck %s
#
# Test that ___dso_handle symbol is available for executables, bundles, and dylibs
diff --git a/test/mach-o/dylib-install-names.yaml b/test/mach-o/dylib-install-names.yaml
index 20b7780..869b19b 100644
--- a/test/mach-o/dylib-install-names.yaml
+++ b/test/mach-o/dylib-install-names.yaml
@@ -1,23 +1,23 @@
# Check we accept -install_name correctly:
-# RUN: ld64.lld -arch x86_64 -install_name libwibble.dylib -dylib \
+# RUN: ld64.lld.darwinold -arch x86_64 -install_name libwibble.dylib -dylib \
# RUN: -compatibility_version 2.0 -current_version 5.3 \
# RUN: %p/Inputs/x86_64/libSystem.yaml %s -o %t.dylib
# RUN: llvm-objdump --private-headers %t.dylib | FileCheck %s --check-prefix=CHECK-BINARY-WRITE
# Check we read LC_ID_DYLIB correctly:
-# RUN: ld64.lld -arch x86_64 %p/Inputs/use-dylib-install-names.yaml \
+# RUN: ld64.lld.darwinold -arch x86_64 %p/Inputs/use-dylib-install-names.yaml \
# RUN: %p/Inputs/x86_64/libSystem.yaml %t.dylib -dylib -o %t2.dylib
# RUN: llvm-objdump --private-headers %t2.dylib | FileCheck %s --check-prefix=CHECK-BINARY-READ
# Check we default the install-name to the output file:
-# RUN: ld64.lld -arch x86_64 -dylib %s -o libwibble.dylib \
+# RUN: ld64.lld.darwinold -arch x86_64 -dylib %s -o libwibble.dylib \
# RUN: -compatibility_version 2.0 -current_version 5.3 \
# RUN: %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump --private-headers libwibble.dylib | FileCheck %s --check-prefix=CHECK-BINARY-WRITE
# RUN: rm -f libwibble.dylib
# Check -single_module does nothing
-# RUN: ld64.lld -arch x86_64 -dylib %s -install_name libwibble.dylib \
+# RUN: ld64.lld.darwinold -arch x86_64 -dylib %s -install_name libwibble.dylib \
# RUN: -compatibility_version 2.0 -current_version 5.3 \
# RUN: -single_module -o %t2.dylib %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump --private-headers %t2.dylib | FileCheck %s --check-prefix=CHECK-BINARY-WRITE
diff --git a/test/mach-o/eh-frame-relocs-arm64.yaml b/test/mach-o/eh-frame-relocs-arm64.yaml
index e669aaf..3d7245e 100644
--- a/test/mach-o/eh-frame-relocs-arm64.yaml
+++ b/test/mach-o/eh-frame-relocs-arm64.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch arm64 -r -print_atoms %s -o %t | FileCheck %s
-# RUN: ld64.lld -arch arm64 -r -print_atoms %t -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch arm64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch arm64 -r -print_atoms %t -o %t2 | FileCheck %s
# RUN: llvm-objdump -r -s --section="__eh_frame" --macho %t | FileCheck --check-prefix=CODE %s
# RUN: llvm-objdump -r -s --section="__eh_frame" --macho %t2 | FileCheck --check-prefix=CODE %s
diff --git a/test/mach-o/empty-sections.yaml b/test/mach-o/empty-sections.yaml
index ca6b150..83cd97a 100644
--- a/test/mach-o/empty-sections.yaml
+++ b/test/mach-o/empty-sections.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r %s -o %t
+# RUN: ld64.lld.darwinold -arch x86_64 -r %s -o %t
#
# Test that writing empty mach-o sections does not segfault the linker.
#
diff --git a/test/mach-o/error-simulator-vs-macosx.yaml b/test/mach-o/error-simulator-vs-macosx.yaml
index fcf1774..94b73d6 100644
--- a/test/mach-o/error-simulator-vs-macosx.yaml
+++ b/test/mach-o/error-simulator-vs-macosx.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch i386 -macosx_version_min 10.8 %s %p/Inputs/hello-world-x86.yaml -o %t && llvm-nm -m %t | FileCheck %s
-# RUN: not ld64.lld -arch i386 -ios_simulator_version_min 5.0 %s %p/Inputs/hello-world-x86.yaml -o %t 2>&1 | FileCheck %s --check-prefix=ERROR
+# RUN: ld64.lld.darwinold -arch i386 -macosx_version_min 10.8 %s %p/Inputs/hello-world-x86.yaml -o %t && llvm-nm -m %t | FileCheck %s
+# RUN: not ld64.lld.darwinold -arch i386 -ios_simulator_version_min 5.0 %s %p/Inputs/hello-world-x86.yaml -o %t 2>&1 | FileCheck %s --check-prefix=ERROR
#
# Test that i386 can link with a macos version but gives an error with a simulator version.
#
diff --git a/test/mach-o/exe-offsets.yaml b/test/mach-o/exe-offsets.yaml
index b653f9d..65025fe 100644
--- a/test/mach-o/exe-offsets.yaml
+++ b/test/mach-o/exe-offsets.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %s -o %t -e start %p/Inputs/x86_64/libSystem.yaml
+# RUN: ld64.lld.darwinold -arch x86_64 %s -o %t -e start %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-readobj --sections %t | FileCheck %s
# Make sure data gets put at offset
diff --git a/test/mach-o/exe-segment-overlap.yaml b/test/mach-o/exe-segment-overlap.yaml
index ac99859..f1bf67b 100644
--- a/test/mach-o/exe-segment-overlap.yaml
+++ b/test/mach-o/exe-segment-overlap.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %s -o %t %p/Inputs/x86_64/libSystem.yaml
+# RUN: ld64.lld.darwinold -arch x86_64 %s -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-readobj --sections --section-data %t | FileCheck %s
--- !native
diff --git a/test/mach-o/executable-exports.yaml b/test/mach-o/executable-exports.yaml
index cd5c1f8..8f0f314 100644
--- a/test/mach-o/executable-exports.yaml
+++ b/test/mach-o/executable-exports.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 \
# RUN: %s %p/Inputs/x86_64/libSystem.yaml -o %t && \
# RUN: llvm-objdump --macho --exports-trie %t | FileCheck %s
#
diff --git a/test/mach-o/export-trie-order.yaml b/test/mach-o/export-trie-order.yaml
index 70c2bc1..e8819e0 100644
--- a/test/mach-o/export-trie-order.yaml
+++ b/test/mach-o/export-trie-order.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch i386 %s %p/Inputs/hello-world-x86.yaml -o %t
+# RUN: ld64.lld.darwinold -arch i386 %s %p/Inputs/hello-world-x86.yaml -o %t
# RUN: llvm-objdump --macho --exports-trie %t | FileCheck %s
#
# Test that the export trie is emitted in order.
diff --git a/test/mach-o/exported_symbols_list-dylib.yaml b/test/mach-o/exported_symbols_list-dylib.yaml
index 860d268..1c417d8 100644
--- a/test/mach-o/exported_symbols_list-dylib.yaml
+++ b/test/mach-o/exported_symbols_list-dylib.yaml
@@ -1,19 +1,19 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 -dylib \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 -dylib \
# RUN: %s %p/Inputs/x86_64/libSystem.yaml -o %t \
# RUN: -exported_symbols_list %p/Inputs/exported_symbols_list.exp && \
# RUN: llvm-nm -m %t | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 -dylib \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 -dylib \
# RUN: %s %p/Inputs/x86_64/libSystem.yaml -o %t2 \
# RUN: -exported_symbol _foo -exported_symbol _b && \
# RUN: llvm-nm -m %t2 | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 -dylib \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 -dylib \
# RUN: %s %p/Inputs/x86_64/libSystem.yaml -o %t3 \
# RUN: -unexported_symbol _bar -unexported_symbol _a && \
# RUN: llvm-nm -m %t3 | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 -dylib \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 -dylib \
# RUN: %s %p/Inputs/x86_64/libSystem.yaml -dead_strip -o %t \
# RUN: -exported_symbols_list %p/Inputs/exported_symbols_list.exp && \
# RUN: llvm-nm -m %t | FileCheck -check-prefix=CHECK_DEAD %s
diff --git a/test/mach-o/exported_symbols_list-obj.yaml b/test/mach-o/exported_symbols_list-obj.yaml
index cc0f75c..420b9cc 100644
--- a/test/mach-o/exported_symbols_list-obj.yaml
+++ b/test/mach-o/exported_symbols_list-obj.yaml
@@ -1,11 +1,11 @@
-# RUN: ld64.lld -arch x86_64 -r %s -o %t -exported_symbol _bar \
+# RUN: ld64.lld.darwinold -arch x86_64 -r %s -o %t -exported_symbol _bar \
# RUN: && llvm-nm -m %t | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 -r %s -o %t2 -keep_private_externs \
+# RUN: ld64.lld.darwinold -arch x86_64 -r %s -o %t2 -keep_private_externs \
# RUN: -exported_symbol _bar && \
# RUN: llvm-nm -m %t2 | FileCheck -check-prefix=CHECK_KPE %s
#
-# RUN: not ld64.lld -arch x86_64 -r %s -o %t3 \
+# RUN: not ld64.lld.darwinold -arch x86_64 -r %s -o %t3 \
# RUN: -exported_symbol _foo 2> %t4
# Test -exported_symbols_list properly changes visibility in -r mode.
diff --git a/test/mach-o/exported_symbols_list-undef.yaml b/test/mach-o/exported_symbols_list-undef.yaml
index 6aca11b..85480af 100644
--- a/test/mach-o/exported_symbols_list-undef.yaml
+++ b/test/mach-o/exported_symbols_list-undef.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -macosx_version_min 10.8 -dylib \
+# RUN: not ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 -dylib \
# RUN: %s %p/Inputs/x86_64/libSystem.yaml -o %t -exported_symbol _foobar 2> %t2
#
# Test -exported_symbol fails if exported symbol not found.
diff --git a/test/mach-o/fat-archive.yaml b/test/mach-o/fat-archive.yaml
index a36c25b..33631ed 100644
--- a/test/mach-o/fat-archive.yaml
+++ b/test/mach-o/fat-archive.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t \
# RUN: -L %p/Inputs -lfoo %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-nm -m -n %t | FileCheck %s
#
diff --git a/test/mach-o/filelist.yaml b/test/mach-o/filelist.yaml
index 85c04f5..e2ffa9f 100644
--- a/test/mach-o/filelist.yaml
+++ b/test/mach-o/filelist.yaml
@@ -1,11 +1,11 @@
-# RUN: ld64.lld -test_file_usage \
+# RUN: ld64.lld.darwinold -test_file_usage \
# RUN: -filelist %p/Inputs/full.filelist \
# RUN: -path_exists /foo/bar/a.o \
# RUN: -path_exists /foo/bar/b.o \
# RUN: -path_exists /foo/x.a \
# RUN: 2>&1 | FileCheck %s
#
-# RUN: ld64.lld -test_file_usage -t \
+# RUN: ld64.lld.darwinold -test_file_usage -t \
# RUN: -filelist %p/Inputs/partial.filelist,/foo \
# RUN: -path_exists /foo/bar/a.o \
# RUN: -path_exists /foo/bar/b.o \
diff --git a/test/mach-o/flat_namespace_undef_error.yaml b/test/mach-o/flat_namespace_undef_error.yaml
index 6d4c38e..004ab3b 100644
--- a/test/mach-o/flat_namespace_undef_error.yaml
+++ b/test/mach-o/flat_namespace_undef_error.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -macosx_version_min 10.9 -flat_namespace -undefined error %s -o %t %p/Inputs/x86_64/libSystem.yaml 2>&1 | FileCheck %s
+# RUN: not ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.9 -flat_namespace -undefined error %s -o %t %p/Inputs/x86_64/libSystem.yaml 2>&1 | FileCheck %s
--- !native
defined-atoms:
diff --git a/test/mach-o/flat_namespace_undef_suppress.yaml b/test/mach-o/flat_namespace_undef_suppress.yaml
index 8fdcfb9..9ad0db8 100644
--- a/test/mach-o/flat_namespace_undef_suppress.yaml
+++ b/test/mach-o/flat_namespace_undef_suppress.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.9 -flat_namespace -undefined suppress %s -o %t %p/Inputs/x86_64/libSystem.yaml
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.9 -flat_namespace -undefined suppress %s -o %t %p/Inputs/x86_64/libSystem.yaml
#
# Sanity check '-flat_namespace -undefined suppress'.
# This should pass without error, even though '_bar' is undefined.
diff --git a/test/mach-o/force_load-dylib.yaml b/test/mach-o/force_load-dylib.yaml
index 4e27b02..fb40aa9 100644
--- a/test/mach-o/force_load-dylib.yaml
+++ b/test/mach-o/force_load-dylib.yaml
@@ -1,6 +1,6 @@
-# RUN: ld64.lld -arch x86_64 -dylib %p/Inputs/bar.yaml \
+# RUN: ld64.lld.darwinold -arch x86_64 -dylib %p/Inputs/bar.yaml \
# RUN: -install_name /usr/lib/libbar.dylib %p/Inputs/x86_64/libSystem.yaml -o %t1.dylib
-# RUN: ld64.lld -arch x86_64 -dylib %s -all_load %t1.dylib \
+# RUN: ld64.lld.darwinold -arch x86_64 -dylib %s -all_load %t1.dylib \
# RUN: -install_name /usr/lib/libfoo.dylib %p/Inputs/x86_64/libSystem.yaml -o %t
# RUN: llvm-nm -m %t | FileCheck %s
#
diff --git a/test/mach-o/force_load-x86_64.yaml b/test/mach-o/force_load-x86_64.yaml
index 7ea2a78..295217c 100644
--- a/test/mach-o/force_load-x86_64.yaml
+++ b/test/mach-o/force_load-x86_64.yaml
@@ -1,8 +1,8 @@
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml \
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml \
# RUN: %p/Inputs/libfoo.a %p/Inputs/libbar.a -o %t1
# RUN: llvm-nm -m -n %t1 | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml \
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml \
# RUN: -force_load %p/Inputs/libfoo.a %p/Inputs/libbar.a -o %t2
# RUN: llvm-nm -m -n %t2 | FileCheck --check-prefix=CHECKF %s
#
diff --git a/test/mach-o/framework-user-paths.yaml b/test/mach-o/framework-user-paths.yaml
index bb4d822..a96cfed 100644
--- a/test/mach-o/framework-user-paths.yaml
+++ b/test/mach-o/framework-user-paths.yaml
@@ -5,7 +5,7 @@
# /opt/Frameworks should not be found in SDK
# /System/Library/Frameworks is implicit and should be in SDK
#
-# RUN: ld64.lld -arch x86_64 -r -test_file_usage -v \
+# RUN: ld64.lld.darwinold -arch x86_64 -r -test_file_usage -v \
# RUN: -path_exists myFrameworks \
# RUN: -path_exists myFrameworks/my.framework/my \
# RUN: -path_exists /opt/Frameworks \
diff --git a/test/mach-o/function-starts-load-command.yaml b/test/mach-o/function-starts-load-command.yaml
index df1f9cf..cb558ad 100644
--- a/test/mach-o/function-starts-load-command.yaml
+++ b/test/mach-o/function-starts-load-command.yaml
@@ -1,8 +1,8 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump --private-headers %t | FileCheck %s
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -function_starts && llvm-objdump --private-headers %t | FileCheck %s
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -no_function_starts && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_FUNCTION_STARTS
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -function_starts -no_function_starts && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_FUNCTION_STARTS
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_FUNCTION_STARTS
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -function_starts && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -no_function_starts && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_FUNCTION_STARTS
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -function_starts -no_function_starts && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_FUNCTION_STARTS
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_FUNCTION_STARTS
--- !mach-o
arch: x86_64
diff --git a/test/mach-o/gcc_except_tab-got-arm64.yaml b/test/mach-o/gcc_except_tab-got-arm64.yaml
index d453e56..caccf4f 100644
--- a/test/mach-o/gcc_except_tab-got-arm64.yaml
+++ b/test/mach-o/gcc_except_tab-got-arm64.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch arm64 %s \
+# RUN: ld64.lld.darwinold -arch arm64 %s \
# RUN: -dylib %p/Inputs/arm64/libSystem.yaml -o %t
# RUN: llvm-objdump --section-headers %t | FileCheck %s
diff --git a/test/mach-o/got-order.yaml b/test/mach-o/got-order.yaml
index 4e2e7f3..5ebb860 100644
--- a/test/mach-o/got-order.yaml
+++ b/test/mach-o/got-order.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/got-order.yaml \
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/got-order.yaml \
# RUN: %p/Inputs/got-order2.yaml -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump --macho --bind %t | FileCheck %s
#
diff --git a/test/mach-o/hello-world-arm64.yaml b/test/mach-o/hello-world-arm64.yaml
index 3dee661..c2e2322 100644
--- a/test/mach-o/hello-world-arm64.yaml
+++ b/test/mach-o/hello-world-arm64.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch arm64 %s %p/Inputs/hello-world-arm64.yaml -o %t
+# RUN: ld64.lld.darwinold -arch arm64 %s %p/Inputs/hello-world-arm64.yaml -o %t
# RUN: llvm-nm -m -n %t | FileCheck %s
# RUN: llvm-objdump --private-headers %t | FileCheck %s --check-prefix=CHECK-PRIVATE-HEADER
#
diff --git a/test/mach-o/hello-world-armv6.yaml b/test/mach-o/hello-world-armv6.yaml
index b14b775..4004c96 100644
--- a/test/mach-o/hello-world-armv6.yaml
+++ b/test/mach-o/hello-world-armv6.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch armv6 %s %p/Inputs/hello-world-armv6.yaml -o %t
+# RUN: ld64.lld.darwinold -arch armv6 %s %p/Inputs/hello-world-armv6.yaml -o %t
# RUN: llvm-nm -m %t | FileCheck %s
#
# Test that armv6 (arm) hello-world can be linked into a mach-o executable
diff --git a/test/mach-o/hello-world-armv7.yaml b/test/mach-o/hello-world-armv7.yaml
index 28a96af..0407e92 100644
--- a/test/mach-o/hello-world-armv7.yaml
+++ b/test/mach-o/hello-world-armv7.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch armv7 %s %p/Inputs/hello-world-armv7.yaml -o %t
+# RUN: ld64.lld.darwinold -arch armv7 %s %p/Inputs/hello-world-armv7.yaml -o %t
# RUN: llvm-nm -m -n %t | FileCheck %s
#
# Test that armv7 (thumb) hello-world can be linked into a mach-o executable
diff --git a/test/mach-o/hello-world-x86.yaml b/test/mach-o/hello-world-x86.yaml
index 7a0cfdc..5c3bc67 100644
--- a/test/mach-o/hello-world-x86.yaml
+++ b/test/mach-o/hello-world-x86.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch i386 %s %p/Inputs/hello-world-x86.yaml -o %t
+# RUN: ld64.lld.darwinold -arch i386 %s %p/Inputs/hello-world-x86.yaml -o %t
# RUN: llvm-nm -m %t | FileCheck %s
#
# Test that i386 hello-world can be linked into a mach-o executable
diff --git a/test/mach-o/hello-world-x86_64.yaml b/test/mach-o/hello-world-x86_64.yaml
index 9df969d..c495652 100644
--- a/test/mach-o/hello-world-x86_64.yaml
+++ b/test/mach-o/hello-world-x86_64.yaml
@@ -1,8 +1,8 @@
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/hello-world-x86_64.yaml \
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/hello-world-x86_64.yaml \
# RUN: -o %t
# RUN: llvm-nm -m -n %t | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/hello-world-x86_64.yaml \
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/hello-world-x86_64.yaml \
# RUN: -dead_strip -o %t2
# RUN: llvm-nm -m -n %t2 | FileCheck %s
#
diff --git a/test/mach-o/image-base.yaml b/test/mach-o/image-base.yaml
index c184e1c..c56eed1 100644
--- a/test/mach-o/image-base.yaml
+++ b/test/mach-o/image-base.yaml
@@ -1,10 +1,10 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.9 %s -o %t -image_base 31415926000 %p/Inputs/x86_64/libSystem.yaml
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.9 %s -o %t -image_base 31415926000 %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-readobj --macho-segment %t | FileCheck %s
-# RUN: not ld64.lld -arch x86_64 -image_base 0x31415926530 %s >/dev/null 2> %t
+# RUN: not ld64.lld.darwinold -arch x86_64 -image_base 0x31415926530 %s >/dev/null 2> %t
# RUN: FileCheck < %t %s --check-prefix=CHECK-ERROR-MISPAGED
-# RUN: not ld64.lld -arch x86_64 -image_base 1000 %s >/dev/null 2> %t
+# RUN: not ld64.lld.darwinold -arch x86_64 -image_base 1000 %s >/dev/null 2> %t
# RUN: FileCheck < %t %s --check-prefix=CHECK-ERROR-OVERLAP
-# RUN: not ld64.lld -arch x86_64 -image_base hithere %s >/dev/null 2> %t
+# RUN: not ld64.lld.darwinold -arch x86_64 -image_base hithere %s >/dev/null 2> %t
# RUN: FileCheck < %t %s --check-prefix=CHECK-ERROR-NOTHEX
--- !native
diff --git a/test/mach-o/infer-arch.yaml b/test/mach-o/infer-arch.yaml
index 2dbf124..a66d17b 100644
--- a/test/mach-o/infer-arch.yaml
+++ b/test/mach-o/infer-arch.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch i386 -macosx_version_min 10.8 %s -r -o %t \
-# RUN: && ld64.lld -r %t -o %t2 -print_atoms | FileCheck %s
+# RUN: ld64.lld.darwinold -arch i386 -macosx_version_min 10.8 %s -r -o %t \
+# RUN: && ld64.lld.darwinold -r %t -o %t2 -print_atoms | FileCheck %s
#
# Test linker can detect architecture without -arch option.
#
diff --git a/test/mach-o/interposing-section.yaml b/test/mach-o/interposing-section.yaml
index aea66b7..340ea8c 100644
--- a/test/mach-o/interposing-section.yaml
+++ b/test/mach-o/interposing-section.yaml
@@ -1,8 +1,8 @@
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/interposing-section.yaml \
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/interposing-section.yaml \
# RUN: -dylib -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump --private-headers %t | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 %s -r -o %t1
+# RUN: ld64.lld.darwinold -arch x86_64 %s -r -o %t1
# RUN: llvm-objdump --private-headers %t1 | FileCheck %s
#
# Test that interposing section is preserved by linker.
diff --git a/test/mach-o/keep_private_externs.yaml b/test/mach-o/keep_private_externs.yaml
index fdee3d4..b8f0e4f 100644
--- a/test/mach-o/keep_private_externs.yaml
+++ b/test/mach-o/keep_private_externs.yaml
@@ -1,7 +1,7 @@
-# RUN: ld64.lld -arch x86_64 -r %s -o %t \
+# RUN: ld64.lld.darwinold -arch x86_64 -r %s -o %t \
# RUN: && llvm-nm -m %t | FileCheck %s
#
-# RUN: ld64.lld -arch x86_64 -r %s -o %t2 -keep_private_externs \
+# RUN: ld64.lld.darwinold -arch x86_64 -r %s -o %t2 -keep_private_externs \
# RUN: && llvm-nm -m %t2 | FileCheck -check-prefix=CHECK_KPE %s
#
# Test -keep_private_externs in -r mode.
diff --git a/test/mach-o/lazy-bind-x86_64.yaml b/test/mach-o/lazy-bind-x86_64.yaml
index 50438fd..3bad4c2 100644
--- a/test/mach-o/lazy-bind-x86_64.yaml
+++ b/test/mach-o/lazy-bind-x86_64.yaml
@@ -1,6 +1,6 @@
# REQUIRES: x86
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s \
# RUN: %p/Inputs/lazy-bind-x86_64.yaml %p/Inputs/lazy-bind-x86_64-2.yaml \
# RUN: %p/Inputs/lazy-bind-x86_64-3.yaml -o %t \
# RUN: %p/Inputs/x86_64/libSystem.yaml
diff --git a/test/mach-o/lc_segment_filesize.yaml b/test/mach-o/lc_segment_filesize.yaml
index fb9703c..fea5008 100644
--- a/test/mach-o/lc_segment_filesize.yaml
+++ b/test/mach-o/lc_segment_filesize.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -o %t %s && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -o %t %s && llvm-objdump --private-headers %t | FileCheck %s
# CHECK: filesize 19
diff --git a/test/mach-o/lib-search-paths.yaml b/test/mach-o/lib-search-paths.yaml
index 68998e0..29c5e62 100644
--- a/test/mach-o/lib-search-paths.yaml
+++ b/test/mach-o/lib-search-paths.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %s -syslibroot %p/Inputs/lib-search-paths -lmyshared -lmystatic -lfile.o -r -print_atoms 2>&1 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 %s -syslibroot %p/Inputs/lib-search-paths -lmyshared -lmystatic -lfile.o -r -print_atoms 2>&1 | FileCheck %s
--- !native
undefined-atoms:
diff --git a/test/mach-o/library-order.yaml b/test/mach-o/library-order.yaml
index 6e091fb..02d31c5 100644
--- a/test/mach-o/library-order.yaml
+++ b/test/mach-o/library-order.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %p/Inputs/libfoo.a %s -o %t \
+# RUN: ld64.lld.darwinold -arch x86_64 %p/Inputs/libfoo.a %s -o %t \
# RUN: %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-nm -m -n %t | FileCheck %s
#
diff --git a/test/mach-o/library-rescan.yaml b/test/mach-o/library-rescan.yaml
index a09f352..138a696 100644
--- a/test/mach-o/library-rescan.yaml
+++ b/test/mach-o/library-rescan.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %p/Inputs/libfoo.a %p/Inputs/libbar.a \
+# RUN: ld64.lld.darwinold -arch x86_64 %p/Inputs/libfoo.a %p/Inputs/libbar.a \
# RUN: %s -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-nm -m -n %t | FileCheck %s
#
diff --git a/test/mach-o/libresolve-bizarre-root-override.yaml b/test/mach-o/libresolve-bizarre-root-override.yaml
index 1c34680..0fda09a 100644
--- a/test/mach-o/libresolve-bizarre-root-override.yaml
+++ b/test/mach-o/libresolve-bizarre-root-override.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -test_file_usage -v \
+# RUN: not ld64.lld.darwinold -test_file_usage -v \
# RUN: -path_exists /usr/lib \
# RUN: -path_exists /Applications/MySDK/usr/local/lib \
# RUN: -path_exists /Applications/MySDK/usr/lib \
diff --git a/test/mach-o/libresolve-multiple-syslibroots.yaml b/test/mach-o/libresolve-multiple-syslibroots.yaml
index bc8e964..6662705 100644
--- a/test/mach-o/libresolve-multiple-syslibroots.yaml
+++ b/test/mach-o/libresolve-multiple-syslibroots.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -test_file_usage -v \
+# RUN: ld64.lld.darwinold -test_file_usage -v \
# RUN: -path_exists /usr/lib \
# RUN: -path_exists /Applications/MyFirstSDK/usr/local/lib \
# RUN: -path_exists /Applications/MySecondSDK/usr/local/lib \
diff --git a/test/mach-o/libresolve-one-syslibroot.yaml b/test/mach-o/libresolve-one-syslibroot.yaml
index 8e28ab4..7ca2670 100644
--- a/test/mach-o/libresolve-one-syslibroot.yaml
+++ b/test/mach-o/libresolve-one-syslibroot.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -test_file_usage -v \
+# RUN: ld64.lld.darwinold -test_file_usage -v \
# RUN: -path_exists /usr/lib \
# RUN: -path_exists /Applications/MySDK/usr/local/lib \
# RUN: -path_exists /Applications/MySDK/usr/local/lib/libSystem.a \
diff --git a/test/mach-o/libresolve-simple.yaml b/test/mach-o/libresolve-simple.yaml
index 9650991..00e3573 100644
--- a/test/mach-o/libresolve-simple.yaml
+++ b/test/mach-o/libresolve-simple.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -test_file_usage -v \
+# RUN: ld64.lld.darwinold -arch x86_64 -r -test_file_usage -v \
# RUN: -path_exists /usr/lib \
# RUN: -path_exists /usr/local/lib \
# RUN: -path_exists /usr/lib/libSystem.dylib \
diff --git a/test/mach-o/libresolve-user-paths.yaml b/test/mach-o/libresolve-user-paths.yaml
index b50703d..3fbb205 100644
--- a/test/mach-o/libresolve-user-paths.yaml
+++ b/test/mach-o/libresolve-user-paths.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -test_file_usage -v \
+# RUN: ld64.lld.darwinold -arch x86_64 -r -test_file_usage -v \
# RUN: -path_exists hasFoo \
# RUN: -path_exists hasFoo/libFoo.dylib \
# RUN: -path_exists /hasBar \
diff --git a/test/mach-o/libresolve-z.yaml b/test/mach-o/libresolve-z.yaml
index 509f80b..aaf98eb 100644
--- a/test/mach-o/libresolve-z.yaml
+++ b/test/mach-o/libresolve-z.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -test_file_usage -v \
+# RUN: ld64.lld.darwinold -arch x86_64 -r -test_file_usage -v \
# RUN: -path_exists /usr/lib \
# RUN: -path_exists /usr/local/lib \
# RUN: -path_exists /usr/lib/libSystem.dylib \
diff --git a/test/mach-o/load-commands-size.yaml b/test/mach-o/load-commands-size.yaml
index d1b4dd3..25314d7 100644
--- a/test/mach-o/load-commands-size.yaml
+++ b/test/mach-o/load-commands-size.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %s -o %t -dylib \
+# RUN: ld64.lld.darwinold -arch x86_64 %s -o %t -dylib \
# RUN: -macosx_version_min 10.10 -sdk_version 10.10 \
# RUN: -install_name /usr/lib/foo.dylib \
# RUN: %p/Inputs/x86_64/libSystem.yaml && \
diff --git a/test/mach-o/mach_header-cpusubtype.yaml b/test/mach-o/mach_header-cpusubtype.yaml
index b113058..7c97e40 100644
--- a/test/mach-o/mach_header-cpusubtype.yaml
+++ b/test/mach-o/mach_header-cpusubtype.yaml
@@ -1,6 +1,6 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.4 %s %p/Inputs/hello-world-x86_64.yaml -o %t && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_LIB64
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.5 %s %p/Inputs/hello-world-x86_64.yaml -o %t && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=LIB64
-# RUN: ld64.lld -arch x86_64 -dylib -macosx_version_min 10.5 %s %p/Inputs/hello-world-x86_64.yaml -o %t && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=DYLIB
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.4 %s %p/Inputs/hello-world-x86_64.yaml -o %t && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_LIB64
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.5 %s %p/Inputs/hello-world-x86_64.yaml -o %t && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=LIB64
+# RUN: ld64.lld.darwinold -arch x86_64 -dylib -macosx_version_min 10.5 %s %p/Inputs/hello-world-x86_64.yaml -o %t && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=DYLIB
--- !mach-o
arch: x86_64
diff --git a/test/mach-o/mh_bundle_header.yaml b/test/mach-o/mh_bundle_header.yaml
index 33944a4..3db78b1 100644
--- a/test/mach-o/mh_bundle_header.yaml
+++ b/test/mach-o/mh_bundle_header.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch x86_64 %s -bundle -o %t %p/Inputs/x86_64/libSystem.yaml && llvm-nm -m -n %t | FileCheck %s
-# RUN: ld64.lld -arch x86_64 %s -bundle -dead_strip -o %t %p/Inputs/x86_64/libSystem.yaml && llvm-nm -m -n %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 %s -bundle -o %t %p/Inputs/x86_64/libSystem.yaml && llvm-nm -m -n %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 %s -bundle -dead_strip -o %t %p/Inputs/x86_64/libSystem.yaml && llvm-nm -m -n %t | FileCheck %s
#
# Test that __mh_bundle_header symbol is available for bundles
#
diff --git a/test/mach-o/mh_dylib_header.yaml b/test/mach-o/mh_dylib_header.yaml
index 27d34c4..ce03d3b 100644
--- a/test/mach-o/mh_dylib_header.yaml
+++ b/test/mach-o/mh_dylib_header.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %s -dylib -o %t %p/Inputs/x86_64/libSystem.yaml
+# RUN: ld64.lld.darwinold -arch x86_64 %s -dylib -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-nm -m -n %t | FileCheck %s
#
# Test that __mh_dylib_header symbol is available for dylibs
diff --git a/test/mach-o/objc-category-list-atom.yaml b/test/mach-o/objc-category-list-atom.yaml
index 4e6cd84..cf4d496 100644
--- a/test/mach-o/objc-category-list-atom.yaml
+++ b/test/mach-o/objc-category-list-atom.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %t -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %t -o %t2 | FileCheck %s
--- !mach-o
diff --git a/test/mach-o/objc-image-info-host-vs-simulator.yaml b/test/mach-o/objc-image-info-host-vs-simulator.yaml
index 38f251b..0691300 100644
--- a/test/mach-o/objc-image-info-host-vs-simulator.yaml
+++ b/test/mach-o/objc-image-info-host-vs-simulator.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -r %s 2>&1 | FileCheck %s
+# RUN: not ld64.lld.darwinold -arch x86_64 -r %s 2>&1 | FileCheck %s
# The file is built for the host, but the objc image info flags are for
# the simulator.
diff --git a/test/mach-o/objc-image-info-invalid-size.yaml b/test/mach-o/objc-image-info-invalid-size.yaml
index a67f61a..ea00bfa 100644
--- a/test/mach-o/objc-image-info-invalid-size.yaml
+++ b/test/mach-o/objc-image-info-invalid-size.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -r %s 2>&1 | FileCheck %s
+# RUN: not ld64.lld.darwinold -arch x86_64 -r %s 2>&1 | FileCheck %s
--- !mach-o
arch: x86_64
diff --git a/test/mach-o/objc-image-info-invalid-version.yaml b/test/mach-o/objc-image-info-invalid-version.yaml
index 845ac56..c64206c 100644
--- a/test/mach-o/objc-image-info-invalid-version.yaml
+++ b/test/mach-o/objc-image-info-invalid-version.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -r %s 2>&1 | FileCheck %s
+# RUN: not ld64.lld.darwinold -arch x86_64 -r %s 2>&1 | FileCheck %s
--- !mach-o
arch: x86_64
diff --git a/test/mach-o/objc-image-info-mismatched-swift-version.yaml b/test/mach-o/objc-image-info-mismatched-swift-version.yaml
index 2389917..35539ca 100644
--- a/test/mach-o/objc-image-info-mismatched-swift-version.yaml
+++ b/test/mach-o/objc-image-info-mismatched-swift-version.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -r %s %p/Inputs/swift-version-1.yaml 2>&1 | FileCheck %s
+# RUN: not ld64.lld.darwinold -arch x86_64 -r %s %p/Inputs/swift-version-1.yaml 2>&1 | FileCheck %s
--- !mach-o
arch: x86_64
diff --git a/test/mach-o/objc-image-info-pass-output.yaml b/test/mach-o/objc-image-info-pass-output.yaml
index c81e6bc..7f7953e 100644
--- a/test/mach-o/objc-image-info-pass-output.yaml
+++ b/test/mach-o/objc-image-info-pass-output.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -ios_simulator_version_min 5.0 -arch x86_64 -r %s -o %t -print_atoms | FileCheck %s
+# RUN: ld64.lld.darwinold -ios_simulator_version_min 5.0 -arch x86_64 -r %s -o %t -print_atoms | FileCheck %s
# Make sure that we have an objc image info in the output. It should have
# been generated by the objc pass.
diff --git a/test/mach-o/objc-image-info-simulator-vs-host.yaml b/test/mach-o/objc-image-info-simulator-vs-host.yaml
index 4fda686..37e5f74 100644
--- a/test/mach-o/objc-image-info-simulator-vs-host.yaml
+++ b/test/mach-o/objc-image-info-simulator-vs-host.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -ios_simulator_version_min 5.0 -arch x86_64 -r %s 2>&1 | FileCheck %s
+# RUN: not ld64.lld.darwinold -ios_simulator_version_min 5.0 -arch x86_64 -r %s 2>&1 | FileCheck %s
# The file is built for the simulator, but the objc image info flags are for
# the host.
diff --git a/test/mach-o/objc-image-info-unsupported-gc.yaml b/test/mach-o/objc-image-info-unsupported-gc.yaml
index 1014b4a..4615e7e 100644
--- a/test/mach-o/objc-image-info-unsupported-gc.yaml
+++ b/test/mach-o/objc-image-info-unsupported-gc.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -r %s 2>&1 | FileCheck %s
+# RUN: not ld64.lld.darwinold -arch x86_64 -r %s 2>&1 | FileCheck %s
--- !mach-o
arch: x86_64
diff --git a/test/mach-o/objc_export_list.yaml b/test/mach-o/objc_export_list.yaml
index 55dff8d..1629c18 100644
--- a/test/mach-o/objc_export_list.yaml
+++ b/test/mach-o/objc_export_list.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -dylib %s -o %t \
+# RUN: ld64.lld.darwinold -arch x86_64 -dylib %s -o %t \
# RUN: -exported_symbol .objc_class_name_Foo %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-nm -m %t | FileCheck %s
#
diff --git a/test/mach-o/order_file-basic.yaml b/test/mach-o/order_file-basic.yaml
index 8c43ee6..9dc1c00 100644
--- a/test/mach-o/order_file-basic.yaml
+++ b/test/mach-o/order_file-basic.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml \
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml \
# RUN: -order_file %p/Inputs/order_file-basic.order \
# RUN: -force_load %p/Inputs/libfoo.a -o %t
# RUN: llvm-nm -m -n %t | FileCheck %s
diff --git a/test/mach-o/parse-aliases.yaml b/test/mach-o/parse-aliases.yaml
index 9d0a1c0..59dcb54 100644
--- a/test/mach-o/parse-aliases.yaml
+++ b/test/mach-o/parse-aliases.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
#
# Test multiple labels to same address parse into aliases.
#
diff --git a/test/mach-o/parse-arm-relocs.yaml b/test/mach-o/parse-arm-relocs.yaml
index 9add766..26e1dcf 100644
--- a/test/mach-o/parse-arm-relocs.yaml
+++ b/test/mach-o/parse-arm-relocs.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch armv7 -r -print_atoms %s -o %t | FileCheck %s
-# RUN: ld64.lld -arch armv7 -r -print_atoms %t -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch armv7 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch armv7 -r -print_atoms %t -o %t2 | FileCheck %s
#
# Test parsing of armv7 relocations.
#
diff --git a/test/mach-o/parse-cfstring32.yaml b/test/mach-o/parse-cfstring32.yaml
index 52588d5..aee244a 100644
--- a/test/mach-o/parse-cfstring32.yaml
+++ b/test/mach-o/parse-cfstring32.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch i386 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch i386 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of mach-o functions.
#
diff --git a/test/mach-o/parse-cfstring64.yaml b/test/mach-o/parse-cfstring64.yaml
index f427ae5..2725047 100644
--- a/test/mach-o/parse-cfstring64.yaml
+++ b/test/mach-o/parse-cfstring64.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of CFString constants.
#
diff --git a/test/mach-o/parse-compact-unwind32.yaml b/test/mach-o/parse-compact-unwind32.yaml
index 6af5fd4..3b0edff 100644
--- a/test/mach-o/parse-compact-unwind32.yaml
+++ b/test/mach-o/parse-compact-unwind32.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch i386 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch i386 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of __LD/__compact_unwind (compact unwind) section.
#
diff --git a/test/mach-o/parse-compact-unwind64.yaml b/test/mach-o/parse-compact-unwind64.yaml
index f0c1c86..a3d2cdf 100644
--- a/test/mach-o/parse-compact-unwind64.yaml
+++ b/test/mach-o/parse-compact-unwind64.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of __LD/__compact_unwind (compact unwind) section.
#
diff --git a/test/mach-o/parse-data-in-code-armv7.yaml b/test/mach-o/parse-data-in-code-armv7.yaml
index 061868c..6f8ffa9 100644
--- a/test/mach-o/parse-data-in-code-armv7.yaml
+++ b/test/mach-o/parse-data-in-code-armv7.yaml
@@ -1,6 +1,6 @@
-# RUN: ld64.lld -arch armv7 -r -print_atoms %s -o %t | FileCheck %s
-# RUN: ld64.lld -arch armv7 -r -print_atoms %t -o %t2 | FileCheck %s
-# RUN: ld64.lld -arch armv7 -dylib %s -o %t3.dylib %p/Inputs/armv7/libSystem.yaml \
+# RUN: ld64.lld.darwinold -arch armv7 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch armv7 -r -print_atoms %t -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch armv7 -dylib %s -o %t3.dylib %p/Inputs/armv7/libSystem.yaml \
# RUN: && llvm-objdump --macho --private-headers %t3.dylib | FileCheck --check-prefix=CHECK2 %s
#
# Test parsing LC_DATA_IN_CODE
diff --git a/test/mach-o/parse-data-in-code-x86.yaml b/test/mach-o/parse-data-in-code-x86.yaml
index 927a9aa..34de2d6 100644
--- a/test/mach-o/parse-data-in-code-x86.yaml
+++ b/test/mach-o/parse-data-in-code-x86.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch i386 -r -print_atoms %s -o %t | FileCheck %s \
-# RUN: && ld64.lld -arch i386 -r -print_atoms %t -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch i386 -r -print_atoms %s -o %t | FileCheck %s \
+# RUN: && ld64.lld.darwinold -arch i386 -r -print_atoms %t -o %t2 | FileCheck %s
#
# Test parsing LC_DATA_IN_CODE
#
diff --git a/test/mach-o/parse-data-relocs-arm64.yaml b/test/mach-o/parse-data-relocs-arm64.yaml
index a46da1b..504d69f 100644
--- a/test/mach-o/parse-data-relocs-arm64.yaml
+++ b/test/mach-o/parse-data-relocs-arm64.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch arm64 -r -print_atoms %s -o %t | FileCheck %s
-# RUN: ld64.lld -arch arm64 -r -print_atoms %t -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch arm64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch arm64 -r -print_atoms %t -o %t2 | FileCheck %s
#
# Test parsing and writing of arm64 data relocations.
#
diff --git a/test/mach-o/parse-data-relocs-x86_64.yaml b/test/mach-o/parse-data-relocs-x86_64.yaml
index 994289b..8aea7cc 100644
--- a/test/mach-o/parse-data-relocs-x86_64.yaml
+++ b/test/mach-o/parse-data-relocs-x86_64.yaml
@@ -1,6 +1,6 @@
-# RUN: ld64.lld -arch x86_64 -r %s -o %t -print_atoms | FileCheck %s \
-# RUN: && ld64.lld -arch x86_64 %t -r -print_atoms -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r %s -o %t -print_atoms | FileCheck %s \
+# RUN: && ld64.lld.darwinold -arch x86_64 %t -r -print_atoms -o %t2 | FileCheck %s
#
# Test parsing and writing of x86_64 data relocations.
#
diff --git a/test/mach-o/parse-data.yaml b/test/mach-o/parse-data.yaml
index 3b9eb9f..ec8a2ad 100644
--- a/test/mach-o/parse-data.yaml
+++ b/test/mach-o/parse-data.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of mach-o data symbols.
#
diff --git a/test/mach-o/parse-eh-frame-relocs-x86_64.yaml b/test/mach-o/parse-eh-frame-relocs-x86_64.yaml
index 0bc47ff..c82c85f 100644
--- a/test/mach-o/parse-eh-frame-relocs-x86_64.yaml
+++ b/test/mach-o/parse-eh-frame-relocs-x86_64.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of x86_64 __eh_frame (dwarf unwind) relocations.
diff --git a/test/mach-o/parse-eh-frame-x86-anon.yaml b/test/mach-o/parse-eh-frame-x86-anon.yaml
index 7a85dcb..feb914b 100644
--- a/test/mach-o/parse-eh-frame-x86-anon.yaml
+++ b/test/mach-o/parse-eh-frame-x86-anon.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch i386 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch i386 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of new __eh_frame (dwarf unwind) section that has no .eh labels
# and no relocations.
diff --git a/test/mach-o/parse-eh-frame-x86-labeled.yaml b/test/mach-o/parse-eh-frame-x86-labeled.yaml
index 7ec86de..b1853ae 100644
--- a/test/mach-o/parse-eh-frame-x86-labeled.yaml
+++ b/test/mach-o/parse-eh-frame-x86-labeled.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch i386 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch i386 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of old __eh_frame (dwarf unwind) section that has .eh labels
# and relocations.
diff --git a/test/mach-o/parse-eh-frame.yaml b/test/mach-o/parse-eh-frame.yaml
index 6571c4f..014e1f2 100644
--- a/test/mach-o/parse-eh-frame.yaml
+++ b/test/mach-o/parse-eh-frame.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of __eh_frame (dwarf unwind) section.
#
diff --git a/test/mach-o/parse-function.yaml b/test/mach-o/parse-function.yaml
index 677cf9a..b6d24fe 100644
--- a/test/mach-o/parse-function.yaml
+++ b/test/mach-o/parse-function.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch x86_64 -r %s -o %t
-# RUN: ld64.lld -arch x86_64 -r %t -print_atoms -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r %s -o %t
+# RUN: ld64.lld.darwinold -arch x86_64 -r %t -print_atoms -o %t2 | FileCheck %s
#
# Test parsing of mach-o functions.
#
diff --git a/test/mach-o/parse-initializers32.yaml b/test/mach-o/parse-initializers32.yaml
index b15f295..5f24319 100644
--- a/test/mach-o/parse-initializers32.yaml
+++ b/test/mach-o/parse-initializers32.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch i386 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch i386 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of literal sections.
#
diff --git a/test/mach-o/parse-initializers64.yaml b/test/mach-o/parse-initializers64.yaml
index 9b3cb2d..8d1503b 100644
--- a/test/mach-o/parse-initializers64.yaml
+++ b/test/mach-o/parse-initializers64.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of literal sections.
#
diff --git a/test/mach-o/parse-literals-error.yaml b/test/mach-o/parse-literals-error.yaml
index de8b47c..b426c81 100644
--- a/test/mach-o/parse-literals-error.yaml
+++ b/test/mach-o/parse-literals-error.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -r -print_atoms %s -o %t 2> %t.err
+# RUN: not ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t 2> %t.err
# RUN: FileCheck %s < %t.err
#
# Test for error if literal section is not correct size multiple.
diff --git a/test/mach-o/parse-literals.yaml b/test/mach-o/parse-literals.yaml
index f23653d..8792e95 100644
--- a/test/mach-o/parse-literals.yaml
+++ b/test/mach-o/parse-literals.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of literal sections.
#
diff --git a/test/mach-o/parse-non-lazy-pointers.yaml b/test/mach-o/parse-non-lazy-pointers.yaml
index 9d6a862..591c116 100644
--- a/test/mach-o/parse-non-lazy-pointers.yaml
+++ b/test/mach-o/parse-non-lazy-pointers.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch i386 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch i386 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of non-lazy-pointer sections.
#
diff --git a/test/mach-o/parse-relocs-x86.yaml b/test/mach-o/parse-relocs-x86.yaml
index b93b436..b1bd619 100644
--- a/test/mach-o/parse-relocs-x86.yaml
+++ b/test/mach-o/parse-relocs-x86.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch i386 -r -print_atoms %s -o %t | FileCheck %s \
-# RUN: && ld64.lld -arch i386 -r -print_atoms %t -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch i386 -r -print_atoms %s -o %t | FileCheck %s \
+# RUN: && ld64.lld.darwinold -arch i386 -r -print_atoms %t -o %t2 | FileCheck %s
#
# Test parsing and writing of x86 relocations.
#
diff --git a/test/mach-o/parse-section-no-symbol.yaml b/test/mach-o/parse-section-no-symbol.yaml
index 6164f0e..a1747e9 100644
--- a/test/mach-o/parse-section-no-symbol.yaml
+++ b/test/mach-o/parse-section-no-symbol.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r %s -print_atoms -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r %s -print_atoms -o %t2 | FileCheck %s
#
# Test parsing of mach-o functions with no symbols at all.
#
diff --git a/test/mach-o/parse-tentative-defs.yaml b/test/mach-o/parse-tentative-defs.yaml
index 63596e9..345038b 100644
--- a/test/mach-o/parse-tentative-defs.yaml
+++ b/test/mach-o/parse-tentative-defs.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
#
# Test parsing of tentative definitions, including size, scope, and alignment.
#
diff --git a/test/mach-o/parse-text-relocs-arm64.yaml b/test/mach-o/parse-text-relocs-arm64.yaml
index 9112782..1c0922b 100644
--- a/test/mach-o/parse-text-relocs-arm64.yaml
+++ b/test/mach-o/parse-text-relocs-arm64.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch arm64 -r -print_atoms %s -o %t | FileCheck %s \
-# RUN: && ld64.lld -arch arm64 -r -print_atoms %t -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch arm64 -r -print_atoms %s -o %t | FileCheck %s \
+# RUN: && ld64.lld.darwinold -arch arm64 -r -print_atoms %t -o %t2 | FileCheck %s
#
# Test parsing and writing of arm64 text relocations.
#
diff --git a/test/mach-o/parse-text-relocs-x86_64.yaml b/test/mach-o/parse-text-relocs-x86_64.yaml
index 76df030..d5ce60d 100644
--- a/test/mach-o/parse-text-relocs-x86_64.yaml
+++ b/test/mach-o/parse-text-relocs-x86_64.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s \
-# RUN: && ld64.lld -arch x86_64 -r -print_atoms %t -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s \
+# RUN: && ld64.lld.darwinold -arch x86_64 -r -print_atoms %t -o %t2 | FileCheck %s
#
# Test parsing and writing of x86_64 text relocations.
#
diff --git a/test/mach-o/parse-tlv-relocs-x86-64.yaml b/test/mach-o/parse-tlv-relocs-x86-64.yaml
index b1a12e2..7c968dc 100644
--- a/test/mach-o/parse-tlv-relocs-x86-64.yaml
+++ b/test/mach-o/parse-tlv-relocs-x86-64.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s \
-# RUN: && ld64.lld -arch x86_64 -r -print_atoms %t -o %t2 | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s \
+# RUN: && ld64.lld.darwinold -arch x86_64 -r -print_atoms %t -o %t2 | FileCheck %s
#
# Test parsing of x86_64 tlv relocations.
diff --git a/test/mach-o/re-exported-dylib-ordinal.yaml b/test/mach-o/re-exported-dylib-ordinal.yaml
index b25a5ec..8fb5ac8 100644
--- a/test/mach-o/re-exported-dylib-ordinal.yaml
+++ b/test/mach-o/re-exported-dylib-ordinal.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s \
# RUN: %p/Inputs/re-exported-dylib-ordinal.yaml \
# RUN: %p/Inputs/re-exported-dylib-ordinal2.yaml \
# RUN: %p/Inputs/re-exported-dylib-ordinal3.yaml -dylib -o %t \
diff --git a/test/mach-o/rpath.yaml b/test/mach-o/rpath.yaml
index 3ffce99..604eafe 100644
--- a/test/mach-o/rpath.yaml
+++ b/test/mach-o/rpath.yaml
@@ -1,5 +1,5 @@
# Check we handle -rpath correctly:
-# RUN: ld64.lld -arch x86_64 -rpath @loader_path/../Frameworks \
+# RUN: ld64.lld.darwinold -arch x86_64 -rpath @loader_path/../Frameworks \
# RUN: %p/Inputs/x86_64/libSystem.yaml %s -o %t
# RUN: llvm-objdump --private-headers %t | FileCheck %s --check-prefix=CHECK-BINARY-WRITE
diff --git a/test/mach-o/run-tlv-pass-x86-64.yaml b/test/mach-o/run-tlv-pass-x86-64.yaml
index ca1d8b2..73b8c37 100644
--- a/test/mach-o/run-tlv-pass-x86-64.yaml
+++ b/test/mach-o/run-tlv-pass-x86-64.yaml
@@ -1,5 +1,5 @@
-# RUN: ld64.lld -macosx_version_min 10.7 -arch x86_64 -print_atoms %s -o %t | FileCheck %s
-# RUN: not ld64.lld -macosx_version_min 10.6 -arch x86_64 -o %t %s 2> %t2
+# RUN: ld64.lld.darwinold -macosx_version_min 10.7 -arch x86_64 -print_atoms %s -o %t | FileCheck %s
+# RUN: not ld64.lld.darwinold -macosx_version_min 10.6 -arch x86_64 -o %t %s 2> %t2
# RUN: FileCheck < %t2 %s --check-prefix=CHECK-ERROR
# RUN: llvm-objdump --macho --private-headers %t | FileCheck %s --check-prefix=CHECK-LOADCMDS
#
diff --git a/test/mach-o/sdk-version-error.yaml b/test/mach-o/sdk-version-error.yaml
index c7e4011..c3c4970 100644
--- a/test/mach-o/sdk-version-error.yaml
+++ b/test/mach-o/sdk-version-error.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -sdk_version 10.blah %s -o %t 2>&1 | FileCheck %s --check-prefix=ERROR
+# RUN: not ld64.lld.darwinold -arch x86_64 -sdk_version 10.blah %s -o %t 2>&1 | FileCheck %s --check-prefix=ERROR
--- !mach-o
arch: x86_64
diff --git a/test/mach-o/sectalign.yaml b/test/mach-o/sectalign.yaml
index 9c6c0cc..2270faf 100644
--- a/test/mach-o/sectalign.yaml
+++ b/test/mach-o/sectalign.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -dylib \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -dylib \
# RUN: -sectalign __DATA __custom 0x800 -sectalign __TEXT __text 0x400 \
# RUN: %p/Inputs/x86_64/libSystem.yaml -o %t \
# RUN: && llvm-readobj --sections %t | FileCheck %s
diff --git a/test/mach-o/sectattrs.yaml b/test/mach-o/sectattrs.yaml
index b9515f3..b2a7172 100644
--- a/test/mach-o/sectattrs.yaml
+++ b/test/mach-o/sectattrs.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -dylib \
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -dylib \
# RUN: %p/Inputs/x86_64/libSystem.yaml -o %t \
# RUN: && llvm-objdump --private-headers %t | FileCheck %s
#
diff --git a/test/mach-o/sectcreate.yaml b/test/mach-o/sectcreate.yaml
index bc17dec..1252b49 100644
--- a/test/mach-o/sectcreate.yaml
+++ b/test/mach-o/sectcreate.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -r -arch x86_64 -o %t -sectcreate __DATA __data \
+# RUN: ld64.lld.darwinold -r -arch x86_64 -o %t -sectcreate __DATA __data \
# RUN: %p/Inputs/hw.raw_bytes -print_atoms | FileCheck %s
# CHECK: --- !native
diff --git a/test/mach-o/seg-protection-arm64.yaml b/test/mach-o/seg-protection-arm64.yaml
index f5f57eb..0a17574 100644
--- a/test/mach-o/seg-protection-arm64.yaml
+++ b/test/mach-o/seg-protection-arm64.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch arm64 %s %p/Inputs/hello-world-arm64.yaml -o %t && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch arm64 %s %p/Inputs/hello-world-arm64.yaml -o %t && llvm-objdump --private-headers %t | FileCheck %s
--- !mach-o
arch: arm64
diff --git a/test/mach-o/seg-protection-x86_64.yaml b/test/mach-o/seg-protection-x86_64.yaml
index 42915d4..b68929d 100644
--- a/test/mach-o/seg-protection-x86_64.yaml
+++ b/test/mach-o/seg-protection-x86_64.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/hello-world-x86_64.yaml -o %t && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/hello-world-x86_64.yaml -o %t && llvm-objdump --private-headers %t | FileCheck %s
--- !mach-o
arch: x86_64
diff --git a/test/mach-o/source-version.yaml b/test/mach-o/source-version.yaml
index aef1af4..6a19ec6 100644
--- a/test/mach-o/source-version.yaml
+++ b/test/mach-o/source-version.yaml
@@ -1,5 +1,5 @@
-# RUN: not ld64.lld -arch x86_64 -source_version 10.blah %s -o %t 2>&1 | FileCheck %s --check-prefix=ERROR
-# RUN: ld64.lld -arch x86_64 -source_version 10.1.2.3.4 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: not ld64.lld.darwinold -arch x86_64 -source_version 10.blah %s -o %t 2>&1 | FileCheck %s --check-prefix=ERROR
+# RUN: ld64.lld.darwinold -arch x86_64 -source_version 10.1.2.3.4 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump --private-headers %t | FileCheck %s
--- !mach-o
arch: x86_64
diff --git a/test/mach-o/stack-size.yaml b/test/mach-o/stack-size.yaml
index 9801649..35a1700 100644
--- a/test/mach-o/stack-size.yaml
+++ b/test/mach-o/stack-size.yaml
@@ -1,10 +1,10 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.9 %s -o %t %p/Inputs/x86_64/libSystem.yaml
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.9 %s -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump --private-headers %t | FileCheck --check-prefix=CHECK-DEFAULT %s
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.9 %s -o %t -stack_size 31415926000 %p/Inputs/x86_64/libSystem.yaml
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.9 %s -o %t -stack_size 31415926000 %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump --private-headers %t | FileCheck --check-prefix=CHECK-EXPLICIT %s
-# RUN: not ld64.lld -arch x86_64 -stack_size 0x31415926530 %s >/dev/null 2> %t
+# RUN: not ld64.lld.darwinold -arch x86_64 -stack_size 0x31415926530 %s >/dev/null 2> %t
# RUN: FileCheck < %t %s --check-prefix=CHECK-ERROR-MISPAGED
-# RUN: not ld64.lld -arch x86_64 -stack_size hithere %s >/dev/null 2> %t
+# RUN: not ld64.lld.darwinold -arch x86_64 -stack_size hithere %s >/dev/null 2> %t
# RUN: FileCheck < %t %s --check-prefix=CHECK-ERROR-NOTHEX
--- !native
diff --git a/test/mach-o/string-table.yaml b/test/mach-o/string-table.yaml
index 8bb4cfe..d22c139 100644
--- a/test/mach-o/string-table.yaml
+++ b/test/mach-o/string-table.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch i386 %s %p/Inputs/hello-world-x86.yaml -o %t
+# RUN: ld64.lld.darwinold -arch i386 %s %p/Inputs/hello-world-x86.yaml -o %t
# RUN: obj2yaml %t | FileCheck %s
#
# Test that the string table contains a ' ' as its first symbol
diff --git a/test/mach-o/stub-link.s b/test/mach-o/stub-link.s
index fb12b76..e0b0536 100644
--- a/test/mach-o/stub-link.s
+++ b/test/mach-o/stub-link.s
@@ -3,7 +3,7 @@
# RUN: mkdir -p %t
#
# RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %s -o %t/test.o
-# RUN: ld64.lld -o %t/test -Z -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem %t/test.o
+# RUN: ld64.lld.darwinold -o %t/test -Z -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem %t/test.o
#
# RUN: llvm-objdump --bind --no-show-raw-insn -d -r %t/test | FileCheck %s
diff --git a/test/mach-o/subsections-via-symbols-default.yaml b/test/mach-o/subsections-via-symbols-default.yaml
index fe28a7f..44e11bc 100644
--- a/test/mach-o/subsections-via-symbols-default.yaml
+++ b/test/mach-o/subsections-via-symbols-default.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -ios_simulator_version_min 5.0 -arch x86_64 -r %s -o %t
+# RUN: ld64.lld.darwinold -ios_simulator_version_min 5.0 -arch x86_64 -r %s -o %t
# RUN: llvm-readobj --file-headers %t | FileCheck %s
# Make sure that we have an objc image info in the output. It should have
diff --git a/test/mach-o/twolevel_namespace_undef_dynamic_lookup.yaml b/test/mach-o/twolevel_namespace_undef_dynamic_lookup.yaml
index a8ceb0f..cc0e61b 100644
--- a/test/mach-o/twolevel_namespace_undef_dynamic_lookup.yaml
+++ b/test/mach-o/twolevel_namespace_undef_dynamic_lookup.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.9 -twolevel_namespace -undefined dynamic_lookup %s -o %t %p/Inputs/x86_64/libSystem.yaml
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.9 -twolevel_namespace -undefined dynamic_lookup %s -o %t %p/Inputs/x86_64/libSystem.yaml
#
# Sanity check '-twolevel_namespace -undefined dynamic_lookup'.
# This should pass without error, even though '_bar' is undefined.
diff --git a/test/mach-o/twolevel_namespace_undef_warning_suppress.yaml b/test/mach-o/twolevel_namespace_undef_warning_suppress.yaml
index 6d9eadd..1195c09 100644
--- a/test/mach-o/twolevel_namespace_undef_warning_suppress.yaml
+++ b/test/mach-o/twolevel_namespace_undef_warning_suppress.yaml
@@ -1,6 +1,6 @@
-# RUN: not ld64.lld -arch x86_64 -macosx_version_min 10.9 -twolevel_namespace -undefined warning %s -o %t %p/Inputs/x86_64/libSystem.yaml 2>&1 | \
+# RUN: not ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.9 -twolevel_namespace -undefined warning %s -o %t %p/Inputs/x86_64/libSystem.yaml 2>&1 | \
# RUN: FileCheck --check-prefix=CHECK-WARNING %s
-# RUN: not ld64.lld -arch x86_64 -macosx_version_min 10.9 -twolevel_namespace -undefined suppress %s -o %t %p/Inputs/x86_64/libSystem.yaml 2>&1 | \
+# RUN: not ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.9 -twolevel_namespace -undefined suppress %s -o %t %p/Inputs/x86_64/libSystem.yaml 2>&1 | \
# RUN: FileCheck --check-prefix=CHECK-SUPPRESS %s
--- !native
diff --git a/test/mach-o/unwind-info-simple-arm64.yaml b/test/mach-o/unwind-info-simple-arm64.yaml
index fa264ef..75d817a 100644
--- a/test/mach-o/unwind-info-simple-arm64.yaml
+++ b/test/mach-o/unwind-info-simple-arm64.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch arm64 -o %t %s \
+# RUN: ld64.lld.darwinold -arch arm64 -o %t %s \
# RUN: %p/Inputs/unwind-info-simple-arm64.yaml -e _main %p/Inputs/arm64/libSystem.yaml
# RUN: llvm-objdump --unwind-info %t | FileCheck %s
diff --git a/test/mach-o/unwind-info-simple-x86_64.yaml b/test/mach-o/unwind-info-simple-x86_64.yaml
index a4efed3..a711f44 100644
--- a/test/mach-o/unwind-info-simple-x86_64.yaml
+++ b/test/mach-o/unwind-info-simple-x86_64.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %s -o %t -e _main %p/Inputs/x86_64/libSystem.yaml
+# RUN: ld64.lld.darwinold -arch x86_64 %s -o %t -e _main %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump --unwind-info %t | FileCheck %s
# CHECK: Contents of __unwind_info section:
diff --git a/test/mach-o/upward-dylib-load-command.yaml b/test/mach-o/upward-dylib-load-command.yaml
index 0b5af14..6dbeb44 100644
--- a/test/mach-o/upward-dylib-load-command.yaml
+++ b/test/mach-o/upward-dylib-load-command.yaml
@@ -1,6 +1,6 @@
-# RUN: ld64.lld -arch x86_64 -dylib %p/Inputs/bar.yaml \
+# RUN: ld64.lld.darwinold -arch x86_64 -dylib %p/Inputs/bar.yaml \
# RUN: -install_name /usr/lib/libbar.dylib %p/Inputs/x86_64/libSystem.yaml -o %t1.dylib
-# RUN: ld64.lld -arch x86_64 -dylib %s -upward_library %t1.dylib \
+# RUN: ld64.lld.darwinold -arch x86_64 -dylib %s -upward_library %t1.dylib \
# RUN: -install_name /usr/lib/libfoo.dylib %p/Inputs/x86_64/libSystem.yaml -o %t
# RUN: llvm-objdump --private-headers %t | FileCheck %s
#
diff --git a/test/mach-o/upward-dylib-paths.yaml b/test/mach-o/upward-dylib-paths.yaml
index 4853633..509edd3 100644
--- a/test/mach-o/upward-dylib-paths.yaml
+++ b/test/mach-o/upward-dylib-paths.yaml
@@ -1,6 +1,6 @@
#
#
-# RUN: ld64.lld -arch x86_64 -r -test_file_usage -v \
+# RUN: ld64.lld.darwinold -arch x86_64 -r -test_file_usage -v \
# RUN: -path_exists /Custom/Frameworks \
# RUN: -path_exists /Custom/Frameworks/Bar.framework/Bar \
# RUN: -path_exists /usr/lib \
diff --git a/test/mach-o/usage.yaml b/test/mach-o/usage.yaml
index d95823d..efae4d0 100644
--- a/test/mach-o/usage.yaml
+++ b/test/mach-o/usage.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld | FileCheck %s
+# RUN: not ld64.lld.darwinold | FileCheck %s
#
# Test that running darwin linker with no option prints out usage message.
#
diff --git a/test/mach-o/use-dylib.yaml b/test/mach-o/use-dylib.yaml
index 7436e18..5717a93 100644
--- a/test/mach-o/use-dylib.yaml
+++ b/test/mach-o/use-dylib.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %s \
+# RUN: ld64.lld.darwinold -arch x86_64 %s \
# RUN: %p/Inputs/use-simple-dylib.yaml %p/Inputs/x86_64/libSystem.yaml -dylib -o %t.dylib
# RUN: llvm-objdump --private-headers %t.dylib | FileCheck %s
diff --git a/test/mach-o/use-simple-dylib.yaml b/test/mach-o/use-simple-dylib.yaml
index 0990659..62fb18f 100644
--- a/test/mach-o/use-simple-dylib.yaml
+++ b/test/mach-o/use-simple-dylib.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 -print_atoms -r %s \
+# RUN: ld64.lld.darwinold -arch x86_64 -print_atoms -r %s \
# RUN: %p/Inputs/use-simple-dylib.yaml -o %t | FileCheck %s
diff --git a/test/mach-o/version-min-load-command-object.yaml b/test/mach-o/version-min-load-command-object.yaml
index cdfee24..8d9089b 100644
--- a/test/mach-o/version-min-load-command-object.yaml
+++ b/test/mach-o/version-min-load-command-object.yaml
@@ -1,6 +1,6 @@
-# RUN: ld64.lld -arch x86_64 %s -o %t -r -macosx_version_min 10.8 && llvm-objdump --private-headers %t | FileCheck %s
-# RUN: ld64.lld -arch x86_64 %s -o %t -r && llvm-objdump --private-headers %t | FileCheck %s
-# RUN: ld64.lld -arch x86_64 %s -o %t -r %p/Inputs/no-version-min-load-command-object.yaml && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
+# RUN: ld64.lld.darwinold -arch x86_64 %s -o %t -r -macosx_version_min 10.8 && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 %s -o %t -r && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 %s -o %t -r %p/Inputs/no-version-min-load-command-object.yaml && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
# If we are emitting an object file, then we only emit a min version load command if the source object file(s) all have
# version(s) and either known platforms or contain min version load commands themselves.
diff --git a/test/mach-o/version-min-load-command.yaml b/test/mach-o/version-min-load-command.yaml
index 38ceb17..e31319d 100644
--- a/test/mach-o/version-min-load-command.yaml
+++ b/test/mach-o/version-min-load-command.yaml
@@ -1,11 +1,11 @@
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump --private-headers %t | FileCheck %s
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml 2>&1 | FileCheck %s --check-prefix=WARNING
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -version_load_command && llvm-objdump --private-headers %t | FileCheck %s
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -no_version_load_command && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -version_load_command -no_version_load_command && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml 2>&1 | FileCheck %s --check-prefix=WARNING
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -version_load_command && llvm-objdump --private-headers %t | FileCheck %s
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -no_version_load_command && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -version_load_command -no_version_load_command && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
-# RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 -sdk_version 10.9 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=SDK_VERSION
+# RUN: ld64.lld.darwinold -arch x86_64 -macosx_version_min 10.8 -sdk_version 10.9 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump --private-headers %t | FileCheck %s --check-prefix=SDK_VERSION
--- !mach-o
arch: x86_64
diff --git a/test/mach-o/write-final-sections.yaml b/test/mach-o/write-final-sections.yaml
index 204203a..d0c0f3c 100644
--- a/test/mach-o/write-final-sections.yaml
+++ b/test/mach-o/write-final-sections.yaml
@@ -1,4 +1,4 @@
-# RUN: ld64.lld -arch x86_64 %s %p/Inputs/write-final-sections.yaml \
+# RUN: ld64.lld.darwinold -arch x86_64 %s %p/Inputs/write-final-sections.yaml \
# RUN: -o %t -e _foo
# RUN: llvm-readobj --sections --section-data %t | FileCheck %s
diff --git a/test/mach-o/wrong-arch-error.yaml b/test/mach-o/wrong-arch-error.yaml
index d518c29..17bd024 100644
--- a/test/mach-o/wrong-arch-error.yaml
+++ b/test/mach-o/wrong-arch-error.yaml
@@ -1,4 +1,4 @@
-# RUN: not ld64.lld -arch x86_64 -r %s \
+# RUN: not ld64.lld.darwinold -arch x86_64 -r %s \
# RUN: %p/Inputs/wrong-arch-error.yaml 2> %t.err
# RUN: FileCheck %s < %t.err
diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt
index 5cff736..e77b216 100644
--- a/tools/lld/CMakeLists.txt
+++ b/tools/lld/CMakeLists.txt
@@ -25,7 +25,7 @@
if(NOT LLD_SYMLINKS_TO_CREATE)
set(LLD_SYMLINKS_TO_CREATE
- lld-link ld.lld ld64.lld ld64.lld.darwinnew wasm-ld)
+ lld-link ld.lld ld64.lld ld64.lld.darwinnew ld64.lld.darwinold wasm-ld)
endif()
foreach(link ${LLD_SYMLINKS_TO_CREATE})
diff --git a/tools/lld/lld.cpp b/tools/lld/lld.cpp
index 77d7792..01605bc 100644
--- a/tools/lld/lld.cpp
+++ b/tools/lld/lld.cpp
@@ -56,7 +56,7 @@
Gnu, // -flavor gnu
WinLink, // -flavor link
Darwin, // -flavor darwin
- DarwinNew, // -flavor darwinnew
+ DarwinOld, // -flavor darwinold
Wasm, // -flavor wasm
};
@@ -70,8 +70,9 @@
.CasesLower("ld", "ld.lld", "gnu", Gnu)
.CasesLower("wasm", "ld-wasm", Wasm)
.CaseLower("link", WinLink)
- .CasesLower("ld64", "ld64.lld", "darwin", Darwin)
- .CasesLower("darwinnew", "ld64.lld.darwinnew", DarwinNew)
+ .CasesLower("ld64", "ld64.lld", "darwin", "darwinnew",
+ "ld64.lld.darwinnew", Darwin)
+ .CasesLower("darwinold", "ld64.lld.darwinold", DarwinOld)
.Default(Invalid);
}
@@ -154,9 +155,9 @@
case WinLink:
return !coff::link(args, exitEarly, stdoutOS, stderrOS);
case Darwin:
- return !mach_o::link(args, exitEarly, stdoutOS, stderrOS);
- case DarwinNew:
return !macho::link(args, exitEarly, stdoutOS, stderrOS);
+ case DarwinOld:
+ return !mach_o::link(args, exitEarly, stdoutOS, stderrOS);
case Wasm:
return !lld::wasm::link(args, exitEarly, stdoutOS, stderrOS);
default:
