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

[Andreas Jaeger <aj at suse dot de>]

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

> Andreas Jaeger <aj@suse.de> writes:
>
>>>
>>> ... and also because you have a bunch of HOST_WIDE_INT quantities
>>> being printed with %l[xdu] not HOST_WIDE_INT_PRINT_{HEX,DEC,UNSIGNED}.
>>
>> I only found the following two places by visual inspection.  Did you
>> receive more warnings?
>
> Yeah.  Here's the diff I came up with.

That's the same that Andreas Tobler has.

I'll commit the appended version after testing with this ChangeLog:

2003-10-26  Andreas Jaeger  <aj@suse.de>
	    Zack Weinberg  <zack@codesourcery.com>
	    Andreas Tobler <toa@pop.agri.ch>

	* dwarf2out.c (output_cfi): Use HOST_WIDE_INT_PRINT.
	(output_die): Likewise.
	(print_die): Likewise.

thanks,
Andreas

> zw
>
> ===================================================================
> Index: dwarf2out.c
> --- dwarf2out.c	25 Oct 2003 21:32:02 -0000	1.460
> +++ dwarf2out.c	26 Oct 2003 08:58:02 -0000
> @@ -1791,7 +1791,7 @@ output_cfi (dw_cfi_ref cfi, dw_fde_ref f
>    if (cfi->dw_cfi_opc == DW_CFA_advance_loc)
>      dw2_asm_output_data (1, (cfi->dw_cfi_opc
>  			     | (cfi->dw_cfi_oprnd1.dw_cfi_offset & 0x3f)),
> -			 "DW_CFA_advance_loc 0x%lx",
> +			 "DW_CFA_advance_loc " HOST_WIDE_INT_PRINT_HEX,
>  			 cfi->dw_cfi_oprnd1.dw_cfi_offset);
>    else if (cfi->dw_cfi_opc == DW_CFA_offset)
>      {
> @@ -5234,10 +5234,10 @@ print_die (dw_die_ref die, FILE *outfile
>  	  fprintf (outfile, "range list");
>  	  break;
>  	case dw_val_class_const:
> -	  fprintf (outfile, "%ld", AT_int (a));
> +	  fprintf (outfile, HOST_WIDE_INT_PRINT_DEC, AT_int (a));
>  	  break;
>  	case dw_val_class_unsigned_const:
> -	  fprintf (outfile, "%lu", AT_unsigned (a));
> +	  fprintf (outfile, HOST_WIDE_INT_PRINT_UNSIGNED, AT_unsigned (a));
>  	  break;
>  	case dw_val_class_long_long:
>  	  fprintf (outfile, "constant (%lu,%lu)",
> @@ -6556,7 +6556,8 @@ output_die (dw_die_ref die)
>  	  {
>  	    char *p = strchr (ranges_section_label, '\0');
>  
> -	    sprintf (p, "+0x%lx", a->dw_attr_val.v.val_offset);
> +	    sprintf (p, "+" HOST_WIDE_INT_PRINT_HEX,
> +		     a->dw_attr_val.v.val_offset);
>  	    dw2_asm_output_offset (DWARF_OFFSET_SIZE, ranges_section_label,
>  				   "%s", name);
>  	    *p = '\0';
>
>

Andreas
-- 
 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