From: Eric Christopher <echristo@gmail.com>
Date: Wed, 18 Sep 2013 22:24:01 +0000 (+0000)
Subject: The intrinsics should all have C linkage.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1fe5ccfaebef277418b0ae44c52d7acf8dea0b0a;p=clang

The intrinsics should all have C linkage.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190963 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Headers/Intrin.h b/lib/Headers/Intrin.h
index 8c976fbc13..6fd76e311b 100644
--- a/lib/Headers/Intrin.h
+++ b/lib/Headers/Intrin.h
@@ -32,6 +32,10 @@
 /* First include the standard intrinsics. */
 #include <x86intrin.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* And the random ones that aren't in those files. */
 __m64 _m_from_float(float);
 __m64 _m_from_int(int _l);
@@ -46,10 +50,10 @@ void __addfsword(unsigned long, unsigned short);
 void __code_seg(const char *);
 void __cpuid(int[4], int);
 void __cpuidex(int[4], int, int);
-void __cdecl __debugbreak(void);
+void __debugbreak(void);
 __int64 __emul(int, int);
 unsigned __int64 __emulu(unsigned int, unsigned int);
-void __fastfail(unsigned int);
+void __cdecl __fastfail(unsigned int);
 unsigned int __getcallerseflags(void);
 void __halt(void);
 unsigned char __inbyte(unsigned short);
@@ -336,6 +340,8 @@ void __cdecl _writegsbase_u64(unsigned __int64);
 void __cdecl _xrstor64(void const *, unsigned __int64);
 void __cdecl _xsave64(void *, unsigned __int64);
 void __cdecl _xsaveopt64(void *, unsigned __int64);
+
+}
 #endif
 #endif
 #endif