X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fgcc%2Fcommon.mk;h=9bc849152bac6d3097c60974c75662a7e96ad59a;hp=ec324ea159e9f6b9671190cb73cc381f5925e4df;hb=74c9b9cfeb0e7cd045b969474a9bcd9ab38bd7d2;hpb=f6be067784e11bcc43d78b14e89abf3c59e0f029 diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index ec324ea159..9bc849152b 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -1,8 +1,8 @@ # # Copyright (C) 2002-2003 Erik Andersen # Copyright (C) 2004 Manuel Novoa III -# Copyright (C) 2005-2006 Felix Fietkau -# Copyright (C) 2006-2013 OpenWrt.org +# Copyright (C) 2005-2006 Felix Fietkau +# Copyright (C) 2006-2014 OpenWrt.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,47 +25,30 @@ 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) - 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-2013.12 - PKG_VERSION:=4.8.3 - PKG_VERSION_MAJOR:=4.8 - PKG_MD5SUM:=bd7a22ff4d1b6bb4824ef908e07bde66 - PKG_COMP:=xz - endif - PKG_SOURCE_URL:=http://launchpad.net/gcc-linaro/$(PKG_VERSION_MAJOR)/$(PKG_REV)/+download/ - 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.4.7) - PKG_MD5SUM:=295709feb4441b04e87dea3f1bab4281 - endif - ifeq ($(PKG_VERSION),4.6.3) - PKG_MD5SUM:=773092fe5194353b02bb0110052a972e - endif - ifeq ($(PKG_VERSION),4.8.0) - PKG_MD5SUM:=e6040024eb9e761c3bea348d1fa5abb0 - endif +ifeq ($(PKG_VERSION),5.3.0) + PKG_MD5SUM:=c9616fd448f980259c31de613e575719 +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 + PKG_SOURCE:=$(PKG_NAME)-$(GCC_VERSION).tar.gz + PKG_MD5SUM:=ca59c8140d6efd07b97a18869bddbb53 + 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=https://dev.openwrt.org/ +BUGURL=http://www.lede-project.org/bugs/ ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro) - PKGVERSION=OpenWrt/Linaro GCC $(PKG_REV) $(REVISION) + PKGVERSION=LEDE/Linaro GCC $(PKG_REV) $(REVISION) else - PKGVERSION=OpenWrt GCC $(PKG_VERSION) $(REVISION) + PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION) endif HOST_BUILD_PARALLEL:=1 @@ -93,8 +76,22 @@ ifdef CONFIG_USE_UCLIBC export glibcxx_cv_c99_math_tr1=no 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 +else + GRAPHITE_CONFIGURE=--without-isl --without-cloog +endif + GCC_CONFIGURE:= \ SHELL="$(BASH)" \ + $(if $(shell gcc --version 2>&1 | grep LLVM), \ + CFLAGS="-O2 -fbracket-depth=512 -pipe" \ + CXXFLAGS="-O2 -fbracket-depth=512 -pipe" \ + ) \ $(HOST_SOURCE_DIR)/configure \ --with-bugurl=$(BUGURL) \ --with-pkgversion="$(PKGVERSION)" \ @@ -113,17 +110,18 @@ GCC_CONFIGURE:= \ $(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 \ --disable-decimal-float ifneq ($(CONFIG_mips)$(CONFIG_mipsel),) GCC_CONFIGURE += --with-mips-plt endif -ifeq ($(CONFIG_GCC_VERSION_4_4),) - GCC_CONFIGURE+= \ - --with-mpc=$(TOPDIR)/staging_dir/host +ifndef GCC_VERSION_4_8 + GCC_CONFIGURE += --with-diagnostics-color=auto-if-env endif ifneq ($(CONFIG_SSP_SUPPORT),) @@ -158,6 +156,13 @@ ifneq ($(GCC_ARCH),) GCC_CONFIGURE+= --with-arch=$(GCC_ARCH) endif +ifneq ($(CONFIG_SOFT_FLOAT),y) + ifeq ($(CONFIG_arm),y) + GCC_CONFIGURE+= \ + --with-float=hard + endif +endif + GCC_MAKE:= \ export SHELL="$(BASH)"; \ $(MAKE) \ @@ -165,10 +170,30 @@ GCC_MAKE:= \ CFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" \ CXXFLAGS_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) \ @@ -176,7 +201,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) \