diff options
author | Travis Tilley <ttilley@gmail.com> | 2015-05-27 12:39:40 -0400 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-29 13:38:55 +0000 |
commit | 08fdc9700ce1b4e47bebc9c9d08959f5e50bc0c1 (patch) | |
tree | a2be5477ecf414d7932779f755518cb4b74a6c75 /main/llvm/clang-0002-fix-unwind-header.patch | |
parent | 2e13d49d9449cb2fab62471594f3980307bf4cef (diff) | |
download | aports-08fdc9700ce1b4e47bebc9c9d08959f5e50bc0c1.tar.bz2 aports-08fdc9700ce1b4e47bebc9c9d08959f5e50bc0c1.tar.xz |
main/llvm: update to 3.6.1
clean up and update patchset
switch to cmake
perform a two-stage build with a minimal bootstrap compile of clang
add clang extras
update package list to split out clang documentation
enable pulling from the svn release tags
fix making use of abuild CFLAGS/CXXFLAGS during build
don't run check-llvm, as the tests fail when running under PaX
Diffstat (limited to 'main/llvm/clang-0002-fix-unwind-header.patch')
-rw-r--r-- | main/llvm/clang-0002-fix-unwind-header.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/main/llvm/clang-0002-fix-unwind-header.patch b/main/llvm/clang-0002-fix-unwind-header.patch new file mode 100644 index 0000000000..30bfaaef0b --- /dev/null +++ b/main/llvm/clang-0002-fix-unwind-header.patch @@ -0,0 +1,35 @@ +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 */ +-- +2.1.4 |