From 99c2dbea3c93cb3cf182964f5fedeba82e31615e Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 29 Sep 2022 18:57:56 +0200 Subject: [PATCH 1/4] Bump LLVM to 15.0.1 Changes: https://releases.llvm.org/15.0.0/docs/ReleaseNotes.html Changes: https://discourse.llvm.org/t/llvm-15-0-1-released/65380 --- build-tools/installers/unix-binutils.projitems | 9 ++++++--- .../xaprepare/xaprepare/ConfigAndData/Configurables.cs | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build-tools/installers/unix-binutils.projitems b/build-tools/installers/unix-binutils.projitems index 2c29381728a..7844af74665 100644 --- a/build-tools/installers/unix-binutils.projitems +++ b/build-tools/installers/unix-binutils.projitems @@ -1,7 +1,7 @@ - <_LlvmLibExtension Condition=" '$(HostOS)' == 'Linux' ">so.14 + <_LlvmLibExtension Condition=" '$(HostOS)' == 'Linux' ">so.15 <_LlvmLibExtension Condition=" '$(HostOS)' == 'Darwin' ">dylib @@ -69,11 +69,12 @@ <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMLibDriver.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMLinker.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMLTO.$(_LlvmLibExtension)" /> - <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMMC.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMMCDisassembler.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMMCParser.$(_LlvmLibExtension)" /> + <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMMC.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMMIRParser.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMObjCARCOpts.$(_LlvmLibExtension)" /> + <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMObjCopy.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMObject.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMOption.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMPasses.$(_LlvmLibExtension)" /> @@ -82,12 +83,14 @@ <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMScalarOpts.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMSelectionDAG.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMSupport.$(_LlvmLibExtension)" /> - <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMTableGen.$(_LlvmLibExtension)" /> + <_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\libLLVMTarget.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMTextAPI.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMTransformUtils.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMVectorize.$(_LlvmLibExtension)" /> + <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMWindowsDriver.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMWindowsManifest.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMX86AsmParser.$(_LlvmLibExtension)" /> <_BinUtilsFilesUnixSign Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\lib\libLLVMX86CodeGen.$(_LlvmLibExtension)" /> diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs index 82bdca75065..afbeec66a56 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_14.0.1-4.1.0"; + const string BinutilsVersion = "L_15.0.1-5.0.0"; const string MicrosoftOpenJDK11Version = "11.0.16"; const string MicrosoftOpenJDK11Release = "8.1"; From 4e97eb47f3d4bf5a61928092895f251d2749bac2 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Mon, 10 Oct 2022 23:21:34 +0200 Subject: [PATCH 2/4] Bump LLVM to 15.0.2 Changes: https://releases.llvm.org/15.0.0/docs/ReleaseNotes.html Changes: https://discourse.llvm.org/t/llvm-15-0-1-released/65380 Changes: https://discourse.llvm.org/t/llvm-15-0-2-released/65695 --- 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 afbeec66a56..ed219d72b9f 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.1-5.0.0"; + const string BinutilsVersion = "L_15.0.2-5.0.1 "; const string MicrosoftOpenJDK11Version = "11.0.16"; const string MicrosoftOpenJDK11Release = "8.1"; From bbc1619424386a6dc721c68e16bce9a2b83a698a Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Mon, 10 Oct 2022 23:27:33 +0200 Subject: [PATCH 3/4] Remove trailing whitespace --- 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 ed219d72b9f..f1f4c2cb5ed 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.2-5.0.1 "; + const string BinutilsVersion = "L_15.0.2-5.0.1"; const string MicrosoftOpenJDK11Version = "11.0.16"; const string MicrosoftOpenJDK11Release = "8.1"; From a395f20f66e2ae6538e8aa0a8f53a784c7365a3a Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Tue, 18 Oct 2022 21:48:23 +0200 Subject: [PATCH 4/4] Bump LLVM to 15.0.3 Changes: https://releases.llvm.org/15.0.0/docs/ReleaseNotes.html Changes: https://discourse.llvm.org/t/llvm-15-0-1-released/65380 Changes: https://discourse.llvm.org/t/llvm-15-0-2-released/65695 Changes: https://discourse.llvm.org/t/llvm-15-0-3-released/66036 --- 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 f1f4c2cb5ed..760479ee6f5 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.2-5.0.1"; + const string BinutilsVersion = "L_15.0.3-5.0.2"; const string MicrosoftOpenJDK11Version = "11.0.16"; const string MicrosoftOpenJDK11Release = "8.1";