mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-10-31 15:59:10 +00:00
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
# 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.
|
|
|
|
---
|
|
clang/lib/Headers/unwind.h | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Headers/unwind.h
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/lib/Headers/unwind.h
|
|
+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Headers/unwind.h
|
|
@@ -9,9 +9,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,
|
|
@@ -39,6 +36,9 @@
|
|
# endif
|
|
#else
|
|
|
|
+#ifndef __CLANG_UNWIND_H
|
|
+#define __CLANG_UNWIND_H
|
|
+
|
|
#include <stdint.h>
|
|
|
|
#ifdef __cplusplus
|
|
@@ -322,6 +322,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struc
|
|
}
|
|
#endif
|
|
|
|
+#endif /* __CLANG_UNWIND_H */
|
|
+
|
|
#endif
|
|
|
|
-#endif /* __CLANG_UNWIND_H */
|