commit 909930fc19ff69b08f2ea6f6e2996d24c816f311
author Hans Wennborg <hans@hanshq.net> Wed Aug 07 00:32:15 2013 +0000
committer Hans Wennborg <hans@hanshq.net> Wed Aug 07 00:32:15 2013 +0000
tree d820f9b0daa9f22462427313667bab20c5ddf35a
parent 8c238be45e2ae6fa00fb5a2bc27a46d3c16d47ee

clang-cl: Use .obj as object file extension instead of .o

Differential Revision: http://llvm-reviews.chandlerc.com/D1302

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@187840 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/Driver.cpp

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 729b9af..3fddc8f 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -1589,7 +1589,8 @@
     StringRef Name = llvm::sys::path::filename(BaseInput);
     std::pair<StringRef, StringRef> Split = Name.split('.');
     std::string TmpName =
-      GetTemporaryPath(Split.first, types::getTypeTempSuffix(JA.getType()));
+      GetTemporaryPath(Split.first,
+          types::getTypeTempSuffix(JA.getType(), IsCLMode()));
     return C.addTempFile(C.getArgs().MakeArgString(TmpName.c_str()));
   }
 
@@ -1620,8 +1621,7 @@
       if (llvm::sys::path::has_extension(Filename.str()))
         Filename = Filename.substr(0, Filename.rfind("."));
       Filename.append(".");
-      // FIXME: For clang-cl, we want .obj rather than .o for object files.
-      Filename.append(types::getTypeTempSuffix(types::TY_Object));
+      Filename.append(types::getTypeTempSuffix(types::TY_Object, IsCLMode()));
     }
 
     NamedOutput = C.getArgs().MakeArgString(Filename.c_str());
@@ -1665,7 +1665,8 @@
       StringRef Name = llvm::sys::path::filename(BaseInput);
       std::pair<StringRef, StringRef> Split = Name.split('.');
       std::string TmpName =
-        GetTemporaryPath(Split.first, types::getTypeTempSuffix(JA.getType()));
+        GetTemporaryPath(Split.first,
+            types::getTypeTempSuffix(JA.getType(), IsCLMode()));
       return C.addTempFile(C.getArgs().MakeArgString(TmpName.c_str()));
     }
   }