From owner-svn-src-projects@freebsd.org  Mon Oct  1 18:16:37 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 748BF10A6449
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon,  1 Oct 2018 18:16:37 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 28FE385AB8;
 Mon,  1 Oct 2018 18:16:37 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 234F7247AD;
 Mon,  1 Oct 2018 18:16:37 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w91IGbCq000442;
 Mon, 1 Oct 2018 18:16:37 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w91IGbKo000440;
 Mon, 1 Oct 2018 18:16:37 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201810011816.w91IGbKo000440@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkim set sender to
 jkim@FreeBSD.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 1 Oct 2018 18:16:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r339070 - projects/openssl111/secure/lib/libcrypto
X-SVN-Group: projects
X-SVN-Commit-Author: jkim
X-SVN-Commit-Paths: projects/openssl111/secure/lib/libcrypto
X-SVN-Commit-Revision: 339070
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2018 18:16:37 -0000

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})