work around issue on s390x with gcc10 (#1799408)

When git is built with gcc10 on s390x, the diff builtin fails many
tests.  Use -mtune=zEC12 as a workaround until the issue is fixed
(in gcc and/or git).

Many thanks to Jakub Jelinek for doing the hard work to track this down.
This commit is contained in:
Todd Zullinger 2020-02-22 13:02:01 -05:00
parent e07c54d140
commit 9a7edd4b7a

View File

@ -83,7 +83,7 @@
Name: git
Version: 2.25.1
Release: 2%{?rcrev}%{?dist}
Release: 3%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL: https://git-scm.com/
@ -501,6 +501,11 @@ sed -i '/^git-p4/d' command-list.txt
%endif
# endif without p4
# Work around issue on s390x with gcc10 (#1799408)
%if 0%{?fedora} >= 32 && %{_arch} == s390x
%global build_cflags %(echo %build_cflags | sed 's/-mtune=z13/-mtune=zEC12/')
%endif
# Use these same options for every invocation of 'make'.
# Otherwise it will rebuild in %%install due to flags changes.
# Pipe to tee to aid confirmation/verification of settings.
@ -1028,6 +1033,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
* Sat Feb 22 2020 Todd Zullinger <tmz@pobox.com> - 2.25.1-3
- work around issue on s390x with gcc10 (#1799408)
* Wed Feb 19 2020 Todd Zullinger <tmz@pobox.com> - 2.25.1-2
- split libsecret credential helper into a subpackage (#1804741)
- consolidate macros for Fedora/EPEL