Use IsCLMode to guard cl-style output argument presence

Author: sharadhr

clang/lib/Driver/Driver.cpp

@@ -6099,8 +6099,15 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
   llvm::PrettyStackTraceString CrashInfo("Computing output path");
   // Output to a user requested destination?
   if (AtTopLevel && !isa<DsymutilJobAction>(JA) && !isa<VerifyJobAction>(JA)) {
-    if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o, options::OPT__SLASH_Fo, options::OPT__SLASH_Fo_COLON))
+    Arg *FinalOutput =
+        IsCLMode()
+            ? C.getArgs().getLastArg(options::OPT_o, options::OPT__SLASH_Fo,
+                                     options::OPT__SLASH_Fo_COLON)
+            : C.getArgs().getLastArg(options::OPT_o);
+
+    if (FinalOutput != nullptr) {
       return C.addResultFile(FinalOutput->getValue(), &JA);
+    }
   }
 
   // For /P, preprocess to file named after BaseInput.