raw_fd_ostream: Don't change STDERR to O_BINARY, or w*printf() (in assert()) would...

[oota-llvm.git] / lib / IR / DataLayout.cpp

diff --git a/lib/IR/DataLayout.cpp b/lib/IR/DataLayout.cpp
index 6f32be08c5ba8029559c78a6d1d647c07ee0e49b..7df867279b229f53c0a59337ff8541557a537811 100644 (file)
--- a/lib/IR/DataLayout.cpp
+++ b/lib/IR/DataLayout.cpp
@@ -159,7 +159,7 @@ const char *DataLayout::getManglingComponent(const Triple &T) {
   if (T.isOSBinFormatELF() || T.isArch64Bit())
     return "-m:e";
   assert(T.isOSBinFormatCOFF());
-  return "-m:c";
+  return "-m:w";
 }
 
 static const LayoutAlignElem DefaultAlignments[] = {
@@ -334,8 +334,8 @@ void DataLayout::parseSpecifier(StringRef Desc) {
       case 'm':
         ManglingMode = MM_Mips;
         break;
-      case 'c':
-        ManglingMode = MM_COFF;
+      case 'w':
+        ManglingMode = MM_WINCOFF;
         break;
       }
       break;
@@ -525,8 +525,8 @@ std::string DataLayout::getStringRepresentation() const {
   case MM_MachO:
     OS << "-m:o";
     break;
-  case MM_COFF:
-    OS << "-m:c";
+  case MM_WINCOFF:
+    OS << "-m:w";
     break;
   case MM_Mips:
     OS << "-m:m";