obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

13 files changed, 621 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc
new file mode 100644
index 000000000..aff8e9a40
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc
@@ -0,0 +1,32 @@
+// { dg-do compile }
+
+// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// Tuple
+
+#include <tr1/tuple>
+
+// libstdc++/35480
+void test01()
+{
+  std::tr1::tuple<int> t1( 1 );
+  std::tr1::tuple<int, int> t2( 1, 2 );
+  if ( t1 < t2 ) {}   // { dg-error "here" }
+  if ( t1 == t2 ) {}  // { dg-error "here" }
+}
+// { dg-excess-errors "incomplete type" }
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/comparisons.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/comparisons.cc
new file mode 100644
index 000000000..b5ef96f41
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/comparisons.cc
@@ -0,0 +1,50 @@
+// 2004-09-23 Chris Jefferson <chris@bubblescope.net>
+
+// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// Tuple
+
+#include <tr1/tuple>
+#include <testsuite_hooks.h>
+
+using namespace std::tr1;
+
+bool test __attribute__((unused)) = true;
+
+#define TEST1(x) VERIFY( x == x && !(x != x) && x <= x && !(x < x) )
+
+int
+main()
+{
+  int i=0;
+  int j=0;
+  int k=2;
+  tuple<int, int, int> a(0, 0, 0);
+  tuple<int, int, int> b(0, 0, 1);
+  tuple<int& , int& , int&> c(i,j,k);
+  tuple<const int&, const int&, const int&> d(c);
+  TEST1(a);
+  TEST1(b);
+  TEST1(c);
+  TEST1(d);
+  VERIFY(!(a > a) && !(b > b));
+  VERIFY(a >= a && b >= b);
+  VERIFY(a < b && !(b < a) && a <= b && !(b <= a));
+  VERIFY(b > a && !(a > b) && b >= a && !(a >= b));  
+}
+
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/assignment.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/assignment.cc
new file mode 100644
index 000000000..a2cf9181f
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/assignment.cc
@@ -0,0 +1,53 @@
+// 2004-09-23 Chris Jefferson <chris@bubblescope.net>
+
+// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// Tuple
+
+#include <tr1/tuple>
+#include <testsuite_hooks.h>
+
+using namespace std::tr1;
+
+int
+main()
+{
+  bool test __attribute__((unused)) = true;
+
+  tuple<> ta;
+  tuple<> tb;
+  ta = tb;
+
+  tuple<int> tc(1);
+  tuple<int> td(0);
+  td = tc;
+  VERIFY(get<0>(td) == 1);
+
+  int i=0;
+  tuple<int&> te(i);
+  te = tc;
+  VERIFY(i == 1);
+
+  tuple<const int&> tf(tc);
+
+  get<0>(tc) = 2;
+  VERIFY(get<0>(tf) == 2);
+  tuple<double> tg;
+  tg = tc;
+}
+
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/big_tuples.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/big_tuples.cc
new file mode 100644
index 000000000..51c6216a8
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/big_tuples.cc
@@ -0,0 +1,108 @@
+// 2004-09-23 Chris Jefferson <chris@bubblescope.net>
+
+// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+// Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// Tuple
+
+#include <tr1/tuple>
+#include <testsuite_hooks.h>
+
+using namespace std::tr1;
+using std::pair;
+
+// A simple class without conversions to check some things
+struct foo
+{ };
+
+void
+test_constructors()
+{
+  bool test __attribute__((unused)) = true;
+
+  int x1=0,x2=0;
+  const int &z1=x1;
+
+  // Test empty constructor
+  tuple<> ta __attribute__((unused));
+  tuple<int,int> tb;
+  // Test construction from values
+  tuple<int,int> tc(x1,x2);
+  tuple<int,int&> td(x1,x2);
+  tuple<const int&> te(z1);
+  x1=1;
+  x2=1;
+  VERIFY(get<0>(td) == 0 && get<1>(td) == 1 && get<0>(te) == 1);
+
+  // Test identical tuple copy constructor
+  tuple<int,int> tf(tc);
+  tuple<int,int> tg(td);
+  tuple<const int&> th(te);
+  // Test different tuple copy constructor
+  tuple<int,double> ti(tc);
+  tuple<int,double> tj(td);
+  // Test constructing from a pair
+  pair<int,int> pair1(1,1);
+  const pair<int,int> pair2(pair1);
+  tuple<int,int> tl(pair1);
+  tuple<int,const int&> tm(pair1);
+  tuple<int,int> tn(pair2);
+  tuple<int,const int&> to(pair2);  
+}
+
+int 
+main(void) 
+{
+  //test construction
+  typedef tuple<int,int,int,int,int,int,int,int,int,int> type1;
+  type1 a(0, 0, 0, 0, 0, 0, 0, 0, 0, 1);
+  type1 b(0, 0, 0, 0, 0, 0, 0, 0, 0, 2);
+  type1 c(a);
+  typedef tuple<int,int,int,int,int,int,int,int,int,char> type2;
+  type2 d(0, 0, 0, 0, 0, 0, 0, 0, 0, 3);
+  type1 e(d);
+  typedef tuple<foo,int,int,int,int,int,int,int,int,foo> type3;
+  // get
+  VERIFY(get<9>(a)==1 && get<9>(b)==2);
+  // comparisons
+  VERIFY(a==a && !(a!=a) && a<=a && a>=a && !(a<a) && !(a>a));
+  VERIFY(!(a==b) && a!=b && a<=b && a<b && !(a>=b) && !(a>b));
+  //tie
+  {
+    int i = 0;
+  tie(ignore, ignore, ignore, ignore, ignore, ignore, ignore, ignore, 
+      ignore, i) = a;
+  VERIFY(i == 1);
+  }
+  //test_assignment
+  a=d;
+  a=b;
+  //make_tuple
+  make_tuple(0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+  
+  //tuple_size
+  VERIFY(tuple_size<type3>::value == 10);
+  //tuple_element
+  {  
+    foo q1;
+    tuple_element<0,type3>::type q2(q1);
+    tuple_element<9,type3>::type q3(q1);
+  }
+  
+}
+
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/constructor.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/constructor.cc
new file mode 100644
index 000000000..2e862813b
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/constructor.cc
@@ -0,0 +1,67 @@
+// 2004-09-23 Chris Jefferson <chris@bubblescope.net>
+
+// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+// Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// Tuple
+
+#include <tr1/tuple>
+#include <testsuite_hooks.h>
+
+using namespace std::tr1;
+using std::pair;
+
+int
+main()
+{
+  bool test __attribute__((unused)) = true;
+
+  int x1=0,x2=0;
+  const int &z1=x1;
+
+  // Test empty constructor
+  tuple<> ta __attribute__((unused));
+  tuple<int,int> tb;
+  // Test construction from values
+  tuple<int,int> tc(x1,x2);
+  tuple<int,int&> td(x1,x2);
+  tuple<const int&> te(z1);
+  x1=1;
+  x2=1;
+  VERIFY(get<0>(td) == 0 && get<1>(td) == 1 && get<0>(te) == 1);
+
+  // Test identical tuple copy constructor
+  tuple<int,int> tf(tc);
+  tuple<int,int> tg(td);
+  tuple<const int&> th(te);
+  // Test different tuple copy constructor
+  tuple<int,double> ti(tc);
+  tuple<int,double> tj(td);
+  //tuple<int&, int&> tk(tc);
+  tuple<const int&, const int&> tl(tc);
+  tuple<const int&, const int&> tm(tl);
+  // Test constructing from a pair
+  pair<int,int> pair1(1,1);
+  const pair<int,int> pair2(pair1);
+  tuple<int,int> tn(pair1);
+  tuple<int,const int&> to(pair1);
+  tuple<int,int> tp(pair2);
+  tuple<int,const int&> tq(pair2);  
+  return 0;
+}
+
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/23978.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/23978.cc
new file mode 100644
index 000000000..b4f928714
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/23978.cc
@@ -0,0 +1,46 @@
+// 2005-09-29  Chris Jefferson  <chris@bubblescope.net>
+//
+// Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// Tuple
+
+#include <tr1/tuple>
+#include <tr1/utility>
+#include <testsuite_hooks.h>
+
+using namespace std::tr1;
+using std::pair;
+
+// libstdc++/23978
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  pair<int, int> p(1, 2);
+  int x = 0;
+  int y = 0;
+  tie(x, y) = p;
+  VERIFY( x == 1 && y == 2 );
+}
+
+int
+main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc
new file mode 100644
index 000000000..0b6da3fee
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc
@@ -0,0 +1,38 @@
+// 2004-09-23 Chris Jefferson <chris@bubblescope.net>
+
+// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// Tuple
+
+#include <tr1/tuple>
+#include <tr1/functional>
+#include <testsuite_hooks.h>
+
+using namespace std::tr1;
+
+int
+main()
+{
+  bool test __attribute__((unused)) = true;
+
+  int i=0;
+  make_tuple(1,2,4.0);
+  make_tuple(ref(i)) = tuple<int>(1);
+  VERIFY(i == 1);
+}
+
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie.cc
new file mode 100644
index 000000000..419a7ad31
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie.cc
@@ -0,0 +1,43 @@
+// 2004-09-23 Chris Jefferson <chris@bubblescope.net>
+
+// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// Tuple
+
+#include <tr1/tuple>
+#include <testsuite_hooks.h>
+
+using namespace std::tr1;
+
+int
+main()
+{
+  bool test __attribute__((unused)) = true;
+
+  int x1 = 0;
+  int x2 = 0;
+  int y1 = 0;
+  int y2 = 0;
+  tuple<int,int> ta(1,1);
+  tuple<const int&,const int&> tc(x1,x2);
+  tie(y1,y2)=ta;
+  VERIFY(y1 == 1 && y2 == 1);
+  tie(y1,y2)=tc;
+  VERIFY(y1 == 0 && y2 == 0);
+}
+
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie2.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie2.cc
new file mode 100644
index 000000000..7aea51643
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie2.cc
@@ -0,0 +1,36 @@
+// Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// Tuple
+
+#include <tr1/tuple>
+#include <string>
+#include <testsuite_hooks.h>
+
+int
+main()
+{
+  bool test __attribute__((unused)) = true; 
+  using namespace std::tr1;
+
+  int i;
+  std::string s;
+
+  tie(i, ignore, s) = make_tuple(42, 3.14, "C++");
+  VERIFY( i == 42 );
+  VERIFY( s == "C++" );
+}
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/element_access/get.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/element_access/get.cc
new file mode 100644
index 000000000..ebd3fd2bf
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/element_access/get.cc
@@ -0,0 +1,45 @@
+// 2004-09-23 Chris Jefferson <chris@bubblescope.net>
+
+// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// Tuple
+
+#include <tr1/tuple>
+#include <testsuite_hooks.h>
+
+using namespace std::tr1;
+
+int
+main()
+{
+  bool test __attribute__((unused)) = true;
+
+  int j=1;
+  const int k=2;
+  tuple<int,int &,const int&> a(0,j,k);
+  const tuple<int,int &,const int&> b(1,j,k); 
+  VERIFY(get<0>(a)==0 && get<1>(a)==1 && get<2>(a)==2);
+  get<0>(a)=3;
+  get<1>(a)=4;  
+  VERIFY(get<0>(a)==3 && get<1>(a)==4);
+  VERIFY(j==4);
+  get<1>(b)=5;
+  VERIFY(get<0>(b)==1 && get<1>(b)==5 && get<2>(b)==2);
+  VERIFY(j==5);
+}
+
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/requirements/explicit_instantiation.cc
new file mode 100644
index 000000000..72e710f57
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/requirements/explicit_instantiation.cc
@@ -0,0 +1,25 @@
+// { dg-do compile }
+
+// Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+
+// This file tests explicit instantiation of library containers.
+
+#include <tr1/tuple>
+
+template class std::tr1::tuple<short, int, double>;
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_element.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_element.cc
new file mode 100644
index 000000000..b41592105
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_element.cc
@@ -0,0 +1,39 @@
+// 2004-09-23 Chris Jefferson <chris@bubblescope.net>
+
+// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// Tuple
+
+#include <tr1/tuple>
+#include <testsuite_hooks.h>
+
+using namespace std::tr1;
+
+struct foo
+{ };
+
+int
+main()
+{
+  // As foo isn't constructible from anything else, this
+  // lets us check if type is returning foo when it should
+  foo q1;
+  tuple_element<0,tuple<foo,void,int> >::type q2(q1);
+  tuple_element<2,tuple<void,int,foo> >::type q3(q1);
+}
+
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_size.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_size.cc
new file mode 100644
index 000000000..d15a3cc20
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_size.cc
@@ -0,0 +1,39 @@
+// 2004-09-23 Chris Jefferson <chris@bubblescope.net>
+
+// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// Tuple
+
+#include <tr1/tuple>
+#include <testsuite_hooks.h>
+
+using namespace std::tr1;
+
+int
+main()
+{
+  bool test __attribute__((unused)) = true;
+
+  VERIFY(tuple_size<tuple<> >::value == 0);
+  VERIFY(tuple_size<tuple<int> >::value == 1);
+  VERIFY(tuple_size<tuple<void> >::value == 1);
+  typedef tuple<int,const int&,void> test_tuple1;
+  VERIFY(tuple_size<test_tuple1>::value == 3);
+  VERIFY(tuple_size<tuple<tuple<void> > >::value == 1);
+}
+