[Buildroot] [PATCH v2 1/3] toolchain/toolchain-buildroot: enable uclibc for riscv64

[Buildroot] [PATCH v2 1/3] toolchain/toolchain-buildroot: enable uclibc for riscv64

[Mark Corbin]

We can enable uclibc for RISC-V 64 bit now that it has been
bumped from v1.0.32 to v1.0.34.

Uclibc has had basic support for RISC-V 64 bit since v1.0.31, but
shared library and TLS/NPTL support has only been available since
v1.0.33.

This update has been tested using qemu_riscv64_virt_defconfig and
the Buildroot host QEMU.

Signed-off-by: Mark Corbin <mark@dibsco.co.uk>
---
Changes v1 -> v2:
  - use BR2_RISCV_64 instead of (BR2_riscv && BR2_ARCH_IS_64)
    (Thomas P)
---
 package/uclibc/Config.in                |  1 +
 toolchain/toolchain-buildroot/Config.in | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index de2885bc92..f4d4f06462 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -101,6 +101,7 @@ config BR2_UCLIBC_TARGET_ARCH
 	default "mips"	   if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	default "or1k"     if BR2_or1k
 	default "powerpc"  if BR2_powerpc
+	default "riscv64"  if BR2_RISCV_64
 	default "sh"	   if BR2_sh
 	default "sparc"	   if BR2_sparc
 	default "xtensa"   if BR2_xtensa
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 8c33b2b4dd..3b2da333a2 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -27,12 +27,13 @@ choice
 
 config BR2_TOOLCHAIN_BUILDROOT_UCLIBC
 	bool "uClibc-ng"
-	depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle   || BR2_arceb  || \
-		   BR2_arm     || BR2_armeb    || \
-		   BR2_i386    || BR2_m68k   || BR2_microblaze || \
-		   BR2_mips    || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
-		   BR2_or1k    || BR2_powerpc || BR2_sh2a   || BR2_sh4	   || \
-		   BR2_sh4eb   || BR2_sparc   || BR2_xtensa || BR2_x86_64
+	depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle      || BR2_arceb    || \
+		   BR2_arm     || BR2_armeb      || \
+		   BR2_i386    || BR2_m68k       || BR2_microblaze || \
+		   BR2_mips    || BR2_mipsel     || BR2_mips64     || BR2_mips64el || \
+		   BR2_or1k    || BR2_powerpc    || BR2_RISCV_64   || \
+		   BR2_sh2a    || BR2_sh4	 || BR2_sh4eb      || BR2_sparc    || \
+		   BR2_xtensa  || BR2_x86_64
 	select BR2_TOOLCHAIN_USES_UCLIBC
 	help
 	  This option selects uClibc-ng as the C library for the
-- 
2.20.1

[Buildroot] [PATCH v2 2/3] support/config-fragments: add RISC-V 64-bit uclibc autobuild config

[Mark Corbin]

Add a RISC-V 64-bit autobuild configuration for the internal
toolchain with uclibc.

Signed-off-by: Mark Corbin <mark@dibsco.co.uk>
---
Changes v1 -> v2:
  - acknowledge that this only adds a uclibc autobuilder configuration
    and not a generic one (Thomas P)
---
 .../config-fragments/autobuild/br-riscv64-full-internal.config  | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 support/config-fragments/autobuild/br-riscv64-full-internal.config

diff --git a/support/config-fragments/autobuild/br-riscv64-full-internal.config b/support/config-fragments/autobuild/br-riscv64-full-internal.config
new file mode 100644
index 0000000000..c729eb55e9
--- /dev/null
+++ b/support/config-fragments/autobuild/br-riscv64-full-internal.config
@@ -0,0 +1,2 @@
+BR2_riscv=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
-- 
2.20.1

[Buildroot] [PATCH v2 3/3] support/config-fragments: use external riscv64 musl toolchain

[Mark Corbin]

Move to an external RISC-V 64 bit musl toolchain to ease the load
on the autobuilders.

Signed-off-by: Mark Corbin <mark@dibsco.co.uk>
---
 .../autobuild/br-riscv64-internal-musl.config            | 3 ---
 .../config-fragments/autobuild/br-riscv64-musl.config    | 9 +++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
 delete mode 100644 support/config-fragments/autobuild/br-riscv64-internal-musl.config
 create mode 100644 support/config-fragments/autobuild/br-riscv64-musl.config

diff --git a/support/config-fragments/autobuild/br-riscv64-internal-musl.config b/support/config-fragments/autobuild/br-riscv64-internal-musl.config
deleted file mode 100644
index 89e7afb276..0000000000
--- a/support/config-fragments/autobuild/br-riscv64-internal-musl.config
+++ /dev/null
@@ -1,3 +0,0 @@
-BR2_riscv=y
-BR2_TOOLCHAIN_BUILDROOT_MUSL=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
diff --git a/support/config-fragments/autobuild/br-riscv64-musl.config b/support/config-fragments/autobuild/br-riscv64-musl.config
new file mode 100644
index 0000000000..fd6ef822aa
--- /dev/null
+++ b/support/config-fragments/autobuild/br-riscv64-musl.config
@@ -0,0 +1,9 @@
+BR2_riscv=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv64-musl-2020.02.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_9=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
-- 
2.20.1

[Buildroot] [PATCH v2 1/3] toolchain/toolchain-buildroot: enable uclibc for riscv64

[Romain Naour]

Hi Mark,

Le 10/05/2020 ? 17:43, Mark Corbin a ?crit?:
> We can enable uclibc for RISC-V 64 bit now that it has been
> bumped from v1.0.32 to v1.0.34.
> 
> Uclibc has had basic support for RISC-V 64 bit since v1.0.31, but
> shared library and TLS/NPTL support has only been available since
> v1.0.33.
> 
> This update has been tested using qemu_riscv64_virt_defconfig and
> the Buildroot host QEMU.

Since uclibc-ng is the default libc in Buildroot, enabling riscv64 change
implicitly the libc used by qemu_riscv64_virt_defconfig.

Before this patch qemu_riscv64_virt_defconfig used glibc, after it use uclibc-ng
(like other defconfig does).

Maybe add a commit before this one enabling explicitly glibc in
qemu_riscv64_virt_defconfig, then add this commit and finally a third commit
switching qemu_riscv64_virt_defconfig from glibc to uclibc-ng.

Anyway it's good to see new architecture supported in uclibc-ng.

Best regards,
Romain

> 
> Signed-off-by: Mark Corbin <mark@dibsco.co.uk>
> ---
> Changes v1 -> v2:
>   - use BR2_RISCV_64 instead of (BR2_riscv && BR2_ARCH_IS_64)
>     (Thomas P)
> ---
>  package/uclibc/Config.in                |  1 +
>  toolchain/toolchain-buildroot/Config.in | 13 +++++++------
>  2 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
> index de2885bc92..f4d4f06462 100644
> --- a/package/uclibc/Config.in
> +++ b/package/uclibc/Config.in
> @@ -101,6 +101,7 @@ config BR2_UCLIBC_TARGET_ARCH
>  	default "mips"	   if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
>  	default "or1k"     if BR2_or1k
>  	default "powerpc"  if BR2_powerpc
> +	default "riscv64"  if BR2_RISCV_64
>  	default "sh"	   if BR2_sh
>  	default "sparc"	   if BR2_sparc
>  	default "xtensa"   if BR2_xtensa
> diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
> index 8c33b2b4dd..3b2da333a2 100644
> --- a/toolchain/toolchain-buildroot/Config.in
> +++ b/toolchain/toolchain-buildroot/Config.in
> @@ -27,12 +27,13 @@ choice
>  
>  config BR2_TOOLCHAIN_BUILDROOT_UCLIBC
>  	bool "uClibc-ng"
> -	depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle   || BR2_arceb  || \
> -		   BR2_arm     || BR2_armeb    || \
> -		   BR2_i386    || BR2_m68k   || BR2_microblaze || \
> -		   BR2_mips    || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
> -		   BR2_or1k    || BR2_powerpc || BR2_sh2a   || BR2_sh4	   || \
> -		   BR2_sh4eb   || BR2_sparc   || BR2_xtensa || BR2_x86_64
> +	depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle      || BR2_arceb    || \
> +		   BR2_arm     || BR2_armeb      || \
> +		   BR2_i386    || BR2_m68k       || BR2_microblaze || \
> +		   BR2_mips    || BR2_mipsel     || BR2_mips64     || BR2_mips64el || \
> +		   BR2_or1k    || BR2_powerpc    || BR2_RISCV_64   || \
> +		   BR2_sh2a    || BR2_sh4	 || BR2_sh4eb      || BR2_sparc    || \
> +		   BR2_xtensa  || BR2_x86_64
>  	select BR2_TOOLCHAIN_USES_UCLIBC
>  	help
>  	  This option selects uClibc-ng as the C library for the
> 

[Buildroot] [PATCH v2 1/3] toolchain/toolchain-buildroot: enable uclibc for riscv64

[Romain Naour]

Le 13/07/2020 ? 23:50, Romain Naour a ?crit?:
> Hi Mark,
> 
> Le 10/05/2020 ? 17:43, Mark Corbin a ?crit?:
>> We can enable uclibc for RISC-V 64 bit now that it has been
>> bumped from v1.0.32 to v1.0.34.
>>
>> Uclibc has had basic support for RISC-V 64 bit since v1.0.31, but
>> shared library and TLS/NPTL support has only been available since
>> v1.0.33.
>>
>> This update has been tested using qemu_riscv64_virt_defconfig and
>> the Buildroot host QEMU.
> 
> Since uclibc-ng is the default libc in Buildroot, enabling riscv64 change
> implicitly the libc used by qemu_riscv64_virt_defconfig.
> 
> Before this patch qemu_riscv64_virt_defconfig used glibc, after it use uclibc-ng
> (like other defconfig does).
> 
> Maybe add a commit before this one enabling explicitly glibc in
> qemu_riscv64_virt_defconfig, then add this commit and finally a third commit
> switching qemu_riscv64_virt_defconfig from glibc to uclibc-ng.

Same for hifive_unleashed_defconfig.

Best regards,
Romain

> 
> Anyway it's good to see new architecture supported in uclibc-ng.
> 
> Best regards,
> Romain
> 
>>
>> Signed-off-by: Mark Corbin <mark@dibsco.co.uk>
>> ---
>> Changes v1 -> v2:
>>   - use BR2_RISCV_64 instead of (BR2_riscv && BR2_ARCH_IS_64)
>>     (Thomas P)
>> ---
>>  package/uclibc/Config.in                |  1 +
>>  toolchain/toolchain-buildroot/Config.in | 13 +++++++------
>>  2 files changed, 8 insertions(+), 6 deletions(-)
>>
>> diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
>> index de2885bc92..f4d4f06462 100644
>> --- a/package/uclibc/Config.in
>> +++ b/package/uclibc/Config.in
>> @@ -101,6 +101,7 @@ config BR2_UCLIBC_TARGET_ARCH
>>  	default "mips"	   if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
>>  	default "or1k"     if BR2_or1k
>>  	default "powerpc"  if BR2_powerpc
>> +	default "riscv64"  if BR2_RISCV_64
>>  	default "sh"	   if BR2_sh
>>  	default "sparc"	   if BR2_sparc
>>  	default "xtensa"   if BR2_xtensa
>> diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
>> index 8c33b2b4dd..3b2da333a2 100644
>> --- a/toolchain/toolchain-buildroot/Config.in
>> +++ b/toolchain/toolchain-buildroot/Config.in
>> @@ -27,12 +27,13 @@ choice
>>  
>>  config BR2_TOOLCHAIN_BUILDROOT_UCLIBC
>>  	bool "uClibc-ng"
>> -	depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle   || BR2_arceb  || \
>> -		   BR2_arm     || BR2_armeb    || \
>> -		   BR2_i386    || BR2_m68k   || BR2_microblaze || \
>> -		   BR2_mips    || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
>> -		   BR2_or1k    || BR2_powerpc || BR2_sh2a   || BR2_sh4	   || \
>> -		   BR2_sh4eb   || BR2_sparc   || BR2_xtensa || BR2_x86_64
>> +	depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle      || BR2_arceb    || \
>> +		   BR2_arm     || BR2_armeb      || \
>> +		   BR2_i386    || BR2_m68k       || BR2_microblaze || \
>> +		   BR2_mips    || BR2_mipsel     || BR2_mips64     || BR2_mips64el || \
>> +		   BR2_or1k    || BR2_powerpc    || BR2_RISCV_64   || \
>> +		   BR2_sh2a    || BR2_sh4	 || BR2_sh4eb      || BR2_sparc    || \
>> +		   BR2_xtensa  || BR2_x86_64
>>  	select BR2_TOOLCHAIN_USES_UCLIBC
>>  	help
>>  	  This option selects uClibc-ng as the C library for the
>>
> 

[Buildroot] [PATCH v2 2/3] support/config-fragments: add RISC-V 64-bit uclibc autobuild config

[Romain Naour]

Le 10/05/2020 ? 17:43, Mark Corbin a ?crit?:
> Add a RISC-V 64-bit autobuild configuration for the internal
> toolchain with uclibc.
> 
> Signed-off-by: Mark Corbin <mark@dibsco.co.uk>
> ---
> Changes v1 -> v2:
>   - acknowledge that this only adds a uclibc autobuilder configuration
>     and not a generic one (Thomas P)
> ---
>  .../config-fragments/autobuild/br-riscv64-full-internal.config  | 2 ++
>  1 file changed, 2 insertions(+)
>  create mode 100644 support/config-fragments/autobuild/br-riscv64-full-internal.config
> 
> diff --git a/support/config-fragments/autobuild/br-riscv64-full-internal.config b/support/config-fragments/autobuild/br-riscv64-full-internal.config
> new file mode 100644
> index 0000000000..c729eb55e9
> --- /dev/null
> +++ b/support/config-fragments/autobuild/br-riscv64-full-internal.config
> @@ -0,0 +1,2 @@
> +BR2_riscv=y
> +BR2_TOOLCHAIN_BUILDROOT_CXX=y
> 

With the first patch fixed:

Reviewed-by: Romain Naour <romain.naour@gmail.com>

Best regards,
Romain

[Buildroot] [PATCH v2 3/3] support/config-fragments: use external riscv64 musl toolchain

[Romain Naour]

Hi Mark,

Le 10/05/2020 ? 17:43, Mark Corbin a ?crit?:
> Move to an external RISC-V 64 bit musl toolchain to ease the load
> on the autobuilders.

Reviewed-by: Romain Naour <romain.naour@gmail.com>
[toolchain downloaded and busybox built with this toolchain]
Tested-by: Romain Naour <romain.naour@gmail.com>

Best regards,
Romain

> 
> Signed-off-by: Mark Corbin <mark@dibsco.co.uk>
> ---
>  .../autobuild/br-riscv64-internal-musl.config            | 3 ---
>  .../config-fragments/autobuild/br-riscv64-musl.config    | 9 +++++++++
>  2 files changed, 9 insertions(+), 3 deletions(-)
>  delete mode 100644 support/config-fragments/autobuild/br-riscv64-internal-musl.config
>  create mode 100644 support/config-fragments/autobuild/br-riscv64-musl.config
> 
> diff --git a/support/config-fragments/autobuild/br-riscv64-internal-musl.config b/support/config-fragments/autobuild/br-riscv64-internal-musl.config
> deleted file mode 100644
> index 89e7afb276..0000000000
> --- a/support/config-fragments/autobuild/br-riscv64-internal-musl.config
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -BR2_riscv=y
> -BR2_TOOLCHAIN_BUILDROOT_MUSL=y
> -BR2_TOOLCHAIN_BUILDROOT_CXX=y
> diff --git a/support/config-fragments/autobuild/br-riscv64-musl.config b/support/config-fragments/autobuild/br-riscv64-musl.config
> new file mode 100644
> index 0000000000..fd6ef822aa
> --- /dev/null
> +++ b/support/config-fragments/autobuild/br-riscv64-musl.config
> @@ -0,0 +1,9 @@
> +BR2_riscv=y
> +BR2_TOOLCHAIN_EXTERNAL=y
> +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
> +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
> +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv64-musl-2020.02.tar.bz2"
> +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y
> +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
> +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
> +BR2_TOOLCHAIN_EXTERNAL_CXX=y
> 

[Buildroot] [PATCH v2 1/3] toolchain/toolchain-buildroot: enable uclibc for riscv64

[Thomas Petazzoni]

On Sun, 10 May 2020 16:43:45 +0100
Mark Corbin <mark@dibsco.co.uk> wrote:

> We can enable uclibc for RISC-V 64 bit now that it has been
> bumped from v1.0.32 to v1.0.34.
> 
> Uclibc has had basic support for RISC-V 64 bit since v1.0.31, but
> shared library and TLS/NPTL support has only been available since
> v1.0.33.
> 
> This update has been tested using qemu_riscv64_virt_defconfig and
> the Buildroot host QEMU.
> 
> Signed-off-by: Mark Corbin <mark@dibsco.co.uk>
> ---
> Changes v1 -> v2:
>   - use BR2_RISCV_64 instead of (BR2_riscv && BR2_ARCH_IS_64)
>     (Thomas P)
> ---
>  package/uclibc/Config.in                |  1 +
>  toolchain/toolchain-buildroot/Config.in | 13 +++++++------
>  2 files changed, 8 insertions(+), 6 deletions(-)

Applied to master, thanks.

Romain: in the end, I didn't change the existing defconfigs. We usually
don't change/check them when we update gcc, glibc or binutils for
example. The compiler/C library is pretty much independent from the
specific board, so I didn't think it was worth changing the HiFive
Unleashed board to use glibc.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 2/3] support/config-fragments: add RISC-V 64-bit uclibc autobuild config

[Thomas Petazzoni]

On Sun, 10 May 2020 16:43:46 +0100
Mark Corbin <mark@dibsco.co.uk> wrote:

> Add a RISC-V 64-bit autobuild configuration for the internal
> toolchain with uclibc.
> 
> Signed-off-by: Mark Corbin <mark@dibsco.co.uk>
> ---
> Changes v1 -> v2:
>   - acknowledge that this only adds a uclibc autobuilder configuration
>     and not a generic one (Thomas P)
> ---
>  .../config-fragments/autobuild/br-riscv64-full-internal.config  | 2 ++
>  1 file changed, 2 insertions(+)
>  create mode 100644 support/config-fragments/autobuild/br-riscv64-full-internal.config
> 
> diff --git a/support/config-fragments/autobuild/br-riscv64-full-internal.config b/support/config-fragments/autobuild/br-riscv64-full-internal.config
> new file mode 100644
> index 0000000000..c729eb55e9
> --- /dev/null
> +++ b/support/config-fragments/autobuild/br-riscv64-full-internal.config
> @@ -0,0 +1,2 @@
> +BR2_riscv=y
> +BR2_TOOLCHAIN_BUILDROOT_CXX=y

This was clearly not a "full" defconfig: you didn't had wchar/locale
enabled, so I've added that.

Also, you had forgotten to update the CSV file that lists the toolchain
used by the autobuilders,
support/config-fragments/autobuild/toolchain-configs.csv, so I did that.

Applied with those changes. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 3/3] support/config-fragments: use external riscv64 musl toolchain

[Thomas Petazzoni]

On Sun, 10 May 2020 16:43:47 +0100
Mark Corbin <mark@dibsco.co.uk> wrote:

> Move to an external RISC-V 64 bit musl toolchain to ease the load
> on the autobuilders.
> 
> Signed-off-by: Mark Corbin <mark@dibsco.co.uk>
> ---
>  .../autobuild/br-riscv64-internal-musl.config            | 3 ---
>  .../config-fragments/autobuild/br-riscv64-musl.config    | 9 +++++++++
>  2 files changed, 9 insertions(+), 3 deletions(-)
>  delete mode 100644 support/config-fragments/autobuild/br-riscv64-internal-musl.config
>  create mode 100644 support/config-fragments/autobuild/br-riscv64-musl.config

Here as well, you had forgotten to update
support/config-fragments/autobuild/toolchain-configs.csv, so I did that
when applying. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com