From 3bc060ad8f334efd3210c2a1e10c2d849c9a9fd5 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Thu, 1 Dec 2016 15:39:40 +0900 Subject: [PATCH] Resolve duplicated functions Several functions are implemented in both cgenx86.cpp and unixstubs.cpp, which results in linking errors. This commit disables functions in cgenx86.cpp to resolve linking errors. --- src/vm/i386/cgenx86.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vm/i386/cgenx86.cpp b/src/vm/i386/cgenx86.cpp index cefeeef0f09b..b907f9e085a6 100644 --- a/src/vm/i386/cgenx86.cpp +++ b/src/vm/i386/cgenx86.cpp @@ -1682,6 +1682,7 @@ void ResumeAtJit(PCONTEXT pContext, LPVOID oldESP) #endif // !EnC_SUPPORTED +#ifndef FEATURE_PAL #pragma warning(push) #pragma warning(disable: 4035) extern "C" DWORD __stdcall getcpuid(DWORD arg, unsigned char result[16]) @@ -1755,6 +1756,7 @@ extern "C" DWORD __stdcall xmmYmmStateSupport() #pragma warning(pop) +#endif // This function returns the number of logical processors on a given physical chip. If it cannot // determine the number of logical cpus, or the machine is not populated uniformly with the same