Skip to content

Commit 9875bb4

Browse files
simpal01vhscampos
simpal01
and
vhscampos
authored
Add armebv7m_soft_fpv4_sp_d16 variants (#50) (#120)
(cherry picked from #50) Co-authored-by: Victor Campos <[email protected]>
1 parent 69945a0 commit 9875bb4

File tree

5 files changed

+109
-0
lines changed

5 files changed

+109
-0
lines changed

‎arm-software/embedded/arm-multilib/json/multilib.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,16 @@
294294
"json": "armv7m_soft_fpv4_sp_d16.json",
295295
"flags": "--target=thumbv7m-unknown-none-eabi -mfpu=fpv4-sp-d16 -fno-exceptions -fno-rtti -mno-unaligned-access"
296296
},
297+
{
298+
"variant": "armebv7m_soft_fpv4_sp_d16_exn_rtti",
299+
"json": "armebv7m_soft_fpv4_sp_d16_exn_rtti.json",
300+
"flags": "--target=thumbebv7m-unknown-none-eabi -mfpu=fpv4-sp-d16"
301+
},
302+
{
303+
"variant": "armebv7m_soft_fpv4_sp_d16",
304+
"json": "armebv7m_soft_fpv4_sp_d16.json",
305+
"flags": "--target=thumbebv7m-unknown-none-eabi -mfpu=fpv4-sp-d16 -fno-exceptions -fno-rtti"
306+
},
297307
{
298308
"variant": "armv7m_hard_fpv4_sp_d16_exn_rtti_unaligned",
299309
"json": "armv7m_hard_fpv4_sp_d16_exn_rtti_unaligned.json",

‎arm-software/embedded/arm-multilib/json/variants/armebv7m_soft_fpv4_sp_d16.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"args": {
3+
"common": {
4+
"TARGET_ARCH": "armv7m",
5+
"VARIANT": "armebv7m_soft_fpv4_sp_d16",
6+
"COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7m -mbig-endian -mfpu=fpv4-sp-d16 -mno-unaligned-access",
7+
"ENABLE_EXCEPTIONS": "OFF",
8+
"ENABLE_RTTI": "OFF",
9+
"TEST_EXECUTOR": "fvp",
10+
"FVP_MODEL": "corstone-310",
11+
"FVP_CONFIG": "cortex-m85 m-big-endian m-fp mve-none",
12+
"BOOT_FLASH_ADDRESS": "0x01000000",
13+
"BOOT_FLASH_SIZE": "2M",
14+
"FLASH_ADDRESS": "0x60000000",
15+
"FLASH_SIZE": "0x1000000",
16+
"RAM_ADDRESS": "0x61000000",
17+
"RAM_SIZE": "0x1000000",
18+
"STACK_SIZE": "4K"
19+
},
20+
"picolibc": {
21+
"PICOLIBC_BUILD_TYPE": "minsize",
22+
"ENABLE_CXX_LIBS": "ON",
23+
"ENABLE_LIBC_TESTS": "ON",
24+
"ENABLE_COMPILER_RT_TESTS": "ON",
25+
"ENABLE_LIBCXX_TESTS": "OFF"
26+
},
27+
"newlib": {
28+
"ENABLE_CXX_LIBS": "ON",
29+
"ENABLE_LIBC_TESTS": "OFF",
30+
"ENABLE_COMPILER_RT_TESTS": "OFF",
31+
"ENABLE_LIBCXX_TESTS": "OFF"
32+
},
33+
"llvmlibc": {
34+
"ENABLE_CXX_LIBS": "OFF",
35+
"ENABLE_LIBC_TESTS": "OFF",
36+
"ENABLE_COMPILER_RT_TESTS": "OFF",
37+
"ENABLE_LIBCXX_TESTS": "OFF"
38+
}
39+
}
40+
}
41+

‎arm-software/embedded/arm-multilib/json/variants/armebv7m_soft_fpv4_sp_d16_exn_rtti.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"args": {
3+
"common": {
4+
"TARGET_ARCH": "armv7m",
5+
"VARIANT": "armebv7m_soft_fpv4_sp_d16_exn_rtti",
6+
"COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7m -mbig-endian -mfpu=fpv4-sp-d16 -mno-unaligned-access",
7+
"ENABLE_EXCEPTIONS": "ON",
8+
"ENABLE_RTTI": "ON",
9+
"TEST_EXECUTOR": "fvp",
10+
"FVP_MODEL": "corstone-310",
11+
"FVP_CONFIG": "cortex-m85 m-big-endian m-fp mve-none",
12+
"BOOT_FLASH_ADDRESS": "0x01000000",
13+
"BOOT_FLASH_SIZE": "2M",
14+
"FLASH_ADDRESS": "0x60000000",
15+
"FLASH_SIZE": "0x1000000",
16+
"RAM_ADDRESS": "0x61000000",
17+
"RAM_SIZE": "0x1000000",
18+
"STACK_SIZE": "4K"
19+
},
20+
"picolibc": {
21+
"PICOLIBC_BUILD_TYPE": "minsize",
22+
"ENABLE_CXX_LIBS": "ON",
23+
"ENABLE_LIBC_TESTS": "ON",
24+
"ENABLE_COMPILER_RT_TESTS": "ON",
25+
"ENABLE_LIBCXX_TESTS": "OFF"
26+
},
27+
"newlib": {
28+
"ENABLE_CXX_LIBS": "ON",
29+
"ENABLE_LIBC_TESTS": "OFF",
30+
"ENABLE_COMPILER_RT_TESTS": "OFF",
31+
"ENABLE_LIBCXX_TESTS": "OFF"
32+
},
33+
"llvmlibc": {
34+
"ENABLE_CXX_LIBS": "OFF",
35+
"ENABLE_LIBC_TESTS": "OFF",
36+
"ENABLE_COMPILER_RT_TESTS": "OFF",
37+
"ENABLE_LIBCXX_TESTS": "OFF"
38+
}
39+
}
40+
}
41+

‎arm-software/embedded/arm-multilib/multilib.yaml.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ Mappings:
9898
- Match: --target=thumbv7em-unknown-none-eabihf
9999
Flags:
100100
- --target=thumbv7m-unknown-none-eabihf
101+
- Match: --target=thumbebv7em-unknown-none-eabi
102+
Flags:
103+
- --target=thumbebv7m-unknown-none-eabi
101104
- Match: --target=thumbebv7em-unknown-none-eabihf
102105
Flags:
103106
- --target=thumbebv7m-unknown-none-eabihf

‎arm-software/embedded/test/multilib/armv7m.test

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,20 @@
8989
# CHECK-BE-FPV4-EXN-RTTI: arm-none-eabi/armebv7m_hard_fpv4_sp_d16_exn_rtti{{$}}
9090
# CHECK-BE-FPV4-EXN-RTTI-EMPTY:
9191

92+
# RUN: %clang -print-multi-directory --target=armv7m-none-eabi -mbig-endian -mfpu=fpv4-sp-d16 -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=CHECK-BE-SOFT-FPV4
93+
# RUN: %clang -print-multi-directory --target=armv7m-none-eabi -mbig-endian -mfpu=fpv4-sp-d16 -fno-exceptions -fno-rtti -mno-unaligned-access | FileCheck %s --check-prefix=CHECK-BE-SOFT-FPV4
94+
# RUN: %clang -print-multi-directory --target=armv7em-none-eabi -mbig-endian -mfpu=fpv4-sp-d16 -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=CHECK-BE-SOFT-FPV4
95+
# RUN: %clang -print-multi-directory --target=armv7em-none-eabi -mbig-endian -mfpu=fpv4-sp-d16 -fno-exceptions -fno-rtti -mno-unaligned-access | FileCheck %s --check-prefix=CHECK-BE-SOFT-FPV4
96+
# CHECK-BE-SOFT-FPV4: arm-none-eabi/armebv7m_soft_fpv4_sp_d16{{$}}
97+
# CHECK-BE-SOFT-FPV4-EMPTY:
98+
99+
# RUN: %clang -print-multi-directory --target=armv7m-none-eabi -mbig-endian -mfpu=fpv4-sp-d16 | FileCheck %s --check-prefix=CHECK-BE-SOFT-FPV4-EXN-RTTI
100+
# RUN: %clang -print-multi-directory --target=armv7m-none-eabi -mbig-endian -mfpu=fpv4-sp-d16 -mno-unaligned-access | FileCheck %s --check-prefix=CHECK-BE-SOFT-FPV4-EXN-RTTI
101+
# RUN: %clang -print-multi-directory --target=armv7em-none-eabi -mbig-endian -mfpu=fpv4-sp-d16 | FileCheck %s --check-prefix=CHECK-BE-SOFT-FPV4-EXN-RTTI
102+
# RUN: %clang -print-multi-directory --target=armv7em-none-eabi -mbig-endian -mfpu=fpv4-sp-d16 -mno-unaligned-access | FileCheck %s --check-prefix=CHECK-BE-SOFT-FPV4-EXN-RTTI
103+
# CHECK-BE-SOFT-FPV4-EXN-RTTI: arm-none-eabi/armebv7m_soft_fpv4_sp_d16_exn_rtti{{$}}
104+
# CHECK-BE-SOFT-FPV4-EXN-RTTI-EMPTY:
105+
92106
# %clang -print-multi-directory --target=arm-none-eabi -mcpu=cortex-m3 | FileCheck %s --check-prefix=NONE
93107
# %clang -print-multi-directory --target=arm-none-eabi -mcpu=cortex-m4 | FileCheck %s --check-prefix=SOFT-FPV4
94108
# %clang -print-multi-directory --target=arm-none-eabihf -mcpu=cortex-m4 | FileCheck %s --check-prefix=FPV4

0 commit comments

Comments
 (0)