Przeglądaj źródła

allow to build nios2 uClibc-ng toolchain

Waldemar Brodkorb 8 lat temu
rodzic
commit
597c81b8b4

+ 4 - 1
target/config/Config.in.cpu

@@ -846,8 +846,11 @@ config ADK_CPU_MICROBLAZE
 
 config ADK_CPU_NIOS2
 	bool
-	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITHOUT_CXX if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_USE_STATIC_LIBS if ADK_TARGET_LIB_UCLIBC_NG
 
 config ADK_CPU_OPTERON
 	bool

+ 0 - 1
target/config/Config.in.libc

@@ -8,7 +8,6 @@ config ADK_TARGET_LIB_UCLIBC_NG
 	bool "uClibc-ng embedded C library"
 	depends on \
 		   !ADK_TARGET_ARCH_AARCH64 && \
-		   !ADK_TARGET_ARCH_NIOS2 && \
 		   !ADK_TARGET_ARCH_S390 && \
 		   !ADK_TARGET_ARCH_SPARC64 && \
 		   !ADK_TARGET_ARCH_PPC64 && \

+ 2 - 9
target/nios2/uclibc.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.10 C Library Configuration
+# uClibc-ng 1.0.11 C Library Configuration
 #
 # TARGET_alpha is not set
 # TARGET_arc is not set
@@ -34,7 +34,6 @@ TARGET_SUBARCH=""
 UCLIBC_FORMAT_FLAT=y
 # UCLIBC_FORMAT_FLAT_SEP_DATA is not set
 # UCLIBC_FORMAT_SHARED_FLAT is not set
-ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_LITTLE_ENDIAN=y
 
 #
@@ -45,12 +44,8 @@ ARCH_HAS_NO_MMU=y
 #
 # Target CPU lacks a memory management unit (MMU)
 #
-UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FLOATS is not set
 # UCLIBC_HAS_FPU is not set
-UCLIBC_HAS_SOFT_FLOAT=y
-DO_C99_MATH=y
-# DO_XSI_MATH is not set
-# UCLIBC_HAS_FENV is not set
 KERNEL_HEADERS=""
 UCLIBC_UCLINUX_BROKEN_MUNMAP=y
 HAVE_DOT_CONFIG=y
@@ -64,7 +59,6 @@ ARCH_HAS_NO_LDSO=y
 UCLIBC_CTOR_DTOR=y
 # HAS_NO_THREADS is not set
 LINUXTHREADS_OLD=y
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS=y
 PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
@@ -152,7 +146,6 @@ UCLIBC_HAS_CTYPE_CHECKED=y
 # UCLIBC_HAS_CTYPE_ENFORCED is not set
 UCLIBC_HAS_WCHAR=y
 # UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
 # UCLIBC_HAS_STDIO_BUFSIZ_256 is not set