Skip to content

Commit 3988969

Browse files
vhscamposvhscampos
authored
Add armebv7m_soft_nofp variants (#51)
1 parent deb3fcb commit 3988969

File tree

4 files changed

+104
-0
lines changed

4 files changed

+104
-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
@@ -354,6 +354,16 @@
354354
"json": "armv7m_soft_nofp.json",
355355
"flags": "--target=thumbv7m-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti -mno-unaligned-access"
356356
},
357+
{
358+
"variant": "armebv7m_soft_nofp_exn_rtti",
359+
"json": "armebv7m_soft_nofp_exn_rtti.json",
360+
"flags": "--target=thumbebv7m-unknown-none-eabi -mfpu=none"
361+
},
362+
{
363+
"variant": "armebv7m_soft_nofp",
364+
"json": "armebv7m_soft_nofp.json",
365+
"flags": "--target=thumbebv7m-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti"
366+
},
357367
{
358368
"variant": "armv8m.main_soft_nofp_exn_rtti",
359369
"json": "armv8m.main_soft_nofp_exn_rtti.json",

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"args": {
3+
"common": {
4+
"TARGET_ARCH": "armv7m",
5+
"VARIANT": "armebv7m_soft_nofp",
6+
"COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7m -mbig-endian -mfpu=none -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-nofp 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+
}

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"args": {
3+
"common": {
4+
"TARGET_ARCH": "armv7m",
5+
"VARIANT": "armebv7m_soft_nofp_exn_rtti",
6+
"COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7m -mbig-endian -mfpu=none -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-nofp 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+
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,20 @@
103103
# CHECK-BE-SOFT-FPV4-EXN-RTTI: arm-none-eabi/armebv7m_soft_fpv4_sp_d16_exn_rtti{{$}}
104104
# CHECK-BE-SOFT-FPV4-EXN-RTTI-EMPTY:
105105

106+
# RUN: %clang -print-multi-directory --target=armv7m-none-eabi -mbig-endian -mfpu=none -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=CHECK-BE-SOFT-NOFP
107+
# RUN: %clang -print-multi-directory --target=armv7m-none-eabi -mbig-endian -mfpu=none -fno-exceptions -fno-rtti -mno-unaligned-access | FileCheck %s --check-prefix=CHECK-BE-SOFT-NOFP
108+
# RUN: %clang -print-multi-directory --target=armv7em-none-eabi -mbig-endian -mfpu=none -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=CHECK-BE-SOFT-NOFP
109+
# RUN: %clang -print-multi-directory --target=armv7em-none-eabi -mbig-endian -mfpu=none -fno-exceptions -fno-rtti -mno-unaligned-access | FileCheck %s --check-prefix=CHECK-BE-SOFT-NOFP
110+
# CHECK-BE-SOFT-NOFP: arm-none-eabi/armebv7m_soft_nofp{{$}}
111+
# CHECK-BE-SOFT-NOFP-EMPTY:
112+
113+
# RUN: %clang -print-multi-directory --target=armv7m-none-eabi -mbig-endian -mfpu=none | FileCheck %s --check-prefix=CHECK-BE-SOFT-NOFP-EXN-RTTI
114+
# RUN: %clang -print-multi-directory --target=armv7m-none-eabi -mbig-endian -mfpu=none -mno-unaligned-access | FileCheck %s --check-prefix=CHECK-BE-SOFT-NOFP-EXN-RTTI
115+
# RUN: %clang -print-multi-directory --target=armv7em-none-eabi -mbig-endian -mfpu=none | FileCheck %s --check-prefix=CHECK-BE-SOFT-NOFP-EXN-RTTI
116+
# RUN: %clang -print-multi-directory --target=armv7em-none-eabi -mbig-endian -mfpu=none -mno-unaligned-access | FileCheck %s --check-prefix=CHECK-BE-SOFT-NOFP-EXN-RTTI
117+
# CHECK-BE-SOFT-NOFP-EXN-RTTI: arm-none-eabi/armebv7m_soft_nofp_exn_rtti{{$}}
118+
# CHECK-BE-SOFT-NOFP-EXN-RTTI-EMPTY:
119+
106120
# %clang -print-multi-directory --target=arm-none-eabi -mcpu=cortex-m3 | FileCheck %s --check-prefix=NONE
107121
# %clang -print-multi-directory --target=arm-none-eabi -mcpu=cortex-m4 | FileCheck %s --check-prefix=SOFT-FPV4
108122
# %clang -print-multi-directory --target=arm-none-eabihf -mcpu=cortex-m4 | FileCheck %s --check-prefix=FPV4

0 commit comments

Comments
 (0)