Index: llvm/trunk/lib/Target/TargetMachine.cpp =================================================================== --- llvm/trunk/lib/Target/TargetMachine.cpp +++ llvm/trunk/lib/Target/TargetMachine.cpp @@ -154,8 +154,9 @@ return true; bool IsTLS = GV && GV->isThreadLocal(); - bool IsAccessViaCopyRelocs = - Options.MCOptions.MCPIECopyRelocations && GV && isa(GV); + bool IsAccessViaCopyRelocs = Options.MCOptions.MCPIECopyRelocations && GV && + isa(GV) && + !GV->hasExternalWeakLinkage(); Triple::ArchType Arch = TT.getArch(); bool IsPPC = Arch == Triple::ppc || Arch == Triple::ppc64 || Arch == Triple::ppc64le; Index: llvm/trunk/test/CodeGen/X86/global-access-pie-copyrelocs.ll =================================================================== --- llvm/trunk/test/CodeGen/X86/global-access-pie-copyrelocs.ll +++ llvm/trunk/test/CodeGen/X86/global-access-pie-copyrelocs.ll @@ -63,6 +63,20 @@ ret i32 %0 } +; ExternalWeak Linkage +@e = extern_weak global i32, align 4 + +define i32* @my_access_global_d() #0 { +; X32-LABEL: my_access_global_d: +; X32: addl $_GLOBAL_OFFSET_TABLE_{{.*}}, %eax +; X32: movl e@GOT(%eax), %eax +; X64-LABEL: my_access_global_d: +; X64: movq e@GOTPCREL(%rip), %rax + +entry: + ret i32* @e +} + ; External Linkage, only declaration, store a value. define i32 @my_access_global_store_d() #0 {