gengtype.c (adjust_field_rtx_def): Cast variables of type size_t to unsigned long, adjust printf format string.

	* gengtype.c (adjust_field_rtx_def): Cast variables of type size_t
	to unsigned long, adjust printf format string.
	(output_mangled_typename): Likewise.

From-SVN: r57804

2 files changed, 19 insertions, 12 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 44a509c..573d75f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-03  Andreas Jaeger  <aj@suse.de>
+
+	* gengtype.c (adjust_field_rtx_def): Cast variables of type size_t
+	to unsigned long, adjust printf format string.
+	(output_mangled_typename): Likewise.
+
 2002-10-03  Jason Thorpe  <thorpej@wasabisystems.com>
 
 	* config/vax/vax.c (vax_output_function_prologue): Use asm_fprintf.
@@ -46,7 +52,7 @@
 	* config.gcc (hppa*64*-*-hpux11*): Check gnu_ld.
 	* config/pa/pa.h (MASK_GNU_LD): New.
 	(TARGET_GNU_LD): New.
-	* config/pa/pa64-hpux.h (LINK_SPEC): Set based 
+	* config/pa/pa64-hpux.h (LINK_SPEC): Set based
 	on gnu-ld and MASK_GNU_LD.
 	(SUBTARGET_SWITCHES): New gnu-ld & hp-ld flags.
 
@@ -127,7 +133,7 @@ Thu Oct  3 21:42:20 CEST 2002  Jan Hubicka  <jh@suse.cz>
 Thu Oct  3 15:15:00 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
 	* i386.md (lea to mul peep2): Fix condition.
-	
+
 2002-10-02  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
 	* pa-linux.h (FUNCTION_OK_FOR_SIBCALL): Delete macro.
@@ -202,7 +208,7 @@ Wed Oct  2 17:01:36 CEST 2002  Jan Hubicka  <jh@suse.cz>
             Jason Thorpe  <thorpej@wasabisystems.com>
 
 	* config.gcc (vax-*-netbsdelf*): Enable configuration.
-	* config/elfos.h (PCC_BITFIELD_TYPE_MATTERS): Define only 
+	* config/elfos.h (PCC_BITFIELD_TYPE_MATTERS): Define only
 	if not already defined.
 	* config/vax/elf.h: New file.
 	* config/vax/netbsd-elf.h: New file.
@@ -244,7 +250,7 @@ Wed Oct  2 17:01:36 CEST 2002  Jan Hubicka  <jh@suse.cz>
 	* stor-layout.c (update_alignment_for_field): New function.
 	(place_union_field): Use it.
 	(place_field): Likewise.
-	
+
 2002-10-01  Nathan Sidwell  <nathan@codesourcery.com>
 
 	PR other/8077
@@ -256,7 +262,7 @@ Wed Oct  2 17:01:36 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
 2002-09-30  Andrew Haley  <aph@redhat.com>
 
-	* flow.c (insn_dead_p): When using non-call-exceptions, don't 
+	* flow.c (insn_dead_p): When using non-call-exceptions, don't
 	eliminate insns that may trap.
 	* cse.c (insn_live_p): Likewise.
 
@@ -1076,7 +1082,7 @@ Tue Aug 27 20:07:01 CEST 2002  Jan Hubicka  <jh@suse.cz>
 	(const_float_1_operand): Use dconst1.
 	* config/mips/mips.md (movsf, movsf_internal1, movsf_internal2,
 	movdf, movdf_internal1, movdf_internal1a, movdf_internal2):
- 	Don't allow arbitrary constants; fix predicates and C constraint.
+	Don't allow arbitrary constants; fix predicates and C constraint.
 
 2002-09-20  Neil Booth  <neil@daikokuya.co.uk>
 
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index ffb5b4b..c95cba7 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -528,8 +528,8 @@ adjust_field_rtx_def (t, opt)
 	      else
 		{
 		  error_at_line (&lexer_line, 
-			"rtx type `%s' has `0' in position %d, can't handle",
-				 rtx_name[i], aindex);
+			"rtx type `%s' has `0' in position %lu, can't handle",
+				 rtx_name[i], (unsigned long) aindex);
 		  t = &string_type;
 		  subname = "rtint";
 		}
@@ -571,9 +571,9 @@ adjust_field_rtx_def (t, opt)
 
 	    default:
 	      error_at_line (&lexer_line, 
-		     "rtx type `%s' has `%c' in position %d, can't handle",
+		     "rtx type `%s' has `%c' in position %lu, can't handle",
 			     rtx_name[i], rtx_format[i][aindex],
-			     aindex);
+			     (unsigned long)aindex);
 	      t = &string_type;
 	      subname = "rtint";
 	      break;
@@ -582,7 +582,8 @@ adjust_field_rtx_def (t, opt)
 	  subfields = xmalloc (sizeof (*subfields));
 	  subfields->next = old_subf;
 	  subfields->type = t;
-	  subfields->name = xasprintf ("[%d].%s", aindex, subname);
+	  subfields->name = xasprintf ("[%lu].%s", (unsigned long)aindex,
+				       subname);
 	  subfields->line.file = __FILE__;
 	  subfields->line.line = __LINE__;
 	  if (t == note_union_tp)
@@ -1452,7 +1453,7 @@ output_mangled_typename (of, t)
     case TYPE_STRUCT:
     case TYPE_UNION:
     case TYPE_LANG_STRUCT:
-      oprintf (of, "%d%s", strlen (t->u.s.tag), t->u.s.tag);
+      oprintf (of, "%lu%s", (unsigned long) strlen (t->u.s.tag), t->u.s.tag);
       break;
     case TYPE_PARAM_STRUCT:
       {