From owner-svn-src-head@freebsd.org  Fri Sep 29 19:56:10 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C20E4E33FED;
 Fri, 29 Sep 2017 19:56:10 +0000 (UTC) (envelope-from cem@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 mx1.freebsd.org (Postfix) with ESMTPS id 8E7547352F;
 Fri, 29 Sep 2017 19:56:10 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8TJu91c023954;
 Fri, 29 Sep 2017 19:56:09 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8TJu92e023952;
 Fri, 29 Sep 2017 19:56:09 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201709291956.v8TJu92e023952@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: Conrad Meyer <cem@FreeBSD.org>
Date: Fri, 29 Sep 2017 19:56:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324106 - head/sys/crypto/aesni
X-SVN-Group: head
X-SVN-Commit-Author: cem
X-SVN-Commit-Paths: head/sys/crypto/aesni
X-SVN-Commit-Revision: 324106
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Sep 2017 19:56:10 -0000

Author: cem
Date: Fri Sep 29 19:56:09 2017
New Revision: 324106
URL: https://svnweb.freebsd.org/changeset/base/324106

Log:
  aesni(4): Fix GCC build
  
  The GCC xmmintrin.h header brokenly includes mm_malloc.h unconditionally.
  (The Clang version of xmmintrin.h only includes mm_malloc.h if not compiling
  in standalone mode.)
  
  Hack around GCC's broken header by defining the include guard macro ahead of
  including xmmintrin.h.
  
  Reported by:	lwhsu, jhb
  Tested by:	lwhsu
  Sponsored by:	Dell EMC Isilon

Modified:
  head/sys/crypto/aesni/intel_sha1.c
  head/sys/crypto/aesni/intel_sha256.c

Modified: head/sys/crypto/aesni/intel_sha1.c
==============================================================================
--- head/sys/crypto/aesni/intel_sha1.c	Fri Sep 29 17:09:13 2017	(r324105)
+++ head/sys/crypto/aesni/intel_sha1.c	Fri Sep 29 19:56:09 2017	(r324106)
@@ -59,9 +59,10 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <immintrin.h>
-
+#include <crypto/aesni/aesni_os.h>
 #include <crypto/aesni/sha_sse.h>
+
+#include <immintrin.h>
 
 void intel_sha1_step(uint32_t *digest, const char *data, uint32_t num_blks) {
    __m128i abcd, e0, e1;

Modified: head/sys/crypto/aesni/intel_sha256.c
==============================================================================
--- head/sys/crypto/aesni/intel_sha256.c	Fri Sep 29 17:09:13 2017	(r324105)
+++ head/sys/crypto/aesni/intel_sha256.c	Fri Sep 29 19:56:09 2017	(r324106)
@@ -59,9 +59,10 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <immintrin.h>
-
+#include <crypto/aesni/aesni_os.h>
 #include <crypto/aesni/sha_sse.h>
+
+#include <immintrin.h>
 
 void intel_sha256_step(uint32_t *digest, const char *data, uint32_t num_blks) {
    __m128i state0, state1;