diff --git a/lib/Target/ARM64/ARM64Subtarget.cpp b/lib/Target/ARM64/ARM64Subtarget.cpp
index e7cafbb3047..62a489fd86f 100644
--- a/lib/Target/ARM64/ARM64Subtarget.cpp
+++ b/lib/Target/ARM64/ARM64Subtarget.cpp
@@ -77,7 +77,8 @@ ARM64Subtarget::ClassifyGlobalReference(const GlobalValue *GV,
       return (isDecl || GV->isWeakForLinker()) ? ARM64II::MO_GOT
                                                : ARM64II::MO_NO_FLAG;
     else
-      return ARM64II::MO_GOT;
+      // No need to go through the GOT for local symbols on ELF.
+      return GV->hasLocalLinkage() ? ARM64II::MO_NO_FLAG : ARM64II::MO_GOT;
   }
 
   return ARM64II::MO_NO_FLAG;
diff --git a/test/CodeGen/ARM64/pic-local-symbol.ll b/test/CodeGen/ARM64/pic-local-symbol.ll
new file mode 100644
index 00000000000..627e741fc32
--- /dev/null
+++ b/test/CodeGen/ARM64/pic-local-symbol.ll
@@ -0,0 +1,22 @@
+; RUN: llc -mtriple=arm64-unknown-linux-gnu -relocation-model=pic < %s | FileCheck %s
+
+@a = internal unnamed_addr global i32 0, align 4
+@.str = private unnamed_addr constant [6 x i8] c"test\0A\00", align 1
+
+define i32 @get() {
+; CHECK: get:
+; CHECK: adrp x{{[0-9]+}}, a
+; CHECK-NEXT: ldr w{{[0-9]+}}, [x{{[0-9]}}, :lo12:a]
+  %res = load i32* @a, align 4
+  ret i32 %res
+}
+
+define void @foo() nounwind {
+; CHECK: foo:
+; CHECK: adrp x{{[0-9]}}, .L.str
+; CHECK-NEXT: add x{{[0-9]}}, x{{[0-9]}}, :lo12:.L.str
+  tail call void @bar(i8* getelementptr inbounds ([6 x i8]* @.str, i64 0, i64 0))
+  ret void
+}
+
+declare void @bar(i8*)