From: Jason Merrill <jason@gcc.gnu.org>
Date: Wed, 26 Nov 1997 07:38:08 +0000 (-0500)
Subject: integrate.c (output_inline_function): Just unset DECL_INLINE.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f47448072a99ebd168eddf9b7ed627518f5e9470;p=gcc.git

integrate.c (output_inline_function): Just unset DECL_INLINE.

	* integrate.c (output_inline_function): Just unset DECL_INLINE.

Tue Nov 25 23:33:29 1997  scott snyder  <snyder@d0sgif.fnal.gov>

	* dwarf2out.c (outout_call_frame_info): Ensure that the info has
	proper alignment.

	* libgcc2.c (__throw): Initialize HANDLER.

From-SVN: r16724
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 06b27cfd06c..bab098424ef 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+Tue Nov 25 23:37:27 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* integrate.c (output_inline_function): Just unset DECL_INLINE.
+
+Tue Nov 25 23:33:29 1997  scott snyder  <snyder@d0sgif.fnal.gov>
+
+	* dwarf2out.c (outout_call_frame_info): Ensure that the info has
+	proper alignment.
+
+	* libgcc2.c (__throw): Initialize HANDLER.
+
 Tue Nov 25 10:00:42 1997  Richard Henderson  (rth@cygnus.com)
 
 	* alpha.h (CONST_OK_FOR_LETTER): Fix 'L' handling.
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index e9bae0026f9..1b4a539d39d 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -1573,6 +1573,7 @@ output_call_frame_info (for_eh)
       tree label = get_file_function_name ('F');
 
       data_section ();
+      ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (PTR_SIZE));
       ASM_GLOBALIZE_LABEL (asm_out_file, IDENTIFIER_POINTER (label));
       ASM_OUTPUT_LABEL (asm_out_file, IDENTIFIER_POINTER (label));
 #endif
diff --git a/gcc/integrate.c b/gcc/integrate.c
index 623beb5b815..60022eb63a4 100644
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -3227,7 +3227,6 @@ output_inline_function (fndecl)
 {
   rtx head;
   rtx last;
-  int save_flag_no_inline = flag_no_inline;
 
   if (output_bytecode)
     {
@@ -3329,15 +3328,11 @@ output_inline_function (fndecl)
   /* We're not deferring this any longer.  */
   DECL_DEFER_OUTPUT (fndecl) = 0;
 
-  /* Integrating function calls isn't safe anymore, so turn on
-     flag_no_inline.  */
-  flag_no_inline = 1;
+  /* We can't inline this anymore.  */
+  DECL_INLINE (fndecl) = 0;
 
   /* Compile this function all the way down to assembly code.  */
   rest_of_compilation (fndecl);
 
-  /* Reset flag_no_inline to its original value.  */
-  flag_no_inline = save_flag_no_inline;
-
   current_function_decl = 0;
 }
diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c
index 7fec5cdd45e..53af01b0e31 100644
--- a/gcc/libgcc2.c
+++ b/gcc/libgcc2.c
@@ -3526,6 +3526,7 @@ label:
   /* Now reset pc to the right throw point.  */
   pc = __eh_pc;
 
+  handler = 0;
   for (;;)
     { 
       frame_state *p = udata;