41intnam.ads, [...]: Merge in ACT changes.

	* 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]

From-SVN: r50451

1 files changed, 75 insertions, 38 deletions

diff --git a/gcc/ada/gnatdll.adb b/gcc/ada/gnatdll.adb
index fbeb470..5fba394 100644
--- a/gcc/ada/gnatdll.adb
+++ b/gcc/ada/gnatdll.adb
@@ -8,7 +8,7 @@
 --                                                                          --
 --                            $Revision$
 --                                                                          --
---          Copyright (C) 1997-2001, Free Software Foundation, Inc.         --
+--          Copyright (C) 1997-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- --
@@ -37,8 +37,8 @@ with GNAT.OS_Lib;
 with GNAT.Command_Line;
 with Gnatvsn;
 
-with MDLL.Files;
-with MDLL.Tools;
+with MDLL.Fil;
+with MDLL.Utl;
 
 procedure Gnatdll is
 
@@ -62,11 +62,15 @@ procedure Gnatdll is
    --  Check the context before runing any commands to build the library
 
    Syntax_Error  : exception;
+   --  Raised when a syntax error is detected, in this case a usage info will
+   --  be displayed.
+
    Context_Error : exception;
-   --  What are these for ???
+   --  Raised when some files (specifed on the command line) are missing to
+   --  build the DLL.
 
    Help : Boolean := False;
-   --  What is this for ???
+   --  Help will be set to True the usage information is to be displayed.
 
    Version : constant String := Gnatvsn.Gnat_Version_String;
    --  Why should it be necessary to make a copy of this
@@ -75,11 +79,17 @@ procedure Gnatdll is
    --  Default address for non relocatable DLL (Win32)
 
    Lib_Filename        : Unbounded_String := Null_Unbounded_String;
+   --  The DLL filename that will be created (.dll)
+
    Def_Filename        : Unbounded_String := Null_Unbounded_String;
+   --  The definition filename (.def)
+
    List_Filename       : Unbounded_String := Null_Unbounded_String;
+   --  The name of the file containing the objects file to put into the DLL
+
    DLL_Address         : Unbounded_String :=
                            To_Unbounded_String (Default_DLL_Address);
-   --  What are the above ???
+   --  The DLL's base address
 
    Objects_Files : Argument_List_Access := Null_Argument_List_Access;
    --  List of objects to put inside the library
@@ -95,13 +105,18 @@ procedure Gnatdll is
    Bargs_Options : Argument_List_Access := Null_Argument_List_Access;
    --  GNAT linker and binder args options
 
-   type Build_Mode_State is (Import_Lib, Dynamic_Lib, Nil);
-   --  Comments needed ???
+   type Build_Mode_State is (Import_Lib, Dynamic_Lib, Dynamic_Lib_Only, Nil);
+   --  Import_Lib means only the .a file will be created, Dynamic_Lib means
+   --  that both the DLL and the import library will be created.
+   --  Dynamic_Lib_Only means that only the DLL will be created (no import
+   --  library).
 
    Build_Mode             : Build_Mode_State := Nil;
+   --  Will be set when parsing the command line.
+
    Must_Build_Relocatable : Boolean := True;
-   Build_Import           : Boolean := True;
-   --  Comments needed
+   --  True means build a relocatable DLL, will be set to False if a
+   --  non-relocatable DLL must be built.
 
    ------------
    -- Syntax --
@@ -130,6 +145,8 @@ procedure Gnatdll is
       P ("   -e file       Definition file containing exports");
       P ("   -d file       Put objects in the relocatable dynamic "
          & "library <file>");
+      P ("   -b addr       Set base address for the relocatable DLL");
+      P ("                 default address is " & Default_DLL_Address);
       P ("   -a[addr]      Build non-relocatable DLL at address <addr>");
       P ("                 if <addr> is not specified use "
          & Default_DLL_Address);
@@ -159,16 +176,12 @@ procedure Gnatdll is
       use GNAT.Command_Line;
 
       procedure Add_File (Filename : in String);
-      --  add one file to the list of file to handle
+      --  Add one file to the list of file to handle
 
       procedure Add_Files_From_List (List_Filename : in String);
-      --  add the files listed in List_Filename (one by line) to the list
+      --  Add the files listed in List_Filename (one by line) to the list
       --  of file to handle
 
-      procedure Ali_To_Object_List;
-      --  for each ali file in Afiles set put a corresponding object file in
-      --  Ofiles set.
-
       Max_Files   : constant := 5_000;
       Max_Options : constant :=   100;
       --  These are arbitrary limits, a better way will be to use linked list.
@@ -196,16 +209,16 @@ procedure Gnatdll is
       B      : Positive := Bopts'First;
       --  A list of -bargs options (B is next entry to be used)
 
+      Build_Import : Boolean := True;
+      --  Set to Fals if option -n if specified (no-import).
+
       --------------
       -- Add_File --
       --------------
 
       procedure Add_File (Filename : in String) is
       begin
-         --  others files are to be put inside the dynamic library
-         --  ??? this makes no sense, should it be "Other files ..."
-
-         if Files.Is_Ali (Filename) then
+         if Fil.Is_Ali (Filename) then
 
             Check (Filename);
 
@@ -215,7 +228,7 @@ procedure Gnatdll is
             Afiles (A) := new String'(Filename);
             A := A + 1;
 
-         elsif Files.Is_Obj (Filename) then
+         elsif Fil.Is_Obj (Filename) then
 
             Check (Filename);
 
@@ -253,18 +266,6 @@ procedure Gnatdll is
          Text_IO.Close (File);
       end Add_Files_From_List;
 
-      ------------------------
-      -- Ali_To_Object_List --
-      ------------------------
-
-      procedure Ali_To_Object_List is
-      begin
-         for K in 1 .. A - 1 loop
-            Ofiles (O) := new String'(Files.Ext_To (Afiles (K).all, "o"));
-            O := O + 1;
-         end loop;
-      end Ali_To_Object_List;
-
    --  Start of processing for Parse_Command_Line
 
    begin
@@ -273,7 +274,7 @@ procedure Gnatdll is
       --  scan gnatdll switches
 
       loop
-         case Getopt ("g h v q k a? d: e: l: n I:") is
+         case Getopt ("g h v q k a? b: d: e: l: n I:") is
 
             when ASCII.Nul =>
                exit;
@@ -326,6 +327,12 @@ procedure Gnatdll is
 
                Must_Build_Relocatable := False;
 
+            when 'b' =>
+
+               DLL_Address := To_Unbounded_String (Parameter);
+
+               Must_Build_Relocatable := True;
+
             when 'e' =>
 
                Def_Filename := To_Unbounded_String (Parameter);
@@ -338,7 +345,7 @@ procedure Gnatdll is
 
                if Def_Filename = Null_Unbounded_String then
                   Def_Filename := To_Unbounded_String
-                    (Files.Ext_To (Parameter, "def"));
+                    (Fil.Ext_To (Parameter, "def"));
                end if;
 
                Build_Mode := Dynamic_Lib;
@@ -419,6 +426,17 @@ procedure Gnatdll is
             "nothing to do.");
       end if;
 
+      --  -n option but no file specified
+
+      if not Build_Import
+        and then A = Afiles'First
+        and then O = Ofiles'First
+      then
+         Exceptions.Raise_Exception
+           (Syntax_Error'Identity,
+            "-n specified but there are no objects to build the library.");
+      end if;
+
       --  Check if we want to build an import library (option -e and
       --  no file specified)
 
@@ -429,6 +447,12 @@ procedure Gnatdll is
          Build_Mode := Import_Lib;
       end if;
 
+      --  Check if only a dynamic library must be built.
+
+      if Build_Mode = Dynamic_Lib and then not Build_Import then
+         Build_Mode := Dynamic_Lib_Only;
+      end if;
+
       if O /= Ofiles'First then
          Objects_Files := new OS_Lib.Argument_List'(Ofiles (1 .. O - 1));
       end if;
@@ -495,7 +519,7 @@ begin
       Text_IO.New_Line;
    end if;
 
-   MDLL.Tools.Locate;
+   MDLL.Utl.Locate;
 
    if Help
      or else (MDLL.Verbose and then Ada.Command_Line.Argument_Count = 1)
@@ -521,8 +545,21 @@ begin
                To_String (Lib_Filename),
                To_String (Def_Filename),
                To_String (DLL_Address),
-               Build_Import,
-               Must_Build_Relocatable);
+               Build_Import => True,
+               Relocatable  => Must_Build_Relocatable);
+
+         when Dynamic_Lib_Only =>
+            MDLL.Build_Dynamic_Library
+              (Objects_Files.all,
+               Ali_Files.all,
+               Options.all,
+               Bargs_Options.all,
+               Largs_Options.all,
+               To_String (Lib_Filename),
+               To_String (Def_Filename),
+               To_String (DLL_Address),
+               Build_Import => False,
+               Relocatable  => Must_Build_Relocatable);
 
          when Nil =>
             null;