X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2Fcommon.mk;h=d07f607c47ee28515cbfc4d8ee4208749df30bf0;hb=a7780603923fddec225c9f4b0990fede4c2695a9;hp=8b7453335070b1474cb7dbfedd37c5015efcbf53;hpb=e3a21eb9f87988f26d0871ad050f05f8d88ddcc7;p=openwrt%2Fstaging%2Fchunkeey.git diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 8b74533350..d07f607c47 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -2,7 +2,7 @@ # Copyright (C) 2002-2003 Erik Andersen # Copyright (C) 2004 Manuel Novoa III # Copyright (C) 2005-2006 Felix Fietkau -# Copyright (C) 2006-2011 OpenWrt.org +# 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,50 +25,60 @@ GCC_VERSION:=$(call qstrip,$(CONFIG_GCC_VERSION)) PKG_VERSION:=$(firstword $(subst +, ,$(GCC_VERSION))) GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION) -ifdef CONFIG_GCC_VERSION_LLVM - PKG_SOURCE_VERSION:=c98c494b72ff875884c0c7286be67f16f9f6d7ab - PKG_REV:=83504 - GCC_DIR:=llvm-gcc-4.2-r$(PKG_REV) - PKG_VERSION:=4.2.1 - PKG_SOURCE:=$(GCC_DIR).tar.gz - PKG_SOURCE_PROTO:=git - PKG_SOURCE_URL:=git://repo.or.cz/llvm-gcc-4.2.git - PKG_SOURCE_SUBDIR:=$(GCC_DIR) - HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GCC_DIR) -else ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro) - ifeq ($(CONFIG_GCC_VERSION),"4.5-linaro") - PKG_REV:=4.5-2011.08 - PKG_VERSION:=4.5.4 - PKG_VERSION_MAJOR:=4.5 - PKG_MD5SUM:=c3374e210209e35ad1ea175223d3605c - endif + LINARO_RELEASE:= ifeq ($(CONFIG_GCC_VERSION),"4.6-linaro") - PKG_REV:=4.6-2011.08 - PKG_VERSION:=4.6.2 + PKG_REV:=4.6-2013.05 + PKG_VERSION:=4.6.4 PKG_VERSION_MAJOR:=4.6 - PKG_MD5SUM:=7417cdb33d7b3a18552b2003a98cadfc + 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 - PKG_SOURCE_URL:=http://launchpad.net/gcc-linaro/$(PKG_VERSION_MAJOR)/$(PKG_REV)/+download/ - PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.bz2 + 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 - ifeq ($(PKG_VERSION),4.4.6) - PKG_MD5SUM:=ab525d429ee4425050a554bc9247d6c4 + ifeq ($(PKG_VERSION),4.6.3) + PKG_MD5SUM:=773092fe5194353b02bb0110052a972e endif - ifeq ($(PKG_VERSION),4.6.1) - PKG_MD5SUM:=c57a9170c677bf795bdc04ed796ca491 + ifeq ($(PKG_VERSION),4.8.0) + PKG_MD5SUM:=e6040024eb9e761c3bea348d1fa5abb0 endif endif -endif PATCH_DIR=../patches/$(GCC_VERSION) 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) +endif + +HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/toolchain-build.mk @@ -86,7 +96,7 @@ HOST_STAMP_CONFIGURED:=$(GCC_BUILD_DIR)/.configured HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.gcc_$(GCC_VARIANT)_installed SEP:=, -TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)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)" export libgcc_cv_fixed_point=no ifdef CONFIG_USE_UCLIBC @@ -95,7 +105,13 @@ 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)" \ --prefix=$(TOOLCHAIN_DIR) \ --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ @@ -110,23 +126,14 @@ GCC_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=64) \ - $(if $(CONFIG_GCC_VERSION_LLVM),--enable-llvm=$(BUILD_DIR_BASE)/host/llvm) \ - -ifeq ($(CONFIG_GCC_LLVM),) - GCC_BUILD_TARGET_LIBGCC:=y - GCC_CONFIGURE+= \ + $(if $(CONFIG_mips64)$(CONFIG_mips64el),--with-arch=mips64 \ + --with-abi=$(subst ",,$(CONFIG_MIPS64_ABI))) \ --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 -endif - -ifneq ($(CONFIG_GCC_VERSION_4_5)$(CONFIG_GCC_VERSION_4_6),) - GCC_CONFIGURE+= \ - --with-mpc=$(TOPDIR)/staging_dir/host +ifneq ($(CONFIG_mips)$(CONFIG_mipsel),) + GCC_CONFIGURE += --with-mips-plt endif ifneq ($(CONFIG_SSP_SUPPORT),) @@ -144,7 +151,9 @@ ifneq ($(CONFIG_EXTRA_TARGET_ARCH),) endif ifdef CONFIG_sparc - GCC_CONFIGURE+= --enable-targets=all + GCC_CONFIGURE+= \ + --enable-targets=all \ + --with-long-double-128 endif ifeq ($(LIBC),uClibc) @@ -155,17 +164,21 @@ else --enable-__cxa_atexit endif -ifdef CONFIG_powerpc - TARGET_CFLAGS := $(patsubst -Os,-O2,$(TARGET_CFLAGS)) -endif - 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) $(TOOLCHAIN_JOBS) \ + $(MAKE) \ + CFLAGS="$(HOST_CFLAGS)" \ CFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" \ CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS)"