Commit efa6b9f6 authored by Alexandre Julliard's avatar Alexandre Julliard

d2d1: Use a gcc pragma instead of a compiler flag for -fexcess-precision.

This will be needed to support building multiple architectures from the same tree.
parent 40b26279
...@@ -733,7 +733,6 @@ GSM_PE_CFLAGS ...@@ -733,7 +733,6 @@ GSM_PE_CFLAGS
FAUDIO_PE_LIBS FAUDIO_PE_LIBS
FAUDIO_PE_CFLAGS FAUDIO_PE_CFLAGS
MINGW_PKG_CONFIG MINGW_PKG_CONFIG
EXCESS_PRECISION_CFLAGS
CROSSDEBUG CROSSDEBUG
DELAYLOADFLAG DELAYLOADFLAG
CROSSLDFLAGS CROSSLDFLAGS
...@@ -11792,42 +11791,6 @@ fi ;; ...@@ -11792,42 +11791,6 @@ fi ;;
esac esac
fi 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" if test "x$enable_werror" = "xyes"
then then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror" >&5
...@@ -19021,39 +18984,6 @@ then : ...@@ -19021,39 +18984,6 @@ then :
EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings"
fi 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\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpointer-arith" >&5
printf %s "checking whether the compiler supports -Wpointer-arith... " >&6; } printf %s "checking whether the compiler supports -Wpointer-arith... " >&6; }
if test ${ac_cv_cflags__Wpointer_arith+y} if test ${ac_cv_cflags__Wpointer_arith+y}
...@@ -23343,7 +23273,6 @@ EXTRACROSSCFLAGS = $EXTRACROSSCFLAGS ...@@ -23343,7 +23273,6 @@ EXTRACROSSCFLAGS = $EXTRACROSSCFLAGS
CROSSLDFLAGS = $CROSSLDFLAGS CROSSLDFLAGS = $CROSSLDFLAGS
DELAYLOADFLAG = $DELAYLOADFLAG DELAYLOADFLAG = $DELAYLOADFLAG
CROSSDEBUG = $CROSSDEBUG CROSSDEBUG = $CROSSDEBUG
EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS
MINGW_PKG_CONFIG = $MINGW_PKG_CONFIG MINGW_PKG_CONFIG = $MINGW_PKG_CONFIG
FAUDIO_PE_CFLAGS = $FAUDIO_PE_CFLAGS FAUDIO_PE_CFLAGS = $FAUDIO_PE_CFLAGS
FAUDIO_PE_LIBS = $FAUDIO_PE_LIBS FAUDIO_PE_LIBS = $FAUDIO_PE_LIBS
......
...@@ -997,8 +997,6 @@ then ...@@ -997,8 +997,6 @@ then
esac esac
fi fi
WINE_TRY_CROSSCFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")])
if test "x$enable_werror" = "xyes" if test "x$enable_werror" = "xyes"
then then
WINE_TRY_CROSSCFLAGS([-Werror]) WINE_TRY_CROSSCFLAGS([-Werror])
...@@ -1847,11 +1845,6 @@ then ...@@ -1847,11 +1845,6 @@ then
WINE_TRY_CFLAGS([-Wvla]) WINE_TRY_CFLAGS([-Wvla])
WINE_TRY_CFLAGS([-Wwrite-strings]) 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 dnl Check for noisy string.h
WINE_TRY_CFLAGS([-Wpointer-arith], WINE_TRY_CFLAGS([-Wpointer-arith],
[saved_string_h_CFLAGS=$CFLAGS [saved_string_h_CFLAGS=$CFLAGS
......
...@@ -21,5 +21,3 @@ C_SRCS = \ ...@@ -21,5 +21,3 @@ C_SRCS = \
wic_render_target.c wic_render_target.c
RC_SRCS = version.rc RC_SRCS = version.rc
geometry_EXTRADEFS = $(EXCESS_PRECISION_CFLAGS)
...@@ -16,6 +16,10 @@ ...@@ -16,6 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "d2d1_private.h"
#include <float.h> #include <float.h>
......
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