Skip to content

Cherry-pick: Integrating Changes from PR #99, #102 and #115 #133

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 28, 2025
Merged

Cherry-pick: Integrating Changes from PR #99, #102 and #115 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20b4a0f
Add logic to multilib.yaml to handle cases of armebv7a_soft_nofp and …
vhscampos Feb 17, 2025
1a10cdb
Add AArch64 R-profile soft nofp variants (LE and BE) (#102)
vhscampos Feb 19, 2025
57e7073
Remove -mno-unaligned-access flag from AArch32 big endian variants. (…
simpal01 Feb 26, 2025
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
42 changes: 36 additions & 6 deletions arm-software/embedded/arm-multilib/json/multilib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,36 @@
"json": "aarch64r.json",
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -fno-exceptions -fno-rtti -mno-unaligned-access"
},
{
"variant": "aarch64r_soft_nofp_exn_rtti_unaligned",
"json": "aarch64r_soft_nofp_exn_rtti_unaligned.json",
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft"
},
{
"variant": "aarch64r_soft_nofp_unaligned",
"json": "aarch64r_soft_nofp_unaligned.json",
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -fno-exceptions -fno-rtti -mabi=aapcs-soft"
},
{
"variant": "aarch64r_soft_nofp_exn_rtti",
"json": "aarch64r_soft_nofp_exn_rtti.json",
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft -mno-unaligned-access"
},
{
"variant": "aarch64r_soft_nofp",
"json": "aarch64r_soft_nofp.json",
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -fno-exceptions -fno-rtti -mabi=aapcs-soft -mno-unaligned-access"
},
{
"variant": "aarch64r_be_soft_nofp_exn_rtti",
"json": "aarch64r_be_soft_nofp_exn_rtti.json",
"flags": "--target=aarch64_be-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft"
},
{
"variant": "aarch64r_be_soft_nofp",
"json": "aarch64r_be_soft_nofp.json",
"flags": "--target=aarch64_be-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -fno-exceptions -fno-rtti -mabi=aapcs-soft"
},
{
"variant": "armv4t_exn_rtti",
"json": "armv4t_exn_rtti.json",
Expand Down Expand Up @@ -157,12 +187,12 @@
{
"variant": "armebv7a_soft_nofp_exn_rtti",
"json": "armebv7a_soft_nofp_exn_rtti.json",
"flags": "--target=armebv7-unknown-none-eabi -mfpu=none -mno-unaligned-access"
"flags": "--target=armebv7-unknown-none-eabi -mfpu=none"
},
{
"variant": "armebv7a_soft_nofp",
"json": "armebv7a_soft_nofp.json",
"flags": "--target=armebv7-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti -mno-unaligned-access"
"flags": "--target=armebv7-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti"
},
{
"variant": "armv7a_hard_vfpv3_d16_exn_rtti_unaligned",
Expand All @@ -187,12 +217,12 @@
{
"variant": "armebv7a_hard_vfpv3_d16_exn_rtti",
"json": "armebv7a_hard_vfpv3_d16_exn_rtti.json",
"flags": "--target=armebv7-unknown-none-eabihf -mfpu=vfpv3-d16 -mno-unaligned-access"
"flags": "--target=armebv7-unknown-none-eabihf -mfpu=vfpv3-d16"
},
{
"variant": "armebv7a_hard_vfpv3_d16",
"json": "armebv7a_hard_vfpv3_d16.json",
"flags": "--target=armebv7-unknown-none-eabihf -mfpu=vfpv3-d16 -fno-exceptions -fno-rtti -mno-unaligned-access"
"flags": "--target=armebv7-unknown-none-eabihf -mfpu=vfpv3-d16 -fno-exceptions -fno-rtti"
},
{
"variant": "armv7a_soft_vfpv3_d16_exn_rtti_unaligned",
Expand All @@ -217,12 +247,12 @@
{
"variant": "armebv7a_soft_vfpv3_d16_exn_rtti",
"json": "armebv7a_soft_vfpv3_d16_exn_rtti.json",
"flags": "--target=armebv7-unknown-none-eabi -mfpu=vfpv3-d16 -mno-unaligned-access"
"flags": "--target=armebv7-unknown-none-eabi -mfpu=vfpv3-d16"
},
{
"variant": "armebv7a_soft_vfpv3_d16",
"json": "armebv7a_soft_vfpv3_d16.json",
"flags": "--target=armebv7-unknown-none-eabi -mfpu=vfpv3-d16 -fno-exceptions -fno-rtti -mno-unaligned-access"
"flags": "--target=armebv7-unknown-none-eabi -mfpu=vfpv3-d16 -fno-exceptions -fno-rtti"
},
{
"variant": "armv7r_soft_nofp_exn_rtti_unaligned",
Expand Down
40 changes: 40 additions & 0 deletions arm-software/embedded/arm-multilib/json/variants/aarch64r_be_soft_nofp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"args": {
"common": {
"TARGET_ARCH": "aarch64r",
"VARIANT": "aarch64r_be_soft_nofp",
"COMPILE_FLAGS": "-march=armv8-r+nofp+nosimd -mbig-endian -mabi=aapcs-soft -mno-unaligned-access",
"ENABLE_EXCEPTIONS": "OFF",
"ENABLE_RTTI": "OFF",
"TEST_EXECUTOR": "fvp",
"FVP_MODEL": "aem-r",
"FVP_CONFIG": "v8r-aarch64 big-endian",
"BOOT_FLASH_ADDRESS": "0x0",
"BOOT_FLASH_SIZE": "0x1000",
"FLASH_ADDRESS": "0x1000",
"FLASH_SIZE": "0xfff000",
"RAM_ADDRESS": "0x1000000",
"RAM_SIZE": "0x1000000",
"STACK_SIZE": "8K"
},
"picolibc": {
"PICOLIBC_BUILD_TYPE": "release",
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
},
"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"
}
}
}
40 changes: 40 additions & 0 deletions arm-software/embedded/arm-multilib/json/variants/aarch64r_be_soft_nofp_exn_rtti.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"args": {
"common": {
"TARGET_ARCH": "aarch64r",
"VARIANT": "aarch64r_be_soft_nofp_exn_rtti",
"COMPILE_FLAGS": "-march=armv8-r+nofp+nosimd -mbig-endian -mabi=aapcs-soft -mno-unaligned-access",
"ENABLE_EXCEPTIONS": "ON",
"ENABLE_RTTI": "ON",
"TEST_EXECUTOR": "fvp",
"FVP_MODEL": "aem-r",
"FVP_CONFIG": "v8r-aarch64 big-endian",
"BOOT_FLASH_ADDRESS": "0x0",
"BOOT_FLASH_SIZE": "0x1000",
"FLASH_ADDRESS": "0x1000",
"FLASH_SIZE": "0xfff000",
"RAM_ADDRESS": "0x1000000",
"RAM_SIZE": "0x1000000",
"STACK_SIZE": "8K"
},
"picolibc": {
"PICOLIBC_BUILD_TYPE": "release",
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
},
"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"
}
}
}
40 changes: 40 additions & 0 deletions arm-software/embedded/arm-multilib/json/variants/aarch64r_soft_nofp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"args": {
"common": {
"TARGET_ARCH": "aarch64r",
"VARIANT": "aarch64r_soft_nofp",
"COMPILE_FLAGS": "-march=armv8-r+nofp+nosimd -mabi=aapcs-soft -mno-unaligned-access",
"ENABLE_EXCEPTIONS": "OFF",
"ENABLE_RTTI": "OFF",
"TEST_EXECUTOR": "fvp",
"FVP_MODEL": "aem-r",
"FVP_CONFIG": "v8r-aarch64",
"BOOT_FLASH_ADDRESS": "0x0",
"BOOT_FLASH_SIZE": "0x1000",
"FLASH_ADDRESS": "0x1000",
"FLASH_SIZE": "0xfff000",
"RAM_ADDRESS": "0x1000000",
"RAM_SIZE": "0x1000000",
"STACK_SIZE": "8K"
},
"picolibc": {
"PICOLIBC_BUILD_TYPE": "release",
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
},
"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"
}
}
}
40 changes: 40 additions & 0 deletions arm-software/embedded/arm-multilib/json/variants/aarch64r_soft_nofp_exn_rtti.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"args": {
"common": {
"TARGET_ARCH": "aarch64r",
"VARIANT": "aarch64r_soft_nofp_exn_rtti",
"COMPILE_FLAGS": "-march=armv8-r+nofp+nosimd -mabi=aapcs-soft -mno-unaligned-access",
"ENABLE_EXCEPTIONS": "ON",
"ENABLE_RTTI": "ON",
"TEST_EXECUTOR": "fvp",
"FVP_MODEL": "aem-r",
"FVP_CONFIG": "v8r-aarch64",
"BOOT_FLASH_ADDRESS": "0x0",
"BOOT_FLASH_SIZE": "0x1000",
"FLASH_ADDRESS": "0x1000",
"FLASH_SIZE": "0xfff000",
"RAM_ADDRESS": "0x1000000",
"RAM_SIZE": "0x1000000",
"STACK_SIZE": "8K"
},
"picolibc": {
"PICOLIBC_BUILD_TYPE": "release",
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
},
"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"
}
}
}
40 changes: 40 additions & 0 deletions arm-software/embedded/arm-multilib/json/variants/aarch64r_soft_nofp_exn_rtti_unaligned.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"args": {
"common": {
"TARGET_ARCH": "aarch64r",
"VARIANT": "aarch64r_soft_nofp_exn_rtti_unaligned",
"COMPILE_FLAGS": "-march=armv8-r+nofp+nosimd -mabi=aapcs-soft",
"ENABLE_EXCEPTIONS": "ON",
"ENABLE_RTTI": "ON",
"TEST_EXECUTOR": "fvp",
"FVP_MODEL": "aem-r",
"FVP_CONFIG": "v8r-aarch64",
"BOOT_FLASH_ADDRESS": "0x0",
"BOOT_FLASH_SIZE": "0x1000",
"FLASH_ADDRESS": "0x1000",
"FLASH_SIZE": "0xfff000",
"RAM_ADDRESS": "0x1000000",
"RAM_SIZE": "0x1000000",
"STACK_SIZE": "8K"
},
"picolibc": {
"PICOLIBC_BUILD_TYPE": "release",
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
},
"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"
}
}
}
40 changes: 40 additions & 0 deletions arm-software/embedded/arm-multilib/json/variants/aarch64r_soft_nofp_unaligned.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"args": {
"common": {
"TARGET_ARCH": "aarch64r",
"VARIANT": "aarch64r_soft_nofp_unaligned",
"COMPILE_FLAGS": "-march=armv8-r+nofp+nosimd -mabi=aapcs-soft",
"ENABLE_EXCEPTIONS": "OFF",
"ENABLE_RTTI": "OFF",
"TEST_EXECUTOR": "fvp",
"FVP_MODEL": "aem-r",
"FVP_CONFIG": "v8r-aarch64",
"BOOT_FLASH_ADDRESS": "0x0",
"BOOT_FLASH_SIZE": "0x1000",
"FLASH_ADDRESS": "0x1000",
"FLASH_SIZE": "0xfff000",
"RAM_ADDRESS": "0x1000000",
"RAM_SIZE": "0x1000000",
"STACK_SIZE": "8K"
},
"picolibc": {
"PICOLIBC_BUILD_TYPE": "release",
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
},
"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"
}
}
}
6 changes: 6 additions & 0 deletions arm-software/embedded/arm-multilib/multilib.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ Mappings:
- Match: --target=thumbv7-unknown-none-eabihf
Flags:
- --target=armv7-unknown-none-eabihf
- Match: --target=thumbebv7-unknown-none-eabihf
Flags:
- --target=armebv7-unknown-none-eabihf
- Match: --target=thumbv4t-unknown-none-eabi
Flags:
- --target=armv4t-unknown-none-eabi
Expand All @@ -146,6 +149,9 @@ Mappings:
- Match: --target=(arm|thumb)v7ve-unknown-none-eabihf
Flags:
- --target=armv7-unknown-none-eabihf
- Match: --target=(arm|thumb)ebv7ve-unknown-none-eabihf
Flags:
- --target=armebv7-unknown-none-eabihf

# Higher versions of the architecture such as v8-A and v9-A are a superset of
# v7-A.
Expand Down
Loading