1 files changed, 3 insertions, 6 deletions
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
index c72cc990..8c25b715 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
@@ -14,8 +14,6 @@
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-Werror=poison-system-directories",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-builtins",
             "-Wno-deprecated-declarations",
             "-Wno-enum-constexpr-conversion",
             "-Wno-error=implicit-function-declaration",
@@ -28,6 +26,7 @@
             "-fdebug-default-version=5",
             "-Wno-int-conversion",
             "-Wno-incompatible-function-pointer-types",
+            "-Wno-error=vla-cxx-extension",
             "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
             "-fclang-abi-compat=17",
             "-Wno-section",
@@ -79,8 +78,6 @@
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-Werror=poison-system-directories",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-builtins",
             "-Wno-deprecated-declarations",
             "-Wno-enum-constexpr-conversion",
             "-Wno-error=implicit-function-declaration",
@@ -93,6 +90,7 @@
             "-fdebug-default-version=5",
             "-Wno-int-conversion",
             "-Wno-incompatible-function-pointer-types",
+            "-Wno-error=vla-cxx-extension",
             "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
             "-fclang-abi-compat=17",
             "-Wno-section",
@@ -145,8 +143,6 @@
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-Werror=poison-system-directories",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-builtins",
             "-Wno-deprecated-declarations",
             "-Wno-enum-constexpr-conversion",
             "-Wno-error=implicit-function-declaration",
@@ -159,6 +155,7 @@
             "-fdebug-default-version=5",
             "-Wno-int-conversion",
             "-Wno-incompatible-function-pointer-types",
+            "-Wno-error=vla-cxx-extension",
             "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
             "-fclang-abi-compat=17",
             "-Wno-section",