summaryrefslogtreecommitdiffstats
path: root/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
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
commitf97efd978bd7a72c598b30267ed58118f7a21c74 (patch)
tree94068778951510123b8e61b420b9c25d55584179 /llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
parent63e999edbf4b6215c5e89c055cc5f97fd6f4d51d (diff)
downloadbcm5719-llvm-f97efd978bd7a72c598b30267ed58118f7a21c74.tar.gz
bcm5719-llvm-f97efd978bd7a72c598b30267ed58118f7a21c74.zip
RuntimeDyld: Fix up r169178. MSVC doesn't like "or".
llvm-svn: 169183
Diffstat (limited to 'llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp')
-rw-r--r--llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
index 648de79b89a..f348a33b381 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -347,7 +347,7 @@ uint8_t *RuntimeDyldImpl::createStubFunction(uint8_t *Addr) {
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).
OpenPOWER on IntegriCloud