Index: gcc-3.0-psion-98r2/expect/exp_strf.c
diff -c gcc-3.0-psion-98r2/expect/exp_strf.c:1.1.1.1 gcc-3.0-psion-98r2/expect/exp_strf.c:1.2
*** gcc-3.0-psion-98r2/expect/exp_strf.c:1.1.1.1	Tue Oct 14 16:33:40 2003
--- gcc-3.0-psion-98r2/expect/exp_strf.c	Mon Aug 30 14:41:06 2004
***************
*** 96,102 ****
--- 96,104 ----
  adddecl(static int iso8601wknum();)
  #else
  
+ #ifndef strchr
  extern char *strchr(const char *str, int ch);
+ #endif
  extern char *getenv(const char *v);
  static int weeknumber(const struct tm *timeptr, int firstweekday);
  adddecl(static int iso8601wknum(const struct tm *timeptr);)
Index: gcc-3.0-psion-98r2/gcc/cppspec.c
diff -c gcc-3.0-psion-98r2/gcc/cppspec.c:1.4 gcc-3.0-psion-98r2/gcc/cppspec.c:1.5
*** gcc-3.0-psion-98r2/gcc/cppspec.c:1.4	Wed Nov 26 16:55:21 2003
--- gcc-3.0-psion-98r2/gcc/cppspec.c	Sun Aug 29 22:37:40 2004
***************
*** 138,144 ****
  #ifdef ARM_EPOC
                else if (argv[i][1] == '+')
                  {
! 	          argv[i] = "-Wp,-+";
  		}
  #endif
  /* end uszeged */
--- 138,145 ----
  #ifdef ARM_EPOC
                else if (argv[i][1] == '+')
                  {
! 		  char **argvi = (char **)&argv[i];
! 	          *argvi = "-Wp,-+";
  		}
  #endif
  /* end uszeged */
Index: gcc-3.0-psion-98r2/gcc/version.c
diff -c gcc-3.0-psion-98r2/gcc/version.c:1.9 gcc-3.0-psion-98r2/gcc/version.c:1.10
*** gcc-3.0-psion-98r2/gcc/version.c:1.9	Tue Jul  6 13:14:36 2004
--- gcc-3.0-psion-98r2/gcc/version.c	Mon Oct 25 22:03:38 2004
***************
*** 1,4 ****
  #include "gansidecl.h"
  #include "version.h"
  
! const char *const version_string = "3.0-psion-98r2 (Symbian build 8/546)";
--- 1,4 ----
  #include "gansidecl.h"
  #include "version.h"
  
! const char *const version_string = "3.0-psion-98r2 (Symbian build 9/546)";
Index: gcc-3.0-psion-98r2/gcc/config/arm/arm.h
diff -c gcc-3.0-psion-98r2/gcc/config/arm/arm.h:1.2 gcc-3.0-psion-98r2/gcc/config/arm/arm.h:1.3
*** gcc-3.0-psion-98r2/gcc/config/arm/arm.h:1.2	Fri Nov  7 15:45:42 2003
--- gcc-3.0-psion-98r2/gcc/config/arm/arm.h	Sun Aug 29 22:46:23 2004
***************
*** 1584,1590 ****
  
  #define THUMB_FUNCTION_PROFILER(STREAM, LABELNO)	\
  {							\
!   fprintf (STREAM, "\tmov\\tip, lr\n");			\
    fprintf (STREAM, "\tbl\tmcount\n");			\
    fprintf (STREAM, "\t.word\tLP%d\n", LABELNO);		\
  }
--- 1584,1590 ----
  
  #define THUMB_FUNCTION_PROFILER(STREAM, LABELNO)	\
  {							\
!   fprintf (STREAM, "\tmov\tip, lr\n");			\
    fprintf (STREAM, "\tbl\tmcount\n");			\
    fprintf (STREAM, "\t.word\tLP%d\n", LABELNO);		\
  }
Index: gcc-3.0-psion-98r2/gdb/remote-rdp.c
diff -c gcc-3.0-psion-98r2/gdb/remote-rdp.c:1.1.1.1 gcc-3.0-psion-98r2/gdb/remote-rdp.c:1.2
*** gcc-3.0-psion-98r2/gdb/remote-rdp.c:1.1.1.1	Tue Oct 14 16:33:47 2003
--- gcc-3.0-psion-98r2/gdb/remote-rdp.c	Sun Aug 29 22:43:36 2004
***************
*** 490,496 ****
  	  abort ();
  	}
      }
!   va_end (args);
  
    if (dst != buf)
      abort ();
--- 490,496 ----
  	  abort ();
  	}
      }
!   va_end (alist);
  
    if (dst != buf)
      abort ();
Index: gcc-3.0-psion-98r2/gdb/rdi-share/devsw.c
diff -c gcc-3.0-psion-98r2/gdb/rdi-share/devsw.c:1.1.1.1 gcc-3.0-psion-98r2/gdb/rdi-share/devsw.c:1.2
*** gcc-3.0-psion-98r2/gdb/rdi-share/devsw.c:1.1.1.1	Tue Oct 14 16:33:52 2003
--- gcc-3.0-psion-98r2/gdb/rdi-share/devsw.c	Sun Aug 29 22:43:45 2004
***************
*** 241,247 ****
      return (device->DeviceMatch(name, arg) == -1) ? adp_failed : adp_ok;
  }
  
! AdpErrs DevSW_Close(const DeviceDescr *device, const DevChanID type)
  {
      DevSWState *ds = (DevSWState *)(device->SwitcherState);
      Packet *pk;
--- 241,247 ----
      return (device->DeviceMatch(name, arg) == -1) ? adp_failed : adp_ok;
  }
  
! AdpErrs DevSW_Close(DeviceDescr *device, const DevChanID type)
  {
      DevSWState *ds = (DevSWState *)(device->SwitcherState);
      Packet *pk;
Index: gcc-3.0-psion-98r2/gdb/rdi-share/devsw.h
diff -c gcc-3.0-psion-98r2/gdb/rdi-share/devsw.h:1.1.1.1 gcc-3.0-psion-98r2/gdb/rdi-share/devsw.h:1.2
*** gcc-3.0-psion-98r2/gdb/rdi-share/devsw.h:1.1.1.1	Tue Oct 14 16:33:52 2003
--- gcc-3.0-psion-98r2/gdb/rdi-share/devsw.h	Sun Aug 29 22:43:45 2004
***************
*** 160,166 ****
   *          OK: adp_ok
   *       Error: adp_device_not_open
   */
! AdpErrs DevSW_Close(const DeviceDescr *device, const DevChanID type);
  
  /*
   *  Function: DevSW_Read
--- 160,166 ----
   *          OK: adp_ok
   *       Error: adp_device_not_open
   */
! AdpErrs DevSW_Close(DeviceDescr *device, const DevChanID type);
  
  /*
   *  Function: DevSW_Read
