svn commit: r347570 - head/sys/conf

[Mark Johnston]

Author: markj
Date: Tue May 14 18:26:39 2019
New Revision: 347570
URL: https://svnweb.freebsd.org/changeset/base/347570

Log:
  Specify -z notext when building with -z ifunc-noplt.
  
  The upstream implementation of -z ifunc-noplt disallows its combination
  with -z text.  The option does not have much significance for kernel
  builds, though.
  
  Reviewed by:	kib (previous version)
  Discussed with:	emaste
  MFC after:	1 week
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D20260

Modified:
  head/sys/conf/kern.pre.mk

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Tue May 14 18:10:32 2019	(r347569)
+++ head/sys/conf/kern.pre.mk	Tue May 14 18:26:39 2019	(r347570)
@@ -157,7 +157,7 @@ LDFLAGS+=	-z max-page-size=2097152
 .if ${LINKER_TYPE} != "lld"
 LDFLAGS+=	-z common-page-size=4096
 .else
-LDFLAGS+=	-z ifunc-noplt
+LDFLAGS+=	-z notext -z ifunc-noplt
 .endif
 .endif