Skip to content

Commit 6ccc4b6

Browse files
authored
Add armebv6m_soft_nofp variants (#626)
1 parent 447a633 commit 6ccc4b6

File tree

5 files changed

+102
-0
lines changed

5 files changed

+102
-0
lines changed

arm-multilib/json/multilib.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,16 @@
9494
"json": "armv6m_soft_nofp.json",
9595
"flags": "--target=thumbv6m-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti -mno-unaligned-access"
9696
},
97+
{
98+
"variant": "armebv6m_soft_nofp_exn_rtti",
99+
"json": "armebv6m_soft_nofp_exn_rtti.json",
100+
"flags": "--target=thumbebv6m-unknown-none-eabi -mfpu=none"
101+
},
102+
{
103+
"variant": "armebv6m_soft_nofp",
104+
"json": "armebv6m_soft_nofp.json",
105+
"flags": "--target=thumbebv6m-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti"
106+
},
97107
{
98108
"variant": "armv7a_soft_nofp_exn_rtti_unaligned",
99109
"json": "armv7a_soft_nofp_exn_rtti_unaligned.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": "armv6m",
5+
"VARIANT": "armebv6m_soft_nofp",
6+
"COMPILE_FLAGS": "-mfloat-abi=soft -march=armv6m -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": "ON"
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+
}
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": "armv6m",
5+
"VARIANT": "armebv6m_soft_nofp_exn_rtti",
6+
"COMPILE_FLAGS": "-mfloat-abi=soft -march=armv6m -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": "ON"
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+
}

fvp/config/m-big-endian.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-FileCopyrightText: Copyright 2024 Arm Limited and/or its affiliates <[email protected]>
2+
cpu0.CFGBIGEND=1

test/multilib/armv6m.test

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,13 @@
1313
# RUN: %clang -print-multi-directory --target=armv6m-none-eabi -mfpu=none -fno-exceptions -fno-rtti -mno-unaligned-access | FileCheck %s --check-prefix=CHECK-NOFP
1414
# CHECK-NOFP: arm-none-eabi/armv6m_soft_nofp{{$}}
1515
# CHECK-NOFP-EMPTY:
16+
17+
# RUN: %clang -print-multi-directory --target=armv6m-none-eabi -mbig-endian -mfpu=none -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=CHECK-BE-NOFP
18+
# RUN: %clang -print-multi-directory --target=armv6m-none-eabi -mbig-endian -mfpu=none -fno-exceptions -fno-rtti -mno-unaligned-access | FileCheck %s --check-prefix=CHECK-BE-NOFP
19+
# CHECK-BE-NOFP: arm-none-eabi/armebv6m_soft_nofp{{$}}
20+
# CHECK-BE-NOFP-EMPTY:
21+
22+
# RUN: %clang -print-multi-directory --target=armv6m-none-eabi -mbig-endian -mfpu=none | FileCheck %s --check-prefix=CHECK-BE-NOFP-EXN-RTTI
23+
# RUN: %clang -print-multi-directory --target=armv6m-none-eabi -mbig-endian -mfpu=none -mno-unaligned-access | FileCheck %s --check-prefix=CHECK-BE-NOFP-EXN-RTTI
24+
# CHECK-BE-NOFP-EXN-RTTI: arm-none-eabi/armebv6m_soft_nofp_exn_rtti{{$}}
25+
# CHECK-BE-NOFP-EXN-RTTI-EMPTY:

0 commit comments

Comments
 (0)