From f28ce0f68fabf5ab319f3d9825d21620a12316f3 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Wed, 26 Jul 2023 22:47:05 +0200 Subject: [PATCH 1/2] Bump to LLVM toolchain based on version 16.0.6 Context: https://github.com/dotnet/maui/issues/14531 Changes: https://discourse.llvm.org/t/llvm-16-0-0-release/69326 Changes: https://discourse.llvm.org/t/llvm-16-0-1-release/69774 Changes: https://discourse.llvm.org/t/llvm-16-0-2-release/70107 Changes: https://discourse.llvm.org/t/16-0-3-release/70341 Changes: https://discourse.llvm.org/t/16-0-4-release/70692 Changes: https://discourse.llvm.org/t/16-0-5-release/71097 Changes: https://discourse.llvm.org/t/16-0-6-release/71344 This release drops use of the UPX executable compressor, since it appears to be crashing on some Windows machines. --- build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs index c26df75a5e1..7cc03163c24 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs @@ -15,7 +15,7 @@ namespace Xamarin.Android.Prepare // partial class Configurables { - const string BinutilsVersion = "L_15.0.7-5.0.3"; + const string BinutilsVersion = "L_16.0.6-6.0.0"; const string MicrosoftOpenJDK11Version = "11.0.16"; const string MicrosoftOpenJDK11Release = "8.1"; From f4dfd695663bc297e5a127a8d00f58c105dc1c61 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 27 Jul 2023 10:37:13 +0200 Subject: [PATCH 2/2] Update LLVM DSO paths --- build-tools/installers/unix-binutils.projitems | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-tools/installers/unix-binutils.projitems b/build-tools/installers/unix-binutils.projitems index 7844af74665..695f1d18be2 100644 --- a/build-tools/installers/unix-binutils.projitems +++ b/build-tools/installers/unix-binutils.projitems @@ -1,7 +1,7 @@ - <_LlvmLibExtension Condition=" '$(HostOS)' == 'Linux' ">so.15 + <_LlvmLibExtension Condition=" '$(HostOS)' == 'Linux' ">so.16 <_LlvmLibExtension Condition=" '$(HostOS)' == 'Darwin' ">dylib @@ -65,6 +65,7 @@ <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMInstCombine.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMInstrumentation.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMipo.$(_LlvmLibExtension)" /> + <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMIRPrinter.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMIRReader.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMLibDriver.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMLinker.$(_LlvmLibExtension)" /> @@ -86,6 +87,7 @@ <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMSymbolize.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMTableGenGlobalISel.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMTableGen.$(_LlvmLibExtension)" /> + <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMTargetParser.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMTarget.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMTextAPI.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMTransformUtils.$(_LlvmLibExtension)" />