bircoph 15/01/31 22:57:46 Added: memtest86+-5.01-hardcoded_cc.patch memtest86+-5.01-gcc-473.patch Log: Version bump, wrt bug 486564 Signed-off-by: Andrew Savchenko <birc...@gentoo.org> (Portage version: 2.2.15/cvs/Linux i686, signed Manifest commit with key 565953B95372756C)
Revision Changes Path 1.1 sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch?rev=1.1&content-type=text/plain Index: memtest86+-5.01-hardcoded_cc.patch =================================================================== --- Makefile.orig 2015-02-01 01:08:33.000000000 +0300 +++ Makefile 2015-02-01 01:10:17.624757244 +0300 @@ -9,11 +9,10 @@ # FDISK=/dev/fd0 -AS=as -32 -CC=gcc - CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector +CPPFLAGS= -m32 +ASFLAGS= -32 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 \ 1.1 sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch?rev=1.1&content-type=text/plain Index: memtest86+-5.01-gcc-473.patch =================================================================== diff -Narup memtest86+-5.01-orig/controller.c memtest86+-5.01/controller.c --- memtest86+-5.01-orig/controller.c 2013-08-09 22:01:58.000000000 -0400 +++ memtest86+-5.01/controller.c 2014-06-22 11:01:17.347923472 -0400 @@ -292,7 +292,7 @@ static void setup_nhm(void) /* First, locate the PCI bus where the MCH is located */ - for(i = 0; i < sizeof(possible_nhm_bus); i++) { + for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); vid &= 0xFFFF; @@ -327,7 +327,7 @@ static void setup_nhm32(void) ctrl.mode = ECC_NONE; /* First, locate the PCI bus where the MCH is located */ - for(i = 0; i < sizeof(possible_nhm_bus); i++) { + for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); vid &= 0xFFFF; diff -Narup memtest86+-5.01-orig/io.h memtest86+-5.01/io.h --- memtest86+-5.01-orig/io.h 2013-08-09 22:01:58.000000000 -0400 +++ memtest86+-5.01/io.h 2014-06-22 11:00:19.279251873 -0400 @@ -31,7 +31,7 @@ */ #define __OUT1(s,x) \ -extern inline void __out##s(unsigned x value, unsigned short port) { +static inline void __out##s(unsigned x value, unsigned short port) { #define __OUT2(s,s1,s2) \ __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" @@ -43,7 +43,7 @@ __OUT1(s##_p,x) __OUT2(s,s1,"w") : : "a" __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } #define __IN1(s) \ -extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; +static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; #define __IN2(s,s1,s2) \ __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" diff -Narup memtest86+-5.01-orig/Makefile memtest86+-5.01/Makefile --- memtest86+-5.01-orig/Makefile 2013-08-09 22:01:58.000000000 -0400 +++ memtest86+-5.01/Makefile 2014-06-22 10:59:27.463573842 -0400 @@ -12,7 +12,7 @@ FDISK=/dev/fd0 AS=as -32 CC=gcc -CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ +CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \