diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-19 22:54:45 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-19 22:54:45 +0000 |
| commit | dc3b4f9e3104dc06e72229f36726f6c8cbb5b8da (patch) | |
| tree | ae07ed256bef48692e90a02c709214f6117a34db /user/z3/_trailing_zeros32.patch | |
| parent | 1cacafa78c61834f07abdf5de9fbb7ab6d63a620 (diff) | |
| parent | bf59364ccef65000e448eaae4791efc630e10a09 (diff) | |
| download | packages-dc3b4f9e3104dc06e72229f36726f6c8cbb5b8da.tar.gz packages-dc3b4f9e3104dc06e72229f36726f6c8cbb5b8da.tar.bz2 packages-dc3b4f9e3104dc06e72229f36726f6c8cbb5b8da.tar.xz packages-dc3b4f9e3104dc06e72229f36726f6c8cbb5b8da.zip | |
Merge branch 'fix/z3-pmmx' into 'master'
user/z3: fix build on pmmx
See merge request adelie/packages!472
Diffstat (limited to 'user/z3/_trailing_zeros32.patch')
| -rw-r--r-- | user/z3/_trailing_zeros32.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/user/z3/_trailing_zeros32.patch b/user/z3/_trailing_zeros32.patch new file mode 100644 index 000000000..05b977f51 --- /dev/null +++ b/user/z3/_trailing_zeros32.patch @@ -0,0 +1,23 @@ +From e212159f4e941c78fc03239e0884f2f0454f581f Mon Sep 17 00:00:00 2001 +From: Nikolaj Bjorner <nbjorner@microsoft.com> +Date: Wed, 20 Nov 2019 15:01:04 -0800 +Subject: [PATCH] fix #2727 + +Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> +--- + src/util/mpz.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp +index a8190df1b0..9c2d3d5ffb 100644 +--- a/src/util/mpz.cpp ++++ b/src/util/mpz.cpp +@@ -72,6 +72,8 @@ inline uint64_t _trailing_zeros64(uint64_t x) { + + #if defined(_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64) + // _trailing_zeros32 already defined using intrinsics ++#elif defined(__GNUC__) ++// _trailing_zeros32 already defined using intrinsics + #else + inline uint32_t _trailing_zeros32(uint32_t x) { + uint32_t r = 0; |