From 18809eb4e9887e431425eb9b9dc558cfd2fafd63 Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Fri, 7 May 2021 15:18:37 -0400
Subject: [PATCH 1/2] Fix issue 42292

---
 .../exception_handling/pal_sxs/test1/CMakeLists.txt         | 4 ++++
 src/coreclr/pal/tests/palsuite/issues.targets               | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt b/src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt
index 08de84f25e8de4..1df233fc68cd80 100644
--- a/src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt
+++ b/src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt
@@ -5,6 +5,10 @@ endif(CLR_CMAKE_HOST_UNIX)
 # Set the RPATH of paltest_pal_sxs_test1 so that it can find dependencies without needing to set LD_LIBRARY
 # For more information: http://www.cmake.org/Wiki/CMake_RPATH_handling.
 if(CORECLR_SET_RPATH)
+  if(CLR_CMAKE_HOST_OSX)
+    set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+    set(CMAKE_INSTALL_RPATH "@loader_path")
+  endif(CLR_CMAKE_HOST_OSX)
   if(CLR_CMAKE_HOST_LINUX)
     set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
     set(CMAKE_INSTALL_RPATH "\$ORIGIN")
diff --git a/src/coreclr/pal/tests/palsuite/issues.targets b/src/coreclr/pal/tests/palsuite/issues.targets
index e5b4b245c178e9..bca854e409e9e9 100644
--- a/src/coreclr/pal/tests/palsuite/issues.targets
+++ b/src/coreclr/pal/tests/palsuite/issues.targets
@@ -28,18 +28,12 @@
         <ExcludeList Include="miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1">
             <Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
         </ExcludeList>
-        <ExcludeList Include="exception_handling/pal_sxs/test1/paltest_pal_sxs_test1">
-            <Issue>https://github.com/dotnet/runtime/issues/42292</Issue>
-        </ExcludeList>
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'OSX'">
         <ExcludeList Include="miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1">
             <Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
         </ExcludeList>
-        <ExcludeList Include="exception_handling/pal_sxs/test1/paltest_pal_sxs_test1">
-            <Issue>https://github.com/dotnet/runtime/issues/42292</Issue>
-        </ExcludeList>
         <ExcludeList Include="file_io/ReadFile/test2/paltest_readfile_test2">
             <!-- Test hard codes PAGE_SIZE = 4096. Apple Silicon does not have 4K pages. -->
             <Issue>https://github.com/dotnet/runtime/issues/42292</Issue>

From 07cffd1e754b84d37922327cc5eb0995509b6647 Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Fri, 7 May 2021 15:19:13 -0400
Subject: [PATCH 2/2] Cleanup PAL issues.targets

---
 src/coreclr/pal/tests/palsuite/issues.targets | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/coreclr/pal/tests/palsuite/issues.targets b/src/coreclr/pal/tests/palsuite/issues.targets
index bca854e409e9e9..6b0e8ae55667ad 100644
--- a/src/coreclr/pal/tests/palsuite/issues.targets
+++ b/src/coreclr/pal/tests/palsuite/issues.targets
@@ -24,23 +24,20 @@
         </ExcludeList>
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' and '$(TargetOS)' == 'OSX'">
+    <ItemGroup Condition="'$(TargetOS)' == 'OSX'">
         <ExcludeList Include="miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1">
             <Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
         </ExcludeList>
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'OSX'">
-        <ExcludeList Include="miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1">
-            <Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
-        </ExcludeList>
         <ExcludeList Include="file_io/ReadFile/test2/paltest_readfile_test2">
             <!-- Test hard codes PAGE_SIZE = 4096. Apple Silicon does not have 4K pages. -->
-            <Issue>https://github.com/dotnet/runtime/issues/42292</Issue>
+            <Issue>https://github.com/dotnet/runtime/issues/48783</Issue>
         </ExcludeList>
         <ExcludeList Include="filemapping_memmgt/VirtualProtect/test4/paltest_virtualprotect_test4">
             <!-- Test tries to set RWX on general memory page -->
-            <Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
+            <Issue>https://github.com/dotnet/runtime/issues/48783</Issue>
         </ExcludeList>
     </ItemGroup>
 </Project>