| 1 |
diff -Naurp memtest86+-4.10-orig/Makefile memtest86+-4.10/Makefile
|
| 2 |
--- memtest86+-4.10-orig/Makefile 2010-06-24 00:27:22.864634431 +0200
|
| 3 |
+++ memtest86+-4.10/Makefile 2010-06-24 00:28:42.402478590 +0200
|
| 4 |
@@ -8,10 +8,9 @@
|
| 5 |
#
|
| 6 |
FDISK=/dev/fd0
|
| 7 |
|
| 8 |
-AS=as -32
|
| 9 |
-CC=gcc
|
| 10 |
-
|
| 11 |
-CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
|
| 12 |
+CFLAGS=-Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
|
| 13 |
+CPPFLAGS=-m32
|
| 14 |
+ASFLAGS=-32
|
| 15 |
|
| 16 |
OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
|
| 17 |
config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
|
| 18 |
@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
|
| 19 |
memtest_shared.bin -o memtest.bin
|
| 20 |
|
| 21 |
reloc.o: reloc.c
|
| 22 |
- $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
|
| 23 |
+ $(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
|
| 24 |
|
| 25 |
test.o: test.c
|
| 26 |
- $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
|
| 27 |
+ $(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie test.c
|
| 28 |
|
| 29 |
clean:
|
| 30 |
rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin
|