summaryrefslogtreecommitdiffstats
path: root/clang/lib/Headers
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2015-06-05 18:24:55 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2015-06-05 18:24:55 +0000
commit81ecbf45d4d7046d5b1c897bbcd9525da9128d07 (patch)
treee6070493f5671bd8ed991eb0292d152bef2c4b8b /clang/lib/Headers
parent3dabb233845f4385e649377d85a21b667a8ed8de (diff)
downloadbcm5719-llvm-81ecbf45d4d7046d5b1c897bbcd9525da9128d07.tar.gz
bcm5719-llvm-81ecbf45d4d7046d5b1c897bbcd9525da9128d07.zip
Revert accidental commit
This change was unrelated to r239170. llvm-svn: 239176
Diffstat (limited to 'clang/lib/Headers')
-rw-r--r--clang/lib/Headers/Intrin.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/clang/lib/Headers/Intrin.h b/clang/lib/Headers/Intrin.h
index 9592cccb15c..727a55e5b76 100644
--- a/clang/lib/Headers/Intrin.h
+++ b/clang/lib/Headers/Intrin.h
@@ -546,8 +546,13 @@ _bittestandset(long *a, long b) {
#if defined(__i386__) || defined(__x86_64__)
static __inline__ unsigned char __attribute__((__always_inline__, __nodebug__))
_interlockedbittestandset(long volatile *__BitBase, long __BitPos) {
- long __OldVal = __atomic_fetch_or(__BitBase, 1 << __BitPos, 5);
- return (__OldVal >> __BitPos) & 1;
+ unsigned char __Res;
+ __asm__ ("xor %0, %0\n"
+ "lock bts %2, %1\n"
+ "setc %0\n"
+ : "=r" (__Res), "+m"(*__BitBase)
+ : "Ir"(__BitPos));
+ return __Res;
}
#endif
#ifdef __x86_64__
OpenPOWER on IntegriCloud