sh: update uclibc-ng config, fix toolchain multilib configure

3 files changed, 22 insertions, 14 deletions

diff --git a/target/sh/uclibc-ng.config b/target/sh/uclibc-ng.config
index ed3a9beca..1181437be 100644
--- a/target/sh/uclibc-ng.config
+++ b/target/sh/uclibc-ng.config
@@ -1,7 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.21 C Library Configuration
+# uClibc-ng 1.0.24 C Library Configuration
 #
+# TARGET_aarch64 is not set
 # TARGET_alpha is not set
 # TARGET_arc is not set
 # TARGET_arm is not set
@@ -56,6 +57,7 @@ UCLIBC_HAS_FPU=y
 DO_C99_MATH=y
 # DO_XSI_MATH is not set
 # UCLIBC_HAS_FENV is not set
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
 KERNEL_HEADERS=""
 HAVE_DOT_CONFIG=y
 
@@ -88,6 +90,7 @@ UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
 PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
+UCLIBC_HAS_LFS=y
 # MALLOC is not set
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
@@ -146,7 +149,6 @@ UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
 UCLIBC_HAS_IPV6=y
-# UCLIBC_HAS_RPC is not set
 UCLIBC_USE_NETLINK=y
 UCLIBC_SUPPORT_AI_ADDRCONFIG=y
 UCLIBC_HAS_BSD_RES_CLOSE=y
@@ -203,9 +205,7 @@ UCLIBC_HAS_ARGP=y
 # Big and Tall
 #
 UCLIBC_HAS_REGEX=y
-# UCLIBC_HAS_REGEX_OLD is not set
 UCLIBC_HAS_FNMATCH=y
-# UCLIBC_HAS_FNMATCH_OLD is not set
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
@@ -224,8 +224,7 @@ HARDWIRED_ABSPATH=y
 #
 # Security options
 #
-UCLIBC_HAS_ARC4RANDOM=y
-# ARC4RANDOM_USES_NODEV is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
 # UCLIBC_HAS_SSP is not set
 # UCLIBC_BUILD_RELRO is not set
 # UCLIBC_BUILD_NOW is not set
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 8f8cacd8f..397a74279 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -135,32 +135,35 @@ GCC_FINAL_CONFOPTS+=	--disable-biarch --disable-multilib
 endif
 
 ifeq ($(ADK_TARGET_ARCH_SH),y)
+
 ifeq ($(ADK_TARGET_LITTLE_ENDIAN),y)
 GCC_CONFOPTS+=		--with-endian=little
 else
 GCC_CONFOPTS+=          --with-endian=big
 endif
-ifeq ($(ADK_TARGET_ARCH_SH),y)
 ifeq ($(ADK_TARGET_BINFMT_FDPIC),y)
 GCC_CONFOPTS+=          --enable-fdpic
 endif
-GCC_FINAL_CONFOPTS+=	--with-multilib-list=mj2
+
+ifeq ($(ADK_TARGET_CPU_SH_J2),y)
+GCC_CONFOPTS+=	--with-multilib-list=mj2
 endif
 ifeq ($(ADK_TARGET_CPU_SH_SH2),y)
-GCC_FINAL_CONFOPTS+=	--with-multilib-list=m2
+GCC_CONFOPTS+=	--with-multilib-list=m2
 endif
 ifeq ($(ADK_TARGET_CPU_SH_SH2A),y)
-GCC_FINAL_CONFOPTS+=	--with-multilib-list=m2a
+GCC_CONFOPTS+=	--with-multilib-list=m2a,m2a-nofpu
 endif
 ifeq ($(ADK_TARGET_CPU_SH_SH3),y)
-GCC_FINAL_CONFOPTS+=	--with-multilib-list=m3
+GCC_CONFOPTS+=	--with-multilib-list=m3
 endif
 ifeq ($(ADK_TARGET_CPU_SH_SH4),y)
-GCC_FINAL_CONFOPTS+=	--with-multilib-list=m4,m4-nofpu
+GCC_CONFOPTS+=	--with-multilib-list=m4,m4-nofpu
 endif
 ifeq ($(ADK_TARGET_CPU_SH_SH4A),y)
-GCC_FINAL_CONFOPTS+=	--with-multilib-list=m4a,m4a-nofpu
+GCC_CONFOPTS+=	--with-multilib-list=m4a,m4a-nofpu
 endif
+
 endif
 
 ifeq ($(ADK_TARGET_ARCH_X86),y)
@@ -238,6 +241,12 @@ ifeq ($(ADK_TARGET_ARCH_SH),y)
 ifeq ($(ADK_TARGET_CPU_SH_J2),y)
 	(cd ${STAGING_TARGET_DIR}/ && ln -sf . mj2)
 endif
+ifeq ($(ADK_TARGET_CPU_SH_SH2),y)
+	(cd ${STAGING_TARGET_DIR}/ && ln -sf . m2)
+endif
+ifeq ($(ADK_TARGET_CPU_SH_SH2A),y)
+	(cd ${STAGING_TARGET_DIR}/ && ln -sf . m2a)
+endif
 ifeq ($(ADK_TARGET_CPU_SH_SH3),y)
 	(cd ${STAGING_TARGET_DIR}/ && ln -sf . m3)
 endif
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile
index 04a768f26..1db3c17ac 100644
--- a/toolchain/uclibc-ng/Makefile
+++ b/toolchain/uclibc-ng/Makefile
@@ -245,7 +245,7 @@ ifeq ($(ADK_TARGET_CPU_SH_SH2)$(ADK_TARGET_CPU_SH_J2),y)
 endif
 ifeq ($(ADK_TARGET_CPU_SH_SH2A),y)
 	$(SED) 's/.*\(UCLIBC_HAS_FPU\).*/# \1 is not set/' ${WRKBUILD}/.config
-	$(SED) 's/.*\(CONFIG_SH2A\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_SH2\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH3\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH4\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH4A\).*/# \1 is not set/' ${WRKBUILD}/.config