summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Ghedini <alessandro@ghedini.me>2014-06-17 20:03:19 +0200
committerwm4 <wm4@nowhere>2014-06-17 22:44:51 +0200
commit84eebc6e4eb0a8731ca07e387749fd7167624bfd (patch)
tree26159e2ab7683f443698ed7fedb4fdf1e2fa2905
parent8ffef4be92fe52b6d70c0f76e92f062a4e6eeeca (diff)
downloadmpv-84eebc6e4eb0a8731ca07e387749fd7167624bfd.tar.bz2
mpv-84eebc6e4eb0a8731ca07e387749fd7167624bfd.tar.xz
build: check for 64bit stdatomic.h operations too
This fixes the build on platform where the atomic calls can't be turned into lock-free instructions and thus need the external libatomic library (e.g. mips).
-rwxr-xr-xold-configure3
-rw-r--r--wscript6
2 files changed, 5 insertions, 4 deletions
diff --git a/old-configure b/old-configure
index 6eed18bcc8..686cbcfd62 100755
--- a/old-configure
+++ b/old-configure
@@ -493,7 +493,8 @@ compile_check waftools/fragments/pthreads.c "$_ld_pthread" || die "Unable to fin
echores "yes"
check_statement_libs "support for stdatomic.h" auto STDATOMIC \
- stdatomic.h '_Atomic int test = ATOMIC_VAR_INIT(123); int test2 = atomic_load(&test)'
+ stdatomic.h 'atomic_int_least64_t test = ATOMIC_VAR_INIT(123); int test2 = atomic_load(&test)' \
+ " " "-latomic"
_stdatomic=$(defretval)
_atomic=auto
diff --git a/wscript b/wscript
index 075e1cf20c..6c5963387e 100644
--- a/wscript
+++ b/wscript
@@ -118,10 +118,10 @@ main_dependencies = [
}, {
'name': 'stdatomic',
'desc': 'stdatomic.h',
- 'func':
+ 'func': check_libs(['atomic'],
check_statement('stdatomic.h',
- '_Atomic int test = ATOMIC_VAR_INIT(123);'
- 'int test2 = atomic_load(&test)')
+ 'atomic_int_least64_t test = ATOMIC_VAR_INIT(123);'
+ 'int test2 = atomic_load(&test)'))
}, {
'name': 'atomic-builtins',
'desc': 'compiler support for __atomic built-ins',