Skip to content

Do not build AArch64a soft no_fp variants using llvm-libc #592

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 1 commit into from
Dec 9, 2024
Merged

Do not build AArch64a soft no_fp variants using llvm-libc #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions arm-multilib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,15 @@ foreach(lib_idx RANGE ${lib_count_dec})
string(JSON variant GET ${lib_def} "variant")
set(additional_cmake_args "")

# If a variant doesn't support all possible C library
# options, check if it should be skipped.
string(JSON variant_support ERROR_VARIABLE json_error GET ${lib_def} "libraries_supported")
if(NOT variant_support STREQUAL "libraries_supported-NOTFOUND")
if(NOT C_LIBRARY IN_LIST variant_support)
continue()
endif()
endif()

if(variant IN_LIST ENABLE_VARIANTS OR ENABLE_VARIANTS STREQUAL "all")
string(JSON variant_multilib_flags GET ${lib_def} "flags")
# Placeholder libraries won't have a json, so store the error in
Expand Down
12 changes: 8 additions & 4 deletions arm-multilib/json/multilib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,26 @@
{
"variant": "aarch64a_soft_nofp",
"json": "aarch64a_soft_nofp.json",
"flags": "--target=aarch64-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft -fno-exceptions -fno-rtti"
"flags": "--target=aarch64-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft -fno-exceptions -fno-rtti",
"libraries_supported": "picolibc,newlib"
},
{
"variant": "aarch64a_be_soft_nofp",
"json": "aarch64a_be_soft_nofp.json",
"flags": "--target=aarch64_be-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft -fno-exceptions -fno-rtti"
"flags": "--target=aarch64_be-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft -fno-exceptions -fno-rtti",
"libraries_supported": "picolibc,newlib"
},
{
"variant": "aarch64a_soft_nofp_exn_rtti",
"json": "aarch64a_soft_nofp_exn_rtti.json",
"flags": "--target=aarch64-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft"
"flags": "--target=aarch64-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft",
"libraries_supported": "picolibc,newlib"
},
{
"variant": "aarch64a_be_soft_nofp_exn_rtti",
"json": "aarch64a_be_soft_nofp_exn_rtti.json",
"flags": "--target=aarch64_be-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft"
"flags": "--target=aarch64_be-unknown-none-elf -march=armv8-a+nofp+nosimd -mabi=aapcs-soft",
"libraries_supported": "picolibc,newlib"
},

{
Expand Down
Loading