2011-02-09 Jonathan Wakely <jwakely.gcc@gmail.com>

	PR libstdc++/43863
	* libsupc++/guard.cc (recursive_init_error::~recursive_init_error):
	Move to ...
	* libsupc++/guard_error.cc: ... new file.
	* libsupc++/Makefile.am: Update.
	* libsupc++/Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169989 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 243659f..e45a71b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,14 @@
 2011-02-09  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
+       PR libstdc++/43863
+       * libsupc++/guard.cc (recursive_init_error::~recursive_init_error):
+       Move to ...
+       * libsupc++/guard_error.cc: ... new file.
+       * libsupc++/Makefile.am: Update.
+       * libsupc++/Makefile.in: Regenerate.
+
+2011-02-09  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
        * include/std/future (packaged_task::operator bool): Rename to...
        (packaged_task::valid): ...this.
        * testsuite/30_threads/packaged_task/cons/1.cc: Adjust.

diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am
index f668328..842d87a 100644 (file)
--- a/libstdc++-v3/libsupc++/Makefile.am
+++ b/libstdc++-v3/libsupc++/Makefile.am
@@ -75,6 +75,7 @@ sources = \
        function_type_info.cc \
        fundamental_type_info.cc \
        guard.cc \
+       guard_error.cc \
        hash_bytes.cc \
        new_handler.cc \
        new_op.cc \

diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index 9951fed..5d687ed 100644 (file)
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -97,8 +97,8 @@ am__objects_1 = array_type_info.lo atexit_arm.lo bad_alloc.lo \
        eh_exception.lo eh_globals.lo eh_personality.lo eh_ptr.lo \
        eh_term_handler.lo eh_terminate.lo eh_throw.lo eh_type.lo \
        eh_unex_handler.lo enum_type_info.lo function_type_info.lo \
-       fundamental_type_info.lo guard.lo hash_bytes.lo new_handler.lo \
-       new_op.lo new_opnt.lo new_opv.lo new_opvnt.lo \
+       fundamental_type_info.lo guard.lo guard_error.lo hash_bytes.lo \
+       new_handler.lo new_op.lo new_opnt.lo new_opv.lo new_opvnt.lo \
        pbase_type_info.lo pmem_type_info.lo pointer_type_info.lo \
        pure.lo si_class_type_info.lo tinfo.lo tinfo2.lo vec.lo \
        vmi_class_type_info.lo vterminate.lo
@@ -380,6 +380,7 @@ sources = \
        function_type_info.cc \
        fundamental_type_info.cc \
        guard.cc \
+       guard_error.cc \
        hash_bytes.cc \
        new_handler.cc \
        new_op.cc \

diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
index 222e5ec..6e3d415 100644 (file)
--- a/libstdc++-v3/libsupc++/guard.cc
+++ b/libstdc++-v3/libsupc++/guard.cc
@@ -1,4 +1,5 @@
-// Copyright (C) 2002, 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010, 2011
+// Free Software Foundation, Inc.
 //  
 // This file is part of GCC.
 //
@@ -134,11 +135,6 @@ __set_and_release (__cxxabiv1::__guard *g)
 
 #endif /* __GTHREADS */
 
-namespace __gnu_cxx
-{
-  recursive_init_error::~recursive_init_error() throw() { }
-}
-
 //
 // Here are C++ run-time routines for guarded initiailization of static
 // variables. There are 4 scenarios under which these routines are called:

diff --git a/libstdc++-v3/libsupc++/guard_error.cc b/libstdc++-v3/libsupc++/guard_error.cc
new file mode 100644 (file)
index 0000000..7c06bcd
--- /dev/null
+++ b/libstdc++-v3/libsupc++/guard_error.cc
@@ -0,0 +1,31 @@
+// Copyright (C) 2011 Free Software Foundation, Inc.
+//  
+// This file is part of GCC.
+//
+// GCC 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.
+
+// GCC 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+#include <bits/c++config.h>
+#include <cxxabi.h>
+
+namespace __gnu_cxx
+{
+  recursive_init_error::~recursive_init_error() throw() { }
+}
+