[M68k] Make M68k TargetMachine use getter function

[ricky26]

Summary

This makes M68k match other platforms in this regard.

This was done as part of the AsmParser/Disassembler work since the entry functions of those modules usually reference getTheXXXTarget().

[ricky26]

Appease clang-tidy

[RKSimon]

llvm/lib/Target/M68k/MCTargetDesc/M68kMCTargetDesc.cpp

15

Interestingly X86MCTargetDesc.cpp doesn't need the "../" - are we missing an include path somewhere?

[ricky26]

Remove unecessary ../ from include

[ricky26]

llvm/lib/Target/M68k/MCTargetDesc/M68kMCTargetDesc.cpp

15

It looks like I'd done that myself unnecessarily. It compiles without the "../".

[RKSimon]

LGTM - cheers

[myhsu]

LGTM, thanks

llvm/lib/Target/M68k/M68kAsmPrinter.cpp

 //===----------------------------------------------------------------------===//
 
 // TODO Conform to Motorola ASM syntax
 
 #include "M68kAsmPrinter.h"
 
 #include "M68k.h"
 #include "M68kMachineFunction.h"
+#include "TargetInfo/M68kTargetInfo.h"
 
 #include "llvm/Support/TargetRegistry.h"
 
 using namespace llvm;
 
 #define DEBUG_TYPE "m68k-asm-printer"
 
 bool M68kAsmPrinter::runOnMachineFunction(MachineFunction &MF) {

 
 void M68kAsmPrinter::emitStartOfAsmFile(Module &M) {
   OutStreamer->emitSyntaxDirective();
 }
 
 void M68kAsmPrinter::emitEndOfAsmFile(Module &M) {}
 
 extern "C" void LLVMInitializeM68kAsmPrinter() {
-  RegisterAsmPrinter<M68kAsmPrinter> X(TheM68kTarget);
+  RegisterAsmPrinter<M68kAsmPrinter> X(getTheM68kTarget());
 }

llvm/lib/Target/M68k/M68kTargetMachine.cpp

 //===-- M68kTargetMachine.cpp - M68k target machine ---------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// This file contains implementation for M68k target machine.
 ///
 //===----------------------------------------------------------------------===//
 
 #include "M68kTargetMachine.h"
 #include "M68k.h"
+#include "TargetInfo/M68kTargetInfo.h"
 
 #include "M68kSubtarget.h"
 #include "M68kTargetObjectFile.h"
 
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/CodeGen/TargetPassConfig.h"
 #include "llvm/IR/LegacyPassManager.h"
 #include "llvm/Support/TargetRegistry.h"
 #include <memory>
 
 using namespace llvm;
 
 #define DEBUG_TYPE "m68k"
 
 extern "C" void LLVMInitializeM68kTarget() {
-  RegisterTargetMachine<M68kTargetMachine> X(TheM68kTarget);
+  RegisterTargetMachine<M68kTargetMachine> X(getTheM68kTarget());
 }
 
 namespace {
 
 std::string computeDataLayout(const Triple &TT, StringRef CPU,
                               const TargetOptions &Options) {
   std::string Ret = "";
   // M68k is Big Endian

llvm/lib/Target/M68k/MCTargetDesc/M68kMCTargetDesc.h

 class MCRelocationInfo;
 class MCTargetOptions;
 class Target;
 class Triple;
 class StringRef;
 class raw_ostream;
 class raw_pwrite_stream;
 
-extern Target TheM68kTarget;
-
 MCAsmBackend *createM68kAsmBackend(const Target &T, const MCSubtargetInfo &STI,
                                    const MCRegisterInfo &MRI,
                                    const MCTargetOptions &Options);
 
 MCCodeEmitter *createM68kMCCodeEmitter(const MCInstrInfo &MCII,
                                        const MCRegisterInfo &MRI,
                                        MCContext &Ctx);
 
 /// Construct an M68k ELF object writer.
 std::unique_ptr<MCObjectTargetWriter> createM68kELFObjectWriter(uint8_t OSABI);
 
 } // namespace llvm
 
 // Defines symbolic names for M68k registers. This defines a mapping from
 // register name to register number.
 #define GET_REGINFO_ENUM
 #include "M68kGenRegisterInfo.inc"
 
 // Defines symbolic names for the M68k instructions.
 #define GET_INSTRINFO_ENUM
 #include "M68kGenInstrInfo.inc"
 
 #define GET_SUBTARGETINFO_ENUM
 #include "M68kGenSubtargetInfo.inc"
 
 #endif

llvm/lib/Target/M68k/MCTargetDesc/M68kMCTargetDesc.cpp

 //===-- M68kMCTargetDesc.cpp - M68k Target Descriptions -----*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// This file provides M68k target specific descriptions.
 ///
 //===----------------------------------------------------------------------===//
 
 #include "M68kMCTargetDesc.h"
-
-#include "M68kMCAsmInfo.h"
-
+#include "../TargetInfo/M68kTargetInfo.h"
 #include "M68kInstPrinter.h"
+#include "M68kMCAsmInfo.h"
 
 #include "llvm/MC/MCELFStreamer.h"
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCInstrInfo.h"
 #include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/MC/MachineLocation.h"
static MCInstPrinter *createM68kMCInstPrinter(const Triple &T,
                                               unsigned SyntaxVariant,
                                               const MCAsmInfo &MAI,
                                               const MCInstrInfo &MII,
                                               const MCRegisterInfo &MRI) {
   return new M68kInstPrinter(MAI, MII, MRI);
 }
 
 extern "C" void LLVMInitializeM68kTargetMC() {
-  Target &T = TheM68kTarget;
+  Target &T = getTheM68kTarget();
 
   // Register the MC asm info.
   RegisterMCAsmInfoFn X(T, createM68kMCAsmInfo);
 
   // Register the MC instruction info.
   TargetRegistry::RegisterMCInstrInfo(T, createM68kMCInstrInfo);
 
   // Register the MC register info.

llvm/lib/Target/M68k/TargetInfo/M68kTargetInfo.h

+//===-- M68kTargetInfo.h - M68k Target Implementation -----------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_M68K_TARGETINFO_M68KTARGETINFO_H
+#define LLVM_LIB_TARGET_M68K_TARGETINFO_M68KTARGETINFO_H
+
+namespace llvm {
+class Target;
+
+Target &getTheM68kTarget();
+} // namespace llvm
+
+#endif // LLVM_LIB_TARGET_M68K_TARGETINFO_M68KTARGETINFO_H

llvm/lib/Target/M68k/TargetInfo/M68kTargetInfo.cpp

 //===-- M68kTargetInfo.cpp - M68k Target Implementation -----*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// This file contains M68k target initializer.
 ///
 //===----------------------------------------------------------------------===//
-#include "MCTargetDesc/M68kMCTargetDesc.h"
 #include "llvm/Support/TargetRegistry.h"
 
 using namespace llvm;
 
-Target llvm::TheM68kTarget;
+namespace llvm {
+Target &getTheM68kTarget() {
+  static Target TheM68kTarget;
+  return TheM68kTarget;
+}
+} // namespace llvm
 
 extern "C" void LLVMInitializeM68kTargetInfo() {
   RegisterTarget<Triple::m68k, /*HasJIT=*/true> X(
-      TheM68kTarget, "m68k", "Motorola 68000 family", "M68k");
+      getTheM68kTarget(), "m68k", "Motorola 68000 family", "M68k");
 }