From fe4dcfdebb47c9f4807b4d6c42da24461daa4353 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sat, 25 Jan 2025 20:11:38 +0100 Subject: [PATCH] Drop --with-uncritical-warn-choke configuration option This selection of suppressed warnings is pretty arbitrary, and apparently disabling it does not raise any more warning for whole php-src (except for `-Wno-deprecated-declarations`). As such it appears to be pretty useless, and it seems to be more appropriate to let users select which warnings to suppress via manually set `CFLAGS`. Since we already apply `/wd4996`[1] when building with MSVC, and there are indeed plenty of deprecation warnings, for now, we apply `-Wno-deprecated-declarations` for Clang builds unconditionally. [1] --- win32/build/config.w32 | 6 ------ win32/build/confutils.js | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 285c130aa791e..f82ed73efe3bd 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -355,7 +355,6 @@ if (PHP_SECURITY_FLAGS == "yes") { ADD_FLAG("LDFLAGS", "/NXCOMPAT /DYNAMICBASE "); } -ARG_WITH("uncritical-warn-choke", "Disable some uncritical warnings", "yes"); ARG_ENABLE("sanitizer", "Enable ASan (and UBSan) extensions", "no"); if (PHP_SANITIZER == "yes" && PHP_DEBUG == "yes") { ERROR("Use of both --enable-sanitizer and --enable-debug not allowed."); @@ -377,11 +376,6 @@ if (VS_TOOLSET) { AC_DEFINE("PHP_HAVE_BUILTIN_SSUBLL_OVERFLOW", 1, "Define to 1 if the compiler supports '__builtin_ssubll_overflow'."); AC_DEFINE("PHP_HAVE_BUILTIN_SMULL_OVERFLOW", 1, "Define to 1 if the compiler supports '__builtin_smull_overflow '."); AC_DEFINE("PHP_HAVE_BUILTIN_SMULLL_OVERFLOW", 1, "Define to 1 if the compiler supports '__builtin_smulll_overflow'."); - if (PHP_UNCRITICAL_WARN_CHOKE != "no") { - ADD_FLAG("CFLAGS", "-Wno-ignored-attributes -Wno-deprecated-declarations -Wno-missing-braces " + - "-Wno-logical-op-parentheses -Wno-msvc-include -Wno-invalid-source-encoding -Wno-unknown-pragmas " + - "-Wno-unused-command-line-argument -Wno-unused-function -Wno-ignored-pragma-optimize"); - } if (PHP_SANITIZER == "yes") { if (COMPILER_NUMERIC_VERSION < 500) { diff --git a/win32/build/confutils.js b/win32/build/confutils.js index e992d0935feaa..af9482065ce1d 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3305,6 +3305,7 @@ function toolset_setup_common_cflags() ADD_FLAG("CFLAGS", "/Zc:wchar_t"); } else if (CLANG_TOOLSET) { + ADD_FLAG("CFLAGS", "-Wno-deprecated-declarations"); if (TARGET_ARCH == 'x86') { ADD_FLAG('CFLAGS', '-m32'); } else {