From 7a2d11b187a45cc268a9ea526b71c6443a9994e7 Mon Sep 17 00:00:00 2001 From: kaloz Date: Mon, 9 Apr 2012 17:00:03 +0000 Subject: [PATCH] [toolchain/gcc/4.4]: upgrade to gcc 4.4.7 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31230 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/gcc/Config.in | 6 +++--- toolchain/gcc/Config.version | 10 +++++----- toolchain/gcc/common.mk | 4 ++-- .../gcc/patches/{4.4.6 => 4.4.7}/100-uclibc-conf.patch | 0 .../{4.4.6 => 4.4.7}/301-missing-execinfo_h.patch | 0 .../patches/{4.4.6 => 4.4.7}/302-c99-snprintf.patch | 0 .../{4.4.6 => 4.4.7}/305-libmudflap-susv3-legacy.patch | 0 .../patches/{4.4.6 => 4.4.7}/600-ubicom_support.patch | 2 +- .../{4.4.6 => 4.4.7}/810-arm-softfloat-libgcc.patch | 0 .../gcc/patches/{4.4.6 => 4.4.7}/820-libgcc_pic.patch | 0 .../gcc/patches/{4.4.6 => 4.4.7}/910-mbsd_multi.patch | 0 .../patches/{4.4.6 => 4.4.7}/930-avr32_support.patch | 0 .../931-avr32_disable_shifted_data_opt.patch | 0 .../patches/{4.4.6 => 4.4.7}/933-avr32_bug_7435.patch | 0 .../patches/{4.4.6 => 4.4.7}/934-avr32_bug_9675.patch | 0 .../993-arm_insn-opinit-RTX_CODE-fixup.patch | 0 .../gcc/patches/{4.4.6 => 4.4.7}/999-coldfire.patch | 0 17 files changed, 11 insertions(+), 11 deletions(-) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/100-uclibc-conf.patch (100%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/301-missing-execinfo_h.patch (100%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/302-c99-snprintf.patch (100%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/305-libmudflap-susv3-legacy.patch (100%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/600-ubicom_support.patch (99%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/810-arm-softfloat-libgcc.patch (100%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/820-libgcc_pic.patch (100%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/910-mbsd_multi.patch (100%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/930-avr32_support.patch (100%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/931-avr32_disable_shifted_data_opt.patch (100%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/933-avr32_bug_7435.patch (100%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/934-avr32_bug_9675.patch (100%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/993-arm_insn-opinit-RTX_CODE-fixup.patch (100%) rename toolchain/gcc/patches/{4.4.6 => 4.4.7}/999-coldfire.patch (100%) diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 90c262db5..4989c8a36 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -2,13 +2,13 @@ choice prompt "GCC compiler Version" if TOOLCHAINOPTS - default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6 + default GCC_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7 default GCC_VERSION_4_6_LINARO help Select the version of gcc you wish to use. - config GCC_VERSION_4_4_6 - bool "gcc 4.4.6" + config GCC_VERSION_4_4_7 + bool "gcc 4.4.7" depends (avr32 || ubicom32) config GCC_VERSION_4_6_2 diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index 6c5327533..06671063d 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -1,7 +1,7 @@ config GCC_DEFAULT_VERSION bool -config GCC_DEFAULT_VERSION_4_4_6 +config GCC_DEFAULT_VERSION_4_4_7 select GCC_DEFAULT_VERSION default y if (avr32 || ubicom32) bool @@ -13,7 +13,7 @@ config GCC_DEFAULT_VERSION_4_6_LINARO config GCC_VERSION string - default "4.4.6" if GCC_VERSION_4_4_6 + default "4.4.7" if GCC_VERSION_4_4_7 default "4.6.2" if GCC_VERSION_4_6_2 default "4.7.0" if GCC_VERSION_4_7_0 default "4.5-linaro" if GCC_VERSION_4_5_LINARO @@ -23,7 +23,7 @@ config GCC_VERSION config GCC_VERSION_4_4 bool - default y if GCC_VERSION_4_4_6 + default y if GCC_VERSION_4_4_7 config GCC_VERSION_4_5 bool @@ -39,8 +39,8 @@ config GCC_VERSION_4_7 if !TOOLCHAINOPTS - config GCC_VERSION_4_4_6 - default y if GCC_DEFAULT_VERSION_4_4_6 + config GCC_VERSION_4_4_7 + default y if GCC_DEFAULT_VERSION_4_4_7 bool config GCC_VERSION_4_6_LINARO diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 731af95e1..c0bc3f8c5 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -57,8 +57,8 @@ else PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 - ifeq ($(PKG_VERSION),4.4.6) - PKG_MD5SUM:=ab525d429ee4425050a554bc9247d6c4 + ifeq ($(PKG_VERSION),4.4.7) + PKG_MD5SUM:=295709feb4441b04e87dea3f1bab4281 endif ifeq ($(PKG_VERSION),4.6.2) PKG_MD5SUM:=028115c4fbfb6cfd75d6369f4a90d87e diff --git a/toolchain/gcc/patches/4.4.6/100-uclibc-conf.patch b/toolchain/gcc/patches/4.4.7/100-uclibc-conf.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/100-uclibc-conf.patch rename to toolchain/gcc/patches/4.4.7/100-uclibc-conf.patch diff --git a/toolchain/gcc/patches/4.4.6/301-missing-execinfo_h.patch b/toolchain/gcc/patches/4.4.7/301-missing-execinfo_h.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/301-missing-execinfo_h.patch rename to toolchain/gcc/patches/4.4.7/301-missing-execinfo_h.patch diff --git a/toolchain/gcc/patches/4.4.6/302-c99-snprintf.patch b/toolchain/gcc/patches/4.4.7/302-c99-snprintf.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/302-c99-snprintf.patch rename to toolchain/gcc/patches/4.4.7/302-c99-snprintf.patch diff --git a/toolchain/gcc/patches/4.4.6/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/patches/4.4.7/305-libmudflap-susv3-legacy.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/305-libmudflap-susv3-legacy.patch rename to toolchain/gcc/patches/4.4.7/305-libmudflap-susv3-legacy.patch diff --git a/toolchain/gcc/patches/4.4.6/600-ubicom_support.patch b/toolchain/gcc/patches/4.4.7/600-ubicom_support.patch similarity index 99% rename from toolchain/gcc/patches/4.4.6/600-ubicom_support.patch rename to toolchain/gcc/patches/4.4.7/600-ubicom_support.patch index 74903bd4b..f9f93c1b4 100644 --- a/toolchain/gcc/patches/4.4.6/600-ubicom_support.patch +++ b/toolchain/gcc/patches/4.4.7/600-ubicom_support.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -2688,6 +2688,9 @@ case "${target}" in +@@ -2690,6 +2690,9 @@ case "${target}" in ip2k-*-*) noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}" ;; diff --git a/toolchain/gcc/patches/4.4.6/810-arm-softfloat-libgcc.patch b/toolchain/gcc/patches/4.4.7/810-arm-softfloat-libgcc.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/810-arm-softfloat-libgcc.patch rename to toolchain/gcc/patches/4.4.7/810-arm-softfloat-libgcc.patch diff --git a/toolchain/gcc/patches/4.4.6/820-libgcc_pic.patch b/toolchain/gcc/patches/4.4.7/820-libgcc_pic.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/820-libgcc_pic.patch rename to toolchain/gcc/patches/4.4.7/820-libgcc_pic.patch diff --git a/toolchain/gcc/patches/4.4.6/910-mbsd_multi.patch b/toolchain/gcc/patches/4.4.7/910-mbsd_multi.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/910-mbsd_multi.patch rename to toolchain/gcc/patches/4.4.7/910-mbsd_multi.patch diff --git a/toolchain/gcc/patches/4.4.6/930-avr32_support.patch b/toolchain/gcc/patches/4.4.7/930-avr32_support.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/930-avr32_support.patch rename to toolchain/gcc/patches/4.4.7/930-avr32_support.patch diff --git a/toolchain/gcc/patches/4.4.6/931-avr32_disable_shifted_data_opt.patch b/toolchain/gcc/patches/4.4.7/931-avr32_disable_shifted_data_opt.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/931-avr32_disable_shifted_data_opt.patch rename to toolchain/gcc/patches/4.4.7/931-avr32_disable_shifted_data_opt.patch diff --git a/toolchain/gcc/patches/4.4.6/933-avr32_bug_7435.patch b/toolchain/gcc/patches/4.4.7/933-avr32_bug_7435.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/933-avr32_bug_7435.patch rename to toolchain/gcc/patches/4.4.7/933-avr32_bug_7435.patch diff --git a/toolchain/gcc/patches/4.4.6/934-avr32_bug_9675.patch b/toolchain/gcc/patches/4.4.7/934-avr32_bug_9675.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/934-avr32_bug_9675.patch rename to toolchain/gcc/patches/4.4.7/934-avr32_bug_9675.patch diff --git a/toolchain/gcc/patches/4.4.6/993-arm_insn-opinit-RTX_CODE-fixup.patch b/toolchain/gcc/patches/4.4.7/993-arm_insn-opinit-RTX_CODE-fixup.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/993-arm_insn-opinit-RTX_CODE-fixup.patch rename to toolchain/gcc/patches/4.4.7/993-arm_insn-opinit-RTX_CODE-fixup.patch diff --git a/toolchain/gcc/patches/4.4.6/999-coldfire.patch b/toolchain/gcc/patches/4.4.7/999-coldfire.patch similarity index 100% rename from toolchain/gcc/patches/4.4.6/999-coldfire.patch rename to toolchain/gcc/patches/4.4.7/999-coldfire.patch