From 2f9b04e9c29999d18906e37b37dcea9676df194f Mon Sep 17 00:00:00 2001
From: Arun Sharma <asharma@fb.com>
Date: Thu, 31 Mar 2011 22:45:10 -0700
Subject: [PATCH] Mark slow_backtrace() ALWAYS_INLINE

Also fix Makefile.am so remote unwinding tests such Gtest-trace
don't link with the local unwind library (libunwind.a).
---
 src/mi/backtrace.c | 3 ++-
 tests/Makefile.am  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mi/backtrace.c b/src/mi/backtrace.c
index a126b1a9..6b00e57d 100644
--- a/src/mi/backtrace.c
+++ b/src/mi/backtrace.c
@@ -27,11 +27,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #define UNW_LOCAL_ONLY
 #include <libunwind.h>
+#include <libunwind_i.h>
 #include <string.h>
 
 /* See glibc manual for a description of this function.  */
 
-static inline int
+static ALWAYS_INLINE int
 slow_backtrace (void **buffer, int size)
 {
   unw_cursor_t cursor;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c724e438..5d3ecc54 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -105,7 +105,7 @@ Ltest_nomalloc_SOURCES = Ltest-nomalloc.c
 Gtest_trace_SOURCES = Gtest-trace.c ident.c
 Ltest_trace_SOURCES = Ltest-trace.c ident.c
 
-LIBUNWIND = $(top_builddir)/src/libunwind-$(arch).la $(LIBUNWIND_local)
+LIBUNWIND = $(top_builddir)/src/libunwind-$(arch).la
 LIBUNWIND_ptrace = $(top_builddir)/src/libunwind-ptrace.a
 
 if USE_ELF32