From 4ceeb16b9162334c929d7232e5b7a2c96e9189f7 Mon Sep 17 00:00:00 2001 From: Tiancong Wang Date: Thu, 30 Apr 2020 17:38:09 +0000 Subject: 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 > Tested-by: Tiancong Wang > Reviewed-by: George Burgess Bug: chromium:1072209 Change-Id: I904fb3c4f7d125579667bef675be654a5465fad9 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2173949 Tested-by: Tiancong Wang Reviewed-by: Manoj Gupta Commit-Queue: Tiancong Wang --- .../testdata/cros_hardened_llvmnext_golden/force_disable_werror.json | 5 ----- 1 file changed, 5 deletions(-) (limited to 'compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json') 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", -- cgit v1.2.3