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

1 files changed, 27 insertions, 0 deletions

diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
index 5d72756d..a9e8b859 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
@@ -26,10 +26,13 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation",
             "-mno-movbe",
             "-B../../bin",
             "-target",
@@ -71,10 +74,13 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation",
             "-mno-movbe",
             "-B../../bin",
             "-target",
@@ -116,10 +122,13 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation",
             "-mno-movbe",
             "-B../../bin",
             "-target",
@@ -161,11 +170,14 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-mthumb",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation",
             "-B../../bin",
             "-target",
             "armv7m-cros-linux-gnu"
@@ -206,10 +218,13 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation",
             "-B../../bin",
             "-target",
             "armv7m-cros-eabi"
@@ -250,11 +265,14 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-mthumb",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation",
             "-B../../bin",
             "-target",
             "armv7m-cros-win-gnu"
@@ -295,11 +313,14 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-mthumb",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation",
             "-B../../bin",
             "-target",
             "armv8m-cros-linux-gnu"
@@ -340,10 +361,13 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation",
             "-B../../bin",
             "-target",
             "armv8m-cros-eabi"
@@ -384,11 +408,14 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-mthumb",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation",
             "-B../../bin",
             "-target",
             "armv8m-cros-win-gnu"