From nobody Fri May 23 23:48:25 2025 X-Original-To: dev-commits-src-main@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 4b420n6J1Yz5wmhr; Fri, 23 May 2025 23:48:25 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b420n5c1pz41GP; Fri, 23 May 2025 23:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044105; 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=4i0m+ryU54JXcBdPsZShm0Xm8Ukz7mj1mJ6/s1RaK3o=; b=F4xwntiYL1bN7jhGdgC6ARSsNnT05j8GSs3SUR0k4UYMZ6cHVRbjcjCP0DWx08JhrURFlk oOPW/Gt3v01PmlO2OZRMj/9VjU/DiEFZqKilfijSQo/ryGX/qv6u14UyZL0gx4niA/pBxK YeIez6GhNGNXa2ax1Ay3gYW61UehXzCOywPdQvBHwP4pTorAWOASqee2EIt8qi4KKt7Ajj QK5/2EKk0jtYSSZtrPz31ovo7QXQCvbgeicHZ8F/M3bNf5pL8Me6ILXG/vVFrAxP3bs4pL dB+zD/8nt+ctvBrYOEvksF84Ia/b8rQkIJM6lny2/3tZj+fE86eOwesyHEYhNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044105; 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=4i0m+ryU54JXcBdPsZShm0Xm8Ukz7mj1mJ6/s1RaK3o=; b=N6ix4bK8txni4n5EcVtIUULlrMkFOTwKh2Omm/TQUxUObRczB6O707FfKH8maZ07y87PlW UNSI3Cd2BJpKs7yeVQDfmtxzzkXGU5xyjk20eRx+IPNfDNNTIEwsvURKrPPclX49F5i6Q1 PMin3G5cTDwjy8ER3CXl+iKhfsMTLXwrZ9xrFfLyJieymib94+OIDf4CxJMzKZ2povf6R/ OjAWMMlmbmjPy0gwj89rjt0A8aqFwic/mTr+jhqiObhhvJWUssoo0aBmyy8IVomQstsz8b ElQPO20ahCAh/6UzpfOJvnFXGH+9Wnq9GC/yOrIgNwOLTvU+MvQpa/jvSHMW1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748044105; a=rsa-sha256; cv=none; b=wbUc/icOkyAhGcxWRqLhJV1dpYtP4Cv+Zd2MWCLSUkQipjYJOQry1b2qz8ddrEv2nEPaiP 6kLSCaJfIFyo+T1lKZIZxA1iqqKaH2Z4P/Yu5GLN2LxYPHfVc+qdqk3wiqcpvXOZpEoiZz f1iFxIon1tnFFZvhxNhc8COoUQx6m5b76/A+ZKicYxhSNy2/OZ7216vsjbjCZYBYs0JRYw HveGDvLZV1uIbZp91KV+FyjLIFbYqRGliBiXZAettqpTK1HdbTA+U5WnJXqenHJZMfKpnc 7e5ob8RCl3NpbU/+KFmRi0ad/AWQU3sxYIekBQLzRtoAT6kFSoMM1HGWWySH+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b420n5BDwz1QMr; Fri, 23 May 2025 23:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54NNmPUs046715; Fri, 23 May 2025 23:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NNmPEH046712; Fri, 23 May 2025 23:48:25 GMT (envelope-from git) Date: Fri, 23 May 2025 23:48:25 GMT Message-Id: <202505232348.54NNmPEH046712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 83812c4eccb3 - main - bsd.suffixes-extra.mk: rewrap long lines List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83812c4eccb3c81e0fe97e9a5b325409ef8ba2ce Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=83812c4eccb3c81e0fe97e9a5b325409ef8ba2ce commit 83812c4eccb3c81e0fe97e9a5b325409ef8ba2ce Author: Brooks Davis AuthorDate: 2025-05-23 23:32:05 +0000 Commit: Brooks Davis CommitDate: 2025-05-23 23:32:05 +0000 bsd.suffixes-extra.mk: rewrap long lines Group CFLAGS variables together either on one line or all separate depending on length. Reviewed by: jhb Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D50463 --- share/mk/bsd.suffixes-extra.mk | 49 +++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/share/mk/bsd.suffixes-extra.mk b/share/mk/bsd.suffixes-extra.mk index 629c3177cec7..680abfc88eb4 100644 --- a/share/mk/bsd.suffixes-extra.mk +++ b/share/mk/bsd.suffixes-extra.mk @@ -11,32 +11,47 @@ PICFLAG?=-fpic PIEFLAG?=-fpie .c.pico: - ${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CC} ${PICFLAG} -DPIC \ + ${SHARED_CFLAGS} ${CFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .c.nossppico: - ${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} -c ${.IMPSRC} -o ${.TARGET} + ${CC} ${PICFLAG} -DPIC \ + ${SHARED_CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} \ + ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} \ + -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .c.pieo: - ${CC} ${PIEFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CC} ${PIEFLAG} -DPIC \ + ${SHARED_CFLAGS} ${CFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .cc.pico .C.pico .cpp.pico .cxx.pico: - ${CXX} ${PICFLAG} -DPIC ${SHARED_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CXX} ${PICFLAG} -DPIC \ + ${SHARED_CXXFLAGS} ${CXXFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} .cc.nossppico .C.nossppico .cpp.nossppico .cxx.nossppico: - ${CXX} ${PICFLAG} -DPIC ${SHARED_CXXFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} ${CXXFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} -c ${.IMPSRC} -o ${.TARGET} + ${CXX} ${PICFLAG} -DPIC \ + ${SHARED_CXXFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} \ + ${CXXFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} \ + -c ${.IMPSRC} -o ${.TARGET} .cc.pieo .C.pieo .cpp.pieo .cxx.pieo: - ${CXX} ${PIEFLAG} ${SHARED_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CXX} ${PIEFLAG} ${SHARED_CXXFLAGS} ${CXXFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} .f.pico: ${FC} ${PICFLAG} -DPIC ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} ${CTFCONVERT_CMD} .f.nossppico: - ${FC} ${PICFLAG} -DPIC ${FFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} -o ${.TARGET} -c ${.IMPSRC} + ${FC} ${PICFLAG} -DPIC \ + ${FFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \ + -o ${.TARGET} -c ${.IMPSRC} ${CTFCONVERT_CMD} .s.pico .s.nossppico .s.pieo: @@ -45,31 +60,39 @@ PIEFLAG?=-fpie .asm.pico: ${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PICFLAG} -DPIC \ - ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CFLAGS} ${ACFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .asm.nossppico: ${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PICFLAG} -DPIC \ - ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \ + ${ACFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .asm.pieo: ${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PIEFLAG} -DPIC \ - ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CFLAGS} ${ACFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .S.pico: - ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC ${CFLAGS} ${ACFLAGS} \ + ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC \ + ${CFLAGS} ${ACFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .S.nossppico: - ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} ${ACFLAGS} \ + ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC \ + ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \ + ${ACFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .S.pieo: - ${CC:N${CCACHE_BIN}} ${PIEFLAG} -DPIC ${CFLAGS} ${ACFLAGS} \ + ${CC:N${CCACHE_BIN}} ${PIEFLAG} -DPIC \ + ${CFLAGS} ${ACFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD}