X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f642dc617471830f6ec520c968d85071fd756347..c3fd35e7800ae1f2dd3fa42ade850c948e4b18ea:/toolchain/gcc/Makefile?ds=inline diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 0198e4364..f1328a358 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -35,37 +35,29 @@ 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 -PKG_BUILD_DIR0:=$(PKG_BUILD_DIR)-minimal -PKG_BUILD_DIR1:=$(PKG_BUILD_DIR)-initial -PKG_BUILD_DIR2:=$(PKG_BUILD_DIR)-final +HOST_BUILD_DIR0:=$(HOST_BUILD_DIR)-minimal +HOST_BUILD_DIR1:=$(HOST_BUILD_DIR)-initial +HOST_BUILD_DIR2:=$(HOST_BUILD_DIR)-final SEP:=, TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)" -GCC_CONFIGURE_COMMON:= \ +GCC_CONFIGURE:= \ SHELL="$(BASH)" \ - $(PKG_BUILD_DIR)/configure \ + $(HOST_BUILD_DIR)/configure \ --prefix=$(TOOLCHAIN_DIR)/usr \ --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ @@ -78,39 +70,40 @@ GCC_CONFIGURE_COMMON:= \ --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),) - GCC_BUILD_TARGET_LIBGCC:=y - GCC_CONFIGURE_COMMON+= \ +ifneq ($(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),) + GCC_BUILD_TARGET_LIBGCC:=y + GCC_CONFIGURE+= \ --with-gmp=$(TOPDIR)/staging_dir/host \ --with-mpfr=$(TOPDIR)/staging_dir/host \ --disable-decimal-float endif ifneq ($(CONFIG_SSP_SUPPORT),) - GCC_CONFIGURE_COMMON+= \ + GCC_CONFIGURE+= \ --enable-libssp else - GCC_CONFIGURE_COMMON+= \ + GCC_CONFIGURE+= \ --disable-libssp endif ifneq ($(CONFIG_EXTRA_TARGET_ARCH),) - GCC_CONFIGURE_COMMON+= \ + GCC_CONFIGURE+= \ --enable-biarch \ --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-$(TARGET_SUFFIX) endif ifeq ($(LIBC),uClibc) - GCC_CONFIGURE_COMMON+= \ + GCC_CONFIGURE+= \ --disable-__cxa_atexit else - GCC_CONFIGURE_COMMON+= \ + GCC_CONFIGURE+= \ --enable-__cxa_atexit endif GCC_CONFIGURE_STAGE0:= \ - $(GCC_CONFIGURE_COMMON) \ + $(GCC_CONFIGURE) \ --with-newlib \ --without-headers \ --enable-languages=c \ @@ -119,7 +112,7 @@ GCC_CONFIGURE_STAGE0:= \ --disable-threads \ GCC_CONFIGURE_STAGE1:= \ - $(GCC_CONFIGURE_COMMON) \ + $(GCC_CONFIGURE) \ --with-newlib \ --with-sysroot=$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev \ --enable-languages=c \ @@ -127,10 +120,11 @@ GCC_CONFIGURE_STAGE1:= \ --disable-threads \ GCC_CONFIGURE_STAGE2:= \ - $(GCC_CONFIGURE_COMMON) \ + $(GCC_CONFIGURE) \ --enable-languages=$(TARGET_LANGUAGES) \ --enable-shared \ --enable-threads \ + --disable-tls \ --with-slibdir=$(TOOLCHAIN_DIR)/lib \ GCC_MAKE:= \ @@ -138,69 +132,71 @@ GCC_MAKE:= \ $(MAKE) \ -define Build/SetToolchainInfo +define Host/SetToolchainInfo $(SED) 's,TARGET_CROSS=.*,TARGET_CROSS=$(REAL_GNU_TARGET_NAME)-,' $(TOOLCHAIN_DIR)/info.mk $(SED) 's,GCC_VERSION=.*,GCC_VERSION=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk endef define Stage0/Configure - mkdir -p $(PKG_BUILD_DIR0) - (cd $(PKG_BUILD_DIR0); rm -f config.cache; \ + mkdir -p $(HOST_BUILD_DIR0) + (cd $(HOST_BUILD_DIR0); rm -f config.cache; \ $(GCC_CONFIGURE_STAGE0) \ ); endef define Stage0/Compile - $(GCC_MAKE) -C $(PKG_BUILD_DIR0) all-gcc + $(GCC_MAKE) -C $(HOST_BUILD_DIR0) all-gcc endef define Stage0/Install - $(GCC_MAKE) -C $(PKG_BUILD_DIR0) install-gcc + $(GCC_MAKE) -C $(HOST_BUILD_DIR0) install-gcc endef define Stage1/Configure - mkdir -p $(PKG_BUILD_DIR1) - (cd $(PKG_BUILD_DIR1); rm -f config.cache; \ + mkdir -p $(HOST_BUILD_DIR1) + (cd $(HOST_BUILD_DIR1); rm -f config.cache; \ $(GCC_CONFIGURE_STAGE1) \ ); endef define Stage1/Compile $(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/ - $(GCC_MAKE) -C $(PKG_BUILD_DIR1) \ + $(GCC_MAKE) -C $(HOST_BUILD_DIR1) \ all-build-libiberty \ all-gcc \ $(if $(GCC_BUILD_TARGET_LIBGCC),all-target-libgcc) endef define Stage1/Install - $(GCC_MAKE) -C $(PKG_BUILD_DIR1) \ + $(GCC_MAKE) -C $(HOST_BUILD_DIR1) \ install-gcc \ $(if $(GCC_BUILD_TARGET_LIBGCC),install-target-libgcc) # 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 define Stage2/Configure - mkdir -p $(PKG_BUILD_DIR2) $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME) + mkdir -p $(HOST_BUILD_DIR2) $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME) # Important! Required for limits.h to be fixed. rm -rf $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include 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 - (cd $(PKG_BUILD_DIR2); rm -f config.cache; \ + $(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) \ ); endef define Stage2/Compile - $(GCC_MAKE) -C $(PKG_BUILD_DIR2) all + $(GCC_MAKE) -C $(HOST_BUILD_DIR2) all endef define SetupExtraArch @@ -217,7 +213,7 @@ define SetupExtraArch endef define Stage2/Install - $(GCC_MAKE) -C $(PKG_BUILD_DIR2) install + $(GCC_MAKE) -C $(HOST_BUILD_DIR2) install # Set up the symlinks to enable lying about target name. set -e; \ (cd $(TOOLCHAIN_DIR)/usr; \ @@ -232,41 +228,41 @@ define Stage2/Install endef -define Build/Prepare - $(call Build/SetToolchainInfo) - $(call Build/Prepare/Default) +define Host/Prepare + $(call Host/SetToolchainInfo) + $(call Host/Prepare/Default) ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ - $(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(PKG_BUILD_DIR)/gcc/version.c - $(SED) 's,\(bug_report_url.. = "\).*\(";\),\1\2,' $(PKG_BUILD_DIR)/gcc/version.c - (cd $(PKG_BUILD_DIR)/libstdc++-v3; autoconf;); - $(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(PKG_BUILD_DIR)/libstdc++-v3/configure + $(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\2,' $(HOST_BUILD_DIR)/gcc/version.c + #(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) $(call Stage0/Install) endef -define Build/Configure +define Host/Configure endef -define Build/Compile +define Host/Compile $(call Stage1/Configure) $(call Stage1/Compile) $(call Stage1/Install) endef -define Build/Install +define Host/Install $(call Stage2/Configure) $(call Stage2/Compile) $(call Stage2/Install) endef -define Build/Clean +define Host/Clean rm -rf \ - $(PKG_BUILD_DIR) \ - $(PKG_BUILD_DIR0) \ - $(PKG_BUILD_DIR1) \ - $(PKG_BUILD_DIR2) \ + $(HOST_BUILD_DIR) \ + $(HOST_BUILD_DIR0) \ + $(HOST_BUILD_DIR1) \ + $(HOST_BUILD_DIR2) \ $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) \ $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME) \ $(TOOLCHAIN_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gc* \