Revert "intrin.h: include setjmp.h to get a jmp_buf definition"
This failed the ms-intrin.cpp test.
This reverts commit r200237.
This also comments out the _setjmpex declaration for now so that
intrin.h will work on x64 targets.
llvm-svn: 200243
diff --git a/clang/lib/Headers/Intrin.h b/clang/lib/Headers/Intrin.h
index 11486a3..6005adf 100644
--- a/clang/lib/Headers/Intrin.h
+++ b/clang/lib/Headers/Intrin.h
@@ -32,8 +32,6 @@
/* First include the standard intrinsics. */
#include <x86intrin.h>
-#include <setjmp.h>
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -279,7 +277,10 @@
static __inline__
unsigned char _rotr8(unsigned char _Value, unsigned char _Shift);
int _sarx_i32(int, unsigned int);
-int __cdecl _setjmp(jmp_buf);
+
+/* FIXME: Need definition for jmp_buf.
+ int __cdecl _setjmp(jmp_buf); */
+
unsigned int _shlx_u32(unsigned int, unsigned int);
unsigned int _shrx_u32(unsigned int, unsigned int);
void _Store_HLERelease(long volatile *, long);
@@ -431,7 +432,8 @@
unsigned __int64 __cdecl _readgsbase_u64(void);
unsigned __int64 _rorx_u64(unsigned __int64, const unsigned int);
__int64 _sarx_i64(__int64, unsigned int);
-int __cdecl _setjmpex(jmp_buf);
+/* FIXME: Need definition for jmp_buf.
+ int __cdecl _setjmpex(jmp_buf); */
unsigned __int64 _shlx_u64(unsigned __int64, unsigned int);
unsigned __int64 shrx_u64(unsigned __int64, unsigned int);
unsigned __int64 _tzcnt_u64(unsigned __int64);