| 1 |
bircoph 15/01/31 22:57:46 |
| 2 |
|
| 3 |
Added: memtest86+-5.01-hardcoded_cc.patch |
| 4 |
memtest86+-5.01-gcc-473.patch |
| 5 |
Log: |
| 6 |
Version bump, wrt bug 486564 |
| 7 |
|
| 8 |
Signed-off-by: Andrew Savchenko <bircoph@g.o> |
| 9 |
(Portage version: 2.2.15/cvs/Linux i686, signed Manifest commit with key 565953B95372756C) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch?rev=1.1&view=markup |
| 15 |
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 |
| 16 |
|
| 17 |
Index: memtest86+-5.01-hardcoded_cc.patch |
| 18 |
=================================================================== |
| 19 |
--- Makefile.orig 2015-02-01 01:08:33.000000000 +0300 |
| 20 |
+++ Makefile 2015-02-01 01:10:17.624757244 +0300 |
| 21 |
@@ -9,11 +9,10 @@ |
| 22 |
# |
| 23 |
FDISK=/dev/fd0 |
| 24 |
|
| 25 |
-AS=as -32 |
| 26 |
-CC=gcc |
| 27 |
- |
| 28 |
CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ |
| 29 |
-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector |
| 30 |
+CPPFLAGS= -m32 |
| 31 |
+ASFLAGS= -32 |
| 32 |
|
| 33 |
OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ |
| 34 |
config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \ |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.1 sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch?rev=1.1&view=markup |
| 41 |
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 |
| 42 |
|
| 43 |
Index: memtest86+-5.01-gcc-473.patch |
| 44 |
=================================================================== |
| 45 |
diff -Narup memtest86+-5.01-orig/controller.c memtest86+-5.01/controller.c |
| 46 |
--- memtest86+-5.01-orig/controller.c 2013-08-09 22:01:58.000000000 -0400 |
| 47 |
+++ memtest86+-5.01/controller.c 2014-06-22 11:01:17.347923472 -0400 |
| 48 |
@@ -292,7 +292,7 @@ static void setup_nhm(void) |
| 49 |
|
| 50 |
/* First, locate the PCI bus where the MCH is located */ |
| 51 |
|
| 52 |
- for(i = 0; i < sizeof(possible_nhm_bus); i++) { |
| 53 |
+ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { |
| 54 |
pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); |
| 55 |
pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); |
| 56 |
vid &= 0xFFFF; |
| 57 |
@@ -327,7 +327,7 @@ static void setup_nhm32(void) |
| 58 |
ctrl.mode = ECC_NONE; |
| 59 |
|
| 60 |
/* First, locate the PCI bus where the MCH is located */ |
| 61 |
- for(i = 0; i < sizeof(possible_nhm_bus); i++) { |
| 62 |
+ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { |
| 63 |
pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); |
| 64 |
pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); |
| 65 |
vid &= 0xFFFF; |
| 66 |
diff -Narup memtest86+-5.01-orig/io.h memtest86+-5.01/io.h |
| 67 |
--- memtest86+-5.01-orig/io.h 2013-08-09 22:01:58.000000000 -0400 |
| 68 |
+++ memtest86+-5.01/io.h 2014-06-22 11:00:19.279251873 -0400 |
| 69 |
@@ -31,7 +31,7 @@ |
| 70 |
*/ |
| 71 |
|
| 72 |
#define __OUT1(s,x) \ |
| 73 |
-extern inline void __out##s(unsigned x value, unsigned short port) { |
| 74 |
+static inline void __out##s(unsigned x value, unsigned short port) { |
| 75 |
|
| 76 |
#define __OUT2(s,s1,s2) \ |
| 77 |
__asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" |
| 78 |
@@ -43,7 +43,7 @@ __OUT1(s##_p,x) __OUT2(s,s1,"w") : : "a" |
| 79 |
__OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } |
| 80 |
|
| 81 |
#define __IN1(s) \ |
| 82 |
-extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; |
| 83 |
+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; |
| 84 |
|
| 85 |
#define __IN2(s,s1,s2) \ |
| 86 |
__asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" |
| 87 |
diff -Narup memtest86+-5.01-orig/Makefile memtest86+-5.01/Makefile |
| 88 |
--- memtest86+-5.01-orig/Makefile 2013-08-09 22:01:58.000000000 -0400 |
| 89 |
+++ memtest86+-5.01/Makefile 2014-06-22 10:59:27.463573842 -0400 |
| 90 |
@@ -12,7 +12,7 @@ FDISK=/dev/fd0 |
| 91 |
AS=as -32 |
| 92 |
CC=gcc |
| 93 |
|
| 94 |
-CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ |
| 95 |
+CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ |
| 96 |
-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector |
| 97 |
|
| 98 |
OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ |
Archives