From 70622e24effd147a1d3e6206607f73ccdba33e8f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 22 May 2015 13:43:22 +0000 Subject: Revert "main/llvm: update patchset, switch to cmake, perform two-stage build with a minimal bootstrap compile of clang, add clang extras, update package list to split out clang documentation" This reverts commit 81d1b43c5af39e14cb91232c4afcb7839b96f5a1. --- .../clang-3.6-fix-unwind-chain-inclusion.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 main/llvm/clang-3.6-fix-unwind-chain-inclusion.patch (limited to 'main/llvm/clang-3.6-fix-unwind-chain-inclusion.patch') diff --git a/main/llvm/clang-3.6-fix-unwind-chain-inclusion.patch b/main/llvm/clang-3.6-fix-unwind-chain-inclusion.patch new file mode 100644 index 000000000..2ead52f0a --- /dev/null +++ b/main/llvm/clang-3.6-fix-unwind-chain-inclusion.patch @@ -0,0 +1,33 @@ +diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h +index 90aca16..ef96969 100644 +--- a/lib/Headers/unwind.h ++++ b/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() + /* 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 + + #ifdef __cplusplus +@@ -277,6 +277,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struct _Unwind_Context *); + } + #endif + ++#endif /* __CLANG_UNWIND_H */ ++ + #endif + +-#endif /* __CLANG_UNWIND_H */ -- cgit v1.2.3