diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-14 10:10:07 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-14 10:10:07 +0000 |
commit | bceb3cd988385d45731703de932adb04846e3db3 (patch) | |
tree | 6ab75a3b165890dfdb1889232c56f78cefaa720a /configure.in | |
parent | 7493417468a731e73d0346e3bdb7bdc59d453735 (diff) |
merge revision(s) 43851,43882,43996:
* ruby_atomic.h: use __atomic builtin functions supported by GCC.
__sync family are legacy functions now and it is recommended
that new code use the __atomic functions.
http://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html
* configure.in: check existence of __atomic functions.
* ruby_atomic.h: define ATOMIC_SIZE_CAS() with
__atomic_compare_exchange_n() and refactoring.
* ruby_atomic.h (ATOMIC_PTR_EXCHANGE): atomic exchange function for
a generic pointer.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/configure.in b/configure.in index ea461489a1..64b257abfd 100644 --- a/configure.in +++ b/configure.in @@ -887,19 +887,35 @@ if test "$GCC" = yes; then AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)], [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)]) fi - AC_CACHE_CHECK([for atomic builtins], [rb_cv_gcc_atomic_builtins], [ + + AC_CACHE_CHECK([for __atomic builtins], [rb_cv_gcc_atomic_builtins], [ AC_TRY_LINK([unsigned char atomic_var;], [ - __sync_lock_test_and_set(&atomic_var, 0); - __sync_lock_test_and_set(&atomic_var, 1); - __sync_fetch_and_add(&atomic_var, 1); - __sync_fetch_and_sub(&atomic_var, 1); + __atomic_exchange_n(&atomic_var, 0, __ATOMIC_SEQ_CST); + __atomic_exchange_n(&atomic_var, 1, __ATOMIC_SEQ_CST); + __atomic_fetch_add(&atomic_var, 1, __ATOMIC_SEQ_CST); + __atomic_fetch_sub(&atomic_var, 1, __ATOMIC_SEQ_CST); ], [rb_cv_gcc_atomic_builtins=yes], [rb_cv_gcc_atomic_builtins=no])]) if test "$rb_cv_gcc_atomic_builtins" = yes; then AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS) fi + + AC_CACHE_CHECK([for __sync builtins], [rb_cv_gcc_sync_builtins], [ + AC_TRY_LINK([unsigned char atomic_var;], + [ + __sync_lock_test_and_set(&atomic_var, 0); + __sync_lock_test_and_set(&atomic_var, 1); + __sync_fetch_and_add(&atomic_var, 1); + __sync_fetch_and_sub(&atomic_var, 1); + ], + [rb_cv_gcc_sync_builtins=yes], + [rb_cv_gcc_sync_builtins=no])]) + if test "$rb_cv_gcc_sync_builtins" = yes; then + AC_DEFINE(HAVE_GCC_SYNC_BUILTINS) + fi + fi AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [ |