From nobody Wed Aug 23 17:50:18 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 4RWDJV66Cyz4r9k1;
Wed, 23 Aug 2023 17:50:18 +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 4RWDJV4bRyz4VsQ;
Wed, 23 Aug 2023 17:50:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1692813018;
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=qqDC+2MPWKp12T3DVXz0fa8CQt/PPR7zgQJp7fAruDk=;
b=Dub08wZkTtx1/wlFJhHrFA+Lfur1K36HNTQ4LOdqM5kjj7EbEOjQqUwPKQRfea3yEM/B7q
oNd4jeThOnPEItmCErMXwzCtxOYpGEtn2PpyM1SU5n+HPiIjEAvWIDazhWfdKFSLx85y4R
0YnwjeZbbH0zuHMNxyzgjW+A9uGliVN9l/1CnGDf4HoLMsfFNgWEWzgmQUj1YqsV3OOS2D
BrAs/9mPD6LrI9lTs5en5rEw0druYaP3es5iA/Iu144avzbRlqQbZ/rgn+cyYJzMVNIAWl
42WHk/OWWoG/1777SDl8g1zXmaXOA0WZ6nrlJ2rHvUl3HMcMq9J8qbwjQn8f9Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1692813018;
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=qqDC+2MPWKp12T3DVXz0fa8CQt/PPR7zgQJp7fAruDk=;
b=cG/HINWtDw/SMdqxD4KGHkCdoRJa4Q0j+ZPV37jE3LWJosuzqmZEpna/6Vmu6LaQmNEgpv
6kgMPMEWdM0wh+Dz0sw14QRLDWo3NKcSfVx6VCa1cZ/3Hr/q9p0vEHQ0ySdb+5vH2Qc6+5
FvlXsGknYbpfMTXJOcMWSI1WD7+QoJaZoJMaTY9dRJhUpT862wTC4rwyRMQ7aSO+b96QPI
UQFAa6WPLamF9LcJErq9QzfZIlhGZyaxa43621YSGxPfGnKShPKnlOS5q8SLcXkQRhU7br
e1hDOyMWZXxnjzaPdcjCHwbHylBxAMdiUUoUv+qZMxBwJvbSwN7Owtj+AMlmJQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813018; a=rsa-sha256; cv=none;
b=i3MPCGsYzLTZut3ePwAAE65BaUXDIOk/RrrZmM+ND5xXP8qk2QOI10PBInZpBF/aWAdd5v
Yi9qMI3wkZIvA6BDpN1y+O3BhqYsqLgLFJEjO8YcjtOi8b7gln2LWrreMBVLyytMOofU5i
leqmogH5wvWubB0V9QGnWWeaQUhP3NYFJoq+99mty5IuOz92nEy9qkuwJq/I1WhTxvcZQi
QQR0ZodgGZgVBUum3RV4az5VlxQp/hOjCNh2Ej4MNu9EhFyI8nVAod5Oeas2Hp3qdNdZXE
DR1Jm+1iPYwwGWh4pJFMG9JWICN0rLxGV5A1UBtd52TWbTKnInZpr+gRKQZfGA==
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 4RWDJV3Sdzzv6B;
Wed, 23 Aug 2023 17:50:18 +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 37NHoImi050562;
Wed, 23 Aug 2023 17:50:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHoIod050559;
Wed, 23 Aug 2023 17:50:18 GMT
(envelope-from git)
Date: Wed, 23 Aug 2023 17:50:18 GMT
Message-Id: <202308231750.37NHoIod050559@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 8f54a610e00d - stable/13 - libcrypto: Don't embed
$FreeBSD$ in generated assembly files
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: imp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 8f54a610e00d946472a3c9b7acee6c0bd08e2f39
Auto-Submitted: auto-generated
The branch stable/13 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=8f54a610e00d946472a3c9b7acee6c0bd08e2f39
commit 8f54a610e00d946472a3c9b7acee6c0bd08e2f39
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-08-22 04:01:48 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-08-23 17:43:35 +0000
libcrypto: Don't embed $FreeBSD$ in generated assembly files
Reviewed by: gallatin, ngie, emaste
Differential Revision: https://reviews.freebsd.org/D41536
(With ppc assembler stuff removed, since that's no in stable/13 yet)
(cherry picked from commit 7a56f5af71851c8b502720ca956629c302821430)
---
secure/lib/libcrypto/Makefile.asm | 48 +++++++++++++--------------------------
1 file changed, 16 insertions(+), 32 deletions(-)
diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm
index 3813adbbba4b..e19410673ecc 100644
--- a/secure/lib/libcrypto/Makefile.asm
+++ b/secure/lib/libcrypto/Makefile.asm
@@ -51,14 +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 '/* $$'FreeBSD'$$ */' ;\
- 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:R:S/$/.pl/}. */' ;\
cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
.pl.S:
env CC=cc perl ${.IMPSRC} linux64 ${.TARGET:R:S/$/.s/}
- ( echo '/* $$'FreeBSD'$$ */' ;\
- 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:R:S/$/.pl/}. */' ;\
cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
.elif defined(ASM_amd64)
@@ -131,8 +129,7 @@ CLEANFILES= ${ASM} ${SHA_ASM:S/$/.s/}
.SUFFIXES: .pl
.pl.S:
- ( echo '/* $$'FreeBSD'$$ */' ;\
- echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
+ ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
env CC=cc perl ${.IMPSRC} elf ) > ${.TARGET}
${SHA_TMP}: ${SHA_SRC}
@@ -140,8 +137,7 @@ ${SHA_TMP}: ${SHA_SRC}
.for s in ${SHA_ASM}
${s}.S: ${s}.s
- ( echo '/* $$'FreeBSD'$$ */' ;\
- echo '/* Do not modify. This file is auto-generated from ${SHA_SRC}. */' ;\
+ ( echo '/* Do not modify. This file is auto-generated from ${SHA_SRC}. */' ;\
cat ${s}.s ) > ${.TARGET}
.endfor
@@ -190,14 +186,12 @@ CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/}
.SUFFIXES: .pl
aes-armv4.S: aes-armv4.pl
- ( echo '/* $$'FreeBSD'$$ */' ;\
- echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
+ ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
env CC=cc perl ${.ALLSRC} linux32 ) > ${.TARGET}
.pl.S:
env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/}
- ( echo '/* $$'FreeBSD'$$ */' ;\
- 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:R:S/$/.pl/}. */' ;\
cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
.elif defined(ASM_i386)
@@ -285,8 +279,7 @@ CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/}
.SUFFIXES: .pl
.pl.S:
- ( echo '/* $$'FreeBSD'$$ */' ;\
- echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
+ ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
echo '#ifdef PIC' ;\
env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} -fpic -DPIC ${.IMPSRC:R:S/$/.s/} ;\
cat ${.IMPSRC:R:S/$/.s/} ;\
@@ -337,20 +330,17 @@ CLEANFILES= ${ASM}
sha256-ppc.S: sha512-ppc.pl
env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/}
- ( echo '/* $$'FreeBSD'$$ */' ;\
- 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:R:S/$/.pl/}. */' ;\
cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
sha256p8-ppc.S: sha512p8-ppc.pl
env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/}
- ( echo '/* $$'FreeBSD'$$ */' ;\
- 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:R:S/$/.pl/}. */' ;\
cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
.pl.S:
env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/}
- ( echo '/* $$'FreeBSD'$$ */' ;\
- 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:R:S/$/.pl/}. */' ;\
cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
.elif defined(ASM_powerpc64)
@@ -402,20 +392,17 @@ CLEANFILES= ${ASM}
sha256-ppc.S: sha512-ppc.pl
env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/}
- ( echo '/* $$'FreeBSD'$$ */' ;\
- 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:R:S/$/.pl/}. */' ;\
cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
sha256p8-ppc.S: sha512p8-ppc.pl
env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/}
- ( echo '/* $$'FreeBSD'$$ */' ;\
- 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:R:S/$/.pl/}. */' ;\
cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
.pl.S:
env CC=cc perl ${.IMPSRC} linux64v2 ${.TARGET:R:S/$/.s/}
- ( echo '/* $$'FreeBSD'$$ */' ;\
- 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:R:S/$/.pl/}. */' ;\
cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
.elif defined(ASM_powerpc64le)
@@ -467,20 +454,17 @@ CLEANFILES= ${ASM}
sha256-ppc.S: sha512-ppc.pl
env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/}
- ( echo '/* $$'FreeBSD'$$ */' ;\
- 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:R:S/$/.pl/}. */' ;\
cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
sha256p8-ppc.S: sha512p8-ppc.pl
env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/}
- ( echo '/* $$'FreeBSD'$$ */' ;\
- 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:R:S/$/.pl/}. */' ;\
cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
.pl.S:
env CC=cc perl ${.IMPSRC} linux64le ${.TARGET:R:S/$/.s/}
- ( echo '/* $$'FreeBSD'$$ */' ;\
- 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:R:S/$/.pl/}. */' ;\
cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
.endif