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

Use AC_LINK_IFELSE for everything using inline assembly

Browse Source
This commit is contained in:
Frank Denis 2019-08-16 13:09:57 +02:00
parent 4b448b5095
commit f7695fd634
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -18408,7 +18408,7 @@ __asm__ __volatile__ ("pxor %%xmm12, %%xmm6 \n"
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
@ -18419,7 +18419,8 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi fi
if test $HAVE_AMD64_ASM_V = 1; then if test $HAVE_AMD64_ASM_V = 1; then
@ -18459,7 +18460,7 @@ __asm__ __volatile__ ("vpunpcklqdq %xmm0,%xmm13,%xmm0");
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
@ -18470,7 +18471,8 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi fi
if test $HAVE_AVX_ASM_V = 1; then if test $HAVE_AVX_ASM_V = 1; then

4
configure.ac
View File

@ -605,7 +605,7 @@ __asm__ __volatile__ ("" : : "r"(pnt) : "memory");
HAVE_AMD64_ASM_V=0 HAVE_AMD64_ASM_V=0
AS_IF([test "$enable_asm" != "no"],[ AS_IF([test "$enable_asm" != "no"],[
AC_MSG_CHECKING(whether we can use x86_64 asm code) AC_MSG_CHECKING(whether we can use x86_64 asm code)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
]], [[ ]], [[
#if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
# if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64) # if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64)
@ -634,7 +634,7 @@ AC_SUBST(HAVE_AMD64_ASM_V)
HAVE_AVX_ASM_V=0 HAVE_AVX_ASM_V=0
AS_IF([test "$enable_asm" != "no"],[ AS_IF([test "$enable_asm" != "no"],[
AC_MSG_CHECKING(whether we can assemble AVX opcodes) AC_MSG_CHECKING(whether we can assemble AVX opcodes)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
]], [[ ]], [[
#if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
# if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64) # if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64)