nios2: depend on gcc 6.x/binutils 2.27, otherwise static linking fails

4 files changed, 26 insertions, 17 deletions

diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils
index b4b7b629d..7457009a0 100644
--- a/target/config/Config.in.binutils
+++ b/target/config/Config.in.binutils
@@ -40,6 +40,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_26_1
 	depends on !ADK_TARGET_ARCH_LM32
 	depends on !ADK_TARGET_ARCH_MICROBLAZE
 	depends on !ADK_TARGET_ARCH_NDS32
+	depends on !ADK_TARGET_ARCH_NIOS2
 
 config ADK_TOOLCHAIN_BINUTILS_2_25_1
 	bool "2.25.1"
@@ -50,6 +51,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_25_1
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_MOXIE
 	depends on !ADK_TARGET_ARCH_NDS32
+	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_CPU_CRIS_CRISV10
 
 config ADK_TOOLCHAIN_BINUTILS_2_24
diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler
index 513aa74e6..28b718b53 100644
--- a/target/config/Config.in.compiler
+++ b/target/config/Config.in.compiler
@@ -62,6 +62,7 @@ config ADK_TOOLCHAIN_GCC_5
 	depends on !ADK_TARGET_ARCH_M32R
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_NDS32
+	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_ARCH_OR1K
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
 	depends on !(ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH)
@@ -77,6 +78,7 @@ config ADK_TOOLCHAIN_GCC_4_9
 	depends on !ADK_TARGET_ARCH_CR16
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_METAG
+	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_ARCH_OR1K
 	depends on !ADK_TARGET_ARCH_TILE
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
diff --git a/target/config/Config.in.float b/target/config/Config.in.float
index 640f2f234..693010633 100644
--- a/target/config/Config.in.float
+++ b/target/config/Config.in.float
@@ -6,6 +6,7 @@ prompt "Float configuration"
 depends on ADK_TARGET_ARCH_ARM || \
 	   ADK_TARGET_ARCH_M68K || \
 	   ADK_TARGET_ARCH_MIPS || \
+	   ADK_TARGET_ARCH_NIOS2 || \
 	   ADK_TARGET_ARCH_PPC
 
 config ADK_TARGET_HARD_FLOAT
@@ -23,7 +24,8 @@ endchoice
 
 config ADK_TARGET_FLOAT
 	string
-	depends on !ADK_TARGET_ARCH_M68K
+	depends on !ADK_TARGET_ARCH_M68K \
+		&& !ADK_TARGET_ARCH_NIOS2
 	default "hard" if ADK_TARGET_HARD_FLOAT
 	default "soft" if ADK_TARGET_SOFT_FLOAT
 	default "softfp" if ADK_TARGET_SOFTFP_FLOAT
diff --git a/target/nios2/uclibc-ng.config b/target/nios2/uclibc-ng.config
index 590394cd8..cfefebc50 100644
--- a/target/nios2/uclibc-ng.config
+++ b/target/nios2/uclibc-ng.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.15 C Library Configuration
+# uClibc-ng 1.0.18 C Library Configuration
 #
 # TARGET_alpha is not set
 # TARGET_arc is not set
@@ -19,6 +19,7 @@
 # TARGET_metag is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
+# TARGET_nds32 is not set
 TARGET_nios2=y
 # TARGET_or1k is not set
 # TARGET_powerpc is not set
@@ -33,40 +34,43 @@ TARGET_nios2=y
 TARGET_ARCH="nios2"
 FORCE_OPTIONS_FOR_ARCH=y
 TARGET_SUBARCH=""
-UCLIBC_FORMAT_FLAT=y
-# UCLIBC_FORMAT_FLAT_SEP_DATA is not set
-# UCLIBC_FORMAT_SHARED_FLAT is not set
-ARCH_LITTLE_ENDIAN=y
 
 #
-# Using Little Endian
+# Using ELF file format
 #
-ARCH_HAS_NO_MMU=y
+ARCH_LITTLE_ENDIAN=y
 
 #
-# Target CPU lacks a memory management unit (MMU)
+# Using Little Endian
 #
-# UCLIBC_HAS_FLOATS is not set
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
 # 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
 
 #
 # General Library Settings
 #
-HAVE_NO_PIC=y
+DOPIC=y
 ARCH_HAS_NO_SHARED=y
 ARCH_HAS_NO_LDSO=y
 UCLIBC_CTOR_DTOR=y
 # HAS_NO_THREADS is not set
-UCLIBC_HAS_LINUXTHREADS=y
+UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
+UCLIBC_HAS_TLS=y
+# PTHREADS_DEBUG_SUPPORT is not set
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 MALLOC=y
 # MALLOC_SIMPLE is not set
+# MALLOC_STANDARD is not set
 MALLOC_GLIBC_COMPAT=y
 # UCLIBC_HAS_OBSTACK is not set
 UCLIBC_DYNAMIC_ATEXIT=y
@@ -104,7 +108,6 @@ UCLIBC_GRP_BUFFER_SIZE=256
 # Support various families of functions
 #
 UCLIBC_LINUX_MODULE_26=y
-# UCLIBC_LINUX_MODULE_24 is not set
 UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
@@ -141,6 +144,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -148,6 +152,7 @@ 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 is not set
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
 # UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
@@ -213,10 +218,8 @@ UCLIBC_BUILD_NOEXECSTACK=y
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
-# DODEBUG_PT is not set
 # DOSTRIP is not set
 # DOASSERTS is not set
 # UCLIBC_MALLOC_DEBUGGING is not set
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
-# DOMULTI is not set