[lld] r226989 - Fix single-arch builds broken by r226976

[Greg Fitzgerald]

Author: garious
Date: Fri Jan 23 22:51:26 2015
New Revision: 226989

URL: http://llvm.org/viewvc/llvm-project?rev=226989&view=rev
Log:
Fix single-arch builds broken by r226976

TODO: Move ELF/PPC to ELF/PowerPC
TODO: Move ELF/X86_64 into ELF/X86

Modified:
    lld/trunk/include/lld/ReaderWriter/ELFTargets.h
    lld/trunk/lib/Driver/GnuLdDriver.cpp

Modified: lld/trunk/include/lld/ReaderWriter/ELFTargets.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/ELFTargets.h?rev=226989&r1=226988&r2=226989&view=diff
==============================================================================
--- lld/trunk/include/lld/ReaderWriter/ELFTargets.h (original)
+++ lld/trunk/include/lld/ReaderWriter/ELFTargets.h Fri Jan 23 22:51:26 2015
@@ -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); \
-};
+// 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)
 
-// PowerPC => PPC
-class PPCLinkingContext final : public ELFLinkingContext {
-public:
-  static std::unique_ptr<ELFLinkingContext> create(llvm::Triple); \
-};
+#undef LLVM_TARGET
 
 } // end namespace elf
 } // end namespace lld

Modified: lld/trunk/lib/Driver/GnuLdDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/GnuLdDriver.cpp?rev=226989&r1=226988&r2=226989&view=diff
==============================================================================
--- lld/trunk/lib/Driver/GnuLdDriver.cpp (original)
+++ lld/trunk/lib/Driver/GnuLdDriver.cpp Fri Jan 23 22:51:26 2015
@@ -331,6 +331,7 @@ createELFLinkingContext(llvm::Triple tri
   LLVM_TARGET(X86_64)
   return nullptr;
 }
+#undef LLVM_TARGET
 
 bool GnuLdDriver::parse(int argc, const char *argv[],
                         std::unique_ptr<ELFLinkingContext> &context,