2011-12-19 Benjamin Kosnik <bkoz@redhat.com>

	* libsupc++/eh_tm.cc (free_any_cxa_exception): Use
	__GCC_ATOMIC_INT_LOCK_FREE, not _GLIBCXX_ATOMIC_BUILTINS_4.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182512 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 07a8d7f..904b66a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2011-12-19  Benjamin Kosnik  <bkoz@redhat.com>
 
+       * libsupc++/eh_tm.cc (free_any_cxa_exception): Use
+       __GCC_ATOMIC_INT_LOCK_FREE, not _GLIBCXX_ATOMIC_BUILTINS_4.
+
+2011-12-19  Benjamin Kosnik  <bkoz@redhat.com>
+
        * testsuite/performance/25_algorithms/search_n.cc: Disambiguate
        local variable.
 

diff --git a/libstdc++-v3/libsupc++/eh_tm.cc b/libstdc++-v3/libsupc++/eh_tm.cc
index a646102..1df8644 100644 (file)
--- a/libstdc++-v3/libsupc++/eh_tm.cc
+++ b/libstdc++-v3/libsupc++/eh_tm.cc
@@ -1,5 +1,5 @@
 // -*- C++ -*- Exception handling routines for Transactional Memory.
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 //
 // This file is part of GCC.
 //
@@ -45,7 +45,7 @@ free_any_cxa_exception (_Unwind_Exception *eo)
       __cxa_free_dependent_exception (dep);
     }
 
-#ifdef _GLIBCXX_ATOMIC_BUILTINS_4
+#if __GCC_ATOMIC_INT_LOCK_FREE > 1
   if (__sync_sub_and_fetch (&h->referenceCount, 1) == 0)
 #endif
     __cxa_free_exception (h + 1);