concurrence.h: Do not include <cstdlib>, use __builtin_abort.

2007-04-22  Paolo Carlini  <pcarlini@suse.de>

	* include/ext/concurrence.h: Do not include <cstdlib>, use
	__builtin_abort.
	* include/debug/debug.h: Likewise.
	* include/tr1/memory: Likewise.
	* include/tr1/boost_shared_ptr.h: Likewise.
	* include/tr1/functional: Likewise.

From-SVN: r124040

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 045fa34c1de6dc937655907d4b06c58794b6e92f..6f932810e150ac4898954dc18dca9933cfa578a6 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2007-04-22  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/ext/concurrence.h: Do not include <cstdlib>, use
+       __builtin_abort.
+       * include/debug/debug.h: Likewise.
+       * include/tr1/memory: Likewise.
+       * include/tr1/boost_shared_ptr.h: Likewise.
+       * include/tr1/functional: Likewise.
+
 2007-04-22  Paolo Carlini  <pcarlini@suse.de>
 
        * include/bits/locale_facets.tcc: Do not include <typeinfo>.

diff --git a/libstdc++-v3/include/debug/debug.h b/libstdc++-v3/include/debug/debug.h
index b914a2cca4de720189b01ac0959dfc9a400546ea..95aa3d5b95e5946afcdbd1cb35cae4ed18a62e8e 100644 (file)
--- a/libstdc++-v3/include/debug/debug.h
+++ b/libstdc++-v3/include/debug/debug.h
@@ -1,6 +1,6 @@
 // Debugging support implementation -*- C++ -*-
 
-// Copyright (C) 2003, 2005, 2006
+// Copyright (C) 2003, 2004, 2005, 2006, 2007
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -80,7 +80,6 @@ namespace __gnu_debug
 
 #else
 
-# include <cstdlib>
 # include <cstdio>
 # include <debug/macros.h>
 
@@ -96,7 +95,7 @@ namespace std
     {
       printf("%s:%d: %s: Assertion '%s' failed.\n", __file, __line,
             __function, __condition);
-      abort();
+      __builtin_abort();
     }
   } // namespace __debug
 } // namespace std

diff --git a/libstdc++-v3/include/ext/concurrence.h b/libstdc++-v3/include/ext/concurrence.h
index 56e07de91e0dbaf2142812406d4a5ba490998302..6efb2a6be08c8cee4ed109018f1563327ff8a0c9 100644 (file)
--- a/libstdc++-v3/include/ext/concurrence.h
+++ b/libstdc++-v3/include/ext/concurrence.h
@@ -1,6 +1,6 @@
 // Support for concurrent programing -*- C++ -*-
 
-// Copyright (C) 2003, 2004, 2005, 2006
+// Copyright (C) 2003, 2004, 2005, 2006, 2007
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -36,7 +36,6 @@
 #ifndef _CONCURRENCE_H
 #define _CONCURRENCE_H 1
 
-#include <cstdlib>
 #include <exception>
 #include <bits/gthr.h> 
 #include <bits/functexcept.h>
@@ -90,7 +89,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 #if __EXCEPTIONS
     throw __concurrence_lock_error();
 #else
-    std::abort();
+    __builtin_abort();
 #endif
   }
 
@@ -100,7 +99,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 #if __EXCEPTIONS
     throw __concurrence_unlock_error();
 #else
-    std::abort();
+    __builtin_abort();
 #endif
   }
 

diff --git a/libstdc++-v3/include/tr1/boost_shared_ptr.h b/libstdc++-v3/include/tr1/boost_shared_ptr.h
index 524a98ccc042520f323c505067e567da017a1b52..d90e6ff81713a0bf67898454ad90ccd1b10184ab 100644 (file)
--- a/libstdc++-v3/include/tr1/boost_shared_ptr.h
+++ b/libstdc++-v3/include/tr1/boost_shared_ptr.h
@@ -1,6 +1,6 @@
 // <tr1/boost_shared_ptr.h> -*- C++ -*-
 
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 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
@@ -73,7 +73,7 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
 #if __EXCEPTIONS
     throw bad_weak_ptr();
 #else
-    std::abort();
+    __builtin_abort();
 #endif
   }
 

diff --git a/libstdc++-v3/include/tr1/functional b/libstdc++-v3/include/tr1/functional
index 7b269fa06cf3c1ac0d93a331c11f9c3c8a080e87..e292260c5db06147e21a80f78bced9825b28f218 100644 (file)
--- a/libstdc++-v3/include/tr1/functional
+++ b/libstdc++-v3/include/tr1/functional
@@ -36,7 +36,6 @@
 
 #pragma GCC system_header
 
-#include <cstdlib>              // for std::abort
 #include <cmath>                // for std::frexp
 #include <string>               // for std::tr1::hash
 #include <functional>
@@ -2183,7 +2182,7 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
 #if __EXCEPTIONS
           throw bad_function_call();
 #else
-          std::abort();
+          __builtin_abort();
 #endif
         }
       return _M_invoker(_M_functor, __args...);

diff --git a/libstdc++-v3/include/tr1/memory b/libstdc++-v3/include/tr1/memory
index 7413410bc27e54c4d5e8c1244b03fbc6f3da215d..f397c980d4994b93b421997152a8da2cb6be0494 100644 (file)
--- a/libstdc++-v3/include/tr1/memory
+++ b/libstdc++-v3/include/tr1/memory
@@ -36,7 +36,6 @@
 #define _TR1_MEMORY 1
 
 #include <cstddef>             // std::size_t
-#include <cstdlib>             // std::abort
 #include <exception>           // std::exception
 #include <new>                 // std::bad_alloc
 #include <typeinfo>            // std::type_info in get_deleter