From b0b43f1cfe57548ee37382c9d1925b9183e62eeb Mon Sep 17 00:00:00 2001
From: Geordie Bilkey <himself@thefumon.com>
Date: Fri, 13 Jul 2012 16:19:23 -0400
Subject: [PATCH 1/2] Added patch
 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51969

---
 patches/patch-gcc-gengtype-fix.diff | 19 +++++++++++++++++++
 summon-arm-toolchain                |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 patches/patch-gcc-gengtype-fix.diff

diff --git a/patches/patch-gcc-gengtype-fix.diff b/patches/patch-gcc-gengtype-fix.diff
new file mode 100644
index 0000000..47b8f31
--- /dev/null
+++ b/patches/patch-gcc-gengtype-fix.diff
@@ -0,0 +1,19 @@
+diff --git a/gcc/gengtype.c b/gcc/gengtype.c
+index abf17f8..550d3bb 100644
+--- a/gcc/gengtype.c
++++ b/gcc/gengtype.c
+@@ -3594,13 +3594,13 @@ write_field_root (outf_p f, pair_p v, type_p type, const char *name,
+                  int has_length, struct fileloc *line, const char *if_marked,
+                  bool emit_pch, type_p field_type, const char *field_name)
+ {
++  struct pair newv;
+   /* If the field reference is relative to V, rather than to some
+      subcomponent of V, we can mark any subarrays with a single stride.
+      We're effectively treating the field as a global variable in its
+      own right.  */
+   if (v && type == v->type)
+     {
+-      struct pair newv;
+
+       newv = *v;
+       newv.type = field_type;
diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 6228c7a..df41578 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -421,6 +421,7 @@ if [ ! -e ${STAMPS}/${GCC}-${NEWLIB}.build ]; then
 	log "Patching gcc to add multilib support"
 	cd ${GCC}
 	patch -p0 -i ../patches/patch-gcc-config-arm-t-arm-elf.diff
+  patch -p1 -i ../patches/patch-gcc-gengtype-fix.diff
 	patch -p0 -i ../patches/patch-libgcc-divide-exceptions.diff
 	cd ..
     fi

From d91c5390c5b7132c92b39d495c285094c4c45316 Mon Sep 17 00:00:00 2001
From: Geordie Bilkey <himself@thefumon.com>
Date: Fri, 13 Jul 2012 16:22:00 -0400
Subject: [PATCH 2/2] Removed extra GDB setting after if statement

---
 summon-arm-toolchain | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index df41578..f4754c8 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -136,7 +136,7 @@ fi
 
 BINUTILS=binutils-2.21.1
 NEWLIB=newlib-1.19.0
-GDB=gdb-7.3.1
+#GDB=gdb-7.3.1
 OOCD=openocd-0.5.0
 OOCD_GIT=9e1a16690e669b895dce7c3951b1fe893bfd6149
 LIBCMSIS=