summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2012-10-12 15:03:23 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2012-10-12 15:03:23 +0000
commit9062b19b5c63af8ac818d9678d2e54a828dcfe49 (patch)
tree1b63f62d5c1077b636c6559fcaed093cd55545d4
parent3c427d61c866dd9155d662f2600a499a531de865 (diff)
Now that the file offset/alignment issue has been found and fixed, switch
back to using -N when linking i386 boot(8). This prevents issues with the .data file offset becoming mismatched with its LMA, once the binary grows.
-rw-r--r--sys/arch/i386/stand/boot/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index 33d0f43ceea..d4b0471601d 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2012/10/12 14:58:26 jsing Exp $
+# $OpenBSD: Makefile,v 1.43 2012/10/12 15:03:22 jsing Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -18,7 +18,7 @@ LDFLAGS+=-nostdlib -Bstatic -nopie
CLEANFILES+= srt0.o
SRCS= crt0.c
.else
-LDFLAGS+=-Ttext $(LINKADDR) -Z -x
+LDFLAGS+=-Ttext $(LINKADDR) -N -x
CLEANFILES+= crt0.o
SRCS= srt0.S
.endif