Mercurial > sdl-ios-xcode
changeset 5071:55ff76cdbbb8
HAVE_GCC_ATOMICS covers the test and set
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Fri, 21 Jan 2011 21:45:55 -0800 |
| parents | 042ad5e274ed |
| children | 2341ecc03388 |
| files | configure.in include/SDL_config_iphoneos.h src/atomic/SDL_spinlock.c |
| diffstat | 3 files changed, 13 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Fri Jan 21 21:43:56 2011 -0800 +++ b/configure.in Fri Jan 21 21:45:55 2011 -0800 @@ -311,18 +311,18 @@ if test x$have_gcc_atomics = xyes; then AC_DEFINE(HAVE_GCC_ATOMICS) - fi - - # See if we have the minimum operation needed for GCC atomics - AC_TRY_LINK([ - ],[ - int a; - __sync_lock_test_and_set(&a, 1); - ],[ - have_gcc_sync_lock_test_and_set=yes - ]) - if test x$have_gcc_sync_lock_test_and_set = xyes; then - AC_DEFINE(HAVE_GCC_SYNC_LOCK_TEST_AND_SET) + else + # See if we have the minimum operation needed for GCC atomics + AC_TRY_LINK([ + ],[ + int a; + __sync_lock_test_and_set(&a, 1); + ],[ + have_gcc_sync_lock_test_and_set=yes + ]) + if test x$have_gcc_sync_lock_test_and_set = xyes; then + AC_DEFINE(HAVE_GCC_SYNC_LOCK_TEST_AND_SET) + fi fi fi
--- a/include/SDL_config_iphoneos.h Fri Jan 21 21:43:56 2011 -0800 +++ b/include/SDL_config_iphoneos.h Fri Jan 21 21:45:55 2011 -0800 @@ -44,7 +44,6 @@ #define SDL_HAS_64BIT_TYPE 1 #define HAVE_GCC_ATOMICS 1 -#define HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1 #define HAVE_ALLOCA_H 1 #define HAVE_SYS_TYPES_H 1
--- a/src/atomic/SDL_spinlock.c Fri Jan 21 21:43:56 2011 -0800 +++ b/src/atomic/SDL_spinlock.c Fri Jan 21 21:45:55 2011 -0800 @@ -36,7 +36,7 @@ #elif defined(__MACOSX__) return OSAtomicCompareAndSwap32Barrier(0, 1, lock); -#elif defined(HAVE_GCC_SYNC_LOCK_TEST_AND_SET) +#elif defined(HAVE_GCC_ATOMICS) || defined(HAVE_GCC_SYNC_LOCK_TEST_AND_SET) return (__sync_lock_test_and_set(lock, 1) == 0); #elif defined(__GNUC__) && defined(__arm__) && defined(__ARM_ARCH_5__)