From 9c146470290a51fa599faeca9d81f177df2e9de8 Mon Sep 17 00:00:00 2001
From: Zangetsu38 <Dante38@free.fr>
Date: Wed, 5 Jul 2017 01:27:16 +0200
Subject: [PATCH] Update LLVM 5.0

---
 .gitmodules                      | 1 -
 llvm                             | 2 +-
 rpcs3/Emu/Cell/Modules/sceNp.cpp | 6 +++++-
 rpcs3_llvm.props                 | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 25a8f750b6..1cec3a9553 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,7 +8,6 @@
 [submodule "llvm"]
 	path = llvm
 	url = https://github.com/llvm-mirror/llvm
-	branch = release_40
 [submodule "rsx_program_decompiler"]
 	path = rsx_program_decompiler
 	url = https://github.com/RPCS3/rsx_program_decompiler
diff --git a/llvm b/llvm
index 4423e35117..6c560b5efb 160000
--- a/llvm
+++ b/llvm
@@ -1 +1 @@
-Subproject commit 4423e351176a92975739dd4ea43c2ff5877236ae
+Subproject commit 6c560b5efb48e5d0315298780852795ea69fdd19
diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp
index 981b957932..8f994d7f7e 100644
--- a/rpcs3/Emu/Cell/Modules/sceNp.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 
@@ -911,6 +911,10 @@ s32 sceNpManagerRegisterCallback(vm::ptr<SceNpManagerCallback> callback, vm::ptr
 	{
 		return SCE_NP_ERROR_INVALID_ARGUMENT;
 	}
+	else
+	{
+		return SCE_NP_ERROR_NOT_INITIALIZED;
+	}
 
 	return CELL_OK;
 }
diff --git a/rpcs3_llvm.props b/rpcs3_llvm.props
index 9e95717589..1e62b9ab6b 100644
--- a/rpcs3_llvm.props
+++ b/rpcs3_llvm.props
@@ -10,7 +10,7 @@
     <Lib>
       <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Debug - LLVM'">..\llvm_build\Debug\lib</AdditionalLibraryDirectories>
       <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Release - LLVM'">..\llvm_build\Release\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>LLVMProfileData.lib;LLVMDebugInfoCodeView.lib;LLVMDebugInfoMSF.lib;LLVMInstrumentation.lib;LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMVectorize.lib;LLVMX86CodeGen.lib;LLVMGlobalISel.lib;LLVMX86Disassembler.lib;LLVMExecutionEngine.lib;LLVMAsmPrinter.lib;LLVMSelectionDAG.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMX86Desc.lib;LLVMX86AsmPrinter.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMCore.lib;LLVMX86Utils.lib;LLVMMC.lib;LLVMX86Info.lib;LLVMSupport.lib;LLVMMCDisassembler.lib;LLVMipo.lib</AdditionalDependencies>
+      <AdditionalDependencies>LLVMProfileData.lib;LLVMDebugInfoCodeView.lib;LLVMDebugInfoMSF.lib;LLVMInstrumentation.lib;LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMVectorize.lib;LLVMX86CodeGen.lib;LLVMGlobalISel.lib;LLVMX86Disassembler.lib;LLVMExecutionEngine.lib;LLVMAsmPrinter.lib;LLVMSelectionDAG.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMX86Desc.lib;LLVMX86AsmPrinter.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMCore.lib;LLVMX86Utils.lib;LLVMMC.lib;LLVMX86Info.lib;LLVMSupport.lib;LLVMMCDisassembler.lib;LLVMipo.lib;LLVMBinaryFormat.lib</AdditionalDependencies>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup />