svn commit: r333048 - stable/11/stand/i386

[Ed Maste]

Author: emaste
Date: Fri Apr 27 01:21:52 2018
New Revision: 333048
URL: https://svnweb.freebsd.org/changeset/base/333048

Log:
  MFC r332090: stand: pass --no-rosegment for i386 bits when linking with lld
  
  btxld does not correctly handle input with other than 2 PT_LOAD
  segments.  Passing --no-rosegment lets lld produce output eqivalent to
  ld.bfd: 2 PT_LOAD segments and no PT_GNU_RELRO.
  
  PR:		225775
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/stand/i386/Makefile.inc
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/stand/i386/Makefile.inc
==============================================================================
--- stable/11/stand/i386/Makefile.inc	Fri Apr 27 00:12:00 2018	(r333047)
+++ stable/11/stand/i386/Makefile.inc	Fri Apr 27 01:21:52 2018	(r333048)
@@ -2,8 +2,13 @@
 #
 # $FreeBSD$
 
+.sinclude <bsd.linker.mk>
+
 LOADER_ADDRESS?=0x200000
 LDFLAGS+=	-nostdlib
+.if defined(LINKER_TYPE) && ${LINKER_TYPE} == "lld"
+LDFLAGS+=	-Wl,--no-rosegment
+.endif
 
 # BTX components
 BTXDIR=		${BOOTOBJ}/i386/btx