diff options
| author | Hans Wennborg <hans@hanshq.net> | 2014-03-12 21:09:03 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2014-03-12 21:09:03 +0000 |
| commit | dd0f5304f60e09c1e056e97634db032fd4922820 (patch) | |
| tree | 047d7be9bf68343778178a210b1395253dc932e7 /clang/lib | |
| parent | 8b77f351a8d8c0c834cff44b161ef5284e7d6c91 (diff) | |
| download | bcm5719-llvm-dd0f5304f60e09c1e056e97634db032fd4922820.tar.gz bcm5719-llvm-dd0f5304f60e09c1e056e97634db032fd4922820.zip | |
MS intrinsics: don't declare __readeflags and __writeeflags in Intrin.h
They're already defined in ia32intrin.h, and this would cause including Intrin.h
in 64-bit mode to fail because of conflicting types. Update ms-intrin.cpp to
also run in 64-bit mode to catch things like this.
llvm-svn: 203714
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Headers/Intrin.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/clang/lib/Headers/Intrin.h b/clang/lib/Headers/Intrin.h index f5843cfab06..54e08993506 100644 --- a/clang/lib/Headers/Intrin.h +++ b/clang/lib/Headers/Intrin.h @@ -106,7 +106,6 @@ unsigned long __readcr3(void); unsigned long __readcr4(void); unsigned long __readcr8(void); unsigned int __readdr(unsigned int); -unsigned int __readeflags(void); #ifdef __i386__ static __inline__ unsigned char __readfsbyte(unsigned long); @@ -142,7 +141,6 @@ void __writecr3(unsigned int); void __writecr4(unsigned int); void __writecr8(unsigned int); void __writedr(unsigned int, unsigned int); -void __writeeflags(unsigned int); void __writefsbyte(unsigned long, unsigned char); void __writefsdword(unsigned long, unsigned long); void __writefsqword(unsigned long, unsigned __int64); |
