git: 7a56f5af7185 - main - libcrypto: Don't embed $FreeBSD$ in generated assembly files

Reply: Enji Cooper : "Re: git: 7a56f5af7185 - main - libcrypto: Don't embed $FreeBSD$ in generated assembly files"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: John Baldwin <jhb_at_FreeBSD.org>
Date: Tue, 22 Aug 2023 04:04:21 UTC
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=7a56f5af71851c8b502720ca956629c302821430

commit 7a56f5af71851c8b502720ca956629c302821430
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-08-22 04:01:48 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-08-22 04:01:48 +0000

    libcrypto: Don't embed $FreeBSD$ in generated assembly files
    
    Reviewed by:    gallatin, ngie, emaste
    Differential Revision:  https://reviews.freebsd.org/D41536
---
 secure/lib/libcrypto/Makefile.asm | 57 +++++++++++++--------------------------
 1 file changed, 19 insertions(+), 38 deletions(-)

diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm
index 791e36229343..b9af383e492f 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,26 +330,22 @@ CLEANFILES=	${ASM}
 
 bn-ppc.S:	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}
 
 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)
@@ -408,26 +397,22 @@ CLEANFILES=	${ASM}
 
 bn-ppc.S:	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}
 
 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)
@@ -479,26 +464,22 @@ CLEANFILES=	${ASM}
 
 bn-ppc.S:	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}
 
 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