Eric Pouech : configure: Make Dwarf4 the default debug format.
Alexandre Julliard
julliard at winehq.org
Mon Nov 22 16:05:18 CST 2021
Module: wine
Branch: master
Commit: 769db93d420abe34ab27f8edd04ae320c97c9209
URL: https://source.winehq.org/git/wine.git/?a=commit;h=769db93d420abe34ab27f8edd04ae320c97c9209
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Mon Nov 22 15:21:21 2021 +0100
configure: Make Dwarf4 the default debug format.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 102 ++++++++++++-----------------------------------------------
configure.ac | 6 ++--
2 files changed, 22 insertions(+), 86 deletions(-)
diff --git a/configure b/configure
index ae5c8e2734e..a2298117ae1 100755
--- a/configure
+++ b/configure
@@ -12164,16 +12164,16 @@ fi ;;
if test "x$ac_debug_format_seen" = x
then
case $CROSSDEBUG in
- *dwarf) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gdwarf-2" >&5
-printf %s "checking whether the cross-compiler supports -gdwarf-2... " >&6; }
-if test ${ac_cv_crosscflags__gdwarf_2+y}
+ *dwarf) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gdwarf-4" >&5
+printf %s "checking whether the cross-compiler supports -gdwarf-4... " >&6; }
+if test ${ac_cv_crosscflags__gdwarf_4+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_wine_try_cflags_saved=$CFLAGS
ac_wine_try_cflags_saved_cc=$CC
ac_wine_try_cflags_saved_exeext=$ac_exeext
-CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -gdwarf-2"
+CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -gdwarf-4"
CC="$CROSSCC"
ac_exeext=".exe"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12182,9 +12182,9 @@ int __cdecl mainCRTStartup(void) { return 0; }
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_crosscflags__gdwarf_2=yes
+ ac_cv_crosscflags__gdwarf_4=yes
else $as_nop
- ac_cv_crosscflags__gdwarf_2=no
+ ac_cv_crosscflags__gdwarf_4=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
@@ -12192,45 +12192,11 @@ CFLAGS=$ac_wine_try_cflags_saved
CC=$ac_wine_try_cflags_saved_cc
ac_exeext=$ac_wine_try_cflags_saved_exeext
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__gdwarf_2" >&5
-printf "%s\n" "$ac_cv_crosscflags__gdwarf_2" >&6; }
-if test "x$ac_cv_crosscflags__gdwarf_2" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__gdwarf_4" >&5
+printf "%s\n" "$ac_cv_crosscflags__gdwarf_4" >&6; }
+if test "x$ac_cv_crosscflags__gdwarf_4" = xyes
then :
- EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -gdwarf-2"
-fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gstrict-dwarf" >&5
-printf %s "checking whether the cross-compiler supports -gstrict-dwarf... " >&6; }
-if test ${ac_cv_crosscflags__gstrict_dwarf+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- ac_wine_try_cflags_saved=$CFLAGS
-ac_wine_try_cflags_saved_cc=$CC
-ac_wine_try_cflags_saved_exeext=$ac_exeext
-CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -gstrict-dwarf"
-CC="$CROSSCC"
-ac_exeext=".exe"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-int __cdecl mainCRTStartup(void) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
- ac_cv_crosscflags__gstrict_dwarf=yes
-else $as_nop
- ac_cv_crosscflags__gstrict_dwarf=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
-CFLAGS=$ac_wine_try_cflags_saved
-CC=$ac_wine_try_cflags_saved_cc
-ac_exeext=$ac_wine_try_cflags_saved_exeext
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__gstrict_dwarf" >&5
-printf "%s\n" "$ac_cv_crosscflags__gstrict_dwarf" >&6; }
-if test "x$ac_cv_crosscflags__gstrict_dwarf" = xyes
-then :
- EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -gstrict-dwarf"
+ EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -gdwarf-4"
fi ;;
pdb) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gcodeview" >&5
printf %s "checking whether the cross-compiler supports -gcodeview... " >&6; }
@@ -18588,61 +18554,33 @@ printf "%s\n" "$wine_cv_64bit_compare_swap" >&6; }
done
if test "x$ac_debug_format_seen" = xdefault
then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5
-printf %s "checking whether the compiler supports -gdwarf-2... " >&6; }
-if test ${ac_cv_cflags__gdwarf_2+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -gdwarf-2"
-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__gdwarf_2=yes
-else $as_nop
- ac_cv_cflags__gdwarf_2=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__gdwarf_2" >&5
-printf "%s\n" "$ac_cv_cflags__gdwarf_2" >&6; }
-if test "x$ac_cv_cflags__gdwarf_2" = xyes
-then :
- EXTRACFLAGS="$EXTRACFLAGS -gdwarf-2"
-fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstrict-dwarf" >&5
-printf %s "checking whether the compiler supports -gstrict-dwarf... " >&6; }
-if test ${ac_cv_cflags__gstrict_dwarf+y}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-4" >&5
+printf %s "checking whether the compiler supports -gdwarf-4... " >&6; }
+if test ${ac_cv_cflags__gdwarf_4+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -gstrict-dwarf"
+CFLAGS="$CFLAGS -gdwarf-4"
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__gstrict_dwarf=yes
+ ac_cv_cflags__gdwarf_4=yes
else $as_nop
- ac_cv_cflags__gstrict_dwarf=no
+ ac_cv_cflags__gdwarf_4=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__gstrict_dwarf" >&5
-printf "%s\n" "$ac_cv_cflags__gstrict_dwarf" >&6; }
-if test "x$ac_cv_cflags__gstrict_dwarf" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__gdwarf_4" >&5
+printf "%s\n" "$ac_cv_cflags__gdwarf_4" >&6; }
+if test "x$ac_cv_cflags__gdwarf_4" = xyes
then :
- EXTRACFLAGS="$EXTRACFLAGS -gstrict-dwarf"
+ EXTRACFLAGS="$EXTRACFLAGS -gdwarf-4"
fi
fi
diff --git a/configure.ac b/configure.ac
index 9c0c8d25d29..1c716b4ec00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1029,8 +1029,7 @@ then
if test "x$ac_debug_format_seen" = x
then
case $CROSSDEBUG in
- *dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-2])
- WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;;
+ *dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-4]) ;;
pdb) WINE_TRY_CROSSCFLAGS([-gcodeview]) ;;
esac
fi
@@ -1843,8 +1842,7 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=
done
if test "x$ac_debug_format_seen" = xdefault
then
- WINE_TRY_CFLAGS([-gdwarf-2])
- WINE_TRY_CFLAGS([-gstrict-dwarf])
+ WINE_TRY_CFLAGS([-gdwarf-4])
fi
dnl Disable gcc builtins except for Mingw
More information about the wine-cvs
mailing list