X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6528871efd3e99f18deba5a768f935fd6c75d533..a9a43ba6aca416dca007be5f3090401e5ba62aa2:/toolchain/gcc/Makefile
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index d7170ea8e..fe07e7d5c 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -21,31 +21,51 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gcc
-PKG_VERSION:=$(call qstrip,$(CONFIG_GCC_VERSION))
-
-PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-
-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.4)
- PKG_MD5SUM:=d79f553e7916ea21c556329eacfeaa16
-endif
-ifeq ($(PKG_VERSION),4.3.1)
- PKG_MD5SUM:=4afa0290cc3a41ac8822666f1110de98
-endif
-ifeq ($(PKG_VERSION),4.3.2)
- PKG_MD5SUM:=5dfac5da961ecd5f227c3175859a486d
-endif
-ifeq ($(PKG_VERSION),4.3.3)
- PKG_MD5SUM:=cc3c5565fdb9ab87a05ddb106ba0bd1f
+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
+ PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+ 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.4)
+ PKG_MD5SUM:=d79f553e7916ea21c556329eacfeaa16
+ endif
+ ifeq ($(PKG_VERSION),4.3.3)
+ PKG_MD5SUM:=cc3c5565fdb9ab87a05ddb106ba0bd1f
+ endif
+ ifeq ($(PKG_VERSION),4.4.0)
+ PKG_MD5SUM:=cf5d787bee57f38168b74d65a7c0e6fd
+ endif
+ ifeq ($(PKG_VERSION),4,4,1)
+ PKG_MD5SUM:=927eaac3d44b22f31f9c83df82f26436
+ endif
+ ifeq ($(PKG_VERSION),4.4.2)
+ PKG_MD5SUM:=70f5ac588a79e3c9901d5b34f58d896d
+ endif
+ ifeq ($(PKG_VERSION),4.4.3)
+ PKG_MD5SUM:=fe1ca818fc6d2caeffc9051fe67ff103
+ endif
endif
-PATCH_DIR=./patches/$(PKG_VERSION)
+PATCH_DIR=./patches/$(GCC_VERSION)
include $(INCLUDE_DIR)/toolchain-build.mk
@@ -58,6 +78,8 @@ HOST_BUILD_DIR2:=$(HOST_BUILD_DIR)-final
SEP:=,
TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)"
+export libgcc_cv_fixed_point=no
+
GCC_CONFIGURE:= \
SHELL="$(BASH)" \
$(HOST_BUILD_DIR)/configure \
@@ -71,11 +93,14 @@ GCC_CONFIGURE:= \
--disable-libmudflap \
--disable-multilib \
--disable-nls \
+ $(if $(CONFIG_GCC_USE_GRAPHITE),--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) \
+ $(if $(CONFIG_GCC_VERSION_4_3_3_CS)$(CONFIG_GCC_VERSION_4_4_1_CS)$(CONFIG_GCC_VERSION_4_4_3_CS),--enable-poison-system-directories)
-ifneq ($(CONFIG_GCC_VERSION_4_3),)
+ifneq ($(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),)
GCC_BUILD_TARGET_LIBGCC:=y
GCC_CONFIGURE+= \
--with-gmp=$(TOPDIR)/staging_dir/host \
@@ -127,16 +152,22 @@ GCC_CONFIGURE_STAGE2:= \
--enable-languages=$(TARGET_LANGUAGES) \
--enable-shared \
--enable-threads \
+ --disable-tls \
--with-slibdir=$(TOOLCHAIN_DIR)/lib \
+ifdef CONFIG_powerpc
+ TARGET_CFLAGS := $(patsubst -Os,-O2,$(TARGET_CFLAGS))
+endif
+
GCC_MAKE:= \
export SHELL="$(BASH)"; \
$(MAKE) \
-
+ CFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" \
+ CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS)"
define Host/SetToolchainInfo
$(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
+ $(SED) 's,GCC_VERSION=.*,GCC_VERSION=$(GCC_VERSION),' $(TOOLCHAIN_DIR)/info.mk
endef
@@ -179,6 +210,7 @@ define Stage1/Install
# XXX: glibc insists on linking against libgcc_eh
( cd $(TOOLCHAIN_DIR)/usr/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) ; \
[ -e libgcc_eh.a ] || ln -sf libgcc.a libgcc_eh.a ; \
+ cp libgcc.a libgcc_initial.a; \
)
endef
@@ -190,7 +222,7 @@ define Stage2/Configure
ln -sf ../include $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include
rm -rf $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
ln -sf ../lib $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
- $(if $(CONFIG_mips64)$(CONFIG_mips64el),ln -sf ../lib64 $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib64)
+ $(if $(CONFIG_mips64)$(CONFIG_mips64el)$(CONFIG_x86_64),ln -sf ../lib64 $(TOOLCHAIN_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib64)
(cd $(HOST_BUILD_DIR2); rm -f config.cache; \
$(GCC_CONFIGURE_STAGE2) \
);
@@ -229,14 +261,18 @@ define Stage2/Install
endef
+BUGURL=https://dev.openwrt.org/
+
define Host/Prepare
$(call Host/SetToolchainInfo)
$(call Host/Prepare/Default)
- ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+ ln -snf $(GCC_DIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/
+ $(SED) 's,^MULTILIB_OSDIRNAMES,# MULTILIB_OSDIRNAMES,' $(HOST_BUILD_DIR)/gcc/config/*/t-*
$(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(HOST_BUILD_DIR)/gcc/version.c
- $(SED) 's,\(bug_report_url.. = "\).*\(";\),\1\2,' $(HOST_BUILD_DIR)/gcc/version.c
- (cd $(HOST_BUILD_DIR)/libstdc++-v3; autoconf;);
+ $(SED) 's,\(bug_report_url.. = "\).*\(";\),\1\2,' $(HOST_BUILD_DIR)/gcc/version.c
+ $(SED) 's,http://gcc.gnu.org/bugs.html,$(BUGURL),' $(HOST_BUILD_DIR)/gcc/configure
+ #(cd $(HOST_BUILD_DIR)/libstdc++-v3; autoconf;);
$(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(HOST_BUILD_DIR)/libstdc++-v3/configure
$(call Stage0/Configure)
$(call Stage0/Compile)