aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog11
-rw-r--r--gcc/dwarf2out.c1
-rw-r--r--gcc/integrate.c9
-rw-r--r--gcc/libgcc2.c1
4 files changed, 15 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 06b27cf..bab0984 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 e9bae00..1b4a539 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 623beb5..60022eb 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 7fec5cd..53af01b 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;