luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1576-meson-armv5-atomic' into 'master'

Browse Source 
meson: Define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 on GNU/Linux if needed

Closes #1576

See merge request GNOME/glib!434
This commit is contained in:
Philip Withnall 2018-11-02 20:56:37 +00:00
commit b09a0df9a9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -1575,8 +1575,8 @@ atomicdefine = '''
# We know that we can always use real ("lock free") atomic operations with MSVC # We know that we can always use real ("lock free") atomic operations with MSVC
if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops') if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
have_atomic_lock_free = true have_atomic_lock_free = true
if host_system == 'android' and not cc.compiles(atomicdefine, name : 'atomic ops define') if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
# When building for armv5 on Android, gcc 4.9 provides # When building for armv5 on Linux, gcc provides
# __sync_bool_compare_and_swap but doesn't define # __sync_bool_compare_and_swap but doesn't define
# __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
glib_conf.set('__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4', true) glib_conf.set('__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4', true)