Add -signed-char and -gcc-10-s390x patches.

This commit is contained in:
Jerry James 2020-01-22 14:37:51 -07:00
parent 64652afb6e
commit 7f69c91f2c
3 changed files with 31 additions and 0 deletions

15
z3-gcc-10-s390x.patch Normal file
View File

@ -0,0 +1,15 @@
Add explicit template instantiation to work around an s390x problem:
https://bugzilla.redhat.com/show_bug.cgi?id=1794127
--- a/src/util/lp/lar_solver.cpp
+++ b/src/util/lp/lar_solver.cpp
@@ -829,6 +829,9 @@ void lar_solver::update_x_and_inf_costs_
update_x_and_inf_costs_for_column_with_changed_bounds(j);
}
+// See https://bugzilla.redhat.com/show_bug.cgi?id=1794127
+extern template void lp::lp_primal_core_solver<rational, lp::numeric_pair<rational> >::update_inf_cost_for_column_tableau(unsigned int);
+
void lar_solver::update_x_and_inf_costs_for_columns_with_changed_bounds_tableau() {
for (auto j : m_columns_with_changed_bound.m_index)
update_x_and_inf_costs_for_column_with_changed_bounds(j);

11
z3-signed-char.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/src/parsers/util/scanner.cpp
+++ b/src/parsers/util/scanner.cpp
@@ -480,7 +480,7 @@ scanner::token scanner::scan() {
return read_number(ch, true);
case '#':
return read_bv_literal();
- case -1:
+ case static_cast<char>(-1):
m_state = EOF_TOKEN;
break;
default:

View File

@ -12,6 +12,10 @@ Source0: https://github.com/Z3Prover/z3/archive/%{name}-%{version}.tar.gz
Patch0: %{name}-ocamldoc.patch
# https://github.com/Z3Prover/z3/commit/e212159f4e941c78fc03239e0884f2f0454f581f
Patch1: %{name}-trailing-zeros32.patch
# Fix a place where char is assumed to be signed
Patch2: %{name}-signed-char.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1794127
Patch3: %{name}-gcc-10-s390x.patch
BuildRequires: doxygen
BuildRequires: gcc-c++
@ -220,6 +224,7 @@ mv %{buildroot}%{_prefix}/lib/lib%{name}java.so %{buildroot}%{_libdir}/%{name}
%changelog
* Tue Jan 21 2020 Jerry James <loganjerry@gmail.com> - 4.8.7-4
- Make -doc be archful (bz 1792740)
- Add -signed-char and -gcc-10-s390x patches
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 4.8.7-4
- OCaml 4.10.0+beta1 rebuild.