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

diff --git a/gcc/ada/mdll-utl.adb b/gcc/ada/mdll-utl.adb
new file mode 100644
index 00000000000..75488ccf278
--- /dev/null
+++ b/gcc/ada/mdll-utl.adb
@@ -0,0 +1,336 @@
+------------------------------------------------------------------------------
+--                                                                          --
+--                         GNAT COMPILER COMPONENTS                         --
+--                                                                          --
+--                            M D L L . T O O L S                           --
+--                                                                          --
+--                                 B o d y                                  --
+--                                                                          --
+--                            $Revision$
+--                                                                          --
+--          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- --
+-- ware  Foundation;  either version 2,  or (at your option) any later ver- --
+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+-- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
+-- for  more details.  You should have  received  a copy of the GNU General --
+-- Public License  distributed with GNAT;  see file COPYING.  If not, write --
+-- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
+-- MA 02111-1307, USA.                                                      --
+--                                                                          --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- It is now maintained by Ada Core Technologies Inc (http://www.gnat.com). --
+--                                                                          --
+------------------------------------------------------------------------------
+
+--  Interface to externals tools used to build DLL and import libraries
+
+with Ada.Text_IO;
+with Ada.Exceptions;
+
+with Sdefault;
+
+package body MDLL.Utl is
+
+   use Ada;
+   use GNAT;
+
+   Dlltool_Name  : constant String := "dlltool";
+   Dlltool_Exec  : OS_Lib.String_Access;
+
+   Gcc_Name      : constant String := "gcc";
+   Gcc_Exec      : OS_Lib.String_Access;
+
+   Gnatbind_Name : constant String := "gnatbind";
+   Gnatbind_Exec : OS_Lib.String_Access;
+
+   Gnatlink_Name : constant String := "gnatlink";
+   Gnatlink_Exec : OS_Lib.String_Access;
+
+   procedure Print_Command
+     (Tool_Name : String;
+      Arguments : OS_Lib.Argument_List);
+   --  display the command runned when in Verbose mode
+
+   -------------------
+   -- Print_Command --
+   -------------------
+
+   procedure Print_Command
+     (Tool_Name : String;
+      Arguments : OS_Lib.Argument_List)
+   is
+   begin
+      if Verbose then
+         Text_IO.Put (Tool_Name);
+         for K in Arguments'Range loop
+            Text_IO.Put (" " & Arguments (K).all);
+         end loop;
+         Text_IO.New_Line;
+      end if;
+   end Print_Command;
+
+   -------------
+   -- Dlltool --
+   -------------
+
+   procedure Dlltool
+     (Def_Filename : String;
+      DLL_Name     : String;
+      Library      : String;
+      Exp_Table    : String := "";
+      Base_File    : String := "";
+      Build_Import : Boolean)
+   is
+      Arguments  : OS_Lib.Argument_List (1 .. 11);
+      A          : Positive;
+
+      Success    : Boolean;
+
+      Def_Opt    : aliased String := "--def";
+      Def_V      : aliased String := Def_Filename;
+      Dll_Opt    : aliased String := "--dllname";
+      Dll_V      : aliased String := DLL_Name;
+      Lib_Opt    : aliased String := "--output-lib";
+      Lib_V      : aliased String := Library;
+      Exp_Opt    : aliased String := "--output-exp";
+      Exp_V      : aliased String := Exp_Table;
+      Bas_Opt    : aliased String := "--base-file";
+      Bas_V      : aliased String := Base_File;
+      No_Suf_Opt : aliased String := "-k";
+   begin
+      Arguments (1 .. 4) := (1 => Def_Opt'Unchecked_Access,
+                             2 => Def_V'Unchecked_Access,
+                             3 => Dll_Opt'Unchecked_Access,
+                             4 => Dll_V'Unchecked_Access);
+      A := 4;
+
+      if Kill_Suffix then
+         A := A + 1;
+         Arguments (A) := No_Suf_Opt'Unchecked_Access;
+      end if;
+
+      if Library /= "" and then Build_Import then
+         A := A + 1;
+         Arguments (A) := Lib_Opt'Unchecked_Access;
+         A := A + 1;
+         Arguments (A) := Lib_V'Unchecked_Access;
+      end if;
+
+      if Exp_Table /= "" then
+         A := A + 1;
+         Arguments (A) := Exp_Opt'Unchecked_Access;
+         A := A + 1;
+         Arguments (A) := Exp_V'Unchecked_Access;
+      end if;
+
+      if Base_File /= "" then
+         A := A + 1;
+         Arguments (A) := Bas_Opt'Unchecked_Access;
+         A := A + 1;
+         Arguments (A) := Bas_V'Unchecked_Access;
+      end if;
+
+      Print_Command ("dlltool", Arguments (1 .. A));
+
+      OS_Lib.Spawn (Dlltool_Exec.all, Arguments (1 .. A), Success);
+
+      if not Success then
+         Exceptions.Raise_Exception (Tools_Error'Identity,
+                                     Dlltool_Name & " execution error.");
+      end if;
+
+   end Dlltool;
+
+   ---------
+   -- Gcc --
+   ---------
+
+   procedure Gcc
+     (Output_File : String;
+      Files       : Argument_List;
+      Options     : Argument_List;
+      Base_File   : String := "";
+      Build_Lib   : Boolean := False)
+   is
+      use Sdefault;
+
+      Arguments : OS_Lib.Argument_List
+        (1 .. 5 + Files'Length + Options'Length);
+      A         : Natural := 0;
+
+      Success   : Boolean;
+      C_Opt     : aliased String := "-c";
+      Out_Opt   : aliased String := "-o";
+      Out_V     : aliased String := Output_File;
+      Bas_Opt   : aliased String := "-Wl,--base-file," & Base_File;
+      Lib_Opt   : aliased String := "-mdll";
+      Lib_Dir   : aliased String := "-L" & Object_Dir_Default_Name.all;
+
+   begin
+      A := A + 1;
+      if Build_Lib then
+         Arguments (A) := Lib_Opt'Unchecked_Access;
+      else
+         Arguments (A) := C_Opt'Unchecked_Access;
+      end if;
+
+      A := A + 1;
+      Arguments (A .. A + 2) := (Out_Opt'Unchecked_Access,
+                                 Out_V'Unchecked_Access,
+                                 Lib_Dir'Unchecked_Access);
+      A := A + 2;
+
+      if Base_File /= "" then
+         A := A + 1;
+         Arguments (A) := Bas_Opt'Unchecked_Access;
+      end if;
+
+      A := A + 1;
+      Arguments (A .. A + Files'Length - 1) := Files;
+      A := A + Files'Length - 1;
+
+      if Build_Lib then
+         A := A + 1;
+         Arguments (A .. A + Options'Length - 1) := Options;
+         A := A + Options'Length - 1;
+      else
+         declare
+            Largs : Argument_List (Options'Range);
+            L     : Natural := Largs'First - 1;
+         begin
+            for K in Options'Range loop
+               if Options (K) (1 .. 2) /= "-l" then
+                  L := L + 1;
+                  Largs (L) := Options (K);
+               end if;
+            end loop;
+            A := A + 1;
+            Arguments (A .. A + L - 1) := Largs (1 .. L);
+            A := A + L - 1;
+         end;
+      end if;
+
+      Print_Command ("gcc", Arguments (1 .. A));
+
+      OS_Lib.Spawn (Gcc_Exec.all, Arguments (1 .. A), Success);
+
+      if not Success then
+         Exceptions.Raise_Exception (Tools_Error'Identity,
+                                     Gcc_Name & " execution error.");
+      end if;
+   end Gcc;
+
+   --------------
+   -- Gnatbind --
+   --------------
+
+   procedure Gnatbind
+     (Alis : Argument_List;
+      Args : Argument_List := Null_Argument_List)
+   is
+      Arguments   : OS_Lib.Argument_List (1 .. 1 + Alis'Length + Args'Length);
+      Success     : Boolean;
+
+      No_Main_Opt : aliased String := "-n";
+
+   begin
+      Arguments (1) := No_Main_Opt'Unchecked_Access;
+      Arguments (2 .. 1 + Alis'Length) := Alis;
+      Arguments (2 + Alis'Length .. Arguments'Last) := Args;
+
+      Print_Command ("gnatbind", Arguments);
+
+      OS_Lib.Spawn (Gnatbind_Exec.all, Arguments, Success);
+
+      if not Success then
+         Exceptions.Raise_Exception (Tools_Error'Identity,
+                                     Gnatbind_Name & " execution error.");
+      end if;
+   end Gnatbind;
+
+   --------------
+   -- Gnatlink --
+   --------------
+
+   procedure Gnatlink
+     (Ali  : String;
+      Args : Argument_List := Null_Argument_List)
+   is
+      Arguments : OS_Lib.Argument_List (1 .. 1 + Args'Length);
+      Success   : Boolean;
+
+      Ali_Name  : aliased String := Ali;
+
+   begin
+      Arguments (1) := Ali_Name'Unchecked_Access;
+      Arguments (2 .. Arguments'Last) := Args;
+
+      Print_Command ("gnatlink", Arguments);
+
+      OS_Lib.Spawn (Gnatlink_Exec.all, Arguments, Success);
+
+      if not Success then
+         Exceptions.Raise_Exception (Tools_Error'Identity,
+                                     Gnatlink_Name & " execution error.");
+      end if;
+   end Gnatlink;
+
+   ------------
+   -- Locate --
+   ------------
+
+   procedure Locate is
+      use type OS_Lib.String_Access;
+   begin
+      --  dlltool
+
+      Dlltool_Exec := OS_Lib.Locate_Exec_On_Path (Dlltool_Name);
+
+      if Dlltool_Exec = null then
+         Exceptions.Raise_Exception (Tools_Error'Identity,
+                                     Dlltool_Name & " not found in path");
+      elsif Verbose then
+         Text_IO.Put_Line ("using " & Dlltool_Exec.all);
+      end if;
+
+      --  gcc
+
+      Gcc_Exec     := OS_Lib.Locate_Exec_On_Path (Gcc_Name);
+
+      if Gcc_Exec = null then
+         Exceptions.Raise_Exception (Tools_Error'Identity,
+                                     Gcc_Name & " not found in path");
+      elsif Verbose then
+         Text_IO.Put_Line ("using " & Gcc_Exec.all);
+      end if;
+
+      --  gnatbind
+
+      Gnatbind_Exec     := OS_Lib.Locate_Exec_On_Path (Gnatbind_Name);
+
+      if Gnatbind_Exec = null then
+         Exceptions.Raise_Exception (Tools_Error'Identity,
+                                     Gnatbind_Name & " not found in path");
+      elsif Verbose then
+         Text_IO.Put_Line ("using " & Gnatbind_Exec.all);
+      end if;
+
+      --  gnatlink
+
+      Gnatlink_Exec     := OS_Lib.Locate_Exec_On_Path (Gnatlink_Name);
+
+      if Gnatlink_Exec = null then
+         Exceptions.Raise_Exception (Tools_Error'Identity,
+                                     Gnatlink_Name & " not found in path");
+      elsif Verbose then
+         Text_IO.Put_Line ("using " & Gnatlink_Exec.all);
+         Text_IO.New_Line;
+      end if;
+
+   end Locate;
+
+end MDLL.Utl;