diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
--- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -2551,7 +2551,9 @@
                    ConstPoolNode->getTargetFlags() == PPCII::MO_PCREL_FLAG;
   GlobalAddressSDNode *GSDN = dyn_cast<GlobalAddressSDNode>(N.getNode());
   bool Global = GSDN && GSDN->getTargetFlags() == PPCII::MO_PCREL_FLAG;
-  if (ConstPool || Global) {
+  JumpTableSDNode *JT = dyn_cast<JumpTableSDNode>(N.getNode());
+  bool JumpTable = JT && JT->getTargetFlags() == PPCII::MO_PCREL_FLAG;
+  if (ConstPool || Global || JumpTable) {
     Base = N;
     return true;
   }
@@ -2851,6 +2853,13 @@
   // 64-bit SVR4 ABI and AIX ABI code are always position-independent.
   // The actual address of the GlobalValue is stored in the TOC.
   if (Subtarget.is64BitELFABI() || Subtarget.isAIXABI()) {
+    if (Subtarget.hasPCRelativeMemops()) {
+      SDLoc DL(JT);
+      EVT Ty = getPointerTy(DAG.getDataLayout());
+      SDValue GA =
+          DAG.getTargetJumpTable(JT->getIndex(), Ty, PPCII::MO_PCREL_FLAG);
+      return DAG.getNode(PPCISD::MAT_PCREL_ADDR, DL, Ty, GA);
+    }
     setUsesTOCBasePtr(DAG);
     SDValue GA = DAG.getTargetJumpTable(JT->getIndex(), PtrVT);
     return getTOCEntry(DAG, SDLoc(JT), GA);
diff --git a/llvm/test/CodeGen/PowerPC/jump-table.ll b/llvm/test/CodeGen/PowerPC/jump-table.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/CodeGen/PowerPC/jump-table.ll
@@ -0,0 +1,43 @@
+; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu \
+; RUN:   -mcpu=future -ppc-asm-full-reg-names < %s | FileCheck %s \
+; RUN:   --check-prefix=CHECK
+; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu \
+; RUN:   -mcpu=future -ppc-use-absolute-jumptables \
+; RUN:   -ppc-asm-full-reg-names < %s | FileCheck %s \
+; RUN:   --check-prefix=CHECK
+
+define dso_local signext i32 @jumptable(i32 signext %param) {
+; CHECK-LABEL: jumptable:
+; CHECK:       # %bb.1: # %entry
+; CHECK-NEXT:    rldic r4, r4
+; CHECK-NEXT:    paddi r5, 0, .LJTI0_0@PCREL, 1
+
+entry:
+  switch i32 %param, label %sw.default [
+    i32 1, label %return
+    i32 2, label %sw.bb1
+    i32 3, label %sw.bb2
+    i32 4, label %sw.bb3
+    i32 20, label %sw.bb4
+  ]
+
+sw.bb1:                                           ; preds = %entry
+  br label %return
+
+sw.bb2:                                           ; preds = %entry
+  br label %return
+
+sw.bb3:                                           ; preds = %entry
+  br label %return
+
+sw.bb4:                                           ; preds = %entry
+  br label %return
+
+sw.default:                                       ; preds = %entry
+  br label %return
+
+return:  ; preds = %entry, %sw.default, %sw.bb4, %sw.bb3, %sw.bb2, %sw.bb1
+  %retval.0 = phi i32 [ -1, %sw.default ], [ 400, %sw.bb4 ], [ 16, %sw.bb3 ],
+                      [ 9, %sw.bb2 ], [ 4, %sw.bb1 ], [ %param, %entry ]
+  ret i32 %retval.0
+}