summaryrefslogtreecommitdiff
path: root/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2012-12-04 00:08:14 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2012-12-04 00:08:14 +0000
commit4af1ca5229a149c1d8e5e89bc2f13209da33221c (patch)
tree1b2b0a66f346cfac03b8b9269ffaaf9a1e82de54 /lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
parentc811976b0400257511f2a255ec70538c3614f85e (diff)
downloadllvm-4af1ca5229a149c1d8e5e89bc2f13209da33221c.tar.gz
llvm-4af1ca5229a149c1d8e5e89bc2f13209da33221c.tar.bz2
llvm-4af1ca5229a149c1d8e5e89bc2f13209da33221c.tar.xz
RuntimeDyld: Fix up r169178. MSVC doesn't like "or".
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169183 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h')
-rw-r--r--lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
index cfeb2b4b6a..a292ee1a84 100644
--- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
+++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
@@ -168,7 +168,7 @@ protected:
inline unsigned getMaxStubSize() {
if (Arch == Triple::arm || Arch == Triple::thumb)
return 8; // 32-bit instruction and 32-bit address
- else if (Arch == Triple::mipsel or Arch == Triple::mips)
+ else if (Arch == Triple::mipsel || Arch == Triple::mips)
return 16;
else if (Arch == Triple::ppc64)
return 44;