diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
--- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp
+++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
@@ -553,7 +553,8 @@
     return MF.getSubtarget<ARMSubtarget>().isThumb2();
   }));
 
-  addPass(createARMBlockPlacementPass());
+  if (getOptLevel() != CodeGenOpt::None)
+    addPass(createARMBlockPlacementPass());
 
   // Don't optimize barriers at -O0.
   if (getOptLevel() != CodeGenOpt::None)