2005-12-23 Paolo Carlini <pcarlini@suse.de>

        Merged to mainline at revision 109012.


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/libstdcxx_so_7-branch@109015 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 19 insertions, 11 deletions

diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index 868725e8237..9d208845997 100644
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -158,6 +158,8 @@ EGREP = @EGREP@
 ENABLE_SYMVERS_DARWIN_EXPORT_FALSE = @ENABLE_SYMVERS_DARWIN_EXPORT_FALSE@
 ENABLE_SYMVERS_DARWIN_EXPORT_TRUE = @ENABLE_SYMVERS_DARWIN_EXPORT_TRUE@
 ENABLE_SYMVERS_GNU_FALSE = @ENABLE_SYMVERS_GNU_FALSE@
+ENABLE_SYMVERS_GNU_NAMESPACE_FALSE = @ENABLE_SYMVERS_GNU_NAMESPACE_FALSE@
+ENABLE_SYMVERS_GNU_NAMESPACE_TRUE = @ENABLE_SYMVERS_GNU_NAMESPACE_TRUE@
 ENABLE_SYMVERS_GNU_TRUE = @ENABLE_SYMVERS_GNU_TRUE@
 EXEEXT = @EXEEXT@
 EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
@@ -209,7 +211,7 @@ SHELL = @SHELL@
 STRING_H = @STRING_H@
 STRING_NAME = @STRING_NAME@
 STRIP = @STRIP@
-SYMVER_MAP = @SYMVER_MAP@
+SYMVER_FILE = @SYMVER_FILE@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
diff --git a/libstdc++-v3/libsupc++/eh_alloc.cc b/libstdc++-v3/libsupc++/eh_alloc.cc
index 5a0d50c8058..b9097812a75 100644
--- a/libstdc++-v3/libsupc++/eh_alloc.cc
+++ b/libstdc++-v3/libsupc++/eh_alloc.cc
@@ -45,8 +45,8 @@ using std::free;
 using std::malloc;
 using std::memcpy;
 #else
-// In a freestanding environment, these functions may not be
-// available -- but for now, we assume that they are.
+// In a freestanding environment, these functions may not be available
+// -- but for now, we assume that they are.
 extern "C" void *malloc (std::size_t);
 extern "C" void free(void *);
 extern "C" int memset (void *, int, std::size_t);
diff --git a/libstdc++-v3/libsupc++/exception b/libstdc++-v3/libsupc++/exception
index 657cbf7791b..cfaf5b1e74c 100644
--- a/libstdc++-v3/libsupc++/exception
+++ b/libstdc++-v3/libsupc++/exception
@@ -1,6 +1,6 @@
 // Exception Handling support header for -*- C++ -*-
 
-// Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002
+// Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2005
 // Free Software Foundation
 //
 // This file is part of GCC.
@@ -39,6 +39,8 @@
 
 #pragma GCC visibility push(default)
 
+#include <bits/c++config.h>
+
 extern "C++" {
 
 namespace std 
@@ -102,8 +104,8 @@ namespace std
   bool uncaught_exception() throw();
 } // namespace std
 
-namespace __gnu_cxx
-{
+_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
+
   /** A replacement for the standard terminate_handler which prints more
       information about the terminating exception (if any) on stderr.  Call
       @code
@@ -115,7 +117,8 @@ namespace __gnu_cxx
       In 3.4 and later, this is on by default.
   */
   void __verbose_terminate_handler ();
-} // namespace __gnu_cxx
+
+_GLIBCXX_END_NAMESPACE
   
 } // extern "C++"
 
diff --git a/libstdc++-v3/libsupc++/vterminate.cc b/libstdc++-v3/libsupc++/vterminate.cc
index 88156aa579f..dd3b657c0e6 100644
--- a/libstdc++-v3/libsupc++/vterminate.cc
+++ b/libstdc++-v3/libsupc++/vterminate.cc
@@ -1,6 +1,6 @@
 // Verbose terminate_handler -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2004, 2005 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
@@ -28,6 +28,7 @@
 // the GNU General Public License.
 
 #include <bits/c++config.h>
+
 #if _GLIBCXX_HOSTED
 #include <cstdlib>
 #include <exception>
@@ -38,8 +39,8 @@
 using namespace std;
 using namespace abi;
 
-namespace __gnu_cxx
-{
+_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
+
   // A replacement for the standard terminate_handler which prints
   // more information about the terminating exception (if any) on
   // stderr.
@@ -96,5 +97,7 @@ namespace __gnu_cxx
     
     abort();
   }
-} // namespace __gnu_cxx
+
+_GLIBCXX_END_NAMESPACE
+
 #endif