diff options
Diffstat (limited to 'src/binder/assemblybinder.cpp')
| -rw-r--r-- | src/binder/assemblybinder.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/binder/assemblybinder.cpp b/src/binder/assemblybinder.cpp index bd5dd18cc9..1015b439a3 100644 --- a/src/binder/assemblybinder.cpp +++ b/src/binder/assemblybinder.cpp @@ -689,11 +689,11 @@ namespace BINDER_SPACE sCoreLib = sCoreLibDir; sCoreLib.Append(CoreLibName_IL_W); BOOL fExplicitBindToNativeImage = (fBindToNativeImage == true)? TRUE:FALSE; -#if defined(FEATURE_PAL) && !defined(_TARGET_AMD64_) - // Non-Amd64 platforms on non-Windows do not support generating the NI image - // as CoreLib.dll. For those, we will bind as IL. +#if defined(FEATURE_PAL) && !defined(_TARGET_AMD64_) && !defined(_TARGET_ARM64_) + // Some non-Windows platforms do not automatically generate the NI image as CoreLib.dll. + // If those platforms also do not support automatic fallback from NI to IL, bind as IL. fExplicitBindToNativeImage = FALSE; -#endif // defined(FEATURE_PAL) && !defined(_TARGET_AMD64_) +#endif // defined(FEATURE_PAL) && !defined(_TARGET_AMD64_) && !defined(_TARGET_ARM64_) IF_FAIL_GO(AssemblyBinder::GetAssembly(sCoreLib, FALSE /* fInspectionOnly */, TRUE /* fIsInGAC */, @@ -1596,8 +1596,13 @@ namespace BINDER_SPACE IF_FAIL_GO(BinderHasNativeHeader(pNativePEImage, &hasHeader)); if (!hasHeader) { - pPEImage = pNativePEImage; - pNativePEImage = NULL; + BinderReleasePEImage(pPEImage); + BinderReleasePEImage(pNativePEImage); + + BINDER_LOG_ENTER(W("BinderAcquirePEImageIL")); + hr = BinderAcquirePEImage(szAssemblyPath, &pPEImage, &pNativePEImage, false); + BINDER_LOG_LEAVE_HR(W("BinderAcquirePEImageIL"), hr); + IF_FAIL_GO(hr); } } |