From dc2baada9beab3fb3a850ae3385018d6014b6bfc Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Tue, 12 Jun 2018 22:50:19 -0700
Subject: [PATCH]  Move x86 HW intrinsics files to shared
 (dotnet/coreclr#18427)

* Switch platfom amd64 to x64

* Move x86 intrinsics file to shared

* Adding condition so corert always picks up X.PlatformNotSupported.cs

Related to: dotnet/coreclr#15922


Commit migrated from https://github.com/dotnet/coreclr/commit/308850ced07e56bd83a36df23455d023b5dba06e
---
 src/coreclr/clr.coreclr.props                      |  1 +
 .../System.Private.CoreLib.csproj                  | 54 ++--------------------
 .../src/System.Private.CoreLib.Shared.projitems    | 41 ++++++++++++++++
 .../src/System/Runtime/Intrinsics/Vector128.cs     |  0
 .../Runtime/Intrinsics/Vector128DebugView.cs       |  0
 .../src/System/Runtime/Intrinsics/Vector256.cs     |  0
 .../Runtime/Intrinsics/Vector256DebugView.cs       |  0
 .../src/System/Runtime/Intrinsics/Vector64.cs      |  0
 .../System/Runtime/Intrinsics/Vector64DebugView.cs |  0
 .../Intrinsics/X86/Aes.PlatformNotSupported.cs     |  0
 .../src/System/Runtime/Intrinsics/X86/Aes.cs       |  0
 .../Intrinsics/X86/Avx.PlatformNotSupported.cs     |  0
 .../src/System/Runtime/Intrinsics/X86/Avx.cs       |  0
 .../Intrinsics/X86/Avx2.PlatformNotSupported.cs    |  0
 .../src/System/Runtime/Intrinsics/X86/Avx2.cs      |  0
 .../Intrinsics/X86/Bmi1.PlatformNotSupported.cs    |  0
 .../src/System/Runtime/Intrinsics/X86/Bmi1.cs      |  0
 .../Intrinsics/X86/Bmi2.PlatformNotSupported.cs    |  0
 .../src/System/Runtime/Intrinsics/X86/Bmi2.cs      |  0
 .../src/System/Runtime/Intrinsics/X86/Enums.cs     |  0
 .../Intrinsics/X86/Fma.PlatformNotSupported.cs     |  0
 .../src/System/Runtime/Intrinsics/X86/Fma.cs       |  0
 .../Intrinsics/X86/Lzcnt.PlatformNotSupported.cs   |  0
 .../src/System/Runtime/Intrinsics/X86/Lzcnt.cs     |  0
 .../X86/Pclmulqdq.PlatformNotSupported.cs          |  0
 .../src/System/Runtime/Intrinsics/X86/Pclmulqdq.cs |  0
 .../Intrinsics/X86/Popcnt.PlatformNotSupported.cs  |  0
 .../src/System/Runtime/Intrinsics/X86/Popcnt.cs    |  0
 .../Intrinsics/X86/Sse.PlatformNotSupported.cs     |  0
 .../src/System/Runtime/Intrinsics/X86/Sse.cs       |  0
 .../Intrinsics/X86/Sse2.PlatformNotSupported.cs    |  0
 .../src/System/Runtime/Intrinsics/X86/Sse2.cs      |  0
 .../Intrinsics/X86/Sse3.PlatformNotSupported.cs    |  0
 .../src/System/Runtime/Intrinsics/X86/Sse3.cs      |  0
 .../Intrinsics/X86/Sse41.PlatformNotSupported.cs   |  0
 .../src/System/Runtime/Intrinsics/X86/Sse41.cs     |  0
 .../Intrinsics/X86/Sse42.PlatformNotSupported.cs   |  0
 .../src/System/Runtime/Intrinsics/X86/Sse42.cs     |  0
 .../Intrinsics/X86/Ssse3.PlatformNotSupported.cs   |  0
 .../src/System/Runtime/Intrinsics/X86/Ssse3.cs     |  0
 40 files changed, 45 insertions(+), 51 deletions(-)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128DebugView.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256DebugView.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64DebugView.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Aes.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Aes.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx2.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx2.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi1.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi1.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi2.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi2.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Enums.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Fma.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Fma.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Lzcnt.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Lzcnt.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Pclmulqdq.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Pclmulqdq.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Popcnt.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Popcnt.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse2.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse2.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse3.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse3.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse41.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse41.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse42.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse42.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Ssse3.PlatformNotSupported.cs (100%)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Ssse3.cs (100%)

diff --git a/src/coreclr/clr.coreclr.props b/src/coreclr/clr.coreclr.props
index 8b546c6..7c402c7 100644
--- a/src/coreclr/clr.coreclr.props
+++ b/src/coreclr/clr.coreclr.props
@@ -1,6 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <FeatureEventTrace>true</FeatureEventTrace>
+    <FeatureHardwareIntrinsics>true</FeatureHardwareIntrinsics>
     <FeatureICastable>true</FeatureICastable>
     <FeatureManagedEtwChannels>true</FeatureManagedEtwChannels>
     <FeatureManagedEtw>true</FeatureManagedEtw>
diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index 51e394b..3e427be 100644
--- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -5,12 +5,9 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <!-- Compilation options -->
   <PropertyGroup>
-    <AvailablePlatforms>amd64,x86,arm,armel,arm64</AvailablePlatforms>
+    <AvailablePlatforms>x64,x86,arm,armel,arm64</AvailablePlatforms>
     <Configuration Condition=" '$(Configuration)' == '' ">$(BuildType)</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">$(BuildArch)</Platform>
-    <!-- The CLR properties use amd64 as their platform string, we want to keep in sync with those, so set Platform appropriately,
-         though still use the 'x64' output path (see use of BuildArch below) -->
-    <Platform Condition=" '$(Platform)' == 'x64' ">amd64</Platform>
     <Platform Condition=" '$(Platform)' == 'armel' ">arm</Platform>
     <ProjectGuid>{3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -49,7 +46,7 @@
     </AssemblyMetadata>
   </ItemGroup>
   <!-- Platform specific properties -->
-  <PropertyGroup Condition="'$(Platform)' == 'amd64'">
+  <PropertyGroup Condition="'$(Platform)' == 'x64'">
     <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
     <BaseAddress>0x180000000</BaseAddress>
@@ -75,7 +72,7 @@
     <Optimize Condition="'$(Optimize)' == '' and '$(Configuration)' == 'Checked'">true</Optimize>
     <DebugType Condition="'$(DebugType)' == ''">full</DebugType>
     <DefineConstants>_LOGGING;DEBUG;TRACE;$(DefineConstants)</DefineConstants>
-    <DefineConstants Condition="'$(Platform)' == 'x86' or '$(Platform)' == 'amd64'">CODE_ANALYSIS;$(DefineConstants)</DefineConstants>
+    <DefineConstants Condition="'$(Platform)' == 'x86' or '$(Platform)' == 'x64'">CODE_ANALYSIS;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <DebugSymbols>true</DebugSymbols>
@@ -244,51 +241,6 @@
     <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\WindowsRuntime\IMap.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\WindowsRuntime\CLRIKeyValuePairImpl.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\Vector64.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\Vector64DebugView.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\Vector128.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\Vector128DebugView.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\Vector256.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\Vector256DebugView.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Enums.cs" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(Platform)' == 'amd64' OR '$(Platform)' == 'x86'">
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Aes.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Avx.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Avx2.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Bmi1.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Bmi2.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Fma.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Lzcnt.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Pclmulqdq.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Popcnt.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Sse.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Sse2.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Sse3.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Sse41.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Sse42.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Ssse3.cs" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(Platform)' != 'amd64' AND '$(Platform)' != 'x86'">
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Aes.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Avx.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Avx2.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Bmi1.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Bmi2.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Fma.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Lzcnt.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Pclmulqdq.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Popcnt.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Sse.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Sse2.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Sse3.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Sse41.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Sse42.PlatformNotSupported.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Ssse3.PlatformNotSupported.cs" />
-  </ItemGroup>
   <ItemGroup Condition="'$(Platform)' == 'arm64'">
     <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\Arm\Arm64\Aes.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\Arm\Arm64\Base.cs" />
diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
index ecc2fdd..07a184f 100644
--- a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
+++ b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
@@ -476,6 +476,13 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\UnmanagedFunctionPointerAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\UnmanagedType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\VarEnum.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\Vector64.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\Vector64DebugView.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\Vector128.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\Vector128DebugView.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\Vector256.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\Vector256DebugView.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Enums.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Serialization\IDeserializationCallback.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Serialization\IFormatterConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Serialization\IObjectReference.cs" />
@@ -852,4 +859,38 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Security\SecureString.Unix.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\TimeZoneInfo.Unix.cs" />
   </ItemGroup>
+  <ItemGroup Condition="'$(FeatureHardwareIntrinsics)' == 'true' AND ('$(Platform)' == 'x64' OR '$(Platform)' == 'x86')">
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Aes.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Avx.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Avx2.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Bmi1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Bmi2.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Fma.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Lzcnt.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Pclmulqdq.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Popcnt.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Sse.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Sse2.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Sse3.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Sse41.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Sse42.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Ssse3.cs" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(FeatureHardwareIntrinsics)' != 'true' OR ('$(Platform)' != 'x64' AND '$(Platform)' != 'x86')">
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Aes.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Avx.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Avx2.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Bmi1.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Bmi2.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Fma.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Lzcnt.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Pclmulqdq.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Popcnt.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Sse.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Sse2.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Sse3.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Sse41.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Sse42.PlatformNotSupported.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Ssse3.PlatformNotSupported.cs" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128DebugView.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128DebugView.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128DebugView.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128DebugView.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256DebugView.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256DebugView.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256DebugView.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256DebugView.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64DebugView.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64DebugView.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64DebugView.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64DebugView.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Aes.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Aes.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Aes.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Aes.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Aes.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Aes.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Aes.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Aes.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx2.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx2.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx2.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx2.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx2.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx2.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx2.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Avx2.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi1.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi1.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi1.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi1.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi1.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi1.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi1.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi1.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi2.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi2.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi2.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi2.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi2.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi2.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi2.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Bmi2.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Enums.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Enums.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Enums.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Enums.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Fma.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Fma.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Fma.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Fma.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Fma.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Fma.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Fma.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Fma.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Lzcnt.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Lzcnt.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Lzcnt.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Lzcnt.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Lzcnt.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Lzcnt.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Lzcnt.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Lzcnt.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Pclmulqdq.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Pclmulqdq.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Pclmulqdq.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Pclmulqdq.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Pclmulqdq.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Pclmulqdq.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Pclmulqdq.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Pclmulqdq.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Popcnt.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Popcnt.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Popcnt.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Popcnt.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Popcnt.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Popcnt.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Popcnt.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Popcnt.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse2.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse2.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse2.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse2.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse2.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse2.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse2.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse2.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse3.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse3.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse3.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse3.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse3.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse3.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse3.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse3.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse41.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse41.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse41.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse41.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse41.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse41.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse41.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse41.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse42.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse42.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse42.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse42.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse42.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse42.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse42.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Sse42.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Ssse3.PlatformNotSupported.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Ssse3.PlatformNotSupported.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Ssse3.PlatformNotSupported.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Ssse3.PlatformNotSupported.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Ssse3.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Ssse3.cs
similarity index 100%
rename from src/coreclr/src/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Ssse3.cs
rename to src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/X86/Ssse3.cs
-- 
2.7.4