D41590.id126664.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D41590.id126664.diff
View Options

	diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
	--- a/secure/lib/libcrypto/Makefile
	+++ b/secure/lib/libcrypto/Makefile
	@@ -606,6 +606,13 @@
	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
	--- a/secure/lib/libcrypto/Makefile.common
	+++ b/secure/lib/libcrypto/Makefile.common
	@@ -7,6 +7,7 @@
	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 @@
	${MACHINE_ARCH} == "powerpc64le"
	ASM_${MACHINE_ARCH}=
	.endif
	+.endif

	.if defined(ASM_${MACHINE_CPUARCH}) \|\| defined(ASM_${MACHINE_ARCH})
	CFLAGS+= -DOPENSSL_CPUID_OBJ