[llvm-commits] [llvm-gcc-4.2] r57652 - /llvm-gcc-4.2/trunk/gcc/except.c

[Owen Anderson]

Author: resistor
Date: Thu Oct 16 17:26:32 2008
New Revision: 57652

URL: http://llvm.org/viewvc/llvm-project?rev=57652&view=rev
Log:
Revert r57527, which was breaking llvm-gcc on linux.

Modified:
    llvm-gcc-4.2/trunk/gcc/except.c

Modified: llvm-gcc-4.2/trunk/gcc/except.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/except.c?rev=57652&r1=57651&r2=57652&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/except.c (original)
+++ llvm-gcc-4.2/trunk/gcc/except.c Thu Oct 16 17:26:32 2008
@@ -4079,25 +4079,13 @@
   /* The default c++ routines aren't actually c++ specific, so use those.  */
   /* LLVM LOCAL begin */
 #ifdef ENABLE_LLVM
-  /* Create the decl with build_decl instead of using llvm_init_one_libfunc
-     so that we can specify an argument type instead of just using '...'.
-     '...' is functionally correct, but more work for codegen to handle,
-     and even requires additional instructions on some targets. */
-  const char *name = USING_SJLJ_EXCEPTIONS ?
-                       "_Unwind_SjLj_Resume"
+  llvm_unwind_resume_libfunc = llvm_init_one_libfunc ( USING_SJLJ_EXCEPTIONS ?
+                                               "_Unwind_SjLj_Resume"
 #ifdef LLVM_STACKSENSITIVE_UNWIND_RESUME
-                       : "_Unwind_Resume_or_Rethrow";
+                                               : "_Unwind_Resume_or_Rethrow");
 #else
-                       : "_Unwind_Resume";
+                                               : "_Unwind_Resume");
 #endif
-  tree decl = build_decl (FUNCTION_DECL, get_identifier (name),
-                          build_function_type (void_type_node,
-                                               tree_cons (0, ptr_type_node,
-                                                          void_list_node)));
-  DECL_ARTIFICIAL (decl) = 1;
-  DECL_EXTERNAL (decl) = 1;
-  TREE_PUBLIC (decl) = 1;
-  llvm_unwind_resume_libfunc = decl;
 #else
   unwind_resume_libfunc =
     init_one_libfunc ( USING_SJLJ_EXCEPTIONS ? "_Unwind_SjLj_Resume"