From bcf188083e843c6b35ddc90bf06b883c28271a8f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 5 Jul 2013 08:17:08 +0000
Subject: [PATCH]  Without this patch, the first local include of unwind.h
 might, with the  __has_include_next, try to include the one from the system. 
 It might be /usr/include/clang/3.4/include/unwind.h  Because of the #ifndef
 __CLANG_UNWIND_H, it might never include any declaration  from the system.

---
 debian/patches/series                      |  1 +
 debian/patches/unwind-chain-inclusion.diff | 39 ++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 debian/patches/unwind-chain-inclusion.diff

diff --git a/debian/patches/series b/debian/patches/series
index a5da4c3d..d1dc09f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ kfreebsd.diff
 mipsel-ftbfs.diff
 kfreebsd_ptrace_kludge.diff
 #kfreebsd_v2.diff
+unwind-chain-inclusion.diff
diff --git a/debian/patches/unwind-chain-inclusion.diff b/debian/patches/unwind-chain-inclusion.diff
new file mode 100644
index 00000000..b971d8bc
--- /dev/null
+++ b/debian/patches/unwind-chain-inclusion.diff
@@ -0,0 +1,39 @@
+# Without this patch, the first local include of unwind.h might, with the 
+# __has_include_next, try to include the one from the system.
+# It might be /usr/include/clang/3.4/include/unwind.h
+# Because of the #ifndef __CLANG_UNWIND_H, it might never include any declaration
+# from the system. 
+
+Index: llvm-toolchain-snapshot-3.4~svn185351/clang/lib/Headers/unwind.h
+===================================================================
+--- llvm-toolchain-snapshot-3.4~svn185351.orig/clang/lib/Headers/unwind.h	2013-07-05 10:05:52.000000000 +0200
++++ llvm-toolchain-snapshot-3.4~svn185351/clang/lib/Headers/unwind.h	2013-07-05 10:06:31.000000000 +0200
+@@ -23,9 +23,6 @@
+ 
+ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
+ 
+-#ifndef __CLANG_UNWIND_H
+-#define __CLANG_UNWIND_H
+-
+ #if __has_include_next(<unwind.h>)
+ /* Darwin and libunwind provide an unwind.h. If that's available, use
+  * it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE,
+@@ -53,6 +50,9 @@
+ # endif
+ #else
+ 
++#ifndef __CLANG_UNWIND_H
++#define __CLANG_UNWIND_H
++
+ #include <stdint.h>
+ 
+ #ifdef __cplusplus
+@@ -128,6 +128,7 @@
+ }
+ #endif
+ 
++#endif /* __CLANG_UNWIND_H */
++
+ #endif
+ 
+-#endif /* __CLANG_UNWIND_H */