diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go
index 0d24c9a..301dda6 100644
--- a/compiler_wrapper/config.go
+++ b/compiler_wrapper/config.go
@@ -140,7 +140,7 @@
 		"-Wno-unknown-warning-option",
 		"-Wno-section",
 		"-fuse-ld=lld",
-		"--unwindlib=libgcc",
+		"--unwindlib=libunwind",
 		"-Wno-final-dtor-non-final-class",
 		"-Werror=poison-system-directories",
 		"-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index 05aea31..39d71b8 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -34,7 +34,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -107,7 +107,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -183,7 +183,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
index 2b04d0c..91953b2 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
@@ -25,7 +25,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -88,7 +88,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -151,7 +151,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -214,7 +214,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -276,7 +276,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -338,7 +338,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -400,7 +400,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -462,7 +462,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -524,7 +524,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
index ea83417..ffe9134 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
@@ -24,7 +24,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -85,7 +85,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -146,7 +146,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -207,7 +207,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -267,7 +267,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -327,7 +327,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -387,7 +387,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -447,7 +447,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -507,7 +507,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index 52d4184..a01dc08 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -24,7 +24,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -88,7 +88,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -152,7 +152,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -216,7 +216,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -287,7 +287,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -363,7 +363,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -434,7 +434,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -500,7 +500,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -561,7 +561,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -622,7 +622,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -683,7 +683,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -747,7 +747,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
index b71a880..e0a2036 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -26,7 +26,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -89,7 +89,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -152,7 +152,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -215,7 +215,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -277,7 +277,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -340,7 +340,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -403,7 +403,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -465,7 +465,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
index d10e6cd..7a437ae 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -34,7 +34,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -104,7 +104,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -167,7 +167,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -230,7 +230,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
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 4220918..4bde083 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
@@ -62,7 +62,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -126,7 +126,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -183,7 +183,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -243,7 +243,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -304,7 +304,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -363,7 +363,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index ea1363e..dd3bc35 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -39,7 +39,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -81,7 +81,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -153,7 +153,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -196,7 +196,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -270,7 +270,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -316,7 +316,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -391,7 +391,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -434,7 +434,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
index 4df8157..c5d2f9e 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -27,7 +27,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -91,7 +91,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -141,7 +141,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -209,7 +209,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -259,7 +259,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
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 e2037e2..0140c96 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -24,7 +24,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -112,7 +112,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -195,7 +195,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -259,7 +259,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
index 05aea31..39d71b8 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
@@ -34,7 +34,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -107,7 +107,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -183,7 +183,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
index 52d4184..a01dc08 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
@@ -24,7 +24,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -88,7 +88,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -152,7 +152,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -216,7 +216,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -287,7 +287,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -363,7 +363,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -434,7 +434,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -500,7 +500,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -561,7 +561,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -622,7 +622,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -683,7 +683,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -747,7 +747,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
index ea1363e..dd3bc35 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
@@ -39,7 +39,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -81,7 +81,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -153,7 +153,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -196,7 +196,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -270,7 +270,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -316,7 +316,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -391,7 +391,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -434,7 +434,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
index 4df8157..c5d2f9e 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
@@ -27,7 +27,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -91,7 +91,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -141,7 +141,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -209,7 +209,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -259,7 +259,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
index e2037e2..0140c96 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
@@ -24,7 +24,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -112,7 +112,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -195,7 +195,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -259,7 +259,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
index a676dc6..a58cafd 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
@@ -33,7 +33,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -102,7 +102,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -174,7 +174,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
index cc6d1ad..2040a62 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
@@ -23,7 +23,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -81,7 +81,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -139,7 +139,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -197,7 +197,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -262,7 +262,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -333,7 +333,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -403,7 +403,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -463,7 +463,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -518,7 +518,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -573,7 +573,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -628,7 +628,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -686,7 +686,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
index ea1363e..dd3bc35 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
@@ -39,7 +39,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -81,7 +81,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -153,7 +153,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -196,7 +196,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -270,7 +270,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -316,7 +316,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -391,7 +391,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -434,7 +434,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
index 2c34edb..1b6e1d9 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
@@ -26,7 +26,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -84,7 +84,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -128,7 +128,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -190,7 +190,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -234,7 +234,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
index 368eb85..3742f01 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
@@ -24,7 +24,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -107,7 +107,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -190,7 +190,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",
@@ -254,7 +254,7 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-fuse-ld=lld",
-            "--unwindlib=libgcc",
+            "--unwindlib=libunwind",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fexperimental-new-pass-manager",