diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-05-07 11:55:33 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-05-07 11:55:33 -0700 |
| commit | 5f0f1c530245abc4870b11e31c7c6dddc280a006 (patch) | |
| tree | d25bf87a42af7e04812abf1d73334b1511c6f0be /src/vm | |
| parent | 4804af9f341a764e3bd238e1cb6bbab14f82a72d (diff) | |
| parent | 100ed2038f979e05714e8c29915ca7b414dbb7ff (diff) | |
| download | coreclr-5f0f1c530245abc4870b11e31c7c6dddc280a006.tar.gz coreclr-5f0f1c530245abc4870b11e31c7c6dddc280a006.tar.bz2 coreclr-5f0f1c530245abc4870b11e31c7c6dddc280a006.zip | |
Merge pull request #949 from jkotas/warnings
Changes for building using VS2015
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/amd64/InstantiatingStub.asm | 6 | ||||
| -rw-r--r-- | src/vm/amd64/UMThunkStub.asm | 2 | ||||
| -rw-r--r-- | src/vm/amd64/cgenamd64.cpp | 3 | ||||
| -rw-r--r-- | src/vm/rcwwalker.cpp | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/vm/amd64/InstantiatingStub.asm b/src/vm/amd64/InstantiatingStub.asm index d0c3c6402c..42d90d350d 100644 --- a/src/vm/amd64/InstantiatingStub.asm +++ b/src/vm/amd64/InstantiatingStub.asm @@ -12,9 +12,7 @@ include <AsmMacros.inc> include AsmConstants.inc -SHF_GETMETHODFRAMEVPTR equ ?GetMethodFrameVPtr@StubHelperFrame@@SA_KXZ - -extern SHF_GETMETHODFRAMEVPTR:proc +extern s_pStubHelperFrameVPtr:qword extern JIT_FailFast:proc extern s_gsCookie:qword @@ -84,7 +82,7 @@ NESTED_ENTRY InstantiatingMethodStubWorker, _TEXT ; ; fully initialize the StubHelperFrame ; - call SHF_GETMETHODFRAMEVPTR + mov rax, s_pStubHelperFrameVPtr mov [rbp + OFFSETOF_FRAME], rax mov rax, s_gsCookie diff --git a/src/vm/amd64/UMThunkStub.asm b/src/vm/amd64/UMThunkStub.asm index 05e25da156..9479f3f3b1 100644 --- a/src/vm/amd64/UMThunkStub.asm +++ b/src/vm/amd64/UMThunkStub.asm @@ -30,8 +30,10 @@ extern g_TrapReturningThreads:dword extern UM2MDoADCallBack:proc extern ReverseEnterRuntimeHelper:proc extern ReverseLeaveRuntimeHelper:proc +ifdef FEATURE_INCLUDE_ALL_INTERFACES extern gfHostConfig:dword extern NDirect__IsHostHookEnabled:proc +endif extern UMThunkStubRareDisableWorker:proc diff --git a/src/vm/amd64/cgenamd64.cpp b/src/vm/amd64/cgenamd64.cpp index ee7711a368..27f1a4a339 100644 --- a/src/vm/amd64/cgenamd64.cpp +++ b/src/vm/amd64/cgenamd64.cpp @@ -79,6 +79,9 @@ void TransitionFrame::UpdateRegDisplay(const PREGDISPLAY pRD) #ifndef DACCESS_COMPILE +extern "C" TADDR s_pStubHelperFrameVPtr; +TADDR s_pStubHelperFrameVPtr = StubHelperFrame::GetMethodFrameVPtr(); + void TailCallFrame::InitFromContext(T_CONTEXT * pContext) { WRAPPER_NO_CONTRACT; diff --git a/src/vm/rcwwalker.cpp b/src/vm/rcwwalker.cpp index ea4de627c9..0cf0d160e6 100644 --- a/src/vm/rcwwalker.cpp +++ b/src/vm/rcwwalker.cpp @@ -25,6 +25,7 @@ #include "cominterfacemarshaler.h" #include "excep.h" #include "finalizerthread.h" +#include "interoputil.inl" const IID IID_ICLRServices = __uuidof(ICLRServices); |