diff options
| author | Martin Storsjö <martin@martin.st> | 2013-03-08 12:32:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 10:41:02 +0100 |
| commit | c48828f763672e45f0b1a20de41fb7ddd744462b (patch) | |
| tree | f1d4afdd4b5285e18a6b54c7f49b098838f972a3 | |
| parent | c536253854eadf9ebf5aa0506657f9c24e522e57 (diff) | |
| download | ffmpeg-c48828f763672e45f0b1a20de41fb7ddd744462b.tar.gz | |
atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
Not all gcc configurations have an implementation of all the atomic
operations, and some gcc configurations have some atomic builtins
implemented but not all.
Thus check for the most essential function, whose presence should
indicate that all others are present as well, since it can be used
to implement all the other ones.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavutil/atomic.c | 4 | ||||
| -rw-r--r-- | libavutil/atomic.h | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -1482,7 +1482,7 @@ HAVE_LIST=" struct_v4l2_frmivalenum_discrete symver_asm_label symver_gnu_asm - sync_synchronize + sync_val_compare_and_swap sysconf sysctl sys_mman_h @@ -3795,7 +3795,7 @@ check_func_headers malloc.h _aligned_malloc && enable aligned_malloc check_func setrlimit check_func strerror_r check_func sched_getaffinity -check_builtin sync_synchronize "" "__sync_synchronize()" +check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval, newval; __sync_val_compare_and_swap(ptr, oldval, newval)" check_builtin machine_rw_barrier mbarrier.h "__machine_rw_barrier()" check_builtin MemoryBarrier windows.h "MemoryBarrier()" check_func sysconf diff --git a/libavutil/atomic.c b/libavutil/atomic.c index 55abbab13a..7a701e1598 100644 --- a/libavutil/atomic.c +++ b/libavutil/atomic.c @@ -20,7 +20,7 @@ #include "atomic.h" -#if !HAVE_MEMORYBARRIER && !HAVE_SYNC_SYNCHRONIZE && !HAVE_MACHINE_RW_BARRIER +#if !HAVE_MEMORYBARRIER && !HAVE_SYNC_VAL_COMPARE_AND_SWAP && !HAVE_MACHINE_RW_BARRIER #if HAVE_PTHREADS @@ -102,7 +102,7 @@ void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval) #endif /* HAVE_PTHREADS */ -#endif /* !HAVE_MEMORYBARRIER && !HAVE_SYNC_SYNCHRONIZE && !HAVE_MACHINE_RW_BARRIER */ +#endif /* !HAVE_MEMORYBARRIER && !HAVE_SYNC_VAL_COMPARE_AND_SWAP && !HAVE_MACHINE_RW_BARRIER */ #ifdef TEST #include <assert.h> diff --git a/libavutil/atomic.h b/libavutil/atomic.h index 14d334f19c..61512e0fec 100644 --- a/libavutil/atomic.h +++ b/libavutil/atomic.h @@ -25,7 +25,7 @@ #if HAVE_MEMORYBARRIER #include "atomic_win32.h" -#elif HAVE_SYNC_SYNCHRONIZE +#elif HAVE_SYNC_VAL_COMPARE_AND_SWAP #include "atomic_gcc.h" #elif HAVE_MACHINE_RW_BARRIER #include "atomic_suncc.h" |