Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add armebv7m_soft_fpv4_sp_d16 variants #50

Open
wants to merge 1 commit into
base: arm-software
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions arm-software/embedded/arm-multilib/json/multilib.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,16 @@
"json": "armv7m_soft_fpv4_sp_d16.json",
"flags": "--target=thumbv7m-unknown-none-eabi -mfpu=fpv4-sp-d16 -fno-exceptions -fno-rtti -mno-unaligned-access"
},
{
"variant": "armebv7m_soft_fpv4_sp_d16_exn_rtti",
"json": "armebv7m_soft_fpv4_sp_d16_exn_rtti.json",
"flags": "--target=thumbebv7m-unknown-none-eabi -mfpu=fpv4-sp-d16"
},
{
"variant": "armebv7m_soft_fpv4_sp_d16",
"json": "armebv7m_soft_fpv4_sp_d16.json",
"flags": "--target=thumbebv7m-unknown-none-eabi -mfpu=fpv4-sp-d16 -fno-exceptions -fno-rtti"
},
{
"variant": "armv7m_hard_fpv4_sp_d16_exn_rtti_unaligned",
"json": "armv7m_hard_fpv4_sp_d16_exn_rtti_unaligned.json",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"args": {
"common": {
"TARGET_ARCH": "armv7m",
"VARIANT": "armebv7m_soft_fpv4_sp_d16",
"COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7m -mbig-endian -mfpu=fpv4-sp-d16 -mno-unaligned-access",
"ENABLE_EXCEPTIONS": "OFF",
"ENABLE_RTTI": "OFF",
"TEST_EXECUTOR": "fvp",
"FVP_MODEL": "corstone-310",
"FVP_CONFIG": "cortex-m85 m-big-endian m-fp mve-none",
"BOOT_FLASH_ADDRESS": "0x01000000",
"BOOT_FLASH_SIZE": "2M",
"FLASH_ADDRESS": "0x60000000",
"FLASH_SIZE": "0x1000000",
"RAM_ADDRESS": "0x61000000",
"RAM_SIZE": "0x1000000",
"STACK_SIZE": "4K"
},
"picolibc": {
"PICOLIBC_BUILD_TYPE": "minsize",
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "ON",
"ENABLE_LIBCXX_TESTS": "ON"
},
"newlib": {
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "OFF",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
},
"llvmlibc": {
"ENABLE_CXX_LIBS": "OFF",
"ENABLE_LIBC_TESTS": "OFF",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"args": {
"common": {
"TARGET_ARCH": "armv7m",
"VARIANT": "armebv7m_soft_fpv4_sp_d16_exn_rtti",
"COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7m -mbig-endian -mfpu=fpv4-sp-d16 -mno-unaligned-access",
"ENABLE_EXCEPTIONS": "ON",
"ENABLE_RTTI": "ON",
"TEST_EXECUTOR": "fvp",
"FVP_MODEL": "corstone-310",
"FVP_CONFIG": "cortex-m85 m-big-endian m-fp mve-none",
"BOOT_FLASH_ADDRESS": "0x01000000",
"BOOT_FLASH_SIZE": "2M",
"FLASH_ADDRESS": "0x60000000",
"FLASH_SIZE": "0x1000000",
"RAM_ADDRESS": "0x61000000",
"RAM_SIZE": "0x1000000",
"STACK_SIZE": "4K"
},
"picolibc": {
"PICOLIBC_BUILD_TYPE": "minsize",
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "ON",
"ENABLE_LIBCXX_TESTS": "ON"
},
"newlib": {
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "OFF",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
},
"llvmlibc": {
"ENABLE_CXX_LIBS": "OFF",
"ENABLE_LIBC_TESTS": "OFF",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
}
}
}

3 changes: 3 additions & 0 deletions arm-software/embedded/arm-multilib/multilib.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ Mappings:
- Match: --target=thumbv7em-unknown-none-eabihf
Flags:
- --target=thumbv7m-unknown-none-eabihf
- Match: --target=thumbebv7em-unknown-none-eabi
Flags:
- --target=thumbebv7m-unknown-none-eabi
- Match: --target=thumbebv7em-unknown-none-eabihf
Flags:
- --target=thumbebv7m-unknown-none-eabihf
Expand Down
14 changes: 14 additions & 0 deletions arm-software/embedded/test/multilib/armv7m.test
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,20 @@
# CHECK-BE-FPV4-EXN-RTTI: arm-none-eabi/armebv7m_hard_fpv4_sp_d16_exn_rtti{{$}}
# CHECK-BE-FPV4-EXN-RTTI-EMPTY:

# 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
# 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
# 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
# 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
# CHECK-BE-SOFT-FPV4: arm-none-eabi/armebv7m_soft_fpv4_sp_d16{{$}}
# CHECK-BE-SOFT-FPV4-EMPTY:

# 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
# 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
# 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
# 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
# CHECK-BE-SOFT-FPV4-EXN-RTTI: arm-none-eabi/armebv7m_soft_fpv4_sp_d16_exn_rtti{{$}}
# CHECK-BE-SOFT-FPV4-EXN-RTTI-EMPTY:

# %clang -print-multi-directory --target=arm-none-eabi -mcpu=cortex-m3 | FileCheck %s --check-prefix=NONE
# %clang -print-multi-directory --target=arm-none-eabi -mcpu=cortex-m4 | FileCheck %s --check-prefix=SOFT-FPV4
# %clang -print-multi-directory --target=arm-none-eabihf -mcpu=cortex-m4 | FileCheck %s --check-prefix=FPV4
Expand Down