Skip to contentSkip to conversation

package/uclibc: reenable riscv64

PATCH New Petr Vorel 3 participants 3 messages Sep 8, 2020 – Oct 6, 2020

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH 1/1 package/uclibc: reenable riscv64

Missing __riscv_flush_icache() (reason for the revert) was implemented in 1.0.35 in commit 8b1f6b2e0 "riscv64: add __riscv_flush_icache".

Revert "Revert "toolchain/toolchain-buildroot: enable uclibc for riscv64"" This reverts commit e7d631c0df1698b4edc94f148e7247869430e108.

---
 package/uclibc/Config.in                |  1 +
 toolchain/toolchain-buildroot/Config.in | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)
package/uclibc/Config.in +1 -0
index de2885bc92..f4d4f06462 100644
@@ -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
toolchain/toolchain-buildroot/Config.in +7 -6
index 418d5cb387..068f91c875 100644
@@ -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
Signature · 1 line
2.27.0.rc0
#1 lore raw

PATCH 1/1 package/uclibc: reenable riscv64

Petr, All,

+Damien in Cc as he's also working on the same topic:

    https://patchwork.ozlabs.org/project/buildroot/patch/20200908113324.1022230-2-damien.lemoal at wdc.com/

On 2020-09-08 16:53 +0200, Petr Vorel spake thusly:

Quoted 8 lines

Missing __riscv_flush_icache() (reason for the revert) was implemented in 1.0.35 in commit 8b1f6b2e0 "riscv64: add __riscv_flush_icache".

Revert "Revert "toolchain/toolchain-buildroot: enable uclibc for riscv64"" This reverts commit e7d631c0df1698b4edc94f148e7247869430e108.

---

[--SNIP--]

Quoted 11 lines
toolchain/toolchain-buildroot/Config.in +0 -3
index 418d5cb387..068f91c875 100644
@@ -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 || \

toolchain/toolchain-buildroot/Config.in choice · line 36

Quoted 10 lines
toolchain/toolchain-buildroot/Config.in +7 -3
-		   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

Please do not reindent eveything just to add the new arch, especially since the existing code is not all properly indented already.

(but if you really don;t like the existing mess ;-) , a separate cleanup patch is OK)

Regards,
Yann E. MORIN.

Quoted 10 lines
toolchain/toolchain-buildroot/Config.in +0 -0
 	select BR2_TOOLCHAIN_USES_UCLIBC
 	help
 	  This option selects uClibc-ng as the C library for the
Signature · 6 lines
2.27.0.rc0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/uclibc: reenable riscv64

In reply to Petr Vorel
Quoted 11 lines · On Tue, 8 Sep 2020 16:53:46 +0200 Petr Vorel <[email protected]> wrote:

Missing __riscv_flush_icache() (reason for the revert) was implemented in 1.0.35 in commit 8b1f6b2e0 "riscv64: add __riscv_flush_icache".

Revert "Revert "toolchain/toolchain-buildroot: enable uclibc for riscv64"" This reverts commit e7d631c0df1698b4edc94f148e7247869430e108.

---
 package/uclibc/Config.in                |  1 +
 toolchain/toolchain-buildroot/Config.in | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

Thanks, but there was another patch from Damien Le Moal, which also enabled it for RISC-V 32-bit, so I've applied his patch instead.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com