wok-next rev 19619

memtest: update for GCC5 (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Feb 06 18:29:58 2017 +0100 (2017-02-06)
parents d726d0daa9a7
children 91a99d774072
files memtest/receipt memtest/stuff/memtest86+-5.01-array-size.patch
line diff
     1.1 --- a/memtest/receipt	Mon Feb 06 18:15:00 2017 +0100
     1.2 +++ b/memtest/receipt	Mon Feb 06 18:29:58 2017 +0100
     1.3 @@ -20,6 +20,7 @@
     1.4  {
     1.5  	sed -i  -e '/scp memtest.bin/d' \
     1.6  		-e 's/no-stack-protector/& -fgnu89-inline/' Makefile
     1.7 +	patch -p1 < $stuff/$SOURCE-$VERSION-array-size.patch
     1.8  	make
     1.9  	cp $stuff/*.S $stuff/pack .
    1.10  	for i in bootloader unpack ; do
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/memtest/stuff/memtest86+-5.01-array-size.patch	Mon Feb 06 18:29:58 2017 +0100
     2.3 @@ -0,0 +1,20 @@
     2.4 +--- memtest86+-5.01/controller.c~	2013-08-10 02:01:58.000000000 +0000
     2.5 ++++ memtest86+-5.01/controller.c	2013-12-12 20:58:12.873555378 +0000
     2.6 +@@ -292,7 +292,7 @@
     2.7 + 
     2.8 + 	/* First, locate the PCI bus where the MCH is located */
     2.9 + 
    2.10 +-	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
    2.11 ++	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
    2.12 + 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
    2.13 + 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
    2.14 + 		vid &= 0xFFFF;
    2.15 +@@ -327,7 +327,7 @@
    2.16 + 	ctrl.mode = ECC_NONE;
    2.17 + 
    2.18 + 	/* First, locate the PCI bus where the MCH is located */
    2.19 +-	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
    2.20 ++	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
    2.21 + 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
    2.22 + 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
    2.23 + 		vid &= 0xFFFF;