--- a/packages/language/c/libc/time/current/ChangeLog
+++ b/packages/language/c/libc/time/current/ChangeLog
@@ -1,3 +1,13 @@
+2003-04-24  Robert Cragie  <rcc@jennic.com>
+
+	* include/time.inl:
+	* include/timeutil.h:
+	* src/timeutil.cxx:
+	Change return type of cyg_libc_time_itoa() to cyg_ucount8.
+	* src/strftime.cxx:
+	Change return type of do_format() to cyg_count8.
+	These benign changes get around a compiler bug using or32-elf-gcc
+
 2003-03-18  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/strptime.cxx: Initialize time structure to a well known, valid,

--- a/packages/language/c/libc/time/current/include/time.inl
+++ b/packages/language/c/libc/time/current/include/time.inl
@@ -264,7 +264,7 @@ cyg_libc_time_setdst( Cyg_libc_time_dst 
 CYGPRI_LIBC_TIME_ASCTIME_R_INLINE char *
 __asctime_r( const struct tm *__timeptr, char *__buf )
 {
-    cyg_uint8 __i;
+    cyg_ucount8 __i;
     
     // These initializers are [4] since C++ dictates you _must_ leave space
     // for the trailing '\0', even though ISO C says you don't need to!

--- a/packages/language/c/libc/time/current/include/timeutil.h
+++ b/packages/language/c/libc/time/current/include/timeutil.h
@@ -98,7 +98,7 @@ cyg_libc_time_normalize_structtm( struct
 // The number of chars written to s is returned
 //
 
-extern cyg_uint8
+extern cyg_ucount8
 cyg_libc_time_itoa( cyg_uint8 *__s, cyg_int32 __num, cyg_uint8 __width,
                     cyg_bool __padzero );
 

--- a/packages/language/c/libc/time/current/src/strftime.cxx
+++ b/packages/language/c/libc/time/current/src/strftime.cxx
@@ -77,7 +77,7 @@
 // in buf. The number of bytes written is returned, or -1 if there was no
 // space
 
-static cyg_int8
+static cyg_count8
 do_format(cyg_uint8 fmtchar, cyg_ucount32 sizeleft, char *buf,
           const struct tm *timeptr)
 {
@@ -303,7 +303,7 @@ strftime( char *s, size_t maxsize, const
     --maxsize;
 
     cyg_ucount32 i, spos;
-    cyg_int8 dof_ret;
+    cyg_count8 dof_ret;
     
     for (i=0, spos=0; (spos<maxsize) && (format[i] != '\0'); ++i) {
         if (format[i] == '%') {

--- a/packages/language/c/libc/time/current/src/timeutil.cxx
+++ b/packages/language/c/libc/time/current/src/timeutil.cxx
@@ -229,7 +229,7 @@ cyg_libc_time_normalize_structtm( struct
 // but there wouldn't be much in it with only 11 chars max to convert :-/.
 // Actually FIXME: what if someone passes a width >11
 
-externC cyg_uint8
+externC cyg_ucount8
 cyg_libc_time_itoa( cyg_uint8 *s, cyg_int32 num, cyg_uint8 width,
                     cyg_bool padzero )
 {
@@ -252,7 +252,7 @@ cyg_libc_time_itoa( cyg_uint8 *s, cyg_in
     }
     
     // return value
-    cyg_uint8 ret=0;
+    cyg_ucount8 ret=0;
     
     // Pre-fiddle for negative numbers
     if ((num < 0) && (width > 0)) {