svn commit: r347905 - stable/12/sys/conf

[Mark Johnston]

Author: markj
Date: Fri May 17 14:09:33 2019
New Revision: 347905
URL: https://svnweb.freebsd.org/changeset/base/347905

Log:
  MFC r347569:
  Remove redundant -Wl uses from the kernel's LDFLAGS.

Modified:
  stable/12/sys/conf/kern.pre.mk
  stable/12/sys/conf/kmod.mk
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/conf/kern.pre.mk
==============================================================================
--- stable/12/sys/conf/kern.pre.mk	Fri May 17 14:08:58 2019	(r347904)
+++ stable/12/sys/conf/kern.pre.mk	Fri May 17 14:09:33 2019	(r347905)
@@ -118,7 +118,7 @@ DEFINED_PROF=	${PROF}
 CFLAGS+=	${CONF_CFLAGS}
 
 .if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id}
-LDFLAGS+=	-Wl,--build-id=sha1
+LDFLAGS+=	--build-id=sha1
 .endif
 
 .if (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
@@ -127,11 +127,11 @@ LDFLAGS+=	-Wl,--build-id=sha1
 .error amd64/arm64/i386 kernel requires linker ifunc support
 .endif
 .if ${MACHINE_CPUARCH} == "amd64"
-LDFLAGS+=	-Wl,-z max-page-size=2097152
+LDFLAGS+=	-z max-page-size=2097152
 .if ${LINKER_TYPE} != "lld"
-LDFLAGS+=	-Wl,-z common-page-size=4096
+LDFLAGS+=	-z common-page-size=4096
 .else
-LDFLAGS+=	-Wl,-z -Wl,ifunc-noplt
+LDFLAGS+=	-z ifunc-noplt
 .endif
 .endif
 

Modified: stable/12/sys/conf/kmod.mk
==============================================================================
--- stable/12/sys/conf/kmod.mk	Fri May 17 14:08:58 2019	(r347904)
+++ stable/12/sys/conf/kmod.mk	Fri May 17 14:09:33 2019	(r347905)
@@ -138,7 +138,7 @@ CFLAGS+=	-fno-common
 LDFLAGS+=	-d -warn-common
 
 .if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id}
-LDFLAGS+=	-Wl,--build-id=sha1
+LDFLAGS+=	--build-id=sha1
 .endif
 
 CFLAGS+=	${DEBUG_FLAGS}