From d50fb671239c72981f8622d394b9ca825a212e02 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Tue, 20 Dec 2011 00:16:25 +0000 Subject: [PATCH] eh_tm.cc (free_any_cxa_exception): Use __GCC_ATOMIC_INT_LOCK_FREE, not _GLIBCXX_ATOMIC_BUILTINS_4. 2011-12-19 Benjamin Kosnik * libsupc++/eh_tm.cc (free_any_cxa_exception): Use __GCC_ATOMIC_INT_LOCK_FREE, not _GLIBCXX_ATOMIC_BUILTINS_4. From-SVN: r182512 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/libsupc++/eh_tm.cc | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 07a8d7f4567..904b66a0bd1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2011-12-19 Benjamin Kosnik + + * libsupc++/eh_tm.cc (free_any_cxa_exception): Use + __GCC_ATOMIC_INT_LOCK_FREE, not _GLIBCXX_ATOMIC_BUILTINS_4. + 2011-12-19 Benjamin Kosnik * testsuite/performance/25_algorithms/search_n.cc: Disambiguate diff --git a/libstdc++-v3/libsupc++/eh_tm.cc b/libstdc++-v3/libsupc++/eh_tm.cc index a64610283ff..1df8644ea0c 100644 --- 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);