From: Peter Collingbourne <peter@pcc.me.uk>
Date: Tue, 15 May 2018 20:21:58 +0000 (+0000)
Subject: Nios2: Unbreak build.
X-Git-Tag: llvmorg-7.0.0-rc1~5960
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28d4ddab860d47bcf4e2d3057d9d52ed57843bbb;p=platform%2Fupstream%2Fllvm.git

Nios2: Unbreak build.

llvm-svn: 332391
---

diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2AsmBackend.cpp b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2AsmBackend.cpp
index 3971630..52fd344 100644
--- a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2AsmBackend.cpp
+++ b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2AsmBackend.cpp
@@ -19,6 +19,7 @@
 #include "llvm/MC/MCELFObjectWriter.h"
 #include "llvm/MC/MCFixupKindInfo.h"
 #include "llvm/MC/MCObjectWriter.h"
+#include "llvm/MC/MCSubtargetInfo.h"
 
 using namespace llvm;
 
@@ -123,9 +124,8 @@ bool Nios2AsmBackend::writeNopData(uint64_t Count, MCObjectWriter *OW) const {
 
 // MCAsmBackend
 MCAsmBackend *llvm::createNios2AsmBackend(const Target &T,
+                                          const MCSubtargetInfo &STI,
                                           const MCRegisterInfo &MRI,
-                                          const Triple &TT, StringRef CPU,
                                           const MCTargetOptions &Options) {
-
-  return new Nios2AsmBackend(T, TT.getOS());
+  return new Nios2AsmBackend(T, STI.getTargetTriple().getOS());
 }
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCTargetDesc.h b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCTargetDesc.h
index d918a06..e5fec96 100644
--- a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCTargetDesc.h
+++ b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCTargetDesc.h
@@ -20,6 +20,7 @@ namespace llvm {
 class MCAsmBackend;
 class MCObjectWriter;
 class MCRegisterInfo;
+class MCSubtargetInfo;
 class MCTargetOptions;
 class Target;
 class Triple;
@@ -28,8 +29,8 @@ class raw_pwrite_stream;
 
 Target &getTheNios2Target();
 
-MCAsmBackend *createNios2AsmBackend(const Target &T, const MCRegisterInfo &MRI,
-                                    const Triple &TT, StringRef CPU,
+MCAsmBackend *createNios2AsmBackend(const Target &T, const MCSubtargetInfo &STI,
+                                    const MCRegisterInfo &MRI,
                                     const MCTargetOptions &Options);
 
 std::unique_ptr<MCObjectWriter>