From 3224f398aacf3740a702b50152fa9fee0ae49795 Mon Sep 17 00:00:00 2001 From: Bruce Forstall Date: Sat, 20 Aug 2016 13:15:09 -0700 Subject: [PATCH] SuperPMI: fix ARM build break [tfs-changeset: 1623419] Commit migrated from https://github.com/dotnet/coreclr/commit/627f3a3eb006f876546197a283b79ddf17ad52a6 --- src/coreclr/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/coreclr/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp b/src/coreclr/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp index 508ccc9..41b0195 100644 --- a/src/coreclr/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp +++ b/src/coreclr/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp @@ -2030,10 +2030,15 @@ void MyICJI::getModuleNativeEntryPointRange( // DWORD MyICJI::getExpectedTargetArchitecture() { -#ifdef _TARGET_AMD64_ - return IMAGE_FILE_MACHINE_AMD64; -#endif -#ifdef _TARGET_X86_ +#if defined(_TARGET_X86_) return IMAGE_FILE_MACHINE_I386; +#elif defined(_TARGET_AMD64_) + return IMAGE_FILE_MACHINE_AMD64; +#elif defined(_TARGET_ARM_) + return IMAGE_FILE_MACHINE_ARMNT; +#elif defined(_TARGET_ARM64_) + return IMAGE_FILE_MACHINE_ARM64; +#else + return IMAGE_FILE_MACHINE_UNKNOWN; #endif } -- 2.7.4