2013-07-12 Benjamin Kosnik <bkoz@redhat.com>

	* libsupc++/vterminate.cc: Add back deleted file.

	* libstdc++-v3/acinclude.m4: Fix paths for libvtv, still
	dependency issue with libvtv build library required when libstdc++
	built with -fvtable-verify. Add stubs lib as weak as part of
	libsupc++ is one solution.

3 files changed, 103 insertions, 2 deletions

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 47350e61ac9..97c47b94a24 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -2302,7 +2302,7 @@ AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY], [
 
   if test $enable_vtable_verify = yes; then
     VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
-    VTV_CXXLINKFLAGS="-L${top_builddir}/libsupc++/.libs -Wl,-lvtv"		
+    VTV_CXXLINKFLAGS="-L${top_builddir}/libvtv/.libs -Wl,-lvtv"		
   else
     VTV_CXXFLAGS= 
     VTV_CXXLINKFLAGS= 
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index cae54ed1fb2..595b00d5d37 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -17413,7 +17413,7 @@ $as_echo "$enable_vtable_verify" >&6; }
 
   if test $enable_vtable_verify = yes; then
     VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
-    VTV_CXXLINKFLAGS="-L${top_builddir}/libsupc++/.libs -Wl,-lvtv"
+    VTV_CXXLINKFLAGS="-L${top_builddir}/libvtv/.libs -Wl,-lvtv"
   else
     VTV_CXXFLAGS=
     VTV_CXXLINKFLAGS=
diff --git a/libstdc++-v3/libsupc++/vterminate.cc b/libstdc++-v3/libsupc++/vterminate.cc
new file mode 100644
index 00000000000..09664c75607
--- /dev/null
+++ b/libstdc++-v3/libsupc++/vterminate.cc
@@ -0,0 +1,101 @@
+// Verbose terminate_handler -*- C++ -*-
+
+// Copyright (C) 2001-2013 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.
+
+// 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>
+
+#if _GLIBCXX_HOSTED
+#include <cstdlib>
+#include <exception>
+#include <bits/exception_defines.h>
+#include <cxxabi.h>
+# include <cstdio>
+
+using namespace std;
+using namespace abi;
+
+namespace __gnu_cxx
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+  // A replacement for the standard terminate_handler which prints
+  // more information about the terminating exception (if any) on
+  // stderr.
+  void __verbose_terminate_handler()
+  {
+    static bool terminating;
+    if (terminating)
+      {
+	fputs("terminate called recursively\n", stderr);
+	abort ();
+      }
+    terminating = true;
+
+    // Make sure there was an exception; terminate is also called for an
+    // attempt to rethrow when there is no suitable exception.
+    type_info *t = __cxa_current_exception_type();
+    if (t)
+      {
+	// Note that "name" is the mangled name.
+	char const *name = t->name();
+	{
+	  int status = -1;
+	  char *dem = 0;
+	  
+	  dem = __cxa_demangle(name, 0, 0, &status);
+
+	  fputs("terminate called after throwing an instance of '", stderr);
+	  if (status == 0)
+	    fputs(dem, stderr);
+	  else
+	    fputs(name, stderr);
+	  fputs("'\n", stderr);
+
+	  if (status == 0)
+	    free(dem);
+	}
+
+	// If the exception is derived from std::exception, we can
+	// give more information.
+	__try { __throw_exception_again; }
+#ifdef __EXCEPTIONS
+	__catch(const exception& exc)
+	  {
+	    char const *w = exc.what();
+	    fputs("  what():  ", stderr);
+	    fputs(w, stderr);
+	    fputs("\n", stderr);
+          }
+#endif
+	__catch(...) { }
+      }
+    else
+      fputs("terminate called without an active exception\n", stderr);
+    
+    abort();
+  }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
+
+#endif