Message ID | 20210802135203.3059317-1-fhunleth@troodon-software.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/1] package/erlang: risc-v should only add risc-v | expand |
On 02/08/2021 15:52, Frank Hunleth wrote: > This restricts the Erlang RISC-V update from > 0bab8c1089983a4b5f0f2acfe5cad77b02d6f654 to only enabling RISCV_64 > rather than enabling builds on all platforms with toolchains that > include atomics. > > This fixes build errors on SPARCv8 and other platforms that look like > this: > > /tmp/ccD9Q9F7.s: Assembler messages: > /tmp/ccD9Q9F7.s:230: Error: Architecture mismatch on "cas [%g3],%g2,%g1". > /tmp/ccD9Q9F7.s:230: (Requires v9|v9a|v9b|v9c|v9d|v9e|v9v|v9m|m8; requested architecture is v8.) > > Fixes: > http://autobuild.buildroot.net/results/a57/a5779e22c41eb63b8400409f26f96b924fdde1bc/ > > Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com> Applied to master, thanks. Regards, Arnout > --- > package/erlang/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/erlang/Config.in b/package/erlang/Config.in > index b6b100f38b..15931b5896 100644 > --- a/package/erlang/Config.in > +++ b/package/erlang/Config.in > @@ -10,7 +10,7 @@ config BR2_PACKAGE_ERLANG_ARCH_SUPPORTS > # __atomic_* builtins > default y if BR2_i386 || BR2_x86_64 || BR2_powerpc || \ > BR2_sparc_v9 || BR2_arm || BR2_aarch64 || BR2_mipsel || \ > - BR2_TOOLCHAIN_HAS_ATOMIC > + BR2_RISCV_64 > # erlang needs host-erlang > depends on BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS > >
diff --git a/package/erlang/Config.in b/package/erlang/Config.in index b6b100f38b..15931b5896 100644 --- a/package/erlang/Config.in +++ b/package/erlang/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_ERLANG_ARCH_SUPPORTS # __atomic_* builtins default y if BR2_i386 || BR2_x86_64 || BR2_powerpc || \ BR2_sparc_v9 || BR2_arm || BR2_aarch64 || BR2_mipsel || \ - BR2_TOOLCHAIN_HAS_ATOMIC + BR2_RISCV_64 # erlang needs host-erlang depends on BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS
This restricts the Erlang RISC-V update from 0bab8c1089983a4b5f0f2acfe5cad77b02d6f654 to only enabling RISCV_64 rather than enabling builds on all platforms with toolchains that include atomics. This fixes build errors on SPARCv8 and other platforms that look like this: /tmp/ccD9Q9F7.s: Assembler messages: /tmp/ccD9Q9F7.s:230: Error: Architecture mismatch on "cas [%g3],%g2,%g1". /tmp/ccD9Q9F7.s:230: (Requires v9|v9a|v9b|v9c|v9d|v9e|v9v|v9m|m8; requested architecture is v8.) Fixes: http://autobuild.buildroot.net/results/a57/a5779e22c41eb63b8400409f26f96b924fdde1bc/ Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com> --- package/erlang/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)