From c044b5d0aaef35d494ddb6ae10290be99e4cdda2 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 22 Mar 2024 04:57:18 +0100
Subject: [PATCH 1/2] Fix calculation in PREPARE_EXTERNAL_VAR[_INDIRECT]

---
 src/coreclr/nativeaot/Runtime/unix/unixasmmacrosarm.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/nativeaot/Runtime/unix/unixasmmacrosarm.inc b/src/coreclr/nativeaot/Runtime/unix/unixasmmacrosarm.inc
index 5a1cef176e102b..68631819f7dee4 100644
--- a/src/coreclr/nativeaot/Runtime/unix/unixasmmacrosarm.inc
+++ b/src/coreclr/nativeaot/Runtime/unix/unixasmmacrosarm.inc
@@ -77,13 +77,13 @@ C_FUNC(\Name):
 
 .macro PREPARE_EXTERNAL_VAR Name, HelperReg
         movw \HelperReg, #:lower16:C_FUNC(\Name) - (. + 12)
-        movt \HelperReg, #:upper16:C_FUNC(\Name) - (. + 12)
+        movt \HelperReg, #:upper16:C_FUNC(\Name) - (. + 8)
         add \HelperReg, pc
 .endm
 
 .macro PREPARE_EXTERNAL_VAR_INDIRECT Name, HelperReg
         movw \HelperReg, #:lower16:C_FUNC(\Name) - (. + 12)
-        movt \HelperReg, #:upper16:C_FUNC(\Name) - (. + 12)
+        movt \HelperReg, #:upper16:C_FUNC(\Name) - (. + 8)
         add \HelperReg, pc
         ldr \HelperReg, [\HelperReg]
 .endm

From 6d2493467b0d05cbeded18eb4d5d242867f04848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Fri, 22 Mar 2024 08:30:18 +0100
Subject: [PATCH 2/2] Work around compiler-asserting tests

---
 src/tests/JIT/Stress/ABI/pinvokes_d.csproj   | 3 +++
 src/tests/JIT/Stress/ABI/pinvokes_do.csproj  | 3 +++
 src/tests/JIT/Stress/ABI/stubs_do.csproj     | 3 +++
 src/tests/JIT/Stress/ABI/tailcalls_d.csproj  | 3 +++
 src/tests/JIT/Stress/ABI/tailcalls_do.csproj | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/src/tests/JIT/Stress/ABI/pinvokes_d.csproj b/src/tests/JIT/Stress/ABI/pinvokes_d.csproj
index 734e0a53fdd348..0fa967a0c43511 100644
--- a/src/tests/JIT/Stress/ABI/pinvokes_d.csproj
+++ b/src/tests/JIT/Stress/ABI/pinvokes_d.csproj
@@ -10,6 +10,9 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- https://github.com/dotnet/runtime/issues/100125 -->
+    <NativeAotIncompatible>true</NativeAotIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Stress/ABI/pinvokes_do.csproj b/src/tests/JIT/Stress/ABI/pinvokes_do.csproj
index 309cb73d7b11e1..f471e30b30f03c 100644
--- a/src/tests/JIT/Stress/ABI/pinvokes_do.csproj
+++ b/src/tests/JIT/Stress/ABI/pinvokes_do.csproj
@@ -10,6 +10,9 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- https://github.com/dotnet/runtime/issues/100125 -->
+    <NativeAotIncompatible>true</NativeAotIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Stress/ABI/stubs_do.csproj b/src/tests/JIT/Stress/ABI/stubs_do.csproj
index 074d268462d20b..38c8f167d1a268 100644
--- a/src/tests/JIT/Stress/ABI/stubs_do.csproj
+++ b/src/tests/JIT/Stress/ABI/stubs_do.csproj
@@ -10,6 +10,9 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- https://github.com/dotnet/runtime/issues/100125 -->
+    <NativeAotIncompatible>true</NativeAotIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Stress/ABI/tailcalls_d.csproj b/src/tests/JIT/Stress/ABI/tailcalls_d.csproj
index f4a41e649c4bcd..9b916ec6156432 100644
--- a/src/tests/JIT/Stress/ABI/tailcalls_d.csproj
+++ b/src/tests/JIT/Stress/ABI/tailcalls_d.csproj
@@ -10,6 +10,9 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- https://github.com/dotnet/runtime/issues/100125 -->
+    <NativeAotIncompatible>true</NativeAotIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/JIT/Stress/ABI/tailcalls_do.csproj b/src/tests/JIT/Stress/ABI/tailcalls_do.csproj
index c295fce88b56d3..5a71a5843a2210 100644
--- a/src/tests/JIT/Stress/ABI/tailcalls_do.csproj
+++ b/src/tests/JIT/Stress/ABI/tailcalls_do.csproj
@@ -10,6 +10,9 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- https://github.com/dotnet/runtime/issues/100125 -->
+    <NativeAotIncompatible>true</NativeAotIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>