46 lines
1.1 KiB
Diff
46 lines
1.1 KiB
Diff
From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001
|
|
From: Andrea Brancaleoni <miwaxe@gmail.com>
|
|
Date: Tue, 8 Sep 2015 22:14:57 +0200
|
|
Subject: [PATCH 2/7] fix unwind chain inclusion
|
|
|
|
---
|
|
lib/Headers/unwind.h | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h
|
|
index 303d792..44e10cc 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.5.1
|
|
|