diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2008-04-26 14:28:47 +0000 |
|---|---|---|
| committer | H.J. Lu <hongjiu.lu@intel.com> | 2008-04-26 14:28:47 +0000 |
| commit | 3671107146f6d0e58e67224107ec97a524d27156 (patch) | |
| tree | 41142492d6b0f089f563852fe2d8ebdea9a34885 /libstdc++-v3/src | |
| parent | 39d043c6ccb8de3e863d9ca7d04001d3b64dedb5 (diff) | |
Merged with trunk at revision 134683.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/stack@134701 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 1 | ||||
| -rw-r--r-- | libstdc++-v3/src/atomic.cc | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index f7e10ac1663..492c8907ced 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -50,6 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/lib-prefix.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/no-executables.m4 \ + $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../config/proginstall.m4 \ $(top_srcdir)/../config/stdint.m4 \ $(top_srcdir)/../config/unwind_ipinfo.m4 \ diff --git a/libstdc++-v3/src/atomic.cc b/libstdc++-v3/src/atomic.cc index e09a9d201b1..46d3f7698e9 100644 --- a/libstdc++-v3/src/atomic.cc +++ b/libstdc++-v3/src/atomic.cc @@ -54,7 +54,7 @@ namespace std atomic_flag_test_and_set_explicit(volatile atomic_flag* __a, memory_order __x) { -#ifdef _GLIBCXX_ATOMIC_BUILTINS +#ifdef _GLIBCXX_ATOMIC_BUILTINS_1 if (__x >= memory_order_acq_rel) __sync_synchronize(); return __sync_lock_test_and_set(&(__a->_M_base._M_b), 1); @@ -72,7 +72,7 @@ namespace std void atomic_flag_clear_explicit(volatile atomic_flag* __a, memory_order __x) { -#ifdef _GLIBCXX_ATOMIC_BUILTINS +#ifdef _GLIBCXX_ATOMIC_BUILTINS_1 __sync_lock_release(&(__a->_M_base._M_b)); if (__x >= memory_order_acq_rel) __sync_synchronize(); @@ -88,7 +88,7 @@ namespace std void atomic_flag_fence(const volatile atomic_flag*, memory_order) { -#ifdef _GLIBCXX_ATOMIC_BUILTINS +#ifdef _GLIBCXX_ATOMIC_BUILTINS_1 __sync_synchronize(); #endif } |