summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-03-25 14:55:42 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2015-03-25 14:55:42 +0100
commit797aae5eb2c3dc687ea10c7d649f7cfed6fdf08c (patch)
tree137c3927d2a3e567ac027efff7b14ed75d2761c2
parent90f4d58a679442b24af9e7e3f6f1f9ecd809e96b (diff)
okay, we need the workarounds for sh toolchain
-rw-r--r--package/libgcc/Makefile4
-rw-r--r--toolchain/gcc/Makefile2
2 files changed, 5 insertions, 1 deletions
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); \