Browse Source

riscv: disable lp64d and FENV for now, it segfaults on boot

Waldemar Brodkorb 1 day ago
parent
commit
8726eaf575
3 changed files with 16 additions and 16 deletions
  1. 12 12
      target/config/Config.in.cpu
  2. 2 2
      target/riscv32/uclibc-ng.config
  3. 2 2
      target/riscv64/uclibc-ng.config

+ 12 - 12
target/config/Config.in.cpu

@@ -1207,20 +1207,20 @@ config ADK_TARGET_CPU_PPC64_POWERPC64
 	depends on ADK_TARGET_BIG_ENDIAN
 
 # riscv
-config ADK_TARGET_CPU_RISCV32_RV32IMADC
-	bool "rv32imadc"
+config ADK_TARGET_CPU_RISCV32_RV32IMAC
+	bool "rv32imac"
 	select ADK_TARGET_SUPPORTS_THREADS
 	select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU
 	select ADK_TARGET_SUPPORTS_LT
-	select ADK_TARGET_ABI_ILP32D
+	select ADK_TARGET_ABI_ILP32
 	depends on ADK_TARGET_ARCH_RISCV32
 
-config ADK_TARGET_CPU_RISCV32_RV32IMAC
-	bool "rv32imac"
+config ADK_TARGET_CPU_RISCV32_RV32IMADC
+	bool "rv32imadc"
 	select ADK_TARGET_SUPPORTS_THREADS
 	select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU
 	select ADK_TARGET_SUPPORTS_LT
-	select ADK_TARGET_ABI_ILP32
+	select ADK_TARGET_ABI_ILP32D
 	depends on ADK_TARGET_ARCH_RISCV32
 
 config ADK_TARGET_CPU_RISCV32_RV32IMA
@@ -1246,20 +1246,20 @@ config ADK_TARGET_CPU_RISCV32_RV32IMAFDC
 	select ADK_TARGET_SUPPORTS_LT if ADK_TARGET_WITH_MMU
 	depends on ADK_TARGET_ARCH_RISCV32
 
-config ADK_TARGET_CPU_RISCV64_RV64IMADC
-	bool "rv64imadc"
+config ADK_TARGET_CPU_RISCV64_RV64IMAC
+	bool "rv64imac"
 	select ADK_TARGET_SUPPORTS_THREADS
 	select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU
 	select ADK_TARGET_SUPPORTS_LT
-	select ADK_TARGET_ABI_LP64D
+	select ADK_TARGET_ABI_LP64
 	depends on ADK_TARGET_ARCH_RISCV64
 
-config ADK_TARGET_CPU_RISCV64_RV64IMAC
-	bool "rv64imac"
+config ADK_TARGET_CPU_RISCV64_RV64IMADC
+	bool "rv64imadc"
 	select ADK_TARGET_SUPPORTS_THREADS
 	select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU
 	select ADK_TARGET_SUPPORTS_LT
-	select ADK_TARGET_ABI_LP64
+	select ADK_TARGET_ABI_LP64D
 	depends on ADK_TARGET_ARCH_RISCV64
 
 config ADK_TARGET_CPU_RISCV64_RV64IMA

+ 2 - 2
target/riscv32/uclibc-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.52 C Library Configuration
+# uClibc-ng 1.0.55 C Library Configuration
 #
 # TARGET_aarch64 is not set
 # TARGET_alpha is not set
@@ -58,7 +58,7 @@ UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
 DO_C99_MATH=y
 DO_XSI_MATH=y
-UCLIBC_HAS_FENV=y
+# UCLIBC_HAS_FENV is not set
 UCLIBC_HAS_LONG_DOUBLE_MATH=y
 KERNEL_HEADERS=""
 HAVE_DOT_CONFIG=y

+ 2 - 2
target/riscv64/uclibc-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.52 C Library Configuration
+# uClibc-ng 1.0.55 C Library Configuration
 #
 # TARGET_aarch64 is not set
 # TARGET_alpha is not set
@@ -58,7 +58,7 @@ UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
 DO_C99_MATH=y
 DO_XSI_MATH=y
-UCLIBC_HAS_FENV=y
+# UCLIBC_HAS_FENV is not set
 UCLIBC_HAS_LONG_DOUBLE_MATH=y
 KERNEL_HEADERS=""
 HAVE_DOT_CONFIG=y