svn commit: r281606 - head/sys/crypto/aesni

[Craig Rodrigues]

Author: rodrigc
Date: Thu Apr 16 17:42:52 2015
New Revision: 281606
URL: https://svnweb.freebsd.org/changeset/base/281606

Log:
  In the version of gcc in the FreeBSD tree, this modification was made to
  the compiler in svn r242182:
  
  #if STDC_HOSTED
  #include <mm_malloc.h>
  #endif
  
  A similar change was done to clang in the FreeBSD tree in svn r218893:
  
  However, for external gcc toolchains, this patch is not in the compiler's header
  file.
  
  This patch to FreeBSD's aesni code allows compilation with an external
  gcc toolchain.
  
  Differential Revision: https://reviews.freebsd.org/D2285
  Reviewed by:  jmg, dim
  Approved by:  dim

Added:
  head/sys/crypto/aesni/aesni_os.h   (contents, props changed)
Modified:
  head/sys/crypto/aesni/aesencdec.h
  head/sys/crypto/aesni/aesni_ghash.c

Modified: head/sys/crypto/aesni/aesencdec.h
==============================================================================
--- head/sys/crypto/aesni/aesencdec.h	Thu Apr 16 15:35:17 2015	(r281605)
+++ head/sys/crypto/aesni/aesencdec.h	Thu Apr 16 17:42:52 2015	(r281606)
@@ -27,6 +27,8 @@
  *
  */
 
+#include <crypto/aesni/aesni_os.h>
+
 #include <wmmintrin.h>
 
 static inline void

Modified: head/sys/crypto/aesni/aesni_ghash.c
==============================================================================
--- head/sys/crypto/aesni/aesni_ghash.c	Thu Apr 16 15:35:17 2015	(r281605)
+++ head/sys/crypto/aesni/aesni_ghash.c	Thu Apr 16 17:42:52 2015	(r281606)
@@ -67,6 +67,7 @@
 
 #ifdef _KERNEL
 #include <crypto/aesni/aesni.h>
+#include <crypto/aesni/aesni_os.h>
 #else
 #include <stdint.h>
 #endif

Added: head/sys/crypto/aesni/aesni_os.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/crypto/aesni/aesni_os.h	Thu Apr 16 17:42:52 2015	(r281606)
@@ -0,0 +1,33 @@
+/*-
+ * Copyright 2015 Craig Rodrigues <rodrigc at FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ */
+
+#if defined(__GNUC__) && defined(_KERNEL)
+/* Suppress inclusion of gcc's mm_malloc.h header */
+#define _MM_MALLOC_H_INCLUDED 1
+#endif