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>

1 files changed, 110 insertions, 0 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0089-PR-c-48468.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0089-PR-c-48468.patch
new file mode 100644
index 0000000000..ab6c28dac1
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0089-PR-c-48468.patch
@@ -0,0 +1,110 @@
+From 4215154488607abf1ee95f1d1f03cb66be4bd4d8 Mon Sep 17 00:00:00 2001
+From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Fri, 8 Apr 2011 15:02:16 +0000
+Subject: [PATCH 089/200]        PR c++/48468
+        * except.c (build_noexcept_spec): Propagate error_mark_node.
+        (finish_noexcept_expr): Likewise.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@172194 138bc75d-0d04-0410-961f-82ee72b054a4
+
+index a814d67..874f111 100644
+--- a/gcc/cp/except.c
++++ b/gcc/cp/except.c
+@@ -1125,6 +1125,9 @@ finish_noexcept_expr (tree expr, tsubst_flags_t complain)
+ {
+   tree fn;
+ 
++  if (expr == error_mark_node)
++    return error_mark_node;
++
+   if (processing_template_decl)
+     return build_min (NOEXCEPT_EXPR, boolean_type_node, expr);
+ 
+@@ -1212,6 +1215,8 @@ build_noexcept_spec (tree expr, int complain)
+     return noexcept_true_spec;
+   else if (expr == boolean_false_node)
+     return noexcept_false_spec;
++  else if (expr == error_mark_node)
++    return error_mark_node;
+   else
+     {
+       gcc_assert (processing_template_decl || expr == error_mark_node);
+index be6fa00..60015e7 100644
+--- a/gcc/testsuite/g++.dg/cpp0x/noexcept02.C
++++ b/gcc/testsuite/g++.dg/cpp0x/noexcept02.C
+@@ -46,7 +46,9 @@ SA(!noexcept(f3(A())));
+ template <class T1, class T2>
+ void f (T1, T2) noexcept(noexcept(T1(), T2()));
+ 
+-SA(noexcept(f3(1,1)));
++struct B { };
++
++SA(noexcept(f3(1,B())));
+ SA(!noexcept(f3(1,A())));
+ SA(!noexcept(f3(A(),1)));
+ SA(!noexcept(f3(A(),A())));
+diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae11.C b/gcc/testsuite/g++.dg/cpp0x/sfinae11.C
+new file mode 100644
+index 0000000..a3ffc34
+--- /dev/null
++++ b/gcc/testsuite/g++.dg/cpp0x/sfinae11.C
+@@ -0,0 +1,56 @@
++// PR c++/48468
++// { dg-options -std=c++0x }
++// { dg-prune-output "note" }
++
++template<class T>
++T&& declval() noexcept;
++
++template< class T >
++inline void f1( T& x ) noexcept( noexcept( declval<T&>().foo() ) )
++{
++  x.foo();
++}
++
++template< class T,
++  bool Noexcept = noexcept( declval<T&>().foo() )
++>
++inline void f2( T& x ) noexcept( Noexcept )
++{
++  x.foo();
++}
++
++// a common and trivial mistake
++template< class T >
++inline void f3( T& x ) noexcept( declval<T&>().foo() )
++{
++  x.foo();
++}
++
++struct X
++{
++  void foo();
++};
++
++struct Y
++{
++  void foo() noexcept;
++};
++
++struct Z {};
++
++int main()
++{
++  X x; Y y; Z z;
++
++  static_assert( !noexcept( f1(x) ), "OK." );
++  static_assert( !noexcept( f2(x) ), "OK." );
++  // static_assert( !noexcept( f3(x) ), "shall be ill-formed(OK)." );
++
++  static_assert(  noexcept( f1(y) ), "OK." );
++  static_assert(  noexcept( f2(y) ), "OK." );
++  // static_assert(  noexcept( f3(y) ), "shall be ill-formed(OK)." );
++
++  static_assert(  noexcept( f1(z) ), "shall be ill-formed." ); // { dg-error "no match" }
++  static_assert(  noexcept( f2(z) ), "shall be ill-formed." ); // { dg-error "no match" }
++  static_assert( !noexcept( f3(z) ), "shall be ill-formed." ); // { dg-error "no match" }
++}
+-- 
+1.7.0.4
+