File: utils/memtest86/files/gar-base.diff
base-0 patch-1
Line 1Line 1
diff --speed-large-files --minimal -Nru tmp/memtest86-3.0/config.c work/main.d/memtest86-3.0/config.c
--- tmp/memtest86-3.0/config.c        2002-05-21 13:27:11.000000000 -0500
+++ work/main.d/memtest86-3.0/config.c        2003-04-03 05:41:30.000000000 -0600
diff --speed-large-files --minimal -Nru scratch/memtest86-3.0/Makefile work/main.d/memtest86-3.0/Makefile
--- scratch/memtest86-3.0/Makefile        2002-04-23 06:21:05.000000000 -0500
+++ work/main.d/memtest86-3.0/Makefile        2003-10-09 01:47:10.000000000 -0500
@@ -12,7 +12,7 @@
#
# gcc compiler options, these settings should suffice
#
-CCFLAGS=-Wall -march=i486 -O -fomit-frame-pointer -fno-builtin
+CCFLAGS=-Wall -march=$(ARCH) -O -fomit-frame-pointer -fno-builtin

AS=as

diff --speed-large-files --minimal -Nru scratch/memtest86-3.0/config.c work/main.d/memtest86-3.0/config.c
--- scratch/memtest86-3.0/config.c        2002-05-21 13:27:11.000000000 -0500
+++ work/main.d/memtest86-3.0/config.c        2003-10-09 01:46:34.000000000 -0500
Line Line

extern int bail;
extern int bail;
Line 10Line 22
extern short e820_nr;
extern char memsz_mode;

 extern short e820_nr;
extern char memsz_mode;

diff --speed-large-files --minimal -Nru tmp/memtest86-3.0/init.c work/main.d/memtest86-3.0/init.c
--- tmp/memtest86-3.0/init.c        2002-05-21 17:52:37.000000000 -0500
+++ work/main.d/memtest86-3.0/init.c        2003-04-03 05:41:30.000000000 -0600
diff --speed-large-files --minimal -Nru scratch/memtest86-3.0/init.c work/main.d/memtest86-3.0/init.c
--- scratch/memtest86-3.0/init.c        2002-05-21 17:52:37.000000000 -0500
+++ work/main.d/memtest86-3.0/init.c        2003-10-09 01:46:34.000000000 -0500
Line Line
#include "pci.h"
#include "io.h"
 #include "pci.h"
#include "io.h"
Line 22Line 34
extern short memsz_mode;
extern short firmware;

 extern short memsz_mode;
extern short firmware;

diff --speed-large-files --minimal -Nru tmp/memtest86-3.0/lib.c work/main.d/memtest86-3.0/lib.c
--- tmp/memtest86-3.0/lib.c        2002-05-21 18:12:07.000000000 -0500
+++ work/main.d/memtest86-3.0/lib.c        2003-04-03 05:41:30.000000000 -0600
diff --speed-large-files --minimal -Nru scratch/memtest86-3.0/lib.c work/main.d/memtest86-3.0/lib.c
--- scratch/memtest86-3.0/lib.c        2002-05-21 18:12:07.000000000 -0500
+++ work/main.d/memtest86-3.0/lib.c        2003-10-09 01:46:34.000000000 -0500
Line Line
#include "config.h"
#include "screen_buffer.h"
 #include "config.h"
#include "screen_buffer.h"
Line 34Line 46

int slock = 0, lsr = 0;
short serial_cons = SERIAL_CONSOLE_DEFAULT;
int slock = 0, lsr = 0;
short serial_cons = SERIAL_CONSOLE_DEFAULT;
diff --speed-large-files --minimal -Nru tmp/memtest86-3.0/patn.c work/main.d/memtest86-3.0/patn.c
--- tmp/memtest86-3.0/patn.c        2001-10-17 18:30:32.000000000 -0500
+++ work/main.d/memtest86-3.0/patn.c        2003-04-03 05:41:50.000000000 -0600
diff --speed-large-files --minimal -Nru scratch/memtest86-3.0/patn.c work/main.d/memtest86-3.0/patn.c
--- scratch/memtest86-3.0/patn.c        2001-10-17 18:30:32.000000000 -0500
+++ work/main.d/memtest86-3.0/patn.c        2003-10-09 01:46:34.000000000 -0500
Line Line
#define DEFAULT_MASK ((~0L) << 2)

 #define DEFAULT_MASK ((~0L) << 2)

Line 46Line 58


/* What it does:

/* What it does:
diff --speed-large-files --minimal -Nru tmp/memtest86-3.0/test.c work/main.d/memtest86-3.0/test.c
--- tmp/memtest86-3.0/test.c        2002-05-21 18:13:32.000000000 -0500
+++ work/main.d/memtest86-3.0/test.c        2003-04-03 05:41:30.000000000 -0600
diff --speed-large-files --minimal -Nru scratch/memtest86-3.0/test.c work/main.d/memtest86-3.0/test.c
--- scratch/memtest86-3.0/test.c        2002-05-21 18:13:32.000000000 -0500
+++ work/main.d/memtest86-3.0/test.c        2003-10-09 01:46:34.000000000 -0500
Line Line
extern int segs, bail;
extern volatile ulong *p;
 extern int segs, bail;
extern volatile ulong *p;