From 797aae5eb2c3dc687ea10c7d649f7cfed6fdf08c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 25 Mar 2015 14:55:42 +0100
Subject: okay, we need the workarounds for sh toolchain

---
 package/libgcc/Makefile | 4 ++++
 toolchain/gcc/Makefile  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 3ec9294d1..aa788b205 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -34,6 +34,9 @@ INSTALL_STYLE:=		manual
 
 libgcc-install:
 	$(INSTALL_DIR) ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+ifeq ($(ADK_TARGET_ARCH_SH),y)
+	${CP} ${STAGING_TARGET_DIR}/lib/!m4/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+else
 ifeq ($(ADK_TARGET_ARCH_AVR32),)
 ifeq ($(ADK_TARGET_UCLINUX),)
 ifeq ($(ADK_TARGET_USE_STATIC_LIBS),)
@@ -41,5 +44,6 @@ ifeq ($(ADK_TARGET_USE_STATIC_LIBS),)
 endif
 endif
 endif
+endif
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index b871d8644..065ed5681 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -180,7 +180,7 @@ endif
 	(cd $(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME); \
 		ln -s ../$(STAGING_HOST2TARGET)/lib lib)
 ifeq ($(ADK_TARGET_ARCH_SH),y)
-	(cd ${STAGING_TARGET_DIR}/ && ln -sf . m4 && ln -sf . m4-nofpu)
+	(cd ${STAGING_TARGET_DIR}/ && ln -sf . m4)
 endif
 	$(SED) '/k prot/agcc_cv_libc_provides_ssp=yes' $(WRKBUILD)/gcc/configure
 	cd $(GCC_BUILD_DIR_MINIMAL); \
-- 
cgit v1.2.3