gcc: fix compile on armv4t with the cs toolchain

[openwrt.git] / toolchain / gcc / Makefile

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index fdcee3f..3b31127 100644 (file)
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -54,6 +54,12 @@ else
   ifeq ($(PKG_VERSION),4.4.0)
     PKG_MD5SUM:=cf5d787bee57f38168b74d65a7c0e6fd
   endif
   ifeq ($(PKG_VERSION),4.4.0)
     PKG_MD5SUM:=cf5d787bee57f38168b74d65a7c0e6fd
   endif

+  ifeq ($(PKG_VERSION),4,4,1)
+    PKG_MD5SUM:=927eaac3d44b22f31f9c83df82f26436
+  endif
+  ifeq ($(PKG_VERSION),4.4.2)
+    PKG_MD5SUM:=70f5ac588a79e3c9901d5b34f58d896d
+  endif

 endif
 
 PATCH_DIR=./patches/$(GCC_VERSION)
 endif
 
 PATCH_DIR=./patches/$(GCC_VERSION)


@@ -69,6 +75,8 @@ HOST_BUILD_DIR2:=$(HOST_BUILD_DIR)-final
 SEP:=,
 TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)"
 
 SEP:=,
 TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)"
 

+export libgcc_cv_fixed_point=no
+

 GCC_CONFIGURE:= \
        SHELL="$(BASH)" \
        $(HOST_BUILD_DIR)/configure \
 GCC_CONFIGURE:= \
        SHELL="$(BASH)" \
        $(HOST_BUILD_DIR)/configure \


@@ -245,13 +253,17 @@ define Stage2/Install
 endef
 
 
 endef
 
 

+BUGURL=https://dev.openwrt.org/
+

 define Host/Prepare
        $(call Host/SetToolchainInfo)
        $(call Host/Prepare/Default)
        ln -snf $(GCC_DIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
        $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/
 define Host/Prepare
        $(call Host/SetToolchainInfo)
        $(call Host/Prepare/Default)
        ln -snf $(GCC_DIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
        $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/

+       $(SED) 's,^MULTILIB_OSDIRNAMES,# MULTILIB_OSDIRNAMES,' $(HOST_BUILD_DIR)/gcc/config/*/t-*

        $(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(HOST_BUILD_DIR)/gcc/version.c
        $(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(HOST_BUILD_DIR)/gcc/version.c

-       $(SED) 's,\(bug_report_url.. = "\).*\(";\),\1<URL:https://dev.openwrt.org/>\2,' $(HOST_BUILD_DIR)/gcc/version.c
+       $(SED) 's,\(bug_report_url.. = "\).*\(";\),\1<URL:$(BUGURL)>\2,' $(HOST_BUILD_DIR)/gcc/version.c
+       $(SED) 's,http://gcc.gnu.org/bugs.html,$(BUGURL),' $(HOST_BUILD_DIR)/gcc/configure

        #(cd $(HOST_BUILD_DIR)/libstdc++-v3; autoconf;);
        $(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(HOST_BUILD_DIR)/libstdc++-v3/configure
        $(call Stage0/Configure)
        #(cd $(HOST_BUILD_DIR)/libstdc++-v3; autoconf;);
        $(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(HOST_BUILD_DIR)/libstdc++-v3/configure
        $(call Stage0/Configure)