aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2013-04-01 15:43:23 +0000
committerImre Kaloz <kaloz@openwrt.org>2013-04-01 15:43:23 +0000
commit48612b3b4a4546d2fcbf4cd9d25d1e0ce907900e (patch)
treec791027a3a1f99e84ee4653c249363047ce648db
parent99d4d9a1481adc6067a1e82ad23401a5b7f995d2 (diff)
downloadupstream-48612b3b4a4546d2fcbf4cd9d25d1e0ce907900e.tar.gz
upstream-48612b3b4a4546d2fcbf4cd9d25d1e0ce907900e.tar.bz2
upstream-48612b3b4a4546d2fcbf4cd9d25d1e0ce907900e.zip
cleanup
SVN-Revision: 36148
-rw-r--r--toolchain/gcc/common.mk10
-rw-r--r--toolchain/gcc/initial/Makefile4
2 files changed, 6 insertions, 8 deletions
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 01fae9836c..35ffbf874b 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -110,10 +110,6 @@ GCC_CONFIGURE:= \
$(SOFT_FLOAT_CONFIG_OPTION) \
$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
$(if $(CONFIG_mips64)$(CONFIG_mips64el),--with-arch=mips64 --with-abi=64) \
- $(if $(CONFIG_sparc),--with-long-double-128) \
-
-GCC_BUILD_TARGET_LIBGCC:=y
-GCC_CONFIGURE+= \
--with-gmp=$(TOPDIR)/staging_dir/host \
--with-mpfr=$(TOPDIR)/staging_dir/host \
--disable-decimal-float
@@ -121,7 +117,7 @@ ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
GCC_CONFIGURE += --with-mips-plt
endif
-ifneq ($(CONFIG_GCC_VERSION_4_5)$(CONFIG_GCC_VERSION_4_6)$(CONFIG_GCC_VERSION_4_7),)
+ifeq ($(CONFIG_GCC_VERSION_4_4),)
GCC_CONFIGURE+= \
--with-mpc=$(TOPDIR)/staging_dir/host
endif
@@ -141,7 +137,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)
diff --git a/toolchain/gcc/initial/Makefile b/toolchain/gcc/initial/Makefile
index d1481e0a36..f0c65b528c 100644
--- a/toolchain/gcc/initial/Makefile
+++ b/toolchain/gcc/initial/Makefile
@@ -14,14 +14,14 @@ define Host/Compile
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
all-build-libiberty \
all-gcc \
- $(if $(GCC_BUILD_TARGET_LIBGCC),all-target-libgcc)
+ all-target-libgcc
endef
define Host/Install
$(GCC_MAKE) -C $(GCC_BUILD_DIR) \
prefix="$(TOOLCHAIN_DIR)/initial" \
install-gcc \
- $(if $(GCC_BUILD_TARGET_LIBGCC),install-target-libgcc)
+ install-target-libgcc
# XXX: glibc insists on linking against libgcc_eh
( cd $(TOOLCHAIN_DIR)/initial/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) ; \