From bf59364ccef65000e448eaae4791efc630e10a09 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Mon, 15 Jun 2020 21:54:20 -0500
Subject: user/z3: fix build on 32-bit arches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

../src/util/mpz.cpp:57:30: error: definition of ‘uint32_t __builtin_ctz(uint32_t)’ ambiguates built-in declaration ‘int __builtin_ctz(unsigned int)’
 #define _trailing_zeros32(X) __builtin_ctz(X)
                              ^~~~~~~~~~~~~
../src/util/mpz.cpp:76:17: note: in expansion of macro ‘_trailing_zeros32’
 inline uint32_t _trailing_zeros32(uint32_t x) {
                 ^~~~~~~~~~~~~~~~~
make: *** [Makefile:216: util/mpz.o] Error 1
make: *** Waiting for unfinished jobs....
make: Leaving directory '/af/build/user/z3/src/z3-z3-4.8.7/build'
>>> ERROR: z3: build failed

Upstream issues:
https://github.com/Z3Prover/z3/issues/2727
https://github.com/Z3Prover/z3/issues/2776
---
 user/z3/APKBUILD                | 13 ++++++++++---
 user/z3/_trailing_zeros32.patch | 23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 user/z3/_trailing_zeros32.patch

diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD
index adac93a71..262a7f530 100644
--- a/user/z3/APKBUILD
+++ b/user/z3/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=z3
 pkgver=4.8.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Mathematical theorem prover"
 url=" "
 arch="all"
@@ -10,9 +10,15 @@ license="MIT"
 depends=""
 makedepends="gmp-dev python3-dev cmd:which"
 subpackages="$pkgname-dev py3-$pkgname:py3:noarch"
-source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz"
+source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz
+	_trailing_zeros32.patch
+	"
 builddir="$srcdir/z3-z3-$pkgver"
 
+case "$CARCH" in
+pmmx) options="$options textrels";;
+esac
+
 build() {
 	PYTHON=python3 ./configure \
 		--prefix=/usr \
@@ -37,4 +43,5 @@ py3() {
 	mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="145e2b2f1fa4edd0917107c7e1d54d779c7ed85c48af2ce6def4c90d1c4db05f74c9657e173cedf48770589fbe484c97fa1923295271cd3792523ffc4f67ed0c  z3-4.8.7.tar.gz"
+sha512sums="145e2b2f1fa4edd0917107c7e1d54d779c7ed85c48af2ce6def4c90d1c4db05f74c9657e173cedf48770589fbe484c97fa1923295271cd3792523ffc4f67ed0c  z3-4.8.7.tar.gz
+6cf6ee35b23f9ef9fe879369a1900c82d38836f245e927f0f80eb6361e3340c32c8b94f00b1cb69eb8cad1626675b8f7b9bdaecffa5072cd5e8b12ecf1e7e3c0  _trailing_zeros32.patch"
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;
-- 
cgit v1.2.3-70-g09d2