Skip to content

Commit

Permalink
Fix compilation with mingw
Browse files Browse the repository at this point in the history
  • Loading branch information
@4144
4144 committed Feb 15, 2021
1 parent f6c6277 commit 8179db5
Show file tree
Hide file tree
Showing 8 changed files with 153 additions and 108 deletions.
90 changes: 56 additions & 34 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5294,9 +5294,14 @@ fi
# Check if CC supports __thread attribute (Thread Local Storage)
# (Usually our OSX friends 're lacking support of it in older llvm versions ..)
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __thread specifier (TLS)" >&5
case "${host}" in
*-*-mingw*)
CPPFLAGS="$CPPFLAGS -DHAS_TLS"
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __thread specifier (TLS)" >&5
$as_echo_n "checking whether $CC supports __thread specifier (TLS)... " >&6; }
if test "$cross_compiling" = yes; then :
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
Expand All @@ -5305,23 +5310,22 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
__thread int g_Test = -1;
int main(int argc, char **argv){
g_Test = 0;
return g_Test;
}
__thread int g_Test = -1;
int main(int argc, char **argv){
g_Test = 0;
return g_Test;
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
CPPFLAGS="$CPPFLAGS -DHAS_TLS"
CPPFLAGS="$CPPFLAGS -DHAS_TLS"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
Expand All @@ -5330,6 +5334,9 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
;;
esac
#
# Check if the linker supports/accepts -rdynamic
Expand Down Expand Up @@ -9619,7 +9626,7 @@ $as_echo_n "checking for MinGW... " >&6; }
if test -n "`$CC --version 2>/dev/null | grep -i mingw`" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
CPPFLAGS="$CPPFLAGS -DMINGW"
CPPFLAGS="$CPPFLAGS -DMINGW -DLIBCONFIG_EXPORTS"
if test -z "$fd_setsize" ; then
CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=4096"
fi
Expand Down Expand Up @@ -9882,7 +9889,11 @@ fi
#
# pthread
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
case "${host}" in
*-*-mingw*)
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
$as_echo_n "checking for library containing pthread_create... " >&6; }
if ${ac_cv_search_pthread_create+:} false; then :
$as_echo_n "(cached) " >&6
Expand Down Expand Up @@ -9940,7 +9951,7 @@ else
as_fn_error $? "pthread library not found or incompatible" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_sigmask" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_sigmask" >&5
$as_echo_n "checking for library containing pthread_sigmask... " >&6; }
if ${ac_cv_search_pthread_sigmask+:} false; then :
$as_echo_n "(cached) " >&6
Expand Down Expand Up @@ -9998,7 +10009,7 @@ else
as_fn_error $? "pthread library not found or incompatible" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_attr_init" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_attr_init" >&5
$as_echo_n "checking for library containing pthread_attr_init... " >&6; }
if ${ac_cv_search_pthread_attr_init+:} false; then :
$as_echo_n "(cached) " >&6
Expand Down Expand Up @@ -10056,7 +10067,7 @@ else
as_fn_error $? "pthread library not found or incompatible" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_attr_setstacksize" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_attr_setstacksize" >&5
$as_echo_n "checking for library containing pthread_attr_setstacksize... " >&6; }
if ${ac_cv_search_pthread_attr_setstacksize+:} false; then :
$as_echo_n "(cached) " >&6
Expand Down Expand Up @@ -10114,7 +10125,7 @@ else
as_fn_error $? "pthread library not found or incompatible" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_attr_destroy" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_attr_destroy" >&5
$as_echo_n "checking for library containing pthread_attr_destroy... " >&6; }
if ${ac_cv_search_pthread_attr_destroy+:} false; then :
$as_echo_n "(cached) " >&6
Expand Down Expand Up @@ -10172,7 +10183,7 @@ else
as_fn_error $? "pthread library not found or incompatible" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_cancel" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_cancel" >&5
$as_echo_n "checking for library containing pthread_cancel... " >&6; }
if ${ac_cv_search_pthread_cancel+:} false; then :
$as_echo_n "(cached) " >&6
Expand Down Expand Up @@ -10230,7 +10241,7 @@ else
as_fn_error $? "pthread library not found or incompatible" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_join" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_join" >&5
$as_echo_n "checking for library containing pthread_join... " >&6; }
if ${ac_cv_search_pthread_join+:} false; then :
$as_echo_n "(cached) " >&6
Expand Down Expand Up @@ -10288,6 +10299,8 @@ else
as_fn_error $? "pthread library not found or incompatible" "$LINENO" 5
fi
;;
esac
# execinfo (backtrace)
for ac_header in execinfo.h
Expand Down Expand Up @@ -10424,12 +10437,19 @@ fi
MYSQL_OLD_LIBS="$LIBS" ; LIBS="$LIBS $MYSQL_LIBS"
MYSQL_OLD_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS $MYSQL_CFLAGS"
ac_fn_c_check_func "$LINENO" "mysql_init" "ac_cv_func_mysql_init"
case "${host}" in
*-*-mingw*)
HAVE_MYSQL="yes"
MYSQL_CFLAGS="$MYSQL_CFLAGS -Dmy_bool=bool"
;;
*)
ac_fn_c_check_func "$LINENO" "mysql_init" "ac_cv_func_mysql_init"
if test "x$ac_cv_func_mysql_init" = xyes; then :
HAVE_MYSQL="yes"
fi
ac_fn_c_check_header_mongrel "$LINENO" "mysql.h" "ac_cv_header_mysql_h" "$ac_includes_default"
ac_fn_c_check_header_mongrel "$LINENO" "mysql.h" "ac_cv_header_mysql_h" "$ac_includes_default"
if test "x$ac_cv_header_mysql_h" = xyes; then :
else
Expand All @@ -10438,9 +10458,9 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether my_bool is supported (MySQL)" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether my_bool is supported (MySQL)" >&5
$as_echo_n "checking whether my_bool is supported (MySQL)... " >&6; }
if test "$cross_compiling" = yes; then :
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
Expand All @@ -10449,33 +10469,35 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef WIN32
#include "common/winapi.h" // Needed before mysql.h
#endif
#include <mysql.h>
int main(int argc, char **argv){
my_bool val = (my_bool)0;
return (int)val;
}
#ifdef WIN32
#include "common/winapi.h" // Needed before mysql.h
#endif
#include <mysql.h>
int main(int argc, char **argv){
my_bool val = (my_bool)0;
return (int)val;
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (converting my_bool to bool)" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (converting my_bool to bool)" >&5
$as_echo "no (converting my_bool to bool)" >&6; }
MYSQL_CFLAGS="$MYSQL_CFLAGS -Dmy_bool=bool"
MYSQL_CFLAGS="$MYSQL_CFLAGS -Dmy_bool=bool"
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
;;
esac
CPPFLAGS="$MYSQL_OLD_CPPFLAGS"
LIBS="$MYSQL_OLD_LIBS"
Expand Down
114 changes: 68 additions & 46 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -809,24 +809,31 @@ AC_RUN_IFELSE(
# Check if CC supports __thread attribute (Thread Local Storage)
# (Usually our OSX friends 're lacking support of it in older llvm versions ..)
#
AC_MSG_CHECKING([whether $CC supports __thread specifier (TLS)])
AC_RUN_IFELSE(
[AC_LANG_SOURCE([
__thread int g_Test = -1;
int main(int argc, char **argv){
g_Test = 0;
return g_Test;
}
])],
[
AC_MSG_RESULT([yes])
case "${host}" in
*-*-mingw*)
CPPFLAGS="$CPPFLAGS -DHAS_TLS"
],
[
AC_MSG_RESULT([no])
]
)
;;
*)
AC_MSG_CHECKING([whether $CC supports __thread specifier (TLS)])
AC_RUN_IFELSE(
[AC_LANG_SOURCE([
__thread int g_Test = -1;
int main(int argc, char **argv){
g_Test = 0;
return g_Test;
}
])],
[
AC_MSG_RESULT([yes])
CPPFLAGS="$CPPFLAGS -DHAS_TLS"
],
[
AC_MSG_RESULT([no])
]
)
;;
esac


#
# Check if the linker supports/accepts -rdynamic
Expand Down Expand Up @@ -1772,7 +1779,7 @@ AC_SUBST([DLLEXT])
AC_MSG_CHECKING([for MinGW])
if test -n "`$CC --version 2>/dev/null | grep -i mingw`" ; then
AC_MSG_RESULT([yes])
CPPFLAGS="$CPPFLAGS -DMINGW"
CPPFLAGS="$CPPFLAGS -DMINGW -DLIBCONFIG_EXPORTS"
if test -z "$fd_setsize" ; then
CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=4096"
fi
Expand Down Expand Up @@ -1843,13 +1850,19 @@ fi
#
# pthread
#
AC_SEARCH_LIBS([pthread_create], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
AC_SEARCH_LIBS([pthread_sigmask], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
AC_SEARCH_LIBS([pthread_attr_init], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
AC_SEARCH_LIBS([pthread_attr_setstacksize], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
AC_SEARCH_LIBS([pthread_attr_destroy], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
AC_SEARCH_LIBS([pthread_cancel], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
AC_SEARCH_LIBS([pthread_join], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
case "${host}" in
*-*-mingw*)
;;
*)
AC_SEARCH_LIBS([pthread_create], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
AC_SEARCH_LIBS([pthread_sigmask], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
AC_SEARCH_LIBS([pthread_attr_init], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
AC_SEARCH_LIBS([pthread_attr_setstacksize], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
AC_SEARCH_LIBS([pthread_attr_destroy], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
AC_SEARCH_LIBS([pthread_cancel], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
AC_SEARCH_LIBS([pthread_join], [pthread], [], [AC_MSG_ERROR([pthread library not found or incompatible])])
;;
esac

# execinfo (backtrace)
AC_CHECK_HEADERS([execinfo.h],
Expand Down Expand Up @@ -1889,29 +1902,38 @@ fi

MYSQL_OLD_LIBS="$LIBS" ; LIBS="$LIBS $MYSQL_LIBS"
MYSQL_OLD_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS $MYSQL_CFLAGS"
AC_CHECK_FUNC([mysql_init], [HAVE_MYSQL="yes"])
AC_CHECK_HEADER([mysql.h], [], [HAVE_MYSQL=""])

AC_MSG_CHECKING([whether my_bool is supported (MySQL)])
AC_RUN_IFELSE(
[AC_LANG_SOURCE([
#ifdef WIN32
#include "common/winapi.h" // Needed before mysql.h
#endif
#include <mysql.h>
int main(int argc, char **argv){
my_bool val = (my_bool)0;
return (int)val;
}
])],
[
AC_MSG_RESULT([yes])
],
[
AC_MSG_RESULT([no (converting my_bool to bool)])
case "${host}" in
*-*-mingw*)
HAVE_MYSQL="yes"
MYSQL_CFLAGS="$MYSQL_CFLAGS -Dmy_bool=bool"
]
)
;;
*)
AC_CHECK_FUNC([mysql_init], [HAVE_MYSQL="yes"])
AC_CHECK_HEADER([mysql.h], [], [HAVE_MYSQL=""])

AC_MSG_CHECKING([whether my_bool is supported (MySQL)])
AC_RUN_IFELSE(
[AC_LANG_SOURCE([
#ifdef WIN32
#include "common/winapi.h" // Needed before mysql.h
#endif
#include <mysql.h>
int main(int argc, char **argv){
my_bool val = (my_bool)0;
return (int)val;
}
])],
[
AC_MSG_RESULT([yes])
],
[
AC_MSG_RESULT([no (converting my_bool to bool)])
MYSQL_CFLAGS="$MYSQL_CFLAGS -Dmy_bool=bool"
]
)
;;
esac

CPPFLAGS="$MYSQL_OLD_CPPFLAGS"
LIBS="$MYSQL_OLD_LIBS"
Expand Down
3 changes: 3 additions & 0 deletions src/common/atomic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ static forceinline int64 InterlockedExchangeAdd64(volatile int64 *addend, int64
return __sync_fetch_and_add(addend, increment);
}//end: InterlockedExchangeAdd64()

#if !defined(__MINGW32__) && !defined(MINGW)
static forceinline int32 InterlockedExchangeAdd(volatile int32 *addend, int32 increment){
return __sync_fetch_and_add(addend, increment);
}//end: InterlockedExchangeAdd()
Expand Down Expand Up @@ -148,6 +149,8 @@ static forceinline int32 InterlockedExchange(volatile int32 *target, int32 val){
return __sync_lock_test_and_set(target, val);
}//end: InterlockedExchange()

#endif // !defined(__MINGW32__) && !defined(MINGW)

#endif //endif compiler decision

#endif /* COMMON_ATOMIC_H */
Loading

0 comments on commit 8179db5

Please sign in to comment.