From 9d1071df59e399b5a03caa21dda4a907f9088e8f Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 27 Oct 2020 22:06:28 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/redhat-rpm-config.git#f97705d6fd5e56e9a5bab4ec4a22188943811263 --- macros | 2 +- redhat-rpm-config.spec | 8 +++++++- rpmrc | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/macros b/macros index bd5be55..01394c4 100644 --- a/macros +++ b/macros @@ -134,7 +134,7 @@ print(result) # Architecture-specific support. Internal. Do not use directly. # Also used for s390. -%__cflags_arch_s390x %[0%{?rhel} >= 8 ? "-march=z13 -mtune=z13" : "-march=zEC12 -mtune=z13"] +%__cflags_arch_s390x %[0%{?rhel} >= 8 ? "-march=z13 -mtune=z14" : "-march=zEC12 -mtune=z13"] #============================================================================== # ---- configure and makeinstall. diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 7d1453c..baac178 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 175 +Version: 177 Release: 1%{?dist} # No version specified. License: GPL+ @@ -213,6 +213,12 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Tue Oct 27 2020 Tom Stellard - 177-1 +- Add back -fcf-protection flag for x86_64 + +* Tue Oct 20 2020 Florian Weimer - 176-1 +- s390x: Tune for z14 (as in Red Hat Enterprise Linux 8) + * Mon Oct 5 2020 Florian Weimer - 175-1 - s390x: Switch Fedora ELN to z13 baseline diff --git a/rpmrc b/rpmrc index a831b9e..ba31d2a 100644 --- a/rpmrc +++ b/rpmrc @@ -6,7 +6,7 @@ optflags: i586 %{__global_compiler_flags} -m32 -march=i586 -mtune=generic -fasyn optflags: i686 %{__global_compiler_flags} -m32 -march=i686 -mtune=generic -msse2 -mfpmath=sse -mstackrealign -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection optflags: athlon %{__global_compiler_flags} -m32 -march=athlon -fasynchronous-unwind-tables -fstack-clash-protection optflags: ia64 %{__global_compiler_flags} -optflags: x86_64 %{__global_compiler_flags} -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection +optflags: x86_64 %{__global_compiler_flags} -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection optflags: alpha %{__global_compiler_flags} -mieee optflags: alphaev5 %{__global_compiler_flags} -mieee -mcpu=ev5