diff options
author | Pirama Arumuga Nainar <pirama@google.com> | 2021-03-10 05:12:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-10 05:12:22 +0000 |
commit | 6e9f5ed75e19d8fc561fda91f5d133ef1ceacd03 (patch) | |
tree | 73936aba47fe1dc71e9cc05af9747036e935608c /compiler_wrapper/testdata/cros_clang_host_golden/bisect.json | |
parent | cb3697f49f351df40ae121a00d7d19061c5ebc6b (diff) | |
parent | 1b67a6a703d73f6e7013aebcf3880fd869b30619 (diff) | |
download | toolchain-utils-6e9f5ed75e19d8fc561fda91f5d133ef1ceacd03.tar.gz |
Merging 15 commit(s) from Chromium's toolchain-utils am: f5cc9231be am: 1b67a6a703
Original change: https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/1624621
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id49aa93263e5db9269279b10578de15869b71090
Diffstat (limited to 'compiler_wrapper/testdata/cros_clang_host_golden/bisect.json')
-rw-r--r-- | compiler_wrapper/testdata/cros_clang_host_golden/bisect.json | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json index cc55bc4f..1c2e5a0e 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json @@ -36,9 +36,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ], "env_updates": [ "PYTHONPATH=/somepath/test_binary" @@ -85,9 +88,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ], "env_updates": [ "PYTHONPATH=/somepath/test_binary" @@ -137,9 +143,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ], "env_updates": [ "PYTHONPATH=/somepath/test_binary" |