From a02045fdf29f1d5bea42c9afe26806bfbb4b3d66 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Fri, 26 Jun 2026 22:13:07 +0300
Subject: [PATCH] Disable OpenBSD execute-only for NativeAOT stubs

---
 .../Microsoft.NETCore.Native.Unix.targets                 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index 1e4afaab8cc578..9867a563edaaee 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -278,6 +278,8 @@ The .NET Foundation licenses this file to you under the MIT license.
            indirect branches (e.g. switch jump tables) to non-endbr64 targets fault with SIGILL.
            Opt out of branch-target CFI enforcement via the PT_OPENBSD_NOBTCFI program header. -->
       <LinkerArg Include="-Wl,-z,nobtcfi" Condition="'$(_targetOS)' == 'openbsd'" />
+      <!-- Opt out of OpenBSD's execute-only text so NativeAOT can read its own stub bytes (RhGetCodeTarget). -->
+      <LinkerArg Include="-Wl,--no-execute-only" Condition="'$(_targetOS)' == 'openbsd'" />
       <!-- this workaround can be deleted once the minimum supported glibc version
            (runtime's official build machine's glibc version) is at least 2.33
            see https://github.com/bminor/glibc/commit/99468ed45f5a58f584bab60364af937eb6f8afda -->
@@ -286,8 +288,10 @@ The .NET Foundation licenses this file to you under the MIT license.
       <LinkerArg Include="-L&quot;$(SysRoot)/usr/local/lib&quot; -lgssapi_krb5" Condition="'$(_targetOS)' == 'freebsd'" />
       <!-- FreeBSD's inotify is an installed package and not found in default libraries  -->
       <LinkerArg Include="-L&quot;$(SysRoot)/usr/local/lib&quot; -linotify" Condition="'$(_targetOS)' == 'freebsd'" />
-      <!-- OpenBSD's GSSAPI is provided by the Heimdal package. -->
-      <LinkerArg Include="-L&quot;$(SysRoot)/usr/local/heimdal/lib&quot; -l:libgssapi.so.9.0" Condition="'$(_targetOS)' == 'openbsd'" />
+      <!-- OpenBSD's GSSAPI is provided by the Heimdal package, which ships only a versioned shared object. -->
+      <LinkerArg Include="-L&quot;$(SysRoot)/usr/local/heimdal/lib&quot; -l:libgssapi.so.9.0 -Wl,-rpath,/usr/local/heimdal/lib" Condition="'$(_targetOS)' == 'openbsd'" />
+      <!-- OpenBSD's inotify is the libinotify port, which ships only a versioned shared object. -->
+      <LinkerArg Include="-L&quot;$(SysRoot)/usr/local/lib/inotify&quot; -l:libinotify.so.4.0 -Wl,-rpath,/usr/local/lib/inotify" Condition="'$(_targetOS)' == 'openbsd'" />
       <LinkerArg Include="@(ExtraLinkerArg->'-Wl,%(Identity)')" />
       <LinkerArg Include="@(NativeFramework->'-framework %(Identity)')" Condition="'$(_IsApplePlatform)' == 'true'" />
       <LinkerArg Include="-Wl,--eh-frame-hdr" Condition="'$(_IsApplePlatform)' != 'true'" />