From 3e99e662138cc70e211fe67d3c657550f333f81a Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Tue, 14 Apr 2015 14:42:45 -0700
Subject: [PATCH] Don't use libunwindbacktrace for non-ARM.

After fixing the link order here, it seems libunwindbacktrace no
longer works for exception unwinding, but libgcc now does.

Change-Id: Ice79af4b8f234ed6a053ee818b6dec3aa9706c8a
---
 core/cxx_stl_setup.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index 7961801a75..da84bdd29a 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -68,8 +68,6 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
     else
         ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
             my_static_libraries += libunwind_llvm
-        else
-            my_static_libraries += libunwindbacktrace
         endif
 
         ifeq ($(my_link_type),static)