1 files changed, 8 insertions, 16 deletions
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
index ed208391..10329a58 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
@@ -8,8 +8,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",
@@ -22,6 +20,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",
@@ -65,8 +64,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",
@@ -79,6 +76,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",
@@ -122,8 +120,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",
@@ -136,6 +132,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",
@@ -179,8 +176,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",
@@ -193,6 +188,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",
@@ -236,8 +232,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",
@@ -250,6 +244,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",
@@ -292,8 +287,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",
@@ -306,6 +299,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",
@@ -350,8 +344,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",
@@ -364,6 +356,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",
@@ -406,8 +399,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",
@@ -420,6 +411,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",