Drop -no-sse patch, now handled upstream.

This commit is contained in:
Jerry James 2018-12-25 15:19:03 -07:00
parent 9a334660bc
commit c4b8d05710
2 changed files with 1 additions and 54 deletions

View File

@ -1,49 +0,0 @@
--- scripts/mk_util.py.orig 2018-11-19 13:21:17.000000000 -0700
+++ scripts/mk_util.py 2018-11-28 18:16:23.957446322 -0700
@@ -115,7 +115,7 @@ GUARD_CF=False
ALWAYS_DYNAMIC_BASE=False
FPMATH="Default"
-FPMATH_FLAGS="-mfpmath=sse -msse -msse2"
+FPMATH_FLAGS=""
def check_output(cmd):
@@ -297,10 +297,10 @@ def test_fpmath(cc):
t = TempFile('tstsse.cpp')
t.add('int main() { return 42; }\n')
t.commit()
- if exec_compiler_cmd([cc, CPPFLAGS, 'tstsse.cpp', LDFLAGS, '-mfpmath=sse -msse -msse2']) == 0:
+ if None:
FPMATH_FLAGS="-mfpmath=sse -msse -msse2"
return "SSE2-GCC"
- elif exec_compiler_cmd([cc, CPPFLAGS, 'tstsse.cpp', LDFLAGS, '-msse -msse2']) == 0:
+ elif None:
FPMATH_FLAGS="-msse -msse2"
return "SSE2-CLANG"
elif exec_compiler_cmd([cc, CPPFLAGS, 'tstsse.cpp', LDFLAGS, '-mfpu=vfp -mfloat-abi=hard']) == 0:
--- src/util/hwf.cpp.orig 2018-11-19 13:21:17.000000000 -0700
+++ src/util/hwf.cpp 2018-11-28 18:16:23.973446296 -0700
@@ -46,9 +46,9 @@ Revision History:
// clear to the compiler what instructions should be used. E.g., for sqrt(), the Windows compiler selects
// the x87 FPU, even when /arch:SSE2 is on.
// Luckily, these are kind of standardized, at least for Windows/Linux/macOS.
-#ifdef __clang__
+//#ifdef __clang__
#undef USE_INTRINSICS
-#endif
+//#endif
#ifdef USE_INTRINSICS
#include <emmintrin.h>
--- src/util/mpz.cpp.orig 2018-11-19 13:21:17.000000000 -0700
+++ src/util/mpz.cpp 2018-11-28 18:16:23.974446294 -0700
@@ -30,7 +30,7 @@ Revision History:
#else
#error No multi-precision library selected.
#endif
-#include <immintrin.h>
+
// Available GCD algorithms
// #define EUCLID_GCD

View File

@ -8,8 +8,6 @@ Summary: Satisfiability Modulo Theories (SMT) solver
License: MIT
URL: https://github.com/Z3Prover/z3
Source0: https://github.com/Z3Prover/z3/archive/%{name}-%{version}.tar.gz
# Do not try to build with SSE2 support on non-x86 arches.
Patch0: %{name}-no-sse.patch
BuildRequires: doxygen
BuildRequires: gcc-c++
@ -91,9 +89,6 @@ Python 3 interface to z3.
%prep
%setup -q -n %{name}-%{name}-%{version}
%ifnarch %{ix86} x86_64
%patch0
%endif
# Install python objects into the right place, enable verbose builds, use
# Fedora CFLAGS, preserve timestamps when installing, include the entire
@ -233,6 +228,7 @@ mv %{buildroot}%{_prefix}/lib/lib%{name}java.so %{buildroot}%{_libdir}/%{name}
%changelog
* Mon Dec 24 2018 Jerry James <loganjerry@gmail.com> - 4.8.4-1
- New upstream version
- Drop -no-sse patch, now handled upstream
* Wed Nov 28 2018 Jerry James <loganjerry@gmail.com> - 4.8.3-1
- New upstream version