[glib: 2/2] Merge branch 'clang-cl-support' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit fa4423d435910fe635de010e9b23debd3bcfd85e
Merge: 81b1ff830 e8d471f3e
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Jul 17 10:30:28 2019 +0000

    Merge branch 'clang-cl-support' into 'master'
    
    Experimental clang-cl support
    
    See merge request GNOME/glib!979

 gio/tests/meson.build                                    |  4 ++--
 glib/gnulib/gl_cv_func_frexp_works/meson.build           |  2 +-
 glib/gnulib/gl_cv_func_printf_directive_f/meson.build    |  2 +-
 glib/gnulib/gl_cv_func_printf_infinite/meson.build       |  2 +-
 .../gl_cv_func_printf_infinite_long_double/meson.build   |  2 +-
 glib/gnulib/gl_cv_func_printf_long_double/meson.build    |  2 +-
 glib/meson.build                                         |  2 +-
 gmodule/meson.build                                      |  2 +-
 meson.build                                              | 16 ++++++++--------
 9 files changed, 17 insertions(+), 17 deletions(-)
---
diff --cc meson.build
index 6c300c052,2cd512ecc..1a1455298
--- a/meson.build
+++ b/meson.build
@@@ -1595,10 -1595,10 +1595,10 @@@ atomicdefine = ''
  '''
  
  # 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.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops')
    have_atomic_lock_free = true
 -  if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic 
ops define')
 -    # When building for armv5 on Linux, gcc provides
 +  if cc.get_id() == 'gcc' and not cc.compiles(atomicdefine, name : 'atomic ops define')
 +    # Old gcc release may provide
      # __sync_bool_compare_and_swap but doesn't define
      # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
      glib_conf.set('__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4', true)