Skip to content

Commit 23e8cfe

Browse files
committed
support vs2022 and llvm 16.0.6
1 parent 32277e2 commit 23e8cfe

File tree

7 files changed

+10
-11
lines changed

7 files changed

+10
-11
lines changed

3rdParty/boost/boost/predef/hardware/simd/arm.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Distributed under the Boost Software License, Version 1.0.
1010
#define BOOST_PREDEF_HARDWARE_SIMD_ARM_H
1111

1212
#include <boost/predef/version_number.h>
13-
#include <boost/predef/hardware/simd/arm/versions.h>
13+
//#include <boost/predef/hardware/simd/arm/versions.h>
1414

1515
/* tag::reference[]
1616
= `BOOST_HW_SIMD_ARM`

3rdParty/boost/boost/predef/hardware/simd/x86.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Distributed under the Boost Software License, Version 1.0.
1010
#define BOOST_PREDEF_HARDWARE_SIMD_X86_H
1111

1212
#include <boost/predef/version_number.h>
13-
#include <boost/predef/hardware/simd/x86/versions.h>
13+
//#include <boost/predef/hardware/simd/x86/versions.h>
1414

1515
/* tag::reference[]
1616
= `BOOST_HW_SIMD_X86`

3rdParty/tinydbr/tinydbr.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ limitations under the License.
2222
#include <list>
2323
#include <stdbool.h>
2424
#include <stdio.h>
25-
#include <stdatomic.h>
2625

2726

2827
#ifdef ARM64
@@ -234,7 +233,7 @@ void TinyDBR::CommitValueAtomicT(ModuleInfo* module, size_t start_offset)
234233
}
235234

236235
#ifdef __clang__
237-
__c11_atomic_store(ptr, value, memory_order_relaxed);
236+
__c11_atomic_store(ptr, value, std::memory_order_relaxed);
238237
#else
239238
// x86 machine aligned memory store should be atomic natively.
240239
*ptr = value;

GPCS4/SceModules/SceLibc/sce_libc.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -274,14 +274,14 @@ int PS4API scec_roundf(void)
274274
// library: libc_setjmp
275275
//////////////////////////////////////////////////////////////////////////
276276

277-
int PS4API _longjmp(void)
277+
int PS4API sce_longjmp(void)
278278
{
279279
LOG_FIXME("Not implemented");
280280
return SCE_OK;
281281
}
282282

283283

284-
int PS4API _setjmp(void)
284+
int PS4API sce_setjmp(void)
285285
{
286286
LOG_FIXME("Not implemented");
287287
return SCE_OK;

GPCS4/SceModules/SceLibc/sce_libc.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,8 @@ int PS4API scec_roundf(void);
396396
// library: libc_setjmp
397397
//////////////////////////////////////////////////////////////////////////
398398

399-
int PS4API _longjmp(void);
399+
int PS4API sce_longjmp(void);
400400

401401

402-
int PS4API _setjmp(void);
402+
int PS4API sce_setjmp(void);
403403

GPCS4/SceModules/SceLibc/sce_libc_export.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ static const SCE_EXPORT_FUNCTION g_pSceLibc_libc_FunctionTable[] =
192192

193193
static const SCE_EXPORT_FUNCTION g_pSceLibc_libc_setjmp_FunctionTable[] =
194194
{
195-
{ 0xF85FBD8618BA93D4, "_longjmp", (void*)_longjmp },
196-
{ 0xB23A64AE1BA0BD52, "_setjmp", (void*)_setjmp },
195+
{ 0xF85FBD8618BA93D4, "_longjmp", (void*)sce_longjmp },
196+
{ 0xB23A64AE1BA0BD52, "_setjmp", (void*)sce_setjmp },
197197
SCE_FUNCTION_ENTRY_END
198198
};
199199

Misc/Directory.build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
33
<LLVMInstallDir>D:\LLVM</LLVMInstallDir>
4-
<LLVMToolsVersion>14.0.3</LLVMToolsVersion>
4+
<LLVMToolsVersion>16.0.6</LLVMToolsVersion>
55
</PropertyGroup>
66
</Project>

0 commit comments

Comments
 (0)