diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2AsmBackend.cpp b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2AsmBackend.cpp
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2AsmBackend.h b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2AsmBackend.h
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2BaseInfo.h b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2BaseInfo.h
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2ELFObjectWriter.cpp b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2ELFObjectWriter.cpp
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2FixupKinds.h b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2FixupKinds.h
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCAsmInfo.cpp b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCAsmInfo.cpp
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCAsmInfo.h b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCAsmInfo.h
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCExpr.cpp b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCExpr.cpp
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCExpr.h b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCExpr.h
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCTargetDesc.cpp b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCTargetDesc.cpp
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCTargetDesc.h b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2MCTargetDesc.h
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2TargetStreamer.cpp b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2TargetStreamer.cpp
diff --git a/llvm/lib/Target/Nios2/Nios2.h b/llvm/lib/Target/Nios2/Nios2.h
diff --git a/llvm/lib/Target/Nios2/Nios2.td b/llvm/lib/Target/Nios2/Nios2.td
diff --git a/llvm/lib/Target/Nios2/Nios2AsmPrinter.cpp b/llvm/lib/Target/Nios2/Nios2AsmPrinter.cpp
diff --git a/llvm/lib/Target/Nios2/Nios2CallingConv.td b/llvm/lib/Target/Nios2/Nios2CallingConv.td
diff --git a/llvm/lib/Target/Nios2/Nios2FrameLowering.cpp b/llvm/lib/Target/Nios2/Nios2FrameLowering.cpp
diff --git a/llvm/lib/Target/Nios2/Nios2FrameLowering.h b/llvm/lib/Target/Nios2/Nios2FrameLowering.h
diff --git a/llvm/lib/Target/Nios2/Nios2ISelDAGToDAG.cpp b/llvm/lib/Target/Nios2/Nios2ISelDAGToDAG.cpp
diff --git a/llvm/lib/Target/Nios2/Nios2ISelLowering.cpp b/llvm/lib/Target/Nios2/Nios2ISelLowering.cpp
diff --git a/llvm/lib/Target/Nios2/Nios2ISelLowering.h b/llvm/lib/Target/Nios2/Nios2ISelLowering.h
diff --git a/llvm/lib/Target/Nios2/Nios2InstrFormats.td b/llvm/lib/Target/Nios2/Nios2InstrFormats.td
diff --git a/llvm/lib/Target/Nios2/Nios2InstrInfo.cpp b/llvm/lib/Target/Nios2/Nios2InstrInfo.cpp
diff --git a/llvm/lib/Target/Nios2/Nios2InstrInfo.h b/llvm/lib/Target/Nios2/Nios2InstrInfo.h
diff --git a/llvm/lib/Target/Nios2/Nios2InstrInfo.td b/llvm/lib/Target/Nios2/Nios2InstrInfo.td
diff --git a/llvm/lib/Target/Nios2/Nios2MCInstLower.cpp b/llvm/lib/Target/Nios2/Nios2MCInstLower.cpp
diff --git a/llvm/lib/Target/Nios2/Nios2MachineFunction.cpp b/llvm/lib/Target/Nios2/Nios2MachineFunction.cpp
diff --git a/llvm/lib/Target/Nios2/Nios2MachineFunction.h b/llvm/lib/Target/Nios2/Nios2MachineFunction.h
diff --git a/llvm/lib/Target/Nios2/Nios2RegisterInfo.cpp b/llvm/lib/Target/Nios2/Nios2RegisterInfo.cpp
diff --git a/llvm/lib/Target/Nios2/Nios2RegisterInfo.h b/llvm/lib/Target/Nios2/Nios2RegisterInfo.h
diff --git a/llvm/lib/Target/Nios2/Nios2RegisterInfo.td b/llvm/lib/Target/Nios2/Nios2RegisterInfo.td
diff --git a/llvm/lib/Target/Nios2/Nios2Schedule.td b/llvm/lib/Target/Nios2/Nios2Schedule.td
diff --git a/llvm/lib/Target/Nios2/Nios2Subtarget.cpp b/llvm/lib/Target/Nios2/Nios2Subtarget.cpp
diff --git a/llvm/lib/Target/Nios2/Nios2Subtarget.h b/llvm/lib/Target/Nios2/Nios2Subtarget.h
diff --git a/llvm/lib/Target/Nios2/Nios2TargetMachine.cpp b/llvm/lib/Target/Nios2/Nios2TargetMachine.cpp
diff --git a/llvm/lib/Target/Nios2/Nios2TargetMachine.h b/llvm/lib/Target/Nios2/Nios2TargetMachine.h
diff --git a/llvm/lib/Target/Nios2/Nios2TargetObjectFile.cpp b/llvm/lib/Target/Nios2/Nios2TargetObjectFile.cpp
diff --git a/llvm/lib/Target/Nios2/Nios2TargetObjectFile.h b/llvm/lib/Target/Nios2/Nios2TargetObjectFile.h
diff --git a/llvm/lib/Target/Nios2/Nios2TargetStreamer.h b/llvm/lib/Target/Nios2/Nios2TargetStreamer.h
diff --git a/llvm/lib/Target/Nios2/TargetInfo/CMakeLists.txt b/llvm/lib/Target/Nios2/TargetInfo/CMakeLists.txt
diff --git a/llvm/lib/Target/Nios2/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/Nios2/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/Nios2/TargetInfo/Nios2TargetInfo.cpp b/llvm/lib/Target/Nios2/TargetInfo/Nios2TargetInfo.cpp
diff --git a/llvm/test/CodeGen/Nios2/add-sub.ll b/llvm/test/CodeGen/Nios2/add-sub.ll
diff --git a/llvm/test/CodeGen/Nios2/lit.local.cfg b/llvm/test/CodeGen/Nios2/lit.local.cfg
diff --git a/llvm/test/CodeGen/Nios2/mul-div.ll b/llvm/test/CodeGen/Nios2/mul-div.ll
diff --git a/llvm/test/CodeGen/Nios2/proc_support.ll b/llvm/test/CodeGen/Nios2/proc_support.ll
diff --git a/llvm/test/CodeGen/Nios2/ret_generated.ll b/llvm/test/CodeGen/Nios2/ret_generated.ll
diff --git a/llvm/test/CodeGen/Nios2/shift-rotate.ll b/llvm/test/CodeGen/Nios2/shift-rotate.ll
diff --git a/llvm/test/CodeGen/Nios2/target_support.ll b/llvm/test/CodeGen/Nios2/target_support.ll
diff --git a/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
@@ -58,7 +58,6 @@ static_library("Basic") {
     "Targets/MSP430.cpp",
     "Targets/Mips.cpp",
     "Targets/NVPTX.cpp",
-    "Targets/Nios2.cpp",
     "Targets/OSTargets.cpp",
     "Targets/PNaCl.cpp",
     "Targets/PPC.cpp",