aboutsummaryrefslogtreecommitdiff
path: root/lib/Transforms
diff options
context:
space:
mode:
authorJukka Jylänki <jujjyl@gmail.com>2014-01-27 12:18:27 +0200
committerJukka Jylänki <jujjyl@gmail.com>2014-01-27 12:19:09 +0200
commitf2d68ac5c26a6f6cd97c28c8f9b2a24ea94f44c2 (patch)
tree73e62308d2346596295b6dbd920d19ada696bd16 /lib/Transforms
parent959ad35ee7d63fdb9e800084adb8fe14b3f07b78 (diff)
Fix 64-bit Visual Studio build. TODO: Move this fix to PNaCl upstream.
Diffstat (limited to 'lib/Transforms')
-rw-r--r--lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp b/lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp
index d58b70d4d0..5331f644f3 100644
--- a/lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp
+++ b/lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp
@@ -183,9 +183,9 @@ struct IsLockFreeToConstant {
default:
return false;
}
-# elif defined(__i386__) || defined(__x86_64__) || defined(__arm__)
+# elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(_M_X64) // XXX Emscripten TODO: Move this fix to PNaCl upstream.
// Continue.
-# elif defined(__mips__) || defined(_M_IX86) // XXX Emscripten TODO: Move this fix to PNacl upstream.
+# elif defined(__mips__) || defined(_M_IX86) // XXX Emscripten TODO: Move this fix to PNaCl upstream.
MaxLockFreeByteSize = 4;
# else
# error "Unknown architecture"