Skip to content

Commit b034a7a

Browse files
authored
Add multilib mappings for armv7ve (#481)
This is a GCC name for v7-A with the virtualisation extension, so for library selection we can treat it the same as v7-A.
1 parent 29fd17c commit b034a7a

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

cmake/multilib.yaml.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,15 @@ Mappings:
135135
Flags:
136136
- --target=armv5e-unknown-none-eabihf
137137

138+
# armv7ve is a GCC name for v7-A with the virtualisation extension, for library
139+
# selection we treat it the same as v7-A.
140+
- Match: --target=(arm|thumb)v7ve-unknown-none-eabi
141+
Flags:
142+
- --target=armv7-unknown-none-eabi
143+
- Match: --target=(arm|thumb)v7ve-unknown-none-eabihf
144+
Flags:
145+
- --target=armv7-unknown-none-eabihf
146+
138147
# Higher versions of v8-A, and v9-A, are all supersets of v8-A. (And
139148
# of each other, in the obvious way, but we don't have any libraries
140149
# for those at present, so there's no need to generate all their

test/multilib/armv7a.test

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# RUN: %clang -print-multi-directory --target=armv7a-none-eabi -mfpu=none | FileCheck %s
22
# RUN: %clang -print-multi-directory --target=armv7a-none-eabi -mfpu=none -marm | FileCheck %s
33
# RUN: %clang -print-multi-directory --target=armv7a-none-eabi -mfpu=none -mthumb| FileCheck %s
4+
# RUN: %clang -print-multi-directory --target=armv7ve-none-eabi -mfpu=none | FileCheck %s
5+
# RUN: %clang -print-multi-directory --target=armv7ve-none-eabi -mfpu=none -marm | FileCheck %s
6+
# RUN: %clang -print-multi-directory --target=armv7ve-none-eabi -mfpu=none -mthumb| FileCheck %s
47
# CHECK: arm-none-eabi/armv7a_soft_nofp_exn_rtti{{$}}
58
# CHECK-EMPTY:
69

@@ -15,6 +18,8 @@
1518
# RUN: %clang -print-multi-directory --target=armv7a-none-eabihf -mfpu=neon-vfpv4 | FileCheck --check-prefix=VFPV3 %s
1619
# RUN: %clang -print-multi-directory --target=armv7a-none-eabihf -mfpu=vfpv3-d16 -marm | FileCheck --check-prefix=VFPV3 %s
1720
# RUN: %clang -print-multi-directory --target=armv7a-none-eabihf -mfpu=vfpv3-d16 -mthumb | FileCheck --check-prefix=VFPV3 %s
21+
# RUN: %clang -print-multi-directory --target=armv7ve-none-eabihf -mfpu=vfpv3-d16 | FileCheck --check-prefix=VFPV3 %s
22+
# RUN: %clang -print-multi-directory --target=armv7ve-none-eabihf -mfpu=vfpv3-d16 -mthumb | FileCheck --check-prefix=VFPV3 %s
1823
# VFPV3: arm-none-eabi/armv7a_hard_vfpv3_d16_exn_rtti{{$}}
1924
# VFPV3-EMPTY:
2025

0 commit comments

Comments
 (0)