diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-09-15 15:18:36 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-10-20 12:00:45 -0500 |
| commit | 3d141527f944682f343d17231771aa0ec21a1a49 (patch) | |
| tree | e5c2be73c8adeeb3874b53a0f65d9739da5b7e6a /sys/crypto | |
| parent | 9cb84adf338093760f52a6571958f1e9a4efcd45 (diff) | |
| download | FreeBSD-src-3d141527f944682f343d17231771aa0ec21a1a49.zip FreeBSD-src-3d141527f944682f343d17231771aa0ec21a1a49.tar.gz | |
MFC r281606:
In the version of gcc in the FreeBSD tree, this modification was made to
the compiler in svn r242182:
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
TAG: IPSEC-HEAD
Issue: #4841
Diffstat (limited to 'sys/crypto')
| -rw-r--r-- | sys/crypto/aesni/aesencdec.h | 2 | ||||
| -rw-r--r-- | sys/crypto/aesni/aesni_ghash.c | 1 | ||||
| -rw-r--r-- | sys/crypto/aesni/aesni_os.h | 33 |
3 files changed, 36 insertions, 0 deletions
diff --git a/sys/crypto/aesni/aesencdec.h b/sys/crypto/aesni/aesencdec.h index 5e4f128..76e6403 100644 --- a/sys/crypto/aesni/aesencdec.h +++ b/sys/crypto/aesni/aesencdec.h @@ -27,6 +27,8 @@ * */ +#include <crypto/aesni/aesni_os.h> + #include <wmmintrin.h> static inline void diff --git a/sys/crypto/aesni/aesni_ghash.c b/sys/crypto/aesni/aesni_ghash.c index 005ba81..f7be6c0 100644 --- a/sys/crypto/aesni/aesni_ghash.c +++ b/sys/crypto/aesni/aesni_ghash.c @@ -67,6 +67,7 @@ #ifdef _KERNEL #include <crypto/aesni/aesni.h> +#include <crypto/aesni/aesni_os.h> #else #include <stdint.h> #endif diff --git a/sys/crypto/aesni/aesni_os.h b/sys/crypto/aesni/aesni_os.h new file mode 100644 index 0000000..273c3f9 --- /dev/null +++ b/sys/crypto/aesni/aesni_os.h @@ -0,0 +1,33 @@ +/*- + * Copyright 2015 Craig Rodrigues <rodrigc@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 |
