Index: projects/openssl111/secure/lib/libcrypto/Makefile.inc
===================================================================
--- projects/openssl111/secure/lib/libcrypto/Makefile.inc	(revision 339069)
+++ projects/openssl111/secure/lib/libcrypto/Makefile.inc	(revision 339070)
@@ -1,90 +1,83 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 # OpenSSL version used for manual page generation
 OPENSSL_VER=	1.1.1
 OPENSSL_DATE=	2018-09-11
 
 LCRYPTO_SRC=	${SRCTOP}/crypto/openssl
 LCRYPTO_DOC=	${LCRYPTO_SRC}/doc
 
 CFLAGS+=	-I${LCRYPTO_SRC}
 CFLAGS+=	-I${LCRYPTO_SRC}/crypto/include
 CFLAGS+=	-I${LCRYPTO_SRC}/include
 
 .include <bsd.endian.mk>
 
 .if ${TARGET_ENDIANNESS} == 1234
 CFLAGS+=	-DL_ENDIAN
 .elif ${TARGET_ENDIANNESS} == 4321
 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})
 CFLAGS+=	-DOPENSSL_CPUID_OBJ
 .if defined(ASM_aarch64)
 CFLAGS+=	-DOPENSSL_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
 CFLAGS+=	-DOPENSSL_BN_ASM_GF2m
 CFLAGS+=	-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
 CFLAGS+=	-DKECCAK1600_ASM
 CFLAGS+=	-DRC4_ASM
 CFLAGS+=	-DMD5_ASM
 CFLAGS+=	-DAES_ASM -DVPAES_ASM -DBSAES_ASM
 CFLAGS+=	-DGHASH_ASM
 CFLAGS+=	-DECP_NISTZ256_ASM -DX25519_ASM
 CFLAGS+=	-DPADLOCK_ASM
 CFLAGS+=	-DPOLY1305_ASM
 .elif defined(ASM_arm)
 CFLAGS+=	-DOPENSSL_BN_ASM_MONT -DOPENSSL_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
 CFLAGS+=	-DOPENSSL_BN_ASM_GF2m
 CFLAGS+=	-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
 CFLAGS+=	-DRC4_ASM
 CFLAGS+=	-DMD5_ASM
 CFLAGS+=	-DRMD160_ASM
 CFLAGS+=	-DAES_ASM -DVPAES_ASM
 CFLAGS+=	-DWHIRLPOOL_ASM
 CFLAGS+=	-DGHASH_ASM
 CFLAGS+=	-DECP_NISTZ256_ASM
 CFLAGS+=	-DPADLOCK_ASM
 CFLAGS+=	-DPOLY1305_ASM
 .endif
 .endif
 
 .if defined(LIB)
 CFLAGS+=	-DOPENSSLDIR="\"/etc/ssl\""
 CFLAGS+=	-DENGINESDIR="\"/usr/lib/engines\""
 .endif
 
 CFLAGS+=	-DNDEBUG
 
 MANDIR=		${SHAREDIR}/openssl/man/man