Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

[x86/Linux] Resolve linking errors due to duplicated functions #8413

Merged
merged 1 commit into from
Dec 2, 2016
Merged

[x86/Linux] Resolve linking errors due to duplicated functions #8413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/vm/i386/cgenx86.cpp
View file
Open in desktop
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