Date: Tue, 14 May 2019 18:10:32 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r347569 - head/sys/conf Message-ID: <201905141810.x4EIAW3D095910@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Tue May 14 18:10:32 2019 New Revision: 347569 URL: https://svnweb.freebsd.org/changeset/base/347569 Log: Remove redundant -Wl uses from the kernel's LDFLAGS. No functional change intended. MFC after: 3 days Sponsored by: The FreeBSD Foundation Modified: head/sys/conf/kern.pre.mk head/sys/conf/kmod.mk Modified: head/sys/conf/kern.pre.mk ============================================================================== --- head/sys/conf/kern.pre.mk Tue May 14 17:05:02 2019 (r347568) +++ head/sys/conf/kern.pre.mk Tue May 14 18:10:32 2019 (r347569) @@ -144,7 +144,7 @@ CFLAGS+= ${GCOV_CFLAGS} 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" || \ @@ -153,11 +153,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: head/sys/conf/kmod.mk ============================================================================== --- head/sys/conf/kmod.mk Tue May 14 17:05:02 2019 (r347568) +++ head/sys/conf/kmod.mk Tue May 14 18:10:32 2019 (r347569) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905141810.x4EIAW3D095910>