Revert "toolchain/toolchain-buildroot: enable uclibc for riscv64"

This reverts commit bd9810e176273914eca1208bcba23f0de9e446b3. Indeed,
while uClibc-ng has support for RISC-V 64-bit, this support lacks the
__riscv_flush_icache() function call, which is used by some GCC
builtins used for example in libffi.

Due to this missing __riscv_flush_icache(), anything that links
against libffi fails to build:

/home/test/autobuild/run/instance-0/output-1/host/bin/riscv64-buildroot-linux-uclibc-gcc  -o gobject/gobject-query gobject/gobject-query.p/gobject-query.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group glib/libglib-2.0.so.0.6400.4 gobject/libgobject-2.0.so.0.6400.4 -Wl,--end-group -pthread '-Wl,-rpath,$ORIGIN/../glib:$ORIGIN/' -Wl,-rpath-link,/home/test/autobuild/run/instance-0/output-1/build/libglib2-2.64.4/build/glib -Wl,-rpath-link,/home/test/autobuild/run/instance-0/output-1/build/libglib2-2.64.4/build/gobject
/home/test/autobuild/run/instance-0/output-1/host/lib/gcc/riscv64-buildroot-linux-uclibc/9.3.0/../../../../riscv64-buildroot-linux-uclibc/bin/ld: /home/test/autobuild/run/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/lib64/libffi.so.7: undefined reference to `__riscv_flush_icache'
collect2: error: ld returned 1 exit status

Note that this commit means that
support/config-fragments/autobuild/br-riscv64-full-internal.config
will be back to using glibc as the C library, but that is OK, until
uClibc-ng is fixed to implemented __riscv_flush_icache().

This uClibc-ng issue has been reported upstream at
https://mailman.uclibc-ng.org/pipermail/devel/2020-August/002022.html.

Fixes:

  http://autobuild.buildroot.net/results/ec1185ad1fd8863a3990143a0af2ace987761a27/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index f4d4f064625e4473d86f489ab9594941ab31fabe..de2885bc92fcf65b12aa1d08a04ba561c934dd7d 100644 (file)
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -101,7 +101,6 @@ 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 068f91c875e0deda4bfc6dfc567534912b33f475..418d5cb387c22fefbbde9104b72e9d6319d85c5a 100644 (file)
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -27,13 +27,12 @@ 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_RISCV_64   || \
-                  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_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