2012-04-16 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / libsupc++ / vterminate.cc

diff --git a/libstdc++-v3/libsupc++/vterminate.cc b/libstdc++-v3/libsupc++/vterminate.cc
index 324e0d3..96824bb 100644 (file)
--- a/libstdc++-v3/libsupc++/vterminate.cc
+++ b/libstdc++-v3/libsupc++/vterminate.cc
@@ -1,11 +1,11 @@
 // Verbose terminate_handler -*- C++ -*-
 
-// Copyright (C) 2001, 2002 Free Software Foundation
+// Copyright (C) 2001, 2002, 2004, 2005, 2009, 2011 Free Software Foundation
 //
 // 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 2, or (at your option)
+// 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,
@@ -13,86 +13,89 @@
 // 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 COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
+// 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.
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+// 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 <exception_defines.h>
+#include <bits/exception_defines.h>
 #include <cxxabi.h>
-
-#ifdef _GLIBCPP_HAVE_UNISTD_H
-# include <unistd.h>
-# define writestr(str)  write(2, str, __builtin_strlen(str))
-#else
 # include <cstdio>
-# define writestr(str)  std::fputs(str, stderr)
-#endif
 
 using namespace std;
 using namespace abi;
 
 namespace __gnu_cxx
 {
-  /* A replacement for the standard terminate_handler which prints
-   more information about the terminating exception (if any) on
-   stderr.  */
+_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)
       {
-       char const *name = t->name();
        // 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);
 
-         writestr("terminate called after throwing an instance of '");
+         fputs("terminate called after throwing an instance of '", stderr);
          if (status == 0)
-           writestr(dem);
+           fputs(dem, stderr);
          else
-           writestr(name);
-         writestr("'\n");
+           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; }
+       // If the exception is derived from std::exception, we can
+       // give more information.
+       __try { __throw_exception_again; }
 #ifdef __EXCEPTIONS
-       catch (exception &exc)
+       __catch(const exception& exc)
          {
            char const *w = exc.what();
-           writestr("  what():  ");
-           writestr(w);
-           writestr("\n");
+           fputs("  what():  ", stderr);
+           fputs(w, stderr);
+           fputs("\n", stderr);
           }
 #endif
-       catch (...) { }
+       __catch(...) { }
       }
     else
-      writestr("terminate called without an active exception\n");
+      fputs("terminate called without an active exception\n", stderr);
     
     abort();
   }
-} // namespace __gnu_cxx
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
+
+#endif