configure: Check for working -mabi=ms support on x86_64.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
bf3ef684e2
commit
9226d0c3d8
|
@ -19273,34 +19273,41 @@ if test "x$ac_cv_cflags__Wno_format" = xyes
|
||||||
then :
|
then :
|
||||||
EXTRACFLAGS="$EXTRACFLAGS -Wno-format"
|
EXTRACFLAGS="$EXTRACFLAGS -Wno-format"
|
||||||
fi ;;
|
fi ;;
|
||||||
*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -mabi=ms" >&5
|
*) if test -z "$CROSSTARGET"
|
||||||
printf %s "checking whether the compiler supports -mabi=ms... " >&6; }
|
then
|
||||||
if test ${ac_cv_cflags__mabi_ms+y}
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working -mabi=ms" >&5
|
||||||
|
printf %s "checking for working -mabi=ms... " >&6; }
|
||||||
|
if test ${ac_cv_mabi_ms+y}
|
||||||
then :
|
then :
|
||||||
printf %s "(cached) " >&6
|
printf %s "(cached) " >&6
|
||||||
else $as_nop
|
else $as_nop
|
||||||
ac_wine_try_cflags_saved=$CFLAGS
|
CFLAGS="$CFLAGS -mabi=ms"
|
||||||
CFLAGS="$CFLAGS -mabi=ms"
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
int main(int argc, char **argv) { return 0; }
|
#include <stdarg.h>
|
||||||
|
int a(int b, ...) { __builtin_ms_va_list list; __builtin_ms_va_start(list,b); }
|
||||||
|
int
|
||||||
|
main (void)
|
||||||
|
{
|
||||||
|
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
_ACEOF
|
_ACEOF
|
||||||
if ac_fn_c_try_link "$LINENO"
|
if ac_fn_c_try_compile "$LINENO"
|
||||||
then :
|
then :
|
||||||
ac_cv_cflags__mabi_ms=yes
|
ac_cv_mabi_ms=yes
|
||||||
else $as_nop
|
else $as_nop
|
||||||
ac_cv_cflags__mabi_ms=no
|
ac_cv_mabi_ms=no
|
||||||
fi
|
fi
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
CFLAGS=$saved_CFLAGS
|
||||||
CFLAGS=$ac_wine_try_cflags_saved
|
|
||||||
fi
|
fi
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__mabi_ms" >&5
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mabi_ms" >&5
|
||||||
printf "%s\n" "$ac_cv_cflags__mabi_ms" >&6; }
|
printf "%s\n" "$ac_cv_mabi_ms" >&6; }
|
||||||
if test "x$ac_cv_cflags__mabi_ms" = xyes
|
test $ac_cv_mabi_ms = yes || as_fn_error $? "The compiler doesn't support -mabi=ms. Use gcc instead of clang, or install mingw-w64." "$LINENO" 5
|
||||||
then :
|
fi
|
||||||
MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms"
|
MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" ;;
|
||||||
fi ;;
|
|
||||||
esac ;;
|
esac ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
12
configure.ac
12
configure.ac
|
@ -1893,7 +1893,17 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=
|
||||||
dnl Mingw uses Windows 64-bit types, not Unix ones
|
dnl Mingw uses Windows 64-bit types, not Unix ones
|
||||||
cygwin*|mingw32*) WINE_TRY_CFLAGS([-Wno-format]) ;;
|
cygwin*|mingw32*) WINE_TRY_CFLAGS([-Wno-format]) ;;
|
||||||
dnl Default to ms_abi on 64-bit
|
dnl Default to ms_abi on 64-bit
|
||||||
*) WINE_TRY_CFLAGS([-mabi=ms],[MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms"]) ;;
|
*) if test -z "$CROSSTARGET"
|
||||||
|
then
|
||||||
|
AC_CACHE_CHECK([for working -mabi=ms], ac_cv_mabi_ms,
|
||||||
|
[CFLAGS="$CFLAGS -mabi=ms"
|
||||||
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
|
||||||
|
int a(int b, ...) { __builtin_ms_va_list list; __builtin_ms_va_start(list,b); }]])],
|
||||||
|
[ac_cv_mabi_ms=yes],[ac_cv_mabi_ms=no])
|
||||||
|
CFLAGS=$saved_CFLAGS])
|
||||||
|
test $ac_cv_mabi_ms = yes || AC_MSG_ERROR([The compiler doesn't support -mabi=ms. Use gcc instead of clang, or install mingw-w64.])
|
||||||
|
fi
|
||||||
|
MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" ;;
|
||||||
esac ;;
|
esac ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue