Make exception handling work properly when building
without LLVM enabled.
llvm-svn: 48816
diff --git a/llvm-gcc-4.2/gcc/expr.h b/llvm-gcc-4.2/gcc/expr.h
index 265b550..dc743f4 100644
--- a/llvm-gcc-4.2/gcc/expr.h
+++ b/llvm-gcc-4.2/gcc/expr.h
@@ -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);
diff --git a/llvm-gcc-4.2/gcc/optabs.c b/llvm-gcc-4.2/gcc/optabs.c
index d5a1b19..f29a33b 100644
--- a/llvm-gcc-4.2/gcc/optabs.c
+++ b/llvm-gcc-4.2/gcc/optabs.c
@@ -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);