diff --git a/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.cpp b/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.cpp
--- a/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.cpp
+++ b/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.cpp
@@ -97,6 +97,9 @@
                       uint64_t &Target) const override {
     if (Inst.getNumOperands() == 0)
       return false;
+    if (!isConditionalBranch(Inst) && !isUnconditionalBranch(Inst) &&
+        !isCall(Inst))
+      return false;
 
     if (Info->get(Inst.getOpcode()).OpInfo[0].OperandType ==
         MCOI::OPERAND_PCREL) {
diff --git a/llvm/test/tools/llvm-objdump/ELF/Lanai/lit.local.cfg b/llvm/test/tools/llvm-objdump/ELF/Lanai/lit.local.cfg
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/ELF/Lanai/lit.local.cfg
@@ -0,0 +1,4 @@
+import platform
+
+if not 'Lanai' in config.root.targets:
+    config.unsupported = True
diff --git a/llvm/test/tools/llvm-objdump/ELF/Lanai/smoke.ll b/llvm/test/tools/llvm-objdump/ELF/Lanai/smoke.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/ELF/Lanai/smoke.ll
@@ -0,0 +1,13 @@
+; RUN: llc -o %t.bc -filetype=obj -mtriple=lanai %s
+; RUN: llvm-objdump -d -S %t.bc | FileCheck %s
+
+;; Ensure that Lanai can be compiled using llc and then objdumped to
+;; assembly. This is a smoke test to exercise the basics of the MC
+;; implementation in Lanai.
+
+; CHECK-LABEL: smoketest
+; CHECK: st %fp, [--%sp]
+define i32 @smoketest(i32 %x, i32 %y)  {
+  %z = add i32 %x, %y
+  ret i32 %z
+}