Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corert.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsergey ignatov <sergign60@mail.ru>2017-10-18 17:25:18 +0300
committerJan Kotas <jkotas@microsoft.com>2017-10-18 17:25:18 +0300
commit726bbcff79351771c1b8feaab87b27f5bf45cb64 (patch)
treec234b4fe39c19b11bf713fa3e2170165acd78240 /src/Native
parent5035c81dfe0a5c66880bb8faca2ca86c998ca7a0 (diff)
[RyuJIT/ARM32] Support for CFI unwind info (#4755)
Diffstat (limited to 'src/Native')
-rw-r--r--src/Native/CMakeLists.txt2
-rw-r--r--src/Native/jitinterface/jithost.cpp6
2 files changed, 8 insertions, 0 deletions
diff --git a/src/Native/CMakeLists.txt b/src/Native/CMakeLists.txt
index ad55c469f..98a0214cf 100644
--- a/src/Native/CMakeLists.txt
+++ b/src/Native/CMakeLists.txt
@@ -64,6 +64,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1)
elseif(CLR_CMAKE_TARGET_ARCH STREQUAL arm)
set(CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM 1)
+ elseif(CLR_CMAKE_TARGET_ARCH STREQUAL armel)
+ set(CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM 1)
elseif(CLR_CMAKE_TARGET_ARCH STREQUAL arm64)
set(CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM64 1)
elseif(CLR_CMAKE_TARGET_ARCH STREQUAL x86)
diff --git a/src/Native/jitinterface/jithost.cpp b/src/Native/jitinterface/jithost.cpp
index 281f7a375..62770ddca 100644
--- a/src/Native/jitinterface/jithost.cpp
+++ b/src/Native/jitinterface/jithost.cpp
@@ -6,11 +6,17 @@
#include "dllexport.h"
+#ifdef _X86_
#ifdef PLATFORM_UNIX
#define DEFAULT_CALL_CONV __cdecl
#else
#define DEFAULT_CALL_CONV __stdcall
#endif
+#else
+#define DEFAULT_CALL_CONV
+#define __cdecl
+#define __stdcall
+#endif
class JitConfigProvider
{