r200243 - Revert "intrin.h: include setjmp.h to get a jmp_buf definition"

[Reid Kleckner]

Author: rnk
Date: Mon Jan 27 13:32:42 2014
New Revision: 200243

URL: http://llvm.org/viewvc/llvm-project?rev=200243&view=rev
Log:
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.

Modified:
    cfe/trunk/lib/Headers/Intrin.h

Modified: cfe/trunk/lib/Headers/Intrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/Intrin.h?rev=200243&r1=200242&r2=200243&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/Intrin.h (original)
+++ cfe/trunk/lib/Headers/Intrin.h Mon Jan 27 13:32:42 2014
@@ -32,8 +32,6 @@
 /* First include the standard intrinsics. */
 #include <x86intrin.h>
 
-#include <setjmp.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -279,7 +277,10 @@ unsigned __int64 __cdecl _rotr64(unsigne
 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 int __cdecl _readgsbase_u32(voi
 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);