Skip to content

Commit 11ae27a

Browse files
wzssyqawzssyqa
committed
Triple::normalize: Set OS for 3-component triple with none as middle
If the middle component of a 3-component triple fails to parse as known Arch/Vendor/OS/Env, it will fallback as Vendor. While for some cases, we may wish to recognize it as OS, such as `arm64-none-elf`. In this patch, we will set OS as `none`, if: 1) Arch is found; 2) Env is found; 3) OS is not found and thus is set as empty; 4) Vendor is not found while is set as "none", we will swap Component[2] and Component[3]. Use this new triple for these tests: - clang/docs/Multilib.rst - clang/test/CodeGen/Inputs/linker-diagnostic1.ll - clang/test/CodeGen/linker-diagnostic.ll - clang/test/Driver/arm-ias-Wa.s - clang/test/Driver/arm-triple.c - clang/test/Driver/baremetal-multilib-exclusive-group.yaml - clang/test/Driver/baremetal-multilib-group-error.yaml - clang/test/Driver/baremetal-multilib-layered.yaml - clang/test/Driver/baremetal-multilib.yaml - clang/test/Driver/baremetal-sysroot.cpp - clang/test/Driver/baremetal.cpp - clang/test/Driver/print-multi-selection-flags.c - clang/test/Driver/program-path-priority.c - clang/test/Preprocessor/init-arm.c - clang/unittests/Driver/MultilibTest.cpp - clang/unittests/Interpreter/IncrementalCompilerBuilderTest.cpp - libcxx/utils/ci/run-buildbot - lld/test/ELF/lto/arm.ll - llvm/test/CodeGen/ARM/machine-sink-multidef.mir - llvm/test/CodeGen/ARM/store-prepostinc.mir - llvm/test/CodeGen/ARM/unschedule-reg-sequence.ll - llvm/test/CodeGen/Thumb/consthoist-few-dependents.ll - llvm/test/CodeGen/Thumb/consthoist-imm8-costs-1.ll - llvm/test/CodeGen/Thumb/pr42760.ll - llvm/test/CodeGen/Thumb/smul_fix.ll - llvm/test/CodeGen/Thumb/smul_fix_sat.ll - llvm/test/CodeGen/Thumb/umul_fix.ll - llvm/test/CodeGen/Thumb/umul_fix_sat.ll - llvm/test/CodeGen/Thumb2/LowOverheadLoops/spillingmove.mir - llvm/test/CodeGen/Thumb2/LowOverheadLoops/wls-search-pred.mir - llvm/test/CodeGen/Thumb2/high-reg-spill.mir - llvm/test/CodeGen/Thumb2/mve-pred-constfold.mir - llvm/test/CodeGen/Thumb2/mve-vpt-block-debug.mir - llvm/test/CodeGen/Thumb2/pipeliner-preserve-ties.mir - llvm/test/CodeGen/Thumb2/store-prepostinc.mir - llvm/test/Transforms/InferFunctionAttrs/norecurse_debug.ll - llvm/test/Transforms/LoopVectorize/ARM/mve-hoist-runtime-checks.ll - llvm/unittests/TargetParser/TripleTest.cpp Fixes: #89582.
1 parent ec062f5 commit 11ae27a

39 files changed

+127
-120
lines changed

‎clang/docs/Multilib.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ For a more comprehensive example see
188188
- Dir: thumb/v6-m
189189
# List of one or more normalized command line options, as generated by Clang
190190
# from the command line options or from Mappings below.
191-
# Here, if the flags are a superset of {target=thumbv6m-none-unknown-eabi}
191+
# Here, if the flags are a superset of {target=thumbv6m-unknown-none-eabi}
192192
# then this multilib variant will be considered a match.
193-
Flags: [--target=thumbv6m-none-unknown-eabi]
193+
Flags: [--target=thumbv6m-unknown-none-eabi]
194194
195195
# Similarly, a multilib variant targeting Arm v7-M with an FPU (floating
196196
# point unit).

‎clang/test/CodeGen/Inputs/linker-diagnostic1.ll

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
target triple = "armv4-none-unknown-eabi"
1+
target triple = "armv4-unknown-none-eabi"
22
target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"
33

44
declare i32 @foo(i32)

‎clang/test/CodeGen/linker-diagnostic.ll

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
; RUN: opt -module-summary -o %t/bar.o %S/Inputs/linker-diagnostic1.ll
55
; RUN: llvm-lto2 run --thinlto-distributed-indexes -r %t/foo.o,foo,plx -r %t/bar.o,bar,plx \
66
; RUN: -r %t/bar.o,foo, -o %t/foobar.so %t/foo.o %t/bar.o
7-
; RUN: %clang -c -o %t/lto.bar.o --target=armv4-none-unknown-eabi -O2 \
7+
; RUN: %clang -c -o %t/lto.bar.o --target=armv4-unknown-none-eabi -O2 \
88
; RUN: -fthinlto-index=%t/bar.o.thinlto.bc %t/bar.o -Wno-override-module 2>&1 | FileCheck %s
99

10-
; CHECK: linking module '{{.*}}/bar.o': Linking two modules of different target triples: '{{.*}}/foo.o' is 'thumbv6-unknown-linux-gnueabihf' whereas '{{.*}}/bar.o' is 'armv4-none-unknown-eabi'
10+
; CHECK: linking module '{{.*}}/bar.o': Linking two modules of different target triples: '{{.*}}/foo.o' is 'thumbv6-unknown-linux-gnueabihf' whereas '{{.*}}/bar.o' is 'armv4-unknown-none-eabi'
1111

1212
target triple = "thumbv6-unknown-linux-gnueabihf"
1313
target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"

‎clang/test/Driver/arm-ias-Wa.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
// RUN: %clang -target armv7r-none-eabi -c %s -### 2>&1 \
7373
// RUN: | FileCheck -check-prefix=CHECK-R-PROFILE %s
74-
// CHECK-R-PROFILE: "-triple" "armv7r-none-unknown-eabi"
74+
// CHECK-R-PROFILE: "-triple" "armv7r-unknown-none-eabi"
7575

7676
// RUN: %clang -target armv7m-none-eabi -c %s -### 2>&1 \
7777
// RUN: %clang -target thumbv7m-none-eabi -c %s -### 2>&1 \

‎clang/test/Driver/arm-triple.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@
77
// RUN: %clang -print-effective-triple \
88
// RUN: --target=arm-none-eabihf -march=armv4t -mfloat-abi=softfp \
99
// RUN: | FileCheck %s --check-prefix=CHECK-DEFAULT
10-
// CHECK-DEFAULT: armv4t-none-unknown-eabi
10+
// CHECK-DEFAULT: armv4t-unknown-none-eabi
1111

1212
// RUN: %clang -print-effective-triple \
1313
// RUN: --target=armeb-none-eabi \
1414
// RUN: | FileCheck %s --check-prefix=CHECK-EB
1515
// RUN: %clang -print-effective-triple \
1616
// RUN: --target=arm-none-eabi -mbig-endian \
1717
// RUN: | FileCheck %s --check-prefix=CHECK-EB
18-
// CHECK-EB: armebv4t-none-unknown-eabi
18+
// CHECK-EB: armebv4t-unknown-none-eabi
1919

2020
// RUN: %clang -print-effective-triple \
2121
// RUN: --target=arm-none-eabihf -march=armv4t \
2222
// RUN: | FileCheck %s --check-prefix=CHECK-HF
2323
// RUN: %clang -print-effective-triple \
2424
// RUN: --target=arm-none-eabi -mfloat-abi=hard \
2525
// RUN: | FileCheck %s --check-prefix=CHECK-HF
26-
// CHECK-HF: armv4t-none-unknown-eabihf
26+
// CHECK-HF: armv4t-unknown-none-eabihf
2727

2828
// RUN: %clang -print-effective-triple \
2929
// RUN: --target=armeb-none-eabihf -march=armv4t \
@@ -37,12 +37,12 @@
3737
// RUN: %clang -print-effective-triple \
3838
// RUN: --target=arm-none-eabi -mbig-endian -mfloat-abi=hard \
3939
// RUN: | FileCheck %s --check-prefix=CHECK-EB-HF
40-
// CHECK-EB-HF: armebv4t-none-unknown-eabihf
40+
// CHECK-EB-HF: armebv4t-unknown-none-eabihf
4141

4242
// RUN: %clang -print-effective-triple \
4343
// RUN: --target=arm-none-eabi -march=armv8m.main -mbig-endian -mfloat-abi=hard \
4444
// RUN: | FileCheck %s --check-prefix=CHECK-V8M-EB-HF
4545
// RUN: %clang -print-effective-triple \
4646
// RUN: --target=arm-none-eabi -mcpu=cortex-m33 -mbig-endian -mfloat-abi=hard \
4747
// RUN: | FileCheck %s --check-prefix=CHECK-V8M-EB-HF
48-
// CHECK-V8M-EB-HF: thumbebv8m.main-none-unknown-eabihf
48+
// CHECK-V8M-EB-HF: thumbebv8m.main-unknown-none-eabihf

‎clang/test/Driver/baremetal-multilib-exclusive-group.yaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
# RUN: mkdir -p %t/baremetal_multilib/lib/clang-runtimes
99
# RUN: ln -s %s %t/baremetal_multilib/lib/clang-runtimes/multilib.yaml
1010

11-
# RUN: %t/baremetal_multilib/bin/clang -no-canonical-prefixes -x c++ %s -### -o %t.out --target=thumbv7em-none-unknown-eabi --sysroot= 2>%t.err
11+
# RUN: %t/baremetal_multilib/bin/clang -no-canonical-prefixes -x c++ %s -### -o %t.out --target=thumbv7em-unknown-none-eabi --sysroot= 2>%t.err
1212

1313
# RUN: FileCheck -DSYSROOT=%t/baremetal_multilib %s < %t.err --check-prefix=POS
1414
# RUN: FileCheck -DSYSROOT=%t/baremetal_multilib %s < %t.err --check-prefix=NEG
1515

1616
# Expected results:
1717
#
1818
# Due to the Mappings section, all six of these library directories should
19-
# match the command-line flag --target=thumbv7em-none-unknown-eabi.
19+
# match the command-line flag --target=thumbv7em-unknown-none-eabi.
2020
#
2121
# The two "non_exclusive" directories, which don't have an ExclusiveGroup at
2222
# all, should both be selected. So should the two "own_group", each of which
@@ -49,31 +49,31 @@ Groups:
4949

5050
Variants:
5151
- Dir: testdir1_non_exclusive
52-
Flags: [--target=thumbv7m-none-unknown-eabi]
52+
Flags: [--target=thumbv7m-unknown-none-eabi]
5353

5454
- Dir: testdir2_non_exclusive
55-
Flags: [--target=thumbv7em-none-unknown-eabi]
55+
Flags: [--target=thumbv7em-unknown-none-eabi]
5656

5757
- Dir: testdir1_exclusive
58-
Flags: [--target=thumbv7m-none-unknown-eabi]
58+
Flags: [--target=thumbv7m-unknown-none-eabi]
5959
Group: actually_exclude_something
6060

6161
- Dir: testdir2_exclusive
62-
Flags: [--target=thumbv7em-none-unknown-eabi]
62+
Flags: [--target=thumbv7em-unknown-none-eabi]
6363
Group: actually_exclude_something
6464

6565
- Dir: testdir3_exclusive
66-
Flags: [--target=thumbv7em-none-unknown-eabi]
66+
Flags: [--target=thumbv7em-unknown-none-eabi]
6767
Group: actually_exclude_something
6868

6969
- Dir: testdir1_own_group
70-
Flags: [--target=thumbv7m-none-unknown-eabi]
70+
Flags: [--target=thumbv7m-unknown-none-eabi]
7171
Group: foo
7272

7373
- Dir: testdir2_own_group
74-
Flags: [--target=thumbv7em-none-unknown-eabi]
74+
Flags: [--target=thumbv7em-unknown-none-eabi]
7575
Group: bar
7676

7777
Mappings:
78-
- Match: --target=thumbv7em-none-unknown-eabi
79-
Flags: [--target=thumbv7m-none-unknown-eabi]
78+
- Match: --target=thumbv7em-unknown-none-eabi
79+
Flags: [--target=thumbv7m-unknown-none-eabi]

‎clang/test/Driver/baremetal-multilib-group-error.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# RUN: mkdir -p %t/baremetal_multilib/lib/clang-runtimes
99
# RUN: ln -s %s %t/baremetal_multilib/lib/clang-runtimes/multilib.yaml
1010

11-
# RUN: %t/baremetal_multilib/bin/clang -no-canonical-prefixes -x c++ %s -### -o %t.out --target=thumbv7em-none-unknown-eabi --sysroot= 2>%t.err
11+
# RUN: %t/baremetal_multilib/bin/clang -no-canonical-prefixes -x c++ %s -### -o %t.out --target=thumbv7em-unknown-none-eabi --sysroot= 2>%t.err
1212
# RUN: FileCheck %s < %t.err
1313

1414
---
@@ -20,7 +20,7 @@ Groups:
2020

2121
Variants:
2222
- Dir: testdir1
23-
Flags: [--target=thumbv7m-none-unknown-eabi]
23+
Flags: [--target=thumbv7m-unknown-none-eabi]
2424
Group: nonexistent_group_name
2525

2626
# CHECK: error: unknown enumerated scalar

‎clang/test/Driver/baremetal-multilib-layered.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# RUN: %T/baremetal_multilib_layered/bin/clang -no-canonical-prefixes -x c++ %s -### -o %t.out 2>&1 \
1919
# RUN: --target=thumbv7m-none-eabi -mfloat-abi=softfp --sysroot= \
2020
# RUN: | FileCheck -DSYSROOT=%T/baremetal_multilib_layered %s
21-
# CHECK: "-cc1" "-triple" "thumbv7m-none-unknown-eabi"
21+
# CHECK: "-cc1" "-triple" "thumbv7m-unknown-none-eabi"
2222
# CHECK-SAME: "-internal-isystem" "[[SYSROOT]]/bin/../lib/clang-runtimes/softfp/include/c++/v1"
2323
# CHECK-SAME: "-internal-isystem" "[[SYSROOT]]/bin/../lib/clang-runtimes/soft/include/c++/v1"
2424
# CHECK-SAME: "-internal-isystem" "[[SYSROOT]]/bin/../lib/clang-runtimes/softfp/include"

‎clang/test/Driver/baremetal-multilib.yaml

+32-32
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# RUN: %T/baremetal_multilib/bin/clang -no-canonical-prefixes -x c++ %s -### -o %t.out 2>&1 \
1212
# RUN: --target=thumbv8m.main-none-eabihf --sysroot= \
1313
# RUN: | FileCheck -DSYSROOT=%T/baremetal_multilib %s
14-
# CHECK: "-cc1" "-triple" "thumbv8m.main-none-unknown-eabihf"
14+
# CHECK: "-cc1" "-triple" "thumbv8m.main-unknown-none-eabihf"
1515
# CHECK-SAME: "-internal-isystem" "[[SYSROOT]]/bin/../lib/clang-runtimes/arm-none-eabi/thumb/v8-m.main/fp/include/c++/v1"
1616
# CHECK-SAME: "-internal-isystem" "[[SYSROOT]]/bin/../lib/clang-runtimes/arm-none-eabi/thumb/v8-m.main/fp/include"
1717
# CHECK-SAME: "-x" "c++" "{{.*}}baremetal-multilib.yaml"
@@ -24,11 +24,11 @@
2424
# RUN: --target=thumbv7em-none-eabi -mfpu=fpv4-sp-d16 --sysroot= \
2525
# RUN: | FileCheck --check-prefix=CHECK-NO-MATCH %s
2626
# CHECK-NO-MATCH: warning: no multilib found matching flags:
27-
# CHECK-NO-MATCH-SAME: --target=thumbv7em-none-unknown-eabi
27+
# CHECK-NO-MATCH-SAME: --target=thumbv7em-unknown-none-eabi
2828
# CHECK-NO-MATCH: note: available multilibs are:
29-
# CHECK-NO-MATCH: --target=thumbv6m-none-unknown-eabi -mfpu=none
30-
# CHECK-NO-MATCH: --target=thumbv7m-none-unknown-eabi -mfpu=none
31-
# CHECK-NO-MATCH: --target=thumbv7em-none-unknown-eabi -mfpu=none
29+
# CHECK-NO-MATCH: --target=thumbv6m-unknown-none-eabi -mfpu=none
30+
# CHECK-NO-MATCH: --target=thumbv7m-unknown-none-eabi -mfpu=none
31+
# CHECK-NO-MATCH: --target=thumbv7em-unknown-none-eabi -mfpu=none
3232

3333
# RUN: %T/baremetal_multilib/bin/clang -no-canonical-prefixes -print-multi-directory 2>&1 \
3434
# RUN: --target=thumbv8m.main-none-eabihf --sysroot= \
@@ -38,16 +38,16 @@
3838
# RUN: %T/baremetal_multilib/bin/clang -no-canonical-prefixes -print-multi-lib 2>&1 \
3939
# RUN: --target=arm-none-eabi --sysroot= \
4040
# RUN: | FileCheck --check-prefix=CHECK-PRINT-MULTI-LIB %s
41-
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v6-m/nofp;@-target=thumbv6m-none-unknown-eabi@mfpu=none
42-
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v7-m/nofp;@-target=thumbv7m-none-unknown-eabi@mfpu=none
43-
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v7e-m/nofp;@-target=thumbv7em-none-unknown-eabi@mfpu=none
44-
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v8-m.main/nofp;@-target=thumbv8m.main-none-unknown-eabi@mfpu=none
45-
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v8.1-m.main/nofp/nomve;@-target=thumbv8.1m.main-none-unknown-eabi@mfpu=none
46-
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v7e-m/fpv4_sp_d16;@-target=thumbv7em-none-unknown-eabihf@mfpu=fpv4-sp-d16
47-
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v7e-m/fpv5_d16;@-target=thumbv7em-none-unknown-eabihf@mfpu=fpv5-d16
48-
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v8-m.main/fp;@-target=thumbv8m.main-none-unknown-eabihf@mfpu=fpv5-d16
49-
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v8.1-m.main/fp;@-target=thumbv8.1m.main-none-unknown-eabihf@mfpu=fp-armv8-fullfp16-sp-d16
50-
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v8.1-m.main/nofp/mve;@-target=thumbv8.1m.main-none-unknown-eabihf@march=thumbv8.1m.main+mve@mfpu=none
41+
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v6-m/nofp;@-target=thumbv6m-unknown-none-eabi@mfpu=none
42+
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v7-m/nofp;@-target=thumbv7m-unknown-none-eabi@mfpu=none
43+
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v7e-m/nofp;@-target=thumbv7em-unknown-none-eabi@mfpu=none
44+
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v8-m.main/nofp;@-target=thumbv8m.main-unknown-none-eabi@mfpu=none
45+
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v8.1-m.main/nofp/nomve;@-target=thumbv8.1m.main-unknown-none-eabi@mfpu=none
46+
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v7e-m/fpv4_sp_d16;@-target=thumbv7em-unknown-none-eabihf@mfpu=fpv4-sp-d16
47+
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v7e-m/fpv5_d16;@-target=thumbv7em-unknown-none-eabihf@mfpu=fpv5-d16
48+
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v8-m.main/fp;@-target=thumbv8m.main-unknown-none-eabihf@mfpu=fpv5-d16
49+
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v8.1-m.main/fp;@-target=thumbv8.1m.main-unknown-none-eabihf@mfpu=fp-armv8-fullfp16-sp-d16
50+
# CHECK-PRINT-MULTI-LIB: arm-none-eabi/thumb/v8.1-m.main/nofp/mve;@-target=thumbv8.1m.main-unknown-none-eabihf@march=thumbv8.1m.main+mve@mfpu=none
5151

5252
# RUN: %T/baremetal_multilib/bin/clang -no-canonical-prefixes -x assembler -mexecute-only \
5353
# RUN: --target=arm-none-eabi --sysroot= %s -c -### 2>&1 \
@@ -86,37 +86,37 @@ MultilibVersion: 1.0
8686

8787
Variants:
8888
- Dir: arm-none-eabi/arm/v4t
89-
Flags: [--target=armv4t-none-unknown-eabi]
89+
Flags: [--target=armv4t-unknown-none-eabi]
9090

9191
- Dir: arm-none-eabi/thumb/v6-m/nofp
92-
Flags: [--target=thumbv6m-none-unknown-eabi, -mfpu=none]
92+
Flags: [--target=thumbv6m-unknown-none-eabi, -mfpu=none]
9393

9494
- Dir: arm-none-eabi/thumb/v7-m/nofp
95-
Flags: [--target=thumbv7m-none-unknown-eabi, -mfpu=none]
95+
Flags: [--target=thumbv7m-unknown-none-eabi, -mfpu=none]
9696

9797
- Dir: arm-none-eabi/thumb/v7e-m/nofp
98-
Flags: [--target=thumbv7em-none-unknown-eabi, -mfpu=none]
98+
Flags: [--target=thumbv7em-unknown-none-eabi, -mfpu=none]
9999

100100
- Dir: arm-none-eabi/thumb/v8-m.main/nofp
101-
Flags: [--target=thumbv8m.main-none-unknown-eabi, -mfpu=none]
101+
Flags: [--target=thumbv8m.main-unknown-none-eabi, -mfpu=none]
102102

103103
- Dir: arm-none-eabi/thumb/v8.1-m.main/nofp/nomve
104-
Flags: [--target=thumbv8.1m.main-none-unknown-eabi, -mfpu=none]
104+
Flags: [--target=thumbv8.1m.main-unknown-none-eabi, -mfpu=none]
105105

106106
- Dir: arm-none-eabi/thumb/v7e-m/fpv4_sp_d16
107-
Flags: [--target=thumbv7em-none-unknown-eabihf, -mfpu=fpv4-sp-d16]
107+
Flags: [--target=thumbv7em-unknown-none-eabihf, -mfpu=fpv4-sp-d16]
108108

109109
- Dir: arm-none-eabi/thumb/v7e-m/fpv5_d16
110-
Flags: [--target=thumbv7em-none-unknown-eabihf, -mfpu=fpv5-d16]
110+
Flags: [--target=thumbv7em-unknown-none-eabihf, -mfpu=fpv5-d16]
111111

112112
- Dir: arm-none-eabi/thumb/v8-m.main/fp
113-
Flags: [--target=thumbv8m.main-none-unknown-eabihf, -mfpu=fpv5-d16]
113+
Flags: [--target=thumbv8m.main-unknown-none-eabihf, -mfpu=fpv5-d16]
114114

115115
- Dir: arm-none-eabi/thumb/v8.1-m.main/fp
116-
Flags: [--target=thumbv8.1m.main-none-unknown-eabihf, -mfpu=fp-armv8-fullfp16-sp-d16]
116+
Flags: [--target=thumbv8.1m.main-unknown-none-eabihf, -mfpu=fp-armv8-fullfp16-sp-d16]
117117

118118
- Dir: arm-none-eabi/thumb/v8.1-m.main/nofp/mve
119-
Flags: [--target=thumbv8.1m.main-none-unknown-eabihf, -march=thumbv8.1m.main+mve, -mfpu=none]
119+
Flags: [--target=thumbv8.1m.main-unknown-none-eabihf, -march=thumbv8.1m.main+mve, -mfpu=none]
120120

121121

122122
# The second section of the file is a map from auto-detected flags
@@ -126,17 +126,17 @@ Variants:
126126
# All flags in the "Flags" list will be added if an argument matches.
127127
Mappings:
128128
# For v8m.base (and potential later v8m baseline versions) use v6m
129-
- Match: --target=thumbv8(\.[0-9]+)?m\.base-none-unknown-eabi
130-
Flags: [--target=thumbv6m-none-unknown-eabi]
129+
- Match: --target=thumbv8(\.[0-9]+)?m\.base-unknown-none-eabi
130+
Flags: [--target=thumbv6m-unknown-none-eabi]
131131
# Match versions after v8.1m.main. We assume that v8.2m (if/when it exists) will
132132
# be backwards compatible with v8.1m.
133133
# The alternative is to not recognise later versions, and require that
134134
# this multilib spec is updated before it can be used with newer
135135
# architecture versions.
136-
- Match: --target=thumbv8\.[1-9]m\.main-none-unknown-eabi
137-
Flags: [--target=thumbv8.1m.main-none-unknown-eabi]
138-
- Match: --target=thumbv8\.[1-9]m\.main-none-unknown-eabihf
139-
Flags: [--target=thumbv8.1m.main-none-unknown-eabihf]
136+
- Match: --target=thumbv8\.[1-9]m\.main-unknown-none-eabi
137+
Flags: [--target=thumbv8.1m.main-unknown-none-eabi]
138+
- Match: --target=thumbv8\.[1-9]m\.main-unknown-none-eabihf
139+
Flags: [--target=thumbv8.1m.main-unknown-none-eabihf]
140140

141141
- Match: -march=thumbv8\.[1-9]m\.main.*\+mve($|\+).*
142142
Flags: [-march=thumbv8.1m.main+mve]

‎clang/test/Driver/baremetal-sysroot.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// RUN: %T/baremetal_default_sysroot/bin/clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
1313
// RUN: -target armv6m-none-eabi --sysroot= \
1414
// RUN: | FileCheck --check-prefix=CHECK-V6M-C %s
15-
// CHECK-V6M-C: "{{.*}}clang{{.*}}" "-cc1" "-triple" "thumbv6m-none-unknown-eabi"
15+
// CHECK-V6M-C: "{{.*}}clang{{.*}}" "-cc1" "-triple" "thumbv6m-unknown-none-eabi"
1616
// CHECK-V6M-C-SAME: "-internal-isystem" "{{.*}}/baremetal_default_sysroot{{[/\\]+}}bin{{[/\\]+}}..{{[/\\]+}}lib{{[/\\]+}}clang-runtimes{{[/\\]+}}armv6m-none-eabi{{[/\\]+}}include{{[/\\]+}}c++{{[/\\]+}}v1"
1717
// CHECk-V6M-C-SAME: "-internal-isystem" "{{.*}}/baremetal_default_sysroot{{[/\\]+}}bin{{[/\\]+}}..{{[/\\]+}}lib{{[/\\]+}}clang-runtimes{{[/\\]+}}armv6m-none-eabi{{[/\\]+}}include"
1818
// CHECK-V6M-C-SAME: "-x" "c++" "{{.*}}baremetal-sysroot.cpp"

‎clang/test/Driver/baremetal.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// RUN: -L some/directory/user/asked/for \
1010
// RUN: --sysroot=%S/Inputs/baremetal_arm \
1111
// RUN: | FileCheck --check-prefix=CHECK-V6M-C %s
12-
// CHECK-V6M-C: "-cc1" "-triple" "thumbv6m-none-unknown-eabi"
12+
// CHECK-V6M-C: "-cc1" "-triple" "thumbv6m-unknown-none-eabi"
1313
// CHECK-V6M-C-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
1414
// CHECK-V6M-C-SAME: "-isysroot" "[[SYSROOT:[^"]*]]"
1515
// CHECK-V6M-C-SAME: "-internal-isystem" "[[SYSROOT]]{{[/\\]+}}include{{[/\\]+}}c++{{[/\\]+}}v1"

‎clang/test/Driver/print-multi-selection-flags.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@
55
// CHECK-FUCHSIA: --target=aarch64-unknown-fuchsia
66

77
// RUN: %clang -print-multi-flags-experimental --target=arm-none-eabi -mfloat-abi=soft -fno-exceptions -fno-rtti | FileCheck --check-prefix=CHECK-ARMV4T %s
8-
// CHECK-ARMV4T: --target=armv4t-none-unknown-eabi
8+
// CHECK-ARMV4T: --target=armv4t-unknown-none-eabi
99
// CHECK-ARMV4T: -mfloat-abi=soft
1010
// CHECK-ARMV4T: -mfpu=none
1111

1212
// RUN: %clang -print-multi-flags-experimental --target=armv7em-none-eabi -mfloat-abi=softfp | FileCheck --check-prefix=CHECK-SOFTFP %s
13-
// CHECK-SOFTFP: --target=thumbv7em-none-unknown-eabi
13+
// CHECK-SOFTFP: --target=thumbv7em-unknown-none-eabi
1414
// CHECK-SOFTFP: -mfloat-abi=softfp
1515
// CHECK-SOFTFP: -mfpu=fpv4-sp-d16
1616

1717
// RUN: %clang -print-multi-flags-experimental --target=arm-none-eabihf -march=armv7em -mfpu=fpv5-d16 | FileCheck --check-prefix=CHECK-HARD %s
18-
// CHECK-HARD: --target=thumbv7em-none-unknown-eabihf
18+
// CHECK-HARD: --target=thumbv7em-unknown-none-eabihf
1919
// CHECK-HARD: -mfloat-abi=hard
2020
// CHECK-HARD: -mfpu=fpv5-d16
2121

2222
// RUN: %clang -print-multi-flags-experimental --target=arm-none-eabi -mfloat-abi=soft -march=armv8-m.main+nofp | FileCheck --check-prefix=CHECK-V8MMAIN-NOFP %s
23-
// CHECK-V8MMAIN-NOFP: --target=thumbv8m.main-none-unknown-eabi
23+
// CHECK-V8MMAIN-NOFP: --target=thumbv8m.main-unknown-none-eabi
2424
// CHECK-V8MMAIN-NOFP: -mfloat-abi=soft
2525
// CHECK-V8MMAIN-NOFP: -mfpu=none
2626

2727
// RUN: %clang -print-multi-flags-experimental --target=arm-none-eabi -mfloat-abi=hard -march=armv8.1m.main+mve.fp | FileCheck --check-prefix=CHECK-MVE %s
28-
// CHECK-MVE: --target=thumbv8.1m.main-none-unknown-eabihf
28+
// CHECK-MVE: --target=thumbv8.1m.main-unknown-none-eabihf
2929
// CHECK-MVE: -march=thumbv8.1m.main{{.*}}+mve{{.*}}+mve.fp{{.*}}
3030
// CHECK-MVE: -mfloat-abi=hard
3131
// CHECK-MVE: -mfpu=fp-armv8-fullfp16-sp-d16
@@ -51,10 +51,10 @@
5151
// CHECK-M85_NO_FP_DP: -mfpu=fp-armv8-fullfp16-sp-d16
5252

5353
// RUN: %clang -print-multi-flags-experimental --target=aarch64-none-elf -march=armv8-a+lse | FileCheck --check-prefix=CHECK-LSE %s
54-
// CHECK-LSE: --target=aarch64-none-unknown-elf
54+
// CHECK-LSE: --target=aarch64-unknown-none-elf
5555
// CHECK-LSE: -march=armv8-a{{.*}}+lse{{.*}}
5656

5757
// RUN: %clang -print-multi-flags-experimental --target=aarch64-none-elf -march=armv8.5-a+sve+sve2 | FileCheck --check-prefix=CHECK-SVE2 %s
5858
// RUN: %clang -print-multi-flags-experimental --target=aarch64-none-elf -march=armv9-a | FileCheck --check-prefix=CHECK-SVE2 %s
59-
// CHECK-SVE2: --target=aarch64-none-unknown-elf
59+
// CHECK-SVE2: --target=aarch64-unknown-none-elf
6060
// CHECK-SVE2: -march=armv{{.*}}-a{{.*}}+simd{{.*}}+sve{{.*}}+sve2{{.*}}

‎clang/test/Driver/program-path-priority.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
// RUN: touch %t/notreal-none-elf-gcc && chmod +x %t/notreal-none-elf-gcc
3737
// RUN: env "PATH=" %t/clang -### -target notreal-none-elf %s 2>&1 | \
3838
// RUN: FileCheck --check-prefix=PROG_PATH_NOTREAL_GCC %s
39-
// PROG_PATH_NOTREAL_GCC: notreal-none-unknown-elf
39+
// PROG_PATH_NOTREAL_GCC: notreal-unknown-none-elf
4040

4141
/// <triple>-gcc on the PATH is found
4242
// RUN: mkdir -p %t/env
@@ -57,7 +57,7 @@
5757
// RUN: touch %t/gcc && chmod +x %t/gcc
5858
// RUN: env "PATH=" %t/clang -### -target notreal-none-elf %s 2>&1 | \
5959
// RUN: FileCheck --check-prefix=NOTREAL_GCC_PREFERRED %s
60-
// NOTREAL_GCC_PREFERRED: notreal-none-unknown-elf"
60+
// NOTREAL_GCC_PREFERRED: notreal-unknown-none-elf"
6161
// NOTREAL_GCC_PREFERRED-NOT: /gcc"
6262

6363
/// <triple>-gcc on the PATH is preferred to gcc in program path

0 commit comments

Comments
 (0)