diff options
| author | Kamil Rytarowski <n54@gmx.com> | 2018-11-16 22:15:09 +0000 |
|---|---|---|
| committer | Kamil Rytarowski <n54@gmx.com> | 2018-11-16 22:15:09 +0000 |
| commit | 7461cc12fca85b060718a283ec5bf0a6946490d4 (patch) | |
| tree | 4421337855495684f1d296f08fe8c209721f59ee /compiler-rt/lib/builtins | |
| parent | 87bc07b3dd3187e8638183ea6e2f99c5157d2516 (diff) | |
| download | bcm5719-llvm-7461cc12fca85b060718a283ec5bf0a6946490d4.tar.gz bcm5719-llvm-7461cc12fca85b060718a283ec5bf0a6946490d4.zip | |
Cast _Unwind_GetIP() and _Unwind_GetRegionStart() to uintptr_t
This modification is require for NetBSD with GCC, as there is a
custom unwind.h header implementation with different types.
No functional change intended for others.
Cherry-picked chunk from D33878.
llvm-svn: 347101
Diffstat (limited to 'compiler-rt/lib/builtins')
| -rw-r--r-- | compiler-rt/lib/builtins/gcc_personality_v0.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler-rt/lib/builtins/gcc_personality_v0.c b/compiler-rt/lib/builtins/gcc_personality_v0.c index 0bc76562456..68581ef1643 100644 --- a/compiler-rt/lib/builtins/gcc_personality_v0.c +++ b/compiler-rt/lib/builtins/gcc_personality_v0.c @@ -206,8 +206,8 @@ __gcc_personality_v0(int version, _Unwind_Action actions, if ( lsda == (uint8_t*) 0 ) return continueUnwind(exceptionObject, context); - uintptr_t pc = _Unwind_GetIP(context)-1; - uintptr_t funcStart = _Unwind_GetRegionStart(context); + uintptr_t pc = (uintptr_t)_Unwind_GetIP(context)-1; + uintptr_t funcStart = (uintptr_t)_Unwind_GetRegionStart(context); uintptr_t pcOffset = pc - funcStart; /* Parse LSDA header. */ @@ -249,4 +249,3 @@ __gcc_personality_v0(int version, _Unwind_Action actions, /* No landing pad found, continue unwinding. */ return continueUnwind(exceptionObject, context); } - |
