Index: COFF/Chunks.h
===================================================================
--- COFF/Chunks.h
+++ COFF/Chunks.h
@@ -186,6 +186,8 @@
 
   void forceWritable() { ForceWritable = true; }
 
+  void discard() { Live = false; }
+
   // True if this is a codeview debug info chunk. These will not be laid out in
   // the image. Instead they will end up in the PDB, if one is requested.
   bool isCodeView() const {
Index: COFF/SymbolTable.cpp
===================================================================
--- COFF/SymbolTable.cpp
+++ COFF/SymbolTable.cpp
@@ -169,6 +169,15 @@
   // reference itself to point at the IAT entry.
   Sym->replaceKeepingName(Imp, sizeof(DefinedImportData));
   cast<DefinedImportData>(Sym)->IsRuntimePseudoReloc = true;
+
+  DefinedRegular *Refptr =
+      dyn_cast_or_null<DefinedRegular>(find((".refptr." + Name).str()));
+  size_t PtrSize = Config->is64() ? 8 : 4;
+  if (Refptr && Refptr->getChunk()->getSize() == PtrSize) {
+    log("Replacing .refptr." + Name + " with " + Imp->getName());
+    Refptr->getChunk()->discard();
+    Refptr->replaceKeepingName(Imp, sizeof(DefinedImportData));
+  }
   return true;
 }
 
Index: test/COFF/autoimport-refptr.s
===================================================================
--- /dev/null
+++ test/COFF/autoimport-refptr.s
@@ -0,0 +1,65 @@
+# REQUIRES: x86
+
+# RUN: echo -e ".global variable\n.global DllMainCRTStartup\n.text\nDllMainCRTStartup:\nret\n.data\nvariable:\n.long 42" > %t-lib.s
+# RUN: llvm-mc -triple=x86_64-windows-gnu %t-lib.s -filetype=obj -o %t-lib.obj
+# RUN: lld-link -out:%t-lib.dll -dll -entry:DllMainCRTStartup %t-lib.obj -lldmingw -implib:%t-lib.lib
+
+# RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
+# RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
+
+# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
+# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
+
+# IMPORTS: Import {
+# IMPORTS-NEXT: Name: autoimport-refptr.s.tmp-lib.dll
+# IMPORTS-NEXT: ImportLookupTableRVA: 0x2030
+# IMPORTS-NEXT: ImportAddressTableRVA: 0x2040
+# IMPORTS-NEXT: Symbol: variable (0)
+# IMPORTS-NEXT: }
+
+# DISASM: Disassembly of section .text:
+# DISASM: .text:
+# Relative offset at 0x1002 pointing at the IAT at 0x2040
+# DISASM: 140001000:      48 8b 05 39 10 00 00    movq    4153(%rip), %rax
+# DISASM: 140001007:      8b 00   movl    (%rax), %eax
+# Relative offset at 0x100b pointing at the .refptr.localvar stub at
+# 0x2000
+# DISASM: 140001009:      48 8b 0d f0 0f 00 00    movq    4080(%rip), %rcx
+# DISASM: 140001010:      03 01   addl    (%rcx), %eax
+# DISASM: 140001012:      c3      retq
+
+# relocs: pointing at an empty list of runtime pseudo relocs.
+# localvar: 42
+# CONTENTS: Contents of section .data:
+# CONTENTS:  140003000 08200040 01000000 08200040 01000000
+# CONTENTS:  140003010 2a000000
+
+    .global main
+    .global localvar
+    .text
+main:
+    movq .refptr.variable(%rip), %rax
+    movl (%rax), %eax
+    movq .refptr.localvar(%rip), %rcx
+    addl (%rcx), %eax
+    ret
+
+    .data
+relocs:
+    .quad __RUNTIME_PSEUDO_RELOC_LIST__
+    .quad __RUNTIME_PSEUDO_RELOC_LIST_END__
+localvar:
+    .int 42
+
+# Normally the compiler wouldn't emit a stub for a variable that is
+# emitted in the same translation unit.
+    .section .rdata$.refptr.localvar,"dr",discard,.refptr.localvar
+    .global .refptr.localvar
+.refptr.localvar:
+    .quad localvar
+
+    .section .rdata$.refptr.variable,"dr",discard,.refptr.variable
+    .global .refptr.variable
+.refptr.variable:
+    .quad variable