From 23e8cfeb68e6b8b62f86c308981afbf3ba0787af Mon Sep 17 00:00:00 2001
From: Inori <bingkan@outlook.com>
Date: Tue, 20 Jun 2023 21:24:59 +0800
Subject: [PATCH] support vs2022 and llvm 16.0.6

---
 3rdParty/boost/boost/predef/hardware/simd/arm.h | 2 +-
 3rdParty/boost/boost/predef/hardware/simd/x86.h | 2 +-
 3rdParty/tinydbr/tinydbr.cpp                    | 3 +--
 GPCS4/SceModules/SceLibc/sce_libc.cpp           | 4 ++--
 GPCS4/SceModules/SceLibc/sce_libc.h             | 4 ++--
 GPCS4/SceModules/SceLibc/sce_libc_export.cpp    | 4 ++--
 Misc/Directory.build.props                      | 2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/3rdParty/boost/boost/predef/hardware/simd/arm.h b/3rdParty/boost/boost/predef/hardware/simd/arm.h
index 24e4c1b0..eec5d1c3 100644
--- a/3rdParty/boost/boost/predef/hardware/simd/arm.h
+++ b/3rdParty/boost/boost/predef/hardware/simd/arm.h
@@ -10,7 +10,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 #define BOOST_PREDEF_HARDWARE_SIMD_ARM_H
 
 #include <boost/predef/version_number.h>
-#include <boost/predef/hardware/simd/arm/versions.h>
+//#include <boost/predef/hardware/simd/arm/versions.h>
 
 /* tag::reference[]
 = `BOOST_HW_SIMD_ARM`
diff --git a/3rdParty/boost/boost/predef/hardware/simd/x86.h b/3rdParty/boost/boost/predef/hardware/simd/x86.h
index 6c9a0fb8..dc4cdcee 100644
--- a/3rdParty/boost/boost/predef/hardware/simd/x86.h
+++ b/3rdParty/boost/boost/predef/hardware/simd/x86.h
@@ -10,7 +10,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 #define BOOST_PREDEF_HARDWARE_SIMD_X86_H
 
 #include <boost/predef/version_number.h>
-#include <boost/predef/hardware/simd/x86/versions.h>
+//#include <boost/predef/hardware/simd/x86/versions.h>
 
 /* tag::reference[]
 = `BOOST_HW_SIMD_X86`
diff --git a/3rdParty/tinydbr/tinydbr.cpp b/3rdParty/tinydbr/tinydbr.cpp
index a44858d6..c465fc36 100644
--- a/3rdParty/tinydbr/tinydbr.cpp
+++ b/3rdParty/tinydbr/tinydbr.cpp
@@ -22,7 +22,6 @@ limitations under the License.
 #include <list>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdatomic.h>
 
 
 #ifdef ARM64
@@ -234,7 +233,7 @@ void TinyDBR::CommitValueAtomicT(ModuleInfo* module, size_t start_offset)
 	}
 
 #ifdef __clang__
-	__c11_atomic_store(ptr, value, memory_order_relaxed);
+	__c11_atomic_store(ptr, value, std::memory_order_relaxed);
 #else
 	// x86 machine aligned memory store should be atomic natively.
 	*ptr = value;
diff --git a/GPCS4/SceModules/SceLibc/sce_libc.cpp b/GPCS4/SceModules/SceLibc/sce_libc.cpp
index 5d5edd71..9024a882 100644
--- a/GPCS4/SceModules/SceLibc/sce_libc.cpp
+++ b/GPCS4/SceModules/SceLibc/sce_libc.cpp
@@ -274,14 +274,14 @@ int PS4API scec_roundf(void)
 // library: libc_setjmp
 //////////////////////////////////////////////////////////////////////////
 
-int PS4API _longjmp(void)
+int PS4API sce_longjmp(void)
 {
 	LOG_FIXME("Not implemented");
 	return SCE_OK;
 }
 
 
-int PS4API _setjmp(void)
+int PS4API sce_setjmp(void)
 {
 	LOG_FIXME("Not implemented");
 	return SCE_OK;
diff --git a/GPCS4/SceModules/SceLibc/sce_libc.h b/GPCS4/SceModules/SceLibc/sce_libc.h
index 8031e61f..4abd3acb 100644
--- a/GPCS4/SceModules/SceLibc/sce_libc.h
+++ b/GPCS4/SceModules/SceLibc/sce_libc.h
@@ -396,8 +396,8 @@ int PS4API scec_roundf(void);
 // library: libc_setjmp
 //////////////////////////////////////////////////////////////////////////
 
-int PS4API _longjmp(void);
+int PS4API sce_longjmp(void);
 
 
-int PS4API _setjmp(void);
+int PS4API sce_setjmp(void);
 
diff --git a/GPCS4/SceModules/SceLibc/sce_libc_export.cpp b/GPCS4/SceModules/SceLibc/sce_libc_export.cpp
index 8f8543e7..177bf509 100644
--- a/GPCS4/SceModules/SceLibc/sce_libc_export.cpp
+++ b/GPCS4/SceModules/SceLibc/sce_libc_export.cpp
@@ -192,8 +192,8 @@ static const SCE_EXPORT_FUNCTION g_pSceLibc_libc_FunctionTable[] =
 
 static const SCE_EXPORT_FUNCTION g_pSceLibc_libc_setjmp_FunctionTable[] =
 {
-	{ 0xF85FBD8618BA93D4, "_longjmp", (void*)_longjmp },
-	{ 0xB23A64AE1BA0BD52, "_setjmp", (void*)_setjmp },
+	{ 0xF85FBD8618BA93D4, "_longjmp", (void*)sce_longjmp },
+	{ 0xB23A64AE1BA0BD52, "_setjmp", (void*)sce_setjmp },
 	SCE_FUNCTION_ENTRY_END
 };
 
diff --git a/Misc/Directory.build.props b/Misc/Directory.build.props
index 3db45630..83bd2f80 100644
--- a/Misc/Directory.build.props
+++ b/Misc/Directory.build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <LLVMInstallDir>D:\LLVM</LLVMInstallDir>
-    <LLVMToolsVersion>14.0.3</LLVMToolsVersion>
+    <LLVMToolsVersion>16.0.6</LLVMToolsVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file