[llvm] [dsymutil] Make --linker explicit in every test (PR #195293)
Jonas Devlieghere via llvm-commits
llvm-commits at lists.llvm.org
Fri May 1 09:56:16 PDT 2026
https://github.com/JDevlieghere created https://github.com/llvm/llvm-project/pull/195293
Pass `--linker classic` or `--linker parallel` on every `dsymutil` invocation instead of relying on the implicit default. This preserves the existing coverage in preparation for toggling the default in the future.
Tests previously exercising only one linker now mirror the RUN block for the other, sharing FileCheck prefixes. Not all tests are compatible, and I've added a FIXME to make them easy to spot.
>From 0d889697f8a013672c5459b3e36ddf3280fad9ff Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jonas at devlieghere.com>
Date: Fri, 1 May 2026 09:53:41 -0700
Subject: [PATCH] [dsymutil] Make --linker explicit in every test
Pass --linker classic or --linker parallel on every dsymutil invocation
under llvm/test/tools/dsymutil/ instead of relying on the implicit
default. This preserves current coverage in preparation for potentially
toggling the default in the future.
Tests previously exercising only one linker now mirror the RUN block for
the other, sharing FileCheck prefixes. Not all tests are compatible, and
I've added a FIXME to make them easy to spot.
---
.../AArch64/accel-imported-declarations.test | 6 +-
.../dsymutil/AArch64/allow-disallow.test | 64 ++++++++++++++++---
.../tools/dsymutil/AArch64/call-pc-reloc.test | 2 +-
.../dsymutil/AArch64/dwarf5-addr-base.test | 4 +-
.../AArch64/dwarf5-addrx-0x0-last.test | 2 +-
.../dwarf5-dwarf4-combination-macho.test | 2 +-
.../tools/dsymutil/AArch64/dwarf5-macho.test | 2 +-
.../AArch64/dwarf5-str-offsets-base-strx.test | 4 +-
.../tools/dsymutil/AArch64/extern-alias.test | 4 +-
.../tools/dsymutil/AArch64/fat-arch-name.test | 2 +-
.../tools/dsymutil/AArch64/fat-threading.test | 3 +-
.../test/tools/dsymutil/AArch64/firmware.test | 4 +-
.../tools/dsymutil/AArch64/inline-source.test | 2 +-
.../AArch64/missing-object-warning.test | 3 +-
.../AArch64/missing-symbol-warning.test | 3 +-
.../odr-uniquing-DW_AT_name-conflict.test | 4 +-
llvm/test/tools/dsymutil/AArch64/preload.test | 2 +-
.../tools/dsymutil/AArch64/pseudo-probe.test | 5 +-
.../AArch64/remarks-linking-bundle-empty.test | 2 +-
.../AArch64/remarks-linking-bundle.test | 4 +-
.../AArch64/static-archive-collision.test | 3 +-
.../dsymutil/AArch64/stmt-seq-macho.test | 4 +-
.../swiftmodule-include-from-interface.test | 2 +-
.../tools/dsymutil/AArch64/swiftmodule.test | 2 +-
.../AArch64/typedefs-with-same-name.test | 2 +
llvm/test/tools/dsymutil/ARM/empty-map.test | 5 +-
.../dsymutil/ARM/fat-arch-not-found.test | 2 +-
.../tools/dsymutil/ARM/fat-dylib-update.test | 6 +-
llvm/test/tools/dsymutil/X86/accelerator.test | 18 ++++--
llvm/test/tools/dsymutil/X86/alias.test | 2 +-
.../tools/dsymutil/X86/assembly-output.test | 3 +-
.../dsymutil/X86/basic-linking-bundle.test | 4 +-
.../tools/dsymutil/X86/basic-linking-x86.test | 12 ++--
.../X86/basic-lto-dw4-linking-x86.test | 2 +-
.../dsymutil/X86/basic-lto-linking-x86.test | 4 +-
.../dsymutil/X86/basic-with-libfat-test.test | 2 +-
.../dsymutil/X86/call-site-entry-linking.test | 2 +-
.../dsymutil/X86/call-site-entry-reloc.test | 2 +-
.../tools/dsymutil/X86/common-sym-multi.test | 4 +-
llvm/test/tools/dsymutil/X86/common-sym.test | 2 +-
.../tools/dsymutil/X86/custom-line-table.test | 2 +-
.../tools/dsymutil/X86/darwin-bundle.test | 4 +-
.../dsymutil/X86/debug-loc-base-addr.test | 2 +-
.../tools/dsymutil/X86/dsym-companion.test | 6 +-
.../tools/dsymutil/X86/dwarf4-linetable.test | 2 +-
.../test/tools/dsymutil/X86/dwarf5-accel.test | 3 +-
.../dsymutil/X86/dwarf5-addrbase-broken.test | 4 +-
.../test/tools/dsymutil/X86/dwarf5-addrx.test | 4 +-
.../X86/dwarf5-call-site-entry-reloc.test | 2 +-
.../dsymutil/X86/dwarf5-dw-op-addrx.test | 4 +-
.../tools/dsymutil/X86/dwarf5-linetable.test | 2 +-
.../tools/dsymutil/X86/dwarf5-loclists.test | 4 +-
.../X86/dwarf5-many-include-directories.test | 2 +-
.../tools/dsymutil/X86/dwarf5-rnglists.test | 4 +-
llvm/test/tools/dsymutil/X86/eh_frame.test | 2 +-
llvm/test/tools/dsymutil/X86/empty-CU.test | 4 +-
.../dsymutil/X86/fat-archive-input-i386.test | 2 +-
.../X86/fat-object-compatible-triple.test | 2 +-
.../dsymutil/X86/fat-object-input-x86_64.test | 2 +-
.../X86/fat-object-input-x86_64h.test | 2 +-
llvm/test/tools/dsymutil/X86/frame-1.test | 4 +-
llvm/test/tools/dsymutil/X86/frame-2.test | 4 +-
.../tools/dsymutil/X86/generate-empty-CU.test | 2 +-
llvm/test/tools/dsymutil/X86/keep-func.test | 6 +-
llvm/test/tools/dsymutil/X86/label.test | 2 +-
llvm/test/tools/dsymutil/X86/label2.test | 2 +-
.../tools/dsymutil/X86/lc_build_version.test | 2 +-
.../X86/linker-llvm-union-fwd-decl.test | 2 +
.../dsymutil/X86/location-expression.test | 2 +-
.../tools/dsymutil/X86/module-warnings.test | 8 ++-
.../tools/dsymutil/X86/multiple-inputs.test | 6 +-
llvm/test/tools/dsymutil/X86/objc.test | 6 +-
.../dsymutil/X86/object-prefix-path.test | 2 +-
.../X86/odr-simple-template-names-mixed.test | 2 +-
.../X86/odr-simple-template-names.test | 2 +-
.../X86/odr-two-units-in-single-file.test | 4 +-
.../tools/dsymutil/X86/op-convert-offset.test | 2 +-
llvm/test/tools/dsymutil/X86/op-convert.test | 2 +-
.../tools/dsymutil/X86/reflection-dump.test | 2 +-
.../X86/remarks-linking-fat-bundle.test | 2 +-
llvm/test/tools/dsymutil/X86/reproducer.test | 8 +--
llvm/test/tools/dsymutil/X86/statistics.test | 2 +-
.../tools/dsymutil/X86/swift-ast-x86_64.test | 6 +-
.../tools/dsymutil/X86/swift-dwarf-loc.test | 2 +-
.../tools/dsymutil/X86/swift-interface.test | 6 +-
.../tools/dsymutil/X86/tail-call-linking.test | 2 +-
.../dsymutil/X86/template_operators.test | 3 +-
llvm/test/tools/dsymutil/X86/thinlto.test | 2 +-
.../dsymutil/X86/timestamp-mismatch.test | 4 +-
.../test/tools/dsymutil/X86/tls-variable.test | 6 +-
.../tools/dsymutil/X86/union-fwd-decl.test | 4 +-
.../tools/dsymutil/X86/update-one-CU.test | 6 +-
llvm/test/tools/dsymutil/X86/update.test | 18 ++++--
llvm/test/tools/dsymutil/X86/verify.test | 22 +++----
llvm/test/tools/dsymutil/absolute_symbol.test | 2 +-
llvm/test/tools/dsymutil/arch-option.test | 18 +++---
.../tools/dsymutil/archive-timestamp.test | 2 +-
llvm/test/tools/dsymutil/asm-line-tables.test | 4 +-
llvm/test/tools/dsymutil/basic-linking.test | 17 +++--
llvm/test/tools/dsymutil/codesign.test | 12 +++-
.../tools/dsymutil/debug-map-parsing.test | 10 +--
llvm/test/tools/dsymutil/dump-symtab.test | 4 +-
llvm/test/tools/dsymutil/embed-resource.test | 47 +++++++++++---
.../tools/dsymutil/fat-binary-output.test | 2 +-
llvm/test/tools/dsymutil/fat-header.test | 4 +-
llvm/test/tools/dsymutil/null-die.test | 4 +-
.../odr-two-units-in-single-file.test | 4 +-
.../dsymutil/yaml-object-address-rewrite.test | 2 +-
108 files changed, 350 insertions(+), 203 deletions(-)
diff --git a/llvm/test/tools/dsymutil/AArch64/accel-imported-declarations.test b/llvm/test/tools/dsymutil/AArch64/accel-imported-declarations.test
index 8afbe34dcdbfb..ddf650fd7ae7d 100644
--- a/llvm/test/tools/dsymutil/AArch64/accel-imported-declarations.test
+++ b/llvm/test/tools/dsymutil/AArch64/accel-imported-declarations.test
@@ -1,9 +1,11 @@
-RUN: dsymutil -accelerator=Dwarf -oso-prepend-path=%p/../Inputs %p/../Inputs/accel-imported-declaration.macho-arm64 -o %t.dwarf.dSYM
-RUN: dsymutil -accelerator=Apple -oso-prepend-path=%p/../Inputs %p/../Inputs/accel-imported-declaration.macho-arm64 -o %t.apple.dSYM
+RUN: dsymutil --linker classic -accelerator=Dwarf -oso-prepend-path=%p/../Inputs %p/../Inputs/accel-imported-declaration.macho-arm64 -o %t.dwarf.dSYM
+RUN: dsymutil --linker classic -accelerator=Apple -oso-prepend-path=%p/../Inputs %p/../Inputs/accel-imported-declaration.macho-arm64 -o %t.apple.dSYM
RUN: llvm-dwarfdump -v %t.dwarf.dSYM | FileCheck %s -check-prefixes=DWARF,COMMON
RUN: llvm-dwarfdump -v %t.apple.dSYM | FileCheck %s -check-prefixes=APPLE,COMMON
+## FIXME: Support --linker parallel
+
COMMON: .debug_info contents
COMMON: {{.*}}DW_TAG_namespace
COMMON: DW_AT_name{{.*}}"A"
diff --git a/llvm/test/tools/dsymutil/AArch64/allow-disallow.test b/llvm/test/tools/dsymutil/AArch64/allow-disallow.test
index b496829e7b6a1..48a19a5d918c9 100644
--- a/llvm/test/tools/dsymutil/AArch64/allow-disallow.test
+++ b/llvm/test/tools/dsymutil/AArch64/allow-disallow.test
@@ -1,64 +1,108 @@
# Test --allow to include one object file (1.o).
-RUN: dsymutil --dump-debug-map \
+RUN: dsymutil --linker classic --dump-debug-map \
+RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
+RUN: --oso-prepend-path=%p/../Inputs \
+RUN: --allow=%p/../Inputs/allow-disallow/one.yaml \
+RUN: | FileCheck %s --check-prefix=ALLOW-ONE
+RUN: dsymutil --linker parallel --dump-debug-map \
RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
RUN: --oso-prepend-path=%p/../Inputs \
RUN: --allow=%p/../Inputs/allow-disallow/one.yaml \
RUN: | FileCheck %s --check-prefix=ALLOW-ONE
# Test --allow to include two object files (1.o and 3.o).
-RUN: dsymutil --dump-debug-map \
+RUN: dsymutil --linker classic --dump-debug-map \
+RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
+RUN: --oso-prepend-path=%p/../Inputs \
+RUN: --allow=%p/../Inputs/allow-disallow/two.yaml \
+RUN: | FileCheck %s --check-prefix=ALLOW-TWO
+RUN: dsymutil --linker parallel --dump-debug-map \
RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
RUN: --oso-prepend-path=%p/../Inputs \
RUN: --allow=%p/../Inputs/allow-disallow/two.yaml \
RUN: | FileCheck %s --check-prefix=ALLOW-TWO
# Test --allow to include no object files (empty allow list).
-RUN: dsymutil --dump-debug-map \
+RUN: dsymutil --linker classic --dump-debug-map \
+RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
+RUN: --oso-prepend-path=%p/../Inputs \
+RUN: --allow=%p/../Inputs/allow-disallow/empty.yaml \
+RUN: | FileCheck %s --check-prefix=ALLOW-NONE
+RUN: dsymutil --linker parallel --dump-debug-map \
RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
RUN: --oso-prepend-path=%p/../Inputs \
RUN: --allow=%p/../Inputs/allow-disallow/empty.yaml \
RUN: | FileCheck %s --check-prefix=ALLOW-NONE
# Test --disallow to exclude one object file (1.o).
-RUN: dsymutil --dump-debug-map \
+RUN: dsymutil --linker classic --dump-debug-map \
+RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
+RUN: --oso-prepend-path=%p/../Inputs \
+RUN: --disallow=%p/../Inputs/allow-disallow/one.yaml \
+RUN: | FileCheck %s --check-prefix=DISALLOW-ONE
+RUN: dsymutil --linker parallel --dump-debug-map \
RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
RUN: --oso-prepend-path=%p/../Inputs \
RUN: --disallow=%p/../Inputs/allow-disallow/one.yaml \
RUN: | FileCheck %s --check-prefix=DISALLOW-ONE
# Test --disallow to exclude two object files (1.o and 3.o).
-RUN: dsymutil --dump-debug-map \
+RUN: dsymutil --linker classic --dump-debug-map \
+RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
+RUN: --oso-prepend-path=%p/../Inputs \
+RUN: --disallow=%p/../Inputs/allow-disallow/two.yaml \
+RUN: | FileCheck %s --check-prefix=DISALLOW-TWO
+RUN: dsymutil --linker parallel --dump-debug-map \
RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
RUN: --oso-prepend-path=%p/../Inputs \
RUN: --disallow=%p/../Inputs/allow-disallow/two.yaml \
RUN: | FileCheck %s --check-prefix=DISALLOW-TWO
# Test --disallow to exclude no object files (empty allow list).
-RUN: dsymutil --dump-debug-map \
+RUN: dsymutil --linker classic --dump-debug-map \
+RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
+RUN: --oso-prepend-path=%p/../Inputs \
+RUN: --disallow=%p/../Inputs/allow-disallow/empty.yaml \
+RUN: | FileCheck %s --check-prefix=DISALLOW-NONE
+RUN: dsymutil --linker parallel --dump-debug-map \
RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
RUN: --oso-prepend-path=%p/../Inputs \
RUN: --disallow=%p/../Inputs/allow-disallow/empty.yaml \
RUN: | FileCheck %s --check-prefix=DISALLOW-NONE
# Test error when allow-list file does not exist.
-RUN: not dsymutil --dump-debug-map \
+RUN: not dsymutil --linker classic --dump-debug-map \
+RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
+RUN: --allow=/nonexistent/path 2>&1 \
+RUN: | FileCheck %s --check-prefix=MISSING-FILE
+RUN: not dsymutil --linker parallel --dump-debug-map \
RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
RUN: --allow=/nonexistent/path 2>&1 \
RUN: | FileCheck %s --check-prefix=MISSING-FILE
# Test error when disallow-list file does not exist.
-RUN: not dsymutil --dump-debug-map \
+RUN: not dsymutil --linker classic --dump-debug-map \
+RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
+RUN: --disallow=/nonexistent/path 2>&1 \
+RUN: | FileCheck %s --check-prefix=MISSING-FILE
+RUN: not dsymutil --linker parallel --dump-debug-map \
RUN: %p/../Inputs/allow-disallow/a.out.arm64 \
RUN: --disallow=/nonexistent/path 2>&1 \
RUN: | FileCheck %s --check-prefix=MISSING-FILE
# Test error when combined with -y.
-RUN: not dsymutil --allow=some.file.yaml \
+RUN: not dsymutil --linker classic --allow=some.file.yaml \
+RUN: -y %p/../Inputs/remarks/basic.macho.remarks.arm64 2>&1 \
+RUN: | FileCheck %s --check-prefix=YAML-CONFLICT
+RUN: not dsymutil --linker parallel --allow=some.file.yaml \
RUN: -y %p/../Inputs/remarks/basic.macho.remarks.arm64 2>&1 \
RUN: | FileCheck %s --check-prefix=YAML-CONFLICT
# Test error when --allow and --disallow are both specified.
-RUN: not dsymutil --allow=some.file.yaml --disallow=some.file.yaml \
+RUN: not dsymutil --linker classic --allow=some.file.yaml --disallow=some.file.yaml \
+RUN: %p/../Inputs/allow-disallow/a.out.arm64 2>&1 \
+RUN: | FileCheck %s --check-prefix=ALLOW-DISALLOW-CONFLICT
+RUN: not dsymutil --linker parallel --allow=some.file.yaml --disallow=some.file.yaml \
RUN: %p/../Inputs/allow-disallow/a.out.arm64 2>&1 \
RUN: | FileCheck %s --check-prefix=ALLOW-DISALLOW-CONFLICT
diff --git a/llvm/test/tools/dsymutil/AArch64/call-pc-reloc.test b/llvm/test/tools/dsymutil/AArch64/call-pc-reloc.test
index 1636f0837fca8..26900b5b97020 100644
--- a/llvm/test/tools/dsymutil/AArch64/call-pc-reloc.test
+++ b/llvm/test/tools/dsymutil/AArch64/call-pc-reloc.test
@@ -14,7 +14,7 @@ int __attribute__((disable_tail_calls)) main() {
$ clang -arch arm64 main.cpp -o main.arm64.o -c -g -O2
$ clang -arch arm64 main.arm64.o -o main.arm64 -g
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/call_pc/main.arm64 -o %t.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/call_pc/main.arm64 -o %t.dSYM
RUN: llvm-dwarfdump %t.dSYM | FileCheck %s -implicit-check-not=DW_AT_call_pc
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/call_pc/main.arm64 -o %t.dSYM
diff --git a/llvm/test/tools/dsymutil/AArch64/dwarf5-addr-base.test b/llvm/test/tools/dsymutil/AArch64/dwarf5-addr-base.test
index ebb2378f74705..d6271d4700877 100644
--- a/llvm/test/tools/dsymutil/AArch64/dwarf5-addr-base.test
+++ b/llvm/test/tools/dsymutil/AArch64/dwarf5-addr-base.test
@@ -46,7 +46,7 @@
RUN: rm -rf %t.dir && mkdir -p %t.dir
-RUN: dsymutil -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM
+RUN: dsymutil --linker classic -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s
RUN: rm -rf %t.dir && mkdir -p %t.dir
@@ -64,7 +64,7 @@ RUN: FileCheck %s --check-prefixes=CHECK,CHECK-LLVM
RUN: rm -rf %t.dir && mkdir -p %t.dir
-RUN: dsymutil --update -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM
+RUN: dsymutil --linker classic --update -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s --check-prefix=UPD
RUN: rm -rf %t.dir && mkdir -p %t.dir
diff --git a/llvm/test/tools/dsymutil/AArch64/dwarf5-addrx-0x0-last.test b/llvm/test/tools/dsymutil/AArch64/dwarf5-addrx-0x0-last.test
index c9d15603f0e16..595c443009873 100644
--- a/llvm/test/tools/dsymutil/AArch64/dwarf5-addrx-0x0-last.test
+++ b/llvm/test/tools/dsymutil/AArch64/dwarf5-addrx-0x0-last.test
@@ -23,7 +23,7 @@ DEBUGADDR: 0x0000000000000059
DEBUGADDR: 0x0000000000000000
DEBUGADDR: ]
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/dwarf5/dwarf5-addrx-0x0-last.out -o %t.dSYM 2>&1 | FileCheck %s --allow-empty
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/dwarf5/dwarf5-addrx-0x0-last.out -o %t.dSYM 2>&1 | FileCheck %s --allow-empty
RUN: llvm-dwarfdump --verify %t.dSYM 2>&1 | FileCheck %s
RUN: llvm-dwarfdump --verbose -debug-info %t.dSYM | FileCheck %s --check-prefix DEBUGINFO
RUN: llvm-dwarfdump --verbose -debug-line %t.dSYM | FileCheck %s --check-prefix DEBUGLINE
diff --git a/llvm/test/tools/dsymutil/AArch64/dwarf5-dwarf4-combination-macho.test b/llvm/test/tools/dsymutil/AArch64/dwarf5-dwarf4-combination-macho.test
index 8c42cd59f5ec4..c82e6b8bb21cd 100644
--- a/llvm/test/tools/dsymutil/AArch64/dwarf5-dwarf4-combination-macho.test
+++ b/llvm/test/tools/dsymutil/AArch64/dwarf5-dwarf4-combination-macho.test
@@ -30,7 +30,7 @@
; clang -g -c -O1 b.cpp -gdwarf-4 -o 2.o
RUN: rm -rf %t.dir && mkdir -p %t.dir
-RUN: dsymutil -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-DWARF4-combination -o %t.dir/dwarf5-dwarf4-combination-macho.dSYM
+RUN: dsymutil --linker classic -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-DWARF4-combination -o %t.dir/dwarf5-dwarf4-combination-macho.dSYM
RUN: llvm-dwarfdump %t.dir/dwarf5-dwarf4-combination-macho.dSYM -a --verbose | FileCheck %s --check-prefixes=CHECK,WITH-PARENTS
RUN: rm -rf %t.dir && mkdir -p %t.dir
diff --git a/llvm/test/tools/dsymutil/AArch64/dwarf5-macho.test b/llvm/test/tools/dsymutil/AArch64/dwarf5-macho.test
index f90f5975e02ed..7771b24b3a1b0 100644
--- a/llvm/test/tools/dsymutil/AArch64/dwarf5-macho.test
+++ b/llvm/test/tools/dsymutil/AArch64/dwarf5-macho.test
@@ -18,7 +18,7 @@
RUN: rm -rf %t.dir && mkdir -p %t.dir
-RUN: dsymutil -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5 -o %t.dir/dwarf5-macho.dSYM
+RUN: dsymutil --linker classic -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5 -o %t.dir/dwarf5-macho.dSYM
RUN: llvm-dwarfdump %t.dir/dwarf5-macho.dSYM -a --verbose | FileCheck %s
RUN: rm -rf %t.dir && mkdir -p %t.dir
diff --git a/llvm/test/tools/dsymutil/AArch64/dwarf5-str-offsets-base-strx.test b/llvm/test/tools/dsymutil/AArch64/dwarf5-str-offsets-base-strx.test
index c5110a873c603..84d452688aa76 100644
--- a/llvm/test/tools/dsymutil/AArch64/dwarf5-str-offsets-base-strx.test
+++ b/llvm/test/tools/dsymutil/AArch64/dwarf5-str-offsets-base-strx.test
@@ -50,10 +50,10 @@
RUN: rm -rf %t.dir && mkdir -p %t.dir
-RUN: dsymutil -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM
+RUN: dsymutil --linker classic -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s --check-prefixes=CHECK,GLOBAL
-RUN: dsymutil --update -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM
+RUN: dsymutil --linker classic --update -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s --check-prefixes=UPD,GLOBALUPD
RUN: rm -rf %t.dir && mkdir -p %t.dir
diff --git a/llvm/test/tools/dsymutil/AArch64/extern-alias.test b/llvm/test/tools/dsymutil/AArch64/extern-alias.test
index 5764063f0e342..d7090673c7018 100644
--- a/llvm/test/tools/dsymutil/AArch64/extern-alias.test
+++ b/llvm/test/tools/dsymutil/AArch64/extern-alias.test
@@ -35,8 +35,8 @@ $ xcrun --sdk iphoneos clang -g private_extern.c -c -o private_extern.o -target
$ xcrun --sdk iphoneos clang -g main.c -c -o main.o -target arm64-apple-ios14.0
$ xcrun --sdk iphoneos clang private_extern.o main.o -target arm64-apple-ios14.0 -o private_extern.out -Xlinker -alias_list -Xlinker alias_list
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/private_extern/private_extern.out -o %t.dSYM --verbose | FileCheck %s
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/extern/extern.out -o %t.dSYM --verbose | FileCheck %s
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/private_extern/private_extern.out -o %t.dSYM --verbose | FileCheck %s
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/extern/extern.out -o %t.dSYM --verbose | FileCheck %s
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/private_extern/private_extern.out -o %t.dSYM --verbose | FileCheck %s
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/extern/extern.out -o %t.dSYM --verbose | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/AArch64/fat-arch-name.test b/llvm/test/tools/dsymutil/AArch64/fat-arch-name.test
index 1fdcc063a8d6c..d6b5cae9b9ffd 100644
--- a/llvm/test/tools/dsymutil/AArch64/fat-arch-name.test
+++ b/llvm/test/tools/dsymutil/AArch64/fat-arch-name.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -no-output %p/../Inputs/fat-test.arm.dylib -o /dev/null -verbose 2>&1 | FileCheck %s
+# RUN: dsymutil --linker classic -no-output %p/../Inputs/fat-test.arm.dylib -o /dev/null -verbose 2>&1 | FileCheck %s
# RUN: dsymutil --linker parallel -no-output %p/../Inputs/fat-test.arm.dylib -o /dev/null -verbose 2>&1 | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/AArch64/fat-threading.test b/llvm/test/tools/dsymutil/AArch64/fat-threading.test
index acb11757493d4..c17ec955ccd46 100644
--- a/llvm/test/tools/dsymutil/AArch64/fat-threading.test
+++ b/llvm/test/tools/dsymutil/AArch64/fat-threading.test
@@ -1,3 +1,4 @@
# By default, dsymutil spawns one thread per architecture and this test just
# ensures that things don't break when processing multiple archs.
-# RUN: dsymutil -no-output %p/../Inputs/fat-test.arm.dylib -o /dev/null 2>&1
+# RUN: dsymutil --linker classic -no-output %p/../Inputs/fat-test.arm.dylib -o /dev/null 2>&1
+# RUN: dsymutil --linker parallel -no-output %p/../Inputs/fat-test.arm.dylib -o /dev/null 2>&1
diff --git a/llvm/test/tools/dsymutil/AArch64/firmware.test b/llvm/test/tools/dsymutil/AArch64/firmware.test
index 128faa50a0ca3..01ad4f1a6ae5a 100644
--- a/llvm/test/tools/dsymutil/AArch64/firmware.test
+++ b/llvm/test/tools/dsymutil/AArch64/firmware.test
@@ -6,6 +6,8 @@ int main() {
$ xcrun clang -O0 -target arm64-apple-unknown-macho test.c -c -o test.o
$ xcrun ld -arch arm64 -o test.out test.o -platform_version firmware 0 0
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/firmware/test.out -o %t.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/firmware/test.out -o %t.dSYM
+RUN: llvm-objdump -h %t.dSYM/Contents/Resources/DWARF/test.out | FileCheck %s
+RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/firmware/test.out -o %t.dSYM
RUN: llvm-objdump -h %t.dSYM/Contents/Resources/DWARF/test.out | FileCheck %s
CHECK: file format mach-o arm64
diff --git a/llvm/test/tools/dsymutil/AArch64/inline-source.test b/llvm/test/tools/dsymutil/AArch64/inline-source.test
index e1c552f1d2af6..266e35c1615eb 100644
--- a/llvm/test/tools/dsymutil/AArch64/inline-source.test
+++ b/llvm/test/tools/dsymutil/AArch64/inline-source.test
@@ -1,7 +1,7 @@
# RUN: rm -rf %t
# RUN: mkdir -p %t
# RUN: llc -filetype=obj -mtriple arm64-apple-darwin %p/../Inputs/inline.ll -o %t/inline.o
-# RUN: dsymutil -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-line - | FileCheck %s
+# RUN: dsymutil --linker=classic -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-line - | FileCheck %s
# RUN: dsymutil --linker=parallel -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-line - | FileCheck %s
# Test inline source files.
diff --git a/llvm/test/tools/dsymutil/AArch64/missing-object-warning.test b/llvm/test/tools/dsymutil/AArch64/missing-object-warning.test
index 62b3ecb31888b..73dc7180fd9f1 100644
--- a/llvm/test/tools/dsymutil/AArch64/missing-object-warning.test
+++ b/llvm/test/tools/dsymutil/AArch64/missing-object-warning.test
@@ -1,4 +1,5 @@
-RUN: dsymutil -oso-prepend-path %p/../Inputs --dump-debug-map %p/../Inputs/private/tmp/missing/foobar.out 2>&1 | FileCheck %s
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs --dump-debug-map %p/../Inputs/private/tmp/missing/foobar.out 2>&1 | FileCheck %s
+RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs --dump-debug-map %p/../Inputs/private/tmp/missing/foobar.out 2>&1 | FileCheck %s
CHECK: bar.o unable to open object file
CHECK-NOT: could not find object file symbol for symbol _bar
diff --git a/llvm/test/tools/dsymutil/AArch64/missing-symbol-warning.test b/llvm/test/tools/dsymutil/AArch64/missing-symbol-warning.test
index 1de805d321953..4cc67a87c193f 100644
--- a/llvm/test/tools/dsymutil/AArch64/missing-symbol-warning.test
+++ b/llvm/test/tools/dsymutil/AArch64/missing-symbol-warning.test
@@ -1,3 +1,4 @@
-RUN: dsymutil -oso-prepend-path %p/../Inputs --dump-debug-map %p/../Inputs/private/tmp/warning/test.out 2>&1 | FileCheck %s
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs --dump-debug-map %p/../Inputs/private/tmp/warning/test.out 2>&1 | FileCheck %s
+RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs --dump-debug-map %p/../Inputs/private/tmp/warning/test.out 2>&1 | FileCheck %s
# CHECK: could not find symbol '_foo' in object file '{{.*}}test.o'
# CHECK: { sym: _main, objAddr: 0x0, binAddr: 0x100003F84, size: 0x1C }
diff --git a/llvm/test/tools/dsymutil/AArch64/odr-uniquing-DW_AT_name-conflict.test b/llvm/test/tools/dsymutil/AArch64/odr-uniquing-DW_AT_name-conflict.test
index b6edb8bca3194..536476144238b 100644
--- a/llvm/test/tools/dsymutil/AArch64/odr-uniquing-DW_AT_name-conflict.test
+++ b/llvm/test/tools/dsymutil/AArch64/odr-uniquing-DW_AT_name-conflict.test
@@ -9,13 +9,13 @@
# clang -g -c -o 1.o Inputs/odr-uniquing-DW_AT_name-conflict/lib1.cpp
# clang -g -c -o 2.o Inputs/odr-uniquing-DW_AT_name-conflict/lib2.cpp
-# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/odr-uniquing-DW_AT_name-conflict -y %p/dummy-debug-map-arm64.map -o - \
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%p/../Inputs/odr-uniquing-DW_AT_name-conflict -y %p/dummy-debug-map-arm64.map -o - \
# RUN: | llvm-dwarfdump --verify - | FileCheck %s
# RUN: dsymutil --linker parallel -f -oso-prepend-path=%p/../Inputs/odr-uniquing-DW_AT_name-conflict -y %p/dummy-debug-map-arm64.map -o - \
# RUN: | not llvm-dwarfdump --verify - | FileCheck %s --check-prefix=PARALLEL-ODR
-# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/odr-uniquing-DW_AT_name-conflict -y %p/dummy-debug-map-arm64.map -no-odr -o - \
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%p/../Inputs/odr-uniquing-DW_AT_name-conflict -y %p/dummy-debug-map-arm64.map -no-odr -o - \
# RUN: | llvm-dwarfdump --verify - | FileCheck %s
# RUN: dsymutil --linker parallel -f -oso-prepend-path=%p/../Inputs/odr-uniquing-DW_AT_name-conflict -y %p/dummy-debug-map-arm64.map -no-odr -o - \
diff --git a/llvm/test/tools/dsymutil/AArch64/preload.test b/llvm/test/tools/dsymutil/AArch64/preload.test
index 2c4522034249f..8031821e60649 100644
--- a/llvm/test/tools/dsymutil/AArch64/preload.test
+++ b/llvm/test/tools/dsymutil/AArch64/preload.test
@@ -4,7 +4,7 @@ void start(void) {}
$ xcrun clang -c -o foo.o foo.c -g3
$ xcrun clang -o foo foo.o -g3 -Wl,-preload -nodefaultlibs
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/preload/foo -o %t.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/preload/foo -o %t.dSYM
RUN: llvm-nm %p/../Inputs/private/tmp/preload/foo | FileCheck %s
RUN: llvm-nm %t.dSYM/Contents/Resources/DWARF/foo | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/AArch64/pseudo-probe.test b/llvm/test/tools/dsymutil/AArch64/pseudo-probe.test
index 3cd8825706cac..0bc97eb574eae 100644
--- a/llvm/test/tools/dsymutil/AArch64/pseudo-probe.test
+++ b/llvm/test/tools/dsymutil/AArch64/pseudo-probe.test
@@ -5,7 +5,10 @@
# RUN: rm -rf %t && mkdir -p %t
# RUN: yaml2obj %s -o %t/main.o
-# RUN: dsymutil %t/main.o -o %t/main.dSYM
+# RUN: dsymutil --linker classic %t/main.o -o %t/main.dSYM
+# RUN: obj2yaml %t/main.dSYM/Contents/Resources/DWARF/main.o -o %t/out.yaml
+# RUN: FileCheck %s < %t/out.yaml
+# RUN: dsymutil --linker parallel %t/main.o -o %t/main.dSYM
# RUN: obj2yaml %t/main.dSYM/Contents/Resources/DWARF/main.o -o %t/out.yaml
# RUN: FileCheck %s < %t/out.yaml
diff --git a/llvm/test/tools/dsymutil/AArch64/remarks-linking-bundle-empty.test b/llvm/test/tools/dsymutil/AArch64/remarks-linking-bundle-empty.test
index 0a89fa1ddee3c..6dfa2f8bdc452 100644
--- a/llvm/test/tools/dsymutil/AArch64/remarks-linking-bundle-empty.test
+++ b/llvm/test/tools/dsymutil/AArch64/remarks-linking-bundle-empty.test
@@ -2,7 +2,7 @@ RUN: rm -rf %t
RUN: mkdir -p %t
RUN: cat %p/../Inputs/remarks/basic.macho.remarks.empty.arm64 > %t/basic.macho.remarks.empty.arm64
-RUN: dsymutil -oso-prepend-path=%p/../Inputs -remarks-prepend-path=%p/../Inputs %t/basic.macho.remarks.empty.arm64
+RUN: dsymutil --linker classic -oso-prepend-path=%p/../Inputs -remarks-prepend-path=%p/../Inputs %t/basic.macho.remarks.empty.arm64
Check that the remark file in the bundle does not exist:
RUN: not cat %t/basic.macho.remarks.empty.arm64.dSYM/Contents/Resources/Remarks/basic.macho.remarks.arm64 2>&1
diff --git a/llvm/test/tools/dsymutil/AArch64/remarks-linking-bundle.test b/llvm/test/tools/dsymutil/AArch64/remarks-linking-bundle.test
index e1b04455b0d9d..b0e0e7956071f 100644
--- a/llvm/test/tools/dsymutil/AArch64/remarks-linking-bundle.test
+++ b/llvm/test/tools/dsymutil/AArch64/remarks-linking-bundle.test
@@ -5,7 +5,7 @@ RUN: llvm-remarkutil yaml2bitstream %p/../Inputs/private/tmp/remarks/basic1.mach
RUN: llvm-remarkutil yaml2bitstream %p/../Inputs/private/tmp/remarks/basic2.macho.remarks.arm64.opt.yaml -o %t/private/tmp/remarks/basic2.macho.remarks.arm64.opt.bitstream
RUN: llvm-remarkutil yaml2bitstream %p/../Inputs/private/tmp/remarks/basic3.macho.remarks.arm64.opt.yaml -o %t/private/tmp/remarks/basic3.macho.remarks.arm64.opt.bitstream
-RUN: dsymutil -oso-prepend-path=%p/../Inputs -remarks-prepend-path=%t %t/basic.macho.remarks.arm64
+RUN: dsymutil --linker classic -oso-prepend-path=%p/../Inputs -remarks-prepend-path=%t %t/basic.macho.remarks.arm64
Check that the remark file in the bundle exists and is sane:
RUN: llvm-bcanalyzer -dump %t/basic.macho.remarks.arm64.dSYM/Contents/Resources/Remarks/basic.macho.remarks.arm64 | FileCheck %s
@@ -16,7 +16,7 @@ Check that the remark file in the bundle exists and is sane:
RUN: llvm-bcanalyzer -dump %t/basic.macho.remarks.arm64.dSYM/Contents/Resources/Remarks/basic.macho.remarks.arm64 | FileCheck %s
Now emit it in a different format: YAML.
-RUN: dsymutil -remarks-output-format=yaml -oso-prepend-path=%p/../Inputs -remarks-prepend-path=%t %t/basic.macho.remarks.arm64
+RUN: dsymutil --linker classic -remarks-output-format=yaml -oso-prepend-path=%p/../Inputs -remarks-prepend-path=%t %t/basic.macho.remarks.arm64
RUN: cat %t/basic.macho.remarks.arm64.dSYM/Contents/Resources/Remarks/basic.macho.remarks.arm64 | FileCheck %s --check-prefix=CHECK-YAML
RUN: dsymutil --linker parallel -remarks-output-format=yaml -oso-prepend-path=%p/../Inputs -remarks-prepend-path=%t %t/basic.macho.remarks.arm64
diff --git a/llvm/test/tools/dsymutil/AArch64/static-archive-collision.test b/llvm/test/tools/dsymutil/AArch64/static-archive-collision.test
index 55fd5e6b621e7..7c33452ac0713 100644
--- a/llvm/test/tools/dsymutil/AArch64/static-archive-collision.test
+++ b/llvm/test/tools/dsymutil/AArch64/static-archive-collision.test
@@ -20,7 +20,8 @@ $ clang -g g.c -c -o g/foo.o
$ libtool -static f/foo.o g/foo.o -o foo.a
$ clang main.o foo.a -o main.out
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/collision/main.out --dump-debug-map 2>&1 | FileCheck %s
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/collision/main.out --dump-debug-map 2>&1 | FileCheck %s
+RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/collision/main.out --dump-debug-map 2>&1 | FileCheck %s
CHECK: skipping debug map object with duplicate name and timestamp: {{.*}} /private/tmp/collision/foo.a(foo.o)
CHECK-NOT: could not find symbol '_g'
CHECK-NOT: could not find symbol '_f'
diff --git a/llvm/test/tools/dsymutil/AArch64/stmt-seq-macho.test b/llvm/test/tools/dsymutil/AArch64/stmt-seq-macho.test
index 974ba6f7dffe2..5cb3557b5becd 100644
--- a/llvm/test/tools/dsymutil/AArch64/stmt-seq-macho.test
+++ b/llvm/test/tools/dsymutil/AArch64/stmt-seq-macho.test
@@ -10,7 +10,7 @@
# RUN: yaml2obj %t/stmt_seq_macho.exe.yaml -o %t/stmt_seq_macho.exe
# RUN: yaml2obj %t/a.o.yaml -o %t/a.o
# RUN: yaml2obj %t/b.o.yaml -o %t/b.o
-# RUN: dsymutil --flat --verify-dwarf=none -oso-prepend-path %t %t/stmt_seq_macho.exe -o %t/stmt_seq_macho.dSYM
+# RUN: dsymutil --linker classic --flat --verify-dwarf=none -oso-prepend-path %t %t/stmt_seq_macho.exe -o %t/stmt_seq_macho.dSYM
# RUN: llvm-dwarfdump --debug-info --debug-line -v %t/stmt_seq_macho.dSYM > %t/stmt_seq_macho.dSYM.txt
## Verify that all stmt_sequence offsets point to DW_LNE_set_address opcodes
@@ -26,6 +26,8 @@
# RUN: cat %t/stmt_seq_macho.dSYM.txt | FileCheck %s -check-prefix=CHECK_NO_INVALID_OFFSET
# CHECK_NO_INVALID_OFFSET-NOT: DW_AT_LLVM_stmt_sequence{{.*}}0xfffffff
+## FIXME: Support --linker parallel
+
#--- stmt_seq_macho.cpp
// This file is split into a.cpp and b.cpp by the gen script.
// The functions are compiled into separate object files and linked
diff --git a/llvm/test/tools/dsymutil/AArch64/swiftmodule-include-from-interface.test b/llvm/test/tools/dsymutil/AArch64/swiftmodule-include-from-interface.test
index 00141f12587d4..35ff7496e6498 100644
--- a/llvm/test/tools/dsymutil/AArch64/swiftmodule-include-from-interface.test
+++ b/llvm/test/tools/dsymutil/AArch64/swiftmodule-include-from-interface.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -include-swiftmodules-from-interface -verbose -oso-prepend-path=%p -y -o %t.dSYM %s | FileCheck %s
+# RUN: dsymutil --linker classic -include-swiftmodules-from-interface -verbose -oso-prepend-path=%p -y -o %t.dSYM %s | FileCheck %s
#
# RUN: dsymutil -include-swiftmodules-from-interface --linker parallel -verbose -oso-prepend-path=%p -y %s -o %t-parallel.dSYM | FileCheck %s
#
diff --git a/llvm/test/tools/dsymutil/AArch64/swiftmodule.test b/llvm/test/tools/dsymutil/AArch64/swiftmodule.test
index 31b392610c091..1e405c64ef265 100644
--- a/llvm/test/tools/dsymutil/AArch64/swiftmodule.test
+++ b/llvm/test/tools/dsymutil/AArch64/swiftmodule.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -verbose -oso-prepend-path=%p -y -o %t.dSYM %s | FileCheck %s
+# RUN: dsymutil --linker classic -verbose -oso-prepend-path=%p -y -o %t.dSYM %s | FileCheck %s
#
# RUN: dsymutil --linker parallel -verbose -oso-prepend-path=%p -y %s -o %t-parallel.dSYM | FileCheck %s
#
diff --git a/llvm/test/tools/dsymutil/AArch64/typedefs-with-same-name.test b/llvm/test/tools/dsymutil/AArch64/typedefs-with-same-name.test
index cef40b4bcf3b0..85d2aaf358d42 100644
--- a/llvm/test/tools/dsymutil/AArch64/typedefs-with-same-name.test
+++ b/llvm/test/tools/dsymutil/AArch64/typedefs-with-same-name.test
@@ -1,6 +1,8 @@
#RUN: dsymutil --linker=parallel -f -oso-prepend-path=%p/../Inputs/ -y %s -o %t.dwarf
#RUN: llvm-dwarfdump %t.dwarf | FileCheck %s
+## FIXME: Support --linker classic
+
# There should be two typedef DIE named "BarInt" in the resultant .dwarf file.
# The second should refer to the first, which refer to "Foo<int>".
# CHECK: 0x[[FIRST_BARINT_ADDR:[0-9a-f]*]]: DW_TAG_typedef
diff --git a/llvm/test/tools/dsymutil/ARM/empty-map.test b/llvm/test/tools/dsymutil/ARM/empty-map.test
index eeca28273a3f5..a6d85c8436700 100644
--- a/llvm/test/tools/dsymutil/ARM/empty-map.test
+++ b/llvm/test/tools/dsymutil/ARM/empty-map.test
@@ -1,7 +1,8 @@
-# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s
-# RUN: dsymutil -q -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s --check-prefix QUIET
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s
+# RUN: dsymutil --linker classic -q -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s --check-prefix QUIET
# RUN: dsymutil --linker parallel -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s
+# RUN: dsymutil --linker parallel -q -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s --check-prefix QUIET
---
triple: 'thumbv7-apple-darwin'
diff --git a/llvm/test/tools/dsymutil/ARM/fat-arch-not-found.test b/llvm/test/tools/dsymutil/ARM/fat-arch-not-found.test
index 85aaaaf67c760..f2f9f652c9bc6 100644
--- a/llvm/test/tools/dsymutil/ARM/fat-arch-not-found.test
+++ b/llvm/test/tools/dsymutil/ARM/fat-arch-not-found.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s
#
# RUN: dsymutil --linker parallel -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/ARM/fat-dylib-update.test b/llvm/test/tools/dsymutil/ARM/fat-dylib-update.test
index e0ba567838591..e97660597b02b 100644
--- a/llvm/test/tools/dsymutil/ARM/fat-dylib-update.test
+++ b/llvm/test/tools/dsymutil/ARM/fat-dylib-update.test
@@ -1,9 +1,9 @@
# REQUIRES: object-emission,system-darwin
-# RUN: dsymutil -oso-prepend-path %p/.. %p/../Inputs/fat-test.arm.dylib -o %t.dSYM
+# RUN: dsymutil --linker classic -oso-prepend-path %p/.. %p/../Inputs/fat-test.arm.dylib -o %t.dSYM
# RUN: llvm-dwarfdump -a -v %t.dSYM/Contents/Resources/DWARF/fat-test.arm.dylib | FileCheck %s
-# RUN: dsymutil -u %t.dSYM
+# RUN: dsymutil --linker classic -u %t.dSYM
# RUN: llvm-dwarfdump -a -v %t.dSYM/Contents/Resources/DWARF/fat-test.arm.dylib | FileCheck %s
-# RUN: dsymutil -u %t.dSYM -o %t1.dSYM
+# RUN: dsymutil --linker classic -u %t.dSYM -o %t1.dSYM
# RUN: llvm-dwarfdump -a -v %t1.dSYM/Contents/Resources/DWARF/fat-test.arm.dylib | FileCheck %s
#
# RUN: dsymutil --linker parallel -oso-prepend-path %p/.. %p/../Inputs/fat-test.arm.dylib -o %t.dSYM
diff --git a/llvm/test/tools/dsymutil/X86/accelerator.test b/llvm/test/tools/dsymutil/X86/accelerator.test
index ae7d88479b1e7..ea0c7e6054df5 100644
--- a/llvm/test/tools/dsymutil/X86/accelerator.test
+++ b/llvm/test/tools/dsymutil/X86/accelerator.test
@@ -1,6 +1,9 @@
-RUN: dsymutil -accelerator=Dwarf -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o %t.dwarf.dSYM
-RUN: dsymutil -accelerator=Apple -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o %t.apple.dSYM
-RUN: dsymutil -accelerator=None -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o %t.none.dSYM
+RUN: dsymutil --linker classic -accelerator=Dwarf -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o %t.dwarf.dSYM
+RUN: dsymutil --linker parallel -accelerator=Dwarf -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o %t.dwarf.dSYM
+RUN: dsymutil --linker classic -accelerator=Apple -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o %t.apple.dSYM
+RUN: dsymutil --linker parallel -accelerator=Apple -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o %t.apple.dSYM
+RUN: dsymutil --linker classic -accelerator=None -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o %t.none.dSYM
+RUN: dsymutil --linker parallel -accelerator=None -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o %t.none.dSYM
RUN: llvm-dwarfdump -verify %t.dwarf.dSYM
RUN: llvm-dwarfdump -verify %t.apple.dSYM
@@ -10,9 +13,12 @@ RUN: llvm-dwarfdump -debug-names %t.dwarf.dSYM | FileCheck %s -check-prefixes=NA
RUN: llvm-dwarfdump -apple-names -apple-namespaces -apple-types %t.apple.dSYM | FileCheck %s -check-prefixes=NAMES,APPLE
RUN: llvm-dwarfdump -a %t.none.dSYM | FileCheck %s -check-prefixes=NONE
-RUN: dsymutil -update -accelerator=Dwarf %t.apple.dSYM
-RUN: dsymutil -update -accelerator=Apple %t.dwarf.dSYM
-RUN: dsymutil -update -accelerator=None %t.none.dSYM
+RUN: dsymutil --linker classic -update -accelerator=Dwarf %t.apple.dSYM
+RUN: dsymutil --linker parallel -update -accelerator=Dwarf %t.apple.dSYM
+RUN: dsymutil --linker classic -update -accelerator=Apple %t.dwarf.dSYM
+RUN: dsymutil --linker parallel -update -accelerator=Apple %t.dwarf.dSYM
+RUN: dsymutil --linker classic -update -accelerator=None %t.none.dSYM
+RUN: dsymutil --linker parallel -update -accelerator=None %t.none.dSYM
RUN: llvm-dwarfdump -verify %t.dwarf.dSYM
RUN: llvm-dwarfdump -verify %t.apple.dSYM
diff --git a/llvm/test/tools/dsymutil/X86/alias.test b/llvm/test/tools/dsymutil/X86/alias.test
index af6ebd52496a8..bbf313daa188f 100644
--- a/llvm/test/tools/dsymutil/X86/alias.test
+++ b/llvm/test/tools/dsymutil/X86/alias.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/alias \
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%p/../Inputs/alias \
# RUN: %p/../Inputs/alias/foobar -o - | llvm-dwarfdump - 2>&1 | FileCheck %s
# RUN: dsymutil --linker parallel -f -oso-prepend-path=%p/../Inputs/alias \
diff --git a/llvm/test/tools/dsymutil/X86/assembly-output.test b/llvm/test/tools/dsymutil/X86/assembly-output.test
index 892f08a6a89f5..e5d09b6e806a7 100644
--- a/llvm/test/tools/dsymutil/X86/assembly-output.test
+++ b/llvm/test/tools/dsymutil/X86/assembly-output.test
@@ -1,3 +1,4 @@
-RUN: dsymutil -S -f -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o - | FileCheck %s
+RUN: dsymutil --linker classic -S -f -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o - | FileCheck %s
+RUN: dsymutil --linker parallel -S -f -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o - | FileCheck %s
CHECK: .section __DWARF
diff --git a/llvm/test/tools/dsymutil/X86/basic-linking-bundle.test b/llvm/test/tools/dsymutil/X86/basic-linking-bundle.test
index 685c86a375e2a..cf734e4452684 100644
--- a/llvm/test/tools/dsymutil/X86/basic-linking-bundle.test
+++ b/llvm/test/tools/dsymutil/X86/basic-linking-bundle.test
@@ -2,7 +2,7 @@ RUN: rm -rf %t
RUN: mkdir -p %t/dsymdest
RUN: cp %p/../Inputs/basic.macho.x86_64 %t/basic.macho.x86_64
-RUN: dsymutil -accelerator=Pub -oso-prepend-path=%p/.. %t/basic.macho.x86_64
+RUN: dsymutil --linker classic -accelerator=Pub -oso-prepend-path=%p/.. %t/basic.macho.x86_64
Check that the object file in the bundle exists and is sane:
RUN: llvm-dwarfdump -a %t/basic.macho.x86_64.dSYM/Contents/Resources/DWARF/basic.macho.x86_64 | FileCheck %S/basic-linking-x86.test
@@ -15,7 +15,7 @@ RUN: llvm-dwarfdump -a %t/basic.macho.x86_64.dSYM | FileCheck %S/basic-linking-x
RUN: FileCheck %s --input-file %t/basic.macho.x86_64.dSYM/Contents/Info.plist
-RUN: dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -o %t/dsymdest/basic.macho.x86_64.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -o %t/dsymdest/basic.macho.x86_64.dSYM
RUN: llvm-dwarfdump -a %t/dsymdest/basic.macho.x86_64.dSYM/Contents/Resources/DWARF/basic.macho.x86_64 | FileCheck %S/basic-linking-x86.test
RUN: FileCheck %s --input-file %t/dsymdest/basic.macho.x86_64.dSYM/Contents/Info.plist
diff --git a/llvm/test/tools/dsymutil/X86/basic-linking-x86.test b/llvm/test/tools/dsymutil/X86/basic-linking-x86.test
index 14b077f9ec3b1..87395608cdbe6 100644
--- a/llvm/test/tools/dsymutil/X86/basic-linking-x86.test
+++ b/llvm/test/tools/dsymutil/X86/basic-linking-x86.test
@@ -1,20 +1,20 @@
RUN: cp %p/../Inputs/basic.macho.x86_64 %t1
-RUN: dsymutil -accelerator=Pub -f -oso-prepend-path=%p/.. %t1
+RUN: dsymutil --linker classic -accelerator=Pub -f -oso-prepend-path=%p/.. %t1
RUN: llvm-dwarfdump -a %t1.dwarf | FileCheck %s
-RUN: dsymutil -accelerator=Pub -f -o %t2 -oso-prepend-path=%p/.. \
+RUN: dsymutil --linker classic -accelerator=Pub -f -o %t2 -oso-prepend-path=%p/.. \
RUN: %p/../Inputs/basic.macho.x86_64
RUN: llvm-dwarfdump -a %t2 | FileCheck %s
-RUN: dsymutil -accelerator=Pub -f -o - -oso-prepend-path=%p/.. \
+RUN: dsymutil --linker classic -accelerator=Pub -f -o - -oso-prepend-path=%p/.. \
RUN: %p/../Inputs/basic.macho.x86_64 | llvm-dwarfdump -a - | \
RUN: FileCheck %s --check-prefixes=CHECK,BASIC,PUB
-RUN: dsymutil -accelerator=Pub -f -o - -oso-prepend-path=%p/.. \
+RUN: dsymutil --linker classic -accelerator=Pub -f -o - -oso-prepend-path=%p/.. \
RUN: %p/../Inputs/basic-archive.macho.x86_64 | llvm-dwarfdump -a - \
RUN: | FileCheck %s --check-prefixes=CHECK,ARCHIVE,PUB
-RUN: dsymutil -accelerator=Pub -dump-debug-map -oso-prepend-path=%p/.. \
+RUN: dsymutil --linker classic -accelerator=Pub -dump-debug-map -oso-prepend-path=%p/.. \
RUN: %p/../Inputs/basic.macho.x86_64 | dsymutil -accelerator=Pub -f -y \
RUN: -o - - | llvm-dwarfdump -a - | FileCheck %s \
RUN: --check-prefixes=CHECK,BASIC,PUB
-RUN: dsymutil -accelerator=Pub -dump-debug-map -oso-prepend-path=%p/.. \
+RUN: dsymutil --linker classic -accelerator=Pub -dump-debug-map -oso-prepend-path=%p/.. \
RUN: %p/../Inputs/basic-archive.macho.x86_64 | dsymutil -accelerator=Pub \
RUN: -f -o - -y - | llvm-dwarfdump -a - | FileCheck %s \
RUN: --check-prefixes=CHECK,ARCHIVE,PUB
diff --git a/llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test b/llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test
index eefb2ba93e735..811877573fec7 100644
--- a/llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test
+++ b/llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test
@@ -1,4 +1,4 @@
-RUN: dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-lto-dw4.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
+RUN: dsymutil --linker classic -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-lto-dw4.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
RUN: dsymutil --linker parallel -f -o - -oso-prepend-path=%p/.. \
RUN: %p/../Inputs/basic-lto-dw4.macho.x86_64 | llvm-dwarfdump -a - \
diff --git a/llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test b/llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test
index 1b148b5d9167a..095dbf3b91f10 100644
--- a/llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test
+++ b/llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test
@@ -1,5 +1,5 @@
-RUN: dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-lto.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
-RUN: dsymutil -oso-prepend-path=%p/.. -dump-debug-map %p/../Inputs/basic-lto.macho.x86_64 | dsymutil -f -o - -y - | llvm-dwarfdump -a - | FileCheck %s
+RUN: dsymutil --linker classic -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-lto.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
+RUN: dsymutil --linker classic -oso-prepend-path=%p/.. -dump-debug-map %p/../Inputs/basic-lto.macho.x86_64 | dsymutil -f -o - -y - | llvm-dwarfdump -a - | FileCheck %s
RUN: dsymutil --linker parallel -f -o - -oso-prepend-path=%p/.. \
RUN: %p/../Inputs/basic-lto.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/basic-with-libfat-test.test b/llvm/test/tools/dsymutil/X86/basic-with-libfat-test.test
index ef7feb29ee3f5..07d281f0e0d5c 100644
--- a/llvm/test/tools/dsymutil/X86/basic-with-libfat-test.test
+++ b/llvm/test/tools/dsymutil/X86/basic-with-libfat-test.test
@@ -1,4 +1,4 @@
-RUN: dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-with-libfat-test.macho.x86_64 | llvm-dwarfdump - | FileCheck %s
+RUN: dsymutil --linker classic -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-with-libfat-test.macho.x86_64 | llvm-dwarfdump - | FileCheck %s
RUN: dsymutil --linker parallel -f -o - -oso-prepend-path=%p/.. \
RUN: %p/../Inputs/basic-with-libfat-test.macho.x86_64 | llvm-dwarfdump - \
diff --git a/llvm/test/tools/dsymutil/X86/call-site-entry-linking.test b/llvm/test/tools/dsymutil/X86/call-site-entry-linking.test
index 841a0329bb66b..db975f765ceec 100644
--- a/llvm/test/tools/dsymutil/X86/call-site-entry-linking.test
+++ b/llvm/test/tools/dsymutil/X86/call-site-entry-linking.test
@@ -1,4 +1,4 @@
-RUN: dsymutil -oso-prepend-path=%p %p/Inputs/call-site-entry.macho.x86_64 -o %t.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path=%p %p/Inputs/call-site-entry.macho.x86_64 -o %t.dSYM
RUN: llvm-dwarfdump %t.dSYM | FileCheck %s -implicit-check-not=DW_AT_call_return_pc
RUN: dsymutil --linker parallel -oso-prepend-path=%p %p/Inputs/call-site-entry.macho.x86_64 -o %t.dSYM
diff --git a/llvm/test/tools/dsymutil/X86/call-site-entry-reloc.test b/llvm/test/tools/dsymutil/X86/call-site-entry-reloc.test
index b99243f6357eb..4d1047b0f1a14 100644
--- a/llvm/test/tools/dsymutil/X86/call-site-entry-reloc.test
+++ b/llvm/test/tools/dsymutil/X86/call-site-entry-reloc.test
@@ -19,7 +19,7 @@ The test requires the return PC to match a relocation (in this case the
DW_AT_high_pc of main). Without this change the value would get relocated
twice.
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/call_return_pc/call -o %t.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/call_return_pc/call -o %t.dSYM
RUN: llvm-dwarfdump %t.dSYM | FileCheck %s -implicit-check-not=DW_AT_call_return_pc
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/call_return_pc/call -o %t.dSYM
diff --git a/llvm/test/tools/dsymutil/X86/common-sym-multi.test b/llvm/test/tools/dsymutil/X86/common-sym-multi.test
index 251a0d5ac0b00..5c5e5244d969d 100644
--- a/llvm/test/tools/dsymutil/X86/common-sym-multi.test
+++ b/llvm/test/tools/dsymutil/X86/common-sym-multi.test
@@ -1,5 +1,5 @@
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/common/common.x86_64 -f -o - | llvm-dwarfdump -debug-info - | FileCheck %s
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/common/common.x86_64 -dump-debug-map | FileCheck %s --check-prefix DEBUGMAP
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/common/common.x86_64 -f -o - | llvm-dwarfdump -debug-info - | FileCheck %s
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/common/common.x86_64 -dump-debug-map | FileCheck %s --check-prefix DEBUGMAP
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/common/common.x86_64 -f -o - | llvm-dwarfdump -debug-info - | FileCheck %s
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/common/common.x86_64 -dump-debug-map | FileCheck %s --check-prefix DEBUGMAP
diff --git a/llvm/test/tools/dsymutil/X86/common-sym.test b/llvm/test/tools/dsymutil/X86/common-sym.test
index f928153f7f4ba..fd05d7468c600 100644
--- a/llvm/test/tools/dsymutil/X86/common-sym.test
+++ b/llvm/test/tools/dsymutil/X86/common-sym.test
@@ -1,4 +1,4 @@
-RUN: dsymutil -oso-prepend-path %p/.. %p/../Inputs/common.macho.x86_64 -f -o - | llvm-dwarfdump -v -debug-info - | FileCheck %s
+RUN: dsymutil --linker classic -oso-prepend-path %p/.. %p/../Inputs/common.macho.x86_64 -f -o - | llvm-dwarfdump -v -debug-info - | FileCheck %s
RUN: dsymutil --linker parallel -oso-prepend-path %p/.. %p/../Inputs/common.macho.x86_64 -f -o - | llvm-dwarfdump -v -debug-info - | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/custom-line-table.test b/llvm/test/tools/dsymutil/X86/custom-line-table.test
index 1c4b900e7c134..87a236fc1d449 100644
--- a/llvm/test/tools/dsymutil/X86/custom-line-table.test
+++ b/llvm/test/tools/dsymutil/X86/custom-line-table.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -oso-prepend-path %p/../Inputs -y %s -f -o - | llvm-dwarfdump - --debug-line | FileCheck %s
+# RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs -y %s -f -o - | llvm-dwarfdump - --debug-line | FileCheck %s
#
# RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs -y %s -f -o - | llvm-dwarfdump - --debug-line | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/darwin-bundle.test b/llvm/test/tools/dsymutil/X86/darwin-bundle.test
index 62f716b8a61ac..e0b4249353fe9 100644
--- a/llvm/test/tools/dsymutil/X86/darwin-bundle.test
+++ b/llvm/test/tools/dsymutil/X86/darwin-bundle.test
@@ -5,10 +5,10 @@ RUN: mkdir -p %t/dsymdest
RUN: cat %p/../Inputs/basic.macho.x86_64 > %t/basic.macho.x86_64
RUN: cat %p/../Inputs/Info.plist > %t/Info.plist
-RUN: dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -o %t/dsymdest/basic.macho.x86_64.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -o %t/dsymdest/basic.macho.x86_64.dSYM
RUN: FileCheck %s --input-file %t/dsymdest/basic.macho.x86_64.dSYM/Contents/Info.plist
-RUN: dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -toolchain "toolchain&and'some<symbols" -o %t/dsymdest/basic.macho.x86_64.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -toolchain "toolchain&and'some<symbols" -o %t/dsymdest/basic.macho.x86_64.dSYM
RUN: FileCheck %s --input-file %t/dsymdest/basic.macho.x86_64.dSYM/Contents/Info.plist --check-prefix=CHECK --check-prefix=TOOLCHAIN
RUN: dsymutil --linker parallel -oso-prepend-path=%p/.. %t/basic.macho.x86_64 -o %t/dsymdest/basic.macho.x86_64.dSYM
diff --git a/llvm/test/tools/dsymutil/X86/debug-loc-base-addr.test b/llvm/test/tools/dsymutil/X86/debug-loc-base-addr.test
index b3056a4289053..fe41f13315db4 100644
--- a/llvm/test/tools/dsymutil/X86/debug-loc-base-addr.test
+++ b/llvm/test/tools/dsymutil/X86/debug-loc-base-addr.test
@@ -1,4 +1,4 @@
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/baseaddr/loc1.x86_64 -f -o - | llvm-dwarfdump --debug-info - | FileCheck %s
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/baseaddr/loc1.x86_64 -f -o - | llvm-dwarfdump --debug-info - | FileCheck %s
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/baseaddr/loc1.x86_64 -f -o - | llvm-dwarfdump --debug-info - | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/dsym-companion.test b/llvm/test/tools/dsymutil/X86/dsym-companion.test
index d81ad7dc92446..60b82e46a0282 100644
--- a/llvm/test/tools/dsymutil/X86/dsym-companion.test
+++ b/llvm/test/tools/dsymutil/X86/dsym-companion.test
@@ -1,5 +1,5 @@
-RUN: dsymutil -accelerator=Pub -o - %p/../Inputs/basic.macho.i386 -f | llvm-readobj --file-headers -l -S --symbols - | FileCheck %s -check-prefixes=CHECK,CHECK32
-RUN: dsymutil -accelerator=Pub -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -f | llvm-readobj --file-headers -l -S --symbols - | FileCheck %s -check-prefixes=CHECK,CHECK64
+RUN: dsymutil --linker classic -accelerator=Pub -o - %p/../Inputs/basic.macho.i386 -f | llvm-readobj --file-headers -l -S --symbols - | FileCheck %s -check-prefixes=CHECK,CHECK32
+RUN: dsymutil --linker classic -accelerator=Pub -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -f | llvm-readobj --file-headers -l -S --symbols - | FileCheck %s -check-prefixes=CHECK,CHECK64
This test checks that the dSYM companion binaries generated in 32 and 64 bits
are correct. The check are pretty strict (we check even the offsets and sizes
@@ -337,3 +337,5 @@ CHECK64: Value: 0x100001004
CHECK: }
CHECK: ]
+
+## FIXME: Support --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/dwarf4-linetable.test b/llvm/test/tools/dsymutil/X86/dwarf4-linetable.test
index e21610dae7afe..f6fa066cdeb7b 100644
--- a/llvm/test/tools/dsymutil/X86/dwarf4-linetable.test
+++ b/llvm/test/tools/dsymutil/X86/dwarf4-linetable.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-line - | FileCheck %s
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-line - | FileCheck %s
# RUN: dsymutil --linker parallel -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-line - | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/dwarf5-accel.test b/llvm/test/tools/dsymutil/X86/dwarf5-accel.test
index 2bbe8775587c5..b2d4020d30b71 100644
--- a/llvm/test/tools/dsymutil/X86/dwarf5-accel.test
+++ b/llvm/test/tools/dsymutil/X86/dwarf5-accel.test
@@ -12,7 +12,8 @@
## $ clang -gdwarf-5 dwarf5-accel.cpp -c -o dwarf5-accel.o
-#RUN: dsymutil -accelerator=Dwarf -oso-prepend-path %p/Inputs -y %s -o %t.dSYM
+#RUN: dsymutil --linker classic -accelerator=Dwarf -oso-prepend-path %p/Inputs -y %s -o %t.dSYM
+#RUN: dsymutil --linker parallel -accelerator=Dwarf -oso-prepend-path %p/Inputs -y %s -o %t.dSYM
#RUN: llvm-dwarfdump --verify %t.dSYM | FileCheck %s --check-prefix VERIFY
#RUN: llvm-dwarfdump -a --verbose %t.dSYM | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/dwarf5-addrbase-broken.test b/llvm/test/tools/dsymutil/X86/dwarf5-addrbase-broken.test
index cfe70586431e6..95f10814c4cda 100644
--- a/llvm/test/tools/dsymutil/X86/dwarf5-addrbase-broken.test
+++ b/llvm/test/tools/dsymutil/X86/dwarf5-addrbase-broken.test
@@ -12,7 +12,7 @@
# RUN: echo ' symbols:' >> %t2.map
# RUN: echo ' - { sym: __Z3foov, objAddr: 0x0, binAddr: 0x10000, size: 0x10 }' >> %t2.map
# RUN: echo '...' >> %t2.map
-# RUN: dsymutil -y %t2.map -f -o - | llvm-dwarfdump -a - | FileCheck %s
+# RUN: dsymutil --linker classic -y %t2.map -f -o - | llvm-dwarfdump -a - | FileCheck %s
# CHECK: file format Mach-O 64-bit x86-64
# CHECK: .debug_info contents:
@@ -282,3 +282,5 @@ DWARF:
Entries:
- Address: 0x10
...
+
+## FIXME: Support --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/dwarf5-addrx.test b/llvm/test/tools/dsymutil/X86/dwarf5-addrx.test
index f8f5a6f879eeb..171f64bea611c 100644
--- a/llvm/test/tools/dsymutil/X86/dwarf5-addrx.test
+++ b/llvm/test/tools/dsymutil/X86/dwarf5-addrx.test
@@ -42,12 +42,12 @@
## $ clang -gdwarf-5 dwarf5-addrx.c -c -o dwarf5-addrx.o
## $ clang dwarf5-addrx.o -o dwarf5-addrx.out
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/dwarf5/dwarf5-addrx.out -o %t.dSYM 2>&1 | FileCheck %s --allow-empty
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/dwarf5/dwarf5-addrx.out -o %t.dSYM 2>&1 | FileCheck %s --allow-empty
RUN: llvm-dwarfdump --verify %t.dSYM 2>&1 | FileCheck %s
RUN: llvm-dwarfdump --verbose %t.dSYM | FileCheck %s --check-prefix DWARF
-RUN: dsymutil --update -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/dwarf5/dwarf5-addrx.out -o %t.dSYM 2>&1 | FileCheck %s --allow-empty
+RUN: dsymutil --linker classic --update -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/dwarf5/dwarf5-addrx.out -o %t.dSYM 2>&1 | FileCheck %s --allow-empty
RUN: llvm-dwarfdump --verify %t.dSYM 2>&1 | FileCheck %s
RUN: llvm-dwarfdump --verbose %t.dSYM | FileCheck %s --check-prefix UPDATE-DWARF
diff --git a/llvm/test/tools/dsymutil/X86/dwarf5-call-site-entry-reloc.test b/llvm/test/tools/dsymutil/X86/dwarf5-call-site-entry-reloc.test
index d5c5976752542..7b6ab1549345c 100644
--- a/llvm/test/tools/dsymutil/X86/dwarf5-call-site-entry-reloc.test
+++ b/llvm/test/tools/dsymutil/X86/dwarf5-call-site-entry-reloc.test
@@ -19,7 +19,7 @@
## DW_AT_high_pc of main). Without this change the value would get relocated
## twice.
-#RUN: dsymutil -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
+#RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
#RUN: llvm-dwarfdump %t.dSYM | FileCheck %s -implicit-check-not=DW_AT_call_return_pc
#RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
diff --git a/llvm/test/tools/dsymutil/X86/dwarf5-dw-op-addrx.test b/llvm/test/tools/dsymutil/X86/dwarf5-dw-op-addrx.test
index 1cde80159202f..9624b2b5279fb 100644
--- a/llvm/test/tools/dsymutil/X86/dwarf5-dw-op-addrx.test
+++ b/llvm/test/tools/dsymutil/X86/dwarf5-dw-op-addrx.test
@@ -17,11 +17,11 @@
## $ clang -gdwarf-5 dwarf5-dw-op-addrx.c -c -O2 -o dwarf5-dw-op-addrx.o
-#RUN: dsymutil -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
+#RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
#RUN: llvm-dwarfdump --verify %t.dSYM | FileCheck %s
#RUN: llvm-dwarfdump -a --verbose %t.dSYM | FileCheck %s --check-prefix DWARF-CHECK
-#RUN: dsymutil --update -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
+#RUN: dsymutil --linker classic --update -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
#RUN: llvm-dwarfdump --verify %t.dSYM | FileCheck %s
#RUN: llvm-dwarfdump -a --verbose %t.dSYM | FileCheck %s --check-prefix UPD-DWARF-CHECK
diff --git a/llvm/test/tools/dsymutil/X86/dwarf5-linetable.test b/llvm/test/tools/dsymutil/X86/dwarf5-linetable.test
index 8be07f3c904ba..a10b25bbb3792 100644
--- a/llvm/test/tools/dsymutil/X86/dwarf5-linetable.test
+++ b/llvm/test/tools/dsymutil/X86/dwarf5-linetable.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-line -debug-line-str --verbose - | FileCheck %s
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-line -debug-line-str --verbose - | FileCheck %s
# RUN: dsymutil --linker parallel -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-line -debug-line-str --verbose - | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/dwarf5-loclists.test b/llvm/test/tools/dsymutil/X86/dwarf5-loclists.test
index c3897d3ddc2a7..35b38c0390796 100644
--- a/llvm/test/tools/dsymutil/X86/dwarf5-loclists.test
+++ b/llvm/test/tools/dsymutil/X86/dwarf5-loclists.test
@@ -16,11 +16,11 @@
## $ clang -gdwarf-5 dwarf5-loclists.c -c -O2 -o dwarf5-rnglists.o
-#RUN: dsymutil -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
+#RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
#RUN: llvm-dwarfdump --verify %t.dSYM | FileCheck %s
#RUN: llvm-dwarfdump -a --verbose %t.dSYM | FileCheck %s --check-prefix DWARF-CHECK
-#RUN: dsymutil --update -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
+#RUN: dsymutil --linker classic --update -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
#RUN: llvm-dwarfdump --verify %t.dSYM | FileCheck %s
#RUN: llvm-dwarfdump -a --verbose %t.dSYM | FileCheck %s --check-prefix UPD-DWARF-CHECK
diff --git a/llvm/test/tools/dsymutil/X86/dwarf5-many-include-directories.test b/llvm/test/tools/dsymutil/X86/dwarf5-many-include-directories.test
index 644eecd26d8af..948d46547afea 100644
--- a/llvm/test/tools/dsymutil/X86/dwarf5-many-include-directories.test
+++ b/llvm/test/tools/dsymutil/X86/dwarf5-many-include-directories.test
@@ -3,7 +3,7 @@
# RUN: %python %t/all.py > %t/all.ll
# RUN: sed 's at ---TEMPORARY_DIR---@%{/t:regex_replacement}@' %t/debug.map.template > %t/debug.map
# RUN: %llc_dwarf -mtriple x86_64-apple-macosx10.4.0 -o %t/all.o -filetype=obj %t/all.ll
-# RUN: dsymutil -f -y %t/debug.map -o - | llvm-dwarfdump -debug-line - | FileCheck %s
+# RUN: dsymutil --linker classic -f -y %t/debug.map -o - | llvm-dwarfdump -debug-line - | FileCheck %s
# RUN: dsymutil --linker parallel -f -y %t/debug.map -o - | llvm-dwarfdump -debug-line - | tee %t/output.txt | FileCheck %s
# CHECK: include_directories[255] = "/tmp/tmp.0HPkdttdoU/d254"
diff --git a/llvm/test/tools/dsymutil/X86/dwarf5-rnglists.test b/llvm/test/tools/dsymutil/X86/dwarf5-rnglists.test
index 33ae2eb917c2d..668df0ffc5939 100644
--- a/llvm/test/tools/dsymutil/X86/dwarf5-rnglists.test
+++ b/llvm/test/tools/dsymutil/X86/dwarf5-rnglists.test
@@ -29,11 +29,11 @@
## $ clang -gdwarf-5 dwarf5-rnglists.c -c -O2 -o dwarf5-rnglists.o
## $ clang -gdwarf-5 dwarf5-rnglists.o -o dwarf5-rnglists
-#RUN: dsymutil -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
+#RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
#RUN: llvm-dwarfdump --verify %t.dSYM | FileCheck %s
#RUN: llvm-dwarfdump -a --verbose %t.dSYM | FileCheck %s --check-prefix DWARF-CHECK
-#RUN: dsymutil --update -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
+#RUN: dsymutil --linker classic --update -oso-prepend-path %p/../Inputs -y %s -o %t.dSYM
#RUN: llvm-dwarfdump --verify %t.dSYM | FileCheck %s
#RUN: llvm-dwarfdump -a --verbose %t.dSYM | FileCheck %s --check-prefix UPD-DWARF-CHECK
diff --git a/llvm/test/tools/dsymutil/X86/eh_frame.test b/llvm/test/tools/dsymutil/X86/eh_frame.test
index 0f10e4b3166ba..506a019b98854 100644
--- a/llvm/test/tools/dsymutil/X86/eh_frame.test
+++ b/llvm/test/tools/dsymutil/X86/eh_frame.test
@@ -13,7 +13,7 @@ int main(int argc, char** argv)
$ clang eh_frame.cpp -g -c -o eh_frame.o
$ ld -no_compact_unwind eh_frame.o -o eh_frame.out
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/eh_frame/eh_frame.out -o %t.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/eh_frame/eh_frame.out -o %t.dSYM
RUN: llvm-dwarfdump --verify %t.dSYM
RUN: llvm-otool -s __TEXT __eh_frame %p/../Inputs/private/tmp/eh_frame/eh_frame.out | FileCheck %s
RUN: llvm-otool -s __TEXT __eh_frame %t.dSYM/Contents/Resources/DWARF/eh_frame.out | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/empty-CU.test b/llvm/test/tools/dsymutil/X86/empty-CU.test
index 7b06607a74cbc..b0d5d093a90a8 100644
--- a/llvm/test/tools/dsymutil/X86/empty-CU.test
+++ b/llvm/test/tools/dsymutil/X86/empty-CU.test
@@ -1,7 +1,9 @@
RUN: llvm-mc %p/../Inputs/empty-CU.s -filetype obj -triple x86_64-apple-darwin -o %t.o
-RUN: dsymutil --update -f %t.o -o - | llvm-dwarfdump -v - -debug-info | FileCheck %s
+RUN: dsymutil --linker classic --update -f %t.o -o - | llvm-dwarfdump -v - -debug-info | FileCheck %s
CHECK: .debug_info contents:
CHECK: 0x00000000: Compile Unit: length = 0x00000008, format = DWARF32, version = 0x0003, abbr_offset = 0x0000, addr_size = 0x04 (next unit at 0x0000000c)
CHECK: 0x0000000b: DW_TAG_compile_unit [1]
+
+## FIXME: Support --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/fat-archive-input-i386.test b/llvm/test/tools/dsymutil/X86/fat-archive-input-i386.test
index 67573fcdb3050..e460e4ac8e763 100644
--- a/llvm/test/tools/dsymutil/X86/fat-archive-input-i386.test
+++ b/llvm/test/tools/dsymutil/X86/fat-archive-input-i386.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s
# RUN: dsymutil --linker parallel -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/fat-object-compatible-triple.test b/llvm/test/tools/dsymutil/X86/fat-object-compatible-triple.test
index e5f15c79ae130..2c026ec072e93 100644
--- a/llvm/test/tools/dsymutil/X86/fat-object-compatible-triple.test
+++ b/llvm/test/tools/dsymutil/X86/fat-object-compatible-triple.test
@@ -2,7 +2,7 @@
# is no exact string match (e.g. the debug map triple has a version suffix that
# the object file triple lacks).
-# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s
# RUN: dsymutil --linker parallel -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64.test b/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64.test
index c82a2ff1d5bec..f739fb348551c 100644
--- a/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64.test
+++ b/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s
# RUN: dsymutil --linker parallel -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64h.test b/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64h.test
index c751fc3fa8d53..aed5af47999f0 100644
--- a/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64h.test
+++ b/llvm/test/tools/dsymutil/X86/fat-object-input-x86_64h.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s
# RUN: dsymutil --linker parallel -f -oso-prepend-path=%p/../Inputs -y %s -o - | llvm-dwarfdump -debug-info - | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/frame-1.test b/llvm/test/tools/dsymutil/X86/frame-1.test
index 7af4bb8dc90f9..e2d72928b728f 100644
--- a/llvm/test/tools/dsymutil/X86/frame-1.test
+++ b/llvm/test/tools/dsymutil/X86/frame-1.test
@@ -1,7 +1,7 @@
# RUN: rm -rf %t
# RUN: mkdir -p %t
# RUN: llc -filetype=obj %p/../Inputs/frame-dw2.ll -o %t/frame-dw2.o
-# RUN: dsymutil -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-frame - | FileCheck %s
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-frame - | FileCheck %s
# This test is meant to verify that identical CIEs will get reused
# in the same file but also inbetween files. For this to happen, we
@@ -29,3 +29,5 @@ objects:
# CHECK: FDE cie=00000000 pc=00003000...00003
# CHECK-NOT: FDE
# CHECK: .eh_frame contents:
+
+## FIXME: Support --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/frame-2.test b/llvm/test/tools/dsymutil/X86/frame-2.test
index 4ae94e25f7caf..4db89ea815f71 100644
--- a/llvm/test/tools/dsymutil/X86/frame-2.test
+++ b/llvm/test/tools/dsymutil/X86/frame-2.test
@@ -2,7 +2,7 @@
# RUN: mkdir -p %t
# RUN: llc -filetype=obj %p/../Inputs/frame-dw2.ll -o %t/frame-dw2.o
# RUN: llc -filetype=obj %p/../Inputs/frame-dw4.ll -o %t/frame-dw4.o
-# RUN: dsymutil -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-frame - | FileCheck %s
+# RUN: dsymutil --linker classic -f -oso-prepend-path=%t -y %s -o - | llvm-dwarfdump -debug-frame - | FileCheck %s
# Check the handling of multiple different CIEs. To have CIEs that
# appear to be different, use a dwarf2 version of the file along with
@@ -39,3 +39,5 @@ objects:
# CHECK: FDE cie=00000000 pc=00004000...00004
# CHECK-NOT: FDE
# CHECK: .eh_frame contents:
+
+## FIXME: Support --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/generate-empty-CU.test b/llvm/test/tools/dsymutil/X86/generate-empty-CU.test
index 3f24c2b274da9..655533516274a 100644
--- a/llvm/test/tools/dsymutil/X86/generate-empty-CU.test
+++ b/llvm/test/tools/dsymutil/X86/generate-empty-CU.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -f -o - -oso-prepend-path=%p/.. -y %s | llvm-dwarfdump -v - | FileCheck %s
+# RUN: dsymutil --linker classic -f -o - -oso-prepend-path=%p/.. -y %s | llvm-dwarfdump -v - | FileCheck %s
# RUN: dsymutil --linker parallel -f -o - -oso-prepend-path=%p/.. -y %s | llvm-dwarfdump -v - | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/keep-func.test b/llvm/test/tools/dsymutil/X86/keep-func.test
index 021c7212bd831..067464647b03f 100644
--- a/llvm/test/tools/dsymutil/X86/keep-func.test
+++ b/llvm/test/tools/dsymutil/X86/keep-func.test
@@ -20,8 +20,8 @@ int main()
$ clang++ -O2 -g main.cpp -c -o main.o
$ clang++ main.o -o main.out
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/keep_func/main.out -o %t.omit.dSYM
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/keep_func/main.out -o %t.keep.dSYM -keep-function-for-static
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/keep_func/main.out -o %t.omit.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/keep_func/main.out -o %t.keep.dSYM -keep-function-for-static
RUN: llvm-dwarfdump %t.omit.dSYM | FileCheck %s --check-prefix OMIT
RUN: llvm-dwarfdump %t.keep.dSYM | FileCheck %s --check-prefix KEEP
@@ -34,3 +34,5 @@ OMIT-NOT: DW_AT_name ("MyDummyVar")
OMIT-NOT: DW_AT_name ("FOO_VAR_TYPE")
OMIT-NOT: DW_AT_name ("x1")
OMIT-NOT: DW_AT_name ("x2")
+
+## FIXME: Support --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/label.test b/llvm/test/tools/dsymutil/X86/label.test
index 4687db720a9f1..0e6cbdd1065ab 100644
--- a/llvm/test/tools/dsymutil/X86/label.test
+++ b/llvm/test/tools/dsymutil/X86/label.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -oso-prepend-path %p/../Inputs -y %s -f -o - | llvm-dwarfdump - --debug-info | FileCheck %s
+# RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs -y %s -f -o - | llvm-dwarfdump - --debug-info | FileCheck %s
# RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs -y %s -f -o - | llvm-dwarfdump - --debug-info | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/label2.test b/llvm/test/tools/dsymutil/X86/label2.test
index aa9f9c487603d..6b8d1eed9578e 100644
--- a/llvm/test/tools/dsymutil/X86/label2.test
+++ b/llvm/test/tools/dsymutil/X86/label2.test
@@ -11,7 +11,7 @@ foobar:
$ clang -g label.c -c -o label.o
$ clang label.o -o label.out
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/label/label.out -o %t.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/label/label.out -o %t.dSYM
RUN: llvm-dwarfdump %t.dSYM | FileCheck %s
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/label/label.out -o %t.dSYM
diff --git a/llvm/test/tools/dsymutil/X86/lc_build_version.test b/llvm/test/tools/dsymutil/X86/lc_build_version.test
index 8be5b9ccff2e0..79a3be9a15e14 100644
--- a/llvm/test/tools/dsymutil/X86/lc_build_version.test
+++ b/llvm/test/tools/dsymutil/X86/lc_build_version.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -f %p/../Inputs/lc_build_version.x86_64 -o - \
+# RUN: dsymutil --linker classic -f %p/../Inputs/lc_build_version.x86_64 -o - \
# RUN: -oso-prepend-path=%p/.. | obj2yaml | FileCheck %s
# RUN: dsymutil --linker parallel -f %p/../Inputs/lc_build_version.x86_64 -o - \
diff --git a/llvm/test/tools/dsymutil/X86/linker-llvm-union-fwd-decl.test b/llvm/test/tools/dsymutil/X86/linker-llvm-union-fwd-decl.test
index 47dd3871d6fdc..4b2d40ae726b6 100644
--- a/llvm/test/tools/dsymutil/X86/linker-llvm-union-fwd-decl.test
+++ b/llvm/test/tools/dsymutil/X86/linker-llvm-union-fwd-decl.test
@@ -48,6 +48,8 @@ Note that the link order in the last command matters for this test.
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/union/a.out -o %t.dSYM
RUN: llvm-dwarfdump --debug-info %t.dSYM | FileCheck %s
+## FIXME: Support --linker classic
+
CHECK: DW_TAG_compile_unit
CHECK-NEXT: DW_AT_producer ("llvm DWARFLinkerParallel library
CHECK-NEXT: DW_AT_language (DW_LANG_C_plus_plus_14)
diff --git a/llvm/test/tools/dsymutil/X86/location-expression.test b/llvm/test/tools/dsymutil/X86/location-expression.test
index c2e8d16d77fa6..be8420878e945 100644
--- a/llvm/test/tools/dsymutil/X86/location-expression.test
+++ b/llvm/test/tools/dsymutil/X86/location-expression.test
@@ -10,7 +10,7 @@
# RUN: echo ' symbols:' >> %t2.map
# RUN: echo ' - { sym: __Z3foov, objAddr: 0x0, binAddr: 0x10000, size: 0x10 }' >> %t2.map
# RUN: echo '...' >> %t2.map
-# RUN: dsymutil -y %t2.map -f -o - | llvm-dwarfdump -a --verbose - | FileCheck %s
+# RUN: dsymutil --linker classic -y %t2.map -f -o - | llvm-dwarfdump -a --verbose - | FileCheck %s
# RUN: dsymutil --linker parallel -y %t2.map -f -o - | llvm-dwarfdump -a --verbose - | FileCheck %s
# CHECK: file format Mach-O 64-bit x86-64
diff --git a/llvm/test/tools/dsymutil/X86/module-warnings.test b/llvm/test/tools/dsymutil/X86/module-warnings.test
index bb8a23b717d71..33cd212812707 100644
--- a/llvm/test/tools/dsymutil/X86/module-warnings.test
+++ b/llvm/test/tools/dsymutil/X86/module-warnings.test
@@ -23,7 +23,7 @@
# RUN: cp %p/../Inputs/module-warnings/1.o %t.dir
# RUN: cp %p/../Inputs/module-warnings/Foo.pcm %t.dir/ModuleCache
#
-# RUN: dsymutil -verify -f -oso-prepend-path=%t.dir -y \
+# RUN: dsymutil --linker classic -verify -f -oso-prepend-path=%t.dir -y \
# RUN: %p/dummy-debug-map.map -o %t 2>&1 | FileCheck %s
#
# Module-not-found should be reported only once.
@@ -32,12 +32,12 @@
# CHECK-NOT: warning: {{.*}}Bar.pcm:
#
# RUN: cp %p/../Inputs/module-warnings/libstatic.a %t.dir
-# RUN: dsymutil -verify -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 | FileCheck %s
+# RUN: dsymutil --linker classic -verify -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 | FileCheck %s
# CHECK: rebuild the module cache
# CHECK-NOT: static libraries
#
# RUN: rm -rf %t.dir/ModuleCache
-# RUN: dsymutil -verify -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 \
+# RUN: dsymutil --linker classic -verify -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 \
# RUN: | FileCheck %s --check-prefix=STATIC
# STATIC: warning: {{.*}}Bar.pcm:
# STATIC: note: Linking a static library
@@ -52,3 +52,5 @@ objects:
symbols:
- { sym: __Z3foov, objAddr: 0x0, binAddr: 0x10000, size: 0x10 }
...
+
+## FIXME: Support --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/multiple-inputs.test b/llvm/test/tools/dsymutil/X86/multiple-inputs.test
index 9b0491349aa50..ca0f2ae6662d9 100644
--- a/llvm/test/tools/dsymutil/X86/multiple-inputs.test
+++ b/llvm/test/tools/dsymutil/X86/multiple-inputs.test
@@ -7,7 +7,7 @@ RUN: cp %p/../Inputs/basic-lto.macho.x86_64 %t/basic-lto.macho.x86_64
RUN: cp %p/../Inputs/basic-lto-dw4.macho.x86_64 %t/basic-lto-dw4.macho.x86_64
# Multiple inputs in flat mode
-RUN: dsymutil -f -oso-prepend-path=%p/.. %t/basic.macho.x86_64 %t/basic-archive.macho.x86_64 %t/basic-lto.macho.x86_64 %t/basic-lto-dw4.macho.x86_64
+RUN: dsymutil --linker classic -f -oso-prepend-path=%p/.. %t/basic.macho.x86_64 %t/basic-archive.macho.x86_64 %t/basic-lto.macho.x86_64 %t/basic-lto-dw4.macho.x86_64
RUN: llvm-dwarfdump -a %t/basic.macho.x86_64.dwarf \
RUN: | FileCheck %S/basic-linking-x86.test --check-prefixes=CHECK,BASIC
RUN: llvm-dwarfdump -a %t/basic-archive.macho.x86_64.dwarf \
@@ -16,7 +16,7 @@ RUN: llvm-dwarfdump -a %t/basic-lto.macho.x86_64.dwarf | FileCheck %S/basic-lto-
RUN: llvm-dwarfdump -a %t/basic-lto-dw4.macho.x86_64.dwarf | FileCheck %S/basic-lto-dw4-linking-x86.test
# Multiple inputs that end up in the same named bundle
-RUN: dsymutil -oso-prepend-path=%p/.. %t/basic.macho.x86_64 %t/basic-archive.macho.x86_64 %t/basic-lto.macho.x86_64 %t/basic-lto-dw4.macho.x86_64 -o %t.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path=%p/.. %t/basic.macho.x86_64 %t/basic-archive.macho.x86_64 %t/basic-lto.macho.x86_64 %t/basic-lto-dw4.macho.x86_64 -o %t.dSYM
RUN: llvm-dwarfdump -a %t.dSYM/Contents/Resources/DWARF/basic.macho.x86_64 \
RUN: | FileCheck %S/basic-linking-x86.test --check-prefixes=CHECK,BASIC
RUN: llvm-dwarfdump -a %t.dSYM/Contents/Resources/DWARF/basic-archive.macho.x86_64 \
@@ -25,7 +25,7 @@ RUN: llvm-dwarfdump -a %t.dSYM/Contents/Resources/DWARF/basic-lto.macho.x86_64 |
RUN: llvm-dwarfdump -a %t.dSYM/Contents/Resources/DWARF/basic-lto-dw4.macho.x86_64 | FileCheck %S/basic-lto-dw4-linking-x86.test
# Multiple inputs in a named bundle in flat mode... impossible.
-RUN: not dsymutil -f -oso-prepend-path=%p/.. %t/basic.macho.x86_64 %t/basic-archive.macho.x86_64 %t/basic-lto.macho.x86_64 %t/basic-lto-dw4.macho.x86_64 -o %t.dSYM 2>&1 | FileCheck %s
+RUN: not dsymutil --linker classic -f -oso-prepend-path=%p/.. %t/basic.macho.x86_64 %t/basic-archive.macho.x86_64 %t/basic-lto.macho.x86_64 %t/basic-lto-dw4.macho.x86_64 -o %t.dSYM 2>&1 | FileCheck %s
## ---------------------------------------
## Repeat the same steps for --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/objc.test b/llvm/test/tools/dsymutil/X86/objc.test
index d3df95802e0f0..fb57aecaef9db 100644
--- a/llvm/test/tools/dsymutil/X86/objc.test
+++ b/llvm/test/tools/dsymutil/X86/objc.test
@@ -1,8 +1,8 @@
-RUN: dsymutil --verify-dwarf=output -f -oso-prepend-path=%p/.. %p/../Inputs/objc.macho.x86_64 -o %t.d4
+RUN: dsymutil --linker classic --verify-dwarf=output -f -oso-prepend-path=%p/.. %p/../Inputs/objc.macho.x86_64 -o %t.d4
RUN: llvm-dwarfdump -apple-types -apple-objc %t.d4 | FileCheck %s
; Test DWARF 5 tables
-RUN: dsymutil --verify-dwarf=output --accelerator='Dwarf' -f -oso-prepend-path=%p/.. %p/../Inputs/objc.macho.x86_64 -o %t.d5
+RUN: dsymutil --linker classic --verify-dwarf=output --accelerator='Dwarf' -f -oso-prepend-path=%p/.. %p/../Inputs/objc.macho.x86_64 -o %t.d5
RUN: llvm-dwarfdump -debug-names %t.d5 | FileCheck %s --check-prefix=D5
D5: String: {{.*}} "method1:"
@@ -62,3 +62,5 @@ CHECK-NEXT: ]
CHECK-NEXT: }
CHECK-NEXT: ]
CHECK-NEXT: ]
+
+## FIXME: Support --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/object-prefix-path.test b/llvm/test/tools/dsymutil/X86/object-prefix-path.test
index 00ff88594a2e5..b6dda69f81e6c 100644
--- a/llvm/test/tools/dsymutil/X86/object-prefix-path.test
+++ b/llvm/test/tools/dsymutil/X86/object-prefix-path.test
@@ -2,7 +2,7 @@ RUN: rm -rf %t.dir && mkdir %t.dir && mkdir %t.dir/ModuleCacheRenamed
RUN: cp %p/../Inputs/module-warnings/1.o %t.dir
RUN: cp %p/../Inputs/module-warnings/Foo.pcm %t.dir/ModuleCacheRenamed
-RUN: dsymutil -verify -f -oso-prepend-path=%t.dir -y \
+RUN: dsymutil --linker classic -verify -f -oso-prepend-path=%t.dir -y \
RUN: %p/dummy-debug-map.map -o %t \
RUN: -object-prefix-map=/ModuleCache=/ModuleCacheRenamed \
RUN: 2>&1 | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/odr-simple-template-names-mixed.test b/llvm/test/tools/dsymutil/X86/odr-simple-template-names-mixed.test
index 766d90fdedfb2..6a34bcce177ba 100644
--- a/llvm/test/tools/dsymutil/X86/odr-simple-template-names-mixed.test
+++ b/llvm/test/tools/dsymutil/X86/odr-simple-template-names-mixed.test
@@ -6,7 +6,7 @@
# RUN: echo ' symbols:' >> %t2.map
# RUN: echo ' - { sym: __Z3foov, objAddr: 0x0, binAddr: 0x10000, size: 0x10 }' >> %t2.map
# RUN: echo '...' >> %t2.map
-# RUN: dsymutil -f -y %t2.map -o - | llvm-dwarfdump --debug-info - | FileCheck %s
+# RUN: dsymutil --linker classic -f -y %t2.map -o - | llvm-dwarfdump --debug-info - | FileCheck %s
# RUN: dsymutil --linker parallel -f -y %t2.map -o - | llvm-dwarfdump --debug-info - | FileCheck --check-prefix=PARALLEL %s
## Test that dsymutil correctly resolves simple template names to types that use
diff --git a/llvm/test/tools/dsymutil/X86/odr-simple-template-names.test b/llvm/test/tools/dsymutil/X86/odr-simple-template-names.test
index f37c076fd2905..8b1ad66c276c2 100644
--- a/llvm/test/tools/dsymutil/X86/odr-simple-template-names.test
+++ b/llvm/test/tools/dsymutil/X86/odr-simple-template-names.test
@@ -6,7 +6,7 @@
# RUN: echo ' symbols:' >> %t2.map
# RUN: echo ' - { sym: __Z3foov, objAddr: 0x0, binAddr: 0x10000, size: 0x10 }' >> %t2.map
# RUN: echo '...' >> %t2.map
-# RUN: dsymutil -f -y %t2.map -o - | llvm-dwarfdump --debug-info - | FileCheck %s
+# RUN: dsymutil --linker classic -f -y %t2.map -o - | llvm-dwarfdump --debug-info - | FileCheck %s
# RUN: dsymutil --linker parallel -f -y %t2.map -o - | llvm-dwarfdump --debug-info - | FileCheck --check-prefix=PARALLEL %s
## Test that dsymutil correctly handles -gsimple-template-names, where
diff --git a/llvm/test/tools/dsymutil/X86/odr-two-units-in-single-file.test b/llvm/test/tools/dsymutil/X86/odr-two-units-in-single-file.test
index c4c833700fefd..0a9f3081f89b3 100644
--- a/llvm/test/tools/dsymutil/X86/odr-two-units-in-single-file.test
+++ b/llvm/test/tools/dsymutil/X86/odr-two-units-in-single-file.test
@@ -11,7 +11,7 @@
# RUN: echo ' symbols:' >> %t2.map
# RUN: echo ' - { sym: __Z3foov, objAddr: 0x0, binAddr: 0x10000, size: 0x10 }' >> %t2.map
# RUN: echo '...' >> %t2.map
-# RUN: dsymutil -y %t2.map -f -o - | llvm-dwarfdump -a - | FileCheck %s
+# RUN: dsymutil --linker classic -y %t2.map -f -o - | llvm-dwarfdump -a - | FileCheck %s
# CHECK: file format Mach-O 64-bit x86-64
# CHECK: .debug_info contents:
@@ -198,3 +198,5 @@ DWARF:
- Value: 0x0000001a
- AbbrCode: 0
...
+
+## FIXME: Support --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/op-convert-offset.test b/llvm/test/tools/dsymutil/X86/op-convert-offset.test
index ee67e44b852eb..370a7e47b1cf1 100644
--- a/llvm/test/tools/dsymutil/X86/op-convert-offset.test
+++ b/llvm/test/tools/dsymutil/X86/op-convert-offset.test
@@ -20,7 +20,7 @@
# $ xcrun clang -c op-convert-offset.ll -O0 -arch x86_64
# $ xcrun clang -g op-convert-offset.o -O0 -arch x86_64 -o op-convert-offset
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/op-convert-offset/op-convert-offset -o %t.dSYM 2>&1
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/op-convert-offset/op-convert-offset -o %t.dSYM 2>&1
RUN: llvm-dwarfdump %p/../Inputs/private/tmp/op-convert-offset/op-convert-offset.o 2>&1 | FileCheck %s --check-prefix OBJ
RUN: llvm-dwarfdump %t.dSYM 2>&1 | FileCheck %s --check-prefix DSYM
diff --git a/llvm/test/tools/dsymutil/X86/op-convert.test b/llvm/test/tools/dsymutil/X86/op-convert.test
index 9d39b13d844ab..97a66d3387315 100644
--- a/llvm/test/tools/dsymutil/X86/op-convert.test
+++ b/llvm/test/tools/dsymutil/X86/op-convert.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -f -o %t --verify -oso-prepend-path=%p/../Inputs -y %s
+# RUN: dsymutil --linker classic -f -o %t --verify -oso-prepend-path=%p/../Inputs -y %s
# RUN: llvm-dwarfdump %t | FileCheck %s
# RUN: dsymutil --linker parallel -f -o %t --verify -oso-prepend-path=%p/../Inputs -y %s
diff --git a/llvm/test/tools/dsymutil/X86/reflection-dump.test b/llvm/test/tools/dsymutil/X86/reflection-dump.test
index 9cf9874f4acdd..9703070f43260 100644
--- a/llvm/test/tools/dsymutil/X86/reflection-dump.test
+++ b/llvm/test/tools/dsymutil/X86/reflection-dump.test
@@ -6,7 +6,7 @@ RUN: yaml2obj %p/../Inputs/main.yaml -o %t.dir/main
RUN: yaml2obj %p/../Inputs/test.yaml -o %t.dir/tmp/test-1.o
RUN: yaml2obj %p/../Inputs/reflection_metadata.yaml -o %t.dir/tmp/reflection_metadata-1.o
-RUN: dsymutil -oso-prepend-path=%t.dir %t.dir/main -o %t.dir/main.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path=%t.dir %t.dir/main -o %t.dir/main.dSYM
RUN: llvm-objdump -s %t.dir/main.dSYM/Contents/Resources/DWARF/main | FileCheck %s
RUN: dsymutil --linker parallel -oso-prepend-path=%t.dir %t.dir/main -o %t.dir/main.dSYM
diff --git a/llvm/test/tools/dsymutil/X86/remarks-linking-fat-bundle.test b/llvm/test/tools/dsymutil/X86/remarks-linking-fat-bundle.test
index b2605a73ac39b..f74a48b4c3060 100644
--- a/llvm/test/tools/dsymutil/X86/remarks-linking-fat-bundle.test
+++ b/llvm/test/tools/dsymutil/X86/remarks-linking-fat-bundle.test
@@ -6,7 +6,7 @@ RUN: cat %p/../Inputs/remarks/fat.macho.remarks.x86 > %t/fat.macho.remarks.x86
RUN: llvm-remarkutil yaml2bitstream %p/../Inputs/private/tmp/remarks/fat.macho.remarks.x86_64.opt.yaml -o %t/private/tmp/remarks/fat.macho.remarks.x86_64.opt.bitstream
RUN: llvm-remarkutil yaml2bitstream %p/../Inputs/private/tmp/remarks/fat.macho.remarks.x86_64h.opt.yaml -o %t/private/tmp/remarks/fat.macho.remarks.x86_64h.opt.bitstream
-RUN: dsymutil -oso-prepend-path=%p/../Inputs -remarks-prepend-path=%t %t/fat.macho.remarks.x86
+RUN: dsymutil --linker classic -oso-prepend-path=%p/../Inputs -remarks-prepend-path=%t %t/fat.macho.remarks.x86
Check that the remark files in the bundle exist and are all sane:
RUN: llvm-bcanalyzer -dump %t/fat.macho.remarks.x86.dSYM/Contents/Resources/Remarks/fat.macho.remarks.x86-x86_64h | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/reproducer.test b/llvm/test/tools/dsymutil/X86/reproducer.test
index 86caddf42cc30..080ea600e4547 100644
--- a/llvm/test/tools/dsymutil/X86/reproducer.test
+++ b/llvm/test/tools/dsymutil/X86/reproducer.test
@@ -11,7 +11,7 @@ RUN: cp %p/../Inputs/basic2.macho.x86_64.o %t/Inputs
RUN: cp %p/../Inputs/basic3.macho.x86_64.o %t/Inputs
# Verify all the files are present.
-RUN: dsymutil -f -o - -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
+RUN: dsymutil --linker classic -f -o - -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
# Make sure we don't crash with an empty TMPDIR.
RUN: env TMPDIR="" dsymutil -o -f -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 2>&1
@@ -31,16 +31,16 @@ RUN: ls %t.diags | grep 'dsymutil-' | count 1
# Remove the input files and verify that was successful.
RUN: rm -rf %t
-RUN: not dsymutil -f -o %t.error -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 2>&1 | FileCheck %s --check-prefix=ERROR
+RUN: not dsymutil --linker classic -f -o %t.error -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 2>&1 | FileCheck %s --check-prefix=ERROR
RUN: not dsymutil --linker parallel -f -o %t.error -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 2>&1 | FileCheck %s --check-prefix=ERROR
# Use the reproducer.
-RUN: dsymutil -use-reproducer %t.repro -f -o - -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
+RUN: dsymutil --linker classic -use-reproducer %t.repro -f -o - -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
RUN: dsymutil --linker parallel -use-reproducer %t.repro -f -o - -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
# Using a reproducer takes precedence.
-RUN: dsymutil -gen-reproducer -use-reproducer %t.repro -f -o - -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
+RUN: dsymutil --linker classic -gen-reproducer -use-reproducer %t.repro -f -o - -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
RUN: dsymutil --linker parallel -gen-reproducer -use-reproducer %t.repro -f -o - -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 | llvm-dwarfdump -a - | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/statistics.test b/llvm/test/tools/dsymutil/X86/statistics.test
index d0efba78a7af6..1e4f9cf1c38d9 100644
--- a/llvm/test/tools/dsymutil/X86/statistics.test
+++ b/llvm/test/tools/dsymutil/X86/statistics.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -statistics -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 %p/../Inputs/basic-archive.macho.x86_64 %p/../Inputs/basic-lto.macho.x86_64 %p/../Inputs/basic-lto-dw4.macho.x86_64 -o %t 2>&1 | FileCheck %s
+# RUN: dsymutil --linker classic -statistics -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 %p/../Inputs/basic-archive.macho.x86_64 %p/../Inputs/basic-lto.macho.x86_64 %p/../Inputs/basic-lto-dw4.macho.x86_64 -o %t 2>&1 | FileCheck %s
# RUN: dsymutil --linker parallel -statistics -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 %p/../Inputs/basic-archive.macho.x86_64 %p/../Inputs/basic-lto.macho.x86_64 %p/../Inputs/basic-lto-dw4.macho.x86_64 -o %t 2>&1 | FileCheck %s
#
# CHECK: -------------------------------------------------------------------------------
diff --git a/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test b/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test
index 70a263bf03803..2235200e1de1a 100644
--- a/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test
+++ b/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test
@@ -1,6 +1,6 @@
RUN: rm -rf %t && mkdir %t
-RUN: dsymutil -oso-prepend-path %p/.. %p/../Inputs/swift-ast.macho.x86_64 -o %t/swift-ast.dSYM -verbose -no-swiftmodule-timestamp | FileCheck %s --check-prefix=DSYMUTIL
-RUN: dsymutil -oso-prepend-path %p/.. %p/../Inputs/swift-ast.macho.x86_64 -o %t/swift-ast.dSYM -verbose | FileCheck %s --check-prefix=DSYMUTIL
+RUN: dsymutil --linker classic -oso-prepend-path %p/.. %p/../Inputs/swift-ast.macho.x86_64 -o %t/swift-ast.dSYM -verbose -no-swiftmodule-timestamp | FileCheck %s --check-prefix=DSYMUTIL
+RUN: dsymutil --linker classic -oso-prepend-path %p/.. %p/../Inputs/swift-ast.macho.x86_64 -o %t/swift-ast.dSYM -verbose | FileCheck %s --check-prefix=DSYMUTIL
RUN: llvm-readobj --sections --section-data %t/swift-ast.dSYM/Contents/Resources/DWARF/swift-ast.macho.x86_64 | FileCheck %s --check-prefix=READOBJ
RUN: llvm-dwarfdump --show-section-sizes %t/swift-ast.dSYM/Contents/Resources/DWARF/swift-ast.macho.x86_64 | FileCheck %s --check-prefix=DWARFDUMP
@@ -28,5 +28,5 @@ READOBJ-NEXT: |.|
DWARFDUMP: __swift_ast
-RUN: dsymutil -s %t/swift-ast.dSYM/Contents/Resources/DWARF/swift-ast.macho.x86_64 | FileCheck %s --check-prefix=NAST
+RUN: dsymutil --linker classic -s %t/swift-ast.dSYM/Contents/Resources/DWARF/swift-ast.macho.x86_64 | FileCheck %s --check-prefix=NAST
NAST-NOT: N_AST
diff --git a/llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test b/llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test
index 3879f31e8ab0d..a4d0f0a9af6b6 100644
--- a/llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test
+++ b/llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test
@@ -1,4 +1,4 @@
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/swift-dwarf-loc.macho.x86_64 -no-output -verbose | FileCheck %s
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/swift-dwarf-loc.macho.x86_64 -no-output -verbose | FileCheck %s
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/swift-dwarf-loc.macho.x86_64 -no-output -verbose | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/X86/swift-interface.test b/llvm/test/tools/dsymutil/X86/swift-interface.test
index 23b27bd3e12d0..d64b61070567e 100644
--- a/llvm/test/tools/dsymutil/X86/swift-interface.test
+++ b/llvm/test/tools/dsymutil/X86/swift-interface.test
@@ -3,11 +3,11 @@
# RUN: mkdir -p %t.dir/Foo/x86_64
# RUN: llvm-mc -triple x86_64-apple-macos -filetype=obj -o %t.dir/obj/1.o \
# RUN: %p/../Inputs/swift-interface.s
-# RUN: dsymutil -oso-prepend-path %t.dir -y %s \
+# RUN: dsymutil --linker classic -oso-prepend-path %t.dir -y %s \
# RUN: -o %t.dir/swift-interface.dSYM 2>&1 \
# RUN: | FileCheck %s --check-prefix=WARNINGS
# RUN: echo "// module Foo" >%t.dir/Foo/x86_64.swiftinterface
-# RUN: dsymutil -oso-prepend-path %t.dir -y %s \
+# RUN: dsymutil --linker classic -oso-prepend-path %t.dir -y %s \
# RUN: -o %t.dir/swift-interface.dSYM
# RUN: cat %t.dir/swift-interface.dSYM/Contents/Resources/Swift/x86_64/Foo.swiftinterface \
# RUN: | FileCheck %s --check-prefix=INTERFACE
@@ -24,3 +24,5 @@ objects:
symbols:
- { sym: _main, objAddr: 0x0, binAddr: 0x10000, size: 0x10 }
...
+
+## FIXME: Support --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/tail-call-linking.test b/llvm/test/tools/dsymutil/X86/tail-call-linking.test
index 0f9cc604a72cf..db05282533ab6 100644
--- a/llvm/test/tools/dsymutil/X86/tail-call-linking.test
+++ b/llvm/test/tools/dsymutil/X86/tail-call-linking.test
@@ -1,4 +1,4 @@
-RUN: dsymutil -oso-prepend-path=%p %p/Inputs/tail-call.macho.x86_64 -o %t.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path=%p %p/Inputs/tail-call.macho.x86_64 -o %t.dSYM
RUN: llvm-dwarfdump %t.dSYM | FileCheck %s -implicit-check-not=DW_AT_call_pc
RUN: dsymutil --linker parallel -oso-prepend-path=%p %p/Inputs/tail-call.macho.x86_64 -o %t.dSYM
diff --git a/llvm/test/tools/dsymutil/X86/template_operators.test b/llvm/test/tools/dsymutil/X86/template_operators.test
index 3397136125432..fca0c994f8d5e 100644
--- a/llvm/test/tools/dsymutil/X86/template_operators.test
+++ b/llvm/test/tools/dsymutil/X86/template_operators.test
@@ -1,4 +1,5 @@
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/templated_operators/template_operators -o %t.apple.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/templated_operators/template_operators -o %t.apple.dSYM
+RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/templated_operators/template_operators -o %t.apple.dSYM
RUN: llvm-dwarfdump -apple-names %t.apple.dSYM | FileCheck %s -check-prefix=NAMES
diff --git a/llvm/test/tools/dsymutil/X86/thinlto.test b/llvm/test/tools/dsymutil/X86/thinlto.test
index 05fc8432287ce..e2f97e3be988a 100644
--- a/llvm/test/tools/dsymutil/X86/thinlto.test
+++ b/llvm/test/tools/dsymutil/X86/thinlto.test
@@ -19,7 +19,7 @@ void function1()
$ xcrun clang++ -g -flto=thin -O2 foo.cpp bar.cpp -c
$ xcrun clang++ -flto=thin foo.o bar.o -Xlinker -object_path_lto -Xlinker lto -shared -o foobar.dylib
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/thinlto/foobar.dylib -o %t.dSYM 2>&1 | FileCheck %s --allow-empty
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/thinlto/foobar.dylib -o %t.dSYM 2>&1 | FileCheck %s --allow-empty
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/thinlto/foobar.dylib -o %t.dSYM 2>&1 | FileCheck %s --allow-empty
diff --git a/llvm/test/tools/dsymutil/X86/timestamp-mismatch.test b/llvm/test/tools/dsymutil/X86/timestamp-mismatch.test
index 4665c75cfe0b7..786124c36c84c 100644
--- a/llvm/test/tools/dsymutil/X86/timestamp-mismatch.test
+++ b/llvm/test/tools/dsymutil/X86/timestamp-mismatch.test
@@ -3,8 +3,8 @@ RUN: cp %p/../Inputs/basic.macho.x86_64 %t/Inputs
RUN: cp %p/../Inputs/basic1.macho.x86_64.o %t/Inputs
RUN: cp %p/../Inputs/basic2.macho.x86_64.o %t/Inputs
RUN: cp %p/../Inputs/basic3.macho.x86_64.o %t/Inputs
-RUN: dsymutil -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 -o %t.dSYM 2>&1 | FileCheck %s --check-prefix=WARN
-RUN: dsymutil -no-object-timestamp -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 -o %t.dSYM 2>&1 | FileCheck %s --allow-empty --check-prefix=NOWARN
+RUN: dsymutil --linker classic -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 -o %t.dSYM 2>&1 | FileCheck %s --check-prefix=WARN
+RUN: dsymutil --linker classic -no-object-timestamp -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 -o %t.dSYM 2>&1 | FileCheck %s --allow-empty --check-prefix=NOWARN
RUN: dsymutil --linker parallel -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 -o %t.dSYM 2>&1 | FileCheck %s --check-prefix=WARN
RUN: dsymutil --linker parallel -no-object-timestamp -oso-prepend-path=%t %t/Inputs/basic.macho.x86_64 -o %t.dSYM 2>&1 | FileCheck %s --allow-empty --check-prefix=NOWARN
diff --git a/llvm/test/tools/dsymutil/X86/tls-variable.test b/llvm/test/tools/dsymutil/X86/tls-variable.test
index 398a97422f365..dc9cbc564df3c 100644
--- a/llvm/test/tools/dsymutil/X86/tls-variable.test
+++ b/llvm/test/tools/dsymutil/X86/tls-variable.test
@@ -9,12 +9,12 @@
# RUN: echo ' symbols:' >> %t2.map
# RUN: echo ' - { sym: __Z3foov, objAddr: 0x0, binAddr: 0x10000, size: 0x10 }' >> %t2.map
# RUN: echo '...' >> %t2.map
-# RUN: dsymutil -y %t2.map --keep-function-for-static -f -o - | llvm-dwarfdump -a - | FileCheck %s
+# RUN: dsymutil --linker classic -y %t2.map --keep-function-for-static -f -o - | llvm-dwarfdump -a - | FileCheck %s
# RUN: dsymutil --linker parallel -y %t2.map --keep-function-for-static -f -o - | llvm-dwarfdump -a - | FileCheck %s
#
## In update mode, markEverythingAsKept must also handle DW_OP_GNU_push_tls_address.
-# RUN: dsymutil -y %t2.map --keep-function-for-static -f -o %t.dSYM
-# RUN: dsymutil -u %t.dSYM -f -o - | llvm-dwarfdump -a - | FileCheck %s --check-prefix=UPDATE
+# RUN: dsymutil --linker classic -y %t2.map --keep-function-for-static -f -o %t.dSYM
+# RUN: dsymutil --linker classic -u %t.dSYM -f -o - | llvm-dwarfdump -a - | FileCheck %s --check-prefix=UPDATE
# CHECK: file format Mach-O 64-bit x86-64
# CHECK: .debug_info contents:
diff --git a/llvm/test/tools/dsymutil/X86/union-fwd-decl.test b/llvm/test/tools/dsymutil/X86/union-fwd-decl.test
index c73db0e3f5532..09b58098da46b 100644
--- a/llvm/test/tools/dsymutil/X86/union-fwd-decl.test
+++ b/llvm/test/tools/dsymutil/X86/union-fwd-decl.test
@@ -45,7 +45,7 @@ $ clang++ use.o container.o -o a.out
Note that the link order in the last command matters for this test.
-RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/union/a.out -o %t.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/union/a.out -o %t.dSYM
RUN: llvm-dwarfdump %t.dSYM | FileCheck %s
CHECK: DW_TAG_compile_unit
@@ -59,3 +59,5 @@ CHECK: DW_AT_name ("Container_ivars")
CHECK-NEXT: DW_AT_byte_size (0x01)
CHECK-NEXT: DW_AT_decl_file ("{{.*}}container.cpp")
CHECK-NEXT: DW_AT_decl_line (4)
+
+## FIXME: Support --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/update-one-CU.test b/llvm/test/tools/dsymutil/X86/update-one-CU.test
index 09f49ca89c485..852fb79195687 100644
--- a/llvm/test/tools/dsymutil/X86/update-one-CU.test
+++ b/llvm/test/tools/dsymutil/X86/update-one-CU.test
@@ -1,5 +1,5 @@
-RUN: dsymutil -oso-prepend-path=%p/.. %p/../Inputs/objc.macho.x86_64 -o %t.dSYM
-RUN: dsymutil -update %t.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path=%p/.. %p/../Inputs/objc.macho.x86_64 -o %t.dSYM
+RUN: dsymutil --linker classic -update %t.dSYM
RUN: llvm-dwarfdump -apple-types -apple-objc %t.dSYM | FileCheck %s
CHECK: .apple_types contents:
@@ -33,3 +33,5 @@ CHECK-NEXT: Data 0 [
CHECK-NEXT: Atom[0]: 0x0000007a
CHECK-NEXT: ]
CHECK-NEXT: }
+
+## FIXME: Support --linker parallel
diff --git a/llvm/test/tools/dsymutil/X86/update.test b/llvm/test/tools/dsymutil/X86/update.test
index d6c900911f52a..4a12c5e1884da 100644
--- a/llvm/test/tools/dsymutil/X86/update.test
+++ b/llvm/test/tools/dsymutil/X86/update.test
@@ -1,15 +1,21 @@
RUN: rm -rf %t.dir
RUN: mkdir -p %t.dir
RUN: cat %p/../Inputs/basic.macho.x86_64 > %t.dir/basic
-RUN: dsymutil -accelerator=Pub -oso-prepend-path=%p/.. %t.dir/basic
+RUN: dsymutil --linker classic -accelerator=Pub -oso-prepend-path=%p/.. %t.dir/basic
+RUN: dsymutil --linker parallel -accelerator=Pub -oso-prepend-path=%p/.. %t.dir/basic
RUN: llvm-dwarfdump -a %t.dir/basic.dSYM | FileCheck %S/basic-linking-x86.test
-RUN: dsymutil -accelerator=Pub --update %t.dir/basic.dSYM
+RUN: dsymutil --linker classic -accelerator=Pub --update %t.dir/basic.dSYM
+RUN: dsymutil --linker parallel -accelerator=Pub --update %t.dir/basic.dSYM
RUN: llvm-dwarfdump -a %t.dir/basic.dSYM | FileCheck %S/basic-linking-x86.test
-RUN: dsymutil -accelerator=Pub -u %t.dir/basic.dSYM
+RUN: dsymutil --linker classic -accelerator=Pub -u %t.dir/basic.dSYM
+RUN: dsymutil --linker parallel -accelerator=Pub -u %t.dir/basic.dSYM
RUN: llvm-dwarfdump -a %t.dir/basic.dSYM | FileCheck %S/basic-linking-x86.test
-RUN: dsymutil -accelerator=Pub --update %t.dir/basic.dSYM -o %t.dir/updated.dSYM
+RUN: dsymutil --linker classic -accelerator=Pub --update %t.dir/basic.dSYM -o %t.dir/updated.dSYM
+RUN: dsymutil --linker parallel -accelerator=Pub --update %t.dir/basic.dSYM -o %t.dir/updated.dSYM
RUN: llvm-dwarfdump -a %t.dir/updated.dSYM | FileCheck %S/basic-linking-x86.test
-RUN: dsymutil -accelerator=Pub -f -o %t2 -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64
-RUN: dsymutil -accelerator=Pub -f -u %t2 -o %t3
+RUN: dsymutil --linker classic -accelerator=Pub -f -o %t2 -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64
+RUN: dsymutil --linker parallel -accelerator=Pub -f -o %t2 -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64
+RUN: dsymutil --linker classic -accelerator=Pub -f -u %t2 -o %t3
+RUN: dsymutil --linker parallel -accelerator=Pub -f -u %t2 -o %t3
RUN: llvm-dwarfdump -a %t3 | FileCheck %S/basic-linking-x86.test
diff --git a/llvm/test/tools/dsymutil/X86/verify.test b/llvm/test/tools/dsymutil/X86/verify.test
index 86268f49d2062..631e2e021a77a 100644
--- a/llvm/test/tools/dsymutil/X86/verify.test
+++ b/llvm/test/tools/dsymutil/X86/verify.test
@@ -1,23 +1,23 @@
# Positive tests in regular and verbose mode.
-# RUN: dsymutil -verify -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 %p/../Inputs/basic-archive.macho.x86_64 %p/../Inputs/basic-lto.macho.x86_64 %p/../Inputs/basic-lto-dw4.macho.x86_64 -o %t 2>&1 | FileCheck %s --allow-empty --check-prefix=QUIET-SUCCESS
-# RUN: dsymutil -verify -verbose -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 %p/../Inputs/basic-archive.macho.x86_64 %p/../Inputs/basic-lto.macho.x86_64 %p/../Inputs/basic-lto-dw4.macho.x86_64 -o %t 2>&1 | FileCheck %s --check-prefixes=QUIET-SUCCESS,VERBOSE
+# RUN: dsymutil --linker classic -verify -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 %p/../Inputs/basic-archive.macho.x86_64 %p/../Inputs/basic-lto.macho.x86_64 %p/../Inputs/basic-lto-dw4.macho.x86_64 -o %t 2>&1 | FileCheck %s --allow-empty --check-prefix=QUIET-SUCCESS
+# RUN: dsymutil --linker classic -verify -verbose -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 %p/../Inputs/basic-archive.macho.x86_64 %p/../Inputs/basic-lto.macho.x86_64 %p/../Inputs/basic-lto-dw4.macho.x86_64 -o %t 2>&1 | FileCheck %s --check-prefixes=QUIET-SUCCESS,VERBOSE
# VERBOSE: Verifying DWARF for architecture: x86_64
# QUIET-SUCCESS-NOT: error: output verification failed
# Negative output tests in regular and verbose mode.
# (Invalid object generated from ../Inputs/invalid.s by modified the low PC.)
-# RUN: not dsymutil -verify -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-OUTPUT-FAIL
-# RUN: not dsymutil -verify-dwarf=output -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-OUTPUT-FAIL
-# RUN: not dsymutil -verify -verbose -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefixes=QUIET-OUTPUT-FAIL,VERBOSE
+# RUN: not dsymutil --linker classic -verify -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-OUTPUT-FAIL
+# RUN: not dsymutil --linker classic -verify-dwarf=output -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-OUTPUT-FAIL
+# RUN: not dsymutil --linker classic -verify -verbose -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefixes=QUIET-OUTPUT-FAIL,VERBOSE
# Negative input & output tests in regular and verbose mode. Only output failures result in a non-zero exit code.
-# RUN: dsymutil -verify-dwarf=input -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-INPUT-FAIL
-# RUN: dsymutil -verify-dwarf=input -verbose -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-INPUT-FAIL
-# RUN: dsymutil -verify-dwarf=none -verbose -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefixes=QUIET-SUCCESS
-# RUN: not dsymutil -verify-dwarf=bogus -verbose -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefixes=BOGUS
-# RUN: not dsymutil -verify-dwarf=all -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefixes=QUIET-OUTPUT-FAIL,QUIET-INPUT-FAIL
-# RUN: not dsymutil -verify-dwarf=all -verbose -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefixes=VERBOSE-INPUT-FAIL
+# RUN: dsymutil --linker classic -verify-dwarf=input -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-INPUT-FAIL
+# RUN: dsymutil --linker classic -verify-dwarf=input -verbose -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefix=QUIET-INPUT-FAIL
+# RUN: dsymutil --linker classic -verify-dwarf=none -verbose -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefixes=QUIET-SUCCESS
+# RUN: not dsymutil --linker classic -verify-dwarf=bogus -verbose -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefixes=BOGUS
+# RUN: not dsymutil --linker classic -verify-dwarf=all -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefixes=QUIET-OUTPUT-FAIL,QUIET-INPUT-FAIL
+# RUN: not dsymutil --linker classic -verify-dwarf=all -verbose -oso-prepend-path=%p/../Inputs -y %s -o %t 2>&1 | FileCheck %s --check-prefixes=VERBOSE-INPUT-FAIL
# VERBOSE-INPUT-FAIL-DAG: error: Abbreviation declaration contains multiple DW_AT_language attributes.
# QUIET-INPUT-FAIL-DAG: warning: input verification failed
diff --git a/llvm/test/tools/dsymutil/absolute_symbol.test b/llvm/test/tools/dsymutil/absolute_symbol.test
index ae61bf750738e..088da9ac94f15 100644
--- a/llvm/test/tools/dsymutil/absolute_symbol.test
+++ b/llvm/test/tools/dsymutil/absolute_symbol.test
@@ -1,4 +1,4 @@
-RUN: dsymutil -dump-debug-map -oso-prepend-path %p %p/Inputs/absolute_sym.macho.i386 | FileCheck %s
+RUN: dsymutil --linker classic -dump-debug-map -oso-prepend-path %p %p/Inputs/absolute_sym.macho.i386 | FileCheck %s
RUN: dsymutil --linker parallel -dump-debug-map -oso-prepend-path %p %p/Inputs/absolute_sym.macho.i386 | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/arch-option.test b/llvm/test/tools/dsymutil/arch-option.test
index d8b8e3d901f6d..d795906456419 100644
--- a/llvm/test/tools/dsymutil/arch-option.test
+++ b/llvm/test/tools/dsymutil/arch-option.test
@@ -1,15 +1,15 @@
Processing of the -arch option happens at debug map parsing time, thus just
looking at the dumped debug maps is enough to validate their effects.
-RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib | FileCheck %s -check-prefixes=ARM64,ARMV7S,ARMV7,CHECK
-RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch all | FileCheck %s -check-prefixes=ARM64,ARMV7S,ARMV7,CHECK
-RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch='*' | FileCheck %s -check-prefixes=ARM64,ARMV7S,ARMV7,CHECK
-RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm64 | FileCheck %s -check-prefixes=ARM64,CHECK
-RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm | FileCheck %s -check-prefixes=ARMV7S,ARMV7,CHECK
-RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch armv7 | FileCheck %s -check-prefixes=ARMV7,CHECK
-RUN: dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm64 -arch armv7s | FileCheck %s -check-prefixes=ARM64,ARMV7S,CHECK
-RUN: not dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm42 2>&1 | FileCheck %s -check-prefix=BADARCH
-RUN: not dsymutil -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch i386 2>&1 | FileCheck %s -check-prefix=EMPTY
+RUN: dsymutil --linker classic -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib | FileCheck %s -check-prefixes=ARM64,ARMV7S,ARMV7,CHECK
+RUN: dsymutil --linker classic -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch all | FileCheck %s -check-prefixes=ARM64,ARMV7S,ARMV7,CHECK
+RUN: dsymutil --linker classic -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch='*' | FileCheck %s -check-prefixes=ARM64,ARMV7S,ARMV7,CHECK
+RUN: dsymutil --linker classic -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm64 | FileCheck %s -check-prefixes=ARM64,CHECK
+RUN: dsymutil --linker classic -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm | FileCheck %s -check-prefixes=ARMV7S,ARMV7,CHECK
+RUN: dsymutil --linker classic -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch armv7 | FileCheck %s -check-prefixes=ARMV7,CHECK
+RUN: dsymutil --linker classic -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm64 -arch armv7s | FileCheck %s -check-prefixes=ARM64,ARMV7S,CHECK
+RUN: not dsymutil --linker classic -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch arm42 2>&1 | FileCheck %s -check-prefix=BADARCH
+RUN: not dsymutil --linker classic -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch i386 2>&1 | FileCheck %s -check-prefix=EMPTY
RUN: dsymutil --linker parallel -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib | FileCheck %s -check-prefixes=ARM64,ARMV7S,ARMV7,CHECK
RUN: dsymutil --linker parallel -oso-prepend-path %p -dump-debug-map %p/Inputs/fat-test.arm.dylib -arch all | FileCheck %s -check-prefixes=ARM64,ARMV7S,ARMV7,CHECK
diff --git a/llvm/test/tools/dsymutil/archive-timestamp.test b/llvm/test/tools/dsymutil/archive-timestamp.test
index c86d19e57738c..6e10319320d1e 100644
--- a/llvm/test/tools/dsymutil/archive-timestamp.test
+++ b/llvm/test/tools/dsymutil/archive-timestamp.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -no-output -oso-prepend-path=%p -y %s 2>&1 | FileCheck -DMSG=%errc_ENOENT %s
+# RUN: dsymutil --linker classic -no-output -oso-prepend-path=%p -y %s 2>&1 | FileCheck -DMSG=%errc_ENOENT %s
# RUN: dsymutil --linker parallel -no-output -oso-prepend-path=%p -y %s 2>&1 | FileCheck -DMSG=%errc_ENOENT %s
diff --git a/llvm/test/tools/dsymutil/asm-line-tables.test b/llvm/test/tools/dsymutil/asm-line-tables.test
index 5966d4b4ea4cc..d0000426b52c5 100644
--- a/llvm/test/tools/dsymutil/asm-line-tables.test
+++ b/llvm/test/tools/dsymutil/asm-line-tables.test
@@ -5,9 +5,11 @@ $ clang -target arm64-apple-macos26 asm-line-tables.s -o asm-line-tables.o -c -g
$ clang -target arm64-apple-macos26 -o asm-line-tables.arm64 asm-line-tables.o -nodefaultlibs -nostdlib -static -Wl,-oso_prefix,$PWD
REQUIRES: aarch64-registered-target
-RUN: dsymutil -oso-prepend-path %p/Inputs/ %p/Inputs/private/tmp/asm/asm-line-tables.arm64 -o %t.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path %p/Inputs/ %p/Inputs/private/tmp/asm/asm-line-tables.arm64 -o %t.dSYM
RUN: llvm-dwarfdump --debug-line %t.dSYM | FileCheck %s
+## FIXME: Support --linker parallel
+
CHECK: 0x00000001000002e8 5 0 0 0 0 0 is_stmt
CHECK-NEXT: 0x00000001000002ec 9 0 0 0 0 0 is_stmt
CHECK-NEXT: 0x00000001000002f0 10 0 0 0 0 0 is_stmt
diff --git a/llvm/test/tools/dsymutil/basic-linking.test b/llvm/test/tools/dsymutil/basic-linking.test
index 1e8027d05b3c3..9dc15340957ad 100644
--- a/llvm/test/tools/dsymutil/basic-linking.test
+++ b/llvm/test/tools/dsymutil/basic-linking.test
@@ -1,15 +1,18 @@
-RUN: dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 | FileCheck %s
-RUN: dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic-lto.macho.x86_64 | FileCheck %s --check-prefix=CHECK-LTO
-RUN: dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefix=CHECK-ARCHIVE
-RUN: dsymutil -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 %p/Inputs/basic-lto.macho.x86_64 %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefixes=CHECK,CHECK-LTO,CHECK-ARCHIVE
-RUN: dsymutil -no-output -verbose -oso-prepend-path=%p -D %p/Inputs %p/Inputs/basic-relink.macho.arm64.dylib | FileCheck %s --check-prefix=CHECK-RELINK
-RUN: dsymutil -no-output -verbose -oso-prepend-path=%p -D %p/Inputs %p/Inputs/two-level-relink.macho.arm64.dylib | FileCheck %s --check-prefix=CHECK-RELINK-TWO
-RUN: dsymutil -no-output -verbose -oso-prepend-path=%p -build-variant-suffix=_debug -D WrongPath -D %p/Inputs %p/Inputs/variant-relink.macho.arm64.dylib | FileCheck %s --check-prefix=CHECK-RELINK-VARIANT
+RUN: dsymutil --linker classic -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 | FileCheck %s
+RUN: dsymutil --linker classic -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic-lto.macho.x86_64 | FileCheck %s --check-prefix=CHECK-LTO
+RUN: dsymutil --linker classic -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefix=CHECK-ARCHIVE
+RUN: dsymutil --linker classic -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 %p/Inputs/basic-lto.macho.x86_64 %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefixes=CHECK,CHECK-LTO,CHECK-ARCHIVE
+RUN: dsymutil --linker classic -no-output -verbose -oso-prepend-path=%p -D %p/Inputs %p/Inputs/basic-relink.macho.arm64.dylib | FileCheck %s --check-prefix=CHECK-RELINK
+RUN: dsymutil --linker classic -no-output -verbose -oso-prepend-path=%p -D %p/Inputs %p/Inputs/two-level-relink.macho.arm64.dylib | FileCheck %s --check-prefix=CHECK-RELINK-TWO
+RUN: dsymutil --linker classic -no-output -verbose -oso-prepend-path=%p -build-variant-suffix=_debug -D WrongPath -D %p/Inputs %p/Inputs/variant-relink.macho.arm64.dylib | FileCheck %s --check-prefix=CHECK-RELINK-VARIANT
RUN: dsymutil --linker parallel -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 | FileCheck %s
RUN: dsymutil --linker parallel -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic-lto.macho.x86_64 | FileCheck %s --check-prefix=CHECK-LTO
RUN: dsymutil --linker parallel -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefix=CHECK-ARCHIVE
RUN: dsymutil --linker parallel -no-output -verbose -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 %p/Inputs/basic-lto.macho.x86_64 %p/Inputs/basic-archive.macho.x86_64 | FileCheck %s --check-prefixes=CHECK,CHECK-LTO,CHECK-ARCHIVE
+RUN: dsymutil --linker parallel -no-output -verbose -oso-prepend-path=%p -D %p/Inputs %p/Inputs/basic-relink.macho.arm64.dylib | FileCheck %s --check-prefix=CHECK-RELINK
+RUN: dsymutil --linker parallel -no-output -verbose -oso-prepend-path=%p -D %p/Inputs %p/Inputs/two-level-relink.macho.arm64.dylib | FileCheck %s --check-prefix=CHECK-RELINK-TWO
+RUN: dsymutil --linker parallel -no-output -verbose -oso-prepend-path=%p -build-variant-suffix=_debug -D WrongPath -D %p/Inputs %p/Inputs/variant-relink.macho.arm64.dylib | FileCheck %s --check-prefix=CHECK-RELINK-VARIANT
This test check the basic Dwarf linking process through the debug dumps.
diff --git a/llvm/test/tools/dsymutil/codesign.test b/llvm/test/tools/dsymutil/codesign.test
index cd6560a235f1d..4a18e568aabb9 100644
--- a/llvm/test/tools/dsymutil/codesign.test
+++ b/llvm/test/tools/dsymutil/codesign.test
@@ -1,15 +1,21 @@
REQUIRES: system-darwin, x86-registered-target
## Verify --codesign signs the dSYM bundle.
-RUN: dsymutil -oso-prepend-path %p %p/Inputs/basic.macho.x86_64 -o %t.dSYM --codesign=-
+RUN: dsymutil --linker classic -oso-prepend-path %p %p/Inputs/basic.macho.x86_64 -o %t.dSYM --codesign=-
+RUN: codesign -v %t.dSYM
+RUN: dsymutil --linker parallel -oso-prepend-path %p %p/Inputs/basic.macho.x86_64 -o %t.dSYM --codesign=-
RUN: codesign -v %t.dSYM
## Verify --codesign is incompatible with --flat.
-RUN: not dsymutil -oso-prepend-path %p %p/Inputs/basic.macho.x86_64 -o %t.flat --flat --codesign=- 2>&1 \
+RUN: not dsymutil --linker classic -oso-prepend-path %p %p/Inputs/basic.macho.x86_64 -o %t.flat --flat --codesign=- 2>&1 \
+RUN: | FileCheck %s --check-prefix=FLAT
+RUN: not dsymutil --linker parallel -oso-prepend-path %p %p/Inputs/basic.macho.x86_64 -o %t.flat --flat --codesign=- 2>&1 \
RUN: | FileCheck %s --check-prefix=FLAT
FLAT: error: --codesign is not supported with --flat: no bundle to sign
## Verify --codesign is incompatible with --no-output.
-RUN: not dsymutil -oso-prepend-path %p %p/Inputs/basic.macho.x86_64 --no-output --codesign=- 2>&1 \
+RUN: not dsymutil --linker classic -oso-prepend-path %p %p/Inputs/basic.macho.x86_64 --no-output --codesign=- 2>&1 \
+RUN: | FileCheck %s --check-prefix=NOOUT
+RUN: not dsymutil --linker parallel -oso-prepend-path %p %p/Inputs/basic.macho.x86_64 --no-output --codesign=- 2>&1 \
RUN: | FileCheck %s --check-prefix=NOOUT
NOOUT: error: --codesign is not supported with --no-output: nothing to sign
diff --git a/llvm/test/tools/dsymutil/debug-map-parsing.test b/llvm/test/tools/dsymutil/debug-map-parsing.test
index 29b9d65477207..299fdfb8f0c99 100644
--- a/llvm/test/tools/dsymutil/debug-map-parsing.test
+++ b/llvm/test/tools/dsymutil/debug-map-parsing.test
@@ -1,8 +1,8 @@
-RUN: dsymutil -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 | FileCheck %s
-RUN: dsymutil -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic-lto.macho.x86_64 | FileCheck %s --check-prefix=CHECK-LTO
-RUN: dsymutil -verbose -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic-archive.macho.x86_64 2>&1 | FileCheck %s --check-prefix=CHECK-ARCHIVE
-RUN: dsymutil -dump-debug-map %p/Inputs/basic.macho.x86_64 2>&1 | FileCheck -DMSG=%errc_ENOENT %s --check-prefix=NOT-FOUND
-RUN: not dsymutil -dump-debug-map %p/Inputs/inexistant 2>&1 | FileCheck -DMSG=%errc_ENOENT %s --check-prefix=NO-EXECUTABLE
+RUN: dsymutil --linker classic -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 | FileCheck %s
+RUN: dsymutil --linker classic -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic-lto.macho.x86_64 | FileCheck %s --check-prefix=CHECK-LTO
+RUN: dsymutil --linker classic -verbose -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic-archive.macho.x86_64 2>&1 | FileCheck %s --check-prefix=CHECK-ARCHIVE
+RUN: dsymutil --linker classic -dump-debug-map %p/Inputs/basic.macho.x86_64 2>&1 | FileCheck -DMSG=%errc_ENOENT %s --check-prefix=NOT-FOUND
+RUN: not dsymutil --linker classic -dump-debug-map %p/Inputs/inexistant 2>&1 | FileCheck -DMSG=%errc_ENOENT %s --check-prefix=NO-EXECUTABLE
RUN: dsymutil --linker parallel -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 | FileCheck %s
RUN: dsymutil --linker parallel -dump-debug-map -oso-prepend-path=%p %p/Inputs/basic-lto.macho.x86_64 | FileCheck %s --check-prefix=CHECK-LTO
diff --git a/llvm/test/tools/dsymutil/dump-symtab.test b/llvm/test/tools/dsymutil/dump-symtab.test
index 6c97140b37017..3a7869ba8d229 100644
--- a/llvm/test/tools/dsymutil/dump-symtab.test
+++ b/llvm/test/tools/dsymutil/dump-symtab.test
@@ -1,5 +1,5 @@
-RUN: dsymutil -s %p/Inputs/fat-test.dylib | FileCheck -check-prefixes=ALL,I386 %s
-RUN: dsymutil -arch i386 -s %p/Inputs/fat-test.dylib | FileCheck -check-prefixes=I386,ONE %s
+RUN: dsymutil --linker classic -s %p/Inputs/fat-test.dylib | FileCheck -check-prefixes=ALL,I386 %s
+RUN: dsymutil --linker classic -arch i386 -s %p/Inputs/fat-test.dylib | FileCheck -check-prefixes=I386,ONE %s
RUN: dsymutil --linker parallel -s %p/Inputs/fat-test.dylib | FileCheck -check-prefixes=ALL,I386 %s
RUN: dsymutil --linker parallel -arch i386 -s %p/Inputs/fat-test.dylib | FileCheck -check-prefixes=I386,ONE %s
diff --git a/llvm/test/tools/dsymutil/embed-resource.test b/llvm/test/tools/dsymutil/embed-resource.test
index dbd47b3b6cc8c..e9cc3ecb56aca 100644
--- a/llvm/test/tools/dsymutil/embed-resource.test
+++ b/llvm/test/tools/dsymutil/embed-resource.test
@@ -6,7 +6,12 @@ Create a temp resource file and embed it into the dSYM bundle.
RUN: rm -rf %t.dir && mkdir -p %t.dir
RUN: echo "# test resource" > %t.dir/test.py
-RUN: dsymutil -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
+RUN: dsymutil --linker classic -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
+RUN: --embed-resource %t.dir/test.py=Python/test.py \
+RUN: -o %t.dir/basic.macho.x86_64.dSYM
+RUN: diff %t.dir/test.py %t.dir/basic.macho.x86_64.dSYM/Contents/Resources/Python/test.py
+RUN: rm -rf %t.dir/basic.macho.x86_64.dSYM
+RUN: dsymutil --linker parallel -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
RUN: --embed-resource %t.dir/test.py=Python/test.py \
RUN: -o %t.dir/basic.macho.x86_64.dSYM
RUN: diff %t.dir/test.py %t.dir/basic.macho.x86_64.dSYM/Contents/Resources/Python/test.py
@@ -15,7 +20,14 @@ Verify multiple --embed-resource options.
RUN: rm -rf %t.dir/basic.macho.x86_64.dSYM
RUN: echo "second" > %t.dir/second.txt
-RUN: dsymutil -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
+RUN: dsymutil --linker classic -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
+RUN: --embed-resource %t.dir/test.py=Python/test.py \
+RUN: --embed-resource %t.dir/second.txt=Scripts/second.txt \
+RUN: -o %t.dir/basic.macho.x86_64.dSYM
+RUN: diff %t.dir/test.py %t.dir/basic.macho.x86_64.dSYM/Contents/Resources/Python/test.py
+RUN: diff %t.dir/second.txt %t.dir/basic.macho.x86_64.dSYM/Contents/Resources/Scripts/second.txt
+RUN: rm -rf %t.dir/basic.macho.x86_64.dSYM
+RUN: dsymutil --linker parallel -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
RUN: --embed-resource %t.dir/test.py=Python/test.py \
RUN: --embed-resource %t.dir/second.txt=Scripts/second.txt \
RUN: -o %t.dir/basic.macho.x86_64.dSYM
@@ -25,7 +37,12 @@ RUN: diff %t.dir/second.txt %t.dir/basic.macho.x86_64.dSYM/Contents/Resources/Sc
Verify verbose output.
RUN: rm -rf %t.dir/basic.macho.x86_64.dSYM
-RUN: dsymutil -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
+RUN: dsymutil --linker classic -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
+RUN: --embed-resource %t.dir/test.py=Python/test.py \
+RUN: --verbose -o %t.dir/basic.macho.x86_64.dSYM 2>&1 \
+RUN: | FileCheck --check-prefix=VERBOSE %s
+RUN: rm -rf %t.dir/basic.macho.x86_64.dSYM
+RUN: dsymutil --linker parallel -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
RUN: --embed-resource %t.dir/test.py=Python/test.py \
RUN: --verbose -o %t.dir/basic.macho.x86_64.dSYM 2>&1 \
RUN: | FileCheck --check-prefix=VERBOSE %s
@@ -34,7 +51,11 @@ VERBOSE: embed resource {{.*}}test.py -> {{.*}}Resources{{.}}Python{{.}}test.py
Verify error on missing source file.
-RUN: not dsymutil -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
+RUN: not dsymutil --linker classic -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
+RUN: --embed-resource %t.dir/nonexistent.py=Python/foo.py \
+RUN: -o %t.dir/basic.macho.x86_64.dSYM 2>&1 \
+RUN: | FileCheck --check-prefix=MISSING %s
+RUN: not dsymutil --linker parallel -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
RUN: --embed-resource %t.dir/nonexistent.py=Python/foo.py \
RUN: -o %t.dir/basic.macho.x86_64.dSYM 2>&1 \
RUN: | FileCheck --check-prefix=MISSING %s
@@ -48,7 +69,14 @@ RUN: mkdir -p %t.dir/pydir/sub
RUN: echo "file_a" > %t.dir/pydir/a.py
RUN: echo "file_b" > %t.dir/pydir/b.py
RUN: echo "file_sub" > %t.dir/pydir/sub/c.py
-RUN: dsymutil -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
+RUN: dsymutil --linker classic -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
+RUN: --embed-resource %t.dir/pydir=Python \
+RUN: -o %t.dir/basic.macho.x86_64.dSYM
+RUN: diff %t.dir/pydir/a.py %t.dir/basic.macho.x86_64.dSYM/Contents/Resources/Python/a.py
+RUN: diff %t.dir/pydir/b.py %t.dir/basic.macho.x86_64.dSYM/Contents/Resources/Python/b.py
+RUN: diff %t.dir/pydir/sub/c.py %t.dir/basic.macho.x86_64.dSYM/Contents/Resources/Python/sub/c.py
+RUN: rm -rf %t.dir/basic.macho.x86_64.dSYM
+RUN: dsymutil --linker parallel -oso-prepend-path=%p %p/Inputs/basic.macho.x86_64 \
RUN: --embed-resource %t.dir/pydir=Python \
RUN: -o %t.dir/basic.macho.x86_64.dSYM
RUN: diff %t.dir/pydir/a.py %t.dir/basic.macho.x86_64.dSYM/Contents/Resources/Python/a.py
@@ -57,11 +85,14 @@ RUN: diff %t.dir/pydir/sub/c.py %t.dir/basic.macho.x86_64.dSYM/Contents/Resource
Verify error cases.
-RUN: not dsymutil --embed-resource noequals file1 2>&1 | FileCheck --check-prefix=BADEMBED %s
+RUN: not dsymutil --linker classic --embed-resource noequals file1 2>&1 | FileCheck --check-prefix=BADEMBED %s
+RUN: not dsymutil --linker parallel --embed-resource noequals file1 2>&1 | FileCheck --check-prefix=BADEMBED %s
BADEMBED: error: invalid --embed-resource argument 'noequals': expected <src-path>=<dst-path>
-RUN: not dsymutil --embed-resource /tmp/a.py=../../etc/passwd file1 2>&1 | FileCheck --check-prefix=ESCAPE %s
+RUN: not dsymutil --linker classic --embed-resource /tmp/a.py=../../etc/passwd file1 2>&1 | FileCheck --check-prefix=ESCAPE %s
+RUN: not dsymutil --linker parallel --embed-resource /tmp/a.py=../../etc/passwd file1 2>&1 | FileCheck --check-prefix=ESCAPE %s
ESCAPE: error: invalid --embed-resource destination '../../etc/passwd': must be a relative path within the bundle
-RUN: not dsymutil --embed-resource /tmp/a.py=%/t/absolute file1 2>&1 | FileCheck --check-prefix=ABSOLUTE %s
+RUN: not dsymutil --linker classic --embed-resource /tmp/a.py=%/t/absolute file1 2>&1 | FileCheck --check-prefix=ABSOLUTE %s
+RUN: not dsymutil --linker parallel --embed-resource /tmp/a.py=%/t/absolute file1 2>&1 | FileCheck --check-prefix=ABSOLUTE %s
ABSOLUTE: error: invalid --embed-resource destination '{{.*}}absolute': must be a relative path within the bundle
diff --git a/llvm/test/tools/dsymutil/fat-binary-output.test b/llvm/test/tools/dsymutil/fat-binary-output.test
index 46b86b0513735..ade611779e7e1 100644
--- a/llvm/test/tools/dsymutil/fat-binary-output.test
+++ b/llvm/test/tools/dsymutil/fat-binary-output.test
@@ -1,4 +1,4 @@
-RUN: dsymutil -f -verbose -no-output %p/Inputs/fat-test.dylib -oso-prepend-path %p | FileCheck %s
+RUN: dsymutil --linker classic -f -verbose -no-output %p/Inputs/fat-test.dylib -oso-prepend-path %p | FileCheck %s
RUN: dsymutil --linker parallel -f -verbose -no-output %p/Inputs/fat-test.dylib -oso-prepend-path %p | FileCheck %s
diff --git a/llvm/test/tools/dsymutil/fat-header.test b/llvm/test/tools/dsymutil/fat-header.test
index 3130f4608476e..27ff8e97af962 100644
--- a/llvm/test/tools/dsymutil/fat-header.test
+++ b/llvm/test/tools/dsymutil/fat-header.test
@@ -1,12 +1,12 @@
REQUIRES: system-darwin,arm-registered-target,aarch64-registered-target
-RUN: dsymutil -oso-prepend-path %p %p/Inputs/fat-test.arm.dylib -o %t.fat32.dSYM
+RUN: dsymutil --linker classic -oso-prepend-path %p %p/Inputs/fat-test.arm.dylib -o %t.fat32.dSYM
RUN: llvm-objdump -m --universal-headers %t.fat32.dSYM/Contents/Resources/DWARF/fat-test.arm.dylib | FileCheck %s -check-prefixes=FAT32
RUN: dsymutil --linker parallel -oso-prepend-path %p %p/Inputs/fat-test.arm.dylib -o %t.fat32.dSYM
RUN: llvm-objdump -m --universal-headers %t.fat32.dSYM/Contents/Resources/DWARF/fat-test.arm.dylib | FileCheck %s -check-prefixes=FAT32
-RUN: dsymutil -oso-prepend-path %p %p/Inputs/fat-test.arm.dylib -o %t.fat64.dSYM -fat64
+RUN: dsymutil --linker classic -oso-prepend-path %p %p/Inputs/fat-test.arm.dylib -o %t.fat64.dSYM -fat64
RUN: llvm-objdump -m --universal-headers %t.fat64.dSYM/Contents/Resources/DWARF/fat-test.arm.dylib | FileCheck %s -check-prefixes=FAT64
RUN: dsymutil --linker parallel -oso-prepend-path %p %p/Inputs/fat-test.arm.dylib -o %t.fat64.dSYM -fat64
diff --git a/llvm/test/tools/dsymutil/null-die.test b/llvm/test/tools/dsymutil/null-die.test
index f046c5a27968d..7111fc2409d10 100644
--- a/llvm/test/tools/dsymutil/null-die.test
+++ b/llvm/test/tools/dsymutil/null-die.test
@@ -1,6 +1,8 @@
-#RUN: dsymutil -f -oso-prepend-path=%p/Inputs/ -y %s -no-output 2>&1 \
+#RUN: dsymutil --linker classic -f -oso-prepend-path=%p/Inputs/ -y %s -no-output 2>&1 \
#RUN: | FileCheck %s
+## FIXME: Support --linker parallel
+
# CHECK: warning: could not find referenced DIE
# We've modified the DW_AT_abstract_origin offset to reference a NULL DIE.
diff --git a/llvm/test/tools/dsymutil/odr-two-units-in-single-file.test b/llvm/test/tools/dsymutil/odr-two-units-in-single-file.test
index 32f1fb18f9755..307794f8f7ab7 100644
--- a/llvm/test/tools/dsymutil/odr-two-units-in-single-file.test
+++ b/llvm/test/tools/dsymutil/odr-two-units-in-single-file.test
@@ -8,7 +8,9 @@
# RUN: echo ' symbols:' >> %t2.map
# RUN: echo ' - { sym: __Z3foov, objAddr: 0x0, binAddr: 0x10000, size: 0x10 }' >> %t2.map
# RUN: echo '...' >> %t2.map
-# RUN: dsymutil -y -j 16 %t2.map -f -o - | llvm-dwarfdump -a - | FileCheck %s
+# RUN: dsymutil --linker classic -y -j 16 %t2.map -f -o - | llvm-dwarfdump -a - | FileCheck %s
+
+## FIXME: Support --linker parallel
# CHECK: file format Mach-O 64-bit x86-64
# CHECK: .debug_info contents:
diff --git a/llvm/test/tools/dsymutil/yaml-object-address-rewrite.test b/llvm/test/tools/dsymutil/yaml-object-address-rewrite.test
index 74e8c1e7ae777..c635e4188bf59 100644
--- a/llvm/test/tools/dsymutil/yaml-object-address-rewrite.test
+++ b/llvm/test/tools/dsymutil/yaml-object-address-rewrite.test
@@ -1,4 +1,4 @@
-# RUN: dsymutil -dump-debug-map -oso-prepend-path=%p -y %s | FileCheck %s
+# RUN: dsymutil --linker classic -dump-debug-map -oso-prepend-path=%p -y %s | FileCheck %s
#
# RUN: dsymutil --linker parallel -dump-debug-map -oso-prepend-path=%p -y %s | FileCheck %s
#
More information about the llvm-commits
mailing list