diff options
| -rw-r--r-- | src/coreclr/tools/aot/crossgen2/Properties/Resources.resx | 2 | ||||
| -rw-r--r-- | src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/coreclr/tools/aot/crossgen2/Properties/Resources.resx b/src/coreclr/tools/aot/crossgen2/Properties/Resources.resx index c031f303e44..56fbb93adb9 100644 --- a/src/coreclr/tools/aot/crossgen2/Properties/Resources.resx +++ b/src/coreclr/tools/aot/crossgen2/Properties/Resources.resx @@ -169,7 +169,7 @@ <value>Instruction set(s) to use for compilation</value> </data> <data name="InstructionSetMustNotBe" xml:space="preserve"> - <value>Instruction set must not be '{0}' for this architecture and operating system</value> + <value>Instruction set '{0}' is not valid for this architecture and operating system</value> </data> <data name="InstructionSetWithoutInputBubble" xml:space="preserve"> <value>Instruction set(s) specified without also specifying input-bubble</value> diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj index 0cd26443fc5..a3f364815d6 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj @@ -32,6 +32,9 @@ <ItemGroup> <PublishReadyToRunCrossgen2ExtraArgsList Include="--compositekeyfile:$(AssemblyOriginatorKeyFile)"/> + <!-- Compile with avx2 on x64 --> + <PublishReadyToRunCrossgen2ExtraArgsList Condition="'$(TargetArchitecture)' == 'x64'" Include="--inputbubble" /> + <PublishReadyToRunCrossgen2ExtraArgsList Condition="'$(TargetArchitecture)' == 'x64'" Include="--instruction-set:avx2" /> </ItemGroup> <Import Project="ReadyToRun.targets" /> |