X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/800e84cc0ff36cfbc254ec9681d8731a4fd480f1..f2d4c6c009e2d305ed2cf816e57783f033ebe6f6:/toolchain/gcc/Makefile?ds=inline

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 10dab856f..f1328a358 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -35,26 +35,18 @@ endif
 ifeq ($(PKG_VERSION),4.2.4)
   PKG_MD5SUM:=d79f553e7916ea21c556329eacfeaa16
 endif
-ifeq ($(PKG_VERSION),4.3.1)
-  PKG_MD5SUM:=4afa0290cc3a41ac8822666f1110de98
-endif
-ifeq ($(PKG_VERSION),4.3.2)
-  PKG_MD5SUM:=5dfac5da961ecd5f227c3175859a486d
-endif
 ifeq ($(PKG_VERSION),4.3.3)
   PKG_MD5SUM:=cc3c5565fdb9ab87a05ddb106ba0bd1f
 endif
+ifeq ($(PKG_VERSION),4.4.0)
+  PKG_MD5SUM:=cf5d787bee57f38168b74d65a7c0e6fd
+endif
 
 PATCH_DIR=./patches/$(PKG_VERSION)
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-
-override CONFIG_AUTOREBUILD=
-
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk
 
-STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed
+HOST_STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed
 
 HOST_BUILD_DIR0:=$(HOST_BUILD_DIR)-minimal
 HOST_BUILD_DIR1:=$(HOST_BUILD_DIR)-initial
@@ -78,8 +70,9 @@ GCC_CONFIGURE:= \
 		--disable-nls \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 		$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
+		$(if $(CONFIG_mips64)$(CONFIG_mips64el),--with-arch=mips64 --with-abi=64) \
 
-ifneq ($(CONFIG_GCC_VERSION_4_3),)
+ifneq ($(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),)
   GCC_BUILD_TARGET_LIBGCC:=y
   GCC_CONFIGURE+= \
 		--with-gmp=$(TOPDIR)/staging_dir/host \
@@ -131,6 +124,7 @@ GCC_CONFIGURE_STAGE2:= \
 		--enable-languages=$(TARGET_LANGUAGES) \
 		--enable-shared \
 		--enable-threads \
+		--disable-tls \
 		--with-slibdir=$(TOOLCHAIN_DIR)/lib \
 
 GCC_MAKE:= \
@@ -183,6 +177,7 @@ define Stage1/Install
 	# XXX: glibc insists on linking against libgcc_eh
 	( cd $(TOOLCHAIN_DIR)/usr/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) ; \
 		[ -e libgcc_eh.a ] || ln -sf libgcc.a libgcc_eh.a ; \
+		cp libgcc.a libgcc_initial.a; \
 	)
 endef
 
@@ -194,6 +189,7 @@ define Stage2/Configure
 	ln -sf ../include $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include
 	rm -rf $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
 	ln -sf ../lib $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
+	$(if $(CONFIG_mips64)$(CONFIG_mips64el)$(CONFIG_x86_64),ln -sf ../lib64 $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib64)
 	(cd $(HOST_BUILD_DIR2); rm -f config.cache; \
 		$(GCC_CONFIGURE_STAGE2) \
 	);
@@ -239,7 +235,7 @@ define Host/Prepare
 	$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/
 	$(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
-	(cd $(HOST_BUILD_DIR)/libstdc++-v3; autoconf;);
+	#(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)
 	$(call Stage0/Compile)