diff options
author | Jan Kotas <jkotas@microsoft.com> | 2019-05-22 23:42:31 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-22 23:42:31 -0700 |
commit | 451fd23fa2179fa22c831bcf84edd547bfba5cd9 (patch) | |
tree | 8d590cd895cce7d5308cf94e92a5b0e8f36d303e /src/vm/arm64 | |
parent | 3eae9c02a9a5eac95bf2900aae3c9e62176bf3c9 (diff) | |
download | coreclr-451fd23fa2179fa22c831bcf84edd547bfba5cd9.tar.gz coreclr-451fd23fa2179fa22c831bcf84edd547bfba5cd9.tar.bz2 coreclr-451fd23fa2179fa22c831bcf84edd547bfba5cd9.zip |
Stop compiling fragile NGen support into the runtime (#24625)
Diffstat (limited to 'src/vm/arm64')
-rw-r--r-- | src/vm/arm64/asmhelpers.S | 4 | ||||
-rw-r--r-- | src/vm/arm64/asmhelpers.asm | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/vm/arm64/asmhelpers.S b/src/vm/arm64/asmhelpers.S index 56ed718708..28daf9ac0d 100644 --- a/src/vm/arm64/asmhelpers.S +++ b/src/vm/arm64/asmhelpers.S @@ -474,6 +474,7 @@ LOCAL_LABEL(Exit): ret lr WRITE_BARRIER_END JIT_WriteBarrier +#ifdef FEATURE_PREJIT //------------------------------------------------ // VirtualMethodFixupStub // @@ -520,7 +521,8 @@ NESTED_ENTRY VirtualMethodFixupStub, _TEXT, NoHandler // and tailcall to the actual method EPILOG_BRANCH_REG x12 -NESTED_END VirtualMEthodFixupStub, _TEXT +NESTED_END VirtualMethodFixupStub, _TEXT +#endif // FEATURE_PREJIT //------------------------------------------------ // ExternalMethodFixupStub diff --git a/src/vm/arm64/asmhelpers.asm b/src/vm/arm64/asmhelpers.asm index 400423b90a..01b49dbe29 100644 --- a/src/vm/arm64/asmhelpers.asm +++ b/src/vm/arm64/asmhelpers.asm @@ -11,12 +11,14 @@ #include "asmconstants.h" #include "asmmacros.h" +#ifdef FEATURE_PREJIT IMPORT VirtualMethodFixupWorker + IMPORT StubDispatchFixupWorker +#endif IMPORT ExternalMethodFixupWorker IMPORT PreStubWorker IMPORT NDirectImportWorker IMPORT VSD_ResolveWorker - IMPORT StubDispatchFixupWorker IMPORT JIT_InternalThrow IMPORT ComPreStubWorker IMPORT COMToCLRWorker @@ -532,6 +534,7 @@ Exit ret lr WRITE_BARRIER_END JIT_WriteBarrier +#ifdef FEATURE_PREJIT ;------------------------------------------------ ; VirtualMethodFixupStub ; @@ -579,6 +582,8 @@ Exit EPILOG_BRANCH_REG x12 NESTED_END +#endif // FEATURE_PREJIT + ;------------------------------------------------ ; ExternalMethodFixupStub ; |