Index: lib/Target/Nios2/CMakeLists.txt
===================================================================
--- lib/Target/Nios2/CMakeLists.txt
+++ lib/Target/Nios2/CMakeLists.txt
@@ -17,9 +17,9 @@
 #Nios2CodeGen should match with LLVMBuild.txt Nios2CodeGen
 add_llvm_target(Nios2CodeGen
  Nios2AsmPrinter.cpp
+ Nios2FrameLowering.cpp
  Nios2InstrInfo.cpp
  Nios2ISelDAGToDAG.cpp
- Nios2FrameLowering.cpp
  Nios2ISelLowering.cpp
  Nios2MachineFunction.cpp
  Nios2MCInstLower.cpp
Index: lib/Target/Nios2/InstPrinter/Nios2InstPrinter.cpp
===================================================================
--- lib/Target/Nios2/InstPrinter/Nios2InstPrinter.cpp
+++ lib/Target/Nios2/InstPrinter/Nios2InstPrinter.cpp
@@ -26,7 +26,7 @@
 #include "Nios2GenAsmWriter.inc"
 
 void Nios2InstPrinter::printRegName(raw_ostream &OS, unsigned RegNo) const {
-  OS << StringRef(getRegisterName(RegNo)).lower();
+  OS << getRegisterName(RegNo);
 }
 
 void Nios2InstPrinter::printInst(const MCInst *MI, raw_ostream &O,
Index: lib/Target/Nios2/MCTargetDesc/CMakeLists.txt
===================================================================
--- lib/Target/Nios2/MCTargetDesc/CMakeLists.txt
+++ lib/Target/Nios2/MCTargetDesc/CMakeLists.txt
@@ -1,4 +1,9 @@
 #MCTargetDesc / CMakeLists.txt
-add_llvm_library(LLVMNios2Desc Nios2MCTargetDesc.cpp Nios2MCExpr.cpp
-                 Nios2MCAsmInfo.cpp Nios2TargetStreamer.cpp Nios2AsmBackend.cpp
-                 Nios2ELFObjectWriter.cpp)
+add_llvm_library(LLVMNios2Desc
+                 Nios2AsmBackend.cpp
+                 Nios2ELFObjectWriter.cpp
+                 Nios2MCAsmInfo.cpp
+                 Nios2MCExpr.cpp
+                 Nios2MCTargetDesc.cpp
+                 Nios2TargetStreamer.cpp
+                 )
Index: lib/Target/Nios2/MCTargetDesc/Nios2MCTargetDesc.cpp
===================================================================
--- lib/Target/Nios2/MCTargetDesc/Nios2MCTargetDesc.cpp
+++ lib/Target/Nios2/MCTargetDesc/Nios2MCTargetDesc.cpp
@@ -45,26 +45,11 @@
 
 static MCSubtargetInfo *
 createNios2MCSubtargetInfo(const Triple &TT, StringRef CPU, StringRef FS) {
-  std::string ArchFS;
   if (CPU.empty() || CPU == "generic") {
-    if (TT.getArch() == Triple::nios2) {
-      if (CPU.empty() || CPU == "nios2r2") {
-        ArchFS = "+nios2r2";
-      } else {
-        if (CPU == "nios2r1") {
-          ArchFS = "+nios2r1";
-        }
-      }
-    }
+    CPU == "nios2r1";
   }
 
-  if (!FS.empty()) {
-    if (!ArchFS.empty())
-      ArchFS = ArchFS + "," + FS.str();
-    else
-      ArchFS = FS;
-  }
-  return createNios2MCSubtargetInfoImpl(TT, CPU, ArchFS);
+  return createNios2MCSubtargetInfoImpl(TT, CPU, FS);
   // createNios2MCSubtargetInfoImpl defined in Nios2GenSubtargetInfo.inc
 }