diff options
author | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-01-14 15:55:17 +0000 |
---|---|---|
committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-01-14 15:55:17 +0000 |
commit | 5f0c79f722b6d2f9368c43af2308596c4a9d0b56 (patch) | |
tree | 6ed3617e2fa2c325281de5ccabb548812461de9d | |
parent | ebd1d5bbdbf66799d0da03068af1649753cf5f27 (diff) | |
download | compiler-rt-5f0c79f722b6d2f9368c43af2308596c4a9d0b56.tar.gz |
builtins: avoid duplicating unwind declarations
Use unwind.h to get the declarations for unwinding interfaces. This header is
already provided by clang and gcc, so this adds no additional dependencies for
building the builtins library. It avoids the duplication which may drift over
time though.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@225990 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | lib/builtins/CMakeLists.txt | 7 | ||||
-rw-r--r-- | lib/builtins/gcc_personality_v0.c | 46 |
3 files changed, 12 insertions, 44 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e0b259538..f8f52630b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -203,6 +203,9 @@ pythonize_bool(COMPILER_RT_DEBUG) #================================ # Setup Compiler Flags #================================ +include(CheckIncludeFile) +check_include_file(unwind.h HAVE_UNWIND_H) + include(config-ix) if(MSVC) diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt index 999faa867..4d102c615 100644 --- a/lib/builtins/CMakeLists.txt +++ b/lib/builtins/CMakeLists.txt @@ -79,7 +79,6 @@ set(GENERIC_SOURCES floatuntidf.c floatuntisf.c floatuntixf.c - gcc_personality_v0.c int_util.c lshrdi3.c lshrti3.c @@ -137,6 +136,12 @@ set(GENERIC_SOURCES umodsi3.c umodti3.c) +if (HAVE_UNWIND_H) + set(GENERIC_SOURCES + ${GENERIC_SOURCES} + gcc_personality_v0.c) +endif () + set(x86_64_SOURCES x86_64/floatdidf.c x86_64/floatdisf.c diff --git a/lib/builtins/gcc_personality_v0.c b/lib/builtins/gcc_personality_v0.c index 869f4178e..33b206e66 100644 --- a/lib/builtins/gcc_personality_v0.c +++ b/lib/builtins/gcc_personality_v0.c @@ -11,47 +11,7 @@ #include "int_lib.h" -/* - * _Unwind_* stuff based on C++ ABI public documentation - * http://refspecs.freestandards.org/abi-eh-1.21.html - */ - -typedef enum { - _URC_NO_REASON = 0, - _URC_FOREIGN_EXCEPTION_CAUGHT = 1, - _URC_FATAL_PHASE2_ERROR = 2, - _URC_FATAL_PHASE1_ERROR = 3, - _URC_NORMAL_STOP = 4, - _URC_END_OF_STACK = 5, - _URC_HANDLER_FOUND = 6, - _URC_INSTALL_CONTEXT = 7, - _URC_CONTINUE_UNWIND = 8 -} _Unwind_Reason_Code; - -typedef enum { - _UA_SEARCH_PHASE = 1, - _UA_CLEANUP_PHASE = 2, - _UA_HANDLER_FRAME = 4, - _UA_FORCE_UNWIND = 8, - _UA_END_OF_STACK = 16 -} _Unwind_Action; - -typedef struct _Unwind_Context* _Unwind_Context_t; - -struct _Unwind_Exception { - uint64_t exception_class; - void (*exception_cleanup)(_Unwind_Reason_Code reason, - struct _Unwind_Exception* exc); - uintptr_t private_1; - uintptr_t private_2; -}; - -COMPILER_RT_ABI const uint8_t* _Unwind_GetLanguageSpecificData(_Unwind_Context_t c); -COMPILER_RT_ABI void _Unwind_SetGR(_Unwind_Context_t c, int i, uintptr_t n); -COMPILER_RT_ABI void _Unwind_SetIP(_Unwind_Context_t, uintptr_t new_value); -COMPILER_RT_ABI uintptr_t _Unwind_GetIP(_Unwind_Context_t context); -COMPILER_RT_ABI uintptr_t _Unwind_GetRegionStart(_Unwind_Context_t context); - +#include <unwind.h> /* * Pointer encodings documented at: @@ -185,12 +145,12 @@ static uintptr_t readEncodedPointer(const uint8_t** data, uint8_t encoding) COMPILER_RT_ABI _Unwind_Reason_Code __gcc_personality_sj0(int version, _Unwind_Action actions, uint64_t exceptionClass, struct _Unwind_Exception* exceptionObject, - _Unwind_Context_t context) + struct _Unwind_Context *context) #else COMPILER_RT_ABI _Unwind_Reason_Code __gcc_personality_v0(int version, _Unwind_Action actions, uint64_t exceptionClass, struct _Unwind_Exception* exceptionObject, - _Unwind_Context_t context) + struct _Unwind_Context *context) #endif { /* Since C does not have catch clauses, there is nothing to do during */ |