Merge branch 'jedisct1:stable' into stable

build-aux/config.sub

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2023 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2023-09-19'
+timestamp='2024-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -76,7 +76,7 @@ Report bugs and patches to <[email protected]>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2023 Free Software Foundation, Inc.
+Copyright 1992-2024 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1222,6 +1222,7 @@ case $cpu-$vendor in
 			| moxie \
 			| mt \
 			| msp430 \
+			| nanomips* \
 			| nds32 | nds32le | nds32be \
 			| nfp \
 			| nios | nios2 | nios2eb | nios2el \
@@ -1253,6 +1254,7 @@ case $cpu-$vendor in
 			| ubicom32 \
 			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
 			| vax \
+			| vc4 \
 			| visium \
 			| w65 \
 			| wasm32 | wasm64 \
@@ -1597,7 +1599,7 @@ case $cpu-$vendor in
 		os=
 		obj=elf
 		;;
-	mips*-*)
+	mips*-*|nanomips*-*)
 		os=
 		obj=elf
 		;;
@@ -1721,7 +1723,7 @@ fi
 
 case $os in
 	# Sometimes we do "kernel-libc", so those need to count as OSes.
-	musl* | newlib* | relibc* | uclibc*)
+	llvm* | musl* | newlib* | relibc* | uclibc*)
 		;;
 	# Likewise for "kernel-abi"
 	eabi* | gnueabi*)
@@ -1766,12 +1768,19 @@ case $os in
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-	     | fiwix* | mlibc* | cos* | mbr* )
+	     | fiwix* | mlibc* | cos* | mbr* | ironclad* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
 		;;
+	# This refers to builds using the UEFI calling convention
+	# (which depends on the architecture) and PE file format.
+	# Note that this is both a different calling convention and
+	# different file format than that of GNU-EFI
+	# (x86_64-w64-mingw32).
+	uefi)
+		;;
 	none)
 		;;
 	kernel* | msvc* )
@@ -1818,16 +1827,18 @@ esac
 # As a final step for OS-related things, validate the OS-kernel combination
 # (given a valid OS), if there is a kernel.
 case $kernel-$os-$obj in
-	linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \
-		   | linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- )
+	linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
+		    | linux-mlibc*- | linux-musl*- | linux-newlib*- \
+		    | linux-relibc*- | linux-uclibc*- )
 		;;
 	uclinux-uclibc*- )
 		;;
 	managarm-mlibc*- | managarm-kernel*- )
 		;;
 	windows*-msvc*-)
 		;;
-	-dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- )
+	-dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
+		    | -uclibc*- )
 		# These are just libc implementations, not actual OSes, and thus
 		# require a kernel.
 		echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2

configure

@@ -21976,7 +21976,7 @@ if test "x$EMSCRIPTEN" != "x"
 then :
 
   EXEEXT=.js
-  TEST_LDFLAGS='--memory-init-file 0 --pre-js pre.js.inc -s RESERVED_FUNCTION_POINTERS=8'
+  TEST_LDFLAGS='--pre-js pre.js.inc -s RESERVED_FUNCTION_POINTERS=8'
 
 fi
 

configure.ac

@@ -964,7 +964,7 @@ AC_SUBST([LIBTOOL_EXTRA_FLAGS])
 TEST_LDFLAGS=''
 AS_IF([test "x$EMSCRIPTEN" != "x"],[
   EXEEXT=.js
-  TEST_LDFLAGS='--memory-init-file 0 --pre-js pre.js.inc -s RESERVED_FUNCTION_POINTERS=8'
+  TEST_LDFLAGS='--pre-js pre.js.inc -s RESERVED_FUNCTION_POINTERS=8'
 ])
 AC_SUBST(TEST_LDFLAGS)
 AM_CONDITIONAL([EMSCRIPTEN], [test "x$EMSCRIPTEN" != "x"])

dist-build/emscripten-symbols.def

@@ -1,23 +1,23 @@
-_crypto_aead_aegis128l_abytes 0 1
-_crypto_aead_aegis128l_decrypt 0 1
-_crypto_aead_aegis128l_decrypt_detached 0 1
-_crypto_aead_aegis128l_encrypt 0 1
-_crypto_aead_aegis128l_encrypt_detached 0 1
-_crypto_aead_aegis128l_keybytes 0 1
-_crypto_aead_aegis128l_keygen 0 1
-_crypto_aead_aegis128l_messagebytes_max 0 1
-_crypto_aead_aegis128l_npubbytes 0 1
-_crypto_aead_aegis128l_nsecbytes 0 1
-_crypto_aead_aegis256_abytes 0 1
-_crypto_aead_aegis256_decrypt 0 1
-_crypto_aead_aegis256_decrypt_detached 0 1
-_crypto_aead_aegis256_encrypt 0 1
-_crypto_aead_aegis256_encrypt_detached 0 1
-_crypto_aead_aegis256_keybytes 0 1
-_crypto_aead_aegis256_keygen 0 1
-_crypto_aead_aegis256_messagebytes_max 0 1
-_crypto_aead_aegis256_npubbytes 0 1
-_crypto_aead_aegis256_nsecbytes 0 1
+_crypto_aead_aegis128l_abytes 1 1
+_crypto_aead_aegis128l_decrypt 1 1
+_crypto_aead_aegis128l_decrypt_detached 1 1
+_crypto_aead_aegis128l_encrypt 1 1
+_crypto_aead_aegis128l_encrypt_detached 1 1
+_crypto_aead_aegis128l_keybytes 1 1
+_crypto_aead_aegis128l_keygen 1 1
+_crypto_aead_aegis128l_messagebytes_max 1 1
+_crypto_aead_aegis128l_npubbytes 1 1
+_crypto_aead_aegis128l_nsecbytes 1 1
+_crypto_aead_aegis256_abytes 1 1
+_crypto_aead_aegis256_decrypt 1 1
+_crypto_aead_aegis256_decrypt_detached 1 1
+_crypto_aead_aegis256_encrypt 1 1
+_crypto_aead_aegis256_encrypt_detached 1 1
+_crypto_aead_aegis256_keybytes 1 1
+_crypto_aead_aegis256_keygen 1 1
+_crypto_aead_aegis256_messagebytes_max 1 1
+_crypto_aead_aegis256_npubbytes 1 1
+_crypto_aead_aegis256_nsecbytes 1 1
 _crypto_aead_aes256gcm_abytes 0 0
 _crypto_aead_aes256gcm_beforenm 0 0
 _crypto_aead_aes256gcm_decrypt 0 0