Author: nbd
Date: 2015-03-24 11:06:27 +0100 (Tue, 24 Mar 2015)
New Revision: 44957

Removed:
   trunk/toolchain/gcc/patches/4.4.7/
Modified:
   trunk/toolchain/gcc/Config.in
   trunk/toolchain/gcc/Config.version
   trunk/toolchain/gcc/common.mk
Log:
gcc: remove 4.4.7 (only used by avr32)

Signed-off-by: Felix Fietkau <[email protected]>

Modified: trunk/toolchain/gcc/Config.in
===================================================================
--- trunk/toolchain/gcc/Config.in       2015-03-24 10:06:14 UTC (rev 44956)
+++ trunk/toolchain/gcc/Config.in       2015-03-24 10:06:27 UTC (rev 44957)
@@ -2,17 +2,11 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_USE_VERSION_4_4_7 if avr32
        default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
        default GCC_USE_VERSION_4_8_LINARO
        help
          Select the version of gcc you wish to use.
 
-       config GCC_USE_VERSION_4_4_7
-               select GCC_VERSION_4_4_7
-               bool "gcc 4.4.7"
-               depends on avr32
-
        config GCC_USE_VERSION_4_6_LINARO
                select GCC_VERSION_4_6_LINARO
                bool "gcc 4.6.x with Linaro enhancements"

Modified: trunk/toolchain/gcc/Config.version
===================================================================
--- trunk/toolchain/gcc/Config.version  2015-03-24 10:06:14 UTC (rev 44956)
+++ trunk/toolchain/gcc/Config.version  2015-03-24 10:06:27 UTC (rev 44957)
@@ -1,13 +1,9 @@
-config GCC_VERSION_4_4_7
-       default y if (!TOOLCHAINOPTS && avr32)
-       bool
-
 config GCC_VERSION_4_6_LINARO
        default y if (!TOOLCHAINOPTS && TARGET_octeon)
        bool
 
 config GCC_VERSION_4_8_LINARO
-       default y if (!TOOLCHAINOPTS && !avr32 && !TARGET_octeon)
+       default y if (!TOOLCHAINOPTS && !TARGET_octeon)
        bool
 
 config GCC_VERSION_4_9_LINARO
@@ -15,17 +11,12 @@
 
 config GCC_VERSION
        string
-       default "4.4.7"     if GCC_VERSION_4_4_7
        default "4.6.3"     if GCC_VERSION_4_6_3
        default "4.6-linaro"    if GCC_VERSION_4_6_LINARO
        default "4.8-linaro"    if GCC_VERSION_4_8_LINARO
        default "4.9-linaro"    if GCC_VERSION_4_9_LINARO
        default "4.6-linaro"
 
-config GCC_VERSION_4_4
-       bool
-       default y       if GCC_VERSION_4_4_7
-
 config GCC_VERSION_4_6
        bool
        default y       if GCC_VERSION_4_6_LINARO

Modified: trunk/toolchain/gcc/common.mk
===================================================================
--- trunk/toolchain/gcc/common.mk       2015-03-24 10:06:14 UTC (rev 44956)
+++ trunk/toolchain/gcc/common.mk       2015-03-24 10:06:27 UTC (rev 44957)
@@ -61,9 +61,6 @@
   PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
   PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
-  ifeq ($(PKG_VERSION),4.4.7)
-    PKG_MD5SUM:=295709feb4441b04e87dea3f1bab4281
-  endif
   ifeq ($(PKG_VERSION),4.6.3)
     PKG_MD5SUM:=773092fe5194353b02bb0110052a972e
   endif
@@ -133,16 +130,12 @@
                        --with-abi=$(subst ",,$(CONFIG_MIPS64_ABI))) \
                --with-gmp=$(TOPDIR)/staging_dir/host \
                --with-mpfr=$(TOPDIR)/staging_dir/host \
+               --with-mpc=$(TOPDIR)/staging_dir/host \
                --disable-decimal-float
 ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
   GCC_CONFIGURE += --with-mips-plt
 endif
 
-ifeq ($(CONFIG_GCC_VERSION_4_4),)
-  GCC_CONFIGURE+= \
-               --with-mpc=$(TOPDIR)/staging_dir/host
-endif
-
 ifneq ($(CONFIG_SSP_SUPPORT),)
   GCC_CONFIGURE+= \
                --enable-libssp
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to