Skip to content

Commit

Permalink
Resolve duplicated functions (dotnet/coreclr#8413)
Browse files Browse the repository at this point in the history
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.

Commit migrated from dotnet/coreclr@7c1fb28
  • Loading branch information
parjong authored and jkotas committed Dec 2, 2016
1 parent e2ca1a3 commit b3546aa
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/coreclr/src/vm/i386/cgenx86.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b3546aa

Please sign in to comment.