SOURCES/gcc48-tweaks.patch

@@ -0,0 +1,11 @@
+--- gcc/reload.h.mp	2021-01-20 20:20:33.565766631 -0500
++++ gcc/reload.h	2021-01-20 20:20:48.437724432 -0500
+@@ -166,7 +166,7 @@ struct target_reload {
+      value indicates the level of indirect addressing supported, e.g., two
+      means that (MEM (MEM (REG n))) is also valid if (REG n) does not get
+      a hard register.  */
+-  bool x_spill_indirect_levels;
++  unsigned char x_spill_indirect_levels;
+ 
+   /* True if caller-save has been reinitialized.  */
+   bool x_caller_save_initialized_p;

SPECS/compat-libgfortran-48.spec

@@ -8,11 +8,13 @@
 %undefine _annotated_build
 # Hardening slows the compiler way too much.
 %undefine _hardened_build
+# libgcc crashes left and right with LTO.
+%global _lto_cflags %%{nil}
 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}
+Release: %{gcc_release}.5%{?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
@@ -37,6 +39,7 @@ BuildRequires: binutils >= 2.20.51.0.2-12
 # While gcc doesn't include statically linked binaries, during testing
 # -static is used several times.
 BuildRequires: glibc-static
+BuildRequires: gcc, gcc-c++, make
 BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, sharutils
 BuildRequires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1, libmpc-devel >= 0.8.1
 # For VTA guality testing
@@ -153,6 +156,7 @@ Patch70: gcc48-pr66840.patch
 Patch71: gcc48-rh1546372.patch
 Patch72: gcc48-libc-name.patch
 Patch73: gcc48-ucontext.patch
+Patch74: gcc48-tweaks.patch
 
 Patch1301: gcc48-rh1469697-1.patch
 Patch1302: gcc48-rh1469697-2.patch
@@ -294,6 +298,7 @@ touch -r %{PATCH27} libstdc++-v3/python/libstdcxx/v6/printers.py
 %patch71 -p0 -b .rh1546372~
 %patch72 -p0 -b .libc-name~
 %patch73 -p0 -b .ucontext~
+%patch74 -p0 -b .tweaks~
 
 %patch1301 -p1 -b .stack-clash-1~
 %patch1302 -p1 -b .stack-clash-2~
@@ -355,16 +360,20 @@ OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/ -pipe / /g'`
 # GCC 4.8 doesn't know these options, but redhat-rpm-config supplies them.
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/ -fstack-clash-protection -fcf-protection/ /g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Werror=format-security/-Wformat-security/g'`
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-march=x86-64-v2/-march=x86-64/g'`
 %ifarch %{ix86}
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-march=i.86//g'`
 %endif
+%ifarch aarch64
+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
@@ -450,7 +459,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \
 	--build=%{gcc_target_platform}
 %endif
 
-make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS"
+make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" LDFLAGS_FOR_TARGET=-Wl,-z,relro,-z,now MAKEINFO=missing
 
 %install
 rm -fr %{buildroot}
@@ -497,8 +506,24 @@ rm -rf testlogs-%{_target_platform}-%{version}-%{release}
 %{_libdir}/libgfortran.so.3*
 
 %changelog
-* Tue Sep 11 2018 Marek Polacek <polacek@redhat.com> 4.8.5-36.1
-- remove a few Requires
+* Wed Jan 26 2022 Marek Polacek <polacek@redhat.com> - 4.8.5-36.5
+- build with -Wl,-z,relro,-z,now (#2044834)
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.8.5-36.4.1
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Mon Aug  9 2021 Marek Polacek <polacek@redhat.com> - 4.8.5-36.4
+- bump for rebuild
+
+* Fri May 14 2021 Marek Polacek <polacek@redhat.com> - 4.8.5-36.3
+- invoke make with MAKEINFO=missing (#1951315)
+
+* 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
 
-* Wed Aug  8 2018 Marek Polacek <polacek@redhat.com> 4.8.5-36
+* Wed Jan 20 2021 Marek Polacek <polacek@redhat.com> 4.8.5-36
 - new compat library