Rename AssemblerX86 to AssemblerX8632 so it works with SZTargets.def.

src/IceTargetLowering.cpp

 //===- subzero/src/IceTargetLowering.cpp - Basic lowering implementation --===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the skeleton of the TargetLowering class,
@@ skipping 62 matching lines @@
   return nullptr;
 }
 
 TargetLowering::TargetLowering(Cfg *Func)
     : Func(Func), Ctx(Func->getContext()), HasComputedFrame(false),
       CallsReturnsTwice(false), StackAdjustment(0), NextLabelNumber(0),
       Context(), SnapshotStackAdjustment(0) {}
 
 std::unique_ptr<Assembler> TargetLowering::createAssembler(TargetArch Target,
                                                            Cfg *Func) {
-  // These statements can be #ifdef'd to specialize the assembler
-  // to a subset of the available targets.  TODO: use CRTP.
-  // TODO(jvoung): use SZTargets.def (rename AssemblerX86 -> AssemblerX8632),
-  // and make the namespaces consistent.
-  if (Target == Target_X8632)
-    return std::unique_ptr<Assembler>(new x86::AssemblerX86());
-
-  if (Target == Target_ARM32)
-    return std::unique_ptr<Assembler>(new AssemblerARM32());
+#define SUBZERO_TARGET(X)                                                      \
+  if (Target == Target_##X)                                                    \
+    return std::unique_ptr<Assembler>(new X::Assembler##X());
+#include "llvm/Config/SZTargets.def"
 
   Func->setError("Unsupported target assembler");
   return nullptr;
 }
 
 void TargetLowering::doAddressOpt() {
   if (llvm::isa<InstLoad>(*Context.getCur()))
     doAddressOptLoad();
   else if (llvm::isa<InstStore>(*Context.getCur()))
     doAddressOptStore();
@@ skipping 145 matching lines @@
     return std::unique_ptr<TargetDataLowering>(TargetData##X::create(Ctx));
 #include "llvm/Config/SZTargets.def"
 
   llvm_unreachable("Unsupported target data lowering");
   return nullptr;
 }
 
 TargetDataLowering::~TargetDataLowering() {}
 
 } // end of namespace Ice