diff options
| -rw-r--r-- | dependencies.props | 6 | ||||
| -rw-r--r-- | src/JitInterface/src/CorInfoTypes.cs | 2 | ||||
| -rw-r--r-- | src/JitInterface/src/ThunkGenerator/corinfo.h | 2 | ||||
| -rw-r--r-- | src/JitInterface/src/ThunkGenerator/corjitflags.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/dependencies.props b/dependencies.props index 6d97c96df..ca1640cab 100644 --- a/dependencies.props +++ b/dependencies.props @@ -1,10 +1,10 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <RyuJITVersion>2.1.0-preview2-26207-13</RyuJITVersion> + <RyuJITVersion>2.1.0-preview2-26302-06</RyuJITVersion> <ObjectWriterVersion>1.0.19-prerelease-00001</ObjectWriterVersion> - <CoreFxVersion>4.5.0-preview2-26202-05</CoreFxVersion> + <CoreFxVersion>4.5.0-preview2-26228-08</CoreFxVersion> <CoreFxUapVersion>4.6.0-preview2-26202-05</CoreFxUapVersion> - <MicrosoftNETCoreNativeVersion>2.1.0-preview2-26207-13</MicrosoftNETCoreNativeVersion> + <MicrosoftNETCoreNativeVersion>2.1.0-preview2-26302-06</MicrosoftNETCoreNativeVersion> <MicrosoftNETCoreAppPackageVersion>2.0.0</MicrosoftNETCoreAppPackageVersion> <XunitNetcoreExtensionsVersion>1.0.1-prerelease-02104-02</XunitNetcoreExtensionsVersion> </PropertyGroup> diff --git a/src/JitInterface/src/CorInfoTypes.cs b/src/JitInterface/src/CorInfoTypes.cs index b0ceda613..6d6653b85 100644 --- a/src/JitInterface/src/CorInfoTypes.cs +++ b/src/JitInterface/src/CorInfoTypes.cs @@ -1508,7 +1508,7 @@ namespace Internal.JitInterface CORJIT_FLAG_HAS_ARM64_LRCPC = 52, // ID_AA64ISAR1_EL1.LRCPC is 1 or better CORJIT_FLAG_HAS_ARM64_PMULL = 53, // ID_AA64ISAR0_EL1.AES is 2 or better CORJIT_FLAG_HAS_ARM64_SHA1 = 54, // ID_AA64ISAR0_EL1.SHA1 is 1 or better - CORJIT_FLAG_HAS_ARM64_SHA2 = 55, // ID_AA64ISAR0_EL1.SHA2 is 1 or better + CORJIT_FLAG_HAS_ARM64_SHA256 = 55, // ID_AA64ISAR0_EL1.SHA2 is 1 or better CORJIT_FLAG_HAS_ARM64_SHA512 = 56, // ID_AA64ISAR0_EL1.SHA2 is 2 or better CORJIT_FLAG_HAS_ARM64_SHA3 = 57, // ID_AA64ISAR0_EL1.SHA3 is 1 or better CORJIT_FLAG_HAS_ARM64_SIMD = 58, // ID_AA64PFR0_EL1.AdvSIMD is 0 or better diff --git a/src/JitInterface/src/ThunkGenerator/corinfo.h b/src/JitInterface/src/ThunkGenerator/corinfo.h index f3b509c5a..d430412f3 100644 --- a/src/JitInterface/src/ThunkGenerator/corinfo.h +++ b/src/JitInterface/src/ThunkGenerator/corinfo.h @@ -2375,7 +2375,7 @@ public: // This is only called for Value classes. It returns a boolean array // in representing of 'cls' from a GC perspective. The class is // assumed to be an array of machine words - // (of length // getClassSize(cls) / sizeof(void*)), + // (of length // getClassSize(cls) / TARGET_POINTER_SIZE), // 'gcPtrs' is a pointer to an array of BYTEs of this length. // getClassGClayout fills in this array so that gcPtrs[i] is set // to one of the CorInfoGCType values which is the GC type of diff --git a/src/JitInterface/src/ThunkGenerator/corjitflags.h b/src/JitInterface/src/ThunkGenerator/corjitflags.h index da303b6a0..84fb42f08 100644 --- a/src/JitInterface/src/ThunkGenerator/corjitflags.h +++ b/src/JitInterface/src/ThunkGenerator/corjitflags.h @@ -120,7 +120,7 @@ public: CORJIT_FLAG_HAS_ARM64_LRCPC = 52, // ID_AA64ISAR1_EL1.LRCPC is 1 or better CORJIT_FLAG_HAS_ARM64_PMULL = 53, // ID_AA64ISAR0_EL1.AES is 2 or better CORJIT_FLAG_HAS_ARM64_SHA1 = 54, // ID_AA64ISAR0_EL1.SHA1 is 1 or better - CORJIT_FLAG_HAS_ARM64_SHA2 = 55, // ID_AA64ISAR0_EL1.SHA2 is 1 or better + CORJIT_FLAG_HAS_ARM64_SHA256 = 55, // ID_AA64ISAR0_EL1.SHA2 is 1 or better CORJIT_FLAG_HAS_ARM64_SHA512 = 56, // ID_AA64ISAR0_EL1.SHA2 is 2 or better CORJIT_FLAG_HAS_ARM64_SHA3 = 57, // ID_AA64ISAR0_EL1.SHA3 is 1 or better CORJIT_FLAG_HAS_ARM64_SIMD = 58, // ID_AA64PFR0_EL1.AdvSIMD is 0 or better |