diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-04-30 12:37:47 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-05 12:26:41 +0100 |
commit | 478deec11f3349d61b1a922f047dc958dc07262a (patch) | |
tree | 1843907b36de2bcb8f821d49d8c9a88014ef0dc7 /meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0190-PR-c-48046.patch | |
parent | d42dccf886983ba14ccc868041d7bea0cf1a260e (diff) | |
download | poky-478deec11f3349d61b1a922f047dc958dc07262a.tar.gz |
gcc-4.6.0: Backport FSF 4.6 branch patches
This is set of bugfixes that has been done on
FSF gcc-4_2-branch since 4.6.0 was released
They will roll into 4.6.1 release once that
happens in coming approx 6 months time then
we can simply remove them thats the reason
so use a separate .inc file to define the
SRC_URI additions
(From OE-Core rev: b0d5b9f12adbce2c4a0df6059f5671188cd32293)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0190-PR-c-48046.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0190-PR-c-48046.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0190-PR-c-48046.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0190-PR-c-48046.patch new file mode 100644 index 0000000000..f2ba186321 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0190-PR-c-48046.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From c270475fa490deeb18cf6275a86ce15a57e706ff Mon Sep 17 00:00:00 2001 | ||
2 | From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | ||
3 | Date: Wed, 27 Apr 2011 15:57:06 +0000 | ||
4 | Subject: [PATCH 190/200] PR c++/48046 | ||
5 | * parser.c (cp_parser_diagnose_invalid_type_name): Commit | ||
6 | to tentative parse sooner. | ||
7 | |||
8 | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@173038 138bc75d-0d04-0410-961f-82ee72b054a4 | ||
9 | |||
10 | index 9d8457f..68c2f88 100644 | ||
11 | --- a/gcc/cp/parser.c | ||
12 | +++ b/gcc/cp/parser.c | ||
13 | @@ -2699,6 +2699,7 @@ cp_parser_diagnose_invalid_type_name (cp_parser *parser, | ||
14 | location_t location) | ||
15 | { | ||
16 | tree decl, old_scope; | ||
17 | + cp_parser_commit_to_tentative_parse (parser); | ||
18 | /* Try to lookup the identifier. */ | ||
19 | old_scope = parser->scope; | ||
20 | parser->scope = scope; | ||
21 | @@ -2792,7 +2793,6 @@ cp_parser_diagnose_invalid_type_name (cp_parser *parser, | ||
22 | else | ||
23 | gcc_unreachable (); | ||
24 | } | ||
25 | - cp_parser_commit_to_tentative_parse (parser); | ||
26 | } | ||
27 | |||
28 | /* Check for a common situation where a type-name should be present, | ||
29 | new file mode 100644 | ||
30 | index 0000000..8f37fea | ||
31 | --- /dev/null | ||
32 | +++ b/gcc/testsuite/g++.dg/parse/ambig6.C | ||
33 | @@ -0,0 +1,12 @@ | ||
34 | +// PR c++/48046 | ||
35 | + | ||
36 | +namespace N1 { typedef int T; } // { dg-error "" } | ||
37 | +namespace N2 { typedef float T; } // { dg-error "" } | ||
38 | + | ||
39 | +int main() | ||
40 | +{ | ||
41 | + using namespace N1; | ||
42 | + using namespace N2; | ||
43 | + | ||
44 | + static T t; // { dg-error "" } | ||
45 | +} | ||
46 | -- | ||
47 | 1.7.0.4 | ||
48 | |||