 --- a/lld/lib/Config/Version.cpp
 +++ b/lld/lib/Config/Version.cpp
 @@ -39,5 +39,5 @@ static std::string getRepository() {
- 
+
  // Returns a version string, e.g., "LLD 4.0 (lld/trunk 284614)".
  std::string lld::getLLDVersion() {
 -  return "LLD " + std::string(LLD_VERSION_STRING) + getRepository();
 +  return "LLD (not GNU) " + std::string(LLD_VERSION_STRING) + getRepository();
  }
-diff --git a/lld/test/ELF/hack-old-gas.s b/lld/test/ELF/hack-old-gas.s
-new file mode 100644
-index 0000000..4d8cf0f
---- /dev/null
-+++ b/lld/test/ELF/hack-old-gas.s
-@@ -0,0 +1,18 @@
-+// REQUIRES: x86
-+// RUN: ld.lld %S/Inputs/hack-old-gas.o -o %t.so -shared
-+// The .o file is this assembled with gas 2.20.
-+
-+	.section	.text.foo,"axG",@progbits,bah,comdat
-+	.global foo
-+	.hidden foo
-+foo:
-+	nop
-+
-+	.section	.text.bar,"axG",@progbits,baz,comdat
-+	.global bar
-+	.hidden bar
-+bar:
-+	nop
-+
-+	.data
-+	.quad bar

+++ b/lld/ELF/InputFiles.h
@@ -130,7 +130,8 @@ template <class ELFT> class ObjectFile : public ELFFileBase<ELFT> {
   typedef typename ELFT::uint uintX_t;
 
   StringRef getShtGroupSignature(ArrayRef<Elf_Shdr> Sections,
-                                 const Elf_Shdr &Sec);
+                                 const Elf_Shdr &Sec,
+                                 StringRef SectionStringTable);
   ArrayRef<Elf_Word> getShtGroupEntries(const Elf_Shdr &Sec);
 
 public:
diff --git a/lld/ELF/Target.cpp b/lld/ELF/Target.cpp
index 5106051..ea7848c 100644

   Table.PrintHelp(outs(), Argv0, "lld", false);
+  outs() << Argv0 << ": supported targets: elf\n";
 }

 // Reconstructs command line arguments so that so that you can re-run
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 37ebfa7..5bfa34d 100644
