From ea1b1c579f600cc85d145c60862b2e6b98701b24 Mon Sep 17 00:00:00 2001 From: Sergey B Kirpichev Date: Mon, 4 Mar 2024 20:07:24 +0300 Subject: [PATCH] gh-108562: Revert enabling -fstrict-overflow for libmpdec (GH-116302) gh-108562: partial reversion of pr114751 Reverts -fstrict-overflow for libmpdec --- Makefile.pre.in | 2 +- configure | 7 ------- configure.ac | 5 ----- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 396a3d4dca3..ee65ecd918c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1213,7 +1213,7 @@ PYTHON_HEADERS= \ ########################################################################## # Build static libmpdec.a -LIBMPDEC_CFLAGS=$(PY_STDMODULE_CFLAGS) @LIBMPDEC_CFLAGS@ $(CCSHARED) +LIBMPDEC_CFLAGS=@LIBMPDEC_CFLAGS@ $(PY_STDMODULE_CFLAGS) $(CCSHARED) # "%.o: %c" is not portable Modules/_decimal/libmpdec/basearith.o: $(srcdir)/Modules/_decimal/libmpdec/basearith.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS) diff --git a/configure b/configure index c0614138ead..4a980fea453 100755 --- a/configure +++ b/configure @@ -14516,13 +14516,6 @@ else $as_nop LIBMPDEC_LDFLAGS="-lm \$(LIBMPDEC_A)" LIBMPDEC_INTERNAL="\$(LIBMPDEC_HEADERS) \$(LIBMPDEC_A)" - if test "x$ac_cv_cc_supports_fstrict_overflow" = xyes -then : - - as_fn_append LIBMPDEC_CFLAGS " -fstrict-overflow" - -fi - if test "x$with_pydebug" = xyes then : diff --git a/configure.ac b/configure.ac index e40b8e0d0de..103c24962b7 100644 --- a/configure.ac +++ b/configure.ac @@ -3896,11 +3896,6 @@ AS_VAR_IF([with_system_libmpdec], [yes], [ LIBMPDEC_LDFLAGS="-lm \$(LIBMPDEC_A)" LIBMPDEC_INTERNAL="\$(LIBMPDEC_HEADERS) \$(LIBMPDEC_A)" - dnl Enable strict-overflow for libmpdec, if available, see GH-108562 - AS_VAR_IF([ac_cv_cc_supports_fstrict_overflow], [yes], [ - AS_VAR_APPEND([LIBMPDEC_CFLAGS], [" -fstrict-overflow"]) - ]) - dnl Disable forced inlining in debug builds, see GH-94847 AS_VAR_IF([with_pydebug], [yes], [ AS_VAR_APPEND([LIBMPDEC_CFLAGS], [" -DTEST_COVERAGE"])