Use power7 cpu/tuning and filter out -march=z14 -mtune=z15.

Resolves: #1951315
This commit is contained in:
Marek Polacek 2021-04-19 19:21:40 -04:00
parent 37b59a5057
commit 29db0d87cc
1 changed files with 6 additions and 3 deletions

View File

@ -14,7 +14,7 @@ Summary: Compatibility Fortran runtime library version 4.8.5
Name: compat-libgfortran-48
%global gcc_version 4.8.5
Version: %{gcc_version}
Release: %{gcc_release}.1%{?dist}.1
Release: %{gcc_release}.2%{?dist}
# libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have
# GCC Runtime Exception.
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
@ -369,11 +369,11 @@ OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mbranch-protection=standard//g'`
%endif
%ifarch s390x
# Same here.
OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-march=z13 -mtune=z14//g'`
OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-march=z14 -mtune=z15//g'`
%endif
%ifarch ppc64le
# Same here. GCC 4.8 doesn't grok power8.
OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=power8 -mtune=power8/-mcpu=power7 -mtune=power7/g'`
OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=power9 -mtune=power9/-mcpu=power7 -mtune=power7/g'`
%endif
OPT_FLAGS=`echo "$OPT_FLAGS" | sed -e 's/[[:blank:]]\+/ /g'`
case "$OPT_FLAGS" in
@ -506,6 +506,9 @@ rm -rf testlogs-%{_target_platform}-%{version}-%{release}
%{_libdir}/libgfortran.so.3*
%changelog
* Mon Apr 19 2021 Marek Polacek <polacek@redhat.com> - 4.8.5-36.2
- use power7 cpu/tuning and filter out -march=z14 -mtune=z15 (#1951315)
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 4.8.5-36.1.1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937