diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go
index fc43a29..79cccbb 100644
--- a/compiler_wrapper/config.go
+++ b/compiler_wrapper/config.go
@@ -120,6 +120,7 @@
 	// Disable "-faddrsig" since it produces object files that strip doesn't understand, chromium:915742.
 	// Pass "-fcommon" till the packages are fixed to work with new clang default
 	// "-fno-common", crbug.com/1060413.
+	// Temporary/Backup solutions to roll compiler to r387436. FIXME(tcwang): Remove after crbug.com/1072209 is fixed.
 	clangFlags: []string{
 		"-Qunused-arguments",
 		"-grecord-gcc-switches",
@@ -133,6 +134,7 @@
 		"-fuse-ld=lld",
 		"-Wno-final-dtor-non-final-class",
 		"-Werror=poison-system-directories",
+		"-Wno-max-tokens",
 	},
 	clangPostFlags: []string{
 		"-Wno-implicit-int-float-conversion",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index 5b95cdb..aa1e7e0 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -38,6 +38,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -99,6 +100,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -163,6 +165,7 @@
             "-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 aa083d7..c827dcd 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,6 +29,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -80,6 +81,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -131,6 +133,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -182,6 +185,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -233,6 +237,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -284,6 +289,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -335,6 +341,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -386,6 +393,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -437,6 +445,7 @@
             "-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 257c0a0..4952862 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,6 +28,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -77,6 +78,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -126,6 +128,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -175,6 +178,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -224,6 +228,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -273,6 +278,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -322,6 +328,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -371,6 +378,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -420,6 +428,7 @@
             "-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 b9edc49..5ebe083 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -28,6 +28,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -80,6 +81,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -132,6 +134,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -184,6 +187,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -243,6 +247,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -307,6 +312,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -366,6 +372,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -420,6 +427,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -469,6 +477,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -518,6 +527,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -567,6 +577,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -619,6 +630,7 @@
             "-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 2d70dfb..cc287b0 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -30,6 +30,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -81,6 +82,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -132,6 +134,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -183,6 +186,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -233,6 +237,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -285,6 +290,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -337,6 +343,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -387,6 +394,7 @@
             "-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 50f71a6..dbb47c6 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -39,6 +39,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -89,6 +90,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -140,6 +142,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -191,6 +194,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -242,6 +246,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -293,6 +298,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -344,6 +350,7 @@
             "-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 b690e3e..6787aab 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,6 +63,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -115,6 +116,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -160,6 +162,7 @@
             "-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",
@@ -208,6 +211,7 @@
             "-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",
@@ -257,6 +261,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-D_FORTIFY_SOURCE=2",
             "-mthumb",
             "-fno-stack-protector",
@@ -305,6 +310,7 @@
             "-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 26abab8..f165726 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -43,6 +43,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -73,6 +74,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -133,6 +135,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -164,6 +167,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -226,6 +230,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -260,6 +265,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -323,6 +329,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -354,6 +361,7 @@
             "-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 61a63a3..939faee 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -31,6 +31,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -83,6 +84,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -121,6 +123,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -177,6 +180,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -215,6 +219,7 @@
             "-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 a37725c..bbabfcc 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -28,6 +28,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -101,6 +102,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -169,6 +171,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -221,6 +224,7 @@
             "-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 5b95cdb..aa1e7e0 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
@@ -38,6 +38,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -99,6 +100,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -163,6 +165,7 @@
             "-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 b9edc49..5ebe083 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
@@ -28,6 +28,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -80,6 +81,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -132,6 +134,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -184,6 +187,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -243,6 +247,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -307,6 +312,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -366,6 +372,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -420,6 +427,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -469,6 +477,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -518,6 +527,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -567,6 +577,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -619,6 +630,7 @@
             "-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 26abab8..f165726 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
@@ -43,6 +43,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -73,6 +74,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -133,6 +135,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -164,6 +167,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -226,6 +230,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -260,6 +265,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -323,6 +329,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -354,6 +361,7 @@
             "-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 61a63a3..939faee 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,6 +31,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -83,6 +84,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -121,6 +123,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -177,6 +180,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -215,6 +219,7 @@
             "-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 a37725c..bbabfcc 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,6 +28,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -101,6 +102,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -169,6 +171,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -221,6 +224,7 @@
             "-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 e9bc366..58db33a 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
@@ -37,6 +37,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -94,6 +95,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -154,6 +156,7 @@
             "-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 c21d619..489dccd 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
@@ -27,6 +27,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -73,6 +74,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -119,6 +121,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -165,6 +168,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -218,6 +222,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -277,6 +282,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -335,6 +341,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -383,6 +390,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -426,6 +434,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -469,6 +478,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -512,6 +522,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -558,6 +569,7 @@
             "-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 26abab8..f165726 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
@@ -43,6 +43,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -73,6 +74,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -133,6 +135,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -164,6 +167,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -226,6 +230,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -260,6 +265,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -323,6 +329,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -354,6 +361,7 @@
             "-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 ce35f31..d420c20 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,6 +30,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -76,6 +77,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -108,6 +110,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -158,6 +161,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -190,6 +194,7 @@
             "-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 f716dde..f514fae 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,6 +28,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -96,6 +97,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -164,6 +166,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -216,6 +219,7 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-Wno-max-tokens",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",