[mips] Remove trivial header for the MipsOs16 pass. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@232258 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/Mips/Mips.h

@@ -20,8 +20,11 @@
 
 namespace llvm {
   class MipsTargetMachine;
+  class ModulePass;
   class FunctionPass;
 
+  ModulePass *createMipsOs16Pass(MipsTargetMachine &TM);
+
   FunctionPass *createMipsOptimizePICCallPass(MipsTargetMachine &TM);
   FunctionPass *createMipsDelaySlotFillerPass(MipsTargetMachine &TM);
   FunctionPass *createMipsLongBranchPass(MipsTargetMachine &TM);

lib/Target/Mips/MipsOs16.cpp

@@ -11,12 +11,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "MipsOs16.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
-#include "llvm/Support/raw_ostream.h"
+#include "Mips.h"
+
 using namespace llvm;
 
 #define DEBUG_TYPE "mips-os16"
@@ -28,12 +28,27 @@ static cl::opt<std::string> Mips32FunctionMask(
   cl::Hidden);
 
 namespace {
+  class MipsOs16 : public ModulePass {
+  public:
+    static char ID;
+
+    MipsOs16() : ModulePass(ID) {}
+
+    const char *getPassName() const override {
+      return "MIPS Os16 Optimization";
+    }
+
+    bool runOnModule(Module &M) override;
+  };
+
+  char MipsOs16::ID = 0;
+}
 
 // Figure out if we need float point based on the function signature.
 // We need to move variables in and/or out of floating point
 // registers because of the ABI
 //
-  bool needsFPFromSig(Function &F) {
+static  bool needsFPFromSig(Function &F) {
   Type* RetType = F.getReturnType();
   switch (RetType->getTypeID()) {
   case Type::FloatTyID:
@@ -57,7 +72,7 @@ namespace {
 
 // Figure out if the function will need floating point operations
 //
-  bool needsFP(Function &F) {
+static bool needsFP(Function &F) {
   if (needsFPFromSig(F))
     return true;
   for (Function::const_iterator BB = F.begin(), E = F.end(); BB != E; ++BB)
@@ -90,20 +105,7 @@ namespace {
     }
   return false;
 }
-}
 
-namespace {
-
-class MipsOs16 : public ModulePass {
-public:
-  static char ID;
-
-  MipsOs16() : ModulePass(ID) {}
-
-  const char *getPassName() const override { return "MIPS Os16 Optimization"; }
-  bool runOnModule(Module &M) override;
-};
-} // namespace
 
 bool MipsOs16::runOnModule(Module &M) {
   bool usingMask = Mips32FunctionMask.length() > 0;
@@ -148,8 +150,6 @@ bool MipsOs16::runOnModule(Module &M) {
   return modified;
 }
 
-char MipsOs16::ID = 0;
+ModulePass *llvm::createMipsOs16Pass(MipsTargetMachine &TM) {
-
-ModulePass *llvm::createMipsOs16(MipsTargetMachine &TM) {
   return new MipsOs16;
 }

lib/Target/Mips/MipsOs16.h

@@ -1,24 +0,0 @@
-//===---- MipsOs16.h for Mips Option -Os16                         --------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines an optimization phase for the MIPS target.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_MIPS_MIPSOS16_H
-#define LLVM_LIB_TARGET_MIPS_MIPSOS16_H
-
-namespace llvm {
-class MipsTargetMachine;
-class ModulePass;
-
-ModulePass *createMipsOs16(MipsTargetMachine &TM);
-}
-
-#endif

lib/Target/Mips/MipsTargetMachine.cpp

@@ -21,7 +21,6 @@
 #include "MipsFrameLowering.h"
 #include "MipsInstrInfo.h"
 #include "MipsModuleISelDAGToDAG.h"
-#include "MipsOs16.h"
 #include "MipsSEFrameLowering.h"
 #include "MipsSEISelDAGToDAG.h"
 #include "MipsSEISelLowering.h"
@@ -34,6 +33,7 @@
 #include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Transforms/Scalar.h"
+
 using namespace llvm;
 
 #define DEBUG_TYPE "mips"
@@ -213,7 +213,7 @@ void MipsPassConfig::addIRPasses() {
   TargetPassConfig::addIRPasses();
   addPass(createAtomicExpandPass(&getMipsTargetMachine()));
   if (getMipsSubtarget().os16())
-    addPass(createMipsOs16(getMipsTargetMachine()));
+    addPass(createMipsOs16Pass(getMipsTargetMachine()));
   if (getMipsSubtarget().inMips16HardFloat())
     addPass(createMips16HardFloat(getMipsTargetMachine()));
 }