[llvm-commits] [llvm-gcc-4.2] r48816 - in /llvm-gcc-4.2/trunk/gcc: expr.h optabs.c

[Duncan Sands]

Author: baldrick
Date: Wed Mar 26 03:12:41 2008
New Revision: 48816

URL: http://llvm.org/viewvc/llvm-project?rev=48816&view=rev
Log:
Make exception handling work properly when building
without LLVM enabled.

Modified:
    llvm-gcc-4.2/trunk/gcc/expr.h
    llvm-gcc-4.2/trunk/gcc/optabs.c

Modified: llvm-gcc-4.2/trunk/gcc/expr.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/expr.h?rev=48816&r1=48815&r2=48816&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/expr.h (original)
+++ llvm-gcc-4.2/trunk/gcc/expr.h Wed Mar 26 03:12:41 2008
@@ -752,7 +752,12 @@
 extern rtx init_one_libfunc (const char *);
 /* LLVM LOCAL begin */
 /* Call this to initialize an optab function tree.  */
-extern tree llvm_init_one_libfunc (const char *);
+#ifdef ENABLE_LLVM
+extern tree llvm_init_one_libfunc_impl (const char *);
+#define llvm_init_one_libfunc	llvm_init_one_libfunc_impl
+#else
+#define llvm_init_one_libfunc	init_one_libfunc
+#endif
 /* LLVM LOCAL end */
 
 extern int vector_mode_valid_p (enum machine_mode);

Modified: llvm-gcc-4.2/trunk/gcc/optabs.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/optabs.c?rev=48816&r1=48815&r2=48816&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/optabs.c (original)
+++ llvm-gcc-4.2/trunk/gcc/optabs.c Wed Mar 26 03:12:41 2008
@@ -5138,7 +5138,7 @@
 
 /* LLVM local begin */
 tree
-llvm_init_one_libfunc (const char *name)
+llvm_init_one_libfunc_impl (const char *name)
 {
   /* Create a FUNCTION_DECL that can be passed to
      targetm.encode_section_info.  */
@@ -5169,7 +5169,7 @@
   return NULL_RTX;
 #endif
 
-  decl = llvm_init_one_libfunc (name);
+  decl = llvm_init_one_libfunc_impl (name);
   /* LLVM local end */
 
   symbol = XEXP (DECL_RTL (decl), 0);