Skip to content

Commit

Permalink
paparazzi-arm-multilib: add patch to build toolchain with gcc4.7
Browse files Browse the repository at this point in the history
  • Loading branch information
flixr committed Feb 23, 2013
1 parent 3cc277c commit 8c087a2
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 1 deletion.
4 changes: 3 additions & 1 deletion linux/paparazzi-arm-multilib/Makefile
Expand Up @@ -151,10 +151,12 @@ $(stamp)gcc-extract: $(GCCSRC) $(stamp)init-dirs
tar xaf $< -C src
touch $@

# Patch to add multilib support
# Patch to add multilib support and fix gengtype subscripted value error
$(stamp)gcc-patch: $(stamp)gcc-extract
cd src/gcc-* && \
patch -p0 -i ../../patches/patch-gcc-config-arm-t-arm-elf.diff
cd src/gcc-* && \
patch -p1 -i ../../patches/patch-gcc-gengtype-fix.diff
touch $@

# Configure
Expand Down
8 changes: 8 additions & 0 deletions linux/paparazzi-arm-multilib/debian/changelog
@@ -1,3 +1,11 @@
paparazzi-arm-multilib (1.2.4-1) unstable; urgency=low

* add patch to fix subscripted value error in gengtype
so we can build the toolchain with gcc 4.7
see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51969

-- Felix Ruess <felix.ruess@gmail.com> Sat, 23 Feb 2013 22:15:01 +0100

paparazzi-arm-multilib (1.2.3-1) unstable; urgency=low

* compile gdb with python support
Expand Down
19 changes: 19 additions & 0 deletions linux/paparazzi-arm-multilib/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;

0 comments on commit 8c087a2

Please sign in to comment.