[PATCH 0/1] MR1062: d2d1: Use a gcc pragma instead of a compiler flag for -fexcess-precision.
From: Alexandre Julliard <julliard(a)winehq.org> This will be needed to support building multiple architectures from the same tree. --- configure | 71 ------------------------------------------- configure.ac | 7 ----- dlls/d2d1/Makefile.in | 2 -- dlls/d2d1/geometry.c | 4 +++ 4 files changed, 4 insertions(+), 80 deletions(-) diff --git a/configure b/configure index 2efb2a37011..4adf86ac31d 100755 --- a/configure +++ b/configure @@ -733,7 +733,6 @@ GSM_PE_CFLAGS FAUDIO_PE_LIBS FAUDIO_PE_CFLAGS MINGW_PKG_CONFIG -EXCESS_PRECISION_CFLAGS CROSSDEBUG DELAYLOADFLAG CROSSLDFLAGS @@ -11792,42 +11791,6 @@ fi ;; esac fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fexcess-precision=standard" >&5 -printf %s "checking whether the cross-compiler supports -fexcess-precision=standard... " >&6; } -if test ${ac_cv_crosscflags__fexcess_precision_standard+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 -fexcess-precision=standard" -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__fexcess_precision_standard=yes -else $as_nop - ac_cv_crosscflags__fexcess_precision_standard=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__fexcess_precision_standard" >&5 -printf "%s\n" "$ac_cv_crosscflags__fexcess_precision_standard" >&6; } -if test "x$ac_cv_crosscflags__fexcess_precision_standard" = xyes -then : - EXCESS_PRECISION_CFLAGS="-fexcess-precision=standard" - -fi - if test "x$enable_werror" = "xyes" then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror" >&5 @@ -19021,39 +18984,6 @@ then : EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi - if test -z "$CROSSTARGET" - then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fexcess-precision=standard" >&5 -printf %s "checking whether the compiler supports -fexcess-precision=standard... " >&6; } -if test ${ac_cv_cflags__fexcess_precision_standard+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -fexcess-precision=standard" -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__fexcess_precision_standard=yes -else $as_nop - ac_cv_cflags__fexcess_precision_standard=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__fexcess_precision_standard" >&5 -printf "%s\n" "$ac_cv_cflags__fexcess_precision_standard" >&6; } -if test "x$ac_cv_cflags__fexcess_precision_standard" = xyes -then : - EXCESS_PRECISION_CFLAGS="-fexcess-precision=standard" - -fi - 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} @@ -23343,7 +23273,6 @@ EXTRACROSSCFLAGS = $EXTRACROSSCFLAGS CROSSLDFLAGS = $CROSSLDFLAGS DELAYLOADFLAG = $DELAYLOADFLAG CROSSDEBUG = $CROSSDEBUG -EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS MINGW_PKG_CONFIG = $MINGW_PKG_CONFIG FAUDIO_PE_CFLAGS = $FAUDIO_PE_CFLAGS FAUDIO_PE_LIBS = $FAUDIO_PE_LIBS diff --git a/configure.ac b/configure.ac index 41a29cee398..e11f3cfdb63 100644 --- a/configure.ac +++ b/configure.ac @@ -997,8 +997,6 @@ then esac fi - WINE_TRY_CROSSCFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) - if test "x$enable_werror" = "xyes" then WINE_TRY_CROSSCFLAGS([-Werror]) @@ -1847,11 +1845,6 @@ then WINE_TRY_CFLAGS([-Wvla]) WINE_TRY_CFLAGS([-Wwrite-strings]) - if test -z "$CROSSTARGET" - then - WINE_TRY_CFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) - fi - dnl Check for noisy string.h WINE_TRY_CFLAGS([-Wpointer-arith], [saved_string_h_CFLAGS=$CFLAGS diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 2bfe57a372d..cd8887064e8 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -21,5 +21,3 @@ C_SRCS = \ wic_render_target.c RC_SRCS = version.rc - -geometry_EXTRADEFS = $(EXCESS_PRECISION_CFLAGS) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 684ac5e240a..d6ee91de005 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if defined(__GNUC__) && !defined(__clang__) +#pragma GCC optimize "O2,no-strict-aliasing,excess-precision=standard" +#endif + #include "d2d1_private.h" #include <float.h> -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1062
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=124986 Your paranoid android. === debian11 (build log) === Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24749. Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24749. Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24749.
This merge request was approved by Nikolay Sivov. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1062
participants (4)
-
Alexandre Julliard -
Alexandre Julliard (＠julliard)
-
Marvin -
Nikolay Sivov (＠nsivov)