From d20df8b3183d1f179ffc30a5ceabb9d1375ac0ff Mon Sep 17 00:00:00 2001
From: Arun Sharma <asharma@fb.com>
Date: Mon, 31 Oct 2011 22:21:34 -0700
Subject: [PATCH] Fix up the breakage when host != target

---
 configure.in                                     | 3 ++-
 include/{libunwind.h => libunwind.h.in}          | 8 ++++++++
 include/tdep/jmpbuf.h                            | 4 ++++
 include/tdep/{libunwind_i.h => libunwind_i.h.in} | 9 +++++++++
 src/dwarf/Gfind_proc_info-lsb.c                  | 2 +-
 5 files changed, 24 insertions(+), 2 deletions(-)
 rename include/{libunwind.h => libunwind.h.in} (84%)
 rename include/tdep/{libunwind_i.h => libunwind_i.h.in} (84%)

diff --git a/configure.in b/configure.in
index 40d13bfd..d13bc2e5 100644
--- a/configure.in
+++ b/configure.in
@@ -296,5 +296,6 @@ AC_SUBST(DLLIB)
 AC_SUBST(BACKTRACELIB)
 
 AC_CONFIG_FILES(Makefile src/Makefile tests/Makefile tests/check-namespace.sh
-		doc/Makefile doc/common.tex include/libunwind-common.h)
+		doc/Makefile doc/common.tex include/libunwind-common.h
+                include/libunwind.h include/tdep/libunwind_i.h)
 AC_OUTPUT
diff --git a/include/libunwind.h b/include/libunwind.h.in
similarity index 84%
rename from include/libunwind.h
rename to include/libunwind.h.in
index c86216a4..6ed47252 100644
--- a/include/libunwind.h
+++ b/include/libunwind.h.in
@@ -1,6 +1,8 @@
 /* Provide a real file - not a symlink - as it would cause multiarch conflicts
    when multiple different arch releases are installed simultaneously.  */
 
+#ifndef UNW_REMOTE_ONLY
+
 #if defined __arm__
 # include "libunwind-arm.h"
 #elif defined __hppa__
@@ -20,3 +22,9 @@
 #else
 # error "Unsupported arch"
 #endif
+
+#else /* UNW_REMOTE_ONLY */
+
+# include "libunwind-@arch@.h"
+
+#endif /* UNW_REMOTE_ONLY */
diff --git a/include/tdep/jmpbuf.h b/include/tdep/jmpbuf.h
index e3cda319..7d04a42c 100644
--- a/include/tdep/jmpbuf.h
+++ b/include/tdep/jmpbuf.h
@@ -1,6 +1,8 @@
 /* Provide a real file - not a symlink - as it would cause multiarch conflicts
    when multiple different arch releases are installed simultaneously.  */
 
+#ifndef UNW_REMOTE_ONLY
+
 #if defined __arm__
 # include "tdep-arm/jmpbuf.h"
 #elif defined __hppa__
@@ -20,3 +22,5 @@
 #else
 # error "Unsupported arch"
 #endif
+
+#endif /* !UNW_REMOTE_ONLY */
diff --git a/include/tdep/libunwind_i.h b/include/tdep/libunwind_i.h.in
similarity index 84%
rename from include/tdep/libunwind_i.h
rename to include/tdep/libunwind_i.h.in
index cd8c2bff..96f49fb2 100644
--- a/include/tdep/libunwind_i.h
+++ b/include/tdep/libunwind_i.h.in
@@ -1,6 +1,8 @@
 /* Provide a real file - not a symlink - as it would cause multiarch conflicts
    when multiple different arch releases are installed simultaneously.  */
 
+#ifndef UNW_REMOTE_ONLY
+
 #if defined __arm__
 # include "tdep-arm/libunwind_i.h"
 #elif defined __hppa__
@@ -20,3 +22,10 @@
 #else
 # error "Unsupported arch"
 #endif
+
+
+#else /* UNW_REMOTE_ONLY */
+
+# include "tdep-@arch@/libunwind_i.h"
+
+#endif /* UNW_REMOTE_ONLY */
diff --git a/src/dwarf/Gfind_proc_info-lsb.c b/src/dwarf/Gfind_proc_info-lsb.c
index ee3872ee..495d251a 100644
--- a/src/dwarf/Gfind_proc_info-lsb.c
+++ b/src/dwarf/Gfind_proc_info-lsb.c
@@ -241,7 +241,7 @@ file_error:
 static int
 find_binary_for_address (unw_word_t ip, char *name, size_t name_size)
 {
-#ifdef __linux
+#if defined(__linux) && (!UNW_REMOTE_ONLY)
   struct map_iterator mi;
   int found = 0;
   int pid = getpid ();