From owner-svn-src-head@FreeBSD.ORG  Thu Jul 12 21:31:54 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 552F6106566B;
	Thu, 12 Jul 2012 21:31:54 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3FB628FC16;
	Thu, 12 Jul 2012 21:31:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6CLVs9j030191;
	Thu, 12 Jul 2012 21:31:54 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6CLVsij030189;
	Thu, 12 Jul 2012 21:31:54 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201207122131.q6CLVsij030189@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 12 Jul 2012 21:31:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238407 - head/secure/lib/libcrypto
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Jul 2012 21:31:54 -0000

Author: jkim
Date: Thu Jul 12 21:31:53 2012
New Revision: 238407
URL: http://svn.freebsd.org/changeset/base/238407

Log:
  Sort ASM definitions by crypto module for slightly easier maintenance.
  Specifically, GHASH_ASM belongs to crypto/modes.

Modified:
  head/secure/lib/libcrypto/Makefile.inc

Modified: head/secure/lib/libcrypto/Makefile.inc
==============================================================================
--- head/secure/lib/libcrypto/Makefile.inc	Thu Jul 12 19:34:30 2012	(r238406)
+++ head/secure/lib/libcrypto/Makefile.inc	Thu Jul 12 21:31:53 2012	(r238407)
@@ -22,16 +22,18 @@ CFLAGS+=-DL_ENDIAN -DOPENSSL_IA32_SSE2
 CFLAGS+=-DAES_ASM -DBSAES_ASM -DVPAES_ASM
 CFLAGS+=-DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m
 CFLAGS+=-DMD5_ASM
+CFLAGS+=-DGHASH_ASM
 CFLAGS+=-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
-CFLAGS+=-DWHIRLPOOL_ASM -DGHASH_ASM
+CFLAGS+=-DWHIRLPOOL_ASM
 .elif ${MACHINE_CPUARCH} == "i386"
 CFLAGS+=-DL_ENDIAN -DOPENSSL_IA32_SSE2
 CFLAGS+=-DAES_ASM -DVPAES_ASM
 CFLAGS+=-DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 CFLAGS+=-DMD5_ASM
+CFLAGS+=-DGHASH_ASM
 CFLAGS+=-DRMD160_ASM
 CFLAGS+=-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
-CFLAGS+=-DWHIRLPOOL_ASM -DGHASH_ASM
+CFLAGS+=-DWHIRLPOOL_ASM
 .endif
 
 MANDIR=	${SHAREDIR}/openssl/man/man