commit 4af1ca5229a149c1d8e5e89bc2f13209da33221c
author NAKAMURA Takumi <geek4civic@gmail.com> Tue Dec 04 00:08:14 2012 +0000
committer NAKAMURA Takumi <geek4civic@gmail.com> Tue Dec 04 00:08:14 2012 +0000
tree 1b2b0a66f346cfac03b8b9269ffaaf9a1e82de54
parent c811976b0400257511f2a255ec70538c3614f85e

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

lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp

diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
index 648de79..f348a33 100644
--- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
+++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -347,7 +347,7 @@
     uint32_t *StubAddr = (uint32_t*)Addr;
     *StubAddr = 0xe51ff004; // ldr pc,<label>
     return (uint8_t*)++StubAddr;
-  } else if (Arch == Triple::mipsel or Arch == Triple::mips) {
+  } else if (Arch == Triple::mipsel || Arch == Triple::mips) {
     uint32_t *StubAddr = (uint32_t*)Addr;
     // 0:   3c190000        lui     t9,%hi(addr).
     // 4:   27390000        addiu   t9,t9,%lo(addr).