From 683d164a600bd265966d3955e29f87c9200eb7bd Mon Sep 17 00:00:00 2001
From: jkim <jkim@FreeBSD.org>
Date: Mon, 1 Oct 2018 18:16:36 +0000
Subject: [PATCH] Drop pre-AVX toolchain for amd64 and i386 to simplify the
 makefile.

Especially, head does not support old toolchains because of ifunc support.
---
 secure/lib/libcrypto/Makefile.inc | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index 5e28c1aa3c5..75b67763e1d 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -21,16 +21,9 @@ CFLAGS+=	-DL_ENDIAN
 CFLAGS+=	-DB_ENDIAN
 .endif
 
-.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm"
+.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
+    ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386"
 ASM_${MACHINE_CPUARCH}=
-.elif ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
-_ASM_AVX!=	{ \
-		    echo vzeroall | \
-		    ${CC} -x assembler -o /dev/null -c - 2> /dev/null; \
-		} && echo yes || echo no
-.if ${_ASM_AVX} == yes
-ASM_${MACHINE_CPUARCH}=
-.endif
 .endif
 
 .if defined(ASM_${MACHINE_CPUARCH})
-- 
2.45.0