Upgrade toolchain-utils to 2c474af4f370b143032144aff1ff1985f789e20f am: 8b320f7173 am: d444309511 am: 584b8e46d1android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release

Original change: https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/2292563

Change-Id: Ida212764c332af8ba8ab8aaa62a7d2a007e3314e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 52 insertions, 44 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 7c4afd32..7c296af9 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
@@ -25,18 +25,20 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-error=implicit-int",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
             "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-mno-movbe",
@@ -48,11 +50,11 @@
             "-Woverride-init",
             "-Wunsafe-loop-optimizations",
             "main.cc",
-            "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
-            "-Wno-unused-but-set-variable"
+            "-Wno-unused-but-set-variable",
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -75,27 +77,29 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-error=implicit-int",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
             "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-Wno-#warnings",
             "main.cc",
-            "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
-            "-Wno-unused-but-set-variable"
+            "-Wno-unused-but-set-variable",
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -118,27 +122,29 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-error=implicit-int",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
             "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-Wno-error=uninitialized",
             "main.cc",
-            "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
-            "-Wno-unused-but-set-variable"
+            "-Wno-unused-but-set-variable",
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -161,27 +167,29 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-error=implicit-int",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
             "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-someflag",
             "main.cc",
-            "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
-            "-Wno-unused-but-set-variable"
+            "-Wno-unused-but-set-variable",
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-string-concatenation"
           ]
         }
       }