aboutsummaryrefslogtreecommitdiff
path: root/4.5.2
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-12-21 05:19:23 +0000
committerMike Frysinger <vapier@gentoo.org>2012-12-21 05:19:23 +0000
commit61e2006b58df0b16336e705db859192b28de372d (patch)
treec4818c7667520c61a618124b56a9759f80266da4 /4.5.2
parentfix from upstream for building with newer glibc #424970 (diff)
downloadgcc-patches-61e2006b58df0b16336e705db859192b28de372d.tar.gz
gcc-patches-61e2006b58df0b16336e705db859192b28de372d.tar.bz2
gcc-patches-61e2006b58df0b16336e705db859192b28de372d.zip
add fix from upstream pr48226 for ppc handling of vector keyword in more cases #445606
Diffstat (limited to '4.5.2')
-rw-r--r--4.5.2/gentoo/56_all_gcc-ppc-vector-pr48226.patch37
-rw-r--r--4.5.2/gentoo/README.history1
2 files changed, 38 insertions, 0 deletions
diff --git a/4.5.2/gentoo/56_all_gcc-ppc-vector-pr48226.patch b/4.5.2/gentoo/56_all_gcc-ppc-vector-pr48226.patch
new file mode 100644
index 0000000..0f9baa0
--- /dev/null
+++ b/4.5.2/gentoo/56_all_gcc-ppc-vector-pr48226.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/445606
+http://gcc.gnu.org/PR48226
+
+fix handling of "vector" with ppc targets
+
+From 0e6b798bb4a3d1024fbdfaf8235d0f7603d3e305 Mon Sep 17 00:00:00 2001
+From: meissner <meissner@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 29 Mar 2011 23:35:40 +0000
+Subject: [PATCH] Merge up to 171704
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@171707 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/config/rs6000/rs6000-c.c | 5 ++++-
+ gcc/testsuite/gcc.dg/torture/va-arg-25.c | 2 ++
+ gcc/testsuite/gcc.target/powerpc/pr48226.c | 14 ++++++++++++++
+ 3 files changed, 20 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gcc.target/powerpc/pr48226.c
+
+diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
+index 3f4f90b..c1683bc 100644
+--- a/gcc/config/rs6000/rs6000-c.c
++++ b/gcc/config/rs6000/rs6000-c.c
+@@ -182,7 +182,10 @@ rs6000_macro_to_expand (cpp_reader *pfile, const cpp_token *tok)
+ expand_this = C_CPP_HASHNODE (__vector_keyword);
+ expand_bool_pixel = __bool_keyword;
+ }
+- else if (ident)
++ /* The boost libraries have code with Iterator::vector vector in it. If
++ we allow the normal handling, this module will be called recursively,
++ and the vector will be skipped.; */
++ else if (ident && (ident != C_CPP_HASHNODE (__vector_keyword)))
+ {
+ enum rid rid_code = (enum rid)(ident->rid_code);
+ if (ident->type == NT_MACRO)
+--
+1.8.0
+
diff --git a/4.5.2/gentoo/README.history b/4.5.2/gentoo/README.history
index 1a38cf1..2673118 100644
--- a/4.5.2/gentoo/README.history
+++ b/4.5.2/gentoo/README.history
@@ -1,5 +1,6 @@
1.3 [pending]
- 03_all_gcc43-java-nomulti.patch
+ + 56_all_gcc-ppc-vector-pr48226.patch
1.2 27 Sep 2012
+ 05_all_gcc-4.5.x-siginfo.patch