cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepare memtest86+ for PIE by passing -fno-pie. This is a no-op right now,

Browse Source 
committing just to reduce the amount of diffs floating around.

ok sthen@
This commit is contained in:
pascal 2012-08-08 20:14:21 +00:00
parent 5245f2f477
commit 63d21a9ccc
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sysutils/memtest86+/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.4 2010/11/07 19:06:15 jasper Exp $
$OpenBSD: patch-Makefile,v 1.5 2012/08/08 20:14:21 pascal Exp $
$RuOBSD: patch-Makefile,v 1.3 2009/02/07 10:28:03 form Exp $
--- Makefile.orig Wed Apr 28 14:11:15 2010
+++ Makefile Sun Nov 7 19:30:26 2010
--- Makefile.orig Sun Jan 23 19:11:04 2011
+++ Makefile Fri Jul 20 18:50:11 2012
@@ -6,33 +6,47 @@
#
# Path for the floppy disk device
@ -14,7 +14,7 @@ $RuOBSD: patch-Makefile,v 1.3 2009/02/07 10:28:03 form Exp $
+CC?=gcc
-CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
+CFLAGS+= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
+CFLAGS+= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector -fno-pie
-OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
+OBJS= head.o reloc.o main.o test.o init.o patn.o screen_buffer.o \
@ -58,14 +58,20 @@ $RuOBSD: patch-Makefile,v 1.3 2009/02/07 10:28:03 form Exp $
head.s: head.S config.h defs.h test.h
$(CC) -E -traditional $< -o $@
@@ -45,6 +59,10 @@ setup.s: setup.S config.h defs.h
memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds
@@ -46,11 +60,15 @@ memtest.bin: memtest_shared.bin bootsect.o setup.o mem
$(LD) -T memtest.bin.lds bootsect.o setup.o -b binary \
memtest_shared.bin -o memtest.bin
+
+memtest_s.bin: memtest_shared_s.bin bootsect.o setup.o memtest.bin.lds
+ $(LD) -T memtest.bin.lds bootsect.o setup.o -b binary \
+ memtest_shared_s.bin -o memtest_s.bin
+
reloc.o: reloc.c
$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
test.o: test.c
- $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
+ $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-pie test.c
clean:
rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin