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

diff --git a/gcc/ada/mdll.adb b/gcc/ada/mdll.adb
index c07768d7380..9f476b2b04d 100644
--- a/gcc/ada/mdll.adb
+++ b/gcc/ada/mdll.adb
@@ -31,8 +31,8 @@
 
 with Ada.Text_IO;
 
-with MDLL.Tools;
-with MDLL.Files;
+with MDLL.Utl;
+with MDLL.Fil;
 
 package body MDLL is
 
@@ -58,7 +58,7 @@ package body MDLL is
 
       use type OS_Lib.Argument_List;
 
-      Base_Filename : constant String := MDLL.Files.Ext_To (Lib_Filename);
+      Base_Filename : constant String := MDLL.Fil.Ext_To (Lib_Filename);
 
       Def_File : aliased String := Def_Filename;
       Jnk_File : aliased String := Base_Filename & ".jnk";
@@ -70,6 +70,7 @@ package body MDLL is
       Bas_Opt  : aliased String := "-Wl,--base-file," & Bas_File;
       Lib_Opt  : aliased String := "-mdll";
       Out_Opt  : aliased String := "-o";
+      Adr_Opt  : aliased String := "-Wl,--image-base=" & Lib_Address;
 
       All_Options : constant Argument_List := Options & Largs_Options;
 
@@ -92,12 +93,13 @@ package body MDLL is
       ---------------------
 
       procedure Build_Reloc_DLL is
-
          --  Objects plus the export table (.exp) file
 
-         Objects_Exp_File : OS_Lib.Argument_List
+         Objects_Exp_File : constant OS_Lib.Argument_List
            := Exp_File'Unchecked_Access & Ofiles;
 
+         Success : Boolean;
+
       begin
          if not Quiet then
             Text_IO.Put_Line ("building relocatable DLL...");
@@ -112,50 +114,50 @@ package body MDLL is
 
          --  1) Build base file with objects files.
 
-         Tools.Gcc (Output_File => Jnk_File,
-                    Files       => Ofiles,
-                    Options     => All_Options,
-                    Base_File   => Bas_File,
-                    Build_Lib   => True);
+         Utl.Gcc (Output_File => Jnk_File,
+                  Files       => Ofiles,
+                  Options     => All_Options,
+                  Base_File   => Bas_File,
+                  Build_Lib   => True);
 
          --  2) Build exp from base file.
 
-         Tools.Dlltool (Def_File, Dll_File, Lib_File,
-                        Base_File    => Bas_File,
-                        Exp_Table    => Exp_File,
-                        Build_Import => False);
+         Utl.Dlltool (Def_File, Dll_File, Lib_File,
+                      Base_File    => Bas_File,
+                      Exp_Table    => Exp_File,
+                      Build_Import => False);
 
          --  3) Build base file with exp file and objects files.
 
-         Tools.Gcc (Output_File => Jnk_File,
-                    Files       => Objects_Exp_File,
-                    Options     => All_Options,
-                    Base_File   => Bas_File,
-                    Build_Lib   => True);
+         Utl.Gcc (Output_File => Jnk_File,
+                  Files       => Objects_Exp_File,
+                  Options     => All_Options,
+                  Base_File   => Bas_File,
+                  Build_Lib   => True);
 
          --  4) Build new exp from base file and the lib file (.a)
 
-         Tools.Dlltool (Def_File, Dll_File, Lib_File,
-                        Base_File    => Bas_File,
-                        Exp_Table    => Exp_File,
-                        Build_Import => Build_Import);
+         Utl.Dlltool (Def_File, Dll_File, Lib_File,
+                      Base_File    => Bas_File,
+                      Exp_Table    => Exp_File,
+                      Build_Import => Build_Import);
 
          --  5) Build the dynamic library
 
-         Tools.Gcc (Output_File => Dll_File,
-                    Files       => Objects_Exp_File,
-                    Options     => All_Options,
-                    Build_Lib   => True);
+         Utl.Gcc (Output_File => Dll_File,
+                  Files       => Objects_Exp_File,
+                  Options     => Adr_Opt'Unchecked_Access & All_Options,
+                  Build_Lib   => True);
 
-         Tools.Delete_File (Exp_File);
-         Tools.Delete_File (Bas_File);
-         Tools.Delete_File (Jnk_File);
+         OS_Lib.Delete_File (Exp_File, Success);
+         OS_Lib.Delete_File (Bas_File, Success);
+         OS_Lib.Delete_File (Jnk_File, Success);
 
       exception
          when others =>
-            Tools.Delete_File (Exp_File);
-            Tools.Delete_File (Bas_File);
-            Tools.Delete_File (Jnk_File);
+            OS_Lib.Delete_File (Exp_File, Success);
+            OS_Lib.Delete_File (Bas_File, Success);
+            OS_Lib.Delete_File (Jnk_File, Success);
             raise;
       end Build_Reloc_DLL;
 
@@ -164,6 +166,7 @@ package body MDLL is
       -------------------------
 
       procedure Ada_Build_Reloc_DLL is
+         Success : Boolean;
       begin
          if not Quiet then
             Text_IO.Put_Line ("Building relocatable DLL...");
@@ -178,7 +181,7 @@ package body MDLL is
 
          --  1) Build base file with objects files.
 
-         Tools.Gnatbind (Afiles, Options & Bargs_Options);
+         Utl.Gnatbind (Afiles, Options & Bargs_Options);
 
          declare
             Params : OS_Lib.Argument_List :=
@@ -186,20 +189,19 @@ package body MDLL is
               Lib_Opt'Unchecked_Access &
               Bas_Opt'Unchecked_Access & Ofiles & All_Options;
          begin
-            Tools.Gnatlink (Afiles (Afiles'Last).all,
-                            Params);
+            Utl.Gnatlink (Afiles (Afiles'Last).all, Params);
          end;
 
          --  2) Build exp from base file.
 
-         Tools.Dlltool (Def_File, Dll_File, Lib_File,
-                        Base_File    => Bas_File,
-                        Exp_Table    => Exp_File,
-                        Build_Import => False);
+         Utl.Dlltool (Def_File, Dll_File, Lib_File,
+                      Base_File    => Bas_File,
+                      Exp_Table    => Exp_File,
+                      Build_Import => False);
 
          --  3) Build base file with exp file and objects files.
 
-         Tools.Gnatbind (Afiles, Options & Bargs_Options);
+         Utl.Gnatbind (Afiles, Options & Bargs_Options);
 
          declare
             Params : OS_Lib.Argument_List :=
@@ -210,42 +212,41 @@ package body MDLL is
               Ofiles &
               All_Options;
          begin
-            Tools.Gnatlink (Afiles (Afiles'Last).all,
-                            Params);
+            Utl.Gnatlink (Afiles (Afiles'Last).all, Params);
          end;
 
          --  4) Build new exp from base file and the lib file (.a)
 
-         Tools.Dlltool (Def_File, Dll_File, Lib_File,
-                        Base_File    => Bas_File,
-                        Exp_Table    => Exp_File,
-                        Build_Import => Build_Import);
+         Utl.Dlltool (Def_File, Dll_File, Lib_File,
+                      Base_File    => Bas_File,
+                      Exp_Table    => Exp_File,
+                      Build_Import => Build_Import);
 
          --  5) Build the dynamic library
 
-         Tools.Gnatbind (Afiles, Options & Bargs_Options);
+         Utl.Gnatbind (Afiles, Options & Bargs_Options);
 
          declare
             Params : OS_Lib.Argument_List :=
               Out_Opt'Unchecked_Access & Dll_File'Unchecked_Access &
               Lib_Opt'Unchecked_Access &
               Exp_File'Unchecked_Access &
+              Adr_Opt'Unchecked_Access &
               Ofiles &
               All_Options;
          begin
-            Tools.Gnatlink (Afiles (Afiles'Last).all,
-                            Params);
+            Utl.Gnatlink (Afiles (Afiles'Last).all, Params);
          end;
 
-         Tools.Delete_File (Exp_File);
-         Tools.Delete_File (Bas_File);
-         Tools.Delete_File (Jnk_File);
+         OS_Lib.Delete_File (Exp_File, Success);
+         OS_Lib.Delete_File (Bas_File, Success);
+         OS_Lib.Delete_File (Jnk_File, Success);
 
       exception
          when others =>
-            Tools.Delete_File (Exp_File);
-            Tools.Delete_File (Bas_File);
-            Tools.Delete_File (Jnk_File);
+            OS_Lib.Delete_File (Exp_File, Success);
+            OS_Lib.Delete_File (Bas_File, Success);
+            OS_Lib.Delete_File (Jnk_File, Success);
             raise;
       end Ada_Build_Reloc_DLL;
 
@@ -254,6 +255,7 @@ package body MDLL is
       -------------------------
 
       procedure Build_Non_Reloc_DLL is
+         Success : Boolean;
       begin
          if not Quiet then
             Text_IO.Put_Line ("building non relocatable DLL...");
@@ -269,22 +271,22 @@ package body MDLL is
 
          --  Build exp table and the lib .a file.
 
-         Tools.Dlltool (Def_File, Dll_File, Lib_File,
-                        Exp_Table    => Exp_File,
-                        Build_Import => Build_Import);
+         Utl.Dlltool (Def_File, Dll_File, Lib_File,
+                      Exp_Table    => Exp_File,
+                      Build_Import => Build_Import);
 
          --  Build the DLL
 
-         Tools.Gcc (Output_File => Dll_File,
-                    Files       => Exp_File'Unchecked_Access & Ofiles,
-                    Options     => All_Options,
-                    Build_Lib   => True);
+         Utl.Gcc (Output_File => Dll_File,
+                  Files       => Exp_File'Unchecked_Access & Ofiles,
+                  Options     => Adr_Opt'Unchecked_Access & All_Options,
+                  Build_Lib   => True);
 
-         Tools.Delete_File (Exp_File);
+         OS_Lib.Delete_File (Exp_File, Success);
 
       exception
          when others =>
-            Tools.Delete_File (Exp_File);
+            OS_Lib.Delete_File (Exp_File, Success);
             raise;
       end Build_Non_Reloc_DLL;
 
@@ -295,6 +297,7 @@ package body MDLL is
       --  Build a non relocatable DLL with Ada code.
 
       procedure Ada_Build_Non_Reloc_DLL is
+         Success : Boolean;
       begin
          if not Quiet then
             Text_IO.Put_Line ("building non relocatable DLL...");
@@ -310,31 +313,31 @@ package body MDLL is
 
          --  Build exp table and the lib .a file.
 
-         Tools.Dlltool (Def_File, Dll_File, Lib_File,
-                        Exp_Table    => Exp_File,
-                        Build_Import => Build_Import);
+         Utl.Dlltool (Def_File, Dll_File, Lib_File,
+                      Exp_Table    => Exp_File,
+                      Build_Import => Build_Import);
 
          --  Build the DLL
 
-         Tools.Gnatbind (Afiles, Options & Bargs_Options);
+         Utl.Gnatbind (Afiles, Options & Bargs_Options);
 
          declare
             Params : OS_Lib.Argument_List :=
               Out_Opt'Unchecked_Access & Dll_File'Unchecked_Access &
               Lib_Opt'Unchecked_Access &
               Exp_File'Unchecked_Access &
+              Adr_Opt'Unchecked_Access &
               Ofiles &
               All_Options;
          begin
-            Tools.Gnatlink (Afiles (Afiles'Last).all,
-                            Params);
+            Utl.Gnatlink (Afiles (Afiles'Last).all, Params);
          end;
 
-         Tools.Delete_File (Exp_File);
+         OS_Lib.Delete_File (Exp_File, Success);
 
       exception
          when others =>
-            Tools.Delete_File (Exp_File);
+            OS_Lib.Delete_File (Exp_File, Success);
             raise;
       end Ada_Build_Non_Reloc_DLL;
 
@@ -371,7 +374,7 @@ package body MDLL is
       --  Build an import library.
       --  this is to build only a .a library to link against a DLL.
 
-      Base_Filename : constant String := MDLL.Files.Ext_To (Lib_Filename);
+      Base_Filename : constant String := MDLL.Fil.Ext_To (Lib_Filename);
 
       --------------------------
       -- Build_Import_Library --
@@ -391,8 +394,8 @@ package body MDLL is
                               " to use dynamic library " & Dll_File);
          end if;
 
-         Tools.Dlltool (Def_File, Dll_File, Lib_File,
-                        Build_Import => True);
+         Utl.Dlltool (Def_File, Dll_File, Lib_File,
+                      Build_Import => True);
       end Build_Import_Library;
 
    begin