From 3b88196b04890eea13cff334650aff7f0fb8fc6b Mon Sep 17 00:00:00 2001 From: Alfredo Mazzinghi Date: Fri, 22 Mar 2024 15:11:21 +0000 Subject: [PATCH] morello: Disable libssl ASM optimisation in the base system. The hybrid ABI libssl uses optimised assembly implementations for crypto functions. This is a problem for benchmarks because we don't currently have pure-capability variants of these functions. This patch temporarily disables ASM optimisations on AArch64, so that we maintain the same behaviour on all ABIs. --- secure/lib/libcrypto/Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Makefile.common index 8c8fcdb8a54d..adb0695b9c84 100644 --- a/secure/lib/libcrypto/Makefile.common +++ b/secure/lib/libcrypto/Makefile.common @@ -10,7 +10,7 @@ CFLAGS+= -DB_ENDIAN .ifndef WITHOUT_AUTO_ASM .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386" -.if !${MACHINE_ARCH:Maarch64*c*} +.if !${MACHINE_ARCH:Maarch64*} ASM_${MACHINE_CPUARCH}= .endif .elif ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" || \