diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-04-20 16:18:08 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-04-20 16:18:08 +0000 |
| commit | 919f5d8ee53f430be11637c61f479cf4992ca839 (patch) | |
| tree | b31b36336f28314dd72c28852b1dcf5f76f62905 /toolchain/gcc/Makefile | |
| parent | 6edd065384aff0d9b7aba8205d5df441d9b21e29 (diff) | |
| download | upstream-919f5d8ee53f430be11637c61f479cf4992ca839.tar.gz upstream-919f5d8ee53f430be11637c61f479cf4992ca839.tar.bz2 upstream-919f5d8ee53f430be11637c61f479cf4992ca839.zip | |
[toolchain] fix graphite options with gcc-4.5, add libelf for LTO, fix mbsd_multi patch, patch from Bernhard Loos
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21046 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/gcc/Makefile')
| -rw-r--r-- | toolchain/gcc/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index ed9de15b3c..325fe7474e 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -96,6 +96,7 @@ GCC_CONFIGURE:= \ --disable-libmudflap \ --disable-multilib \ --disable-nls \ + $(GRAPHITE_CONFIGURE) \ $(if $(CONFIG_GCC_USE_GRAPHITE),--with-host-libstdcxx=-lstdc++) \ $(SOFT_FLOAT_CONFIG_OPTION) \ $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \ @@ -103,7 +104,7 @@ GCC_CONFIGURE:= \ $(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)$(CONFIG_GCC_VERSION_4_4),) +ifneq ($(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_5),) GCC_BUILD_TARGET_LIBGCC:=y GCC_CONFIGURE+= \ --with-gmp=$(TOPDIR)/staging_dir/host \ @@ -164,7 +165,13 @@ GCC_CONFIGURE_STAGE2:= \ --enable-languages=$(TARGET_LANGUAGES) \ --enable-shared \ --enable-threads \ - --with-slibdir=$(TOOLCHAIN_DIR)/lib \ + --with-slibdir=$(TOOLCHAIN_DIR)/lib + +ifneq ($(CONFIG_GCC_VERSION_4_5),) + GCC_CONFIGURE_STAGE2+= \ + --enable-lto \ + --with-libelf=$(TOPDIR)/staging_dir/host +endif ifneq ($(CONFIG_TLS_SUPPORT),) GCC_CONFIGURE_STAGE2+= \ @@ -225,7 +232,7 @@ define Stage1/Install $(GCC_MAKE) -C $(HOST_BUILD_DIR1) \ install-gcc \ $(if $(GCC_BUILD_TARGET_LIBGCC),install-target-libgcc) - + # 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 ; \ |