Browse Source

okay, we need the workarounds for sh toolchain

Waldemar Brodkorb 9 years ago
parent
commit
797aae5eb2
2 changed files with 5 additions and 1 deletions
  1. 4 0
      package/libgcc/Makefile
  2. 1 1
      toolchain/gcc/Makefile

+ 4 - 0
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

+ 1 - 1
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); \