11
11
# RUN: %T/baremetal_multilib/bin/clang -no-canonical-prefixes -x c++ %s -### -o %t.out 2>&1 \
12
12
# RUN: --target=thumbv8m.main-none-eabihf --sysroot= \
13
13
# 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"
15
15
# CHECK-SAME: "-internal-isystem" "[[SYSROOT]]/bin/../lib/clang-runtimes/arm-none-eabi/thumb/v8-m.main/fp/include/c++/v1"
16
16
# CHECK-SAME: "-internal-isystem" "[[SYSROOT]]/bin/../lib/clang-runtimes/arm-none-eabi/thumb/v8-m.main/fp/include"
17
17
# CHECK-SAME: "-x" "c++" "{{.*}}baremetal-multilib.yaml"
24
24
# RUN: --target=thumbv7em-none-eabi -mfpu=fpv4-sp-d16 --sysroot= \
25
25
# RUN: | FileCheck --check-prefix=CHECK-NO-MATCH %s
26
26
# 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
28
28
# 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
32
32
33
33
# RUN: %T/baremetal_multilib/bin/clang -no-canonical-prefixes -print-multi-directory 2>&1 \
34
34
# RUN: --target=thumbv8m.main-none-eabihf --sysroot= \
38
38
# RUN: %T/baremetal_multilib/bin/clang -no-canonical-prefixes -print-multi-lib 2>&1 \
39
39
# RUN: --target=arm-none-eabi --sysroot= \
40
40
# 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
51
51
52
52
# RUN: %T/baremetal_multilib/bin/clang -no-canonical-prefixes -x assembler -mexecute-only \
53
53
# RUN: --target=arm-none-eabi --sysroot= %s -c -### 2>&1 \
@@ -86,37 +86,37 @@ MultilibVersion: 1.0
86
86
87
87
Variants :
88
88
- Dir : arm-none-eabi/arm/v4t
89
- Flags : [--target=armv4t-none- unknown-eabi]
89
+ Flags : [--target=armv4t-unknown-none -eabi]
90
90
91
91
- 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]
93
93
94
94
- 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]
96
96
97
97
- 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]
99
99
100
100
- 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]
102
102
103
103
- 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]
105
105
106
106
- 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]
108
108
109
109
- 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]
111
111
112
112
- 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]
114
114
115
115
- 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]
117
117
118
118
- 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]
120
120
121
121
122
122
# The second section of the file is a map from auto-detected flags
@@ -126,17 +126,17 @@ Variants:
126
126
# All flags in the "Flags" list will be added if an argument matches.
127
127
Mappings :
128
128
# 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]
131
131
# Match versions after v8.1m.main. We assume that v8.2m (if/when it exists) will
132
132
# be backwards compatible with v8.1m.
133
133
# The alternative is to not recognise later versions, and require that
134
134
# this multilib spec is updated before it can be used with newer
135
135
# 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]
140
140
141
141
- Match : -march=thumbv8\.[1-9]m\.main.*\+mve($|\+).*
142
142
Flags : [-march=thumbv8.1m.main+mve]
0 commit comments