enable ILC generation of tls_InlinedThreadStatics on win-x64

src/coreclr/nativeaot/Runtime/threadstore.cpp

@@ -437,9 +437,8 @@ __thread ThreadBuffer tls_CurrentThread;
 __thread InlinedThreadStaticRoot tls_InlinedThreadStatics;
 #endif
 
-#else
-// the root of inlined threadstatics storage
-// there is only one now,
+#elif defined(TARGET_ARM64)
+// the root of inlined threadstatics storage for ARM64
 // eventually this will be emitted by ILC and we may have more than one such variable
 EXTERN_C __declspec(thread) InlinedThreadStaticRoot tls_InlinedThreadStatics;
 __declspec(thread) InlinedThreadStaticRoot tls_InlinedThreadStatics;

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/NodeFactory.cs

@@ -1303,8 +1303,8 @@ public virtual void AttachToDependencyGraph(DependencyAnalyzerBase<NodeFactory>
             graph.AddRoot(EagerCctorTable, "EagerCctorTable is always generated");
             graph.AddRoot(TypeManagerIndirection, "TypeManagerIndirection is always generated");
 
-            if (_target.OperatingSystem == TargetOS.Linux &&
-                _target.Architecture == TargetArchitecture.X64)
+            if (_target.Architecture == TargetArchitecture.X64 &&
+                (_target.OperatingSystem == TargetOS.Linux || _target.OperatingSystem == TargetOS.Windows))
             {
                 graph.AddRoot(TlsRoot, "TlsRoot is always generated");
             }

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_X64/X64ReadyToRunHelperNode.cs

@@ -236,9 +236,6 @@ private static void EmitInlineTLSAccess(NodeFactory factory, ref X64Emitter enco
 
             if (factory.Target.IsWindows)
             {
-                // TODO: VS this is a temporary HACK.
-                //       until we emit proper TLS template on Windows, we will emit one in c++ and bind to that.
-                tlsRoot = factory.ExternSymbol("tls_InlinedThreadStatics");
                 if (singleFileExe)
                 {
                     // mov         rax,qword ptr gs:[58h]