svn commit: r339070 - projects/openssl111/secure/lib/libcrypto

[Jung-uk Kim]

Author: jkim
Date: Mon Oct  1 18:16:36 2018
New Revision: 339070
URL: https://svnweb.freebsd.org/changeset/base/339070

Log:
  Drop pre-AVX toolchain for amd64 and i386 to simplify the makefile.
  
  Especially, head does not support old toolchains because of ifunc support.

Modified:
  projects/openssl111/secure/lib/libcrypto/Makefile.inc

Modified: projects/openssl111/secure/lib/libcrypto/Makefile.inc
==============================================================================
--- projects/openssl111/secure/lib/libcrypto/Makefile.inc	Mon Oct  1 18:15:25 2018	(r339069)
+++ projects/openssl111/secure/lib/libcrypto/Makefile.inc	Mon Oct  1 18:16:36 2018	(r339070)
@@ -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})