From 604871c9df53ade2a0df00df5804a06ffbf03071 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Sat, 22 Sep 2018 05:16:06 +0000
Subject: [PATCH] Add CFLAGS for aarch64/arm assembly files.
---
secure/lib/libcrypto/Makefile.inc | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index f98ce39468e1..73e4e144bff0 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -36,11 +36,16 @@ ASM_${MACHINE_CPUARCH}=
.if defined(ASM_${MACHINE_CPUARCH})
CFLAGS+= -DOPENSSL_CPUID_OBJ
.if defined(ASM_aarch64)
+CFLAGS+= -OPENSSL_BN_ASM_MONT
CFLAGS+= -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
+CFLAGS+= -DKECCAK1600_ASM
+CFLAGS+= -DVPAES_ASM
+CFLAGS+= -DECP_NISTZ256_ASM
+CFLAGS+= -DPOLY1305_ASM
.elif defined(ASM_amd64)
CFLAGS+= -DOPENSSL_IA32_SSE2
-CFLAGS+= -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 \
- -DOPENSSL_BN_ASM_GF2m
+CFLAGS+= -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5
+CFLAGS+= -DOPENSSL_BN_ASM_GF2m
CFLAGS+= -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
CFLAGS+= -DKECCAK1600_ASM
CFLAGS+= -DRC4_ASM
@@ -50,6 +55,14 @@ CFLAGS+= -DGHASH_ASM
CFLAGS+= -DECP_NISTZ256_ASM -DX25519_ASM
CFLAGS+= -DPADLOCK_ASM
CFLAGS+= -DPOLY1305_ASM
+.elif defined(ASM_arm)
+CFLAGS+= -OPENSSL_BN_ASM_MONT -OPENSSL_BN_ASM_GF2m
+CFLAGS+= -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
+CFLAGS+= -DKECCAK1600_ASM
+CFLAGS+= -DAES_ASM -DBSAES_ASM
+CFLAGS+= -DGHASH_ASM
+CFLAGS+= -DECP_NISTZ256_ASM
+CFLAGS+= -DPOLY1305_ASM
.elif defined(ASM_i386)
CFLAGS+= -DOPENSSL_IA32_SSE2
CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT