Re: Recent patch neglects to update tree.h - causes bootstrapfailure

[Andreas Jaeger <aj at suse dot de>]

"Zack Weinberg" <zack@codesourcery.com> writes:

> This patch
>
> 2003-10-25  Jan Hubicka  <jh@suse.cz>
>
>         * dwarf2out.c (dw_cfi_oprnd_struct): Offset is HOST_WIDE_INT.
>         (cfa_loc): Likewise.
>         (reg_save, stack_adjust_offset, queue_reg_save): Replace long by
>         HOST_WIDE_INT.
>         (args_size, old_args_size): change type to HOST_WIDE_INT.
>         (dwarf2out_def_cfa, dwarf2out_args_size,
>         dwarf2out_reg_save, new_loc_descr): offset is HOST_WIDE_INT.
>         (dw_val_struct): integers, unsigneds and offsets are HOST_WIDE_INT.
>         (add_AT_int, add_AT_unsigned, att_AT_offset, AT_int, AT_unsigned,
>         AT_offset): Use HOST_WIDE_INT.
>         (based_loc_descr): offset is HOST_WIDE_INT.
>         (add_data_member): Likewise.
>         (add_const_value_attribute): Simplify.
>
> breaks bootstrap on any target where HOST_WIDE_INT != long, because
> tree.h still has several declarations with 'long' types: hence we get
>
> dwarf2out.c:719: error: conflicting types for `dwarf2out_def_cfa'
> tree.h:3013: error: previous declaration of `dwarf2out_def_cfa'
> dwarf2out.c:873: error: conflicting types for `dwarf2out_args_size'
> tree.h:3022: error: previous declaration of `dwarf2out_args_size'
> dwarf2out.c:892: error: conflicting types for `dwarf2out_reg_save'
> tree.h:3026: error: previous declaration of `dwarf2out_reg_save'
> dwarf2out.c:901: error: conflicting types for `dwarf2out_return_save'
> tree.h:3030: error: previous declaration of `dwarf2out_return_save'
>
> Please fix.  (I would check in the obvious patch, but I have too many
> other changes in my tree right now.)

Here's the obvious patch for this problem, committed after testing on
i686-linux-gnu,

Andreas

2003-10-26  Andreas Jaeger  <aj@suse.de>

	* tree.h (dwarf2out_def_cfa, dwarf2out_args_size,
	dwarf2out_reg_save, new_loc_descr): Update prototypes for recent
	dwarf2out.c change.

============================================================
Index: gcc/tree.h
--- gcc/tree.h	21 Oct 2003 22:14:53 -0000	1.449
+++ gcc/tree.h	26 Oct 2003 08:13:33 -0000
@@ -3010,7 +3010,7 @@ extern char *dwarf2out_cfi_label (void);
 
 /* Entry point to update the canonical frame address (CFA).  */
 
-extern void dwarf2out_def_cfa (const char *, unsigned, long);
+extern void dwarf2out_def_cfa (const char *, unsigned, HOST_WIDE_INT);
 
 /* Add the CFI for saving a register window.  */
 
@@ -3019,15 +3019,15 @@ extern void dwarf2out_window_save (const
 /* Add a CFI to update the running total of the size of arguments pushed
    onto the stack.  */
 
-extern void dwarf2out_args_size (const char *, long);
+extern void dwarf2out_args_size (const char *, HOST_WIDE_INT);
 
 /* Entry point for saving a register to the stack.  */
 
-extern void dwarf2out_reg_save (const char *, unsigned, long);
+extern void dwarf2out_reg_save (const char *, unsigned, HOST_WIDE_INT);
 
 /* Entry point for saving the return address in the stack.  */
 
-extern void dwarf2out_return_save (const char *, long);
+extern void dwarf2out_return_save (const char *, HOST_WIDE_INT);
 
 /* Entry point for saving the return address in a register.  */
 

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SuSE Linux AG, Deutschherrnstr. 15-19, 90429 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Attachment: pgp00000.pgp
Description: PGP signature