vendor/libsodium/autom4te.cache/output.1 in rbnacl-libsodium-1.0.6 vs vendor/libsodium/autom4te.cache/output.1 in rbnacl-libsodium-1.0.7
- old
+ new
@@ -1,8 +1,8 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.6.
+@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.7.
@%:@
@%:@ Report bugs to <https://github.com/jedisct1/libsodium/issues>.
@%:@
@%:@
@%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -588,12 +588,12 @@
MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libsodium'
PACKAGE_TARNAME='libsodium'
-PACKAGE_VERSION='1.0.6'
-PACKAGE_STRING='libsodium 1.0.6'
+PACKAGE_VERSION='1.0.7'
+PACKAGE_STRING='libsodium 1.0.7'
PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
PACKAGE_URL='https://github.com/jedisct1/libsodium'
ac_unique_file="src/libsodium/sodium/version.c"
# Factoring default headers for most tests.
@@ -647,10 +647,13 @@
LIBTOOL_EXTRA_FLAGS
HAVE_CPUID_V
HAVE_TI_MODE_V
HAVE_TI_MODE_FALSE
HAVE_TI_MODE_TRUE
+HAVE_AVX_ASM_V
+HAVE_AVX_ASM_FALSE
+HAVE_AVX_ASM_TRUE
HAVE_AMD64_ASM_V
HAVE_AMD64_ASM_FALSE
HAVE_AMD64_ASM_TRUE
CFLAGS_PCLMUL
CFLAGS_AESNI
@@ -801,10 +804,11 @@
enable_pie
enable_blocking_random
enable_minimal
with_safecode
enable_debug
+enable_opt
enable_soname_versions
enable_shared
enable_static
with_pic
enable_fast_install
@@ -1366,11 +1370,11 @@
#
if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libsodium 1.0.6 to adapt to many kinds of systems.
+\`configure' configures libsodium 1.0.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
To assign environment variables (e.g., CC, CFLAGS...), specify them as
VAR=VALUE. See below for descriptions of some of the useful variables.
@@ -1436,11 +1440,11 @@
_ACEOF
fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libsodium 1.0.6:";;
+ short | recursive ) echo "Configuration of libsodium 1.0.7:";;
esac
cat <<\_ACEOF
Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
@@ -1462,10 +1466,12 @@
Enable this switch only if /dev/urandom is totally
broken on the target platform
--enable-minimal Only compile the minimum set of functions required
for the high-level API
--enable-debug For maintainers only - please do not use
+ --enable-opt Optimize for the native CPU - The resulting library
+ will be faster but not portable
--enable-soname-versions
enable soname versions (must be disabled for
Android) (default: enabled)
--enable-shared@<:@=PKGS@:>@ build shared libraries @<:@default=yes@:>@
--enable-static@<:@=PKGS@:>@ build static libraries @<:@default=yes@:>@
@@ -1569,11 +1575,11 @@
fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libsodium configure 1.0.6
+libsodium configure 1.0.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
@@ -1938,11 +1944,11 @@
} @%:@ ac_fn_c_check_func
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libsodium $as_me 1.0.6, which was
+It was created by libsodium $as_me 1.0.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
_ACEOF
@@ -2874,11 +2880,11 @@
fi
# Define the identity of the package.
PACKAGE='libsodium'
- VERSION='1.0.6'
+ VERSION='1.0.7'
cat >>confdefs.h <<_ACEOF
@%:@define PACKAGE "$PACKAGE"
_ACEOF
@@ -3169,14 +3175,14 @@
ISODATE=`date +%Y-%m-%d`
-SODIUM_LIBRARY_VERSION_MAJOR=8
+SODIUM_LIBRARY_VERSION_MAJOR=9
SODIUM_LIBRARY_VERSION_MINOR=0
-DLL_VERSION=7
-SODIUM_LIBRARY_VERSION=17:0:0
+DLL_VERSION=8
+SODIUM_LIBRARY_VERSION=18:0:0
# | | |
# +------+ | +---+
# | | |
# current:revision:age
# | | |
@@ -3350,13 +3356,25 @@
fi
fi
+@%:@ Check whether --enable-opt was given.
+if test "${enable_opt+set}" = set; then :
+ enableval=$enable_opt;
+ if test "x$enableval" = "xyes"; then :
+
+ CFLAGS="$CFLAGS -flto -march=native"
+ LDFLAGS="$LDFLAGS -flto -march=native"
+fi
+fi
+
+
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -15038,10 +15056,110 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$oldcflags"
oldcflags="$CFLAGS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mavx" >&5
+$as_echo_n "checking whether C compiler accepts -mavx... " >&6; }
+if ${ax_cv_check_cflags___mavx+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ ax_check_save_flags=$CFLAGS
+ CFLAGS="$CFLAGS -mavx"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ax_cv_check_cflags___mavx=yes
+else
+ ax_cv_check_cflags___mavx=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mavx" >&5
+$as_echo "$ax_cv_check_cflags___mavx" >&6; }
+if test "x$ax_cv_check_cflags___mavx" = xyes; then :
+ CFLAGS="$CFLAGS -mavx"
+else
+ :
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVX instructions set" >&5
+$as_echo_n "checking for AVX instructions set... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#pragma GCC target("avx")
+#include <immintrin.h>
+
+int
+main ()
+{
+ _mm256_zeroall();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "@%:@define HAVE_AVXINTRIN_H 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mavx" >&5
+$as_echo_n "checking whether C compiler accepts -mavx... " >&6; }
+if ${ax_cv_check_cflags___mavx+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ ax_check_save_flags=$CFLAGS
+ CFLAGS="$CFLAGS -mavx"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ax_cv_check_cflags___mavx=yes
+else
+ ax_cv_check_cflags___mavx=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mavx" >&5
+$as_echo "$ax_cv_check_cflags___mavx" >&6; }
+if test "x$ax_cv_check_cflags___mavx" = xyes; then :
+ CFLAGS_AVX="-mavx"
+else
+ :
+fi
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$oldcflags"
+
+ oldcflags="$CFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -maes" >&5
$as_echo_n "checking whether C compiler accepts -maes... " >&6; }
if ${ax_cv_check_cflags___maes+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -15536,12 +15654,12 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
HAVE_AMD64_ASM_V=0
if test "$enable_asm" != "no"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we should use x86_64 asm code" >&5
-$as_echo_n "checking whether we should use x86_64 asm code... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can use x86_64 asm code" >&5
+$as_echo_n "checking whether we can use x86_64 asm code... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -15554,11 +15672,17 @@
# endif
/* neat */
#else
# error !x86_64
#endif
-__asm__("pxor %xmm12,%xmm6");
+unsigned char i = 0, o = 0, t;
+__asm__ __volatile__ ("pxor %%xmm12, %%xmm6 \n"
+ "movb (%[i]), %[t] \n"
+ "addb %[t], (%[o]) \n"
+ : [t] "=&r"(t)
+ : [o] "D"(&o), [i] "S"(&i)
+ : "memory", "flags", "cc");
;
return 0;
}
_ACEOF
@@ -15584,31 +15708,87 @@
HAVE_AMD64_ASM_FALSE=
fi
+HAVE_AVX_ASM_V=0
+if test "$enable_asm" != "no"; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can assemble AVX opcodes" >&5
+$as_echo_n "checking whether we can assemble AVX opcodes... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+
+#if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
+# if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64)
+# error Windows x86_64 calling conventions are not supported yet
+# endif
+/* neat */
+#else
+# error !x86_64
+#endif
+__asm__ __volatile__ ("vpunpcklqdq %xmm0,%xmm13,%xmm0");
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "@%:@define HAVE_AVX_ASM 1" >>confdefs.h
+
+ HAVE_AVX_ASM_V=1
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+ if test $HAVE_AVX_ASM_V = 1; then
+ HAVE_AVX_ASM_TRUE=
+ HAVE_AVX_ASM_FALSE='#'
+else
+ HAVE_AVX_ASM_TRUE='#'
+ HAVE_AVX_ASM_FALSE=
+fi
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 128-bit arithmetic" >&5
$as_echo_n "checking for 128-bit arithmetic... " >&6; }
HAVE_TI_MODE_V=0
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#ifndef __GNUC__
-# error mode(TI) is a gcc extension
+#if !defined(__GNUC__) && !defined(__SIZEOF_INT128__)
+# error mode(TI) is a gcc extension, and __int128 is not available
#endif
#if defined(__clang__) && !defined(__x86_64__)
-# error clang does not properly compile smult_curve25519_donna_c64.c
+# error clang does not properly handle the 128-bit type on 32-bit systems
#endif
#ifndef NATIVE_LITTLE_ENDIAN
-# error donna_c64 currently requires a little endian CPU
+# error libsodium currently expects a little endian CPU for the 128-bit type
#endif
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
# error emscripten currently supports only shift operations on integers \
# larger than 64 bits
#endif
+#include <stddef.h>
#include <stdint.h>
+#if defined(__SIZEOF_INT128__)
+typedef unsigned __int128 uint128_t;
+#else
typedef unsigned uint128_t __attribute__((mode(TI)));
+#endif
void fcontract(uint128_t *t) {
*t += 0x8000000000000 - 1;
}
int
@@ -15742,16 +15922,16 @@
;;
esac
if test "x$aligned_access_required" = "xyes"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-
-$as_echo "@%:@define CPU_ALIGNED_ACCESS_REQUIRED 1" >>confdefs.h
-
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
+
+$as_echo "@%:@define CPU_UNALIGNED_ACCESS 1" >>confdefs.h
+
fi
if test "x$EMSCRIPTEN" = "x"; then :
@@ -16354,10 +16534,14 @@
fi
if test -z "${HAVE_AMD64_ASM_TRUE}" && test -z "${HAVE_AMD64_ASM_FALSE}"; then
as_fn_error $? "conditional \"HAVE_AMD64_ASM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_AVX_ASM_TRUE}" && test -z "${HAVE_AVX_ASM_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_AVX_ASM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${HAVE_TI_MODE_TRUE}" && test -z "${HAVE_TI_MODE_FALSE}"; then
as_fn_error $? "conditional \"HAVE_TI_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${EMSCRIPTEN_TRUE}" && test -z "${EMSCRIPTEN_FALSE}"; then
@@ -16767,11 +16951,11 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# Save the log message, to keep $0 and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libsodium $as_me 1.0.6, which was
+This file was extended by libsodium $as_me 1.0.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
CONFIG_LINKS = $CONFIG_LINKS
@@ -16825,10 +17009,10 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libsodium config.status 1.0.6
+libsodium config.status 1.0.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation