the intrinsic variant is 32-bit clean

the ASM variant is not

found it

fix

something is wrong with the external build

hmm

why is this critical section doing nothing

fix multiple init

debug init

ok fixed

CMakeLists.txt

@@ -36,23 +36,24 @@ add_compile_options(-Wvla)
 add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fpermissive>)
 add_compile_options(-Wno-unused-function -Wno-deprecated-declarations -Wno-unknown-pragmas)
 
-# gah, can't recall which -Wno flag is exclusive to clang
-# -Wno-cast-function-type is GNU exclusive..i think
 if (WOW64_CROSS_COMPILE OR WIN64_CROSS_COMPILE)
 # dynamic linking does this all the time
-add_compile_options(-Wno-cast-function-type)
 if (USING_CLANG)
 add_compile_options(-Wno-unused-command-line-argument -Wno-c++11-narrowing)
 add_compile_options($<$<COMPILE_LANGUAGE:C>:-Wno-bad-function-cast>)
 # because clang is insane enough to inline whole sections of the C++ library!
 # May have been fixed in llvm-7.
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--allow-multiple-definition --rtlib=libgcc")
+else()
+# found it. this is GNU only
+add_compile_options(-Wno-cast-function-type)
 endif(USING_CLANG)
+else()
+add_compile_options(-Wno-cast-function-type)
 endif()
 
 if(WIN32)
 add_compile_options($<$<COMPILE_LANGUAGE:C>:-Wno-bad-function-cast>)
-add_compile_options(-Wno-cast-function-type)
 set(FS_LIB stdc++fs)
 endif(WIN32)
 

crypto/libsodium/init.c

@@ -35,7 +35,8 @@ sodium_init(void)
     {
       return -1; /* LCOV_EXCL_LINE */
     }
-    return 1;
+    /* if we're here, we already started properly */
+    return initialized ? 0: -1;
   }
   _sodium_runtime_get_cpu_features();
   _crypto_generichash_blake2b_pick_best_implementation();

crypto/salsa20/xmm6int/salsa20_xmm6int-avx2.c

@@ -8,7 +8,7 @@
 #include <sodium/private/sse2_64_32.h>
 #include <sodium/utils.h>
 
-#if __AVX2__ && __amd64__
+#if __AVX2__
 
 #ifdef __GNUC__
 #pragma GCC target("sse2")