cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always include intrin.h if available

Browse Source
This commit is contained in:
Frank Denis 2017-02-28 17:58:50 +01:00
parent 9eea164007
commit e5a196a8ee
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -453,7 +453,7 @@ AC_SUBST(CFLAGS_AVX2)
AC_SUBST(CFLAGS_AESNI) AC_SUBST(CFLAGS_AESNI)
AC_SUBST(CFLAGS_PCLMUL) AC_SUBST(CFLAGS_PCLMUL)
AC_CHECK_HEADERS([sys/mman.h]) AC_CHECK_HEADERS([sys/mman.h intrin.h])
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.

3
src/libsodium/include/sodium/private/common.h
View File

@ -225,6 +225,9 @@ sodium__mm_set1_epi64x(int64_t q)
return _mm_set_epi64x(q, q); return _mm_set_epi64x(q, q);
} }
# endif # endif
#elif defined(HAVE_INTRIN_H)
# include <intrin.h>
#endif #endif
#endif #endif

4
src/libsodium/sodium/runtime.c
View File

@ -3,8 +3,8 @@
#ifdef HAVE_ANDROID_GETCPUFEATURES #ifdef HAVE_ANDROID_GETCPUFEATURES
# include <cpu-features.h> # include <cpu-features.h>
#endif #endif
#if (defined(_MSC_VER) && \ #if defined(HAVE_INTRIN_H) || (defined(_MSC_VER) && \
(defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))) || defined(HAVE__XGETBV) (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
# include <intrin.h> # include <intrin.h>
#endif #endif