git: ef81451d114e - stable/14 - libcrypto: Add buildasm and cleanasm targets
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Sep 2023 20:56:40 UTC
The branch stable/14 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=ef81451d114ebae9f77e195534898b6c4061aa69
commit ef81451d114ebae9f77e195534898b6c4061aa69
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-08-29 21:39:54 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-09-08 20:55:44 +0000
libcrypto: Add buildasm and cleanasm targets
These targets generate all the assembly files in sys/crypto/openssl.
Reviewed by: markj, emaste (earlier version)
Differential Revision: https://reviews.freebsd.org/D41590
(cherry picked from commit 73653b72af65e294dcfedc43a8ea09b2137d72ed)
---
secure/lib/libcrypto/Makefile | 7 +++++++
secure/lib/libcrypto/Makefile.common | 2 ++
2 files changed, 9 insertions(+)
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index f4bd4a3247f3..ab9044ad67f9 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -606,6 +606,13 @@ buildinf.h: Makefile
echo "static const char compiler_flags[] = \"compiler: ${COMPILER_TYPE}\";" ) \
> ${.TARGET}
+buildasm cleanasm:
+.for arch in aarch64 amd64 arm i386 powerpc powerpc64 powerpc64le
+ make MK_AUTO_OBJ=no -DWITHOUT_AUTO_ASM -DASM_${arch} \
+ -f ${.CURDIR}/Makefile.asm -C ${SRCTOP}/sys/crypto/openssl/${arch} \
+ ${.TARGET:S/build/all/:S/asm$//}
+.endfor
+
.include <bsd.lib.mk>
PICFLAG+= -DOPENSSL_PIC
diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Makefile.common
index a52e2979060a..b109fd7f7f4f 100644
--- a/secure/lib/libcrypto/Makefile.common
+++ b/secure/lib/libcrypto/Makefile.common
@@ -7,6 +7,7 @@ CFLAGS+= -DL_ENDIAN
CFLAGS+= -DB_ENDIAN
.endif
+.ifndef WITHOUT_AUTO_ASM
.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386"
ASM_${MACHINE_CPUARCH}=
@@ -14,6 +15,7 @@ ASM_${MACHINE_CPUARCH}=
${MACHINE_ARCH} == "powerpc64le"
ASM_${MACHINE_ARCH}=
.endif
+.endif
.if defined(ASM_${MACHINE_CPUARCH}) || defined(ASM_${MACHINE_ARCH})
CFLAGS+= -DOPENSSL_CPUID_OBJ