luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-13 22:07:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[win32] Fix atomic ops on mingw*

Browse Source 
Bug 682896 - glib doesn't build on mingw32
This commit is contained in:
Behdad Esfahbod 2013-02-25 22:48:03 -05:00
parent e1ccae8416
commit 547221b486
1 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
configure.ac
View File

@ -2373,7 +2373,7 @@ dnl
dnl We can currently support the atomic ops natively when building GLib dnl We can currently support the atomic ops natively when building GLib
dnl with recent versions of GCC or MSVC. MSVC doesn't run ./configure, dnl with recent versions of GCC or MSVC. MSVC doesn't run ./configure,
dnl so we skip that case here and define G_ATOMIC_LOCK_FREE exactly when dnl so we skip that case here and define G_ATOMIC_LOCK_FREE exactly when
dnl we are using GCC. dnl we are using GCC (and not mingw*).
dnl dnl
dnl Note that the atomic ops are only available with GCC on x86 when dnl Note that the atomic ops are only available with GCC on x86 when
dnl using -march=i486 or higher. If we detect that the atomic ops are dnl using -march=i486 or higher. If we detect that the atomic ops are
@ -2385,13 +2385,17 @@ dnl the user had the wrong build environment.
dnl We may add other compilers here in the future... dnl We may add other compilers here in the future...
AC_CACHE_CHECK([for lock-free atomic intrinsics], glib_cv_g_atomic_lock_free, [ AC_CACHE_CHECK([for lock-free atomic intrinsics], glib_cv_g_atomic_lock_free, [
case $host in
*-*-mingw*)
glib_cv_g_atomic_lock_free=yes
;;
*)
AC_TRY_COMPILE([], AC_TRY_COMPILE([],
[volatile int atomic = 2;\ [volatile int atomic = 2;\
__sync_bool_compare_and_swap (&atomic, 2, 3);], __sync_bool_compare_and_swap (&atomic, 2, 3);],
[glib_cv_g_atomic_lock_free=yes], [glib_cv_g_atomic_lock_free=yes],
[glib_cv_g_atomic_lock_free=no])]) [glib_cv_g_atomic_lock_free=no])
if test "$glib_cv_g_atomic_lock_free" = "no"; then
if test "$glib_cv_g_atomic_lock_free" = "no"; then
SAVE_CFLAGS="${CFLAGS}" SAVE_CFLAGS="${CFLAGS}"
CFLAGS="-march=i486" CFLAGS="-march=i486"
AC_TRY_COMPILE([], AC_TRY_COMPILE([],
@ -2400,16 +2404,25 @@ if test "$glib_cv_g_atomic_lock_free" = "no"; then
[AC_MSG_ERROR([GLib must be build with -march=i486 or later.])], [AC_MSG_ERROR([GLib must be build with -march=i486 or later.])],
[]) [])
CFLAGS="${SAVE_CFLAGS}" CFLAGS="${SAVE_CFLAGS}"
fi fi
;;
esac])
# Some compilers support atomic operations but do not define
# __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4, like clang case $host in
if test x"$glib_cv_g_atomic_lock_free" = xyes; then *-*-mingw*)
;;
*)
# Some compilers support atomic operations but do not define
# __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4, like clang
if test x"$glib_cv_g_atomic_lock_free" = xyes; then
AC_TRY_COMPILE([], AC_TRY_COMPILE([],
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4;], [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4;],
[], [],
[AC_DEFINE(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4, 1, [ compiler supports atomic operations])]) [AC_DEFINE(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4, 1, [ compiler supports atomic operations])])
fi fi
;;
esac
dnl We need a more robust approach here... dnl We need a more robust approach here...
case $host_cpu in case $host_cpu in