mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +00:00
Code Activity

Fix building with Windows SDK and Clang-CL (#7337)

Browse source 
* Fix building with Windows SDK and Clang-CL

* Attempt to add Clang-CL to CI build configurations

* Fix typo

* Enable EHsc explicitly when using ClangCL due to it being default turned-off

* Override CMAKE_<LANG>_FLAGS instead due to Z3 resets the _INIT variants
This commit is contained in:
Zhang 2024-08-16 04:08:38 +08:00 committed by GitHub
parent 0612a0ba17
commit c1454dc31c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
.github/workflows/msvc-static-build-clang-cl.yml vendored Normal file
View file

@ -0,0 +1,23 @@
name: MSVC Clang-CL Static Build
on:
push:
pull_request:
permissions:
contents: read # to fetch code (actions/checkout)
jobs:
build:
runs-on: windows-2019
env:
BUILD_TYPE: Release
steps:
- name: Checkout Repo
uses: actions/checkout@v4
- name: Build
run: |
cmake -B build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DZ3_BUILD_LIBZ3_SHARED=OFF -DZ3_BUILD_LIBZ3_MSVC_STATIC=ON -T ClangCL -DCMAKE_C_FLAGS="/EHsc" -DCMAKE_CXX_FLAGS="/EHsc"
cmake --build build --config ${{ env.BUILD_TYPE }} --parallel

22
src/util/mpz.cpp
View file

@ -46,10 +46,14 @@ Revision History:
#define LEHMER_GCD #define LEHMER_GCD
#endif #endif
#ifdef __has_builtin
#if defined(__GNUC__) #define HAS_BUILTIN(X) __has_builtin(X)
#else
#define HAS_BUILTIN(X) 0
#endif
#if HAS_BUILTIN(__builtin_ctz)
#define _trailing_zeros32(X) __builtin_ctz(X) #define _trailing_zeros32(X) __builtin_ctz(X)
#elif defined(_WINDOWS) && (defined(_M_X86) || (defined(_M_X64) && !defined(_M_ARM64EC))) #elif defined(_WINDOWS) && (defined(_M_X86) || (defined(_M_X64) && !defined(_M_ARM64EC))) && !defined(__clang__)
// This is needed for _tzcnt_u32 and friends. // This is needed for _tzcnt_u32 and friends.
#include <immintrin.h> #include <immintrin.h>
#define _trailing_zeros32(X) _tzcnt_u32(X) #define _trailing_zeros32(X) _tzcnt_u32(X)
@ -62,11 +66,11 @@ static uint32_t _trailing_zeros32(uint32_t x) {
#endif #endif
#if (defined(__LP64__) || defined(_WIN64)) && defined(_M_X64) && !defined(_M_ARM64EC) #if (defined(__LP64__) || defined(_WIN64)) && defined(_M_X64) && !defined(_M_ARM64EC)
#if defined(__GNUC__) #if HAS_BUILTIN(__builtin_ctzll)
#define _trailing_zeros64(X) __builtin_ctzll(X) #define _trailing_zeros64(X) __builtin_ctzll(X)
#else #elif !defined(__clang__)
#define _trailing_zeros64(X) _tzcnt_u64(X) #define _trailing_zeros64(X) _tzcnt_u64(X)
#endif #endif
#else #else
static uint64_t _trailing_zeros64(uint64_t x) { static uint64_t _trailing_zeros64(uint64_t x) {
uint64_t r = 0; uint64_t r = 0;
@ -75,6 +79,8 @@ static uint64_t _trailing_zeros64(uint64_t x) {
} }
#endif #endif
#undef HAS_BUILTIN
unsigned trailing_zeros(uint32_t x) { unsigned trailing_zeros(uint32_t x) {
return static_cast<unsigned>(_trailing_zeros32(x)); return static_cast<unsigned>(_trailing_zeros32(x));
} }