Module: wine Branch: master Commit: 2a5acd3dda4cd5130a65be1718fd01a76e5f7fb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a5acd3dda4cd5130a65be1718fd01a...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Feb 26 22:12:41 2024 +0100
configure: Disable -Wmisleading-indentation warnings on GCC.
---
configure | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 ++++++ 2 files changed, 70 insertions(+)
diff --git a/configure b/configure index 5e1b3765413..83a641ff542 100755 --- a/configure +++ b/configure @@ -11526,6 +11526,41 @@ then : as_fn_append ${wine_arch}_EXTRACFLAGS " -Wenum-conversion" fi }
+ { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-flarge-source-files -Wmisleading-indentation" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -flarge-source-files -Wmisleading-indentation" >&5 +printf %s "checking whether $CC supports -flarge-source-files -Wmisleading-indentation... " >&6; } +if eval test ${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -flarge-source-files -Wmisleading-indentation" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void *__os_arm64x_dispatch_ret = 0; +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test "x$"$as_ac_var"" = x"yes" +then : + as_fn_append ${wine_arch}_EXTRACFLAGS " -Wno-misleading-indentation" +fi } + case $wine_arch in i386) { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-fno-omit-frame-pointer" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fno-omit-frame-pointer" >&5 @@ -19473,6 +19508,35 @@ then : EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -flarge-source-files -Wmisleading-indentation" >&5 +printf %s "checking whether the compiler supports -flarge-source-files -Wmisleading-indentation... " >&6; } +if test ${ac_cv_cflags__flarge_source_files__Wmisleading_indentation+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -flarge-source-files -Wmisleading-indentation" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cflags__flarge_source_files__Wmisleading_indentation=yes +else $as_nop + ac_cv_cflags__flarge_source_files__Wmisleading_indentation=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__flarge_source_files__Wmisleading_indentation" >&5 +printf "%s\n" "$ac_cv_cflags__flarge_source_files__Wmisleading_indentation" >&6; } +if test "x$ac_cv_cflags__flarge_source_files__Wmisleading_indentation" = xyes +then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-misleading-indentation" +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpointer-arith" >&5 printf %s "checking whether the compiler supports -Wpointer-arith... " >&6; } if test ${ac_cv_cflags__Wpointer_arith+y} diff --git a/configure.ac b/configure.ac index 1c59651ba1e..64083de89c4 100644 --- a/configure.ac +++ b/configure.ac @@ -968,6 +968,9 @@ This is an error since --enable-archs=$wine_arch was requested.])]) WINE_TRY_PE_CFLAGS([-Wabsolute-value]) WINE_TRY_PE_CFLAGS([-Wenum-conversion])
+ dnl GCC can't handle large files when -Wmisleading-indentation is enabled (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89549) + WINE_TRY_PE_CFLAGS([-flarge-source-files -Wmisleading-indentation],[AS_VAR_APPEND(${wine_arch}_EXTRACFLAGS,[" -Wno-misleading-indentation"])]) + case $wine_arch in i386) WINE_TRY_PE_CFLAGS([-fno-omit-frame-pointer]) WINE_TRY_PE_CFLAGS([-mpreferred-stack-boundary=2]) @@ -1863,6 +1866,9 @@ then WINE_TRY_CFLAGS([-Wvla]) WINE_TRY_CFLAGS([-Wwrite-strings])
+ dnl GCC can't handle large files when -Wmisleading-indentation is enabled (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89549) + WINE_TRY_CFLAGS([-flarge-source-files -Wmisleading-indentation],[EXTRACFLAGS="$EXTRACFLAGS -Wno-misleading-indentation"]) + dnl Check for noisy string.h WINE_TRY_CFLAGS([-Wpointer-arith], [saved_string_h_CFLAGS=$CFLAGS