[wasm][coreclr] Fix native relinking

src/coreclr/vm/callhelpers.h

@@ -10,10 +10,7 @@
 #define __CALLHELPERS_H__
 
 #ifdef TARGET_WASM
-// A sentinel value to indicate to the stack walker that this frame is NOT R2R generated managed code,
-// and it should look for the next Frame in the Frame chain to make further progress.
-#define TERMINATE_R2R_STACK_WALK 1
-
+#include "wasm/callhelpers.hpp"
 #endif
 
 struct CallDescrData

src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp

@@ -8,6 +8,7 @@
 //
 
 #include <callhelpers.hpp>
+#include <minipal/utils.h>
 
 // Arguments are passed on the stack with each argument aligned to INTERP_STACK_SLOT_SIZE.
 #define ARG_ADDR(i) (pArgs + (i * INTERP_STACK_SLOT_SIZE))

src/coreclr/vm/wasm/callhelpers.hpp

@@ -5,6 +5,10 @@
 #ifndef __WASM_CALLHELPERS_HPP__
 #define __WASM_CALLHELPERS_HPP__
 
+// A sentinel value to indicate to the stack walker that this frame is NOT R2R generated managed code,
+// and it should look for the next Frame in the Frame chain to make further progress.
+#define TERMINATE_R2R_STACK_WALK 1
+
 struct StringToWasmSigThunk
 {
     const char* key;

src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs

@@ -74,6 +74,7 @@ private static void Emit(StreamWriter w, IEnumerable<string> cookies)
         //
 
         #include <callhelpers.hpp>
+        #include <minipal/utils.h>
 
         // Arguments are passed on the stack with each argument aligned to INTERP_STACK_SLOT_SIZE.
         #define ARG_ADDR(i) (pArgs + (i * INTERP_STACK_SLOT_SIZE))