From nobody Tue Dec 26 23:55:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T0BVN3FB7z54ZkT; Tue, 26 Dec 2023 23:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0BVN2NHWz4GjV; Tue, 26 Dec 2023 23:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703634940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bTc6e56b6eZQ1QiLAeOnxJ+JDB0dl12f96SQAi2AWF0=; b=YTR4mrsQJK25Ys83C2417qbd+yZ5GG+TMfdQcTHqtpZgc0Mt303crErbLraMoIikK47Btk cihBvqmSWQLiFF2pZo3IE5kZ6Se6lcaCuRWdIllpeTZz7pSuEk+TOLCpPBLbJ4jyu56EdR k4997gbe16nHDA3zxuoXqc7D60zAH1OQHBehPSkyxyBR3/pRfRT1+331GOaBmdSk+hVPOJ 46a9SJPjDMasu/iFbqdD2Dcx+OIZm6iEZRX9vNhtSKN1FuVVZ+X9rEYhH6m3dDKHSsZd76 3Wy4DXUPey5gRIHcr2L2wMNknlkA8fiQl9acPm0XA4iC7KLUqUes080VsCvGMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703634940; a=rsa-sha256; cv=none; b=HMnpmk2QP+MNOWx0GMg9r/7RrC5mEwnV796gkUyFerMBh81a2JdEVkxQC174xbOp++zn0h zGAGhNsEOC0BN11Bf6quy/wg2pakl7dWdw5Qw2HlqnHY5G1ZiS+eTegkm66rxJMGcK3zzd C0XEjpQM9/kYlTrwEMlMdTpbz2eBXRoNC7KblwK4pNJD4fh95IRULzChmAn4hAKAB3sguW I/spVzgsuVVNMuGwoBGfgggbPR8lLvDL7ybJguONNKl37x/3qG8hmTV6HOw4vq6cKt+xfZ IP5+WTOQVku6fqETqAh0hu/+fQcAqUi9WJ0x0MOJTECWyH6WMbFUCgLGRtMEeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703634940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bTc6e56b6eZQ1QiLAeOnxJ+JDB0dl12f96SQAi2AWF0=; b=SfZfY3gtuOkVYwjHXopIOMPwSz9d142SeajKl4z9a//IVGddbMoZNCwLpgtL0Karv0ZRbe lo/a23zPNXbCYkn7g7kul8hocV6FdklL/uNQ1sJdytAAG/ZusjfXk9a5rdm+ereAJ+xfeu 55kgnQfc/Tvs7w8TGbJ3Ptshk/WXE3hDelZmeC0fXXcHyKv46+IK5Q+aEJFHuZdhR6hboH zsUAxVu2YxmvygRUP536tazqWPJUE5nofjfQUrQKUxvGc55gAsHx1btCrqrTH60ruU7q+a oarZ3Ty6xS1JIGuJEeQW1Bz+uaX7w9vvBvptlfBocyEBjChUOdsiZSpygiE8mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0BVN1RK6z1RK; Tue, 26 Dec 2023 23:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQNteqS000869; Tue, 26 Dec 2023 23:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQNtebK000866; Tue, 26 Dec 2023 23:55:40 GMT (envelope-from git) Date: Tue, 26 Dec 2023 23:55:40 GMT Message-Id: <202312262355.3BQNtebK000866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c6ae97c44d4d - main - sys: ${CFLAGS:N-flto} -> ${CFLAGS:N-flto*} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6ae97c44d4dc0d90d20bec3235a6484912767a1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c6ae97c44d4dc0d90d20bec3235a6484912767a1 commit c6ae97c44d4dc0d90d20bec3235a6484912767a1 Author: Alex Xu (Hello71) AuthorDate: 2023-12-26 23:24:53 +0000 Commit: Warner Losh CommitDate: 2023-12-26 23:31:51 +0000 sys: ${CFLAGS:N-flto} -> ${CFLAGS:N-flto*} For the same reason as the original https://reviews.freebsd.org/D9659: -flto=, -flto=full, and -flto=thin also produce the GIMPLE/bitcode which is not supported by genassym, so filter those out as well. Signed-off-by: Alex Xu (Hello71) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/898 --- sys/conf/files.amd64 | 2 +- sys/conf/kern.post.mk | 6 +++--- sys/conf/kmod.mk | 4 ++-- sys/modules/linux/Makefile | 2 +- sys/modules/linux64/Makefile | 2 +- sys/modules/vmm/Makefile | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index dfbe278f0c46..de509e362b6d 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -25,7 +25,7 @@ elf-vdso32.so.o optional compat_freebsd32 \ # ia32_genassym.o standard \ dependency "$S/compat/ia32/ia32_genassym.c offset.inc" \ - compile-with "${CC} ${CFLAGS:N-flto:N-fno-common} -fcommon -c ${.IMPSRC}" \ + compile-with "${CC} ${CFLAGS:N-flto*:N-fno-common} -fcommon -c ${.IMPSRC}" \ no-obj no-implicit-rule \ clean "ia32_genassym.o" # diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index d2968b42f5ef..34877a01b7dd 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -245,20 +245,20 @@ offset.inc: $S/kern/genoffset.sh genoffset.o NM='${NM}' NMFLAGS='${NMFLAGS}' sh $S/kern/genoffset.sh genoffset.o > ${.TARGET} genoffset.o: $S/kern/genoffset.c - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon $S/kern/genoffset.c + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon $S/kern/genoffset.c # genoffset_test.o is not actually used for anything - the point of compiling it # is to exercise the CTASSERT that checks that the offsets in the offset.inc # _lite struct(s) match those in the original(s). genoffset_test.o: $S/kern/genoffset.c offset.inc - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon -DOFFSET_TEST \ + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon -DOFFSET_TEST \ $S/kern/genoffset.c -o ${.TARGET} assym.inc: $S/kern/genassym.sh genassym.o genoffset_test.o NM='${NM}' NMFLAGS='${NMFLAGS}' sh $S/kern/genassym.sh genassym.o > ${.TARGET} genassym.o: $S/$M/$M/genassym.c offset.inc - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon $S/$M/$M/genassym.c + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon $S/$M/$M/genassym.c OBJS_DEPEND_GUESS+= opt_global.h genoffset.o genassym.o vers.o: opt_global.h diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 5d4dcd4371bc..3dc83ce4c423 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -524,13 +524,13 @@ assym.inc: ${SYSDIR}/kern/genassym.sh sh ${SYSDIR}/kern/genassym.sh genassym.o > ${.TARGET} genassym.o: ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c offset.inc genassym.o: ${SRCS:Mopt_*.h} - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon \ + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon \ ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c offset.inc: ${SYSDIR}/kern/genoffset.sh genoffset.o sh ${SYSDIR}/kern/genoffset.sh genoffset.o > ${.TARGET} genoffset.o: ${SYSDIR}/kern/genoffset.c genoffset.o: ${SRCS:Mopt_*.h} - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon \ + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon \ ${SYSDIR}/kern/genoffset.c CLEANDEPENDFILES+= ${_ILINKS} diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index d1035445ccfb..88b3b8f5e123 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -135,7 +135,7 @@ linux${SFX}_support.o: linux${SFX}_support.S linux${SFX}_assym.h assym.inc .endif linux${SFX}_genassym.o: offset.inc - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC} + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon ${.IMPSRC} .if !defined(KERNBUILDDIR) .warning Building Linuxulator outside of a kernel does not make sense diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index 05fe76ba6a51..9ac1944ad1a9 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -101,7 +101,7 @@ linux_support.o: linux_support.S assym.inc linux_assym.h ${.ALLSRC:M*.S:u} -o ${.TARGET} linux_genassym.o: offset.inc - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC} + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon ${.IMPSRC} .if !defined(KERNBUILDDIR) .warning Building Linuxulator outside of a kernel does not make sense diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 6bb78d055580..46909dad6c71 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -82,9 +82,9 @@ svm_support.o: ${.IMPSRC} -o ${.TARGET} vmx_genassym.o: offset.inc - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC} + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon ${.IMPSRC} svm_genassym.o: offset.inc - ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC} + ${CC} -c ${CFLAGS:N-flto*:N-fno-common} -fcommon ${.IMPSRC} .include