diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-21 11:37:40 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-21 11:59:24 +0000 |
| commit | eac22325a7d4cf3ca559fa4d3ee2e49f4e879ffd (patch) | |
| tree | be9d3da7650e4eeb3ba22c6d0c1cca45ccb51517 /main/llvm/clang-3.6-fix-unwind-chain-inclusion.patch | |
| parent | 3681f34c0d3bd9b6d30a7817989a862e29ab4fe4 (diff) | |
| download | aports-eac22325a7d4cf3ca559fa4d3ee2e49f4e879ffd.tar.bz2 aports-eac22325a7d4cf3ca559fa4d3ee2e49f4e879ffd.tar.xz | |
main/llvm: upgrade to 3.6.0
move from testing
fixes #4068
Diffstat (limited to 'main/llvm/clang-3.6-fix-unwind-chain-inclusion.patch')
| -rw-r--r-- | main/llvm/clang-3.6-fix-unwind-chain-inclusion.patch | 33 |
1 files changed, 33 insertions, 0 deletions
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 0000000000..2ead52f0a6 --- /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(<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(struct _Unwind_Context *); + } + #endif + ++#endif /* __CLANG_UNWIND_H */ ++ + #endif + +-#endif /* __CLANG_UNWIND_H */ |