summaryrefslogtreecommitdiff
path: root/secure
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2018-10-01 18:16:36 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2018-10-01 18:16:36 +0000
commit2f0b51ed02117568e5c08f0094853fc74b5abc1b (patch)
tree8967fe50c141a4fdfbf8645a5611c98a56698698 /secure
parent8fef2de1fc0aedb055fbd6212287261eec857d49 (diff)
downloadsrc-test-2f0b51ed02117568e5c08f0094853fc74b5abc1b.tar.gz
src-test-2f0b51ed02117568e5c08f0094853fc74b5abc1b.zip
Drop pre-AVX toolchain for amd64 and i386 to simplify the makefile.
Especially, head does not support old toolchains because of ifunc support.
Notes
Notes: svn path=/projects/openssl111/; revision=339070
Diffstat (limited to 'secure')
-rw-r--r--secure/lib/libcrypto/Makefile.inc11
1 files changed, 2 insertions, 9 deletions
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index 5e28c1aa3c5cb..75b67763e1ddb 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})