diff options
author | Pirama Arumuga Nainar <pirama@google.com> | 2021-03-10 05:57:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-10 05:57:21 +0000 |
commit | 898f8d62d1305674635d1e341b5839154d4e6acd (patch) | |
tree | 73936aba47fe1dc71e9cc05af9747036e935608c /compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json | |
parent | 5948a3ee3be44c312f11fb2acc617cce94e95582 (diff) | |
parent | 6e9f5ed75e19d8fc561fda91f5d133ef1ceacd03 (diff) | |
download | toolchain-utils-android12L-d2-s1-release.tar.gz |
Merging 15 commit(s) from Chromium's toolchain-utils am: f5cc9231be am: 1b67a6a703 am: 6e9f5ed75eandroid-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-release
Original change: https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/1624621
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3e09c0f25dea2ce281aa3edc999669d4d383510b
Diffstat (limited to 'compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json')
-rw-r--r-- | compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json index 41143bf0..bddb110e 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json @@ -37,6 +37,7 @@ "-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", "-mno-movbe", "-Wclobbered", @@ -47,7 +48,9 @@ "-Woverride-init", "-Wunsafe-loop-optimizations", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -81,10 +84,13 @@ "-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", "-Wno-#warnings", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -118,10 +124,13 @@ "-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", "-Wno-error=uninitialized", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -155,10 +164,13 @@ "-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", "-Wno-error=unused-variable", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -192,10 +204,13 @@ "-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", "-Wno-unused-variable", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -229,10 +244,13 @@ "-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", "-Wunused-variable", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -266,10 +284,13 @@ "-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", "-someflag", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } |