1
- diff -Naur ispc-1.27.0-orig/CMakeLists.txt ispc-1.27.0/CMakeLists.txt
2
- --- ispc-1.27.0-orig/CMakeLists.txt 2025-05-16 01:24:52.000000000 +0300
3
- +++ ispc-1.27.0/CMakeLists.txt 2025-06-10 15:33:13.821883100 +0300
4
- @@ -387,7 +387,7 @@
5
- message(FATAL_ERROR "ISPC requires LLVM 17.0.0 or later")
1
+ --- a/CMakeLists.txt
2
+ +++ b/CMakeLists.txt
3
+ @@ -408,7 +408,7 @@
4
+ message(FATAL_ERROR "ISPC requires LLVM 18.0.0 or later")
6
5
endif()
7
6
8
7
- set(CLANG_LIBRARY_LIST clangFrontend clangBasic clangEdit clangLex clangSupport clangASTMatchers)
9
8
+ set(CLANG_LIBRARY_LIST clangFrontend clangEdit clangLex clangBasic clangSupport clangASTMatchers)
10
9
11
10
set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp passes)
12
-
13
- @@ -723 ,6 +723 ,9 @@
11
+ if (ISPC_LIBRARY_JIT)
12
+ @@ -765 ,6 +765 ,9 @@
14
13
list(APPEND LINK_OPTIONS_PUBLIC)
15
14
# Link options
16
15
if (WIN32)
@@ -20,35 +19,32 @@ diff -Naur ispc-1.27.0-orig/CMakeLists.txt ispc-1.27.0/CMakeLists.txt
20
19
list(APPEND LINK_OPTIONS_PRIVATE /DYNAMICBASE)
21
20
# Control flow guard
22
21
list(APPEND LINK_OPTIONS_PRIVATE /GUARD:CF)
23
- @@ -732 ,6 +735 ,7 @@
22
+ @@ -774 ,6 +777 ,7 @@
24
23
if (MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
25
24
list(APPEND LINK_OPTIONS_PUBLIC /OPT:REF /OPT:ICF)
26
25
endif()
27
26
+ endif()
28
27
elseif (APPLE)
29
28
if(CMAKE_BUILD_TYPE MATCHES Release)
30
29
list(APPEND LINK_OPTIONS_PUBLIC "SHELL: -Wl,-dead_strip")
31
- @@ -802,14 +806,14 @@
30
+ @@ -844,12 +847,12 @@
32
31
33
32
# System libraries, our own and transitive dependencies from LLVM libs.
34
33
if (WIN32)
35
34
- list(APPEND LINK_LIBRARIES version.lib shlwapi.lib odbc32.lib odbccp32.lib)
36
35
+ list(APPEND LINK_LIBRARIES version shlwapi odbc32 odbccp32)
37
36
# Required after LLVM commit a5ffabc
38
- if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "18.1.0")
39
- - list(APPEND LINK_LIBRARIES ws2_32.lib)
40
- + list(APPEND LINK_LIBRARIES ws2_32)
41
- endif()
37
+ - list(APPEND LINK_LIBRARIES ws2_32.lib)
38
+ + list(APPEND LINK_LIBRARIES ws2_32)
42
39
# Required after LLVM commit cb7690a
43
40
if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "19.1.0")
44
41
- list(APPEND LINK_LIBRARIES ntdll.lib)
45
42
+ list(APPEND LINK_LIBRARIES ntdll)
46
43
endif()
47
44
else()
48
45
run_llvm_config(LLVM_SYSTEM_LIBS "--system-libs")
49
- diff -Naur ispc-1.27.0-orig/builtins/builtins-c-cpu.cpp ispc-1.27.0/builtins/builtins-c-cpu.cpp
50
- --- ispc-1.27.0-orig/builtins/builtins-c-cpu.cpp 2025-05-16 01:24:52.000000000 +0300
51
- +++ ispc-1.27.0/builtins/builtins-c-cpu.cpp 2025-06-10 15:33:13.821883100 +0300
46
+ --- a/builtins/builtins-c-cpu.cpp
47
+ +++ a/builtins/builtins-c-cpu.cpp
52
48
@@ -24,7 +24,7 @@
53
49
*/
54
50
#ifndef WASM
@@ -58,9 +54,8 @@ diff -Naur ispc-1.27.0-orig/builtins/builtins-c-cpu.cpp ispc-1.27.0/builtins/bui
58
54
// We do want old school sprintf and don't want secure Microsoft extensions.
59
55
// And we also don't want warnings about it, so the define.
60
56
#define _CRT_SECURE_NO_WARNINGS
61
- diff -Naur ispc-1.27.0-orig/ispcrt/CMakeLists.txt ispc-1.27.0/ispcrt/CMakeLists.txt
62
- --- ispc-1.27.0-orig/ispcrt/CMakeLists.txt 2025-05-16 01:24:52.000000000 +0300
63
- +++ ispc-1.27.0/ispcrt/CMakeLists.txt 2025-06-10 15:33:13.829848200 +0300
57
+ --- a/ispcrt/CMakeLists.txt
58
+ +++ b/ispcrt/CMakeLists.txt
64
59
@@ -111,7 +111,7 @@
65
60
-fstack-protector-strong -fno-delete-null-pointer-checks -fwrapv)
66
61
target_compile_options(ispcrt_interface_lib INTERFACE -Wall -Wextra -Wno-unused-private-field)
@@ -70,9 +65,8 @@ diff -Naur ispc-1.27.0-orig/ispcrt/CMakeLists.txt ispc-1.27.0/ispcrt/CMakeLists.
70
65
target_link_options(ispcrt_interface_lib INTERFACE
71
66
"SHELL: -z noexecstack"
72
67
"SHELL: -z relro"
73
- diff -Naur ispc-1.27.0-orig/ispcrt/detail/cpu/CPUDevice.cpp ispc-1.27.0/ispcrt/detail/cpu/CPUDevice.cpp
74
- --- ispc-1.27.0-orig/ispcrt/detail/cpu/CPUDevice.cpp 2025-05-16 01:24:52.000000000 +0300
75
- +++ ispc-1.27.0/ispcrt/detail/cpu/CPUDevice.cpp 2025-06-10 15:33:13.839623300 +0300
68
+ --- a/ispcrt/detail/cpu/CPUDevice.cpp
69
+ +++ b/ispcrt/detail/cpu/CPUDevice.cpp
76
70
@@ -175,7 +175,7 @@
77
71
void *fptr = nullptr;
78
72
for (auto lib : m_libs) {
@@ -82,9 +76,8 @@ diff -Naur ispc-1.27.0-orig/ispcrt/detail/cpu/CPUDevice.cpp ispc-1.27.0/ispcrt/d
82
76
#else
83
77
fptr = dlsym(lib ? lib : RTLD_DEFAULT, name);
84
78
#endif
85
- diff -Naur ispc-1.27.0-orig/ispcrt/detail/cpu/ispc_tasking.cpp ispc-1.27.0/ispcrt/detail/cpu/ispc_tasking.cpp
86
- --- ispc-1.27.0-orig/ispcrt/detail/cpu/ispc_tasking.cpp 2025-05-16 01:24:52.000000000 +0300
87
- +++ ispc-1.27.0/ispcrt/detail/cpu/ispc_tasking.cpp 2025-06-10 15:33:13.847644600 +0300
79
+ --- a/ispcrt/detail/cpu/ispc_tasking.cpp
80
+ +++ b/ispcrt/detail/cpu/ispc_tasking.cpp
88
81
@@ -55,9 +55,9 @@
89
82
defined ISPC_USE_TBB_PARALLEL_FOR || defined ISPC_USE_OMP || defined ISPC_USE_HPX)
90
83
@@ -126,10 +119,9 @@ diff -Naur ispc-1.27.0-orig/ispcrt/detail/cpu/ispc_tasking.cpp ispc-1.27.0/ispcr
126
119
// Signature of ispc-generated 'task' functions
127
120
typedef void (*TaskFuncType)(void *data, int threadIndex, int threadCount, int taskIndex, int taskCount, int taskIndex0,
128
121
int taskIndex1, int taskIndex2, int taskCount0, int taskCount1, int taskCount2);
129
- diff -Naur ispc-1.27.0-orig/src/main.cpp ispc-1.27.0/src/main.cpp
130
- --- ispc-1.27.0-orig/src/main.cpp 2025-05-16 01:24:52.000000000 +0300
131
- +++ ispc-1.27.0/src/main.cpp 2025-06-10 15:45:17.325604100 +0300
132
- @@ -42,7 +42,9 @@
122
+ --- a/src/args.cpp
123
+ +++ b/src/args.cpp
124
+ @@ -30,7 +30,9 @@
133
125
#ifndef BUILD_DATE
134
126
#define BUILD_DATE __DATE__
135
127
#endif
0 commit comments