Merge branch 'main' into dev/grendel/blazor-hang

* main:
  Switch 64-bit hashes to xxhash3 (#8721)
  Bump to xamarin/monodroid@fefc158ef3 (#8850)
  Bump binutils to 17.0.6-7.2.1 (#8806)

Author: grendello

.external

@@ -1 +1 @@
-xamarin/monodroid:main@77124dc16985a92077e62b0cfeaeb007c4d4fd2a
+xamarin/monodroid:main@fefc158ef36d056249e8775df4e5d409a70119e2

.gitmodules

@@ -25,3 +25,9 @@
 [submodule "external/libunwind"]
 	path = external/libunwind
 	url = https://github.com/libunwind/libunwind.git
+[submodule "external/xxHash"]
+	path = external/xxHash
+	url = https://github.com/Cyan4973/xxHash.git
+[submodule "external/constexpr-xxh3"]
+	path = external/constexpr-xxh3
+	url = https://github.com/chys87/constexpr-xxh3.git

THIRD-PARTY-NOTICES.TXT

@@ -516,3 +516,68 @@ SOFTWARE.
 ======================================================
 END OF tessil/robin-map NOTICES AND INFORMATION
 
+%% chys87/constexpr-xxh3 NOTICES AND INFORMATION BEGIN HERE
+===========================================================
+
+BSD 2-Clause License
+
+constexpr-xxh3 - C++20 constexpr implementation of the XXH3 64-bit variant of xxHash
+Copyright (c) 2021-2023, chys <admin@chys.info> <chys87@github>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+======================================================
+END OF chys87/constexpr-xxh3 NOTICES AND INFORMATION
+
+%% Cyan4973/xxHash NOTICES AND INFORMATION BEGIN HERE
+=====================================================
+
+xxHash Library
+Copyright (c) 2012-2021 Yann Collet
+All rights reserved.
+
+BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+%% END OF Cyan4973/xxHash NOTICES AND INFORMATION
+=================================================

build-tools/scripts/generate-pinvoke-tables.sh

@@ -8,6 +8,7 @@ GENERATOR_BINARY="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables"
 TARGET_FILE="${MONODROID_SOURCE_DIR}/pinvoke-tables.include"
 GENERATED_FILE="${TARGET_FILE}.generated"
 DIFF_FILE="${TARGET_FILE}.diff"
+EXTERNAL_DIR="${MY_DIR}/../../external/"
 
 function die()
 {
@@ -62,7 +63,7 @@ case ${HOST} in
 	*) die Unsupported OS ;;
 esac
 
-${COMPILER} -O2 -std=c++20 "${GENERATOR_SOURCE}" -o "${GENERATOR_BINARY}"
+${COMPILER} -O2 -std=c++20 -I${EXTERNAL_DIR} -I${EXTERNAL_DIR}/constexpr-xxh3 "${GENERATOR_SOURCE}" -o "${GENERATOR_BINARY}"
 "${GENERATOR_BINARY}" "${GENERATED_FILE}"
 
 FILES_DIFFER="no"

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

@@ -15,7 +15,7 @@ namespace Xamarin.Android.Prepare
 	//
 	partial class Configurables
 	{
-		const string BinutilsVersion                = "L_17.0.6-7.1.0";
+		const string BinutilsVersion                = "L_17.0.6-7.2.1";
 
 		const string MicrosoftOpenJDK17Version      = "17.0.8";
 		const string MicrosoftOpenJDK17Release      = "17.0.8.7";

external/constexpr-xxh3

@@ -223,7 +223,7 @@ public static ulong GetMangledAssemblyNameSizeOverhead ()
 	public static ulong GetXxHash (byte[] stringBytes, bool is64Bit)
 	{
 		if (is64Bit) {
-			return XxHash64.HashToUInt64 (stringBytes);
+			return XxHash3.HashToUInt64 (stringBytes);
 		}
 
 		return (ulong)XxHash32.HashToUInt32 (stringBytes);

external/xxHash

@@ -23,7 +23,7 @@ public static ulong HashJavaName (string name, bool is64Bit)
 	static ulong HashBytes (byte[] bytes, bool is64Bit)
 	{
 		if (is64Bit) {
-			return XxHash64.HashToUInt64 (bytes);
+			return XxHash3.HashToUInt64 (bytes);
 		}
 
 		return (ulong)XxHash32.HashToUInt32 (bytes);

src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.Basic.cs

@@ -65,16 +65,20 @@ set(LZ4_SRC_DIR "${EXTERNAL_DIR}/lz4/lib")
 set(LZ4_INCLUDE_DIR ${LZ4_SRC_DIR})
 set(XA_BIN_DIR "${REPO_ROOT_DIR}/bin/${XA_BUILD_CONFIGURATION}")
 set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")
+set(XXHASH_DIR "${EXTERNAL_DIR}/xxHash")
+set(CONSTEXPR_XXH3_DIR "${EXTERNAL_DIR}/constexpr-xxh3")
 
 set(LZ4_SOURCES
   "${LZ4_SRC_DIR}/lz4.c"
   )
 
 # Include directories
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/ ${CMAKE_SOURCE_DIR}/include)
+include_directories(${EXTERNAL_DIR})
 
 # The SYSTEM which will make clang skip warnings for the headers there. Since we can't do
 # much about them, we can just as well avoid cluttered build output.
+include_directories(SYSTEM ${CONSTEXPR_XXH3_DIR})
 include_directories(SYSTEM ${ROBIN_MAP_DIR}/include)
 include_directories(SYSTEM ${LZ4_INCLUDE_DIR})