2006-08-31  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/28671
	* include/bits/atomicity.h (__exchange_and_add): Declare only.
	(__atomic_add): Same.
	* config/cpu/generic/atomicity_builtins/atomicity.h: Remove comment.

Index: include/bits/atomicity.h
===================================================================
--- include/bits/atomicity.h	(revision 116600)
+++ include/bits/atomicity.h	(working copy)
@@ -41,15 +41,6 @@
 
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 
-#ifdef _GLIBCXX_ATOMIC_BUILTINS
-  static inline _Atomic_word 
-  __exchange_and_add(volatile _Atomic_word* __mem, int __val)
-  { return __sync_fetch_and_add(__mem, __val); }
-
-  static inline void
-  __atomic_add(volatile _Atomic_word* __mem, int __val)
-  { __sync_fetch_and_add(__mem, __val); }
-#else
   _Atomic_word
   __attribute__ ((__unused__))
   __exchange_and_add(volatile _Atomic_word* __mem, int __val);
@@ -57,7 +48,6 @@
   void
   __attribute__ ((__unused__))
   __atomic_add(volatile _Atomic_word* __mem, int __val);
-#endif
 
   static inline _Atomic_word
   __exchange_and_add_single(_Atomic_word* __mem, int __val)
Index: config/cpu/generic/atomicity_builtins/atomicity.h
===================================================================
--- config/cpu/generic/atomicity_builtins/atomicity.h	(revision 116600)
+++ config/cpu/generic/atomicity_builtins/atomicity.h	(working copy)
@@ -33,8 +33,6 @@
 
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 
-  // XXX GLIBCXX_ABI Deprecated
-  // Should be inlined, and not exported.
   _Atomic_word 
   __attribute__ ((__unused__))
   __exchange_and_add(volatile _Atomic_word* __mem, int __val)