diff mbox series

[2/2] toolchain: enable musl for riscv

Message ID 20190730102331.25609-2-joerg.krause@embedded.rocks
State Accepted
Commit 6105fb4e41a90728ff20f33ebc04ff6df02bd65d
Headers show
Series [1/2] package/musl: bump to version 1.1.23 | expand

Commit Message

Jörg Krause July 30, 2019, 10:23 a.m. UTC
Since version 1.1.23 musl supports the RISC-V architecture.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
---
 toolchain/toolchain-buildroot/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Corbin July 30, 2019, 2:28 p.m. UTC | #1
On 30/07/2019 11:23, Jörg Krause wrote:
> Since version 1.1.23 musl supports the RISC-V architecture.
>
> Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
> ---
>  toolchain/toolchain-buildroot/Config.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
> index d9f16e2a3a..b4168bd40c 100644
> --- a/toolchain/toolchain-buildroot/Config.in
> +++ b/toolchain/toolchain-buildroot/Config.in
> @@ -84,7 +84,7 @@ config BR2_TOOLCHAIN_BUILDROOT_MUSL
>  	depends on BR2_aarch64	   || BR2_arm   || BR2_armeb   || BR2_i386 || \
>  		   BR2_microblaze  || BR2_mips  || BR2_mipsel  || BR2_mips64 || \
>  		   BR2_mips64el    || BR2_or1k  || BR2_powerpc || BR2_powerpc64 || \
> -		   BR2_powerpc64le || BR2_sh    || BR2_x86_64
> +		   BR2_powerpc64le || BR2_riscv || BR2_sh      || BR2_x86_64
>  	depends on !BR2_powerpc_SPE # not supported, build breaks
>  	# sh2 nommu is supported by musl, but we don't have support
>  	# for it in Buildroot.

Successfully builds 'qemu_riscv64_virt_defconfig' and boots under qemu
3.1.0 to a working system.

Tested-by: Mark Corbin <mark.corbin@embecosm.com>
Thomas Petazzoni July 30, 2019, 3:46 p.m. UTC | #2
Hello,

On Tue, 30 Jul 2019 12:23:31 +0200
Jörg Krause <joerg.krause@embedded.rocks> wrote:

> Since version 1.1.23 musl supports the RISC-V architecture.
> 
> Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
> ---
>  toolchain/toolchain-buildroot/Config.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
> index d9f16e2a3a..b4168bd40c 100644
> --- a/toolchain/toolchain-buildroot/Config.in
> +++ b/toolchain/toolchain-buildroot/Config.in
> @@ -84,7 +84,7 @@ config BR2_TOOLCHAIN_BUILDROOT_MUSL
>  	depends on BR2_aarch64	   || BR2_arm   || BR2_armeb   || BR2_i386 || \
>  		   BR2_microblaze  || BR2_mips  || BR2_mipsel  || BR2_mips64 || \
>  		   BR2_mips64el    || BR2_or1k  || BR2_powerpc || BR2_powerpc64 || \
> -		   BR2_powerpc64le || BR2_sh    || BR2_x86_64
> +		   BR2_powerpc64le || BR2_riscv || BR2_sh      || BR2_x86_64

My understanding is that musl 1.1.23 only supports RISC-V 64 bits, not
RISC-V 32 bits, so that should probably be "BR2_RISCV_64" instead of
just "BR2_riscv".

Best regards,

Thomas
Peter Korsgaard July 30, 2019, 3:54 p.m. UTC | #3
>>>>> "Jörg" == Jörg Krause <joerg.krause@embedded.rocks> writes:

 > Since version 1.1.23 musl supports the RISC-V architecture.
 > Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>

Committed, thanks.
Peter Korsgaard July 30, 2019, 4:25 p.m. UTC | #4
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > Hello,
 > On Tue, 30 Jul 2019 12:23:31 +0200
 > Jörg Krause <joerg.krause@embedded.rocks> wrote:

 >> Since version 1.1.23 musl supports the RISC-V architecture.
 >> 
 >> Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
 >> ---
 >> toolchain/toolchain-buildroot/Config.in | 2 +-
 >> 1 file changed, 1 insertion(+), 1 deletion(-)
 >> 
 >> diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
 >> index d9f16e2a3a..b4168bd40c 100644
 >> --- a/toolchain/toolchain-buildroot/Config.in
 >> +++ b/toolchain/toolchain-buildroot/Config.in
 >> @@ -84,7 +84,7 @@ config BR2_TOOLCHAIN_BUILDROOT_MUSL
 >> depends on BR2_aarch64	   || BR2_arm   || BR2_armeb   || BR2_i386 || \
 >> BR2_microblaze  || BR2_mips  || BR2_mipsel  || BR2_mips64 || \
 >> BR2_mips64el    || BR2_or1k  || BR2_powerpc || BR2_powerpc64 || \
 >> -		   BR2_powerpc64le || BR2_sh    || BR2_x86_64
 >> +		   BR2_powerpc64le || BR2_riscv || BR2_sh      || BR2_x86_64

 > My understanding is that musl 1.1.23 only supports RISC-V 64 bits, not
 > RISC-V 32 bits, so that should probably be "BR2_RISCV_64" instead of
 > just "BR2_riscv".

Ups, indeed - I'll fix that up.
diff mbox series

Patch

diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index d9f16e2a3a..b4168bd40c 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -84,7 +84,7 @@  config BR2_TOOLCHAIN_BUILDROOT_MUSL
 	depends on BR2_aarch64	   || BR2_arm   || BR2_armeb   || BR2_i386 || \
 		   BR2_microblaze  || BR2_mips  || BR2_mipsel  || BR2_mips64 || \
 		   BR2_mips64el    || BR2_or1k  || BR2_powerpc || BR2_powerpc64 || \
-		   BR2_powerpc64le || BR2_sh    || BR2_x86_64
+		   BR2_powerpc64le || BR2_riscv || BR2_sh      || BR2_x86_64
 	depends on !BR2_powerpc_SPE # not supported, build breaks
 	# sh2 nommu is supported by musl, but we don't have support
 	# for it in Buildroot.