cleanup
authorImre Kaloz <kaloz@openwrt.org>
Mon, 1 Apr 2013 15:43:23 +0000 (15:43 +0000)
committerImre Kaloz <kaloz@openwrt.org>
Mon, 1 Apr 2013 15:43:23 +0000 (15:43 +0000)
SVN-Revision: 36148

toolchain/gcc/common.mk
toolchain/gcc/initial/Makefile

index 01fae98..35ffbf8 100644 (file)
@@ -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) \
                $(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
                --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
 
   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
   GCC_CONFIGURE+= \
                --with-mpc=$(TOPDIR)/staging_dir/host
 endif
@@ -141,7 +137,9 @@ ifneq ($(CONFIG_EXTRA_TARGET_ARCH),)
 endif
 
 ifdef CONFIG_sparc
 endif
 
 ifdef CONFIG_sparc
-  GCC_CONFIGURE+= --enable-targets=all
+  GCC_CONFIGURE+= \
+               --enable-targets=all \
+               --with-long-double-128
 endif
 
 ifeq ($(LIBC),uClibc)
 endif
 
 ifeq ($(LIBC),uClibc)
index d1481e0..f0c65b5 100644 (file)
@@ -14,14 +14,14 @@ define Host/Compile
        +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
                all-build-libiberty \
                all-gcc \
        +$(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 \
 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) ; \
 
        # XXX: glibc insists on linking against libgcc_eh
        ( cd $(TOOLCHAIN_DIR)/initial/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) ; \