Index: lib/Target/PowerPC/PPCISelLowering.cpp
===================================================================
--- lib/Target/PowerPC/PPCISelLowering.cpp
+++ lib/Target/PowerPC/PPCISelLowering.cpp
@@ -2671,7 +2671,8 @@
 
   // 64-bit SVR4 ABI code is always position-independent.
   // The actual BlockAddress is stored in the TOC.
-  if (Subtarget.isSVR4ABI() && isPositionIndependent()) {
+  if (Subtarget.isSVR4ABI() &&
+      (Subtarget.isPPC64() || isPositionIndependent())) {
     if (Subtarget.isPPC64())
       setUsesTOCBasePtr(DAG);
     SDValue GA = DAG.getTargetBlockAddress(BA, PtrVT, BASDN->getOffset());
Index: test/CodeGen/PowerPC/ppc-label2.ll
===================================================================
--- test/CodeGen/PowerPC/ppc-label2.ll
+++ test/CodeGen/PowerPC/ppc-label2.ll
@@ -0,0 +1,22 @@
+; RUN: llc < %s -mtriple=powerpc-unknown-linux-gnu -relocation-model=pic | FileCheck --check-prefix=CHECK-PIC32 %s
+; RUN: llc < %s -mtriple=powerpc-unknown-linux-gnu -relocation-model=static | FileCheck --check-prefix=CHECK-STATIC32 %s
+; RUN: llc < %s -mtriple=powerpc64-unknown-linux-gnu -relocation-model=pic | FileCheck --check-prefix=CHECK-PIC64 %s
+; RUN: llc < %s -mtriple=powerpc64-unknown-linux-gnu -relocation-model=static | FileCheck --check-prefix=CHECK-STATIC64 %s
+
+define dso_local i64 @foo() {
+entry:
+  br label %__here
+
+__here:                                           ; preds = %entry
+  ret i64 ptrtoint (i8* blockaddress(@foo, %__here) to i64)
+}
+
+; CHECK-PIC32:           lwz {{[0-9]+}}, .LC0-.LTOC(30)
+; CHECK-PIC32-NOT:       li {{[0-9]+}}, .Ltmp1-.L1$pb@l
+; CHECK-PIC32-NOT:       addis 4, 30, .Ltmp1-.L1$pb@ha
+; CHECK-STATIC32:        li {{[0-9]+}}, .Ltmp0@l
+; CHECK-STATIC32-NEXT:   addis {{[0-9]+}}, {{[0-9]+}}, .Ltmp0@ha
+; CHECK-PIC64:           addis   {{[0-9]+}}, {{[0-9]+}}, .LC0@toc@ha
+; CHECK-PIC64-NEXT:      ld 3, .LC0@toc@l(3)
+; CHECK-STATIC64:        addis   {{[0-9]+}}, {{[0-9]+}}, .LC0@toc@h
+; CHECK-STATIC64-NEXT:   ld 3, .LC0@toc@l(3)
\ No newline at end of file