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/0053-Merge-r171807-from-trunk-to-the-4.6-release-branch-t.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/0053-Merge-r171807-from-trunk-to-the-4.6-release-branch-t.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0053-Merge-r171807-from-trunk-to-the-4.6-release-branch-t.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/0053-Merge-r171807-from-trunk-to-the-4.6-release-branch-t.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0053-Merge-r171807-from-trunk-to-the-4.6-release-branch-t.patch new file mode 100644 index 0000000000..a2094fecfa --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0053-Merge-r171807-from-trunk-to-the-4.6-release-branch-t.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 5e28e486dbc793184ca462b8b528f5eff3d4f2ef Mon Sep 17 00:00:00 2001 | ||
2 | From: jyasskin <jyasskin@138bc75d-0d04-0410-961f-82ee72b054a4> | ||
3 | Date: Fri, 1 Apr 2011 01:07:46 +0000 | ||
4 | Subject: [PATCH 053/200] Merge r171807 from trunk to the 4.6 release branch, to fix two C++ | ||
5 | conformance problems in libsupc++. | ||
6 | |||
7 | Tested: bootstrap + make check-c++ on x86_64 | ||
8 | |||
9 | libstdc++-v3/ChangeLog: | ||
10 | |||
11 | 2011-03-31 Jeffrey Yasskin <jyasskin@google.com> | ||
12 | |||
13 | * libsupc++/exception_ptr.h: Forward-declare std::type_info. | ||
14 | * libsupc++/nested_exception.h (__throw_with_nested): Remove a | ||
15 | redundant default argument from std::__throw_with_nested. | ||
16 | |||
17 | |||
18 | |||
19 | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@171815 138bc75d-0d04-0410-961f-82ee72b054a4 | ||
20 | |||
21 | index ef826f6..26117cd 100644 | ||
22 | --- a/libstdc++-v3/libsupc++/exception_ptr.h | ||
23 | +++ b/libstdc++-v3/libsupc++/exception_ptr.h | ||
24 | @@ -137,7 +137,7 @@ namespace std | ||
25 | operator==(const exception_ptr&, const exception_ptr&) throw() | ||
26 | __attribute__ ((__pure__)); | ||
27 | |||
28 | - const type_info* | ||
29 | + const class type_info* | ||
30 | __cxa_exception_type() const throw() __attribute__ ((__pure__)); | ||
31 | }; | ||
32 | |||
33 | diff --git a/libstdc++-v3/libsupc++/nested_exception.h b/libstdc++-v3/libsupc++/nested_exception.h | ||
34 | index 6a4f04e..d4804bb 100644 | ||
35 | --- a/libstdc++-v3/libsupc++/nested_exception.h | ||
36 | +++ b/libstdc++-v3/libsupc++/nested_exception.h | ||
37 | @@ -117,7 +117,7 @@ namespace std | ||
38 | // with a type that has an accessible nested_exception base. | ||
39 | template<typename _Ex> | ||
40 | inline void | ||
41 | - __throw_with_nested(_Ex&& __ex, const nested_exception* = 0) | ||
42 | + __throw_with_nested(_Ex&& __ex, const nested_exception*) | ||
43 | { throw __ex; } | ||
44 | |||
45 | template<typename _Ex> | ||
46 | -- | ||
47 | 1.7.0.4 | ||
48 | |||