X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=toolchain%2Fgcc%2FMakefile;h=adf665fc41d2feab042369bcccb930d527eb872b;hb=3376b8d8904ee6e3a140650e1e8fccbf33e2c726;hp=7ef6005d06ba901e4d26c43ff9a3a273e8f24c5e;hpb=60c1f0f64d23003a19a07d6b9638542130f6641d;p=oweals%2Fopenwrt.git diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 7ef6005d06..adf665fc41 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -21,66 +21,100 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gcc -PKG_VERSION:=$(strip $(subst ",, $(CONFIG_GCC_VERSION)))#")) +PKG_VERSION:=$(call qstrip,$(CONFIG_GCC_VERSION)) -PKG_SOURCE:=gcc-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=unknown -PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(PKG_VERSION) \ - http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(PKG_VERSION) \ - ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(PKG_VERSION) -PKG_CAT:=bzcat +PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION) - -TARGET_LANGUAGES:=c -ifeq ($(CONFIG_INSTALL_LIBSTDCPP),y) -TARGET_LANGUAGES:=$(TARGET_LANGUAGES),c++ +ifeq ($(PKG_VERSION),3.4.6) + PKG_MD5SUM:=4a21ac777d4b5617283ce488b808da7b +endif +ifeq ($(PKG_VERSION),4.1.2) + PKG_MD5SUM:=a4a3eb15c96030906d8494959eeda23c +endif +ifeq ($(PKG_VERSION),4.2.0) + PKG_MD5SUM:=4798c23548dc791ea12a139e18940684 +endif +ifeq ($(PKG_VERSION),4.2.1) + PKG_MD5SUM:=cba410e6ff70f7d7f4be7a0267707fd0 endif -ifeq ($(CONFIG_INSTALL_LIBGCJ),y) -TARGET_LANGUAGES:=$(TARGET_LANGUAGES),java +ifeq ($(PKG_VERSION),4.2.2) + PKG_MD5SUM:=7ae33781417a35a2eb03ee098a9f4490 endif +ifeq ($(PKG_VERSION),4.2.3) + PKG_MD5SUM:=ef2a4d9991b3644115456ea05b2b8163 +endif +ifeq ($(PKG_VERSION),4.2.4) + PKG_MD5SUM:=d79f553e7916ea21c556329eacfeaa16 +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 -BUILD_DIR1:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-initial -BUILD_DIR2:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-final +STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed +BUILD_DIR1:=$(BUILD_DIR_HOST)/gcc-$(PKG_VERSION)-initial +BUILD_DIR2:=$(BUILD_DIR_HOST)/gcc-$(PKG_VERSION)-final -override SHELL:=$(BASH) +SEP:=, +TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)" + +ifeq ($(CONFIG_SSP_SUPPORT),y) + SSP:=--enable-ssp +else + SSP:=--disable-ssp +endif + +EXTRA_TARGET=$(if $(CONFIG_EXTRA_TARGET_ARCH),--enable-biarch --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-uclibc) define Stage1/Configure + $(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 mkdir -p $(BUILD_DIR1) (cd $(BUILD_DIR1); rm -f config.cache; \ + SHELL="$(BASH)" \ $(PKG_BUILD_DIR)/configure \ - --prefix=$(STAGING_DIR) \ + --prefix=$(TOOLCHAIN_DIR) \ --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ --enable-languages=c \ --disable-shared \ - --with-sysroot=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \ + --with-sysroot=$(BUILD_DIR_HOST)/uClibc_dev/ \ --disable-__cxa_atexit \ --enable-target-optspace \ --with-gnu-ld \ --disable-nls \ + --disable-libmudflap \ + --disable-multilib \ + $(SSP) \ + $(EXTRA_TARGET) \ + $(SOFT_FLOAT_CONFIG_OPTION) \ + $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \ ); endef define Stage1/Compile - $(MAKE) -C $(BUILD_DIR1) all-gcc + export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) all-gcc endef define Stage1/Install - $(MAKE) -C $(BUILD_DIR1) install-gcc + export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) install-gcc endef define Stage2/Configure - mkdir -p $(BUILD_DIR2) + mkdir -p $(BUILD_DIR2) $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME) # Important! Required for limits.h to be fixed. - rm -rf $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include - ln -sf ../include $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include - rm -rf $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib - ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib + rm -rf $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include + ln -sf ../include $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include + rm -rf $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/lib + ln -sf ../lib $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/lib (cd $(BUILD_DIR2); rm -f config.cache; \ + SHELL="$(BASH)" \ $(PKG_BUILD_DIR)/configure \ - --prefix=$(STAGING_DIR) \ + --prefix=$(TOOLCHAIN_DIR) \ --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ @@ -90,17 +124,39 @@ define Stage2/Configure --enable-target-optspace \ --with-gnu-ld \ --disable-nls \ + --disable-libmudflap \ + --disable-multilib \ + $(SSP) \ + $(EXTRA_TARGET) \ + $(SOFT_FLOAT_CONFIG_OPTION) \ + $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \ ); endef + define Stage2/Compile - $(MAKE) -C $(BUILD_DIR2) all + export SHELL="\$(BASH)"; \$(MAKE) -C \$(BUILD_DIR2) all endef + +define SetupExtraArch + for app in $(TOOLCHAIN_DIR)/bin/$(OPTIMIZE_FOR_CPU)*-{gcc,gcc-*,g++}; do \ + [ -e $$$$app ] || continue; \ + old_base=$$$$(basename $$$$app); \ + new_base=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-$$$${old_base##$(OPTIMIZE_FOR_CPU)-}; \ + sed -e "s/@CC_BASE@/$$$$old_base/" \ + -e 's/@EXTRA_ARCH_OPTS@/$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_OPTS))/' \ + ./files/alternate-arch-cc.in > \ + $(TOOLCHAIN_DIR)/bin/$$$$new_base; \ + chmod a+x $(TOOLCHAIN_DIR)/bin/$$$$new_base; \ + done +endef + define Stage2/Install - $(MAKE) -C $(BUILD_DIR2) install - echo $(PKG_VERSION) > $(STAGING_DIR)/gcc_version + $(MAKE) -C $(BUILD_DIR2) \ + SHELL="$(BASH)" \ + install # Set up the symlinks to enable lying about target name. set -e; \ - (cd $(STAGING_DIR); \ + (cd $(TOOLCHAIN_DIR); \ ln -sf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \ cd bin; \ for app in $(REAL_GNU_TARGET_NAME)-* ; do \ @@ -108,13 +164,15 @@ define Stage2/Install $(GNU_TARGET_NAME)$$$${app##$(REAL_GNU_TARGET_NAME)}; \ done; \ ); + $(if $(CONFIG_EXTRA_TARGET_ARCH),$(call SetupExtraArch)) endef define Build/Prepare $(call Build/Prepare/Default) - $(SCRIPT_DIR)/patch-kernel.sh $(PKG_BUILD_DIR) ./patches/$(PKG_VERSION) \*.patch $(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 endef define Build/Configure @@ -123,7 +181,7 @@ endef define Build/Compile $(call Stage1/Compile) - $(call Stage1/Install) + $(if $(wildcard $(TOOLCHAIN_DIR)/bin/$(GNU_TARGET_NAME)-gcc),,$(call Stage1/Install)) endef define Build/Install @@ -133,11 +191,13 @@ define Build/Install endef define Build/Clean - rm -rf $(PKG_BUILD_DIR) - rm -rf $(BUILD_DIR1) - rm -rf $(BUILD_DIR2) - rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gc* - rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c* + rm -rf \ + $(PKG_BUILD_DIR) \ + $(BUILD_DIR1) \ + $(BUILD_DIR2) \ + $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME) \ + $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gc* \ + $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c* endef $(eval $(call HostBuild))