Do not pass -D_DLL and -D_MT to device compilation.

Otherwise, the errors reported during device code compilation because
device code cannot handle implib call.

Author: v-klochkov

clang/lib/Driver/ToolChains/Clang.cpp

@@ -6258,6 +6258,19 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       if (Args.hasFlag(options::OPT_fsycl_esimd, options::OPT_fno_sycl_esimd,
                        false))
         CmdArgs.push_back("-fsycl-explicit-simd");
+
+      if (!D.IsCLMode()) {
+        // SYCL library is guaranteed to work correctly only with dynamic
+        // MSVC runtime.
+        llvm::Triple AuxT = C.getDefaultToolChain().getTriple();
+        if (Args.hasFlag(options::OPT_fsycl_device_only, OptSpecifier(), false))
+          AuxT = llvm::Triple(llvm::sys::getProcessTriple());
+        if (AuxT.isWindowsMSVCEnvironment()) {
+          CmdArgs.push_back("-D_MT");
+          CmdArgs.push_back("-D_DLL");
+          CmdArgs.push_back("--dependent-lib=msvcrt");
+        }
+      }
     }
     if (IsSYCLOffloadDevice && JA.getType() == types::TY_SYCL_Header) {
       // Generating a SYCL Header
@@ -6275,20 +6288,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back("-D__ENABLE_USM_ADDR_SPACE__");
   }
 
-  if ((IsSYCL || UseSYCLTriple) && !D.IsCLMode()) {
-    // SYCL library is guaranteed to work correctly only with dynamic
-    // MSVC runtime.
-    llvm::Triple AuxT = C.getDefaultToolChain().getTriple();
-    if (Args.hasFlag(options::OPT_fsycl_device_only, OptSpecifier(), false))
-      AuxT = llvm::Triple(llvm::sys::getProcessTriple());
-    if (AuxT.isWindowsMSVCEnvironment()) {
-      CmdArgs.push_back("-D_MT");
-      CmdArgs.push_back("-D_DLL");
-      if (IsSYCL && !IsSYCLOffloadDevice && SYCLDeviceInput)
-        CmdArgs.push_back("--dependent-lib=msvcrt");
-    }
-  }
-
   if (IsHIP)
     CmdArgs.push_back("-fcuda-allow-variadic-functions");
 

clang/test/Driver/sycl-MD-default.cpp

@@ -13,12 +13,6 @@
 // CHK-DEFAULT: "-D_MT" "-D_DLL"
 // CHK-DEFAULT: "--dependent-lib=msvcrt{{d*}}"
 
-// RUN: %clang -### -fsycl-device-only -c %s 2>&1 \
-// RUN:   | FileCheck -check-prefix=CHK-DEFAULT-DEF %s
-// RUN: %clangxx -### -fsycl -c %s 2>&1 \
-// RUN:   | FileCheck -check-prefix=CHK-DEFAULT-DEF %s
-// CHK-DEFAULT-DEF: "-D_MT" "-D_DLL"
-
 // RUN: %clang_cl -### -MT -fsycl -c %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHK-ERROR %s
 // RUN: %clang_cl -### -MTd -fsycl -c %s 2>&1 \