From 58b74484f6572671b057e869418954a514d0f74d Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Wed, 26 Apr 2023 18:00:50 -0700 Subject: [PATCH 1/3] Comment out support for mtag extension in libunwind Works around build breaks with some compiler versions. Fixes https://github.com/dotnet/source-build/issues/3424 --- src/native/external/llvm-libunwind/src/DwarfInstructions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/native/external/llvm-libunwind/src/DwarfInstructions.hpp b/src/native/external/llvm-libunwind/src/DwarfInstructions.hpp index 7c546c1e9ea97c..d242a549e5b47d 100644 --- a/src/native/external/llvm-libunwind/src/DwarfInstructions.hpp +++ b/src/native/external/llvm-libunwind/src/DwarfInstructions.hpp @@ -211,7 +211,7 @@ int DwarfInstructions::stepWithDwarf(A &addressSpace, pint_t pc, // __unw_step_stage2 is not used for cross unwinding, so we use // __aarch64__ rather than LIBUNWIND_TARGET_AARCH64 to make sure we are // building for AArch64 natively. -#if defined(__aarch64__) +#if 0 // defined(__aarch64__) if (stage2 && cieInfo.mteTaggedFrame) { pint_t sp = registers.getSP(); pint_t p = sp; From 110ee255cc19f7a8b2e0388e21d1d89e1bebbf40 Mon Sep 17 00:00:00 2001 From: vsadov <8218165+VSadov@users.noreply.github.com> Date: Thu, 27 Apr 2023 10:17:36 -0700 Subject: [PATCH 2/3] added a commit reference to libunwind-version.txt --- src/native/external/libunwind-version.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/native/external/libunwind-version.txt b/src/native/external/libunwind-version.txt index d3fef9166e6151..6d15b93e1e5a19 100644 --- a/src/native/external/libunwind-version.txt +++ b/src/native/external/libunwind-version.txt @@ -18,3 +18,6 @@ Apply https://github.com/libunwind/libunwind/pull/416 For LoongArch64: Apply https://github.com/libunwind/libunwind/pull/316 and https://github.com/libunwind/libunwind/pull/322 + +Build Break on arm64 with old clang +https://github.com/dotnet/runtime/pull/85431/commits/0ee8827547405408b37d1aae2a83629c1632eea8 From 10ba563042616592bebf8beb513d9ce0483646ac Mon Sep 17 00:00:00 2001 From: vsadov <8218165+VSadov@users.noreply.github.com> Date: Thu, 27 Apr 2023 15:44:20 -0700 Subject: [PATCH 3/3] move commit to the right file --- src/native/external/libunwind-version.txt | 3 --- src/native/external/llvm-libunwind-version.txt | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/native/external/libunwind-version.txt b/src/native/external/libunwind-version.txt index 6d15b93e1e5a19..d3fef9166e6151 100644 --- a/src/native/external/libunwind-version.txt +++ b/src/native/external/libunwind-version.txt @@ -18,6 +18,3 @@ Apply https://github.com/libunwind/libunwind/pull/416 For LoongArch64: Apply https://github.com/libunwind/libunwind/pull/316 and https://github.com/libunwind/libunwind/pull/322 - -Build Break on arm64 with old clang -https://github.com/dotnet/runtime/pull/85431/commits/0ee8827547405408b37d1aae2a83629c1632eea8 diff --git a/src/native/external/llvm-libunwind-version.txt b/src/native/external/llvm-libunwind-version.txt index 655ea7ff05e1aa..d23999cc453682 100644 --- a/src/native/external/llvm-libunwind-version.txt +++ b/src/native/external/llvm-libunwind-version.txt @@ -2,3 +2,5 @@ v16.0.2 https://github.com/llvm/llvm-project/releases/tag/llvmorg-16.0.2 Apply https://github.com/dotnet/runtime/commit/1bafb60792b91747d9c2a9dd38461cf090a987a4 +Apply https://github.com/dotnet/runtime/commit/0ee8827547405408b37d1aae2a83629c1632eea8 +