summaryrefslogtreecommitdiff
path: root/debian/patches/unwind-chain-inclusion.diff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2016-12-29 13:40:27 +0300
committerIgor Pashev <pashev.igor@gmail.com>2016-12-29 13:40:27 +0300
commitdf36a469d77312f6dc0dccf08252542c16cf3308 (patch)
treec7089deec82cde1a5ac416aff1daadb097225ba3 /debian/patches/unwind-chain-inclusion.diff
downloadllvm-toolchain-3.8-df36a469d77312f6dc0dccf08252542c16cf3308.tar.gz
llvm-toolchain-3.8 (1:3.8.1-16)debian/3.8.1-16
Diffstat (limited to 'debian/patches/unwind-chain-inclusion.diff')
-rw-r--r--debian/patches/unwind-chain-inclusion.diff39
1 files changed, 39 insertions, 0 deletions
diff --git a/debian/patches/unwind-chain-inclusion.diff b/debian/patches/unwind-chain-inclusion.diff
new file mode 100644
index 0000000..0506b35
--- /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.6~svn224989/clang/lib/Headers/unwind.h
+===================================================================
+--- llvm-toolchain-snapshot_3.6~svn224989.orig/clang/lib/Headers/unwind.h
++++ llvm-toolchain-snapshot_3.6~svn224989/clang/lib/Headers/unwind.h
+@@ -23,9 +23,6 @@
+
+ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
+
+-#ifndef __CLANG_UNWIND_H
+-#define __CLANG_UNWIND_H
+-
+ #if defined(__APPLE__) && __has_include_next(<unwind.h>)
+ /* Darwin (from 11.x on) 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
+@@ -277,6 +277,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struc
+ }
+ #endif
+
++#endif /* __CLANG_UNWIND_H */
++
+ #endif
+
+-#endif /* __CLANG_UNWIND_H */