refresh a patch

This commit is contained in:
Sylvestre Ledru 2014-12-30 16:29:28 +00:00
parent 7a62aa0f04
commit c9a7add854

View File

@ -4,10 +4,10 @@
# Because of the #ifndef __CLANG_UNWIND_H, it might never include any declaration # Because of the #ifndef __CLANG_UNWIND_H, it might never include any declaration
# from the system. # from the system.
Index: llvm-toolchain-snapshot_3.5~svn201843/clang/lib/Headers/unwind.h Index: llvm-toolchain-snapshot_3.6~svn224989/clang/lib/Headers/unwind.h
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn201843.orig/clang/lib/Headers/unwind.h 2014-02-21 11:12:42.154418157 +0100 --- llvm-toolchain-snapshot_3.6~svn224989.orig/clang/lib/Headers/unwind.h
+++ llvm-toolchain-snapshot_3.5~svn201843/clang/lib/Headers/unwind.h 2014-02-21 11:12:42.150418157 +0100 +++ llvm-toolchain-snapshot_3.6~svn224989/clang/lib/Headers/unwind.h
@@ -23,9 +23,6 @@ @@ -23,9 +23,6 @@
/* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
@ -15,8 +15,8 @@ Index: llvm-toolchain-snapshot_3.5~svn201843/clang/lib/Headers/unwind.h
-#ifndef __CLANG_UNWIND_H -#ifndef __CLANG_UNWIND_H
-#define __CLANG_UNWIND_H -#define __CLANG_UNWIND_H
- -
#if __has_include_next(<unwind.h>) #if defined(__APPLE__) && __has_include_next(<unwind.h>)
/* Darwin (from 11.x on) and libunwind provide an unwind.h. If that's available, /* 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, * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE,
@@ -53,6 +50,9 @@ @@ -53,6 +50,9 @@
# endif # endif
@ -28,7 +28,7 @@ Index: llvm-toolchain-snapshot_3.5~svn201843/clang/lib/Headers/unwind.h
#include <stdint.h> #include <stdint.h>
#ifdef __cplusplus #ifdef __cplusplus
@@ -275,6 +275,7 @@ @@ -277,6 +277,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struc
} }
#endif #endif