Skip to content

W
wine-winehq
Commit da2ae583 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

configure: Consistently use HOST_ARCH for platform checks.

parent c33f3506
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 78 deletions
aclocal.m4
View file @ da2ae583
......@@ -65,12 +65,9 @@ AC_DEFUN([WINE_PATH_PKG_CONFIG],
[WINE_CHECK_HOST_TOOL(PKG_CONFIG,[pkg-config])])
AC_DEFUN([WINE_PATH_MINGW_PKG_CONFIG],
[case "$host_cpu" in
i[[3456789]]86*)
ac_prefix_list="m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-w64-mingw32-pkg-config ])" ;;
*)
ac_prefix_list="$host_cpu-w64-mingw32-pkg-config" ;;
esac
[AS_VAR_IF([HOST_ARCH],[i386],
[ac_prefix_list="m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-w64-mingw32-pkg-config ])"],
[ac_prefix_list="$host_cpu-w64-mingw32-pkg-config"])
AC_CHECK_PROGS(MINGW_PKG_CONFIG,[$ac_prefix_list],false)])
dnl **** Extract the soname of a library ****
......
configure
View file @ da2ae583
......@@ -9440,8 +9440,9 @@ case $host_os in
LIBEXT="dll"
DLLEXT=""
EXTRACFLAGS="-D__WINE_PE_BUILD"
case $host_cpu in
*i[3456]86*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--disable-stdcall-fixup" >&5
if test "x$HOST_ARCH" = xi386
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--disable-stdcall-fixup" >&5
printf %s "checking whether the compiler supports -Wl,--disable-stdcall-fixup... " >&6; }
if test ${ac_cv_cflags__Wl___disable_stdcall_fixup+y}
then :
......@@ -9468,8 +9469,8 @@ printf "%s\n" "$ac_cv_cflags__Wl___disable_stdcall_fixup" >&6; }
if test "x$ac_cv_cflags__Wl___disable_stdcall_fixup" = xyes
then :
LDDLLFLAGS="-Wl,--disable-stdcall-fixup"
fi ;;
esac
fi
fi
enable_loader=${enable_loader:-no}
enable_server=${enable_server:-no}
with_x=${with_x:-no}
......@@ -9504,9 +9505,9 @@ fi ;;
WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
case $host_cpu in
*i[3456]86*|*x86_64*) wine_can_build_preloader=yes ;;
*) wine_can_build_preloader=no ;;
case $HOST_ARCH in
i386|x86_64) wine_can_build_preloader=yes ;;
*) wine_can_build_preloader=no ;;
esac
if test "$wine_can_build_preloader" = "yes"
......@@ -9540,11 +9541,11 @@ if test "x$ac_cv_cflags__Wl__no_pie" = xyes
then :
WINEPRELOADER_LDFLAGS="-Wl,-no_pie $WINEPRELOADER_LDFLAGS"
fi
case $host_cpu in
*i[3456]86*)
case $HOST_ARCH in
i386)
WINEPRELOADER_LDFLAGS="-Wl,-image_base,0x7d400000 $WINEPRELOADER_LDFLAGS"
;;
*x86_64*)
x86_64)
WINEPRELOADER_LDFLAGS="-Wl,-image_base,0x200000000,-segalign,0x1000,-segaddr,WINE_RESERVE,0x1000 $WINEPRELOADER_LDFLAGS"
;;
esac
......@@ -10056,11 +10057,11 @@ fi
if test "x$exec_prefix" = xNONE
then
case $host_cpu in
*i[3456]86*) exec_prefix='${prefix}/x86' ;;
*x86_64*) exec_prefix='${prefix}/x86_64' ;;
*arm*) exec_prefix='${prefix}/armeabi-v7a' ;;
*aarch64*) exec_prefix='${prefix}/arm64-v8a' ;;
case $HOST_ARCH in
i386) exec_prefix='${prefix}/x86' ;;
x86_64) exec_prefix='${prefix}/x86_64' ;;
arm) exec_prefix='${prefix}/armeabi-v7a' ;;
aarch64) exec_prefix='${prefix}/arm64-v8a' ;;
esac
fi
;;
......@@ -10072,8 +10073,8 @@ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
test "$ac_cv_sys_file_offset_bits" = 64 &&
printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h
case $host_cpu in
*i[3456789]86*)
if test $HOST_ARCH = i386
then
DLLFLAGS="$DLLFLAGS -fno-PIC"
LDDLLFLAGS="-fno-PIC"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-PIC -Wl,-z,notext" >&5
......@@ -10104,11 +10105,10 @@ if test "x$ac_cv_cflags__fno_PIC__Wl__z_notext" = xyes
then :
LDDLLFLAGS="$LDDLLFLAGS -Wl,-z,notext"
fi
;;
*)
else
DLLFLAGS="$DLLFLAGS -fPIC"
LDDLLFLAGS="-fPIC" ;;
esac
LDDLLFLAGS="-fPIC"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wl,-z,defs works correctly" >&5
printf %s "checking whether -Wl,-z,defs works correctly... " >&6; }
......@@ -11702,12 +11702,12 @@ fi
if test "x$with_system_dllpath" != "x" -a -n "$PE_ARCHS"
then
case "$host_cpu" in
i[3456789]86*)
ac_prefix_list="i686-w64-mingw32-pkg-config i586-w64-mingw32-pkg-config i486-w64-mingw32-pkg-config i386-w64-mingw32-pkg-config " ;;
*)
ac_prefix_list="$host_cpu-w64-mingw32-pkg-config" ;;
esac
if test "x$HOST_ARCH" = xi386
then :
ac_prefix_list="i686-w64-mingw32-pkg-config i586-w64-mingw32-pkg-config i486-w64-mingw32-pkg-config i386-w64-mingw32-pkg-config "
else $as_nop
ac_prefix_list="$host_cpu-w64-mingw32-pkg-config"
fi
for ac_prog in $ac_prefix_list
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
......@@ -19213,10 +19213,10 @@ if ac_fn_c_try_compile "$LINENO"
then :
wine_cv_64bit_compare_swap="none needed"
else $as_nop
case $host_cpu in
*i[3456]86*) wine_cv_64bit_compare_swap="-march=i586" ;;
*arm*) wine_cv_64bit_compare_swap="-march=armv7-a" ;;
*) wine_cv_64bit_compare_swap="unknown" ;;
case $HOST_ARCH in
i386) wine_cv_64bit_compare_swap="-march=i586" ;;
arm) wine_cv_64bit_compare_swap="-march=armv7-a" ;;
*) wine_cv_64bit_compare_swap="unknown" ;;
esac
if test "x$wine_cv_64bit_compare_swap" != xunknown
then
......@@ -19412,8 +19412,8 @@ then :
fi ;;
esac
case $host_cpu in
*i[3456789]86*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5
case $HOST_ARCH in
i386) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5
printf %s "checking whether the compiler supports -fno-omit-frame-pointer... " >&6; }
if test ${ac_cv_cflags__fno_omit_frame_pointer+y}
then :
......@@ -19441,7 +19441,7 @@ if test "x$ac_cv_cflags__fno_omit_frame_pointer" = xyes
then :
MSVCRTFLAGS="$MSVCRTFLAGS -fno-omit-frame-pointer"
fi ;;
*x86_64*)
x86_64)
case $host_os in
cygwin*|mingw32*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5
printf %s "checking whether the compiler supports -Wno-format... " >&6; }
......@@ -19507,7 +19507,7 @@ printf "%s\n" "$ac_cv_mabi_ms" >&6; }
fi
MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" ;;
esac ;;
arm*)
arm)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wincompatible-function-pointer-types" >&5
printf %s "checking whether the compiler supports -Wincompatible-function-pointer-types... " >&6; }
if test ${ac_cv_cflags__Wincompatible_function_pointer_types+y}
......@@ -19689,12 +19689,11 @@ WINELOADER_PROGRAMS="$wine_binary"
case $host_os in
linux*)
case $host_cpu in
*i[3456789]86*|x86_64*|*aarch64*|arm*)
if test $HOST_ARCH != unknown
then
test "$wine_binary" = wine || as_fn_append CONFIGURE_TARGETS " loader/wine-preloader"
WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
;;
esac
fi
;;
darwin*|macosx*)
if test "$wine_can_build_preloader" = "yes"
......
configure.ac
View file @ da2ae583
......@@ -644,10 +644,9 @@ case $host_os in
DLLEXT=""
EXTRACFLAGS="-D__WINE_PE_BUILD"
dnl Disable stdcall fixups to catch prototype mismatches
case $host_cpu in
*i[[3456]]86*) WINE_TRY_CFLAGS([-Wl,--disable-stdcall-fixup],
[LDDLLFLAGS="-Wl,--disable-stdcall-fixup"]) ;;
esac
AS_VAR_IF([HOST_ARCH],[i386],
[WINE_TRY_CFLAGS([-Wl,--disable-stdcall-fixup],
[LDDLLFLAGS="-Wl,--disable-stdcall-fixup"])])
dnl Disable modules that can't be used on Windows
enable_loader=${enable_loader:-no}
enable_server=${enable_server:-no}
......@@ -675,9 +674,9 @@ case $host_os in
WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
case $host_cpu in
*i[[3456]]86*|*x86_64*) wine_can_build_preloader=yes ;;
*) wine_can_build_preloader=no ;;
case $HOST_ARCH in
i386|x86_64) wine_can_build_preloader=yes ;;
*) wine_can_build_preloader=no ;;
esac
if test "$wine_can_build_preloader" = "yes"
......@@ -685,11 +684,11 @@ case $host_os in
WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -mmacosx-version-min=10.7 -Wl,-no_new_main,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
WINE_TRY_CFLAGS([-Wl,-no_pie],
[WINEPRELOADER_LDFLAGS="-Wl,-no_pie $WINEPRELOADER_LDFLAGS"])
case $host_cpu in
*i[[3456]]86*)
case $HOST_ARCH in
i386)
WINEPRELOADER_LDFLAGS="-Wl,-image_base,0x7d400000 $WINEPRELOADER_LDFLAGS"
;;
*x86_64*)
x86_64)
WINEPRELOADER_LDFLAGS="-Wl,-image_base,0x200000000,-segalign,0x1000,-segaddr,WINE_RESERVE,0x1000 $WINEPRELOADER_LDFLAGS"
;;
esac
......@@ -738,11 +737,11 @@ case $host_os in
if test "x$exec_prefix" = xNONE
then
case $host_cpu in
*i[[3456]]86*) exec_prefix='${prefix}/x86' ;;
*x86_64*) exec_prefix='${prefix}/x86_64' ;;
*arm*) exec_prefix='${prefix}/armeabi-v7a' ;;
*aarch64*) exec_prefix='${prefix}/arm64-v8a' ;;
case $HOST_ARCH in
i386) exec_prefix='${prefix}/x86' ;;
x86_64) exec_prefix='${prefix}/x86_64' ;;
arm) exec_prefix='${prefix}/armeabi-v7a' ;;
aarch64) exec_prefix='${prefix}/arm64-v8a' ;;
esac
fi
;;
......@@ -750,16 +749,15 @@ case $host_os in
*)
AC_DEFINE(_GNU_SOURCE,1,[Define to 1 to enable GNU extensions on Linux])
test "$ac_cv_sys_file_offset_bits" = 64 && AC_DEFINE(_TIME_BITS,64,[Define to 64 to enable 64-bit time_t on Linux])
case $host_cpu in
*i[[3456789]]86*)
if test $HOST_ARCH = i386
then
DLLFLAGS="$DLLFLAGS -fno-PIC"
LDDLLFLAGS="-fno-PIC"
WINE_TRY_CFLAGS([-fno-PIC -Wl,-z,notext],[LDDLLFLAGS="$LDDLLFLAGS -Wl,-z,notext"])
;;
*)
else
DLLFLAGS="$DLLFLAGS -fPIC"
LDDLLFLAGS="-fPIC" ;;
esac
LDDLLFLAGS="-fPIC"
fi
AC_CACHE_CHECK([whether -Wl,-z,defs works correctly], ac_cv_wl_z_defs,
[ac_save_CFLAGS="$CFLAGS"
......@@ -1875,10 +1873,10 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=
#error no
#endif]])],
[wine_cv_64bit_compare_swap="none needed"],
[case $host_cpu in
*i[[3456]]86*) wine_cv_64bit_compare_swap="-march=i586" ;;
*arm*) wine_cv_64bit_compare_swap="-march=armv7-a" ;;
*) wine_cv_64bit_compare_swap="unknown" ;;
[case $HOST_ARCH in
i386) wine_cv_64bit_compare_swap="-march=i586" ;;
arm) wine_cv_64bit_compare_swap="-march=armv7-a" ;;
*) wine_cv_64bit_compare_swap="unknown" ;;
esac
if test "x$wine_cv_64bit_compare_swap" != xunknown
then
......@@ -1919,10 +1917,10 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=
WINE_TRY_CFLAGS([-Wno-format],[MSVCRTFLAGS="$MSVCRTFLAGS -Wno-format"]) ;;
esac
case $host_cpu in
case $HOST_ARCH in
dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections
*i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-omit-frame-pointer"]) ;;
*x86_64*)
i386) WINE_TRY_CFLAGS([-fno-omit-frame-pointer],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-omit-frame-pointer"]) ;;
x86_64)
case $host_os in
dnl Mingw uses Windows 64-bit types, not Unix ones
cygwin*|mingw32*) WINE_TRY_CFLAGS([-Wno-format]) ;;
......@@ -1939,7 +1937,7 @@ int a(int b, ...) { __builtin_ms_va_list list; __builtin_ms_va_start(list,b); }]
fi
MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" ;;
esac ;;
arm*)
arm)
WINE_TRY_CFLAGS([-Wincompatible-function-pointer-types],[EXTRACFLAGS="$EXTRACFLAGS -Wno-error=incompatible-function-pointer-types"]) ;;
esac
......@@ -1996,12 +1994,11 @@ AC_SUBST(WINELOADER_PROGRAMS,"$wine_binary")
case $host_os in
linux*)
case $host_cpu in
*i[[3456789]]86*|x86_64*|*aarch64*|arm*)
if test $HOST_ARCH != unknown
then
test "$wine_binary" = wine || WINE_IGNORE_FILE(loader/wine-preloader)
WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
;;
esac
fi
;;
darwin*|macosx*)
if test "$wine_can_build_preloader" = "yes"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment