diff --git a/memtest86+-5.01-gcc34-fix.patch b/memtest86+-5.01-gcc34-fix.patch deleted file mode 100644 index 56097ec..0000000 --- a/memtest86+-5.01-gcc34-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/Makefile b/Makefile -index 7906d50..fb57b1e 100644 ---- a/Makefile -+++ b/Makefile -@@ -13,7 +13,7 @@ AS=as -32 - CC=gcc - - CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ -- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -+ -ffreestanding -fPIC $(SMP_FL) - - OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ - config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \ -diff --git a/init.c b/init.c -index 5bd8b4f..571c11d 100644 ---- a/init.c -+++ b/init.c -@@ -639,11 +639,11 @@ void smp_default_mode(void) - for(i = 0; i < 3; i++) - { - result = strstr(cpupsn , disabledcpu[i]); -- if(result != -1) { v->fail_safe |= 0b10; } -+ if(result != -1) { v->fail_safe |= 2; } - } - - // For 5.01 release, SMP disabled by defualt by config.h toggle -- if(CONSERVATIVE_SMP) { v->fail_safe |= 0b10; } -+ if(CONSERVATIVE_SMP) { v->fail_safe |= 2; } - - } - diff --git a/memtest86+.spec b/memtest86+.spec index 2dfa0b3..65a8532 100644 --- a/memtest86+.spec +++ b/memtest86+.spec @@ -9,7 +9,7 @@ Name: memtest86+ Version: 5.01 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2 Summary: Stand-alone memory tester for x86 and x86-64 computers Source0: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz @@ -28,12 +28,11 @@ Patch1: memtest86+-5.01-no-optimization.patch Patch2: memtest86+-5.01-compile-fix.patch Patch3: memtest86+-5.01-crash-fix.patch Patch4: memtest86+-5.01-fgnu89-inline.patch -Patch5: memtest86+-5.01-gcc34-fix.patch -Patch6: memtest86+-5.01-serial-console-fix.patch +Patch5: memtest86+-5.01-serial-console-fix.patch URL: http://www.memtest.org # require glibc-devel.i386 via this file: BuildRequires: %{_includedir}/gnu/stubs-32.h -BuildRequires: compat-gcc-34 +BuildRequires: gcc Requires: sed coreutils ExclusiveArch: %{ix86} x86_64 @@ -59,9 +58,8 @@ cp -p %{SOURCE5} README.%{readme_suffix} %patch1 -p1 -b .no-optimization %patch2 -p1 -b .compile-fix %patch3 -p1 -b .crash-fix -#%patch4 -p1 -b .fgnu89-inline -%patch5 -p1 -b .gcc34-fix -%patch6 -p1 -b .serial-console-fix +%patch4 -p1 -b .fgnu89-inline +%patch5 -p1 -b .serial-console-fix #sed -i -e's,0x10000,0x100000,' memtest.lds %ifarch x86_64 @@ -72,7 +70,7 @@ sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1 # Regular build flags not wanted for this binary # Note: i486 minimum runtime arch # It makes no sense to use smp flags here. -make CC=gcc34 +make %install mkdir -p %{buildroot}/{boot,%{_sbindir}} @@ -115,6 +113,10 @@ install -Dpm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/memtest86+.conf %{_mandir}/man8/*.8.gz %changelog +* Fri Aug 2 2019 Jaroslav Škarvada - 5.01-27 +- No more compat-gcc in rawhide, so switching to distro's gcc + Resolves: rhbz#1736106 + * Thu Jul 25 2019 Fedora Release Engineering - 5.01-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild