From 441898c285c4fb198eb088dbe284fa41087f6cc0 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 11 Feb 2022 13:44:48 -0800
Subject: [PATCH] Switch to libunwind to remove dependency on libgcc for musl

The libgcc dependency is only used for _Unwind* symbols, remove
it now that libc_musl.so embeds libunwind.a.

Bug: 215802826
Test: m USE_HOST_MUSL=true host-native
Change-Id: I1ad4c1435fc0090c6df2d50d542d2203dfb94d7b
---
 cc/config/x86_linux_host.go   | 1 -
 rust/config/x86_linux_host.go | 2 --
 2 files changed, 3 deletions(-)

diff --git a/cc/config/x86_linux_host.go b/cc/config/x86_linux_host.go
index ce6836ba5..e1659d380 100644
--- a/cc/config/x86_linux_host.go
+++ b/cc/config/x86_linux_host.go
@@ -65,7 +65,6 @@ var (
 
 	linuxMuslLdflags = []string{
 		"-nostdlib",
-		"-lgcc", "-lgcc_eh",
 		"--sysroot /dev/null",
 	}
 
diff --git a/rust/config/x86_linux_host.go b/rust/config/x86_linux_host.go
index 760834929..4d7c42219 100644
--- a/rust/config/x86_linux_host.go
+++ b/rust/config/x86_linux_host.go
@@ -42,8 +42,6 @@ var (
 		"-nodefaultlibs",
 		"-nostdlib",
 		"-Wl,--no-dynamic-linker",
-		// for unwind
-		"-lgcc", "-lgcc_eh",
 	}
 	linuxX86Rustflags   = []string{}
 	linuxX86Linkflags   = []string{}