Skip to content

Commit d2609b3

Browse files
dcandlersimpal01
authored andcommitted
[ATfE] Do not build aarch64r soft_nofp variants with newlib/llvmlibc (#110)
The aarch64r soft_nofp variants will fail to build using newlib. The aarch64a soft_nofp variants are already disabled in newlib/llvmlibc builds due to missing support, so the aarch64r should be similarly limited to picolibc.
1 parent 39c7470 commit d2609b3

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

arm-software/embedded/arm-multilib/json/multilib.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,32 +87,38 @@
8787
{
8888
"variant": "aarch64r_soft_nofp_exn_rtti_unaligned",
8989
"json": "aarch64r_soft_nofp_exn_rtti_unaligned.json",
90-
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft"
90+
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft",
91+
"libraries_supported": "picolibc"
9192
},
9293
{
9394
"variant": "aarch64r_soft_nofp_unaligned",
9495
"json": "aarch64r_soft_nofp_unaligned.json",
95-
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -fno-exceptions -fno-rtti -mabi=aapcs-soft"
96+
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -fno-exceptions -fno-rtti -mabi=aapcs-soft",
97+
"libraries_supported": "picolibc"
9698
},
9799
{
98100
"variant": "aarch64r_soft_nofp_exn_rtti",
99101
"json": "aarch64r_soft_nofp_exn_rtti.json",
100-
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft -mno-unaligned-access"
102+
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft -mno-unaligned-access",
103+
"libraries_supported": "picolibc"
101104
},
102105
{
103106
"variant": "aarch64r_soft_nofp",
104107
"json": "aarch64r_soft_nofp.json",
105-
"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"
108+
"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",
109+
"libraries_supported": "picolibc"
106110
},
107111
{
108112
"variant": "aarch64r_be_soft_nofp_exn_rtti",
109113
"json": "aarch64r_be_soft_nofp_exn_rtti.json",
110-
"flags": "--target=aarch64_be-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft"
114+
"flags": "--target=aarch64_be-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft",
115+
"libraries_supported": "picolibc"
111116
},
112117
{
113118
"variant": "aarch64r_be_soft_nofp",
114119
"json": "aarch64r_be_soft_nofp.json",
115-
"flags": "--target=aarch64_be-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -fno-exceptions -fno-rtti -mabi=aapcs-soft"
120+
"flags": "--target=aarch64_be-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -fno-exceptions -fno-rtti -mabi=aapcs-soft",
121+
"libraries_supported": "picolibc"
116122
},
117123
{
118124
"variant": "armv4t_exn_rtti",

0 commit comments

Comments
 (0)