Comment out usage of write() for now.

llvm-svn: 36287

2 files changed, 6 insertions, 4 deletions

diff --git a/llvm/lib/Target/X86/X86IntelAsmPrinter.cpp b/llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
index c0c1b5a9b8c..39b65eeee40 100755
--- a/llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
@@ -355,10 +355,6 @@ bool X86IntelAsmPrinter::doInitialization(Module &M) {
       if (I->hasDLLImportLinkage()) {
         O << "__imp_";
       }      
-      // Microsoft sticks an extra _ in front of "_write" (whether LLVM should
-      // hard-code usage of a Unix API is another question).
-      if (Name == "_write")
-        Name = "__write";
       O << Name << ":near\n";
     }
   
diff --git a/llvm/lib/Transforms/Utils/LowerInvoke.cpp b/llvm/lib/Transforms/Utils/LowerInvoke.cpp
index a1bd065df8b..e0332d28f72 100644
--- a/llvm/lib/Transforms/Utils/LowerInvoke.cpp
+++ b/llvm/lib/Transforms/Utils/LowerInvoke.cpp
@@ -149,8 +149,12 @@ bool LowerInvoke::doInitialization(Module &M) {
 
   // We need the 'write' and 'abort' functions for both models.
   AbortFn = M.getOrInsertFunction("abort", Type::VoidTy, (Type *)0);
+#if 0 // "write" is Unix-specific.. code is going away soon anyway.
   WriteFn = M.getOrInsertFunction("write", Type::VoidTy, Type::Int32Ty,
                                   VoidPtrTy, Type::Int32Ty, (Type *)0);
+#else
+  WriteFn = 0;
+#endif
   return true;
 }
 
@@ -185,6 +189,7 @@ void LowerInvoke::createAbortMessage(Module *M) {
 
 
 void LowerInvoke::writeAbortMessage(Instruction *IB) {
+#if 0
   if (AbortMessage == 0)
     createAbortMessage(IB->getParent()->getParent()->getParent());
 
@@ -194,6 +199,7 @@ void LowerInvoke::writeAbortMessage(Instruction *IB) {
   Args[1] = AbortMessage;
   Args[2] = ConstantInt::get(Type::Int32Ty, AbortMessageLength);
   (new CallInst(WriteFn, Args, 3, "", IB))->setTailCall();
+#endif
 }
 
 bool LowerInvoke::insertCheapEHSupport(Function &F) {