From e8a253ed34060f934df58c1f6f083cb726c55df1 Mon Sep 17 00:00:00 2001 From: kaloz Date: Fri, 1 Jul 2011 13:39:50 +0000 Subject: [PATCH] [toolchain/gcc]: bump the 4.4 flavour to 4.4.6 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27337 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/gcc/Config.in | 6 +++--- toolchain/gcc/Config.version | 10 +++++----- toolchain/gcc/common.mk | 4 ++-- .../{4.4.5 => 4.4.6}/100-uclibc-conf.patch | 0 .../301-missing-execinfo_h.patch | 0 .../{4.4.5 => 4.4.6}/302-c99-snprintf.patch | 0 .../305-libmudflap-susv3-legacy.patch | 0 .../{4.4.5 => 4.4.6}/600-ubicom_support.patch | 2 +- .../810-arm-softfloat-libgcc.patch | 0 .../{4.4.5 => 4.4.6}/820-libgcc_pic.patch | 0 .../{4.4.5 => 4.4.6}/910-mbsd_multi.patch | 0 .../{4.4.5 => 4.4.6}/930-avr32_support.patch | 16 ++++++++-------- .../931-avr32_disable_shifted_data_opt.patch | 0 .../{4.4.5 => 4.4.6}/933-avr32_bug_7435.patch | 4 ++-- .../{4.4.5 => 4.4.6}/934-avr32_bug_9675.patch | 0 .../993-arm_insn-opinit-RTX_CODE-fixup.patch | 0 .../patches/{4.4.5 => 4.4.6}/999-coldfire.patch | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/100-uclibc-conf.patch (100%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/301-missing-execinfo_h.patch (100%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/302-c99-snprintf.patch (100%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/305-libmudflap-susv3-legacy.patch (100%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/600-ubicom_support.patch (99%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/810-arm-softfloat-libgcc.patch (100%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/820-libgcc_pic.patch (100%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/910-mbsd_multi.patch (100%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/930-avr32_support.patch (99%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/931-avr32_disable_shifted_data_opt.patch (100%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/933-avr32_bug_7435.patch (94%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/934-avr32_bug_9675.patch (100%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/993-arm_insn-opinit-RTX_CODE-fixup.patch (100%) rename toolchain/gcc/patches/{4.4.5 => 4.4.6}/999-coldfire.patch (79%) diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 9e6d0ed86..7f8a0fc31 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -4,7 +4,7 @@ choice prompt "GCC compiler Version" if TOOLCHAINOPTS default GCC_VERSION_4_3_3_CS if GCC_DEFAULT_VERSION_4_3_3_CS default GCC_VERSION_4_3_5 if GCC_DEFAULT_VERSION_4_3_5 - default GCC_VERSION_4_4_5 if GCC_DEFAULT_VERSION_4_4_5 + default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6 default GCC_VERSION_LINARO help Select the version of gcc you wish to use. @@ -12,8 +12,8 @@ choice config GCC_VERSION_4_3_5 bool "gcc 4.3.5" - config GCC_VERSION_4_4_5 - bool "gcc 4.4.5" + config GCC_VERSION_4_4_6 + bool "gcc 4.4.6" config GCC_VERSION_4_6_1 bool "gcc 4.6.1" diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index c8aff0220..0661ea4a2 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -10,7 +10,7 @@ config GCC_DEFAULT_VERSION_4_3_5 default y if (avr32 || powerpc64 || TARGET_coldfire || TARGET_etrax) bool -config GCC_DEFAULT_VERSION_4_4_5 +config GCC_DEFAULT_VERSION_4_4_6 select GCC_DEFAULT_VERSION default y if (powerpc || ubicom32) bool @@ -25,7 +25,7 @@ config GCC_VERSION 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.4.5" if GCC_VERSION_4_4_5 + default "4.4.6" if GCC_VERSION_4_4_6 default "4.6.1" if GCC_VERSION_4_6_1 default "linaro" if GCC_VERSION_LINARO default "llvm" if GCC_VERSION_LLVM @@ -39,7 +39,7 @@ config GCC_VERSION_4_3 config GCC_VERSION_4_4 bool default y if GCC_VERSION_4_4_1_CS - default y if GCC_VERSION_4_4_5 + default y if GCC_VERSION_4_4_6 config GCC_VERSION_4_5 bool @@ -59,8 +59,8 @@ if !TOOLCHAINOPTS default y if GCC_DEFAULT_VERSION_4_3_5 bool - config GCC_VERSION_4_4_5 - default y if GCC_DEFAULT_VERSION_4_4_5 + config GCC_VERSION_4_4_6 + default y if GCC_DEFAULT_VERSION_4_4_6 bool config GCC_VERSION_LINARO diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index a71f2981d..d0c62940a 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -57,8 +57,8 @@ else ifeq ($(PKG_VERSION),4.4.1) PKG_MD5SUM:=927eaac3d44b22f31f9c83df82f26436 endif - ifeq ($(PKG_VERSION),4.4.5) - PKG_MD5SUM:=44b3192c4c584b9be5243d9e8e7e0ed1 + ifeq ($(PKG_VERSION),4.4.6) + PKG_MD5SUM:=ab525d429ee4425050a554bc9247d6c4 endif ifeq ($(PKG_VERSION),4.6.1) PKG_MD5SUM:=c57a9170c677bf795bdc04ed796ca491 diff --git a/toolchain/gcc/patches/4.4.5/100-uclibc-conf.patch b/toolchain/gcc/patches/4.4.6/100-uclibc-conf.patch similarity index 100% rename from toolchain/gcc/patches/4.4.5/100-uclibc-conf.patch rename to toolchain/gcc/patches/4.4.6/100-uclibc-conf.patch diff --git a/toolchain/gcc/patches/4.4.5/301-missing-execinfo_h.patch b/toolchain/gcc/patches/4.4.6/301-missing-execinfo_h.patch similarity index 100% rename from toolchain/gcc/patches/4.4.5/301-missing-execinfo_h.patch rename to toolchain/gcc/patches/4.4.6/301-missing-execinfo_h.patch diff --git a/toolchain/gcc/patches/4.4.5/302-c99-snprintf.patch b/toolchain/gcc/patches/4.4.6/302-c99-snprintf.patch similarity index 100% rename from toolchain/gcc/patches/4.4.5/302-c99-snprintf.patch rename to toolchain/gcc/patches/4.4.6/302-c99-snprintf.patch diff --git a/toolchain/gcc/patches/4.4.5/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/patches/4.4.6/305-libmudflap-susv3-legacy.patch similarity index 100% rename from toolchain/gcc/patches/4.4.5/305-libmudflap-susv3-legacy.patch rename to toolchain/gcc/patches/4.4.6/305-libmudflap-susv3-legacy.patch diff --git a/toolchain/gcc/patches/4.4.5/600-ubicom_support.patch b/toolchain/gcc/patches/4.4.6/600-ubicom_support.patch similarity index 99% rename from toolchain/gcc/patches/4.4.5/600-ubicom_support.patch rename to toolchain/gcc/patches/4.4.6/600-ubicom_support.patch index 040128f1b..74903bd4b 100644 --- a/toolchain/gcc/patches/4.4.5/600-ubicom_support.patch +++ b/toolchain/gcc/patches/4.4.6/600-ubicom_support.patch @@ -9313,7 +9313,7 @@ +#define FATAL_EXIT_CODE 33 --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -2339,6 +2339,34 @@ spu-*-elf*) +@@ -2340,6 +2340,34 @@ spu-*-elf*) c_target_objs="${c_target_objs} spu-c.o" cxx_target_objs="${cxx_target_objs} spu-c.o" ;; diff --git a/toolchain/gcc/patches/4.4.5/810-arm-softfloat-libgcc.patch b/toolchain/gcc/patches/4.4.6/810-arm-softfloat-libgcc.patch similarity index 100% rename from toolchain/gcc/patches/4.4.5/810-arm-softfloat-libgcc.patch rename to toolchain/gcc/patches/4.4.6/810-arm-softfloat-libgcc.patch diff --git a/toolchain/gcc/patches/4.4.5/820-libgcc_pic.patch b/toolchain/gcc/patches/4.4.6/820-libgcc_pic.patch similarity index 100% rename from toolchain/gcc/patches/4.4.5/820-libgcc_pic.patch rename to toolchain/gcc/patches/4.4.6/820-libgcc_pic.patch diff --git a/toolchain/gcc/patches/4.4.5/910-mbsd_multi.patch b/toolchain/gcc/patches/4.4.6/910-mbsd_multi.patch similarity index 100% rename from toolchain/gcc/patches/4.4.5/910-mbsd_multi.patch rename to toolchain/gcc/patches/4.4.6/910-mbsd_multi.patch diff --git a/toolchain/gcc/patches/4.4.5/930-avr32_support.patch b/toolchain/gcc/patches/4.4.6/930-avr32_support.patch similarity index 99% rename from toolchain/gcc/patches/4.4.5/930-avr32_support.patch rename to toolchain/gcc/patches/4.4.6/930-avr32_support.patch index a2d1c2f21..334d2cd13 100644 --- a/toolchain/gcc/patches/4.4.5/930-avr32_support.patch +++ b/toolchain/gcc/patches/4.4.6/930-avr32_support.patch @@ -1,6 +1,6 @@ --- a/gcc/builtins.c +++ b/gcc/builtins.c -@@ -11092,7 +11092,7 @@ validate_gimple_arglist (const_gimple ca +@@ -11108,7 +11108,7 @@ validate_gimple_arglist (const_gimple ca do { @@ -21539,7 +21539,7 @@ bfin*-elf*) tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h" tmake_file=bfin/t-bfin-elf -@@ -2763,6 +2781,32 @@ case "${target}" in +@@ -2764,6 +2782,32 @@ case "${target}" in fi ;; @@ -21588,7 +21588,7 @@ changequote([,])dnl if test $as_major -eq 2 && test $as_minor -lt 11 then : -@@ -3296,7 +3295,7 @@ case "$target" in +@@ -3308,7 +3307,7 @@ case "$target" in i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \ | x86_64*-*-* | hppa*-*-* | arm*-*-* \ | xstormy16*-*-* | cris-*-* | crisv32-*-* | xtensa*-*-* | bfin-*-* | score*-*-* \ @@ -21624,7 +21624,7 @@ On ARMv7-M the interrupt type is ignored, and the attribute means the function may be called with a word aligned stack pointer. -@@ -4224,6 +4233,23 @@ placed in either the @code{.bss_below100 +@@ -4188,6 +4197,23 @@ placed in either the @code{.bss_below100 @end table @@ -21750,7 +21750,7 @@ -Wno-non-template-friend -Wold-style-cast @gol -Woverloaded-virtual -Wno-pmf-conversions @gol -Wsign-promo} -@@ -637,6 +637,12 @@ Objective-C and Objective-C++ Dialects}. +@@ -641,6 +641,12 @@ Objective-C and Objective-C++ Dialects}. -mauto-incdec -minmax -mlong-calls -mshort @gol -msoft-reg-count=@var{count}} @@ -22119,7 +22119,7 @@ } dest = gen_rtx_MEM (mode, dest_addr); -@@ -5772,7 +5774,8 @@ store_field (rtx target, HOST_WIDE_INT b +@@ -5775,7 +5777,8 @@ store_field (rtx target, HOST_WIDE_INT b is a bit field, we cannot use addressing to access it. Use bit-field techniques or SUBREG to store in it. */ @@ -22129,7 +22129,7 @@ || (mode != BLKmode && ! direct_store[(int) mode] && GET_MODE_CLASS (mode) != MODE_COMPLEX_INT && GET_MODE_CLASS (mode) != MODE_COMPLEX_FLOAT) -@@ -5929,7 +5932,18 @@ get_inner_reference (tree exp, HOST_WIDE +@@ -5932,7 +5935,18 @@ get_inner_reference (tree exp, HOST_WIDE { tree field = TREE_OPERAND (exp, 1); size_tree = DECL_SIZE (field); @@ -22149,7 +22149,7 @@ mode = DECL_MODE (field); else if (DECL_MODE (field) == BLKmode) blkmode_bitfield = true; -@@ -7912,7 +7926,8 @@ expand_expr_real_1 (tree exp, rtx target +@@ -7915,7 +7929,8 @@ expand_expr_real_1 (tree exp, rtx target by doing the extract into an object as wide as the field (which we know to be the width of a basic mode), then storing into memory, and changing the mode to BLKmode. */ diff --git a/toolchain/gcc/patches/4.4.5/931-avr32_disable_shifted_data_opt.patch b/toolchain/gcc/patches/4.4.6/931-avr32_disable_shifted_data_opt.patch similarity index 100% rename from toolchain/gcc/patches/4.4.5/931-avr32_disable_shifted_data_opt.patch rename to toolchain/gcc/patches/4.4.6/931-avr32_disable_shifted_data_opt.patch diff --git a/toolchain/gcc/patches/4.4.5/933-avr32_bug_7435.patch b/toolchain/gcc/patches/4.4.6/933-avr32_bug_7435.patch similarity index 94% rename from toolchain/gcc/patches/4.4.5/933-avr32_bug_7435.patch rename to toolchain/gcc/patches/4.4.6/933-avr32_bug_7435.patch index 021c62ecf..78106619c 100644 --- a/toolchain/gcc/patches/4.4.5/933-avr32_bug_7435.patch +++ b/toolchain/gcc/patches/4.4.6/933-avr32_bug_7435.patch @@ -1,6 +1,6 @@ --- a/gcc/config/avr32/avr32.c +++ b/gcc/config/avr32/avr32.c -@@ -222,14 +222,14 @@ void +@@ -243,14 +243,14 @@ void avr32_override_options (void) { const struct part_type_s *part; @@ -17,7 +17,7 @@ avr32_arch_name); avr32_arch_name="ucr1"; } -@@ -277,6 +277,12 @@ avr32_override_options (void) +@@ -298,6 +298,12 @@ avr32_override_options (void) if (!arch->name) avr32_arch = &avr32_arch_types[avr32_part->arch_type]; diff --git a/toolchain/gcc/patches/4.4.5/934-avr32_bug_9675.patch b/toolchain/gcc/patches/4.4.6/934-avr32_bug_9675.patch similarity index 100% rename from toolchain/gcc/patches/4.4.5/934-avr32_bug_9675.patch rename to toolchain/gcc/patches/4.4.6/934-avr32_bug_9675.patch diff --git a/toolchain/gcc/patches/4.4.5/993-arm_insn-opinit-RTX_CODE-fixup.patch b/toolchain/gcc/patches/4.4.6/993-arm_insn-opinit-RTX_CODE-fixup.patch similarity index 100% rename from toolchain/gcc/patches/4.4.5/993-arm_insn-opinit-RTX_CODE-fixup.patch rename to toolchain/gcc/patches/4.4.6/993-arm_insn-opinit-RTX_CODE-fixup.patch diff --git a/toolchain/gcc/patches/4.4.5/999-coldfire.patch b/toolchain/gcc/patches/4.4.6/999-coldfire.patch similarity index 79% rename from toolchain/gcc/patches/4.4.5/999-coldfire.patch rename to toolchain/gcc/patches/4.4.6/999-coldfire.patch index f7c6029b8..bce2177e8 100644 --- a/toolchain/gcc/patches/4.4.5/999-coldfire.patch +++ b/toolchain/gcc/patches/4.4.6/999-coldfire.patch @@ -1,6 +1,6 @@ --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -1536,6 +1536,7 @@ m68k-*-linux*) # Motorola m68k's runnin +@@ -1537,6 +1537,7 @@ m68k-*-linux*) # Motorola m68k's runnin if test x$sjlj != x1; then tmake_file="$tmake_file m68k/t-slibgcc-elf-ver" fi -- 2.20.1