Attachment 948383 Details for Bug 1013110 – Patch fixes non-working binary with later GCC versions.

[patch] Patch fixes non-working binary with later GCC versions.

memtest86+-5.01-fixed-gcc-compilation.patch (text/plain), 3.43 KB, created by David McInnis on 2014-10-20 05:15:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David McInnis

Created: 2014-10-20 05:15:51 UTC

Size: 3.43 KB

patch

obsolete

>diff -Naur memtest86+-5.01-Src/controller.c memtest86+-5.01-patched/controller.c
>--- memtest86+-5.01-Src/controller.c	2013-08-09 19:01:58.000000000 -0700
>+++ memtest86+-5.01-patched/controller.c	2014-10-04 21:56:57.000000000 -0700
>@@ -2,6 +2,8 @@
>  * MemTest86+ V5 Specific code (GPL V2.0)
>  * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
>  * http://www.canardpc.com - http://www.memtest.org
>+ * 
>+ * Edited by David McInnis Oct 4, 2014
>  */
> 
> //#include "defs.h"
>@@ -292,7 +294,7 @@
> 
> 	/* First, locate the PCI bus where the MCH is located */
> 
>-	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
>+	for(i = 0; i < 3; 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 +329,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 < 3; 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;
>@@ -1424,7 +1426,7 @@
> 	unsigned long dramchr;
> 	float clockratio;
> 	double dramclock;
>-	unsigned int dummy[3];
>+	unsigned int dummy[4];
> 	int ram_type;
> 
> 	float coef = 10;
>@@ -2851,13 +2853,13 @@
> 
> static void poll_timings_i875(void) {
> 
>-	ulong dev6, dev62;
>+	ulong dev6;
> 	ulong temp;
> 	float cas;
> 	int rcd, rp, ras, chan;
> 	long *ptr, *ptr2;
> 
>-	pci_conf_read( 0, 6, 0, 0x40, 4, &dev62);
>+	pci_conf_read( 0, 6, 0, 0x40, 4, &dev6);
> 	ptr2=(long*)(dev6+0x68);
> 
> 	/* Read the MMR Base Address & Define the pointer */
>diff -Naur memtest86+-5.01-Src/init.c memtest86+-5.01-patched/init.c
>--- memtest86+-5.01-Src/init.c	2013-08-09 19:26:27.000000000 -0700
>+++ memtest86+-5.01-patched/init.c	2014-10-04 21:55:06.000000000 -0700
>@@ -7,6 +7,8 @@
>  *
>  * Released under version 2 of the Gnu Public License.
>  * By Chris Brady
>+ * 
>+ * Edited by David McInnis October 4, 2014
>  */
>  
> 
>@@ -914,7 +916,6 @@
> 			default:
> 				cprint(0, COL_MID, "Unknown Intel");
>  				break;
>-			break;
> 		    }
> 
> 		}
>diff -Naur memtest86+-5.01-Src/main.c memtest86+-5.01-patched/main.c
>--- memtest86+-5.01-Src/main.c	2013-08-09 19:01:58.000000000 -0700
>+++ memtest86+-5.01-patched/main.c	2014-10-05 22:58:41.000000000 -0700
>@@ -422,7 +422,7 @@
> 		//initialise_cpus();
> 		btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0);
> 		/* Draw the screen and get system information */
>-	  init();
>+		init();
> 
> 		/* Set defaults and initialize variables */
> 		set_defaults();
>@@ -737,7 +737,7 @@
> 			    /* Do the same test for each CPU */
> 			    if (++cpu_sel >= act_cpus) 
> 			    	{
>-	            cpu_sel = 0;
>+				cpu_sel = 0;
> 			        next_test();
> 			    	} else {
> 			        continue;
>diff -Naur memtest86+-5.01-Src/Makefile memtest86+-5.01-patched/Makefile
>--- memtest86+-5.01-Src/Makefile	2013-08-09 19:01:58.000000000 -0700
>+++ memtest86+-5.01-patched/Makefile	2014-10-04 21:32:06.000000000 -0700
>@@ -2,6 +2,7 @@
> #
> # Author:		Chris Brady
> # Created:		January 1, 1996
>+# Edited:		October 8, 2014, by David McInnis
> 
> 
> #
>@@ -13,7 +14,8 @@
> CC=gcc
> 
> CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
>-	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
>+	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector \
>+	-fno-inline-functions-called-once
> 	
> 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 \

Actions: View | Diff

Attachments on bug 1013110: 948383