Upgrade toolchain-utils to 2c474af4f370b143032144aff1ff1985f789e20f am: 8b320f7173main-16k-with-phones

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

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

1 files changed, 48 insertions, 54 deletions

diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
index e2037e26..d9b532f0 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -17,35 +17,35 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-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-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
-            "-fPIE",
-            "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
-            "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-Wno-unused-but-set-variable",
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-string-concatenation",
             "-mno-movbe",
             "-B../../bin",
             "-target",
@@ -66,8 +66,6 @@
             "-Wno-maybe-uninitialized",
             "-fcommon",
             "-fstack-protector-strong",
-            "-fPIE",
-            "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "-static-libgcc",
@@ -105,35 +103,35 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-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-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
-            "-fPIE",
-            "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
-            "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-Wno-unused-but-set-variable",
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-string-concatenation",
             "-mno-movbe",
             "-B../../bin",
             "-target",
@@ -154,8 +152,6 @@
             "-Wno-maybe-uninitialized",
             "-fcommon",
             "-fstack-protector-strong",
-            "-fPIE",
-            "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "-static-libgcc",
@@ -188,35 +184,35 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-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-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
-            "-fPIE",
-            "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
-            "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-Wno-unused-but-set-variable",
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-string-concatenation",
             "-mno-movbe",
             "-B../../bin",
             "-target",
@@ -252,35 +248,35 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-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-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
-            "-fPIE",
-            "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
-            "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-Wno-unused-but-set-variable",
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-string-concatenation",
             "-mno-movbe",
             "-B../../bin",
             "-target",
@@ -301,8 +297,6 @@
             "-Wno-maybe-uninitialized",
             "-fcommon",
             "-fstack-protector-strong",
-            "-fPIE",
-            "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "-static-libgcc",