Skip to content

Commit f1fdfe6

Browse files
authored
[dsymutil][llvm-dwarfutil] Rename command line options to avoid using vendor names. (#78135)
This patch renames values of dsymutil/llvm-dwarfutil options: --linker apple -> --linker classic --linker llvm -> --linker parallel The purpose to rename options is to avoid using vendor names and to match with library names. It should be safe to rename options at current stage as they are not seemed widely used(we may not preserve backward compatibility).
1 parent e75720b commit f1fdfe6

File tree

122 files changed

+222
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+222
-222
lines changed

llvm/test/tools/dsymutil/ARM/DWARFLinkerParallel/accel-imported-declarations.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
RUN: dsymutil --linker llvm -accelerator=Dwarf \
1+
RUN: dsymutil --linker parallel -accelerator=Dwarf \
22
RUN: -oso-prepend-path=%p/../../Inputs \
33
RUN: %p/../../Inputs/accel-imported-declaration.macho-arm64 -o %t.dwarf.dSYM
4-
RUN: dsymutil --linker llvm -accelerator=Apple \
4+
RUN: dsymutil --linker parallel -accelerator=Apple \
55
RUN: -oso-prepend-path=%p/../../Inputs \
66
RUN: %p/../../Inputs/accel-imported-declaration.macho-arm64 -o %t.apple.dSYM
77

llvm/test/tools/dsymutil/ARM/call-pc-reloc.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $ clang -arch arm64 main.arm64.o -o main.arm64 -g
1717
RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/call_pc/main.arm64 -o %t.dSYM
1818
RUN: llvm-dwarfdump %t.dSYM | FileCheck %s -implicit-check-not=DW_AT_call_pc
1919

20-
RUN: dsymutil --linker llvm -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/call_pc/main.arm64 -o %t.dSYM
20+
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/call_pc/main.arm64 -o %t.dSYM
2121
RUN: llvm-dwarfdump %t.dSYM | FileCheck %s -implicit-check-not=DW_AT_call_pc
2222

2323
CHECK: DW_AT_call_pc (0x0000000100007f94)

llvm/test/tools/dsymutil/ARM/dwarf5-addr-base.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ RUN: dsymutil -y %p/dummy-debug-map-amr64.map -oso-prepend-path=%p/../Inputs/DWA
5050
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s
5151

5252
RUN: rm -rf %t.dir && mkdir -p %t.dir
53-
RUN: dsymutil --linker llvm --no-odr -y %p/dummy-debug-map-amr64.map \
53+
RUN: dsymutil --linker parallel --no-odr -y %p/dummy-debug-map-amr64.map \
5454
RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \
5555
RUN: -o %t.dir/dwarf5-addr-base.dSYM
5656
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s
5757

5858
RUN: rm -rf %t.dir && mkdir -p %t.dir
59-
RUN: dsymutil --linker llvm -y %p/dummy-debug-map-amr64.map \
59+
RUN: dsymutil --linker parallel -y %p/dummy-debug-map-amr64.map \
6060
RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \
6161
RUN: -o %t.dir/dwarf5-addr-base.dSYM
6262
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \
@@ -68,14 +68,14 @@ RUN: dsymutil --update -y %p/dummy-debug-map-amr64.map -oso-prepend-path=%p/../I
6868
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s --check-prefix=UPD
6969

7070
RUN: rm -rf %t.dir && mkdir -p %t.dir
71-
RUN: dsymutil --linker llvm --no-odr --update -y %p/dummy-debug-map-amr64.map \
71+
RUN: dsymutil --linker parallel --no-odr --update -y %p/dummy-debug-map-amr64.map \
7272
RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \
7373
RUN: -o %t.dir/dwarf5-addr-base.dSYM
7474
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \
7575
RUN: FileCheck %s --check-prefix=UPD
7676

7777
RUN: rm -rf %t.dir && mkdir -p %t.dir
78-
RUN: dsymutil --linker llvm --update -y %p/dummy-debug-map-amr64.map \
78+
RUN: dsymutil --linker parallel --update -y %p/dummy-debug-map-amr64.map \
7979
RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \
8080
RUN: -o %t.dir/dwarf5-addr-base.dSYM
8181
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \

llvm/test/tools/dsymutil/ARM/dwarf5-addrx-0x0-last.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN: llvm-dwarfdump --verify %t.dSYM 2>&1 | FileCheck %s
2828
RUN: llvm-dwarfdump --verbose -debug-info %t.dSYM | FileCheck %s --check-prefix DEBUGINFO
2929
RUN: llvm-dwarfdump --verbose -debug-line %t.dSYM | FileCheck %s --check-prefix DEBUGLINE
3030

31-
RUN: dsymutil --linker llvm -oso-prepend-path %p/../Inputs \
31+
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs \
3232
RUN: %p/../Inputs/private/tmp/dwarf5/dwarf5-addrx-0x0-last.out \
3333
RUN: -o %t.dSYM 2>&1 | FileCheck %s --allow-empty
3434
RUN: llvm-dwarfdump --verify %t.dSYM 2>&1 | FileCheck %s

llvm/test/tools/dsymutil/ARM/dwarf5-dwarf4-combination-macho.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN: dsymutil -y %p/dummy-debug-map-amr64.map -oso-prepend-path=%p/../Inputs/DWA
3434
RUN: llvm-dwarfdump %t.dir/dwarf5-dwarf4-combination-macho.dSYM -a --verbose | FileCheck %s
3535

3636
RUN: rm -rf %t.dir && mkdir -p %t.dir
37-
RUN: dsymutil --no-odr --linker llvm -y %p/dummy-debug-map-amr64.map \
37+
RUN: dsymutil --no-odr --linker parallel -y %p/dummy-debug-map-amr64.map \
3838
RUN: -oso-prepend-path=%p/../Inputs/DWARF5-DWARF4-combination \
3939
RUN: -o %t.dir/dwarf5-dwarf4-combination-macho.dSYM
4040
RUN: llvm-dwarfdump %t.dir/dwarf5-dwarf4-combination-macho.dSYM \
@@ -43,7 +43,7 @@ RUN: -a --verbose | FileCheck %s
4343
### Uncomment following when llvm-dwarfdump will dump address ranges
4444
### correctly for severall compile units case.
4545
COM: rm -rf %t.dir && mkdir -p %t.dir
46-
COM: dsymutil --linker llvm -y %p/dummy-debug-map-amr64.map \
46+
COM: dsymutil --linker parallel -y %p/dummy-debug-map-amr64.map \
4747
COM: -oso-prepend-path=%p/../Inputs/DWARF5-DWARF4-combination \
4848
COM: -o %t.dir/dwarf5-dwarf4-combination-macho.dSYM
4949
COM: llvm-dwarfdump %t.dir/dwarf5-dwarf4-combination-macho.dSYM \

llvm/test/tools/dsymutil/ARM/dwarf5-macho.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ RUN: dsymutil -y %p/dummy-debug-map-amr64.map -oso-prepend-path=%p/../Inputs/DWA
2222
RUN: llvm-dwarfdump %t.dir/dwarf5-macho.dSYM -a --verbose | FileCheck %s
2323

2424
RUN: rm -rf %t.dir && mkdir -p %t.dir
25-
RUN: dsymutil --linker llvm --no-odr -y %p/dummy-debug-map-amr64.map \
25+
RUN: dsymutil --linker parallel --no-odr -y %p/dummy-debug-map-amr64.map \
2626
RUN: -oso-prepend-path=%p/../Inputs/DWARF5 -o %t.dir/dwarf5-macho.dSYM
2727
RUN: llvm-dwarfdump %t.dir/dwarf5-macho.dSYM -a --verbose | FileCheck %s
2828

2929
### Uncomment following when llvm-dwarfdump will print resolved address ranges
3030
### for the case mutiplue compile units.
3131
COM: rm -rf %t.dir && mkdir -p %t.dir
32-
COM: dsymutil --linker llvm -y %p/dummy-debug-map-amr64.map \
32+
COM: dsymutil --linker parallel -y %p/dummy-debug-map-amr64.map \
3333
COM: -oso-prepend-path=%p/../Inputs/DWARF5 -o %t.dir/dwarf5-macho.dSYM
3434
COM: llvm-dwarfdump %t.dir/dwarf5-macho.dSYM -a --verbose | FileCheck %s \
3535
COM: --check-prefixes=CHECK,CHECK-LLVM

llvm/test/tools/dsymutil/ARM/dwarf5-str-offsets-base-strx.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,26 @@ RUN: dsymutil --update -y %p/dummy-debug-map-amr64.map -oso-prepend-path=%p/../I
5757
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s --check-prefixes=UPD,GLOBALUPD
5858

5959
RUN: rm -rf %t.dir && mkdir -p %t.dir
60-
RUN: dsymutil --linker llvm --no-odr -y %p/dummy-debug-map-amr64.map \
60+
RUN: dsymutil --linker parallel --no-odr -y %p/dummy-debug-map-amr64.map \
6161
RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \
6262
RUN: -o %t.dir/dwarf5-addr-base.dSYM
6363
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \
6464
RUN: FileCheck %s --check-prefixes=CHECK,LOCAL
6565

6666
RUN: rm -rf %t.dir && mkdir -p %t.dir
67-
RUN: dsymutil --linker llvm -y %p/dummy-debug-map-amr64.map \
67+
RUN: dsymutil --linker parallel -y %p/dummy-debug-map-amr64.map \
6868
RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \
6969
RUN: -o %t.dir/dwarf5-addr-base.dSYM
7070
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \
7171
RUN: FileCheck %s --check-prefixes=CHECK,LOCAL,CHECK-LLVM
7272

73-
RUN: dsymutil --linker llvm --no-odr --update -y %p/dummy-debug-map-amr64.map \
73+
RUN: dsymutil --linker parallel --no-odr --update -y %p/dummy-debug-map-amr64.map \
7474
RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \
7575
RUN: -o %t.dir/dwarf5-addr-base.dSYM
7676
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \
7777
RUN: FileCheck %s --check-prefixes=UPD,LOCALUPD
7878

79-
RUN: dsymutil --linker llvm --update -y %p/dummy-debug-map-amr64.map \
79+
RUN: dsymutil --linker parallel --update -y %p/dummy-debug-map-amr64.map \
8080
RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \
8181
RUN: -o %t.dir/dwarf5-addr-base.dSYM
8282
RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \

llvm/test/tools/dsymutil/ARM/empty-map.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RUN: dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s
22

3-
# RUN: dsymutil --linker llvm -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s
3+
# RUN: dsymutil --linker parallel -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s
44

55
---
66
triple: 'thumbv7-apple-darwin'

llvm/test/tools/dsymutil/ARM/extern-alias.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ $ xcrun --sdk iphoneos clang private_extern.o main.o -target arm64-apple-ios14.0
3838
RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/private_extern/private_extern.out -o %t.dSYM --verbose | FileCheck %s
3939
RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/extern/extern.out -o %t.dSYM --verbose | FileCheck %s
4040

41-
RUN: dsymutil --linker llvm -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/private_extern/private_extern.out -o %t.dSYM --verbose | FileCheck %s
42-
RUN: dsymutil --linker llvm -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/extern/extern.out -o %t.dSYM --verbose | FileCheck %s
41+
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/private_extern/private_extern.out -o %t.dSYM --verbose | FileCheck %s
42+
RUN: dsymutil --linker parallel -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/extern/extern.out -o %t.dSYM --verbose | FileCheck %s
4343

4444
CHECK-NOT: could not find symbol '_baz'
4545
CHECK: { sym: _baz, objAddr: 0x0, binAddr: 0x100007F58, size: 0x0 }

llvm/test/tools/dsymutil/ARM/fat-arch-name.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RUN: dsymutil -no-output %p/../Inputs/fat-test.arm.dylib -o /dev/null -verbose 2>&1 | FileCheck %s
22

3-
# RUN: dsymutil --linker llvm -no-output %p/../Inputs/fat-test.arm.dylib -o /dev/null -verbose 2>&1 | FileCheck %s
3+
# RUN: dsymutil --linker parallel -no-output %p/../Inputs/fat-test.arm.dylib -o /dev/null -verbose 2>&1 | FileCheck %s
44

55
# We detect thumb triples from the binaries, because those are the only ones
66
# that are guaranteed to be able to generate a Target instance (for example

0 commit comments

Comments
 (0)