# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1413382555 -7200
# Node ID d0ddd1e74d41a6d81ebde22e20b2c12b7b9194b3
# Parent  b5bb376d98ad9344394e7d7f2182f7b17b13d67f
memtest: add some patches

diff -r b5bb376d98ad -r d0ddd1e74d41 memtest-serial/receipt
--- a/memtest-serial/receipt	Wed Oct 15 15:56:22 2014 +0200
+++ b/memtest-serial/receipt	Wed Oct 15 16:15:55 2014 +0200
@@ -5,7 +5,7 @@
 CATEGORY="base-system"
 SHORT_DESC="Memory failures detection tool using serial port."
 MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="GPL"
+LICENSE="GPL2"
 WEB_SITE="http://www.memtest.org/"
 WANTED="memtest"
 
diff -r b5bb376d98ad -r d0ddd1e74d41 memtest/receipt
--- a/memtest/receipt	Wed Oct 15 15:56:22 2014 +0200
+++ b/memtest/receipt	Wed Oct 15 16:15:55 2014 +0200
@@ -5,7 +5,7 @@
 CATEGORY="base-system"
 SHORT_DESC="Memory failures detection tool."
 MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="GPL"
+LICENSE="GPL2"
 SOURCE="memtest86+"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.memtest.org/"
@@ -18,6 +18,9 @@
 {
 	cd $src
 	sed -i '/scp memtest.bin/d' Makefile
+	for i in array-size io O0; do
+		patch -p1 < $stuff/$SOURCE-$VERSION-$i.patch
+	done
 	make
 	cp $stuff/*.S $stuff/pack .
 	for i in bootloader unpack ; do
diff -r b5bb376d98ad -r d0ddd1e74d41 memtest/stuff/memtest86+-5.01-O0.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memtest/stuff/memtest86+-5.01-O0.patch	Wed Oct 15 16:15:55 2014 +0200
@@ -0,0 +1,11 @@
+--- memtest86+-5.01/Makefile~	2014-01-08 01:30:11.355900076 +0000
++++ memtest86+-5.01/Makefile	2014-01-08 01:31:19.387555469 +0000
+@@ -12,7 +12,7 @@
+ 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 \
diff -r b5bb376d98ad -r d0ddd1e74d41 memtest/stuff/memtest86+-5.01-array-size.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memtest/stuff/memtest86+-5.01-array-size.patch	Wed Oct 15 16:15:55 2014 +0200
@@ -0,0 +1,20 @@
+--- memtest86+-5.01/controller.c~	2013-08-10 02:01:58.000000000 +0000
++++ memtest86+-5.01/controller.c	2013-12-12 20:58:12.873555378 +0000
+@@ -292,7 +292,7 @@
+ 
+ 	/* 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 @@
+ 	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 -r b5bb376d98ad -r d0ddd1e74d41 memtest/stuff/memtest86+-5.01-io.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memtest/stuff/memtest86+-5.01-io.patch	Wed Oct 15 16:15:55 2014 +0200
@@ -0,0 +1,20 @@
+--- memtest86+-5.01/io.h~	2013-08-10 02:01:58.000000000 +0000
++++ memtest86+-5.01/io.h	2014-01-08 01:29:12.404465515 +0000
+@@ -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##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"