* Makefile.tpl (BUILD_CONFIGDIRS): Remove

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

diff --git a/libstdc++-v3/libsupc++/pure.cc b/libstdc++-v3/libsupc++/pure.cc
index 7ada066..8734730 100644 (file)
--- a/libstdc++-v3/libsupc++/pure.cc
+++ b/libstdc++-v3/libsupc++/pure.cc
@@ -1,22 +1,22 @@
 // -*- C++ -*- 
-// Copyright (C) 2000 Free Software Foundation
+// Copyright (C) 2000, 2001 Free Software Foundation
 //
-// This file is part of GNU CC.
+// This file is part of GCC.
 //
-// GNU CC is free software; you can redistribute it and/or modify
+// 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 2, or (at your option)
 // any later version.
 //
-// GNU CC is distributed in the hope that it will be useful,
+// 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.
 //
 // You should have received a copy of the GNU General Public License
-// along with GNU CC; see the file COPYING.  If not, write to
-// the Free Software Foundation, 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
+// along with GCC; see the file COPYING.  If not, write to
+// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+// Boston, MA 02110-1301, USA.
 //
 // As a special exception, you may use this file as part of a free software
 // library without restriction.  Specifically, if other files instantiate
@@ -28,8 +28,11 @@
 // the GNU General Public License.
 
 #include <bits/c++config.h>
+#include <cxxabi.h>
+#include "unwind-cxx.h"
 
-#ifdef _GLIBCPP_HAVE_UNISTD_H
+#if _GLIBCXX_HOSTED
+#ifdef _GLIBCXX_HAVE_UNISTD_H
 # include <unistd.h>
 # define writestr(str) write(2, str, sizeof(str) - 1)
 # ifdef __GNU_LIBRARY__
@@ -38,27 +41,16 @@
 /*#  define write(fd, buf, n)  __write((fd), (buf), (n))*/
 # endif
 #else
-# include <stdio.h>
-# define writestr(str) fputs(str, stderr)
+# include <cstdio>
+# define writestr(str) std::fputs(str, stderr)
 #endif
-
-extern "C" {
-
-extern void __terminate(void) __attribute__ ((__noreturn__));
-
-// The name of the function to be placed in vtables in place of a pure
-// virtual function is different in the two ABIs.
-#if !defined(__GXX_ABI_VERSION) || __GXX_ABI_VERSION < 100
-#define PURE_VIRTUAL_NAME __pure_virtual
 #else
-#define PURE_VIRTUAL_NAME __cxa_pure_virtual
+# define writestr(str) /* Empty */
 #endif
 
-void
-PURE_VIRTUAL_NAME (void)
+extern "C" void
+__cxxabiv1::__cxa_pure_virtual (void)
 {
   writestr ("pure virtual method called\n");
-  __terminate ();
-}
-
+  std::terminate ();
 }