git: 8f54a610e00d - stable/13 - libcrypto: Don't embed $FreeBSD$ in generated assembly files
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 23 Aug 2023 17:50:18 UTC
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