svn commit: r307954 - head/sys/boot/i386

[Warner Losh]

Author: imp
Date: Wed Oct 26 05:26:58 2016
New Revision: 307954
URL: https://svnweb.freebsd.org/changeset/base/307954

Log:
  Back out the move to the loader script from -N. This should fix the
  crypto-using boot problems.

Modified:
  head/sys/boot/i386/Makefile.inc

Modified: head/sys/boot/i386/Makefile.inc
==============================================================================
--- head/sys/boot/i386/Makefile.inc	Wed Oct 26 05:06:23 2016	(r307953)
+++ head/sys/boot/i386/Makefile.inc	Wed Oct 26 05:26:58 2016	(r307954)
@@ -30,7 +30,9 @@ BTXCRT=		${BTXDIR}/lib/crt0.o
 
 # compact binary with no padding between text, data, bss
 LDSCRIPT=	${SRCTOP}/sys/boot/i386/boot.ldscript
-LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-T,${LDSCRIPT},-S,--oformat,binary
-LD_FLAGS_BIN=-static -T ${LDSCRIPT} --gc-sections
+# LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-T,${LDSCRIPT},-S,--oformat,binary
+# LD_FLAGS_BIN=-static -T ${LDSCRIPT} --gc-sections
+LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
+LD_FLAGS_BIN=-static -N --gc-sections
 
 .include "../Makefile.inc"