1 files changed, 17 insertions, 6 deletions
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
index b690e3ed..247f207c 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
@@ -52,7 +52,6 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-Wno-tautological-constant-compare",
@@ -63,6 +62,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -70,6 +71,7 @@
             "-fno-omit-frame-pointer",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -104,7 +106,6 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-Wno-tautological-constant-compare",
@@ -115,6 +116,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -122,6 +125,7 @@
             "-fno-omit-frame-pointer",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -149,7 +153,6 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-Wno-tautological-constant-compare",
@@ -160,11 +163,14 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -197,7 +203,6 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-Wno-tautological-constant-compare",
@@ -208,12 +213,15 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "-fno-stack-protector",
             "-D__KERNEL__",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -246,7 +254,6 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7a-cros-linux-gnueabihf",
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-Wno-tautological-constant-compare",
@@ -257,6 +264,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-D_FORTIFY_SOURCE=2",
             "-mthumb",
             "-fno-stack-protector",
@@ -294,7 +303,6 @@
           "args": [
             "../../usr/bin/clang",
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-Wno-tautological-constant-compare",
@@ -305,6 +313,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -313,6 +323,7 @@
             "--sysroot=xyz",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
+            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"