--- gcc-svn-255377.old/gcc/system.h
+++ gcc-svn-255377/gcc/system.h
@@ -537,7 +537,7 @@
 #if !defined (HAVE_STRSIGNAL) \
     || (defined (HAVE_DECL_STRSIGNAL) && !HAVE_DECL_STRSIGNAL)
 # ifndef strsignal
-extern const char *strsignal (int);
+extern char *strsignal (int);
 # endif
 #endif
 
--- gcc-svn-255377.old/gcc/timevar.c
+++ gcc-svn-255377/gcc/timevar.c
@@ -24,6 +24,7 @@
 #include "timevar.h"
 #include "options.h"
 
+#ifdef NOTDEF
 #ifndef HAVE_CLOCK_T
 typedef int clock_t;
 #endif
@@ -37,6 +38,9 @@
   clock_t tms_cstime;
 };
 #endif
+#else
+#include <time.h>
+#endif
 
 #ifndef RUSAGE_SELF
 # define RUSAGE_SELF 0
--- gcc-svn-255377.old/libiberty/gettimeofday.c
+++ gcc-svn-255377/libiberty/gettimeofday.c
@@ -18,6 +18,7 @@
 
 */ 
 
+#ifdef NOTDEF
 int
 gettimeofday (struct timeval *tp, void *tz)
 {
@@ -28,3 +29,4 @@
     return -1;
   return 0;
 }
+#endif
--- gcc-svn-255377.old/libiberty/strsignal.c
+++ gcc-svn-255377/libiberty/strsignal.c
@@ -551,7 +551,7 @@
 #ifndef HAVE_PSIGNAL
 
 void
-psignal (int signo, char *message)
+psignal (int signo, const char *message)
 {
   if (signal_names == NULL)
     {