diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-24 15:44:53 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-24 15:44:53 -0800 |
| commit | 959ad35ee7d63fdb9e800084adb8fe14b3f07b78 (patch) | |
| tree | 7a5f92fc5fbab1d24276e5447ae3ac64ab1aa03a /lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp | |
| parent | ff6dfa8bd32383accdb1a84e9e350cb0b27a6abd (diff) | |
| parent | 861843f11cf162404960f73a5d5aa5b7d904374a (diff) | |
Merge pull request #6 from juj/win_build_fixes
Win build fixes
Diffstat (limited to 'lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp')
| -rw-r--r-- | lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp b/lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp index 428caef2b5..d58b70d4d0 100644 --- a/lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp +++ b/lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp @@ -185,7 +185,7 @@ struct IsLockFreeToConstant { } # elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) // Continue. -# elif defined(__mips__) +# elif defined(__mips__) || defined(_M_IX86) // XXX Emscripten TODO: Move this fix to PNacl upstream. MaxLockFreeByteSize = 4; # else # error "Unknown architecture" |