From: Jonghyun Park Date: Fri, 2 Dec 2016 00:57:46 +0000 (+0900) Subject: Resolve duplicated functions (#8413) X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c1fb28db6cd0e0bdd83494054d743a30c3287b6;p=platform%2Fupstream%2Fcoreclr.git Resolve duplicated functions (#8413) 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. --- diff --git a/src/vm/i386/cgenx86.cpp b/src/vm/i386/cgenx86.cpp index 8864b025ae..b3bb14fa23 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