[toolchain]: get rid of gcc 4.1.2 and 4.2.4 support

SVN-Revision: 25144

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 78b3fa8e3a0ba7d081d0a693fd4c54d65c47d479..bd46864bc2edf5a9f5dacf563469673cb822977b 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -65,11 +65,6 @@ UCI_MAKEOPTS = \
                FPIC="$(FPIC)" \
                OS="Linux"
 
                FPIC="$(FPIC)" \
                OS="Linux"
 

-# work around a nasty gcc bug
-ifneq ($(CONFIG_GCC_VERSION_4_2_4),)
-  UCI_MAKEOPTS += WOPTS=""
-endif
-

 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) $(UCI_MAKEOPTS)
        $(MAKE) -C $(PKG_BUILD_DIR)/lua $(UCI_MAKEOPTS)
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) $(UCI_MAKEOPTS)
        $(MAKE) -C $(PKG_BUILD_DIR)/lua $(UCI_MAKEOPTS)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 01b8f60044efb60cd2e765f9f5bcc1f56b73b396..cd4f3e25e91f3ab6a22e8fcbbdd01996c9c3e245 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -12,12 +12,6 @@ choice
        help
          Select the version of gcc you wish to use.
 
        help
          Select the version of gcc you wish to use.
 

-       config GCC_VERSION_4_1_2
-               bool "gcc 4.1.2"
-
-       config GCC_VERSION_4_2_4
-               bool "gcc 4.2.4"
-

        config GCC_VERSION_4_3_5
                bool "gcc 4.3.5"
 
        config GCC_VERSION_4_3_5
                bool "gcc 4.3.5"
 


@@ -84,7 +78,7 @@ config INSTALL_LIBSTDCPP
 
 config INSTALL_LIBGCJ
        bool
 
 config INSTALL_LIBGCJ
        bool

-       depends on !(GCC_VERSION_4_1||GCC_VERSION_4_2)
+       depends on !GCC_VERSION_4_2

        prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
        default n
        help
        prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
        default n
        help

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index a5a1ea63b5d7e4240917e12071a48d2aacf3ea4a..a39c0e88a9a4c5a8e21449de47fa78d8f37dc1de 100644 (file)
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -1,7 +1,5 @@
 config GCC_VERSION
        string
 config GCC_VERSION
        string

-       default "4.1.2"     if GCC_VERSION_4_1_2
-       default "4.2.4"     if GCC_VERSION_4_2_4

        default "4.3.3+cs"  if GCC_VERSION_4_3_3_CS
        default "4.3.5"     if GCC_VERSION_4_3_5
        default "4.4.1+cs"  if GCC_VERSION_4_4_1_CS
        default "4.3.3+cs"  if GCC_VERSION_4_3_3_CS
        default "4.3.5"     if GCC_VERSION_4_3_5
        default "4.4.1+cs"  if GCC_VERSION_4_4_1_CS


@@ -13,19 +11,13 @@ config GCC_VERSION
 
 config GCC_VERSION_4
        bool
 
 config GCC_VERSION_4
        bool

-       default y       if GCC_VERSION_4_1

        default y       if GCC_VERSION_4_2
        default y       if GCC_VERSION_4_3
        default y       if GCC_VERSION_4_4
        default y       if GCC_VERSION_4_5
 
        default y       if GCC_VERSION_4_2
        default y       if GCC_VERSION_4_3
        default y       if GCC_VERSION_4_4
        default y       if GCC_VERSION_4_5
 

-config GCC_VERSION_4_1
-       bool
-       default y       if GCC_VERSION_4_1_2
-

 config GCC_VERSION_4_2
        bool
 config GCC_VERSION_4_2
        bool

-       default y       if GCC_VERSION_4_2_4

        default y       if GCC_VERSION_LLVM
 
 config GCC_VERSION_4_3
        default y       if GCC_VERSION_LLVM
 
 config GCC_VERSION_4_3