svn commit: r366644 - in head/stand/efi: boot1 loader

[Alex Richardson]

Author: arichardson
Date: Mon Oct 12 11:27:08 2020
New Revision: 366644
URL: https://svnweb.freebsd.org/changeset/base/366644

Log:
  Link efi programs with -pie rather than -shared
  
  This was causing build failures in CheriBSD where we were passing -pie
  already by default.
  
  Reviewed By:	andrew
  Differential Revision: https://reviews.freebsd.org/D24787

Modified:
  head/stand/efi/boot1/Makefile
  head/stand/efi/loader/Makefile

Modified: head/stand/efi/boot1/Makefile
==============================================================================
--- head/stand/efi/boot1/Makefile	Mon Oct 12 11:04:52 2020	(r366643)
+++ head/stand/efi/boot1/Makefile	Mon Oct 12 11:27:08 2020	(r366644)
@@ -63,7 +63,7 @@ FILES=	${BOOT1}.efi
 FILESMODE_${BOOT1}.efi=	${BINMODE}
 
 LDSCRIPT=	${EFISRC}/loader/arch/${MACHINE}/ldscript.${MACHINE}
-LDFLAGS+=	-Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -shared
+LDFLAGS+=	-Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie
 
 .if ${MACHINE_CPUARCH} == "aarch64"
 CFLAGS+=	-mgeneral-regs-only

Modified: head/stand/efi/loader/Makefile
==============================================================================
--- head/stand/efi/loader/Makefile	Mon Oct 12 11:04:52 2020	(r366643)
+++ head/stand/efi/loader/Makefile	Mon Oct 12 11:27:08 2020	(r366644)
@@ -82,7 +82,7 @@ LINKS+=		${BINDIR}/${LOADER}.efi ${BINDIR}/loader.efi
 .endif
 
 LDSCRIPT=	${.CURDIR}/../loader/arch/${MACHINE}/ldscript.${MACHINE}
-LDFLAGS+=	-Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -shared
+LDFLAGS+=	-Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie
 
 CLEANFILES+=	loader.efi