Merge pull request #37605 from compnerd/preservation

Driver: correct profiling symbol preservation on Windows

Author: compnerd

lib/Driver/WindowsToolChains.cpp

@@ -180,8 +180,9 @@ toolchains::Windows::constructInvocation(const DynamicLinkJobAction &job,
                             Twine("clang_rt.profile-") +
                                 getTriple().getArchName() + ".lib");
     Arguments.push_back(context.Args.MakeArgString(LibProfile));
+    Arguments.push_back(context.Args.MakeArgString("-Xlinker"));
     Arguments.push_back(context.Args.MakeArgString(
-        Twine("-u", llvm::getInstrProfRuntimeHookVarName())));
+        Twine({"-include:", llvm::getInstrProfRuntimeHookVarName()})));
   }
 
   context.Args.AddAllArgs(Arguments, options::OPT_Xlinker);

test/Driver/profiling.swift

@@ -52,7 +52,7 @@
 
 // WINDOWS: clang{{(\.exe)?"? }}
 // WINDOWS: lib{{(\\\\|/)}}swift{{(\\\\|/)}}clang{{(\\\\|/)}}lib{{(\\\\|/)}}windows{{(\\\\|/)}}clang_rt.profile-x86_64.lib
-// WINDOWS: -u__llvm_profile_runtime
+// WINDOWS: -Xlinker -include:__llvm_profile_runtime
 
 // WASI: clang{{(\.exe)?"? }}
 // WASI: lib{{(\\\\|/)}}swift{{(\\\\|/)}}clang{{(\\\\|/)}}lib{{(\\\\|/)}}wasi{{(\\\\|/)}}libclang_rt.profile-wasm32.a