From nobody Wed Oct 25 20:06:24 2023 X-Original-To: dev-commits-src-branches@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 4SG0LV18ZVz4xyMS; Wed, 25 Oct 2023 20:06:26 +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 4SG0LT6ZXxz3Swx; Wed, 25 Oct 2023 20:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698264385; 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=wmaZQ5iT6oRWpwqjiD/5xUhahQAg3v5g4TqXF0CDX+M=; b=r5dpGX442Uq+j0jCBPxdNivH0+4ocRryAT4/zjlWqVV1iHCifjBNnydjU3P14h3N2E3QeW S9/wlHkeDWTSBzUE0swVdLlqTdBKU1qJzlKT1HfW/y9Ok2PnUvTsWGRnK4UIbUyhBHWNSf 7xxuhw1tmCv60wLAOn537oZz/Zpn9vj/SzH2XYnHdMxQh+ziIJgchNCuMoLoEGTZWZ3Txf xGr+wjRkKQSflHxKuIvxgT90FRu4Tfz7In9fZQNBiHnm8k4xYChkGN1J6/yvYW7AU9lc/Z 4oEljQ/NqEanVe4NlNCnz/mF/dBsg+8YlqsUvObkptos5yvai1zV+Yz/f3ZfrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698264385; a=rsa-sha256; cv=none; b=UWlRGef/5QJlxF85t9SHk0W38r0KPpof4eB0oay8P3lDDBNsNfM6zOqUZ+4A4isBv5kS8X kPc6cMNAWhbU/FP2NByMRRxFcnmiO4HcCCMbub82e9b4aa10JgmjZU8U9hKLjuZD7DA2WZ WpOLPhmFOgseZHIjyQZmyP34GVsTtEmMoHyKmHRvFoBkVvjQr++jtGbts/M5FtzSHiTiGy JN0NJDDoONAYGaCx4niJITq48VLU8MvVYgpm4iEQJT22e4h28ZyQN6yPfRvjQAv+g6V9oF yx4yfRMpo1I64yhDe4Nc0eshIiZeHRDMdIeYyKMyIgAOqIMWKFU/lo9q+w5KXQ== 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=1698264385; 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=wmaZQ5iT6oRWpwqjiD/5xUhahQAg3v5g4TqXF0CDX+M=; b=Tym6htnKQ9CsLMGc2PSzXzotUxwzIOrAfcsLEQc/AUYKNz2QvlukKFLHcsE9hfZB5Le+eN hMizKDHKqcAjgPoOitu7bC/NH0ljYVjnScIDX2U8zrRa6C6qlTgNHx/T4QZLnP30APsRC/ /0Gki49SS/vanBYHGueaqgukSIaIOyzxIEiEgH8E2ZzFrgZgKl0jRGgcEECA19eQK/5cz3 ohAkjW01HxHR4WTh4CmgE5btG9A834u7CyJlzOiyVX9FPwghrSxynPJmPbUIfmdNSaVsiw GbvivmEf7dY30p4Jj88kZZGchXEzqM7cGuQlgToY2ZxnNwEKFmDfgNoJS2IHrA== 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 4SG0LT5dH5z1HcW; Wed, 25 Oct 2023 20:06:25 +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 39PK6OiH039812; Wed, 25 Oct 2023 20:06:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PK6Ota039809; Wed, 25 Oct 2023 20:06:24 GMT (envelope-from git) Date: Wed, 25 Oct 2023 20:06:24 GMT Message-Id: <202310252006.39PK6Ota039809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d649e347dfa7 - releng/14.0 - Makefile.asm: Simplify variable expansions in generated headers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: d649e347dfa7a238e1e0db0e9ef4bd4f96df2497 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d649e347dfa7a238e1e0db0e9ef4bd4f96df2497 commit d649e347dfa7a238e1e0db0e9ef4bd4f96df2497 Author: John Baldwin AuthorDate: 2023-08-29 21:38:27 +0000 Commit: Ed Maste CommitDate: 2023-10-25 19:55:00 +0000 Makefile.asm: Simplify variable expansions in generated headers The :R:S expressions removed the .pl extension only to add it back again, so just trim them to using :T alone. Reviewed by: Pierre Pronchery , markj, emaste Differential Revision: https://reviews.freebsd.org/D41588 (cherry picked from commit 7406b6f9761c35eb53f91f54d1a687d96d638907) (cherry picked from commit a3f973f2ea0909be26666d3dcac3c4c45562a678) Approved by: re (gjb) --- secure/lib/libcrypto/Makefile.asm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm index 1199dc830a50..0ee8c17369e9 100644 --- a/secure/lib/libcrypto/Makefile.asm +++ b/secure/lib/libcrypto/Makefile.asm @@ -51,12 +51,12 @@ CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/} sha256-armv8.s sha256-armv8.S: sha512-armv8.pl env CC=cc perl ${.ALLSRC} linux64 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux64 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_amd64) @@ -192,7 +192,7 @@ aes-armv4.S: aes-armv4.pl .pl.S: env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_i386) @@ -331,22 +331,22 @@ CLEANFILES= ${ASM} bn-ppc.S: ppc.pl env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256-ppc.S: sha512-ppc.pl env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256p8-ppc.S: sha512p8-ppc.pl env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_powerpc64) @@ -398,22 +398,22 @@ CLEANFILES= ${ASM} bn-ppc.S: ppc.pl env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256-ppc.S: sha512-ppc.pl env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256p8-ppc.S: sha512p8-ppc.pl env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_powerpc64le) @@ -465,22 +465,22 @@ CLEANFILES= ${ASM} bn-ppc.S: ppc.pl env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256-ppc.S: sha512-ppc.pl env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256p8-ppc.S: sha512p8-ppc.pl env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .endif