From 5ac2c8fa60f6fb73788e402b32415f95c6889a94 Mon Sep 17 00:00:00 2001
From: cathugger <cathugger@cock.li>
Date: Tue, 31 May 2022 02:11:40 +0300
Subject: [PATCH] some cleanups & make depend

---
 GNUmakefile.in                 | 74 +++++++++++++++++++++++++++++++++-
 configure.ac                   | 37 +++++++++++------
 ed25519/amd64-64-24k/ed25519.h | 16 ++++----
 ed25519/amd64-64-24k/sc25519.h |  2 +-
 4 files changed, 105 insertions(+), 24 deletions(-)

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 910b1ae..ec4725b 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -156,53 +156,76 @@ base64_from.c.o: types.h base64.h
 base64_to.c.o: types.h base64.h
 cpucount.c.o: cpucount.h
 ed25519/amd64-51-30k/fe25519_add.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/fe25519_add.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/fe25519_batchinvert.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/fe25519_batchinvert.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/fe25519_getparity.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/fe25519_getparity.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/fe25519_invert.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/fe25519_invert.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/fe25519_iseq.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/fe25519_iseq.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/fe25519_iszero.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/fe25519_iszero.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/fe25519_neg.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/fe25519_neg.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/fe25519_pack.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/fe25519_pack.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/fe25519_pow2523.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/fe25519_pow2523.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/fe25519_setint.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/fe25519_setint.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/fe25519_sub.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/fe25519_sub.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/fe25519_unpack.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/fe25519_unpack.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/ge25519_add.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/ge25519_add.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/ge25519_add.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/ge25519_add.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-51-30k/ge25519_base.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/ge25519_base.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/ge25519_base.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/ge25519_base.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-51-30k/ge25519_batchpack.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/ge25519_batchpack.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/ge25519_batchpack.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/ge25519_batchpack.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-51-30k/ge25519_double.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/ge25519_double.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/ge25519_double.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/ge25519_double.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-51-30k/ge25519_double_scalarmult.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/ge25519_double_scalarmult.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/ge25519_double_scalarmult.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-51-30k/ge25519_double_scalarmult.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/ge25519_double_scalarmult.c.o: ed25519/amd64-51-30k/ge25519_base_slide_multiples.data
 ed25519/amd64-51-30k/ge25519_isneutral.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/ge25519_isneutral.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/ge25519_isneutral.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/ge25519_isneutral.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-51-30k/ge25519_multi_scalarmult.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/ge25519_multi_scalarmult.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/ge25519_multi_scalarmult.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-51-30k/ge25519_multi_scalarmult.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/ge25519_multi_scalarmult.c.o: ed25519/amd64-51-30k/index_heap.h
 ed25519/amd64-51-30k/ge25519_pack.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/ge25519_pack.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/ge25519_pack.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-51-30k/ge25519_pack.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/ge25519_scalarmult_base.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/ge25519_scalarmult_base.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/ge25519_scalarmult_base.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-51-30k/ge25519_scalarmult_base.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/ge25519_scalarmult_base.c.o: ed25519/amd64-51-30k/ge25519_base_niels_smalltables.data
 ed25519/amd64-51-30k/ge25519_unpackneg.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/ge25519_unpackneg.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/ge25519_unpackneg.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/ge25519_unpackneg.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-51-30k/hram.c.o: ed25519/amd64-51-30k/crypto_hash_sha512.h
 ed25519/amd64-51-30k/hram.c.o: ed25519/amd64-51-30k/hram.h
 ed25519/amd64-51-30k/index_heap.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-51-30k/index_heap.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/index_heap.c.o: ed25519/amd64-51-30k/index_heap.h
 ed25519/amd64-51-30k/keypair.c.o: ed25519/amd64-51-30k/crypto_sign.h
 ed25519/amd64-51-30k/keypair.c.o: ed25519/amd64-51-30k/ed25519.h
@@ -210,6 +233,7 @@ ed25519/amd64-51-30k/keypair.c.o: ed25519/amd64-51-30k/crypto_hash_sha512.h
 ed25519/amd64-51-30k/keypair.c.o: ed25519/amd64-51-30k/randombytes.h
 ed25519/amd64-51-30k/keypair.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/keypair.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/keypair.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/keypair.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-51-30k/open.c.o: ed25519/amd64-51-30k/crypto_sign.h
 ed25519/amd64-51-30k/open.c.o: ed25519/amd64-51-30k/ed25519.h
@@ -217,68 +241,100 @@ ed25519/amd64-51-30k/open.c.o: ed25519/amd64-51-30k/crypto_verify_32.h
 ed25519/amd64-51-30k/open.c.o: ed25519/amd64-51-30k/crypto_hash_sha512.h
 ed25519/amd64-51-30k/open.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/open.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/open.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/open.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-51-30k/sc25519_from32bytes.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-51-30k/sc25519_from32bytes.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/sc25519_from64bytes.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-51-30k/sc25519_from64bytes.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/sc25519_from_shortsc.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-51-30k/sc25519_from_shortsc.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/sc25519_iszero.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-51-30k/sc25519_iszero.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/sc25519_mul.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-51-30k/sc25519_mul.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/sc25519_mul_shortsc.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-51-30k/sc25519_mul_shortsc.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/sc25519_slide.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-51-30k/sc25519_slide.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/sc25519_to32bytes.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-51-30k/sc25519_to32bytes.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/sc25519_window4.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-51-30k/sc25519_window4.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/sign.c.o: ed25519/amd64-51-30k/crypto_sign.h
 ed25519/amd64-51-30k/sign.c.o: ed25519/amd64-51-30k/ed25519.h
 ed25519/amd64-51-30k/sign.c.o: ed25519/amd64-51-30k/crypto_hash_sha512.h
 ed25519/amd64-51-30k/sign.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-51-30k/sign.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-51-30k/sign.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-51-30k/sign.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/fe25519_batchinvert.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/fe25519_batchinvert.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/fe25519_getparity.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/fe25519_getparity.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/fe25519_invert.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/fe25519_invert.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/fe25519_iseq.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/fe25519_iseq.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/fe25519_iszero.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/fe25519_iszero.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/fe25519_neg.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/fe25519_neg.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/fe25519_pack.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/fe25519_pack.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/fe25519_pow2523.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/fe25519_pow2523.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/fe25519_setint.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/fe25519_setint.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/fe25519_unpack.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/fe25519_unpack.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/ge25519_add.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/ge25519_add.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/ge25519_add.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/ge25519_add.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/ge25519_base.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/ge25519_base.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/ge25519_base.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/ge25519_base.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/ge25519_batchpack.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/ge25519_batchpack.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/ge25519_batchpack.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/ge25519_batchpack.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/ge25519_double.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/ge25519_double.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/ge25519_double.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/ge25519_double.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/ge25519_double_scalarmult.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/ge25519_double_scalarmult.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/ge25519_double_scalarmult.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/ge25519_double_scalarmult.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/ge25519_double_scalarmult.c.o: ed25519/amd64-51-30k/ge25519_base_slide_multiples.data
 ed25519/amd64-64-24k/ge25519_isneutral.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/ge25519_isneutral.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/ge25519_isneutral.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/ge25519_isneutral.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/ge25519_multi_scalarmult.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/ge25519_multi_scalarmult.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/ge25519_multi_scalarmult.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/ge25519_multi_scalarmult.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/ge25519_multi_scalarmult.c.o: ed25519/amd64-51-30k/index_heap.h
 ed25519/amd64-64-24k/ge25519_pack.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/ge25519_pack.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/ge25519_pack.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/ge25519_pack.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/ge25519_scalarmult_base.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/ge25519_scalarmult_base.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/ge25519_scalarmult_base.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/ge25519_scalarmult_base.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/ge25519_scalarmult_base.c.o: ed25519/amd64-64-24k/ge25519_base_niels.data
 ed25519/amd64-64-24k/ge25519_unpackneg.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/ge25519_unpackneg.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/ge25519_unpackneg.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/ge25519_unpackneg.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/hram.c.o: ed25519/amd64-51-30k/crypto_hash_sha512.h
 ed25519/amd64-64-24k/hram.c.o: ed25519/amd64-51-30k/hram.h
 ed25519/amd64-64-24k/index_heap.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-64-24k/index_heap.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/index_heap.c.o: ed25519/amd64-51-30k/index_heap.h
 ed25519/amd64-64-24k/keypair.c.o: ed25519/amd64-51-30k/crypto_sign.h
 ed25519/amd64-64-24k/keypair.c.o: ed25519/amd64-51-30k/ed25519.h
@@ -286,6 +342,7 @@ ed25519/amd64-64-24k/keypair.c.o: ed25519/amd64-51-30k/crypto_hash_sha512.h
 ed25519/amd64-64-24k/keypair.c.o: ed25519/amd64-51-30k/randombytes.h
 ed25519/amd64-64-24k/keypair.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/keypair.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/keypair.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/keypair.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/open.c.o: ed25519/amd64-51-30k/crypto_sign.h
 ed25519/amd64-64-24k/open.c.o: ed25519/amd64-51-30k/ed25519.h
@@ -293,21 +350,32 @@ ed25519/amd64-64-24k/open.c.o: ed25519/amd64-51-30k/crypto_verify_32.h
 ed25519/amd64-64-24k/open.c.o: ed25519/amd64-51-30k/crypto_hash_sha512.h
 ed25519/amd64-64-24k/open.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/open.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/open.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/open.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/amd64-64-24k/sc25519_from32bytes.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-64-24k/sc25519_from32bytes.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/sc25519_from64bytes.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-64-24k/sc25519_from64bytes.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/sc25519_from_shortsc.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-64-24k/sc25519_from_shortsc.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/sc25519_iszero.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-64-24k/sc25519_iszero.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/sc25519_mul.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-64-24k/sc25519_mul.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/sc25519_mul_shortsc.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-64-24k/sc25519_mul_shortsc.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/sc25519_slide.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-64-24k/sc25519_slide.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/sc25519_to32bytes.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-64-24k/sc25519_to32bytes.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/sc25519_window4.c.o: ed25519/amd64-51-30k/sc25519.h
+ed25519/amd64-64-24k/sc25519_window4.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/sign.c.o: ed25519/amd64-51-30k/crypto_sign.h
 ed25519/amd64-64-24k/sign.c.o: ed25519/amd64-51-30k/ed25519.h
 ed25519/amd64-64-24k/sign.c.o: ed25519/amd64-51-30k/crypto_hash_sha512.h
 ed25519/amd64-64-24k/sign.c.o: ed25519/amd64-51-30k/ge25519.h
 ed25519/amd64-64-24k/sign.c.o: ed25519/amd64-51-30k/fe25519.h
+ed25519/amd64-64-24k/sign.c.o: ed25519/amd64-51-30k/compat.h
 ed25519/amd64-64-24k/sign.c.o: ed25519/amd64-51-30k/sc25519.h
 ed25519/ref10/fe_0.c.o: ed25519/ref10/fe.h ed25519/ref10/crypto_int32.h
 ed25519/ref10/fe_1.c.o: ed25519/ref10/fe.h ed25519/ref10/crypto_int32.h
@@ -423,6 +491,7 @@ test_ed25519.c.o: ed25519/ref10/fe.h ed25519/ref10/crypto_int32.h
 test_ed25519.c.o: ed25519/amd64-51-30k/crypto_sign.h
 test_ed25519.c.o: ed25519/amd64-51-30k/ge25519.h
 test_ed25519.c.o: ed25519/amd64-51-30k/fe25519.h
+test_ed25519.c.o: ed25519/amd64-51-30k/compat.h
 test_ed25519.c.o: ed25519/amd64-51-30k/sc25519.h
 test_ed25519.c.o: ed25519/amd64-64-24k/crypto_sign.h
 test_ed25519.c.o: ed25519/amd64-64-24k/ge25519.h
@@ -453,8 +522,9 @@ worker.c.o: ed25519/ed25519_impl_pre.h ed25519/ref10/crypto_sign.h
 worker.c.o: ed25519/amd64-51-30k/ed25519.h ed25519/ref10/ge.h
 worker.c.o: ed25519/ref10/fe.h ed25519/ref10/crypto_int32.h
 worker.c.o: ed25519/amd64-51-30k/crypto_sign.h ed25519/amd64-51-30k/ge25519.h
-worker.c.o: ed25519/amd64-51-30k/fe25519.h ed25519/amd64-51-30k/sc25519.h
-worker.c.o: ed25519/amd64-64-24k/crypto_sign.h ed25519/amd64-64-24k/ge25519.h
+worker.c.o: ed25519/amd64-51-30k/fe25519.h ed25519/amd64-51-30k/compat.h
+worker.c.o: ed25519/amd64-51-30k/sc25519.h ed25519/amd64-64-24k/crypto_sign.h
+worker.c.o: ed25519/amd64-64-24k/ge25519.h
 worker.c.o: ed25519/ed25519-donna/ed25519-donna.h
 worker.c.o: ed25519/ed25519-donna/ed25519-donna-portable.h
 worker.c.o: ed25519/ed25519-donna/ed25519-donna-portable-identify.h
diff --git a/configure.ac b/configure.ac
index c2c89ef..a2053c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ fi
 
 # NOTE: this script intentionally doesn't check for small details like posix functions and hard dependencies (libsodium) so you may get errors at compilation
 
-if test "x$oldcflags" != "x$CFLAGS"
+if test x"$oldcflags" != x"$CFLAGS"
 then
 	oldcflags="-O3"
 	CFLAGS="-march=native"
@@ -83,7 +83,7 @@ AC_ARG_ENABLE([ref10],
 	[AS_HELP_STRING([--enable-ref10],
 		[use SUPERCOP ref10 ed25519 implementation @<:@default=no@:>@])],
 	[
-		AS_IF([test "x$ed25519impl" != "x" -a "$ed25519impl" != "ref10"],
+		AS_IF([test x"$ed25519impl" != x"" -a "$ed25519impl" != "ref10"],
 			[AC_MSG_ERROR(only one ed25519 implementation can be defined)])
 		ed25519impl="ref10"
 	],
@@ -94,7 +94,7 @@ AC_ARG_ENABLE([amd64-51-30k],
 	[AS_HELP_STRING([--enable-amd64-51-30k],
 		[use SUPERCOP amd64-51-30k ed25519 implementation @<:@default=no@:>@])],
 	[
-		AS_IF([test "x$ed25519impl" != "x" -a "$ed25519impl" != "amd64_51_30k"],
+		AS_IF([test x"$ed25519impl" != x"" -a "$ed25519impl" != "amd64_51_30k"],
 			[AC_MSG_ERROR(only one ed25519 implementation can be defined)])
 		ed25519impl="amd64_51_30k"
 	],
@@ -105,7 +105,7 @@ AC_ARG_ENABLE([amd64-64-24k],
 	[AS_HELP_STRING([--enable-amd64-64-24k],
 		[use SUPERCOP amd64-64-24k ed25519 implementation @<:@default=no@:>@])],
 	[
-		AS_IF([test "x$ed25519impl" != "x" -a "$ed25519impl" != "amd64_64_24k"],
+		AS_IF([test x"$ed25519impl" != x"" -a "$ed25519impl" != "amd64_64_24k"],
 			[AC_MSG_ERROR(only one ed25519 implementation can be defined)])
 		ed25519impl="amd64_64_24k"
 	],
@@ -116,7 +116,7 @@ AC_ARG_ENABLE([donna],
 	[AS_HELP_STRING([--enable-donna],
 		[use ed25519-donna implementation @<:@default=yes@:>@])],
 	[
-		AS_IF([test "x$ed25519impl" != "x" -a "$ed25519impl" != "donna"],
+		AS_IF([test x"$ed25519impl" != x"" -a "$ed25519impl" != "donna"],
 			[AC_MSG_ERROR(only one ed25519 implementation can be defined)])
 		ed25519impl="donna"
 	],
@@ -127,7 +127,7 @@ AC_ARG_ENABLE([donna-sse2],
 	[AS_HELP_STRING([--enable-donna-sse2],
 		[use ed25519-donna SSE2 implementation @<:@default=no@:>@])],
 	[
-		AS_IF([test "x$ed25519impl" != "x" -a "$ed25519impl" != "donna-sse2"],
+		AS_IF([test x"$ed25519impl" != x"" -a "$ed25519impl" != "donna-sse2"],
 			[AC_MSG_ERROR(only one ed25519 implementation can be defined)])
 		ed25519impl="donna-sse2"
 	],
@@ -135,7 +135,7 @@ AC_ARG_ENABLE([donna-sse2],
 )
 
 # default
-AS_IF([test "x$ed25519impl" = "x"],[ed25519impl="donna"])
+AS_IF([test x"$ed25519impl" = x""],[ed25519impl="donna"])
 
 if test "$ed25519impl" = "donna-sse2"
 then
@@ -232,7 +232,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
 	[AC_MSG_RESULT([no])]
 )
 
-if test "x$c99" = "xyes" -a "x$ed25519impl" != "xdonna" -a "x$enable_intfilter" != "x128"
+if test x"$c99" = x"yes" -a x"$ed25519impl" != x"donna" -a x"$enable_intfilter" != x"128"
 then
 	CFLAGS="$cstd -pedantic"
 	AC_MSG_CHECKING([whether CC supports -pedantic])
@@ -253,7 +253,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef _WIN32
 	[AC_MSG_RESULT([no])]
 )
 
-if test "x$ed25519impl" = "xdonna"
+if test x"$ed25519impl" = x"donna"
 then
 	CFLAGS="$cstd -Wno-unused-function -Werror"
 	AC_MSG_CHECKING([whether CC supports -Wno-unused-function])
@@ -264,6 +264,17 @@ then
 	)
 fi
 
+if test x"$ed25519impl" = x"amd64_64_24k"
+then
+	CFLAGS="$cstd -Wno-unused-const-variable -Werror"
+	AC_MSG_CHECKING([whether CC supports -Wno-unused-const-variable])
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+		[AC_MSG_RESULT([yes])]
+		[cstd="$cstd -Wno-unused-const-variable"],
+		[AC_MSG_RESULT([no])]
+	)
+fi
+
 CFLAGS="$cstd -Wmissing-prototypes -Werror"
 AC_MSG_CHECKING([whether CC supports -Wmissing-prototypes])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
@@ -288,7 +299,7 @@ AC_ARG_ENABLE([binfilterlen],
 		[set binary string filter length (if you don't use intfilter) @<:@default=32@:>@])],
 	[], [enable_binfilterlen=no]
 )
-if test "x$enable_binfilterlen" != "xyes" -a "x$enable_binfilterlen" != "xno"
+if test x"$enable_binfilterlen" != x"yes" -a x"$enable_binfilterlen" != x"no"
 then
 	MYDEFS="$MYDEFS -DBINFILTERLEN=$enable_binfilterlen"
 fi
@@ -298,7 +309,7 @@ AC_ARG_ENABLE([binsearch],
 		[enable binary search algoritm; MUCH faster if there are a lot of filters @<:@default=no@:>@])],
 	[], [enable_binsearch=no]
 )
-if test "x$enable_binsearch" = "xyes"
+if test x"$enable_binsearch" = x"yes"
 then
 	MYDEFS="$MYDEFS -DBINSEARCH"
 fi
@@ -308,7 +319,7 @@ AC_ARG_ENABLE([besort],
 		[force intfilter binsearch case to use big endian sorting and not omit masks from filters; useful if your filters aren't of same length @<:@default=no@:>@])],
 	[], [enable_besort=no]
 )
-if test "x$enable_besort" = "xyes"
+if test x"$enable_besort" = x"yes"
 then
 	MYDEFS="$MYDEFS -DBESORT"
 fi
@@ -318,7 +329,7 @@ AC_ARG_ENABLE([statistics],
 		[collect statistics @<:@default=yes@:>@])],
 	[], [enable_statistics=yes]
 )
-if test "x$enable_statistics" = "xyes"
+if test x"$enable_statistics" = x"yes"
 then
 	MYDEFS="$MYDEFS -DSTATISTICS"
 fi
diff --git a/ed25519/amd64-64-24k/ed25519.h b/ed25519/amd64-64-24k/ed25519.h
index 8916c9b..50c610d 100644
--- a/ed25519/amd64-64-24k/ed25519.h
+++ b/ed25519/amd64-64-24k/ed25519.h
@@ -1,20 +1,20 @@
-int ed25519_amd64_64_seckey(unsigned char *sk);
-int ed25519_amd64_64_seckey_expand(unsigned char *sk,const unsigned char *seed);
-int ed25519_amd64_64_pubkey(unsigned char *pk,const unsigned char *sk);
-int ed25519_amd64_64_keygen(unsigned char *pk,unsigned char *sk);
-int ed25519_amd64_64_sign(
+int crypto_sign_seckey(unsigned char *sk);
+int crypto_sign_seckey_expand(unsigned char *sk,const unsigned char *seed);
+int crypto_sign_pubkey(unsigned char *pk,const unsigned char *sk);
+int crypto_sign_keypair(unsigned char *pk,unsigned char *sk);
+int crypto_sign(
     unsigned char *sm,unsigned long long *smlen,
     const unsigned char *m,unsigned long long mlen,
     const unsigned char *sk
 );
-int ed25519_amd64_64_open(
+int crypto_sign_open(
     unsigned char *m,unsigned long long *mlen,
     const unsigned char *sm,unsigned long long smlen,
     const unsigned char *pk
 );
-int ed25519_amd64_64_open_batch(
+int crypto_sign_open_batch(
     unsigned char* const m[],unsigned long long mlen[],
     unsigned char* const sm[],const unsigned long long smlen[],
-    unsigned char* const pk[], 
+    unsigned char* const pk[],
     unsigned long long num
 );
diff --git a/ed25519/amd64-64-24k/sc25519.h b/ed25519/amd64-64-24k/sc25519.h
index 315cc53..020984f 100644
--- a/ed25519/amd64-64-24k/sc25519.h
+++ b/ed25519/amd64-64-24k/sc25519.h
@@ -57,7 +57,7 @@ void sc25519_mul_shortsc(sc25519 *r, const sc25519 *x, const shortsc25519 *y);
 /* Convert s into a representation of the form \sum_{i=0}^{63}r[i]2^(4*i)
  * with r[i] in {-8,...,7}
  */
-void sc25519_window4(signed char r[85], const sc25519 *s);
+void sc25519_window4(signed char r[64], const sc25519 *s);
 
 void sc25519_slide(signed char r[256], const sc25519 *s, int swindowsize);