root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

CMake: Conditionally allow win95 threads and --enable-small.

This commit is contained in:
Jia Tan 2023-08-09 20:54:15 +08:00
parent e919ebb29a
commit bfb623ad96
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@ -348,6 +348,11 @@ set(ENABLE_THREADS ON CACHE STRING
set_property(CACHE ENABLE_THREADS set_property(CACHE ENABLE_THREADS
PROPERTY STRINGS "${SUPPORTED_THREAD_METHODS}") PROPERTY STRINGS "${SUPPORTED_THREAD_METHODS}")
# This is a flag variable set when win95 threads are used. We must ensure
# the combination of enable_small and win95 threads is not used without a
# compiler supporting attribute __constructor__.
set(USE_WIN95_THREADS OFF)
if(NOT ENABLE_THREADS IN_LIST SUPPORTED_THREAD_METHODS) if(NOT ENABLE_THREADS IN_LIST SUPPORTED_THREAD_METHODS)
message(SEND_ERROR "'${ENABLE_THREADS}' is not a supported thread type") message(SEND_ERROR "'${ENABLE_THREADS}' is not a supported thread type")
endif() endif()
@ -368,14 +373,7 @@ if(ENABLE_THREADS)
# Windows Vista. This is used for 32-bit x86 builds for # Windows Vista. This is used for 32-bit x86 builds for
# compatibility reasons since it makes no measurable difference # compatibility reasons since it makes no measurable difference
# in performance compared to Vista threads. # in performance compared to Vista threads.
# set(USE_WIN95_THREADS ON)
# The Win95 threading lacks thread-safe one-time initialization
# function.
if (ENABLE_SMALL)
message(SEND_ERROR "Threading method win95 and ENABLE_SMALL "
"cannot be used at the same time")
endif()
add_compile_definitions(MYTHREAD_WIN95) add_compile_definitions(MYTHREAD_WIN95)
else() else()
add_compile_definitions(MYTHREAD_VISTA) add_compile_definitions(MYTHREAD_VISTA)
@ -763,6 +761,19 @@ check_c_source_compiles("
cmake_pop_check_state() cmake_pop_check_state()
tuklib_add_definition_if(liblzma HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR) tuklib_add_definition_if(liblzma HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR)
# The Win95 threading lacks a thread-safe one-time initialization function.
# The one-time initialization is needed for crc32_small.c and crc64_small.c
# create the CRC tables. So if small mode is enabled, the threading mode is
# win95, and the compiler does not support attribute constructor, then we
# would end up with a multithreaded build that is thread-unsafe. As a
# result this configuration is not allowed.
if(USE_WIN95_THREADS AND ENABLE_SMALL AND NOT HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR)
message(SEND_ERROR "Threading method win95 and ENABLE_SMALL "
"cannot be used at the same time with a compiler "
"that doesn't support "
"__attribute__((__constructor__))")
endif()
# cpuid.h # cpuid.h
check_include_file(cpuid.h HAVE_CPUID_H) check_include_file(cpuid.h HAVE_CPUID_H)
tuklib_add_definition_if(liblzma HAVE_CPUID_H) tuklib_add_definition_if(liblzma HAVE_CPUID_H)