Index: ELF/OutputSections.h
===================================================================
--- ELF/OutputSections.h
+++ ELF/OutputSections.h
@@ -59,10 +59,11 @@
     GotPlt,
     HashTable,
     Interp,
+    LinkerVersion,
     Merge,
-    MipsReginfo,
-    MipsOptions,
     MipsAbiFlags,
+    MipsOptions,
+    MipsReginfo,
     Plt,
     Regular,
     Reloc,
@@ -500,6 +501,22 @@
   static bool classof(const Base *B) { return B->getKind() == Base::Interp; }
 };
 
+// Represents a ".linker-version" section which contains
+// a linker version string.
+template <class ELFT>
+class LinkerVersionSection final : public OutputSectionBase<ELFT> {
+  typedef OutputSectionBase<ELFT> Base;
+
+public:
+  LinkerVersionSection();
+  void writeTo(uint8_t *Buf) override;
+  typename Base::Kind getKind() const override { return Base::LinkerVersion; }
+
+  static bool classof(const Base *B) {
+    return B->getKind() == Base::LinkerVersion;
+  }
+};
+
 template <class ELFT>
 class StringTableSection final : public OutputSectionBase<ELFT> {
   typedef OutputSectionBase<ELFT> Base;
@@ -770,6 +787,7 @@
   static GotSection<ELFT> *Got;
   static HashTableSection<ELFT> *HashTab;
   static InterpSection<ELFT> *Interp;
+  static LinkerVersionSection<ELFT> *LinkerVersion;
   static OutputSection<ELFT> *Bss;
   static OutputSection<ELFT> *MipsRldMap;
   static OutputSectionBase<ELFT> *Opd;
@@ -839,6 +857,7 @@
 template <class ELFT> GotSection<ELFT> *Out<ELFT>::Got;
 template <class ELFT> HashTableSection<ELFT> *Out<ELFT>::HashTab;
 template <class ELFT> InterpSection<ELFT> *Out<ELFT>::Interp;
+template <class ELFT> LinkerVersionSection<ELFT> *Out<ELFT>::LinkerVersion;
 template <class ELFT> OutputSection<ELFT> *Out<ELFT>::Bss;
 template <class ELFT> OutputSection<ELFT> *Out<ELFT>::MipsRldMap;
 template <class ELFT> OutputSectionBase<ELFT> *Out<ELFT>::Opd;
Index: ELF/OutputSections.cpp
===================================================================
--- ELF/OutputSections.cpp
+++ ELF/OutputSections.cpp
@@ -14,6 +14,7 @@
 #include "Strings.h"
 #include "SymbolTable.h"
 #include "Target.h"
+#include "lld/Config/Version.h"
 #include "lld/Core/Parallel.h"
 #include "llvm/Support/Dwarf.h"
 #include "llvm/Support/MD5.h"
@@ -451,6 +452,17 @@
 }
 
 template <class ELFT>
+LinkerVersionSection<ELFT>::LinkerVersionSection()
+    : OutputSectionBase<ELFT>(".linker-version", SHT_PROGBITS, 0) {
+  this->Header.sh_size = getLLDVersion().size() + 1; // +1 for NUL
+}
+
+template <class ELFT> void LinkerVersionSection<ELFT>::writeTo(uint8_t *Buf) {
+  StringRef S = getLLDVersion();
+  memcpy(Buf, S.data(), S.size());
+}
+
+template <class ELFT>
 HashTableSection<ELFT>::HashTableSection()
     : OutputSectionBase<ELFT>(".hash", SHT_HASH, SHF_ALLOC) {
   this->Header.sh_entsize = sizeof(Elf_Word);
@@ -1978,6 +1990,11 @@
 template class DynamicSection<ELF64LE>;
 template class DynamicSection<ELF64BE>;
 
+template class LinkerVersionSection<ELF32LE>;
+template class LinkerVersionSection<ELF32BE>;
+template class LinkerVersionSection<ELF64LE>;
+template class LinkerVersionSection<ELF64BE>;
+
 template class OutputSection<ELF32LE>;
 template class OutputSection<ELF32BE>;
 template class OutputSection<ELF64LE>;
Index: ELF/Writer.cpp
===================================================================
--- ELF/Writer.cpp
+++ ELF/Writer.cpp
@@ -133,6 +133,7 @@
   OutputSection<ELFT> Bss(".bss", SHT_NOBITS, SHF_ALLOC | SHF_WRITE);
   DynamicSection<ELFT> Dynamic;
   EhOutputSection<ELFT> EhFrame;
+  LinkerVersionSection<ELFT> LinkerVersion;
   GotSection<ELFT> Got;
   PltSection<ELFT> Plt;
   RelocationSection<ELFT> RelaDyn(Config->Rela ? ".rela.dyn" : ".rel.dyn",
@@ -219,6 +220,7 @@
   Out<ELFT>::GotPlt = GotPlt.get();
   Out<ELFT>::HashTab = HashTab.get();
   Out<ELFT>::Interp = Interp.get();
+  Out<ELFT>::LinkerVersion = &LinkerVersion;
   Out<ELFT>::Plt = &Plt;
   Out<ELFT>::RelaDyn = &RelaDyn;
   Out<ELFT>::RelaPlt = RelaPlt.get();
@@ -904,6 +906,7 @@
 
   // This order is not the same as the final output order
   // because we sort the sections using their attributes below.
+  Add(Out<ELFT>::LinkerVersion);
   Add(Out<ELFT>::SymTab);
   Add(Out<ELFT>::ShStrTab);
   Add(Out<ELFT>::StrTab);