aboutsummaryrefslogtreecommitdiff
path: root/meta-aarch64
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-05-08 13:09:01 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-05-08 13:10:39 +0200
commit3ad3915821827e08d4ebfbdebab53089cd479142 (patch)
treef24e5dcc797dda3347f6bf77fb7a693ff596d648 /meta-aarch64
parent6cf7a04a4716470a075ebe8acb09252d57cd8519 (diff)
downloadmeta-linaro-3ad3915821827e08d4ebfbdebab53089cd479142.tar.gz
gcc: update patches, refresh 800-arm-bigendian.patch
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Diffstat (limited to 'meta-aarch64')
-rw-r--r--meta-aarch64/recipes-devtools/gcc/files/800-arm-bigendian.patch36
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/0001-Makefile.in-vis_hide-gen-hide-list-Do-not-make-defin.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/0001-Makefile.in-vis_hide-gen-hide-list-Do-not-make-defin.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/0001-crtstuff.c-USE_PT_GNU_EH_FRAME-Define-for-systems-us.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/0001-crtstuff.c-USE_PT_GNU_EH_FRAME-Define-for-systems-us.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/100-uclibc-conf.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/100-uclibc-conf.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/200-uclibc-locale.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/200-uclibc-locale.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/203-uclibc-locale-no__x.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/203-uclibc-locale-no__x.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/204-uclibc-locale-wchar_fix.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/204-uclibc-locale-wchar_fix.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/205-uclibc-locale-update.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/205-uclibc-locale-update.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/301-missing-execinfo_h.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/301-missing-execinfo_h.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/302-c99-snprintf.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/302-c99-snprintf.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/303-c99-complex-ugly-hack.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/303-c99-complex-ugly-hack.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/304-index_macro.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/304-index_macro.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/305-libmudflap-susv3-legacy.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/305-libmudflap-susv3-legacy.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/306-libstdc++-namespace.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/306-libstdc++-namespace.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/64bithack.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/64bithack.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/740-sh-pr24836.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/740-sh-pr24836.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/800-arm-bigendian.patch26
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/COLLECT_GCC_OPTIONS.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/COLLECT_GCC_OPTIONS.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/GLIBC_DYNAMIC_LINKER.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/GLIBC_DYNAMIC_LINKER.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/arm-hard-float-loader.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/arm-hard-float-loader.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/avoid-oob-array-access.patch45
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/cpp-honor-sysroot.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/cpp-honor-sysroot.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/define_insn_reservation.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/define_insn_reservation.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch107
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/disable_relax_pic_calls_flag.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/disable_relax_pic_calls_flag.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/disablesdt.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/disablesdt.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/fix-g++-sysroot.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/fix-g++-sysroot.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/fortran-cross-compile-hack.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/fortran-cross-compile-hack.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-argument-list-too-long.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/gcc-argument-list-too-long.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-armv4-pass-fix-v4bx-to-ld.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/gcc-armv4-pass-fix-v4bx-to-ld.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-poison-dir-extend.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/gcc-poison-dir-extend.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-poison-system-directories.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/gcc-poison-system-directories.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-uclibc-locale-ctype_touplow_t.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/gcc-uclibc-locale-ctype_touplow_t.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/libgcc-sjlj-check.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/libgcc-sjlj-check.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/libtool.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/libtool.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/mips64-default-n64.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/mips64-default-n64.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/optional_libstdc.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/optional_libstdc.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/ppc_no_crtsavres.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/ppc_no_crtsavres.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/ppc_with_cpu.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/ppc_with_cpu.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/ppce5500-e6500-support.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/ppce5500-e6500-support.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/pr32219.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/pr32219.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/rs6000-tables.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/rs6000-tables.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/use-defaults.h-and-t-oe-in-B.patch (renamed from meta-aarch64/recipes-devtools/gcc/files/use-defaults.h-and-t-oe-in-B.patch)0
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/use-ml-conf-files-from-B.patch87
-rw-r--r--meta-aarch64/recipes-devtools/gcc/gcc-4.7/wcast-qual-PR55383.patch43
47 files changed, 308 insertions, 36 deletions
diff --git a/meta-aarch64/recipes-devtools/gcc/files/800-arm-bigendian.patch b/meta-aarch64/recipes-devtools/gcc/files/800-arm-bigendian.patch
deleted file mode 100644
index ac301bd8..00000000
--- a/meta-aarch64/recipes-devtools/gcc/files/800-arm-bigendian.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream-Status: Pending
-
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
-Index: gcc-4_7-branch/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4_7-branch.orig/gcc/config/arm/linux-elf.h 2012-04-10 10:19:49.171337068 -0700
-+++ gcc-4_7-branch/gcc/config/arm/linux-elf.h 2012-04-10 10:32:36.819374226 -0700
-@@ -48,7 +48,7 @@
-
- #undef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
-- { "marm", "mlittle-endian", "mfloat-abi=hard", "mno-thumb-interwork" }
-+ { "marm", TARGET_ENDIAN_OPTION, "mfloat-abi=hard", "mno-thumb-interwork" }
-
- /* Now we define the strings used to build the spec file. */
- #undef LIB_SPEC
-Index: gcc-4_7-branch/gcc/config.gcc
-===================================================================
---- gcc-4_7-branch.orig/gcc/config.gcc 2012-04-10 10:19:49.159337069 -0700
-+++ gcc-4_7-branch/gcc/config.gcc 2012-04-10 10:32:36.823374222 -0700
-@@ -842,6 +842,11 @@
- esac
- tmake_file="${tmake_file} arm/t-arm"
- case ${target} in
-+ arm*b-*)
-+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ case ${target} in
- arm*-*-linux-*eabi)
- tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
- tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
diff --git a/meta-aarch64/recipes-devtools/gcc/files/0001-Makefile.in-vis_hide-gen-hide-list-Do-not-make-defin.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/0001-Makefile.in-vis_hide-gen-hide-list-Do-not-make-defin.patch
index b6f8f943..b6f8f943 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/0001-Makefile.in-vis_hide-gen-hide-list-Do-not-make-defin.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/0001-Makefile.in-vis_hide-gen-hide-list-Do-not-make-defin.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/0001-crtstuff.c-USE_PT_GNU_EH_FRAME-Define-for-systems-us.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/0001-crtstuff.c-USE_PT_GNU_EH_FRAME-Define-for-systems-us.patch
index 15034f7d..15034f7d 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/0001-crtstuff.c-USE_PT_GNU_EH_FRAME-Define-for-systems-us.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/0001-crtstuff.c-USE_PT_GNU_EH_FRAME-Define-for-systems-us.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/100-uclibc-conf.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/100-uclibc-conf.patch
index b2981e07..b2981e07 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/100-uclibc-conf.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/100-uclibc-conf.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/200-uclibc-locale.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/200-uclibc-locale.patch
index df22c544..df22c544 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/200-uclibc-locale.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/200-uclibc-locale.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/203-uclibc-locale-no__x.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/203-uclibc-locale-no__x.patch
index c602e913..c602e913 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/203-uclibc-locale-no__x.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/203-uclibc-locale-no__x.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/204-uclibc-locale-wchar_fix.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/204-uclibc-locale-wchar_fix.patch
index 896d2a57..896d2a57 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/204-uclibc-locale-wchar_fix.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/204-uclibc-locale-wchar_fix.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/205-uclibc-locale-update.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/205-uclibc-locale-update.patch
index 743017b4..743017b4 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/205-uclibc-locale-update.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/205-uclibc-locale-update.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/301-missing-execinfo_h.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/301-missing-execinfo_h.patch
index 9589822b..9589822b 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/301-missing-execinfo_h.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/301-missing-execinfo_h.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/302-c99-snprintf.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/302-c99-snprintf.patch
index 9becc15e..9becc15e 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/302-c99-snprintf.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/302-c99-snprintf.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/303-c99-complex-ugly-hack.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/303-c99-complex-ugly-hack.patch
index d69c5469..d69c5469 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/303-c99-complex-ugly-hack.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/303-c99-complex-ugly-hack.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/304-index_macro.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/304-index_macro.patch
index f1037652..f1037652 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/304-index_macro.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/304-index_macro.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/305-libmudflap-susv3-legacy.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/305-libmudflap-susv3-legacy.patch
index 10d09a7f..10d09a7f 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/305-libmudflap-susv3-legacy.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/305-libmudflap-susv3-legacy.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/306-libstdc++-namespace.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/306-libstdc++-namespace.patch
index e99bf960..e99bf960 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/306-libstdc++-namespace.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/306-libstdc++-namespace.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/64bithack.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/64bithack.patch
index f4756695..f4756695 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/64bithack.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/64bithack.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/740-sh-pr24836.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/740-sh-pr24836.patch
index 1406f87f..1406f87f 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/740-sh-pr24836.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/740-sh-pr24836.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/gcc-4.7/800-arm-bigendian.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/800-arm-bigendian.patch
new file mode 100644
index 00000000..1374e1d3
--- /dev/null
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/800-arm-bigendian.patch
@@ -0,0 +1,26 @@
+Upstream-Status: Pending
+
+By Lennert Buytenhek <buytenh@wantstofly.org>
+Adds support for arm*b-linux* big-endian ARM targets
+
+See http://gcc.gnu.org/PR16350
+
+---
+ gcc/config/arm/linux-elf.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- aarch64-4.7-branch.orig/gcc/config/arm/linux-elf.h
++++ aarch64-4.7-branch/gcc/config/arm/linux-elf.h
+@@ -46,11 +46,11 @@
+
+ #define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
+
+ #undef MULTILIB_DEFAULTS
+ #define MULTILIB_DEFAULTS \
+- { "marm", "mlittle-endian", "mfloat-abi=hard", "mno-thumb-interwork" }
++ { "marm", TARGET_ENDIAN_OPTION, "mfloat-abi=hard", "mno-thumb-interwork" }
+
+ /* Now we define the strings used to build the spec file. */
+ #undef LIB_SPEC
+ #define LIB_SPEC \
+ "%{pthread:-lpthread} \
diff --git a/meta-aarch64/recipes-devtools/gcc/files/COLLECT_GCC_OPTIONS.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/COLLECT_GCC_OPTIONS.patch
index f5982983..f5982983 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/COLLECT_GCC_OPTIONS.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/COLLECT_GCC_OPTIONS.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/GLIBC_DYNAMIC_LINKER.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/GLIBC_DYNAMIC_LINKER.patch
index 38c361e0..38c361e0 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/GLIBC_DYNAMIC_LINKER.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/GLIBC_DYNAMIC_LINKER.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/arm-hard-float-loader.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/arm-hard-float-loader.patch
index dfa0d191..dfa0d191 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/arm-hard-float-loader.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/arm-hard-float-loader.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/gcc-4.7/avoid-oob-array-access.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/avoid-oob-array-access.patch
new file mode 100644
index 00000000..4ba707d0
--- /dev/null
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/avoid-oob-array-access.patch
@@ -0,0 +1,45 @@
+Upstream-Status: Backport
+
+See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56308
+
+From 1e37e371d2cca3549b71a247bf79778aa1a9e1c4 Mon Sep 17 00:00:00 2001
+From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Fri, 21 Sep 2012 10:08:35 +0000
+Subject: [PATCH] 2012-09-21 Richard Guenther <rguenther@suse.de>
+
+ PR middle-end/54638
+ Backport from mainline
+ 2012-04-19 Richard Guenther <rguenther@suse.de>
+
+ * ira-int.h (ira_allocno_object_iter_cond): Avoid out-of-bound
+ array access.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@191605 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog | 9 +++++++++
+ gcc/ira-int.h | 9 +++++++--
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/ira-int.h b/gcc/ira-int.h
+index 9faabb5..771a368 100644
+--- a/gcc/ira-int.h
++++ b/gcc/ira-int.h
+@@ -1138,8 +1138,13 @@ static inline bool
+ ira_allocno_object_iter_cond (ira_allocno_object_iterator *i, ira_allocno_t a,
+ ira_object_t *o)
+ {
+- *o = ALLOCNO_OBJECT (a, i->n);
+- return i->n++ < ALLOCNO_NUM_OBJECTS (a);
++ int n = i->n++;
++ if (n < ALLOCNO_NUM_OBJECTS (a))
++ {
++ *o = ALLOCNO_OBJECT (a, n);
++ return true;
++ }
++ return false;
+ }
+
+ /* Loop over all objects associated with allocno A. In each
+--
+1.8.2.2
+
diff --git a/meta-aarch64/recipes-devtools/gcc/files/cpp-honor-sysroot.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/cpp-honor-sysroot.patch
index 73106774..73106774 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/cpp-honor-sysroot.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/cpp-honor-sysroot.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/define_insn_reservation.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/define_insn_reservation.patch
index 2b0ff677..2b0ff677 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/define_insn_reservation.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/define_insn_reservation.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch
new file mode 100644
index 00000000..d5c9165a
--- /dev/null
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/disable-texinfo-5.patch
@@ -0,0 +1,107 @@
+Upstream-Status: Pending
+
+gcc-4.8 is compatible with texinfo-5, so this is only temporary fix
+(we don't need info files on target)
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
+diff -uNr gcc-4.7.2.orig/configure.ac gcc-4.7.2/configure.ac
+--- gcc-4.7.2.orig/configure.ac 2013-04-04 09:10:24.600848496 +0200
++++ gcc-4.7.2/configure.ac 2013-04-04 09:51:51.808031042 +0200
+@@ -3031,7 +3031,7 @@
+ # For an installed makeinfo, we require it to be from texinfo 4.7 or
+ # higher, else we use the "missing" dummy.
+ if ${MAKEINFO} --version \
+- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
++ | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9]))' >/dev/null 2>&1; then
+ :
+ else
+ MAKEINFO="$MISSING makeinfo"
+diff -uNr gcc-4.7.2.orig/gcc/configure.ac gcc-4.7.2/gcc/configure.ac
+--- gcc-4.7.2.orig/gcc/configure.ac 2013-04-04 09:10:30.523848931 +0200
++++ gcc-4.7.2/gcc/configure.ac 2013-04-04 09:52:16.111032826 +0200
+@@ -871,7 +871,7 @@
+ # that we can use it.
+ ACX_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
+ [GNU texinfo.* \([0-9][0-9.]*\)],
+- [4.[7-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
++ [4.[7-9]*|4.[1-9][0-9]*])
+ if test $gcc_cv_prog_makeinfo_modern = no; then
+ AC_MSG_WARN([
+ *** Makeinfo is missing or too old.
+diff -uNr gcc-4.7.2.orig/libgomp/configure.ac gcc-4.7.2/libgomp/configure.ac
+--- gcc-4.7.2.orig/libgomp/configure.ac 2010-12-06 01:50:04.000000000 +0100
++++ gcc-4.7.2/libgomp/configure.ac 2013-04-04 09:51:29.571029410 +0200
+@@ -129,7 +129,7 @@
+ # that we can use it.
+ ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version],
+ [GNU texinfo.* \([0-9][0-9.]*\)],
+- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
++ [4.[4-9]*|4.[1-9][0-9]*])
+ AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes")
+
+
+diff -uNr gcc-4.7.2.orig/libiberty/configure.ac gcc-4.7.2/libiberty/configure.ac
+--- gcc-4.7.2.orig/libiberty/configure.ac 2011-08-22 18:54:02.000000000 +0200
++++ gcc-4.7.2/libiberty/configure.ac 2013-04-04 09:51:20.685028758 +0200
+@@ -84,6 +84,12 @@
+ AC_MSG_WARN([
+ *** Makeinfo is too old. Info documentation will not be built.])
+ ;;
++ x*\ [[5-9]].* )
++ MAKEINFO="@echo $MAKEINFO is too new, 5.0 or newer does not work; true"
++ BUILD_INFO=
++ AC_MSG_WARN([
++*** Makeinfo is too new. Info documentation will not be built.])
++ ;;
+ esac
+ ;;
+ esac
+diff -uNr gcc-4.7.2.orig/libitm/configure.ac gcc-4.7.2/libitm/configure.ac
+--- gcc-4.7.2.orig/libitm/configure.ac 2012-02-13 22:46:38.000000000 +0100
++++ gcc-4.7.2/libitm/configure.ac 2013-04-04 09:51:59.676031620 +0200
+@@ -140,7 +140,7 @@
+ # that we can use it.
+ ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version],
+ [GNU texinfo.* \([0-9][0-9.]*\)],
+- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
++ [4.[4-9]*|4.[1-9][0-9]*])
+ AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes")
+
+
+diff -uNr gcc-4.7.2.orig/libquadmath/configure.ac gcc-4.7.2/libquadmath/configure.ac
+--- gcc-4.7.2.orig/libquadmath/configure.ac 2012-05-31 20:57:56.000000000 +0200
++++ gcc-4.7.2/libquadmath/configure.ac 2013-04-04 09:49:52.432022281 +0200
+@@ -48,7 +48,7 @@
+ # that we can use it.
+ ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version],
+ [GNU texinfo.* \([0-9][0-9.]*\)],
+- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
++ [4.[4-9]*|4.[1-9][0-9]*])
+ AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes")
+
+ ACX_BUGURL([http://gcc.gnu.org/bugs.html])
+diff -uNr gcc-4.7.2.orig/libstdc++-v3/configure.ac gcc-4.7.2/libstdc++-v3/configure.ac
+--- gcc-4.7.2.orig/libstdc++-v3/configure.ac 2012-08-06 16:34:27.000000000 +0200
++++ gcc-4.7.2/libstdc++-v3/configure.ac 2013-04-04 09:49:57.483022652 +0200
+@@ -344,7 +344,7 @@
+ # that we can use it.
+ ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version],
+ [GNU texinfo.* \([0-9][0-9.]*\)],
+- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
++ [4.[4-9]*|4.[1-9][0-9]*])
+ AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes")
+
+ # Check for doxygen
+diff -uNr gcc-4.7.2.orig/configure gcc-4.7.2/configure
+--- gcc-4.7.2.orig/configure 2013-04-04 10:23:58.009172414 +0200
++++ gcc-4.7.2/configure 2013-04-04 10:26:42.696184501 +0200
+@@ -7858,7 +7858,7 @@
+ # For an installed makeinfo, we require it to be from texinfo 4.7 or
+ # higher, else we use the "missing" dummy.
+ if ${MAKEINFO} --version \
+- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
++ | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9]))' >/dev/null 2>&1; then
+ :
+ else
+ MAKEINFO="$MISSING makeinfo"
diff --git a/meta-aarch64/recipes-devtools/gcc/files/disable_relax_pic_calls_flag.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/disable_relax_pic_calls_flag.patch
index bc01cd91..bc01cd91 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/disable_relax_pic_calls_flag.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/disable_relax_pic_calls_flag.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/disablesdt.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/disablesdt.patch
index 8946afc1..8946afc1 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/disablesdt.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/disablesdt.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/fix-g++-sysroot.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/fix-g++-sysroot.patch
index aad234c6..aad234c6 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/fix-g++-sysroot.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/fix-g++-sysroot.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/fortran-cross-compile-hack.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/fortran-cross-compile-hack.patch
index 2773b42c..2773b42c 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/fortran-cross-compile-hack.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/fortran-cross-compile-hack.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index 964c4bbb..964c4bbb 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index ff136e19..ff136e19 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/gcc-argument-list-too-long.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-argument-list-too-long.patch
index 70d3c53a..70d3c53a 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/gcc-argument-list-too-long.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-argument-list-too-long.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/gcc-armv4-pass-fix-v4bx-to-ld.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-armv4-pass-fix-v4bx-to-ld.patch
index 7e03a3a8..7e03a3a8 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/gcc-armv4-pass-fix-v4bx-to-ld.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-armv4-pass-fix-v4bx-to-ld.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/gcc-poison-dir-extend.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-poison-dir-extend.patch
index 607129a6..607129a6 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/gcc-poison-dir-extend.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-poison-dir-extend.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/gcc-poison-system-directories.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-poison-system-directories.patch
index 82a55c9b..82a55c9b 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/gcc-poison-system-directories.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-poison-system-directories.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/gcc-uclibc-locale-ctype_touplow_t.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-uclibc-locale-ctype_touplow_t.patch
index 1648b3b9..1648b3b9 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/gcc-uclibc-locale-ctype_touplow_t.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/gcc-uclibc-locale-ctype_touplow_t.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/libgcc-sjlj-check.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/libgcc-sjlj-check.patch
index c2fe7921..c2fe7921 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/libgcc-sjlj-check.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/libgcc-sjlj-check.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/libtool.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/libtool.patch
index 9580b23d..9580b23d 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/libtool.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/libtool.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/mips64-default-n64.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/mips64-default-n64.patch
index a42569e0..a42569e0 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/mips64-default-n64.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/mips64-default-n64.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/optional_libstdc.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/optional_libstdc.patch
index 6e7536b6..6e7536b6 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/optional_libstdc.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/optional_libstdc.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/ppc_no_crtsavres.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/ppc_no_crtsavres.patch
index 92a5d9e1..92a5d9e1 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/ppc_no_crtsavres.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/ppc_no_crtsavres.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/ppc_with_cpu.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/ppc_with_cpu.patch
index 5ca12a68..5ca12a68 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/ppc_with_cpu.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/ppc_with_cpu.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/ppce5500-e6500-support.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/ppce5500-e6500-support.patch
index e3341fc0..e3341fc0 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/ppce5500-e6500-support.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/ppce5500-e6500-support.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/pr32219.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/pr32219.patch
index bea20630..bea20630 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/pr32219.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/pr32219.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/rs6000-tables.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/rs6000-tables.patch
index 5b8064b0..5b8064b0 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/rs6000-tables.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/rs6000-tables.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/files/use-defaults.h-and-t-oe-in-B.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/use-defaults.h-and-t-oe-in-B.patch
index 212c2632..212c2632 100644
--- a/meta-aarch64/recipes-devtools/gcc/files/use-defaults.h-and-t-oe-in-B.patch
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/use-defaults.h-and-t-oe-in-B.patch
diff --git a/meta-aarch64/recipes-devtools/gcc/gcc-4.7/use-ml-conf-files-from-B.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/use-ml-conf-files-from-B.patch
new file mode 100644
index 00000000..4d229247
--- /dev/null
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/use-ml-conf-files-from-B.patch
@@ -0,0 +1,87 @@
+Use the multilib config files from ${B} instead of using the ones from ${S}
+so that the source can be shared between gcc-cross-initial,
+gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+
+Index: gcc-4.7.2/gcc/configure
+===================================================================
+--- gcc-4.7.2.orig/gcc/configure
++++ gcc-4.7.2/gcc/configure
+@@ -11717,10 +11717,20 @@ done
+ tmake_file_=
+ for f in ${tmake_file}
+ do
+- if test -f ${srcdir}/config/$f
+- then
+- tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
+- fi
++ case $f in
++ */t-linux64 )
++ if test -f ./config/$f
++ then
++ tmake_file_="${tmake_file_} ./config/$f"
++ fi
++ ;;
++ * )
++ if test -f ${srcdir}/config/$f
++ then
++ tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
++ fi
++ ;;
++ esac
+ done
+ tmake_file="${tmake_file_}"
+
+@@ -11731,6 +11741,10 @@ tm_file_list="options.h"
+ tm_include_list="options.h insn-constants.h"
+ for f in $tm_file; do
+ case $f in
++ */linux64.h )
++ tm_file_list="${tm_file_list} ./config/$f"
++ tm_include_list="${tm_include_list} ./config/$f"
++ ;;
+ ./* )
+ f=`echo $f | sed 's/^..//'`
+ tm_file_list="${tm_file_list} $f"
+Index: gcc-4.7.2/gcc/configure.ac
+===================================================================
+--- gcc-4.7.2.orig/gcc/configure.ac
++++ gcc-4.7.2/gcc/configure.ac
+@@ -1701,10 +1701,20 @@ done
+ tmake_file_=
+ for f in ${tmake_file}
+ do
+- if test -f ${srcdir}/config/$f
+- then
+- tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
+- fi
++ case $f in
++ */t-linux64 )
++ if test -f ./config/$f
++ then
++ tmake_file_="${tmake_file_} ./config/$f"
++ fi
++ ;;
++ * )
++ if test -f ${srcdir}/config/$f
++ then
++ tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
++ fi
++ ;;
++ esac
+ done
+ tmake_file="${tmake_file_}"
+
+@@ -1715,6 +1725,10 @@ tm_file_list="options.h"
+ tm_include_list="options.h insn-constants.h"
+ for f in $tm_file; do
+ case $f in
++ */linux64.h )
++ tm_file_list="${tm_file_list} ./config/$f"
++ tm_include_list="${tm_include_list} ./config/$f"
++ ;;
+ ./* )
+ f=`echo $f | sed 's/^..//'`
+ tm_file_list="${tm_file_list} $f"
diff --git a/meta-aarch64/recipes-devtools/gcc/gcc-4.7/wcast-qual-PR55383.patch b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/wcast-qual-PR55383.patch
new file mode 100644
index 00000000..7c5bbe76
--- /dev/null
+++ b/meta-aarch64/recipes-devtools/gcc/gcc-4.7/wcast-qual-PR55383.patch
@@ -0,0 +1,43 @@
+This is a backport from gcc bugzilla
+
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55383
+
+fixes wrong warning behavior which has no workaround
+other than disabling the warning
+
+Upstream-Status: Backport
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: gcc-4.7.2/gcc/c-typeck.c
+===================================================================
+--- gcc-4.7.2.orig/gcc/c-typeck.c 2012-09-13 10:04:44.000000000 -0700
++++ gcc-4.7.2/gcc/c-typeck.c 2013-03-10 23:09:17.610899536 -0700
+@@ -4557,7 +4557,7 @@
+ /* There are qualifiers present in IN_OTYPE that are not present
+ in IN_TYPE. */
+ warning_at (loc, OPT_Wcast_qual,
+- "cast discards %q#v qualifier from pointer target type",
++ "cast discards %qv qualifier from pointer target type",
+ discarded);
+
+ if (added || discarded)
+Index: gcc-4.7.2/gcc/testsuite/c-c++-common/Wcast-qual-1.c
+===================================================================
+--- gcc-4.7.2.orig/gcc/testsuite/c-c++-common/Wcast-qual-1.c 2011-04-07 14:47:38.000000000 -0700
++++ gcc-4.7.2/gcc/testsuite/c-c++-common/Wcast-qual-1.c 2013-03-10 23:15:45.610894589 -0700
+@@ -85,11 +85,11 @@
+ void
+ f4 (void * const **bar)
+ {
+- const void ***p9 = (const void ***) bar; /* { dg-warning "cast" } */
++ const void ***p9 = (const void ***) bar; /* { dg-warning "cast discards .const. qualifier" } */
+ void * const **p11 = (void * const **) bar;
+- void ** const *p13 = (void ** const *) bar; /* { dg-warning "cast" } */
++ void ** const *p13 = (void ** const *) bar; /* { dg-warning "cast discards .const. qualifier" } */
+ const void * const **p15 = (const void * const **) bar; /* { dg-warning "cast" } */
+- const void ** const *p17 = (const void ** const *) bar; /* { dg-warning "cast" } */
++ const void ** const *p17 = (const void ** const *) bar; /* { dg-warning "cast discards .const. qualifier" } */
+ void * const * const * p19 = (void * const * const *) bar;
+ const void * const * const *p21 = (const void * const * const *) bar;
+ }