* 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, 40 insertions, 40 deletions

diff --git a/gcc/ada/gnatbl.c b/gcc/ada/gnatbl.c
index 18529a272b7..f1810582127 100644
--- a/gcc/ada/gnatbl.c
+++ b/gcc/ada/gnatbl.c
@@ -6,7 +6,7 @@
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *                             $Revision: 1.65 $
+ *                             $Revision$
  *                                                                          *
  *          Copyright (C) 1992-2001 Free Software Foundation, Inc.          *
  *                                                                          *
@@ -89,7 +89,7 @@ addarg (str)
 	= (char **) xcalloc (link_arg_max + 1000, sizeof (char *));
 
       for (i = 0; i <= link_arg_max; i++)
-	new_link_args [i] = link_args [i];
+	new_link_args[i] = link_args[i];
 
       if (link_args)
 	free (link_args);
@@ -98,7 +98,7 @@ addarg (str)
       link_args = new_link_args;
     }
 
-  link_args [link_arg_index] = str;
+  link_args[link_arg_index] = str;
 }
 
 static void
@@ -124,24 +124,24 @@ process_args (p_argc, argv)
 	}
 
       /* -B is passed on to gcc */
-      if (! strncmp (argv [i], "-B", 2))
+      if (! strncmp (argv[i], "-B", 2))
 	gcc_B_arg = argv[i];
 
       /* -v turns on verbose option here and is passed on to gcc */
 
-      if (! strcmp (argv [i], "-v"))
+      if (! strcmp (argv[i], "-v"))
 	verbose = 1;
 
-      if (! strcmp (argv [i], "-o"))
+      if (! strcmp (argv[i], "-o"))
 	{
 	  o_present = 1;
-	  exec_file_name = argv [i + 1];
+	  exec_file_name = argv[i + 1];
 	}
 
-      if (! strcmp (argv [i], "-g"))
+      if (! strcmp (argv[i], "-g"))
 	g_present = 1;
 
-      if (! strcmp (argv [i], "-gnatbind"))
+      if (! strcmp (argv[i], "-gnatbind"))
 	{
 	  /* Explicit naming of binder.  Grab the value then remove the
 	     two arguments from the argument list. */
@@ -151,52 +151,52 @@ process_args (p_argc, argv)
 	      exit (1);
 	    }
 
-	  binder_path = __gnat_locate_exec (argv [i + 1], (char *) ".");
+	  binder_path = __gnat_locate_exec (argv[i + 1], (char *) ".");
 	  if (!binder_path)
 	    {
-	      fprintf (stderr, "Could not locate binder: %s\n", argv [i + 1]);
+	      fprintf (stderr, "Could not locate binder: %s\n", argv[i + 1]);
 	      exit (1);
 	    }
 
 	  for (j = i + 2; j < *p_argc; j++)
-	    argv [j - 2] = argv [j];
+	    argv[j - 2] = argv[j];
 
 	  (*p_argc) -= 2;
 	  i--;
 	}
 
-    else if (! strcmp (argv [i], "-linkonly"))
+    else if (! strcmp (argv[i], "-linkonly"))
       {
 	/* Don't call the binder. Set the flag and then remove the
 	   argument from the argument list. */
 	linkonly = 1;
 	for (j = i + 1; j < *p_argc; j++)
-	  argv [j - 1] = argv [j];
+	  argv[j - 1] = argv[j];
 
-	(*p_argc) -= 1;
+	*p_argc -= 1;
 	i--;
       }
 
-    else if (! strcmp (argv [i], "-gnatlink"))
+    else if (! strcmp (argv[i], "-gnatlink"))
       {
 	/* Explicit naming of binder.  Grab the value then remove the
 	   two arguments from the argument list. */
 	if (i + 1 >= *p_argc)
-	{
-	  fprintf (stderr, "Missing argument for -gnatlink\n");
-	  exit (1);
-	}
+	  {
+	    fprintf (stderr, "Missing argument for -gnatlink\n");
+	    exit (1);
+	  }
 
-	linker_path = __gnat_locate_exec (argv [i + 1], (char *) ".");
+	linker_path = __gnat_locate_exec (argv[i + 1], (char *) ".");
 	if (!linker_path)
 	  {
-	    fprintf (stderr, "Could not locate linker: %s\n", argv [i + 1]);
+	    fprintf (stderr, "Could not locate linker: %s\n", argv[i + 1]);
 	    exit (1);
 	  }
 
 	for (j = i + 2; j < *p_argc; j++)
-	  argv [j - 2] = argv [j];
-	(*p_argc) -= 2;
+	  argv[j - 2] = argv[j];
+	*p_argc -= 2;
 	i--;
       }
     }
@@ -214,11 +214,11 @@ main (argc, argv)
 #ifdef VMS
   /* Warning: getenv only retrieves the first directory in VAXC$PATH */
   char *pathval =
-    strdup (__gnat_to_canonical_dir_spec (getenv ("VAXC$PATH"), 0));
+    xstrdup (__gnat_to_canonical_dir_spec (getenv ("VAXC$PATH"), 0));
 #else
   char *pathval = getenv ("PATH");
 #endif
-  char *spawn_args [5];
+  char *spawn_args[5];
   int  spawn_index = 0;
 
 #if defined (__EMX__) || defined(MSDOS)
@@ -290,9 +290,9 @@ main (argc, argv)
 
   for (i = 1; i < argc; i++)
     {
-      int arg_len = strlen (argv [i]);
+      int arg_len = strlen (argv[i]);
 
-      if (arg_len > 4 && ! strcmp (&argv [i][arg_len - 4], ".ali"))
+      if (arg_len > 4 && ! strcmp (&argv[i][arg_len - 4], ".ali"))
 	{
 	  if (done_an_ali)
 	    {
@@ -303,24 +303,24 @@ main (argc, argv)
 
 	  done_an_ali = 1;
 
-	  if (__gnat_is_regular_file (argv [i]))
+	  if (__gnat_is_regular_file (argv[i]))
 	    {
 	      ali_file_name = argv[i];
 	      if (!linkonly)
 		{
 		  /* Run gnatbind */
 		  spawn_index = 0;
-		  spawn_args [spawn_index++] = binder_path;
-		  spawn_args [spawn_index++] = ali_file_name;
+		  spawn_args[spawn_index++] = binder_path;
+		  spawn_args[spawn_index++] = ali_file_name;
 		  for (j = 0 ; j <= bind_arg_index ; j++ )
-		    spawn_args [spawn_index++] = bind_args [j];
-		  spawn_args [spawn_index] = 0;
+		    spawn_args[spawn_index++] = bind_args[j];
+		  spawn_args[spawn_index] = 0;
 
 		  if (verbose)
 		    {
 		      int i;
 		      for (i = 0; i < 2; i++)
-			printf ("%s ", spawn_args [i]);
+			printf ("%s ", spawn_args[i]);
 
 		      putchar ('\n');
 		    }
@@ -331,19 +331,19 @@ main (argc, argv)
 		}
 	    }
 	  else 
-	    addarg (argv [i]);
+	    addarg (argv[i]);
 	}
 #ifdef MSDOS
-      else if (!strcmp (argv [i], "-o"))
+      else if (!strcmp (argv[i], "-o"))
 	{
-	  addarg (argv [i]);
+	  addarg (argv[i]);
 	  if (i < argc)
 	    i++;
 
 	  {
 	    char *ptr = strstr (argv[i], ".exe");
 
-	    arg_len = strlen (argv [i]);
+	    arg_len = strlen (argv[i]);
 	    coff2exe_args[1] = malloc (arg_len + 1);
 	    strcpy (coff2exe_args[1], argv[i]);
 	    if (ptr != NULL && strlen (ptr) == 4)
@@ -354,7 +354,7 @@ main (argc, argv)
 	}
 #endif
       else
-	addarg (argv [i]);
+	addarg (argv[i]);
     }
 
   if (! done_an_ali)
@@ -371,7 +371,7 @@ main (argc, argv)
       int i;
 
       for (i = 0; i < link_arg_index; i++)
-	printf ("%s ", link_args [i]);
+	printf ("%s ", link_args[i]);
 
       putchar ('\n');
     }