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

[x86/Linux] Use portable FastGetDomain #8556

Merged
merged 1 commit into from
Dec 9, 2016
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/vm/comsynchronizable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,7 @@ FCIMPL0(Object*, ThreadNative::GetDomain)
}
FCIMPLEND

#ifdef _TARGET_X86_
#if defined(_TARGET_X86_) && defined(_MSC_VER)
__declspec(naked) LPVOID __fastcall ThreadNative::FastGetDomain()
{
STATIC_CONTRACT_MODE_COOPERATIVE;
Expand All @@ -1624,7 +1624,7 @@ __declspec(naked) LPVOID __fastcall ThreadNative::FastGetDomain()
ret
}
}
#else // _TARGET_X86_
#else // _TARGET_X86_ && _MSC_VER
LPVOID F_CALL_CONV ThreadNative::FastGetDomain()
{
CONTRACTL
Expand All @@ -1650,7 +1650,7 @@ LPVOID F_CALL_CONV ThreadNative::FastGetDomain()
}
return NULL;
}
#endif // _TARGET_X86_
#endif // _TARGET_X86_ && _MSC_VER

#ifdef FEATURE_REMOTING
// This is just a helper method that lets BCL get to the managed context
Expand Down