[llvm-commits] CVS: llvm/lib/CWriter/Writer.cpp

[John Criswell]

Changes in directory llvm/lib/CWriter:

Writer.cpp updated: 1.149 -> 1.150

---
Log message:

Upon Chris's suggestion, moved the #ifdef's to the generated C code.
This makes LLVM and the generated C code more portable.



---
Diffs of the changes:  (+5 -8)

Index: llvm/lib/CWriter/Writer.cpp
diff -u llvm/lib/CWriter/Writer.cpp:1.149 llvm/lib/CWriter/Writer.cpp:1.150
--- llvm/lib/CWriter/Writer.cpp:1.149	Wed Dec 10 12:06:34 2003
+++ llvm/lib/CWriter/Writer.cpp	Wed Dec 10 12:17:57 2003
@@ -1087,20 +1087,17 @@
 
 
 void CWriter::visitUnwindInst(UnwindInst &I) {
-  // Determine the return size of write() based on the data model.
-#ifdef _LP64
-      const char * writedecl = "    extern signed long long write();\n";
-#else
-      const char * writedecl = "    extern write();\n";
-#endif
-
   // The unwind instructions causes a control flow transfer out of the current
   // function, unwinding the stack until a caller who used the invoke
   // instruction is found.  In this context, we code generated the invoke
   // instruction to add an entry to the top of the jmpbuf_list.  Thus, here we
   // just have to longjmp to the specified handler.
   Out << "  if (__llvm_jmpbuf_list == 0) {  /* unwind */\n"
-      << writedecl
+      << "#ifdef _LP64\n"
+      << "    extern signed long long write();\n"
+      << "#else\n"
+      << "    extern write();\n"
+      << "#endif\n"
       << "    ((void (*)(int, void*, unsigned))write)(2,\n"
       << "           \"throw found with no handler!\\n\", 31); abort();\n"
       << "  }\n"