ARM: rename ARMle/ARMbe with ARMLE/ARMBE, and Thumble/Thumbbe with ThumbLE/ThumbBE

[cpirker]

Summary

Hi All,

I renamed this because of the comment from Tim (in patch D3095#comment-5).
Please review.

Thanks,
Christian

[t.p.northover]

Hi Christian,

Thanks for doing this. The patch looks good to me.

Tim.

[cpirker]

Hi Tim,

I committed this patch as r205317.

Thanks,
Christian

[cpirker]

Hi Tim,

I added you as reviewer.
Can you please "Accepted Revision" so that I can "Close Revision"?
As you can see in the comment above, the patch is already committed (rL205317).

Thanks,
Christian

lib/Target/ARM/ARMAsmPrinter.cpp

 
 // Force static initialization.
 extern "C" void LLVMInitializeARMAsmPrinter() {
-  RegisterAsmPrinter<ARMAsmPrinter> X(TheARMleTarget);
-  RegisterAsmPrinter<ARMAsmPrinter> Y(TheARMbeTarget);
-  RegisterAsmPrinter<ARMAsmPrinter> A(TheThumbleTarget);
-  RegisterAsmPrinter<ARMAsmPrinter> B(TheThumbbeTarget);
+  RegisterAsmPrinter<ARMAsmPrinter> X(TheARMLETarget);
+  RegisterAsmPrinter<ARMAsmPrinter> Y(TheARMBETarget);
+  RegisterAsmPrinter<ARMAsmPrinter> A(TheThumbLETarget);
+  RegisterAsmPrinter<ARMAsmPrinter> B(TheThumbBETarget);
 }

lib/Target/ARM/ARMTargetMachine.h

   const DataLayout *getDataLayout() const override { return &DL; }
 };
 
-/// ARMleTargetMachine - ARM little endian target machine.
+/// ARMLETargetMachine - ARM little endian target machine.
 ///
-class ARMleTargetMachine : public ARMTargetMachine {
+class ARMLETargetMachine : public ARMTargetMachine {
   virtual void anchor();
 public:
-  ARMleTargetMachine(const Target &T, StringRef TT,
+  ARMLETargetMachine(const Target &T, StringRef TT,
                      StringRef CPU, StringRef FS, const TargetOptions &Options,
                      Reloc::Model RM, CodeModel::Model CM,
                      CodeGenOpt::Level OL);
 };
 
-/// ARMbeTargetMachine - ARM big endian target machine.
+/// ARMBETargetMachine - ARM big endian target machine.
 ///
-class ARMbeTargetMachine : public ARMTargetMachine {
+class ARMBETargetMachine : public ARMTargetMachine {
   virtual void anchor();
 public:
-  ARMbeTargetMachine(const Target &T, StringRef TT,
+  ARMBETargetMachine(const Target &T, StringRef TT,
                      StringRef CPU, StringRef FS, const TargetOptions &Options,
                      Reloc::Model RM, CodeModel::Model CM,
                      CodeGenOpt::Level OL);

   const DataLayout *getDataLayout() const override { return &DL; }
 };
 
-/// ThumbleTargetMachine - Thumb little endian target machine.
+/// ThumbLETargetMachine - Thumb little endian target machine.
 ///
-class ThumbleTargetMachine : public ThumbTargetMachine {
+class ThumbLETargetMachine : public ThumbTargetMachine {
   virtual void anchor();
 public:
-  ThumbleTargetMachine(const Target &T, StringRef TT,
+  ThumbLETargetMachine(const Target &T, StringRef TT,
                      StringRef CPU, StringRef FS, const TargetOptions &Options,
                      Reloc::Model RM, CodeModel::Model CM,
                      CodeGenOpt::Level OL);
 };
 
-/// ThumbbeTargetMachine - Thumb big endian target machine.
+/// ThumbBETargetMachine - Thumb big endian target machine.
 ///
-class ThumbbeTargetMachine : public ThumbTargetMachine {
+class ThumbBETargetMachine : public ThumbTargetMachine {
   virtual void anchor();
 public:
-  ThumbbeTargetMachine(const Target &T, StringRef TT,
+  ThumbBETargetMachine(const Target &T, StringRef TT,
                        StringRef CPU, StringRef FS, const TargetOptions &Options,
                        Reloc::Model RM, CodeModel::Model CM,
                        CodeGenOpt::Level OL);

lib/Target/ARM/ARMTargetMachine.cpp

 
 extern "C" void LLVMInitializeARMTarget() {
   // Register the target.
-  RegisterTargetMachine<ARMleTargetMachine> X(TheARMleTarget);
-  RegisterTargetMachine<ARMbeTargetMachine> Y(TheARMbeTarget);
-  RegisterTargetMachine<ThumbleTargetMachine> A(TheThumbleTarget);
-  RegisterTargetMachine<ThumbbeTargetMachine> B(TheThumbbeTarget);
+  RegisterTargetMachine<ARMLETargetMachine> X(TheARMLETarget);
+  RegisterTargetMachine<ARMBETargetMachine> Y(TheARMBETarget);
+  RegisterTargetMachine<ThumbLETargetMachine> A(TheThumbLETarget);
+  RegisterTargetMachine<ThumbBETargetMachine> B(TheThumbBETarget);
 }
 
 

                        "support ARM mode execution!");
 }
 
-void ARMleTargetMachine::anchor() { }
+void ARMLETargetMachine::anchor() { }
 
-ARMleTargetMachine::
-ARMleTargetMachine(const Target &T, StringRef TT,
+ARMLETargetMachine::
+ARMLETargetMachine(const Target &T, StringRef TT,
                        StringRef CPU, StringRef FS, const TargetOptions &Options,
                        Reloc::Model RM, CodeModel::Model CM,
                        CodeGenOpt::Level OL)
   : ARMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL, true) {}
 
-void ARMbeTargetMachine::anchor() { }
+void ARMBETargetMachine::anchor() { }
 
-ARMbeTargetMachine::
-ARMbeTargetMachine(const Target &T, StringRef TT,
+ARMBETargetMachine::
+ARMBETargetMachine(const Target &T, StringRef TT,
                        StringRef CPU, StringRef FS, const TargetOptions &Options,
                        Reloc::Model RM, CodeModel::Model CM,
                        CodeGenOpt::Level OL)

   initAsmInfo();
 }
 
-void ThumbleTargetMachine::anchor() { }
+void ThumbLETargetMachine::anchor() { }
 
-ThumbleTargetMachine::
-ThumbleTargetMachine(const Target &T, StringRef TT,
+ThumbLETargetMachine::
+ThumbLETargetMachine(const Target &T, StringRef TT,
                        StringRef CPU, StringRef FS, const TargetOptions &Options,
                        Reloc::Model RM, CodeModel::Model CM,
                        CodeGenOpt::Level OL)
   : ThumbTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL, true) {}
 
-void ThumbbeTargetMachine::anchor() { }
+void ThumbBETargetMachine::anchor() { }
 
-ThumbbeTargetMachine::
-ThumbbeTargetMachine(const Target &T, StringRef TT,
+ThumbBETargetMachine::
+ThumbBETargetMachine(const Target &T, StringRef TT,
                        StringRef CPU, StringRef FS, const TargetOptions &Options,
                        Reloc::Model RM, CodeModel::Model CM,
                        CodeGenOpt::Level OL)

lib/Target/ARM/AsmParser/ARMAsmParser.cpp

 
 /// Force static initialization.
 extern "C" void LLVMInitializeARMAsmParser() {
-  RegisterMCAsmParser<ARMAsmParser> X(TheARMleTarget);
-  RegisterMCAsmParser<ARMAsmParser> Y(TheARMbeTarget);
-  RegisterMCAsmParser<ARMAsmParser> A(TheThumbleTarget);
-  RegisterMCAsmParser<ARMAsmParser> B(TheThumbbeTarget);
+  RegisterMCAsmParser<ARMAsmParser> X(TheARMLETarget);
+  RegisterMCAsmParser<ARMAsmParser> Y(TheARMBETarget);
+  RegisterMCAsmParser<ARMAsmParser> A(TheThumbLETarget);
+  RegisterMCAsmParser<ARMAsmParser> B(TheThumbBETarget);
 }
 
 #define GET_REGISTER_MATCHER

lib/Target/ARM/Disassembler/ARMDisassembler.cpp

 
 
 extern "C" void LLVMInitializeARMDisassembler() {
-  TargetRegistry::RegisterMCDisassembler(TheARMleTarget,
+  TargetRegistry::RegisterMCDisassembler(TheARMLETarget,
                                          createARMDisassembler);
-  TargetRegistry::RegisterMCDisassembler(TheARMbeTarget,
+  TargetRegistry::RegisterMCDisassembler(TheARMBETarget,
                                          createARMDisassembler);
-  TargetRegistry::RegisterMCDisassembler(TheThumbleTarget,
+  TargetRegistry::RegisterMCDisassembler(TheThumbLETarget,
                                          createThumbDisassembler);
-  TargetRegistry::RegisterMCDisassembler(TheThumbbeTarget,
+  TargetRegistry::RegisterMCDisassembler(TheThumbBETarget,
                                          createThumbDisassembler);
 }
 

lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp

   return new ELFARMAsmBackend(T, TT, OSABI, isLittle);
 }
 
-MCAsmBackend *llvm::createARMleAsmBackend(const Target &T,
+MCAsmBackend *llvm::createARMLEAsmBackend(const Target &T,
                                           const MCRegisterInfo &MRI,
                                           StringRef TT, StringRef CPU) {
   return createARMAsmBackend(T, MRI, TT, CPU, true);
 }
 
-MCAsmBackend *llvm::createARMbeAsmBackend(const Target &T,
+MCAsmBackend *llvm::createARMBEAsmBackend(const Target &T,
                                           const MCRegisterInfo &MRI,
                                           StringRef TT, StringRef CPU) {
   return createARMAsmBackend(T, MRI, TT, CPU, false);
 }
 
-MCAsmBackend *llvm::createThumbleAsmBackend(const Target &T,
+MCAsmBackend *llvm::createThumbLEAsmBackend(const Target &T,
                                           const MCRegisterInfo &MRI,
                                           StringRef TT, StringRef CPU) {
   return createARMAsmBackend(T, MRI, TT, CPU, true);
 }
 
-MCAsmBackend *llvm::createThumbbeAsmBackend(const Target &T,
+MCAsmBackend *llvm::createThumbBEAsmBackend(const Target &T,
                                           const MCRegisterInfo &MRI,
                                           StringRef TT, StringRef CPU) {
   return createARMAsmBackend(T, MRI, TT, CPU, false);

lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp

 
 } // end anonymous namespace
 
-MCCodeEmitter *llvm::createARMleMCCodeEmitter(const MCInstrInfo &MCII,
+MCCodeEmitter *llvm::createARMLEMCCodeEmitter(const MCInstrInfo &MCII,
                                               const MCRegisterInfo &MRI,
                                               const MCSubtargetInfo &STI,
                                               MCContext &Ctx) {
   return new ARMMCCodeEmitter(MCII, Ctx, true);
 }
 
-MCCodeEmitter *llvm::createARMbeMCCodeEmitter(const MCInstrInfo &MCII,
+MCCodeEmitter *llvm::createARMBEMCCodeEmitter(const MCInstrInfo &MCII,
                                               const MCRegisterInfo &MRI,
                                               const MCSubtargetInfo &STI,
                                               MCContext &Ctx) {

lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.h

 class Target;
 class raw_ostream;
 
-extern Target TheARMleTarget, TheThumbleTarget;
-extern Target TheARMbeTarget, TheThumbbeTarget;
+extern Target TheARMLETarget, TheThumbLETarget;
+extern Target TheARMBETarget, TheThumbBETarget;
 
 namespace ARM_MC {
   std::string ParseARMTriple(StringRef TT, StringRef CPU);

                                 MCInstPrinter *InstPrint, MCCodeEmitter *CE,
                                 MCAsmBackend *TAB, bool ShowInst);
 
-MCCodeEmitter *createARMleMCCodeEmitter(const MCInstrInfo &MCII,
+MCCodeEmitter *createARMLEMCCodeEmitter(const MCInstrInfo &MCII,
                                         const MCRegisterInfo &MRI,
                                         const MCSubtargetInfo &STI,
                                         MCContext &Ctx);
 
-MCCodeEmitter *createARMbeMCCodeEmitter(const MCInstrInfo &MCII,
+MCCodeEmitter *createARMBEMCCodeEmitter(const MCInstrInfo &MCII,
                                         const MCRegisterInfo &MRI,
                                         const MCSubtargetInfo &STI,
                                         MCContext &Ctx);

                                   StringRef TT, StringRef CPU,
                                   bool IsLittleEndian);
 
-MCAsmBackend *createARMleAsmBackend(const Target &T, const MCRegisterInfo &MRI,
+MCAsmBackend *createARMLEAsmBackend(const Target &T, const MCRegisterInfo &MRI,
                                   StringRef TT, StringRef CPU);
 
-MCAsmBackend *createARMbeAsmBackend(const Target &T, const MCRegisterInfo &MRI,
+MCAsmBackend *createARMBEAsmBackend(const Target &T, const MCRegisterInfo &MRI,
                                   StringRef TT, StringRef CPU);
 
-MCAsmBackend *createThumbleAsmBackend(const Target &T, const MCRegisterInfo &MRI,
+MCAsmBackend *createThumbLEAsmBackend(const Target &T, const MCRegisterInfo &MRI,
                                       StringRef TT, StringRef CPU);
 
-MCAsmBackend *createThumbbeAsmBackend(const Target &T, const MCRegisterInfo &MRI,
+MCAsmBackend *createThumbBEAsmBackend(const Target &T, const MCRegisterInfo &MRI,
                                       StringRef TT, StringRef CPU);
 
 /// createARMELFObjectWriter - Construct an ELF Mach-O object writer.

lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp

 // Force static initialization.
 extern "C" void LLVMInitializeARMTargetMC() {
   // Register the MC asm info.
-  RegisterMCAsmInfoFn X(TheARMleTarget, createARMMCAsmInfo);
-  RegisterMCAsmInfoFn Y(TheARMbeTarget, createARMMCAsmInfo);
-  RegisterMCAsmInfoFn A(TheThumbleTarget, createARMMCAsmInfo);
-  RegisterMCAsmInfoFn B(TheThumbbeTarget, createARMMCAsmInfo);
+  RegisterMCAsmInfoFn X(TheARMLETarget, createARMMCAsmInfo);
+  RegisterMCAsmInfoFn Y(TheARMBETarget, createARMMCAsmInfo);
+  RegisterMCAsmInfoFn A(TheThumbLETarget, createARMMCAsmInfo);
+  RegisterMCAsmInfoFn B(TheThumbBETarget, createARMMCAsmInfo);
 
   // Register the MC codegen info.
-  TargetRegistry::RegisterMCCodeGenInfo(TheARMleTarget, createARMMCCodeGenInfo);
-  TargetRegistry::RegisterMCCodeGenInfo(TheARMbeTarget, createARMMCCodeGenInfo);
-  TargetRegistry::RegisterMCCodeGenInfo(TheThumbleTarget, createARMMCCodeGenInfo);
-  TargetRegistry::RegisterMCCodeGenInfo(TheThumbbeTarget, createARMMCCodeGenInfo);
+  TargetRegistry::RegisterMCCodeGenInfo(TheARMLETarget, createARMMCCodeGenInfo);
+  TargetRegistry::RegisterMCCodeGenInfo(TheARMBETarget, createARMMCCodeGenInfo);
+  TargetRegistry::RegisterMCCodeGenInfo(TheThumbLETarget, createARMMCCodeGenInfo);
+  TargetRegistry::RegisterMCCodeGenInfo(TheThumbBETarget, createARMMCCodeGenInfo);
 
   // Register the MC instruction info.
-  TargetRegistry::RegisterMCInstrInfo(TheARMleTarget, createARMMCInstrInfo);
-  TargetRegistry::RegisterMCInstrInfo(TheARMbeTarget, createARMMCInstrInfo);
-  TargetRegistry::RegisterMCInstrInfo(TheThumbleTarget, createARMMCInstrInfo);
-  TargetRegistry::RegisterMCInstrInfo(TheThumbbeTarget, createARMMCInstrInfo);
+  TargetRegistry::RegisterMCInstrInfo(TheARMLETarget, createARMMCInstrInfo);
+  TargetRegistry::RegisterMCInstrInfo(TheARMBETarget, createARMMCInstrInfo);
+  TargetRegistry::RegisterMCInstrInfo(TheThumbLETarget, createARMMCInstrInfo);
+  TargetRegistry::RegisterMCInstrInfo(TheThumbBETarget, createARMMCInstrInfo);
 
   // Register the MC register info.
-  TargetRegistry::RegisterMCRegInfo(TheARMleTarget, createARMMCRegisterInfo);
-  TargetRegistry::RegisterMCRegInfo(TheARMbeTarget, createARMMCRegisterInfo);
-  TargetRegistry::RegisterMCRegInfo(TheThumbleTarget, createARMMCRegisterInfo);
-  TargetRegistry::RegisterMCRegInfo(TheThumbbeTarget, createARMMCRegisterInfo);
+  TargetRegistry::RegisterMCRegInfo(TheARMLETarget, createARMMCRegisterInfo);
+  TargetRegistry::RegisterMCRegInfo(TheARMBETarget, createARMMCRegisterInfo);
+  TargetRegistry::RegisterMCRegInfo(TheThumbLETarget, createARMMCRegisterInfo);
+  TargetRegistry::RegisterMCRegInfo(TheThumbBETarget, createARMMCRegisterInfo);
 
   // Register the MC subtarget info.
-  TargetRegistry::RegisterMCSubtargetInfo(TheARMleTarget,
+  TargetRegistry::RegisterMCSubtargetInfo(TheARMLETarget,
                                           ARM_MC::createARMMCSubtargetInfo);
-  TargetRegistry::RegisterMCSubtargetInfo(TheARMbeTarget,
+  TargetRegistry::RegisterMCSubtargetInfo(TheARMBETarget,
                                           ARM_MC::createARMMCSubtargetInfo);
-  TargetRegistry::RegisterMCSubtargetInfo(TheThumbleTarget,
+  TargetRegistry::RegisterMCSubtargetInfo(TheThumbLETarget,
                                           ARM_MC::createARMMCSubtargetInfo);
-  TargetRegistry::RegisterMCSubtargetInfo(TheThumbbeTarget,
+  TargetRegistry::RegisterMCSubtargetInfo(TheThumbBETarget,
                                           ARM_MC::createARMMCSubtargetInfo);
 
   // Register the MC instruction analyzer.
-  TargetRegistry::RegisterMCInstrAnalysis(TheARMleTarget,
+  TargetRegistry::RegisterMCInstrAnalysis(TheARMLETarget,
                                           createARMMCInstrAnalysis);
-  TargetRegistry::RegisterMCInstrAnalysis(TheARMbeTarget,
+  TargetRegistry::RegisterMCInstrAnalysis(TheARMBETarget,
                                           createARMMCInstrAnalysis);
-  TargetRegistry::RegisterMCInstrAnalysis(TheThumbleTarget,
+  TargetRegistry::RegisterMCInstrAnalysis(TheThumbLETarget,
                                           createARMMCInstrAnalysis);
-  TargetRegistry::RegisterMCInstrAnalysis(TheThumbbeTarget,
+  TargetRegistry::RegisterMCInstrAnalysis(TheThumbBETarget,
                                           createARMMCInstrAnalysis);
 
   // Register the MC Code Emitter
-  TargetRegistry::RegisterMCCodeEmitter(TheARMleTarget,
-                                        createARMleMCCodeEmitter);
-  TargetRegistry::RegisterMCCodeEmitter(TheARMbeTarget,
-                                        createARMbeMCCodeEmitter);
-  TargetRegistry::RegisterMCCodeEmitter(TheThumbleTarget,
-                                        createARMleMCCodeEmitter);
-  TargetRegistry::RegisterMCCodeEmitter(TheThumbbeTarget,
-                                        createARMbeMCCodeEmitter);
+  TargetRegistry::RegisterMCCodeEmitter(TheARMLETarget,
+                                        createARMLEMCCodeEmitter);
+  TargetRegistry::RegisterMCCodeEmitter(TheARMBETarget,
+                                        createARMBEMCCodeEmitter);
+  TargetRegistry::RegisterMCCodeEmitter(TheThumbLETarget,
+                                        createARMLEMCCodeEmitter);
+  TargetRegistry::RegisterMCCodeEmitter(TheThumbBETarget,
+                                        createARMBEMCCodeEmitter);
 
   // Register the asm backend.
-  TargetRegistry::RegisterMCAsmBackend(TheARMleTarget, createARMleAsmBackend);
-  TargetRegistry::RegisterMCAsmBackend(TheARMbeTarget, createARMbeAsmBackend);
-  TargetRegistry::RegisterMCAsmBackend(TheThumbleTarget,
-                                       createThumbleAsmBackend);
-  TargetRegistry::RegisterMCAsmBackend(TheThumbbeTarget,
-                                       createThumbbeAsmBackend);
+  TargetRegistry::RegisterMCAsmBackend(TheARMLETarget, createARMLEAsmBackend);
+  TargetRegistry::RegisterMCAsmBackend(TheARMBETarget, createARMBEAsmBackend);
+  TargetRegistry::RegisterMCAsmBackend(TheThumbLETarget,
+                                       createThumbLEAsmBackend);
+  TargetRegistry::RegisterMCAsmBackend(TheThumbBETarget,
+                                       createThumbBEAsmBackend);
 
   // Register the object streamer.
-  TargetRegistry::RegisterMCObjectStreamer(TheARMleTarget, createMCStreamer);
-  TargetRegistry::RegisterMCObjectStreamer(TheARMbeTarget, createMCStreamer);
-  TargetRegistry::RegisterMCObjectStreamer(TheThumbleTarget, createMCStreamer);
-  TargetRegistry::RegisterMCObjectStreamer(TheThumbbeTarget, createMCStreamer);
+  TargetRegistry::RegisterMCObjectStreamer(TheARMLETarget, createMCStreamer);
+  TargetRegistry::RegisterMCObjectStreamer(TheARMBETarget, createMCStreamer);
+  TargetRegistry::RegisterMCObjectStreamer(TheThumbLETarget, createMCStreamer);
+  TargetRegistry::RegisterMCObjectStreamer(TheThumbBETarget, createMCStreamer);
 
   // Register the asm streamer.
-  TargetRegistry::RegisterAsmStreamer(TheARMleTarget, createMCAsmStreamer);
-  TargetRegistry::RegisterAsmStreamer(TheARMbeTarget, createMCAsmStreamer);
-  TargetRegistry::RegisterAsmStreamer(TheThumbleTarget, createMCAsmStreamer);
-  TargetRegistry::RegisterAsmStreamer(TheThumbbeTarget, createMCAsmStreamer);
+  TargetRegistry::RegisterAsmStreamer(TheARMLETarget, createMCAsmStreamer);
+  TargetRegistry::RegisterAsmStreamer(TheARMBETarget, createMCAsmStreamer);
+  TargetRegistry::RegisterAsmStreamer(TheThumbLETarget, createMCAsmStreamer);
+  TargetRegistry::RegisterAsmStreamer(TheThumbBETarget, createMCAsmStreamer);
 
   // Register the MCInstPrinter.
-  TargetRegistry::RegisterMCInstPrinter(TheARMleTarget, createARMMCInstPrinter);
-  TargetRegistry::RegisterMCInstPrinter(TheARMbeTarget, createARMMCInstPrinter);
-  TargetRegistry::RegisterMCInstPrinter(TheThumbleTarget,
+  TargetRegistry::RegisterMCInstPrinter(TheARMLETarget, createARMMCInstPrinter);
+  TargetRegistry::RegisterMCInstPrinter(TheARMBETarget, createARMMCInstPrinter);
+  TargetRegistry::RegisterMCInstPrinter(TheThumbLETarget,
                                         createARMMCInstPrinter);
-  TargetRegistry::RegisterMCInstPrinter(TheThumbbeTarget,
+  TargetRegistry::RegisterMCInstPrinter(TheThumbBETarget,
                                         createARMMCInstPrinter);
 
   // Register the MC relocation info.
-  TargetRegistry::RegisterMCRelocationInfo(TheARMleTarget,
+  TargetRegistry::RegisterMCRelocationInfo(TheARMLETarget,
                                            createARMMCRelocationInfo);
-  TargetRegistry::RegisterMCRelocationInfo(TheARMbeTarget,
+  TargetRegistry::RegisterMCRelocationInfo(TheARMBETarget,
                                            createARMMCRelocationInfo);
-  TargetRegistry::RegisterMCRelocationInfo(TheThumbleTarget,
+  TargetRegistry::RegisterMCRelocationInfo(TheThumbLETarget,
                                            createARMMCRelocationInfo);
-  TargetRegistry::RegisterMCRelocationInfo(TheThumbbeTarget,
+  TargetRegistry::RegisterMCRelocationInfo(TheThumbBETarget,
                                            createARMMCRelocationInfo);
 }

lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp

 #include "llvm/Support/TargetRegistry.h"
 using namespace llvm;
 
-Target llvm::TheARMleTarget,   llvm::TheARMbeTarget;
-Target llvm::TheThumbleTarget, llvm::TheThumbbeTarget;
+Target llvm::TheARMLETarget,   llvm::TheARMBETarget;
+Target llvm::TheThumbLETarget, llvm::TheThumbBETarget;
 
 extern "C" void LLVMInitializeARMTargetInfo() { 
   RegisterTarget<Triple::arm, /*HasJIT=*/true>
-    X(TheARMleTarget, "arm", "ARM");
+    X(TheARMLETarget, "arm", "ARM");
   RegisterTarget<Triple::armeb, /*HasJIT=*/true>
-    Y(TheARMbeTarget, "armeb", "ARM (big endian)");
+    Y(TheARMBETarget, "armeb", "ARM (big endian)");
 
   RegisterTarget<Triple::thumb, /*HasJIT=*/true>
-    A(TheThumbleTarget, "thumb", "Thumb");
+    A(TheThumbLETarget, "thumb", "Thumb");
   RegisterTarget<Triple::thumbeb, /*HasJIT=*/true>
-    B(TheThumbbeTarget, "thumbeb", "Thumb (big endian)");
+    B(TheThumbBETarget, "thumbeb", "Thumb (big endian)");
 }