RISC-OS rev 5, DEC OSF/1 changes.

From-SVN: r2256

7 files changed, 37 insertions, 48 deletions

diff --git a/gcc/config.sub b/gcc/config.sub
index 01149b1..f640f94 100755
--- a/gcc/config.sub
+++ b/gcc/config.sub
@@ -473,7 +473,7 @@ case $os in
 	      | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos* | -hpux* \
 	      | -unos* | -osf* | -luna* | -dgux* | -solari* | -sym* \
 	      | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
-	      | -nindy* | -vxworks* | -ebmon* | -hds* | -m88kbcs*)
+	      | -nindy* | -vxworks* | -ebmon* | -hds* | -m88kbcs* | -riscos*)
 		;;
 	-osfrose*)
 		os=-osfrose
diff --git a/gcc/config/i386/osfrose.h b/gcc/config/i386/osfrose.h
index 33bca7c..d6a7f9a 100644
--- a/gcc/config/i386/osfrose.h
+++ b/gcc/config/i386/osfrose.h
@@ -113,6 +113,14 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif
 #define STARTFILE_SPEC "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}"
 
+#undef TARGET_VERSION_INTERNAL
+#undef TARGET_VERSION
+
+#define I386_VERSION " 80386, OSF/rose objects"
+
+#define TARGET_VERSION_INTERNAL(STREAM) fputs (I386_VERSION, STREAM)
+#define TARGET_VERSION TARGET_VERSION_INTERNAL (stderr)
+
 #ifdef  MACHINE_TYPE
 #undef  MACHINE_TYPE
 #endif
diff --git a/gcc/config/mips/dec-osf1.h b/gcc/config/mips/dec-osf1.h
index 55cc653..fb48ce6 100644
--- a/gcc/config/mips/dec-osf1.h
+++ b/gcc/config/mips/dec-osf1.h
@@ -27,10 +27,21 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 %{!mgas: \
 	%{EL} %{!EL: -EL} \
 	%{EB: %e-EB not supported} \
-	%{mips1} %{mips2} %{mips3} \
-	%{bestGnum} %{shared} %{non_shared}}"
+	%{mips1} %{mips2} %{mips3} %{bestGnum} \
+	%{shared} %{non_shared} %{!shared: %!{non_shared: -non_shared}}}"
 
 #include "decstatn.h"
 
+/* Specify size_t, ptrdiff_t, and wchar_t types.  */
+#undef	SIZE_TYPE
+#undef	PTRDIFF_TYPE
+#undef	WCHAR_TYPE
+#undef	WCHAR_TYPE_SIZE
+
+#define SIZE_TYPE	"long unsigned int"
+#define PTRDIFF_TYPE	"int"
+#define WCHAR_TYPE	"short unsigned int"
+#define WCHAR_TYPE_SIZE SHORT_TYPE_SIZE
+
 /* turn off collect2 COFF support, since ldfcn now has elf declaration */
 #undef OBJECT_FORMAT_COFF
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index c795a24..7252ce7 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -2693,54 +2693,14 @@ trace (s, s1, s2)
 
 #ifdef SIGINFO
 
-#include <sys/wait.h>
-
 static void
 siginfo (signo)
      int signo;
 {
-  char select_pgrp[15];
-  char *argv[4];
-  pid_t pid;
-  pid_t pgrp;
-  int status;
-
   fprintf (stderr, "compiling '%s' in '%s'\n",
 	   (current_function_name != (char *)0) ? current_function_name : "<toplevel>",
 	   (current_function_file != (char *)0) ? current_function_file : "<no file>");
-
-  pgrp = getpgrp ();
-  if (pgrp != -1)
-    sprintf (select_pgrp, "-g%d", pgrp);
-  else
-    strcpy (select_pgrp, "-a");
-
-  /* Spawn a ps to tell about current memory usage, etc. */
-  argv[0] = "ps";
-  argv[1] = "-ouser,pid,pri,nice,usertime,systime,pcpu,cp,inblock,oublock,vsize,rss,pmem,ucomm";
-  argv[2] = select_pgrp;
-  argv[3] = (char *)0;
-
-  pid = vfork ();
-  if (pid == 0)			/* child context */
-    {
-      execv ("/usr/bin/ps", argv);
-      execv ("/usr/sbin/ps", argv);
-      execvp ("ps", argv);
-      perror ("ps");
-      _exit (1);
-    }
-
-  else if (pid > 0)		/* parent context */
-    {
-      void (*sigint)(int)  = signal (SIGINT, SIG_IGN);
-      void (*sigquit)(int) = signal (SIGQUIT, SIG_IGN);
-
-      (void) waitpid (pid, &status, 0);
-
-      (void) signal (SIGINT,  sigint);
-      (void) signal (SIGQUIT, sigquit);
-    }
+  fflush (stderr);
 }
 #endif /* SIGINFO */
 
diff --git a/gcc/config/mips/osfrose.h b/gcc/config/mips/osfrose.h
index 591a000..93baee5 100644
--- a/gcc/config/mips/osfrose.h
+++ b/gcc/config/mips/osfrose.h
@@ -1,5 +1,6 @@
-/* Definitions of target machine for GNU compiler.  DECstation (OSF/1 with OSF/rose) version.
-   Copyright (C) 1991 Free Software Foundation, Inc.
+/* Definitions of target machine for GNU compiler.
+   DECstation (OSF/1 reference port with OSF/rose) version.
+   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -73,7 +74,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define STARTFILE_SPEC "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}"
 
-#define MACHINE_TYPE "DECstation running OSF/1 with OSF/rose objects"
+#define MACHINE_TYPE "DECstation with OSF/rose objects"
 
 #ifndef MD_EXEC_PREFIX
 #define MD_EXEC_PREFIX		"/usr/ccs/gcc/"
diff --git a/gcc/config/mips/xm-mips.h b/gcc/config/mips/xm-mips.h
index ebf3b3b..2791917 100644
--- a/gcc/config/mips/xm-mips.h
+++ b/gcc/config/mips/xm-mips.h
@@ -74,7 +74,7 @@ extern char * alloca ();
 #endif /* not MIPS_OVERRIDE_ALLOCA */
 
 /* Say if we have vprintf.  BSD Mips targets probably don't have vfprintf.  */
-#if defined(__OSF1__) ||  defined(__OSF__)
+#if defined(__OSF1__) || defined(__OSF__) || defined(__osf__)
 #define HAVE_VFPRINTF
 #define HAVE_PUTENV
 
diff --git a/gcc/mips-tfile.c b/gcc/mips-tfile.c
index 4ca0374..53320e3 100644
--- a/gcc/mips-tfile.c
+++ b/gcc/mips-tfile.c
@@ -637,7 +637,11 @@ typedef char *CPTR_T;
    the fact that including stddef.h gets you GCC's version
    instead of the standard one it's not worth it to fix it.  */
 
+#if defined(__OSF1__) || defined(__OSF__) || defined(__osf__)
+#define Size_t		long unsigned int
+#else
 #define Size_t		unsigned int
+#endif
 #define Ptrdiff_t	int
 
 /* The following might be called from obstack or malloc,
@@ -655,8 +659,13 @@ extern void	xfree		__proto((PTR_T));
 extern void	fatal();	/* can't use prototypes here */
 extern void	error();
 
+#if !defined(__OSF1__) && !defined(__OSF__) && !defined(__osf__)
 extern char *index ();
 extern char *rindex ();
+#else
+#undef rindex
+#undef index
+#endif
 
 #ifndef MIPS_DEBUGGING_INFO