diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-08-25 22:14:41 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-08-25 22:14:41 -0400 |
| commit | cce14f92fc2e284114bc9d08bc93e55d45a55188 (patch) | |
| tree | c9d4ef8c5b05a900731aba091f3f5b64b2f5f73b /c_headers | |
| parent | 20810e0a7976748d0632ed72454a829802dcf76d (diff) | |
| download | zig-cce14f92fc2e284114bc9d08bc93e55d45a55188.tar.gz zig-cce14f92fc2e284114bc9d08bc93e55d45a55188.zip | |
update clang headers to 7.0.0rc2
Diffstat (limited to 'c_headers')
| -rw-r--r-- | c_headers/intrin.h | 14 | ||||
| -rw-r--r-- | c_headers/unwind.h | 4 |
2 files changed, 4 insertions, 14 deletions
diff --git a/c_headers/intrin.h b/c_headers/intrin.h index 91914214e2..edb947eef6 100644 --- a/c_headers/intrin.h +++ b/c_headers/intrin.h @@ -863,20 +863,6 @@ __nop(void) { __asm__ volatile ("nop"); } #endif -#if defined(__x86_64__) -static __inline__ unsigned __int64 __DEFAULT_FN_ATTRS -__shiftleft128(unsigned __int64 __l, unsigned __int64 __h, unsigned char __d) { - unsigned __int128 __val = ((unsigned __int128)__h << 64) | __l; - unsigned __int128 __res = __val << (__d & 63); - return (unsigned __int64)(__res >> 64); -} -static __inline__ unsigned __int64 __DEFAULT_FN_ATTRS -__shiftright128(unsigned __int64 __l, unsigned __int64 __h, unsigned char __d) { - unsigned __int128 __val = ((unsigned __int128)__h << 64) | __l; - unsigned __int128 __res = __val >> (__d & 63); - return (unsigned __int64)__res; -} -#endif /*----------------------------------------------------------------------------*\ |* Privileged intrinsics diff --git a/c_headers/unwind.h b/c_headers/unwind.h index 345fa4d0c1..0e8317e5b9 100644 --- a/c_headers/unwind.h +++ b/c_headers/unwind.h @@ -154,8 +154,12 @@ struct _Unwind_Control_Block { struct _Unwind_Exception { _Unwind_Exception_Class exception_class; _Unwind_Exception_Cleanup_Fn exception_cleanup; +#if !defined (__USING_SJLJ_EXCEPTIONS__) && defined (__SEH__) + _Unwind_Word private_[6]; +#else _Unwind_Word private_1; _Unwind_Word private_2; +#endif /* The Itanium ABI requires that _Unwind_Exception objects are "double-word * aligned". GCC has interpreted this to mean "use the maximum useful * alignment for the target"; so do we. */ |