diff options
author | Tiancong Wang <tcwang@google.com> | 2020-04-30 17:38:09 +0000 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-05-04 21:59:08 +0000 |
commit | 4ceeb16b9162334c929d7232e5b7a2c96e9189f7 (patch) | |
tree | 03e3b8527af836451e7c88d5e498ff14d0253c94 /compiler_wrapper/testdata/cros_hardened_llvmnext_golden | |
parent | b7cc8cd6bc3b0c9652b817e976cc4f58c96bd34d (diff) | |
download | toolchain-utils-4ceeb16b9162334c929d7232e5b7a2c96e9189f7.tar.gz |
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>
Diffstat (limited to 'compiler_wrapper/testdata/cros_hardened_llvmnext_golden')
5 files changed, 0 insertions, 32 deletions
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", |