X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=toolchain%2Fgcc%2Fcommon.mk;h=69214aca0317a71c974f38402b8c1ad5a5bda78a;hp=4220cf54f3ccbd039cc5ac4245e3f47961f23f51;hb=d2c06eb0756dea5f473a34b3eb391517318f4132;hpb=360fd10ac9cb92425709c76ded0cd418662e121e diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 4220cf54f3..69214aca03 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -26,22 +26,27 @@ PKG_VERSION:=$(firstword $(subst +, ,$(GCC_VERSION))) GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -ifeq ($(PKG_VERSION),5.4.0) - PKG_MD5SUM:=4c626ac2a83ef30dfb9260e6f59c2b30 +ifeq ($(PKG_VERSION),5.5.0) + PKG_HASH:=530cea139d82fe542b358961130c69cfde8b3d14556370b65823d2f91f0ced87 endif -ifeq ($(PKG_VERSION),6.1.0) - PKG_MD5SUM:=8fb6cb98b8459f5863328380fbf06bd1 +ifeq ($(PKG_VERSION),6.3.0) + PKG_HASH:=f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 endif -ifneq ($(CONFIG_GCC_VERSION_4_8_ARC),) - PKG_VERSION:=4.8.5 - PKG_SOURCE_URL:=https://github.com/foss-for-synopsys-dwc-arc-processors/gcc/archive/arc-2016.03 +ifeq ($(PKG_VERSION),7.2.0) + PKG_HASH:=1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a +endif + +ifneq ($(CONFIG_GCC_VERSION_6_3_ARC),) + PKG_VERSION:=6.3.0 + PKG_SOURCE_URL:=https://github.com/foss-for-synopsys-dwc-arc-processors/gcc/archive/$(GCC_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(GCC_VERSION).tar.gz - PKG_MD5SUM:=ca59c8140d6efd07b97a18869bddbb53 - PKG_REV:=2016.03 + PKG_HASH:=b7223e134199b1a6f71de629da6aa845790e55d28e9892143dde09b1bc878110 + PKG_REV:=2017.03-release GCC_DIR:=gcc-arc-$(PKG_REV) HOST_BUILD_DIR = $(BUILD_DIR_HOST)/$(PKG_NAME)-$(GCC_VERSION) endif @@ -49,7 +54,7 @@ endif PATCH_DIR=../patches/$(GCC_VERSION) BUGURL=http://www.lede-project.org/bugs/ -PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION) +PKGVERSION=OpenWrt GCC $(PKG_VERSION) $(REVISION) HOST_BUILD_PARALLEL:=1 @@ -66,10 +71,14 @@ endif HOST_STAMP_PREPARED:=$(HOST_BUILD_DIR)/.prepared HOST_STAMP_BUILT:=$(GCC_BUILD_DIR)/.built HOST_STAMP_CONFIGURED:=$(GCC_BUILD_DIR)/.configured -HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.gcc_$(GCC_VARIANT)_installed +HOST_STAMP_INSTALLED:=$(HOST_BUILD_PREFIX)/stamp/.gcc_$(GCC_VARIANT)_installed SEP:=, -TARGET_LANGUAGES:="c,c++$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)$(if $(CONFIG_INSTALL_GFORTRAN),$(SEP)fortran)$(if $(CONFIG_INSTALL_GCCGO),$(SEP)go)" +TARGET_LANGUAGES:="c,c++$(if $(CONFIG_INSTALL_GFORTRAN),$(SEP)fortran)$(if $(CONFIG_INSTALL_GCCGO),$(SEP)go)" + +TAR_OPTIONS += \ + --exclude-from='$(CURDIR)/../exclude-testsuite' --exclude=gcc/ada/*.ad* \ + --exclude=libjava export libgcc_cv_fixed_point=no ifdef CONFIG_USE_UCLIBC @@ -80,13 +89,9 @@ ifdef CONFIG_INSTALL_GCCGO endif ifdef CONFIG_GCC_USE_GRAPHITE - ifdef CONFIG_GCC_VERSION_4_8 - GRAPHITE_CONFIGURE=--with-cloog=$(REAL_STAGING_DIR_HOST) - else - GRAPHITE_CONFIGURE=--with-isl=$(REAL_STAGING_DIR_HOST) - endif + GRAPHITE_CONFIGURE:= --with-isl=$(TOPDIR)/staging_dir/host else - GRAPHITE_CONFIGURE=--without-isl --without-cloog + GRAPHITE_CONFIGURE:= --without-isl --without-cloog endif GCC_CONFIGURE:= \ @@ -211,8 +216,8 @@ endef define Host/Clean rm -rf $(if $(GCC_PREPARE),$(HOST_SOURCE_DIR)) \ - $(STAGING_DIR_HOST)/stamp/.gcc_* \ - $(STAGING_DIR_HOST)/stamp/.binutils_* \ + $(HOST_BUILD_PREFIX)/stamp/.gcc_* \ + $(HOST_BUILD_PREFIX)/stamp/.binutils_* \ $(GCC_BUILD_DIR) \ $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) \ $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME) \