summaryrefslogtreecommitdiffstats
path: root/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
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-06-17 17:11:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 11:50:07 +0100
commit0faa5f72999fea82fadda8bab70abea2303216c7 (patch)
tree05a8c18d2f67d883f94d2bd6f060ab0f4ac7f156 /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
parentc2007ba4cdb64fa9e308d3dae395c03ef4cc9161 (diff)
downloadpoky-0faa5f72999fea82fadda8bab70abea2303216c7.tar.gz
gcc-4.6: Switch to using svn SRC_URI for recipe
We call the recipes 4.6 Remove the backport patches (From OE-Core rev: 68b545f4ff719f2b6e57d68b002dc9845c7a14ae) 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.patch48
1 files changed, 0 insertions, 48 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
deleted file mode 100644
index e5c6b4a95e..0000000000
--- 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
+++ /dev/null
@@ -1,48 +0,0 @@
1From 5e28e486dbc793184ca462b8b528f5eff3d4f2ef Mon Sep 17 00:00:00 2001
2From: jyasskin <jyasskin@138bc75d-0d04-0410-961f-82ee72b054a4>
3Date: Fri, 1 Apr 2011 01:07:46 +0000
4Subject: [PATCH] Merge r171807 from trunk to the 4.6 release branch, to fix two C++
5 conformance problems in libsupc++.
6
7Tested: bootstrap + make check-c++ on x86_64
8
9libstdc++-v3/ChangeLog:
10
112011-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
19git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@171815 138bc75d-0d04-0410-961f-82ee72b054a4
20
21index 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
33diff --git a/libstdc++-v3/libsupc++/nested_exception.h b/libstdc++-v3/libsupc++/nested_exception.h
34index 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--
471.7.0.4
48