Fix superpmi arm64 build

Commit migrated from https://github.com/dotnet/coreclr/commit/f2324b6744f05a051829a2aa65b745bb073d6f98

diff --git a/src/coreclr/src/ToolBox/superpmi/superpmi-shared/compileresult.cpp b/src/coreclr/src/ToolBox/superpmi/superpmi-shared/compileresult.cpp
index dfb7ecd..8b7961d 100644 (file)
--- a/src/coreclr/src/ToolBox/superpmi/superpmi-shared/compileresult.cpp
+++ b/src/coreclr/src/ToolBox/superpmi/superpmi-shared/compileresult.cpp
@@ -729,7 +729,7 @@ void CompileResult::applyRelocs(unsigned char *block1, ULONG blocksize1, void *o
             break;
         #endif // _TARGET_X86_
 
-        #if defined(_TARGET_X86_) || defined(_TARGET_AMD64_)
+        #if defined(_TARGET_X86_) || defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
         case IMAGE_REL_BASED_REL32:
             {
                 DWORDLONG target = tmp.target + tmp.addlDelta;
@@ -737,7 +737,7 @@ void CompileResult::applyRelocs(unsigned char *block1, ULONG blocksize1, void *o
                 DWORDLONG baseAddr = fixupLocation + sizeof(INT32);
                 INT64 delta = (INT64)((BYTE *)target - baseAddr);
 
-        #if defined(_TARGET_AMD64_)
+        #if defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
                 if (delta != (INT64)(int)delta)
                 {
                     // This isn't going to fit in a signed 32-bit address. Use something that will fit,
@@ -750,11 +750,11 @@ void CompileResult::applyRelocs(unsigned char *block1, ULONG blocksize1, void *o
 
                     delta = newdelta;
                 }
-        #endif // defined(_TARGET_AMD64_)
+        #endif // defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
 
                 if (delta != (INT64)(int)delta)
                 {
-        #if defined(_TARGET_AMD64_)
+        #if defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
                     LogError("REL32 relocation overflows field! delta=0x%016llX", delta);
         #else
                     LogError("REL32 relocation overflows field! delta=0x%08X", delta);
@@ -770,9 +770,9 @@ void CompileResult::applyRelocs(unsigned char *block1, ULONG blocksize1, void *o
                 }
             }
             break;
-        #endif // defined(_TARGET_X86_) || defined(_TARGET_AMD64_)
+        #endif // defined(_TARGET_X86_) || defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
 
-        #if defined(_TARGET_AMD64_)
+        #if defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
         case IMAGE_REL_BASED_DIR64:
             {
                 DWORDLONG fixupLocation = tmp.location + tmp.slotNum;
@@ -786,7 +786,15 @@ void CompileResult::applyRelocs(unsigned char *block1, ULONG blocksize1, void *o
                 }
             }
             break;
-        #endif // defined(_TARGET_AMD64_)
+        #endif // defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
+
+        #ifdef _TARGET_ARM64_
+        case IMAGE_REL_ARM64_BRANCH26:   // 26 bit offset << 2 & sign ext, for B and BL
+        case IMAGE_REL_ARM64_PAGEBASE_REL21:
+        case IMAGE_REL_ARM64_PAGEOFFSET_12A:
+            LogError("Unimplemented reloc type %u", tmp.fRelocType);
+            break;
+        #endif // _TARGET_ARM64_          
 
         default:
             LogError("Unknown reloc type %u", tmp.fRelocType);

diff --git a/src/coreclr/src/ToolBox/superpmi/superpmi-shared/runtimedetails.h b/src/coreclr/src/ToolBox/superpmi/superpmi-shared/runtimedetails.h
index 77caafc..4677299 100644 (file)
--- a/src/coreclr/src/ToolBox/superpmi/superpmi-shared/runtimedetails.h
+++ b/src/coreclr/src/ToolBox/superpmi/superpmi-shared/runtimedetails.h
@@ -11,13 +11,17 @@
 
 //Our little collection of enough of the CLR data to get the JIT up and working...
 #define FEATURE_CLRSQM
-#ifdef _M_X64
+
+#if !defined(_TARGET_AMD64_) && !defined(_TARGET_X86_) && !defined(_TARGET_ARM64_) && !defined(_TARGET_ARM_)
+#if defined(_M_X64)
 #define _TARGET_AMD64_ 1
-#endif
-#ifdef _M_IX86
+#elif defined(_M_IX86)
 #define _TARGET_X86_ 1
 #endif
+#endif // _TARGET_* not previously defined
+
 #define __EXCEPTION_RECORD_CLR //trick out clrntexception.h to not include another exception record....
+
 #include <mscoree.h>
 #include <corjit.h>
 #include <utilcode.h>