Fix single-arch builds broken by r226976

TODO: Move ELF/PPC to ELF/PowerPC
TODO: Move ELF/X86_64 into ELF/X86
llvm-svn: 226989

2 files changed, 12 insertions, 13 deletions

diff --git a/lld/include/lld/ReaderWriter/ELFTargets.h b/lld/include/lld/ReaderWriter/ELFTargets.h
index dfb92bbfe85..c986e27479e 100644
--- a/lld/include/lld/ReaderWriter/ELFTargets.h
+++ b/lld/include/lld/ReaderWriter/ELFTargets.h
@@ -20,19 +20,17 @@ namespace elf {
   public: \
     static std::unique_ptr<ELFLinkingContext> create(llvm::Triple); \
   };
-#include "llvm/Config/Targets.def"
-
-// X86 => X86,X86_64
-class X86_64LinkingContext final : public ELFLinkingContext {
-public:
-  static std::unique_ptr<ELFLinkingContext> create(llvm::Triple); \
-};
-
-// PowerPC => PPC
-class PPCLinkingContext final : public ELFLinkingContext {
-public:
-  static std::unique_ptr<ELFLinkingContext> create(llvm::Triple); \
-};
+
+// FIXME: #include "llvm/Config/Targets.def"
+LLVM_TARGET(AArch64)
+LLVM_TARGET(ARM)
+LLVM_TARGET(Hexagon)
+LLVM_TARGET(Mips)
+LLVM_TARGET(PPC)
+LLVM_TARGET(X86)
+LLVM_TARGET(X86_64)
+
+#undef LLVM_TARGET
 
 } // end namespace elf
 } // end namespace lld
diff --git a/lld/lib/Driver/GnuLdDriver.cpp b/lld/lib/Driver/GnuLdDriver.cpp
index 23d989ad483..67d0e6812af 100644
--- a/lld/lib/Driver/GnuLdDriver.cpp
+++ b/lld/lib/Driver/GnuLdDriver.cpp
@@ -331,6 +331,7 @@ createELFLinkingContext(llvm::Triple triple) {
   LLVM_TARGET(X86_64)
   return nullptr;
 }
+#undef LLVM_TARGET
 
 bool GnuLdDriver::parse(int argc, const char *argv[],
                         std::unique_ptr<ELFLinkingContext> &context,