Skip to content

Commit e916285

Browse files
authored
[ATfE] Re-disable aarch64 nofp variants for newlib (#329)
#314 should have only enabled aarch64 nofp variants for LLVM-libc builds. However it also enabled the variants for newlib builds, which were disabled since newlib is similarly unable to build those variants (see #60 (comment)). While there is now a fix for the LLVM-libc build, there is yet no fix for newlib so they need to remain disabled for that selection. This patch sets the variants to only build for picolibc and llvmlibc, but not newlib.
1 parent 69d9b06 commit e916285

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,25 @@
3434
"variant": "aarch64a_soft_nofp_exn_rtti",
3535
"json": "aarch64a_soft_nofp_exn_rtti.json",
3636
"flags": "--target=aarch64-unknown-none-elf -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft",
37+
"libraries_supported": "picolibc,llvmlibc"
3738
},
3839
{
3940
"variant": "aarch64a_soft_nofp",
4041
"json": "aarch64a_soft_nofp.json",
4142
"flags": "--target=aarch64-unknown-none-elf -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft -fno-exceptions -fno-rtti",
43+
"libraries_supported": "picolibc,llvmlibc"
4244
},
4345
{
4446
"variant": "aarch64a_be_soft_nofp_exn_rtti",
4547
"json": "aarch64a_be_soft_nofp_exn_rtti.json",
4648
"flags": "--target=aarch64_be-unknown-none-elf -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft",
49+
"libraries_supported": "picolibc,llvmlibc"
4750
},
4851
{
4952
"variant": "aarch64a_be_soft_nofp",
5053
"json": "aarch64a_be_soft_nofp.json",
5154
"flags": "--target=aarch64_be-unknown-none-elf -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft -fno-exceptions -fno-rtti",
55+
"libraries_supported": "picolibc,llvmlibc"
5256
},
5357
{
5458
"variant": "aarch64r_exn_rtti_unaligned",
@@ -84,31 +88,37 @@
8488
"variant": "aarch64r_soft_nofp_exn_rtti_unaligned",
8589
"json": "aarch64r_soft_nofp_exn_rtti_unaligned.json",
8690
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft -munaligned-access",
91+
"libraries_supported": "picolibc,llvmlibc"
8792
},
8893
{
8994
"variant": "aarch64r_soft_nofp_unaligned",
9095
"json": "aarch64r_soft_nofp_unaligned.json",
9196
"flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -fno-exceptions -fno-rtti -mabi=aapcs-soft -munaligned-access",
97+
"libraries_supported": "picolibc,llvmlibc"
9298
},
9399
{
94100
"variant": "aarch64r_soft_nofp_exn_rtti",
95101
"json": "aarch64r_soft_nofp_exn_rtti.json",
96102
"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,llvmlibc"
97104
},
98105
{
99106
"variant": "aarch64r_soft_nofp",
100107
"json": "aarch64r_soft_nofp.json",
101108
"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,llvmlibc"
102110
},
103111
{
104112
"variant": "aarch64r_be_soft_nofp_exn_rtti",
105113
"json": "aarch64r_be_soft_nofp_exn_rtti.json",
106114
"flags": "--target=aarch64_be-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft",
115+
"libraries_supported": "picolibc,llvmlibc"
107116
},
108117
{
109118
"variant": "aarch64r_be_soft_nofp",
110119
"json": "aarch64r_be_soft_nofp.json",
111120
"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,llvmlibc"
112122
},
113123
{
114124
"variant": "armv4t_exn_rtti",

0 commit comments

Comments
 (0)