X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2Fcommon.mk;h=fce8a5165ca9b835d5e7cc0fdcc9d5d24a641875;hb=0a5ccfbadda79f4626202b78326c4d3ffccf9bd1;hp=d07f607c47ee28515cbfc4d8ee4208749df30bf0;hpb=e856d62d0ad7469a99d32a34799dd75bf994449b;p=openwrt%2Fstaging%2Fblogic.git diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index d07f607c47ee..fce8a5165ca9 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -1,7 +1,7 @@ # # Copyright (C) 2002-2003 Erik Andersen # Copyright (C) 2004 Manuel Novoa III -# Copyright (C) 2005-2006 Felix Fietkau +# Copyright (C) 2005-2006 Felix Fietkau # Copyright (C) 2006-2014 OpenWrt.org # # This program is free software; you can redistribute it and/or modify @@ -25,59 +25,32 @@ GCC_VERSION:=$(call qstrip,$(CONFIG_GCC_VERSION)) PKG_VERSION:=$(firstword $(subst +, ,$(GCC_VERSION))) GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION) -ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro) - LINARO_RELEASE:= - ifeq ($(CONFIG_GCC_VERSION),"4.6-linaro") - PKG_REV:=4.6-2013.05 - PKG_VERSION:=4.6.4 - PKG_VERSION_MAJOR:=4.6 - PKG_MD5SUM:=26b48802ae1203cd99415026fbf56ed7 - PKG_COMP:=bz2 - endif - ifeq ($(CONFIG_GCC_VERSION),"4.8-linaro") - PKG_REV:=4.8-2014.04 - PKG_VERSION:=4.8.3 - PKG_VERSION_MAJOR:=4.8 - PKG_MD5SUM:=5ba2f3a449b1658ccc09d27cc7ab3c03 - PKG_COMP:=xz - endif - ifeq ($(CONFIG_GCC_VERSION),"4.9-linaro") - LINARO_RELEASE:=15.03 - PKG_REV:=4.9-2015.03 - PKG_VERSION:=4.9.3 - PKG_VERSION_MAJOR:=4.9 - PKG_MD5SUM:=f9d256d120adfbb45dd3e2d22b70cba9 - PKG_COMP:=xz - endif - ifneq ($(LINARO_RELEASE),) - PKG_SOURCE_URL:=http://releases.linaro.org/$(LINARO_RELEASE)/components/toolchain/gcc-linaro/$(PKG_VERSION_MAJOR) - else - PKG_SOURCE_URL:=http://launchpad.net/gcc-linaro/$(PKG_VERSION_MAJOR)/$(PKG_REV)/+download/ - endif - PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.$(PKG_COMP) - GCC_DIR:=gcc-linaro-$(PKG_REV) - HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GCC_DIR) -else - PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION) - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 - ifeq ($(PKG_VERSION),4.6.3) - PKG_MD5SUM:=773092fe5194353b02bb0110052a972e - endif - ifeq ($(PKG_VERSION),4.8.0) - PKG_MD5SUM:=e6040024eb9e761c3bea348d1fa5abb0 - endif +ifeq ($(PKG_VERSION),5.4.0) + PKG_HASH:=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a endif -PATCH_DIR=../patches/$(GCC_VERSION) +ifeq ($(PKG_VERSION),6.3.0) + PKG_HASH:=f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f +endif -BUGURL=https://dev.openwrt.org/ -ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro) - PKGVERSION=OpenWrt/Linaro GCC $(PKG_REV) $(REVISION) -else - PKGVERSION=OpenWrt GCC $(PKG_VERSION) $(REVISION) +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 + PKG_SOURCE:=$(PKG_NAME)-$(GCC_VERSION).tar.gz + PKG_HASH:=6a5eb0c83dca16f228ac836677a1fbb42a53c30334487ac37c2c18db80a38f35 + PKG_REV:=2016.03 + GCC_DIR:=gcc-arc-$(PKG_REV) + HOST_BUILD_DIR = $(BUILD_DIR_HOST)/$(PKG_NAME)-$(GCC_VERSION) endif +PATCH_DIR=../patches/$(GCC_VERSION) + +BUGURL=http://www.lede-project.org/bugs/ +PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION) + HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/toolchain-build.mk @@ -96,12 +69,21 @@ HOST_STAMP_CONFIGURED:=$(GCC_BUILD_DIR)/.configured HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.gcc_$(GCC_VARIANT)_installed SEP:=, -TARGET_LANGUAGES:="c,c++$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)$(if $(CONFIG_INSTALL_GFORTRAN),$(SEP)fortran)" +TARGET_LANGUAGES:="c,c++$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)$(if $(CONFIG_INSTALL_GFORTRAN),$(SEP)fortran)$(if $(CONFIG_INSTALL_GCCGO),$(SEP)go)" export libgcc_cv_fixed_point=no ifdef CONFIG_USE_UCLIBC export glibcxx_cv_c99_math_tr1=no endif +ifdef CONFIG_INSTALL_GCCGO + export libgo_cv_c_split_stack_supported=no +endif + +ifdef CONFIG_GCC_USE_GRAPHITE + GRAPHITE_CONFIGURE=--with-isl=$(REAL_STAGING_DIR_HOST) +else + GRAPHITE_CONFIGURE=--without-isl --without-cloog +endif GCC_CONFIGURE:= \ SHELL="$(BASH)" \ @@ -121,13 +103,15 @@ GCC_CONFIGURE:= \ --disable-libgomp \ --disable-libmudflap \ --disable-multilib \ + --disable-libmpx \ --disable-nls \ $(GRAPHITE_CONFIGURE) \ --with-host-libstdcxx=-lstdc++ \ $(SOFT_FLOAT_CONFIG_OPTION) \ $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \ $(if $(CONFIG_mips64)$(CONFIG_mips64el),--with-arch=mips64 \ - --with-abi=$(subst ",,$(CONFIG_MIPS64_ABI))) \ + --with-abi=$(call qstrip,$(CONFIG_MIPS64_ABI))) \ + $(if $(CONFIG_arc),--with-cpu=$(CONFIG_CPU_TYPE)) \ --with-gmp=$(TOPDIR)/staging_dir/host \ --with-mpfr=$(TOPDIR)/staging_dir/host \ --with-mpc=$(TOPDIR)/staging_dir/host \ @@ -136,6 +120,10 @@ ifneq ($(CONFIG_mips)$(CONFIG_mipsel),) GCC_CONFIGURE += --with-mips-plt endif +ifndef GCC_VERSION_4_8 + GCC_CONFIGURE += --with-diagnostics-color=auto-if-env +endif + ifneq ($(CONFIG_SSP_SUPPORT),) GCC_CONFIGURE+= \ --enable-libssp @@ -175,17 +163,42 @@ ifneq ($(CONFIG_SOFT_FLOAT),y) endif endif +ifeq ($(CONFIG_TARGET_x86)$(CONFIG_USE_GLIBC)$(CONFIG_INSTALL_GCCGO),yyy) + TARGET_CFLAGS+=-fno-split-stack +endif + GCC_MAKE:= \ export SHELL="$(BASH)"; \ $(MAKE) \ CFLAGS="$(HOST_CFLAGS)" \ CFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" + CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" \ + GOCFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" -define Host/Prepare - mkdir -p $(GCC_BUILD_DIR) +define Host/SetToolchainInfo + $(SED) 's,TARGET_CROSS=.*,TARGET_CROSS=$(REAL_GNU_TARGET_NAME)-,' $(TOOLCHAIN_DIR)/info.mk + $(SED) 's,GCC_VERSION=.*,GCC_VERSION=$(GCC_VERSION),' $(TOOLCHAIN_DIR)/info.mk endef +ifneq ($(GCC_PREPARE),) + 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_SOURCE_DIR)/ + $(SED) 's,^MULTILIB_OSDIRNAMES,# MULTILIB_OSDIRNAMES,' $(HOST_SOURCE_DIR)/gcc/config/*/t-* + $(SED) 'd' $(HOST_SOURCE_DIR)/gcc/DEV-PHASE + $(SED) 's, DATESTAMP,,' $(HOST_SOURCE_DIR)/gcc/version.c + #(cd $(HOST_SOURCE_DIR)/libstdc++-v3; autoconf;); + $(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(HOST_SOURCE_DIR)/libstdc++-v3/configure + mkdir -p $(GCC_BUILD_DIR) + endef +else + define Host/Prepare + mkdir -p $(GCC_BUILD_DIR) + endef +endif + define Host/Configure (cd $(GCC_BUILD_DIR) && rm -f config.cache; \ $(GCC_CONFIGURE) \ @@ -193,7 +206,7 @@ define Host/Configure endef define Host/Clean - rm -rf \ + rm -rf $(if $(GCC_PREPARE),$(HOST_SOURCE_DIR)) \ $(STAGING_DIR_HOST)/stamp/.gcc_* \ $(STAGING_DIR_HOST)/stamp/.binutils_* \ $(GCC_BUILD_DIR) \