Upon Chris's suggestion, moved the #ifdef's to the generated C code.

This makes LLVM and the generated C code more portable.

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

diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp
index faa9b925dd13949fa4ad289af602e0673201643c..63a5ec8bc34d328d7d4ac49370d89d955e08e4ce 100644 (file)
--- a/lib/Target/CBackend/CBackend.cpp
+++ b/lib/Target/CBackend/CBackend.cpp
@@ -1087,20 +1087,17 @@ void CWriter::visitInvokeInst(InvokeInst &II) {
 
 
 void CWriter::visitUnwindInst(UnwindInst &I) {
 
 
 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"
   // 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"
       << "    ((void (*)(int, void*, unsigned))write)(2,\n"
       << "           \"throw found with no handler!\\n\", 31); abort();\n"
       << "  }\n"

diff --git a/lib/Target/CBackend/Writer.cpp b/lib/Target/CBackend/Writer.cpp
index faa9b925dd13949fa4ad289af602e0673201643c..63a5ec8bc34d328d7d4ac49370d89d955e08e4ce 100644 (file)
--- a/lib/Target/CBackend/Writer.cpp
+++ b/lib/Target/CBackend/Writer.cpp
@@ -1087,20 +1087,17 @@ void CWriter::visitInvokeInst(InvokeInst &II) {
 
 
 void CWriter::visitUnwindInst(UnwindInst &I) {
 
 
 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"
   // 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"
       << "    ((void (*)(int, void*, unsigned))write)(2,\n"
       << "           \"throw found with no handler!\\n\", 31); abort();\n"
       << "  }\n"