Skip to content

Commit cfdb437

Browse files
Fix "GetThreadContext failed" on Windows (#264)
* Remove secondary url for boehmgc * Update boehmgc to 7.6.16 This is to get the fix for the GetThreadContext error on Windows. ivmai/bdwgc@449eda0 * Disable parallel marking on Windows Enabling parallel marking causes an error. https://github.com/ivmai/bdwgc/blob/v7.6.16/win32_threads.c#L175 The reason this wasn't an issue before, is that in the version of bdwgc that we were previously using, enable_parallel_mark didn't actually have the intended effect. That was fixed in bdwgc 7.6.2. ivmai/bdwgc@d66bd58 --------- Co-authored-by: tobil4sk <[email protected]>
1 parent a58c2ba commit cfdb437

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

CMakeLists.txt

+5-7
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ add_executable(nekovm
265265
if (STATIC_BOEHMGC OR WIN32)
266266
ExternalProject_Add(libatomic_ops
267267
${EP_CONFIGS}
268-
URL https://github.com/ivmai/libatomic_ops/releases/download/v7.6.0/libatomic_ops-7.6.0.tar.gz
269-
URL_MD5 4d4cd729e55fafb56d48f667c3e46331
268+
URL https://github.com/ivmai/libatomic_ops/releases/download/v7.6.14/libatomic_ops-7.6.14.tar.gz
269+
URL_MD5 ee8251f5091b7938d18be4dda843a515
270270
CONFIGURE_COMMAND echo skip config
271271
BUILD_COMMAND echo skip build
272272
INSTALL_COMMAND echo skip install
@@ -276,10 +276,8 @@ if (STATIC_BOEHMGC OR WIN32)
276276
set (
277277
BoehmGC_CONFIGS
278278
DEPENDS libatomic_ops
279-
URL
280-
"https://www.hboehm.info/gc/gc_source/gc-7.6.0.tar.gz"
281-
"https://github.com/ivmai/bdwgc/files/1005477/gc-7.6.0.tar.gz"
282-
URL_MD5 bf46ccbdaccfa3186c2ab87191c8855a
279+
URL https://github.com/ivmai/bdwgc/releases/download/v7.6.16/gc-7.6.16.tar.gz
280+
URL_MD5 74fb76b6bccf0874cec65b794535a7dd
283281
)
284282

285283
set(GC_INCLUDE_DIR ${CMAKE_BINARY_DIR}/libs/src/BoehmGC-build/include)
@@ -294,7 +292,7 @@ if (STATIC_BOEHMGC OR WIN32)
294292
CMAKE_ARGS
295293
-Wno-dev
296294
-Denable_threads=ON
297-
-Denable_parallel_mark=ON
295+
-Denable_parallel_mark=OFF
298296
-DCMAKE_USE_WIN32_THREADS_INIT=ON
299297
-DCMAKE_CXX_STANDARD=14
300298
PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_BINARY_DIR}/libs/src/libatomic_ops ${CMAKE_BINARY_DIR}/libs/src/BoehmGC/libatomic_ops

0 commit comments

Comments
 (0)