Revert "wrapper: Temporarily disable -Wmax-tokens"

This reverts commit 3b2358092e00ab7904a873b516ac6aac832c2277.
According to crrev.com/c/2171058, the fix in chromium could work.
Will wait till the patch submitted in chromium and CrOS uprevs to
merge the change into CrOS.

Reason for revert: The workaround is not needed anymore.

Original change's description:
> wrapper: Temporarily disable -Wmax-tokens
> 
> As reported in crbug.com/1072209, -Wmax-tokens is causing latest
> chrome fail to build. While we are blocked by Chrome uprevs, we
> want to update the compiler by disabling the warning, until it's
> fixed properly on upstream Chrome.
> 
> BUG=chromium:1072209
> TEST=Local testing in CrOS
> 
> Change-Id: I082dd342a802e80250d0fca7c4b15afb4e972e7e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2161770
> Commit-Queue: Tiancong Wang <tcwang@google.com>
> Tested-by: Tiancong Wang <tcwang@google.com>
> Reviewed-by: George Burgess <gbiv@chromium.org>

Bug: chromium:1072209
Change-Id: I904fb3c4f7d125579667bef675be654a5465fad9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2173949
Tested-by: Tiancong Wang <tcwang@google.com>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Commit-Queue: Tiancong Wang <tcwang@google.com>

20 files changed, 0 insertions, 135 deletions

diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index aa1e7e07..5b95cdb7 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -38,7 +38,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -100,7 +99,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -165,7 +163,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
index c827dcde..aa083d70 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
@@ -29,7 +29,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -81,7 +80,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -133,7 +131,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -185,7 +182,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -237,7 +233,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -289,7 +284,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -341,7 +335,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -393,7 +386,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -445,7 +437,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
index 49528627..257c0a05 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
@@ -28,7 +28,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -78,7 +77,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -128,7 +126,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -178,7 +175,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -228,7 +224,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -278,7 +273,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -328,7 +322,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -378,7 +371,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -428,7 +420,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index 5ebe0831..b9edc49d 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -28,7 +28,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -81,7 +80,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -134,7 +132,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -187,7 +184,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -247,7 +243,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -312,7 +307,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -372,7 +366,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -427,7 +420,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -477,7 +469,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -527,7 +518,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -577,7 +567,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -630,7 +619,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
index cc287b09..2d70dfbf 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -30,7 +30,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -82,7 +81,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -134,7 +132,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -186,7 +183,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -237,7 +233,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -290,7 +285,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -343,7 +337,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -394,7 +387,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
index dbb47c62..50f71a6f 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -39,7 +39,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -90,7 +89,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -142,7 +140,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -194,7 +191,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -246,7 +242,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -298,7 +293,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -350,7 +344,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
index 6787aab0..b690e3ed 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
@@ -63,7 +63,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -116,7 +115,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -162,7 +160,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
@@ -211,7 +208,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "-fno-stack-protector",
@@ -261,7 +257,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-D_FORTIFY_SOURCE=2",
             "-mthumb",
             "-fno-stack-protector",
@@ -310,7 +305,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index f165726b..26abab87 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -43,7 +43,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -74,7 +73,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -135,7 +133,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -167,7 +164,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -230,7 +226,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -265,7 +260,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -329,7 +323,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -361,7 +354,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
index 939faee5..61a63a37 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -31,7 +31,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -84,7 +83,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -123,7 +121,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -180,7 +177,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -219,7 +215,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
index bbabfcc4..a37725c0 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -28,7 +28,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -102,7 +101,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -171,7 +169,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -224,7 +221,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
index aa1e7e07..5b95cdb7 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
@@ -38,7 +38,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -100,7 +99,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -165,7 +163,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
index 5ebe0831..b9edc49d 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
@@ -28,7 +28,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -81,7 +80,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -134,7 +132,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -187,7 +184,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -247,7 +243,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -312,7 +307,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -372,7 +366,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -427,7 +420,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -477,7 +469,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -527,7 +518,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -577,7 +567,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -630,7 +619,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
index f165726b..26abab87 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
@@ -43,7 +43,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -74,7 +73,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -135,7 +133,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -167,7 +164,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -230,7 +226,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -265,7 +260,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -329,7 +323,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -361,7 +354,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
index 939faee5..61a63a37 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
@@ -31,7 +31,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -84,7 +83,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -123,7 +121,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -180,7 +177,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -219,7 +215,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
index bbabfcc4..a37725c0 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
@@ -28,7 +28,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -102,7 +101,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -171,7 +169,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -224,7 +221,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
index 58db33a5..e9bc3661 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
@@ -37,7 +37,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -95,7 +94,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -156,7 +154,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
index 489dccd4..c21d6198 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
@@ -27,7 +27,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -74,7 +73,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -121,7 +119,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -168,7 +165,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -222,7 +218,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -282,7 +277,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -341,7 +335,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -390,7 +383,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -434,7 +426,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -478,7 +469,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -522,7 +512,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -569,7 +558,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
index f165726b..26abab87 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
@@ -43,7 +43,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -74,7 +73,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -135,7 +133,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -167,7 +164,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -230,7 +226,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -265,7 +260,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -329,7 +323,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -361,7 +354,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
index d420c204..ce35f311 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
@@ -30,7 +30,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -77,7 +76,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -110,7 +108,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -161,7 +158,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -194,7 +190,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
index f514fae6..f716dde3 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
@@ -28,7 +28,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -97,7 +96,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -166,7 +164,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -219,7 +216,6 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",