2 files changed, 13 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
index a52ce86d6d3..99dd0c9a4d4 100644
--- a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
+++ b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
@@ -876,8 +876,9 @@ bool JITEmitter::finishFunction(MachineFunction &F) {
   Relocations.clear();
 
 #ifndef NDEBUG
-  DOUT << "Disassembled code:\n"
-       << sys::disassembleBuffer(FnStart, FnEnd-FnStart, (uintptr_t)FnStart);
+  if (sys::hasDisassembler())
+    DOUT << "Disassembled code:\n"
+         << sys::disassembleBuffer(FnStart, FnEnd-FnStart, (uintptr_t)FnStart);
 #endif
   
   return false;
diff --git a/llvm/lib/System/Disassembler.cpp b/llvm/lib/System/Disassembler.cpp
index 30d3fb7fcc0..4aec698022f 100644
--- a/llvm/lib/System/Disassembler.cpp
+++ b/llvm/lib/System/Disassembler.cpp
@@ -26,6 +26,16 @@
 
 using namespace llvm;
 
+bool llvm::sys::hasDisassembler(void) 
+{
+#if defined (__i386__) || defined (__amd64__) || defined (__x86_64__)
+  // We have option to enable udis86 library.
+  return true;
+#else
+  return false;
+#endif
+}
+
 std::string llvm::sys::disassembleBuffer(uint8_t* start, size_t length,
                                          uint64_t pc) {
   std::stringstream res;