1 files changed, 18 insertions, 9 deletions
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json
index 05b0ff96..0b951f3e 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json
@@ -15,7 +15,6 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-fuse-ld=lld",
@@ -26,6 +25,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -49,7 +50,6 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-fuse-ld=lld",
@@ -60,6 +60,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -83,7 +85,6 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-fuse-ld=lld",
@@ -94,6 +95,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -117,7 +120,6 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-fuse-ld=lld",
@@ -128,6 +130,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -151,7 +155,6 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-fuse-ld=lld",
@@ -162,6 +165,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -185,7 +190,6 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-fuse-ld=lld",
@@ -196,6 +200,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -219,7 +225,6 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-fuse-ld=lld",
@@ -230,6 +235,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -253,7 +260,6 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-fuse-ld=lld",
@@ -264,6 +270,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -287,7 +295,6 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-grecord-gcc-switches",
             "-fno-addrsig",
             "-fcommon",
             "-fuse-ld=lld",
@@ -298,6 +305,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]