* 41intnam.ads, 42intnam.ads, 4aintnam.ads, 4cintnam.ads,

	4dintnam.ads, 4gintnam.ads, 4hintnam.ads, 4lintnam.ads,
	4mintnam.ads, 4pintnam.ads, 4rintnam.ads, 4sintnam.ads,
	4uintnam.ads, 4vcalend.adb, 4zintnam.ads, 52system.ads,
	5amastop.adb, 5asystem.ads, 5ataprop.adb, 5atpopsp.adb,
	5avxwork.ads, 5bosinte.adb, 5bsystem.ads, 5esystem.ads,
	5fsystem.ads, 5ftaprop.adb, 5ginterr.adb, 5gmastop.adb,
	5gsystem.ads, 5gtaprop.adb, 5gtasinf.adb, 5gtasinf.ads,
	5hparame.ads, 5hsystem.ads, 5htaprop.adb, 5htraceb.adb,
	5itaprop.adb, 5ksystem.ads, 5kvxwork.ads, 5lintman.adb,
	5lsystem.ads, 5mvxwork.ads, 5ninmaop.adb, 5nosinte.ads,
	5ntaprop.adb, 5ointerr.adb, 5omastop.adb, 5oosinte.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5pvxwork.ads,
	5qtaprop.adb, 5sintman.adb, 5ssystem.ads, 5staprop.adb,
	5stpopse.adb, 5svxwork.ads, 5tosinte.ads, 5uintman.adb,
	5vasthan.adb, 5vinmaop.adb, 5vinterr.adb, 5vintman.adb,
	5vmastop.adb, 5vparame.ads, 5vsystem.ads, 5vtaprop.adb,
	5vtpopde.adb, 5wmemory.adb, 5wsystem.ads, 5wtaprop.adb,
	5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb,
	5zosinte.ads, 5zsystem.ads, 5ztaprop.adb, 6vcpp.adb, 6vcstrea.adb,
	7sintman.adb, 7staprop.adb, 7stpopsp.adb, 9drpc.adb,
	Make-lang.in, Makefile.in, a-caldel.adb, a-comlin.ads,
	a-dynpri.adb, a-except.adb, a-except.ads, a-finali.adb,
	a-ncelfu.ads, a-reatim.adb, a-retide.adb, a-stream.ads,
	a-ststio.adb, a-ststio.ads, a-stwifi.adb, a-tags.adb, a-tasatt.adb,
	a-textio.adb, a-tideau.adb, a-tiflau.adb, a-tigeau.adb,
	a-tigeau.ads, a-tiinau.adb, a-timoau.adb, a-witeio.adb,
	a-wtdeau.adb, a-wtenau.adb, a-wtflau.adb, a-wtgeau.adb,
	a-wtgeau.ads, a-wtinau.adb, a-wtmoau.adb, ada-tree.def, ada-tree.h,
	adaint.c, adaint.h, ali-util.adb, ali.adb, ali.ads, atree.adb,
	atree.ads, atree.h, back_end.adb, bcheck.adb, bindgen.adb,
	bindusg.adb, checks.adb, comperr.adb, config-lang.in, csets.adb,
	csets.ads, cstand.adb, cstreams.c, debug.adb, debug.ads, decl.c,
	einfo.adb, einfo.ads, einfo.h, elists.h, errout.adb, errout.ads,
	eval_fat.adb, exp_aggr.adb, exp_attr.adb, exp_ch11.adb,
	exp_ch12.adb, exp_ch13.adb, exp_ch2.adb, exp_ch3.adb, exp_ch3.ads,
	exp_ch4.adb, exp_ch5.adb, exp_ch6.adb, exp_ch7.adb, exp_ch7.ads,
	exp_ch9.adb, exp_ch9.ads, exp_dbug.adb, exp_dbug.ads, exp_disp.ads,
	exp_dist.adb, exp_fixd.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_strm.adb, exp_util.adb, exp_util.ads,
	expander.adb, expect.c, fe.h, fmap.adb, fmap.ads, fname-uf.adb,
	freeze.adb, frontend.adb, g-awk.adb, g-cgideb.adb, g-comlin.adb,
	g-comlin.ads, g-debpoo.adb, g-dirope.adb, g-dirope.ads,
	g-dyntab.adb, g-expect.adb, g-expect.ads, g-io.ads, g-io_aux.adb,
	g-io_aux.ads, g-locfil.adb, g-locfil.ads, g-os_lib.adb,
	g-os_lib.ads, g-regexp.adb, g-regpat.adb, g-socket.adb,
	g-socket.ads, g-spipat.adb, g-table.adb, g-trasym.adb,
	g-trasym.ads, gigi.h, gmem.c, gnat1drv.adb, gnatbind.adb, gnatbl.c,
	gnatchop.adb, gnatcmd.adb, gnatdll.adb, gnatfind.adb, gnatlbr.adb,
	gnatlink.adb, gnatls.adb, gnatmem.adb, gnatprep.adb, gnatvsn.ads,
	gnatxref.adb, hlo.adb, hostparm.ads, i-cobol.adb, i-cpp.adb,
	i-cstrea.ads, i-cstrin.adb, i-pacdec.adb, i-vxwork.ads,
	impunit.adb, init.c, inline.adb, io-aux.c, layout.adb, lib-load.adb,
	lib-util.adb, lib-writ.adb, lib-writ.ads, lib-xref.adb,
	lib-xref.ads, lib.adb, lib.ads, make.adb, makeusg.adb, mdll.adb,
	memroot.adb, misc.c, mlib-tgt.adb, mlib-utl.adb, mlib-utl.ads,
	mlib.adb, namet.adb, namet.ads, namet.h, nlists.h, nmake.adb,
	nmake.ads, nmake.adt, opt.adb, opt.ads, osint.adb, osint.ads,
	output.adb, output.ads, par-ch2.adb, par-ch3.adb, par-ch5.adb,
	par-prag.adb, par-tchk.adb, par-util.adb, par.adb, prj-attr.adb,
	prj-dect.adb, prj-env.adb, prj-env.ads, prj-nmsc.adb, prj-part.adb,
	prj-proc.adb, prj-strt.adb, prj-tree.adb, prj-tree.ads, prj.adb,
	prj.ads, raise.c, raise.h, repinfo.adb, restrict.adb, restrict.ads,
	rident.ads, rtsfind.adb, rtsfind.ads, s-arit64.adb, s-asthan.adb,
	s-atacco.adb, s-atacco.ads, s-auxdec.adb, s-crc32.adb, s-crc32.ads,
	s-direio.adb, s-fatgen.adb, s-fileio.adb, s-finimp.adb,
	s-gloloc.adb, s-gloloc.ads, s-interr.adb, s-mastop.adb,
	s-mastop.ads, s-memory.adb, s-parame.ads, s-parint.adb,
	s-pooglo.adb, s-pooloc.adb, s-rpc.adb, s-secsta.adb, s-sequio.adb,
	s-shasto.adb, s-soflin.adb, s-soflin.ads, s-stache.adb,
	s-taasde.adb, s-taasde.ads, s-tadeca.adb, s-tadeca.ads,
	s-tadert.adb, s-tadert.ads, s-taenca.adb, s-taenca.ads,
	s-taprob.adb, s-taprop.ads, s-tarest.adb, s-tasdeb.adb,
	s-tasini.adb, s-tasini.ads, s-taskin.adb, s-taskin.ads,
	s-tasque.adb, s-tasque.ads, s-tasren.adb, s-tasren.ads,
	s-tassta.adb, s-tasuti.adb, s-tasuti.ads, s-tataat.adb,
	s-tataat.ads, s-tpoben.adb, s-tpoben.ads, s-tpobop.adb,
	s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads,
	s-unstyp.ads, s-widenu.adb, scn-nlit.adb, scn.adb, sem.adb,
	sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb,
	sem_ch10.adb, sem_ch11.adb, sem_ch11.ads, sem_ch12.adb,
	sem_ch13.adb, sem_ch13.ads, sem_ch2.adb, sem_ch3.adb, sem_ch3.ads,
	sem_ch4.adb, sem_ch5.adb, sem_ch6.adb, sem_ch6.ads, sem_ch7.adb,
	sem_ch8.adb, sem_ch8.ads, sem_ch9.adb, sem_disp.adb, sem_dist.adb,
	sem_elab.adb, sem_elim.adb, sem_elim.ads, sem_eval.adb,
	sem_intr.adb, sem_mech.adb, sem_prag.adb, sem_res.adb,
	sem_type.adb, sem_util.adb, sem_util.ads, sem_vfpt.adb,
	sem_warn.adb, sinfo.adb, sinfo.ads, sinfo.h, sinput-l.adb,
	sinput-l.ads, sinput.adb, sinput.ads, snames.adb, snames.ads,
	snames.h, sprint.adb, sprint.ads, stringt.adb, stringt.ads,
	stringt.h, style.adb, switch.adb, switch.ads, sysdep.c, system.ads,
	table.adb, targparm.adb, targparm.ads, targtyps.c, tbuild.adb,
	tbuild.ads, tracebak.c, trans.c, tree_gen.adb, tree_io.adb,
	treepr.adb, treepr.ads, treeprs.ads, treeprs.adt, ttypes.ads,
	types.adb, types.ads, types.h, uintp.ads, urealp.ads, usage.adb,
	utils.c, utils2.c, validsw.adb, xnmake.adb, xr_tabls.adb,
	xr_tabls.ads, xref_lib.adb, xref_lib.ads : Merge in ACT changes.

	* 1ssecsta.adb, 1ssecsta.ads, a-chlat9.ads, a-cwila9.ads,
	g-enblsp.adb, g-md5.adb, g-md5.ads, gnatname.adb, gnatname.ads,
	mkdir.c, osint-b.adb, osint-b.ads, osint-c.adb, osint-c.ads,
	osint-l.adb, osint-l.ads, osint-m.adb, osint-m.ads : New files

	* 3lsoccon.ads, 5qparame.ads, 5qvxwork.ads, 5smastop.adb,
	5zparame.ads, gnatmain.adb, gnatmain.ads, gnatpsys.adb : Removed

	* mdllfile.adb, mdllfile.ads, mdlltool.adb, mdlltool.ads : Renamed
	to mdll-fil.ad[bs] and mdll-util.ad[bs]

	* mdll-fil.adb, mdll-fil.ads, mdll-utl.adb, mdll-utl.ads : Renamed
	from mdllfile.ad[bs] and mdlltool.ad[bs]


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50451 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 150 insertions, 64 deletions

diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c
index 2ab58074c02..a2804c66025 100644
--- a/gcc/ada/sysdep.c
+++ b/gcc/ada/sysdep.c
@@ -6,9 +6,9 @@
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *                            $Revision: 1.4 $
+ *                            $Revision$
  *                                                                          *
- *          Copyright (C) 1992-2001 Free Software Foundation, Inc.          *
+ *          Copyright (C) 1992-2002 Free Software Foundation, Inc.          *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
@@ -36,6 +36,8 @@
    GNAT Run Time Library */
 
 #ifdef __vxworks
+#include "ioLib.h"
+#include "selectLib.h"
 #include "vxWorks.h"
 #endif
 #ifdef IN_RTS
@@ -142,18 +144,18 @@
 */
 
 #if defined(WINNT) || defined (MSDOS) || defined (__EMX__)
-const char *mode_read_text = "rt";
-const char *mode_write_text = "wt";
-const char *mode_append_text = "at";
-const char *mode_read_binary = "rb";
-const char *mode_write_binary = "wb";
-const char *mode_append_binary = "ab";
-const char *mode_read_text_plus = "r+t";
-const char *mode_write_text_plus = "w+t";
-const char *mode_append_text_plus = "a+t";
-const char *mode_read_binary_plus = "r+b";
-const char *mode_write_binary_plus = "w+b";
-const char *mode_append_binary_plus = "a+b";
+static const char *mode_read_text = "rt";
+static const char *mode_write_text = "wt";
+static const char *mode_append_text = "at";
+static const char *mode_read_binary = "rb";
+static const char *mode_write_binary = "wb";
+static const char *mode_append_binary = "ab";
+static const char *mode_read_text_plus = "r+t";
+static const char *mode_write_text_plus = "w+t";
+static const char *mode_append_text_plus = "a+t";
+static const char *mode_read_binary_plus = "r+b";
+static const char *mode_write_binary_plus = "w+b";
+static const char *mode_append_binary_plus = "a+b";
 const char __gnat_text_translation_required = 1;
 
 void
@@ -247,18 +249,18 @@ static void winflush_nt ()
 
 #else
 
-const char *mode_read_text = "r";
-const char *mode_write_text = "w";
-const char *mode_append_text = "a";
-const char *mode_read_binary = "r";
-const char *mode_write_binary = "w";
-const char *mode_append_binary = "a";
-const char *mode_read_text_plus = "r+";
-const char *mode_write_text_plus = "w+";
-const char *mode_append_text_plus = "a+";
-const char *mode_read_binary_plus = "r+";
-const char *mode_write_binary_plus = "w+";
-const char *mode_append_binary_plus = "a+";
+static const char *mode_read_text = "r";
+static const char *mode_write_text = "w";
+static const char *mode_append_text = "a";
+static const char *mode_read_binary = "r";
+static const char *mode_write_binary = "w";
+static const char *mode_append_binary = "a";
+static const char *mode_read_text_plus = "r+";
+static const char *mode_write_text_plus = "w+";
+static const char *mode_append_text_plus = "a+";
+static const char *mode_read_binary_plus = "r+";
+static const char *mode_write_binary_plus = "w+";
+static const char *mode_append_binary_plus = "a+";
 const char __gnat_text_translation_required = 0;
 
 /* These functions do nothing in non-DOS systems. */
@@ -292,7 +294,8 @@ __gnat_ttyname (filedes)
 
 #if defined (linux) || defined (sun) || defined (sgi) || defined (__EMX__) \
   || (defined (__osf__) && ! defined (__alpha_vxworks)) || defined (WINNT) \
-  || defined (__MACHTEN__)
+  || defined (__MACHTEN__) || defined (hpux) || defined (_AIX) \
+  || (defined (__svr4__) && defined (i386)) || defined (__Lynx__)
 #include <termios.h>
 
 #else
@@ -347,7 +350,9 @@ getc_immediate_common (stream, ch, end_of_file, avail, waiting)
 {
 #if defined (linux) || defined (sun) || defined (sgi) || defined (__EMX__) \
     || (defined (__osf__) && ! defined (__alpha_vxworks)) \
-    || defined (__CYGWIN32__) || defined (__MACHTEN__)
+    || defined (__CYGWIN32__) || defined (__MACHTEN__) || defined (hpux) \
+    || defined (_AIX) || (defined (__svr4__) && defined (i386)) \
+    || defined (__Lynx__)
   char c;
   int nread;
   int good_one = 0;
@@ -359,34 +364,37 @@ getc_immediate_common (stream, ch, end_of_file, avail, waiting)
     {
       tcgetattr (fd, &termios_rec);
       memcpy (&otermios_rec, &termios_rec, sizeof (struct termios));
-      while (! good_one)
-        {
-          /* Set RAW mode */
-          termios_rec.c_lflag = termios_rec.c_lflag & ~ICANON;
-#if defined(sgi) || defined (sun) || defined (__EMX__) || defined (__osf__) \
-      || defined (linux) || defined (__MACHTEN__)
-          eof_ch = termios_rec.c_cc[VEOF];
-
-          /* If waiting (i.e. Get_Immediate (Char)), set MIN = 1 and wait for
-             a character forever. This doesn't seem to effect Ctrl-Z or
-             Ctrl-C processing except on OS/2 where Ctrl-C won't work right
-             unless we do a read loop. Luckily we can delay a bit between
-             iterations. If not waiting (i.e. Get_Immediate (Char, Available)),
-             don't wait for anything but timeout immediately. */
+
+      /* Set RAW mode, with no echo */
+      termios_rec.c_lflag = termios_rec.c_lflag & ~ICANON & ~ECHO;
+
+#if defined(linux) || defined (sun) || defined (sgi) || defined (__EMX__) \
+    || defined (__osf__) || defined (__MACHTEN__) || defined (hpux) \
+    || defined (_AIX) || (defined (__svr4__) && defined (i386)) \
+    || defined (__Lynx__)
+      eof_ch = termios_rec.c_cc[VEOF];
+
+      /* If waiting (i.e. Get_Immediate (Char)), set MIN = 1 and wait for
+         a character forever. This doesn't seem to effect Ctrl-Z or
+         Ctrl-C processing except on OS/2 where Ctrl-C won't work right
+         unless we do a read loop. Luckily we can delay a bit between
+         iterations. If not waiting (i.e. Get_Immediate (Char, Available)),
+         don't wait for anything but timeout immediately. */
 #ifdef __EMX__
-          termios_rec.c_cc[VMIN] = 0;
-          termios_rec.c_cc[VTIME] = waiting;
+      termios_rec.c_cc[VMIN] = 0;
+      termios_rec.c_cc[VTIME] = waiting;
 #else
-          termios_rec.c_cc[VMIN] = waiting;
-          termios_rec.c_cc[VTIME] = 0;
+      termios_rec.c_cc[VMIN] = waiting;
+      termios_rec.c_cc[VTIME] = 0;
 #endif
 #endif
-          tcsetattr (fd, TCSANOW, &termios_rec);
+      tcsetattr (fd, TCSANOW, &termios_rec);
 
-          /* Read() is used here instead of fread(), because fread() doesn't
+      while (! good_one)
+        {
+          /* Read is used here instead of fread, because fread doesn't
              work on Solaris5 and Sunos4 in this situation.  Maybe because we
              are mixing calls that use file descriptors and streams. */
-
           nread = read (fd, &c, 1);
           if (nread > 0)
             {
@@ -414,9 +422,7 @@ getc_immediate_common (stream, ch, end_of_file, avail, waiting)
               good_one = 1;
             }
           else
-            {
-              good_one = 0;
-            }
+	    good_one = 0;
         }
 
       tcsetattr (fd, TCSANOW, &otermios_rec);
@@ -424,8 +430,7 @@ getc_immediate_common (stream, ch, end_of_file, avail, waiting)
     }
 
   else
-#else
-#if defined (VMS)
+#elif defined (VMS)
   int fd = fileno (stream);
 
   if (isatty (fd))
@@ -435,6 +440,7 @@ getc_immediate_common (stream, ch, end_of_file, avail, waiting)
 	  decc$bsd_initscr ();
 	  initted = 1;
 	}
+
       decc$bsd_cbreak ();
       *ch = decc$bsd_wgetch (decc$ga_stdscr);
 
@@ -447,8 +453,7 @@ getc_immediate_common (stream, ch, end_of_file, avail, waiting)
       decc$bsd_nocbreak ();
     }
   else
-#else
-#if defined (__MINGW32__)
+#elif defined (__MINGW32__)
   int fd = fileno (stream);
   int char_waiting;
   int eot_ch = 4; /* Ctrl-D */
@@ -457,8 +462,8 @@ getc_immediate_common (stream, ch, end_of_file, avail, waiting)
     {
       if (waiting)
 	{
-	  *ch = getch();
-	  (*winflush_function)();
+	  *ch = getch ();
+	  (*winflush_function) ();
 
 	  if (*ch == eot_ch)
 	    *end_of_file = 1;
@@ -474,8 +479,8 @@ getc_immediate_common (stream, ch, end_of_file, avail, waiting)
 	  if (char_waiting == 1)
 	    {
 	      *avail = 1;
-	      *ch = getch();
-	      (*winflush_function)();
+	      *ch = getch ();
+	      (*winflush_function) ();
 
 	      if (*ch == eot_ch)
 		*end_of_file = 1;
@@ -490,13 +495,94 @@ getc_immediate_common (stream, ch, end_of_file, avail, waiting)
 	}
     }
   else
-#endif
-#endif
+#elif defined (__vxworks)
+  /* Bit masks of file descriptors to read from.  */
+  struct fd_set readFds;
+  /* Timeout before select returns if nothing can be read.  */ 
+  struct timeval timeOut;
+  char c;
+  int fd = fileno (stream);
+  int nread;
+  int option;
+  int readable;
+  int status;
+  int width;
+
+  if (isatty (fd)) 
+    {
+      /* If we do not want to wait, we have to set up fd in RAW mode. This
+	 should be done outside this function as setting fd in RAW mode under
+	 vxWorks flushes the buffer of fd. If the RAW mode was set here, the
+	 buffer would be empty and we would always return that no character
+	 is available */
+      if (! waiting) 
+	{
+	  /* Initialization of timeOut for its use with select.  */
+	  timeOut.tv_sec  = 0;
+	  timeOut.tv_usec = 0;
+
+	  /* Initialization of readFds for its use with select;
+	     FD is the only file descriptor to be monitored */
+	  FD_ZERO (&readFds);
+	  FD_SET (fd, &readFds);
+	  width = 2;
+
+	  /* We do all this processing to emulate a non blocking read.  */
+	  readable = select (width, &readFds, NULL, NULL, &timeOut);
+	  if (readable == ERROR)
+	    *avail = -1, *end_of_file = -1;
+	  /* No character available in input.  */
+	  else if (readable == 0)
+	    *avail = 0, *end_of_file = 0;
+	  else
+	    {
+	      nread = read (fd, &c, 1);
+	      if (nread > 0) 
+		*avail = 1, *end_of_file = 0;
+	      /* End Of File. */
+	      else if (nread == 0) 
+		*avail = 0, *end_of_file = 1;
+	      /* Error.  */
+	      else 
+		*avail = -1, *end_of_file = -1;
+	    }   
+	}
+
+      /* We have to wait until we get a character */
+      else 
+	{
+	  *avail = -1;
+	  *end_of_file = -1;
+
+	  /* Save the current mode of FD.  */
+	  option = ioctl (fd, FIOGETOPTIONS, 0);
+
+	  /* Set FD in RAW mode.  */
+	  status = ioctl (fd, FIOSETOPTIONS, OPT_RAW);
+	  if (status != -1) 
+	    {
+	      nread = read (fd, &c, 1);
+	      if (nread > 0) 
+		*avail = 1, *end_of_file = 0;
+	      /* End of file.  */
+	      else if (nread == 0) 
+		*avail = 0, *end_of_file = 1;
+	      /* Else there is an ERROR.  */
+	    }
+
+	  /* Revert FD to its previous mode. */
+	  status = ioctl (fd, FIOSETOPTIONS, option);
+	}
+
+      *ch = c;
+    }
+  else
 #endif
     {
       /* If we're not on a terminal, then we don't need any fancy processing.
 	 Also this is the only thing that's left if we're not on one of the
-	 supported systems. */
+	 supported systems; which means that for non supported systems,
+         get_immediate may wait for a carriage return on terminals. */
       *ch = fgetc (stream);
       if (feof (stream))
         {
@@ -584,7 +670,7 @@ extern void (*Unlock_Task) PARAMS ((void));
    provide localtime_r, but in the library libc_r which doesn't get included
    systematically, so we can't use it. */
 
-exrern void struct tm *__gnat_localtime_r PARAMS ((const time_t *,
+extern void struct tm *__gnat_localtime_r PARAMS ((const time_t *,
 						   struct tm *));
 
 struct tm *