Allow compilation without a working x86_64 assembler

This commit is contained in:
Frank Denis
2017-02-27 00:19:42 +01:00
parent e3b9907429
commit 14bebe460b
2 changed files with 4 additions and 3 deletions
+3 -2
View File
@@ -81,8 +81,6 @@ libsodium_la_SOURCES = \
crypto_stream/crypto_stream.c \
crypto_stream/salsa20/stream_salsa20.c \
crypto_stream/salsa20/stream_salsa20.h \
crypto_stream/salsa20/ref/salsa20_ref.c \
crypto_stream/salsa20/ref/salsa20_ref.h \
crypto_stream/xsalsa20/stream_xsalsa20.c \
crypto_verify/sodium/verify.c \
include/sodium/private/common.h \
@@ -123,6 +121,9 @@ libsodium_la_SOURCES += \
crypto_stream/salsa20/xmm6/salsa20_xmm6-asm.S \
crypto_stream/salsa20/xmm6/salsa20_xmm6.c \
crypto_stream/salsa20/xmm6/salsa20_xmm6.h
else
crypto_stream/salsa20/ref/salsa20_ref.c \
crypto_stream/salsa20/ref/salsa20_ref.h
endif
noinst_HEADERS = \
@@ -13,7 +13,7 @@ Public domain.
#include "../stream_salsa20.h"
#include "salsa20_ref.h"
#if !(defined(HAVE_EMMINTRIN_H) && defined(__x86_64__))
#ifndef HAVE_AMD64_ASM
static int
stream_ref(unsigned char *c, unsigned long long clen, const unsigned char *n,