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, 198 insertions, 140 deletions

diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb
index 5143a252f10..24a1198806a 100644
--- a/gcc/ada/gnatlink.adb
+++ b/gcc/ada/gnatlink.adb
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision: 1.1 $
+--                            $Revision$
 --                                                                          --
---          Copyright (C) 1996-2001 Free Software Foundation, Inc.          --
+--          Copyright (C) 1996-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- --
@@ -28,12 +28,17 @@
 
 --  Gnatlink usage: please consult the gnat documentation
 
+with Ada.Exceptions; use Ada.Exceptions;
+with ALI;      use ALI;
 with Gnatvsn;  use Gnatvsn;
 with Hostparm;
+with Namet;    use Namet;
 with Osint;    use Osint;
 with Output;   use Output;
+with Switch;   use Switch;
 with System;   use System;
 with Table;
+with Types;
 
 with Ada.Command_Line;     use Ada.Command_Line;
 with GNAT.OS_Lib;          use GNAT.OS_Lib;
@@ -97,6 +102,16 @@ procedure Gnatlink is
    --  file. Only application objects are collected there (see details in
    --  Linker_Objects table comments)
 
+   package Binder_Options_From_ALI is new Table.Table (
+     Table_Component_Type => String_Access,
+     Table_Index_Type     => Integer,
+     Table_Low_Bound      => 1, -- equals low bound of Argument_List for Spawn
+     Table_Initial        => 20,
+     Table_Increment      => 100,
+     Table_Name           => "Gnatlink.Binder_Options_From_ALI");
+   --  This table collects the switches from the ALI file of the main
+   --  subprogram.
+
    package Binder_Options is new Table.Table (
      Table_Component_Type => String_Access,
      Table_Index_Type     => Integer,
@@ -139,6 +154,8 @@ procedure Gnatlink is
    Ada_Bind_File : Boolean := True;
    --  Set to True if bind file is generated in Ada
 
+   Standard_Gcc  : Boolean := True;
+
    Compile_Bind_File : Boolean := True;
    --  Set to False if bind file is not to be compiled
 
@@ -250,30 +267,6 @@ procedure Gnatlink is
       Next_Arg : Integer;
 
    begin
-      Binder_Options.Increment_Last;
-      Binder_Options.Table (Binder_Options.Last) := new String'("-c");
-
-      --  If the main program is in Ada it is compiled with the following
-      --  switches:
-
-      --    -gnatA   stops reading gnat.adc, since we don't know what
-      --             pagmas would work, and we do not need it anyway.
-
-      --    -gnatWb  allows brackets coding for wide characters
-
-      --    -gnatiw  allows wide characters in identifiers. This is needed
-      --             because bindgen uses brackets encoding for all upper
-      --             half and wide characters in identifier names.
-
-      if Ada_Bind_File then
-         Binder_Options.Increment_Last;
-         Binder_Options.Table (Binder_Options.Last) := new String'("-gnatA");
-         Binder_Options.Increment_Last;
-         Binder_Options.Table (Binder_Options.Last) := new String'("-gnatWb");
-         Binder_Options.Increment_Last;
-         Binder_Options.Table (Binder_Options.Last) := new String'("-gnatiw");
-      end if;
-
       --  Loop through arguments of gnatlink command
 
       Next_Arg := 1;
@@ -288,9 +281,7 @@ procedure Gnatlink is
 
             --  We definitely need section by section comments here ???
 
-            if Arg'Length /= 0
-              and then (Arg (1) = Switch_Character or else Arg (1) = '-')
-            then
+            if Arg'Length /= 0 and then Arg (1) = '-' then
                if Arg'Length > 4
                  and then Arg (2 .. 5) =  "gnat"
                then
@@ -440,6 +431,7 @@ procedure Gnatlink is
 
                   begin
                      Gcc := new String'(Program_Args.all (1).all);
+                     Standard_Gcc := False;
 
                      --  Set appropriate flags for switches passed
 
@@ -449,10 +441,7 @@ procedure Gnatlink is
                            AF  : Integer := Arg'First;
 
                         begin
-                           if Arg'Length /= 0
-                             and then (Arg (AF) = Switch_Character
-                                        or else Arg (AF) = '-')
-                           then
+                           if Arg'Length /= 0 and then Arg (AF) = '-' then
                               if Arg (AF + 1) = 'g'
                                 and then (Arg'Length = 2
                                   or else Arg (AF + 2) in '0' .. '3'
@@ -765,131 +754,116 @@ procedure Gnatlink is
 
       if Next_Line (Nfirst .. Nlast) /= End_Info then
          loop
-            --  Add binder options only if not already set on the command
-            --  line. This rule is a way to control the linker options order.
-
-            if not Is_Option_Present
-              (Next_Line (Nfirst .. Nlast))
-            then
-               if Next_Line (Nfirst .. Nlast) = "-static" then
-                  GNAT_Static := True;
+            if Next_Line (Nfirst .. Nlast) = "-static" then
+               GNAT_Static := True;
 
-               elsif Next_Line (Nfirst .. Nlast) = "-shared" then
-                  GNAT_Shared := True;
+            elsif Next_Line (Nfirst .. Nlast) = "-shared" then
+               GNAT_Shared := True;
 
-               else
-                  if Nlast > Nfirst + 2 and then
-                    Next_Line (Nfirst .. Nfirst + 1) = "-L"
-                  then
-                     --  Construct a library search path for use later
-                     --  to locate static gnatlib libraries.
-
-                     if Libpath.Last > 1 then
-                        Libpath.Increment_Last;
-                        Libpath.Table (Libpath.Last) := Path_Separator;
-                     end if;
+            --  Add binder options only if not already set on the command
+            --  line. This rule is a way to control the linker options order.
 
-                     for I in Nfirst + 2 .. Nlast loop
-                        Libpath.Increment_Last;
-                        Libpath.Table (Libpath.Last) := Next_Line (I);
-                     end loop;
+            elsif not Is_Option_Present (Next_Line (Nfirst .. Nlast)) then
+               if Nlast > Nfirst + 2 and then
+                 Next_Line (Nfirst .. Nfirst + 1) = "-L"
+               then
+                  --  Construct a library search path for use later
+                  --  to locate static gnatlib libraries.
 
-                     Linker_Options.Increment_Last;
+                  if Libpath.Last > 1 then
+                     Libpath.Increment_Last;
+                     Libpath.Table (Libpath.Last) := Path_Separator;
+                  end if;
 
-                     Linker_Options.Table (Linker_Options.Last) :=
-                      new String'(Next_Line (Nfirst .. Nlast));
+                  for I in Nfirst + 2 .. Nlast loop
+                     Libpath.Increment_Last;
+                     Libpath.Table (Libpath.Last) := Next_Line (I);
+                  end loop;
 
-                  elsif Next_Line (Nfirst .. Nlast) = "-ldecgnat"
-                    or else Next_Line (Nfirst .. Nlast) = "-lgnarl"
-                    or else Next_Line (Nfirst .. Nlast) = "-lgnat"
-                  then
-                     --  Given a Gnat standard library, search the
-                     --  library path to find the library location
-                     declare
-                        File_Path : String_Access;
+                  Linker_Options.Increment_Last;
 
-                        Object_Lib_Extension : constant String :=
-                                                 Value
-                                                   (Object_Library_Ext_Ptr);
+                  Linker_Options.Table (Linker_Options.Last) :=
+                    new String'(Next_Line (Nfirst .. Nlast));
 
-                        File_Name : String :=
-                                      "lib" &
-                                        Next_Line (Nfirst + 2 .. Nlast) &
-                                        Object_Lib_Extension;
+               elsif Next_Line (Nfirst .. Nlast) = "-ldecgnat"
+                 or else Next_Line (Nfirst .. Nlast) = "-lgnarl"
+                 or else Next_Line (Nfirst .. Nlast) = "-lgnat"
+               then
+                  --  Given a Gnat standard library, search the
+                  --  library path to find the library location
 
-                     begin
-                        File_Path :=
-                          Locate_Regular_File
-                           (File_Name,
-                            String (Libpath.Table (1 .. Libpath.Last)));
+                  declare
+                     File_Path : String_Access;
+                     Object_Lib_Extension : constant String :=
+                       Value (Object_Library_Ext_Ptr);
 
-                        if File_Path /= null then
-                           if GNAT_Static then
+                     File_Name : String := "lib" &
+                       Next_Line (Nfirst + 2 .. Nlast) & Object_Lib_Extension;
 
-                              --  If static gnatlib found, explicitly
-                              --  specify to overcome possible linker
-                              --  default usage of shared version.
+                  begin
+                     File_Path :=
+                       Locate_Regular_File (File_Name,
+                         String (Libpath.Table (1 .. Libpath.Last)));
 
-                              Linker_Options.Increment_Last;
+                     if File_Path /= null then
+                        if GNAT_Static then
 
-                              Linker_Options.Table (Linker_Options.Last) :=
-                               new String'(File_Path.all);
+                           --  If static gnatlib found, explicitly
+                           --  specify to overcome possible linker
+                           --  default usage of shared version.
 
-                           elsif GNAT_Shared then
+                           Linker_Options.Increment_Last;
 
-                              --  If shared gnatlib desired, add the
-                              --  appropriate system specific switch
-                              --  so that it can be located at runtime.
+                           Linker_Options.Table (Linker_Options.Last) :=
+                             new String'(File_Path.all);
 
-                              declare
-                                 Run_Path_Opt : constant String :=
-                                                  Value
-                                                    (Run_Path_Option_Ptr);
+                        elsif GNAT_Shared then
 
-                              begin
-                                 if Run_Path_Opt'Length /= 0 then
+                           --  If shared gnatlib desired, add the
+                           --  appropriate system specific switch
+                           --  so that it can be located at runtime.
 
-                                    --  Output the system specific linker
-                                    --  command that allows the image
-                                    --  activator to find the shared library
-                                    --  at runtime.
+                           declare
+                              Run_Path_Opt : constant String :=
+                                Value (Run_Path_Option_Ptr);
 
-                                    Linker_Options.Increment_Last;
+                           begin
+                              if Run_Path_Opt'Length /= 0 then
 
-                                    Linker_Options.Table
-                                     (Linker_Options.Last) :=
-                                       new String'(Run_Path_Opt
-                                          & File_Path
-                                            (1 .. File_Path'Length
-                                                   - File_Name'Length));
-                                 end if;
+                                 --  Output the system specific linker
+                                 --  command that allows the image
+                                 --  activator to find the shared library
+                                 --  at runtime.
 
                                  Linker_Options.Increment_Last;
 
-                                 Linker_Options.Table
-                                  (Linker_Options.Last) :=
-                                   new String'(Next_Line
-                                                (Nfirst .. Nlast));
-
-                              end;
-                           end if;
+                                 Linker_Options.Table (Linker_Options.Last)
+                                      := new String'(Run_Path_Opt
+                                           & File_Path
+                                              (1 .. File_Path'Length
+                                                     - File_Name'Length));
+                              end if;
 
-                        else
-                           --  If gnatlib library not found, then
-                           --  add it anyway in case some other
-                           --  mechanimsm may find it.
+                              Linker_Options.Increment_Last;
+                              Linker_Options.Table (Linker_Options.Last)
+                                := new String'(Next_Line (Nfirst .. Nlast));
+                           end;
+                        end if;
 
-                           Linker_Options.Increment_Last;
+                     else
+                        --  If gnatlib library not found, then
+                        --  add it anyway in case some other
+                        --  mechanimsm may find it.
 
-                           Linker_Options.Table (Linker_Options.Last) :=
-                             new String'(Next_Line (Nfirst .. Nlast));
-                        end if;
-                     end;
-                  else
-                     Linker_Options.Increment_Last;
-                     Linker_Options.Table (Linker_Options.Last) :=
-                      new String'(Next_Line (Nfirst .. Nlast));
-                  end if;
+                        Linker_Options.Increment_Last;
+                        Linker_Options.Table (Linker_Options.Last)
+                          := new String'(Next_Line (Nfirst .. Nlast));
+                     end if;
+                  end;
+               else
+                  Linker_Options.Increment_Last;
+                  Linker_Options.Table (Linker_Options.Last)
+                    := new String'(Next_Line (Nfirst .. Nlast));
                end if;
             end if;
 
@@ -897,8 +871,8 @@ procedure Gnatlink is
             exit when Next_Line (Nfirst .. Nlast) = End_Info;
 
             if Ada_Bind_File then
-               Next_Line (Nfirst .. Nlast - 8) :=
-                 Next_Line (Nfirst + 8 .. Nlast);
+               Next_Line (Nfirst .. Nlast - 8)
+                 := Next_Line (Nfirst + 8 .. Nlast);
                Nlast := Nlast - 8;
             end if;
          end loop;
@@ -966,7 +940,6 @@ procedure Gnatlink is
 --  Start of processing for Gnatlink
 
 begin
-
    if Argument_Count = 0 then
       Write_Usage;
       Exit_Program (E_Fatal);
@@ -981,6 +954,36 @@ begin
 
    Process_Args;
 
+   --  We always compile with -c
+
+   Binder_Options_From_ALI.Increment_Last;
+   Binder_Options_From_ALI.Table (Binder_Options_From_ALI.Last) :=
+     new String'("-c");
+
+   --  If the main program is in Ada it is compiled with the following
+   --  switches:
+
+   --    -gnatA   stops reading gnat.adc, since we don't know what
+   --             pagmas would work, and we do not need it anyway.
+
+   --    -gnatWb  allows brackets coding for wide characters
+
+   --    -gnatiw  allows wide characters in identifiers. This is needed
+   --             because bindgen uses brackets encoding for all upper
+   --             half and wide characters in identifier names.
+
+   if Ada_Bind_File then
+      Binder_Options_From_ALI.Increment_Last;
+      Binder_Options_From_ALI.Table (Binder_Options_From_ALI.Last) :=
+        new String'("-gnatA");
+      Binder_Options_From_ALI.Increment_Last;
+      Binder_Options_From_ALI.Table (Binder_Options_From_ALI.Last) :=
+        new String'("-gnatWb");
+      Binder_Options_From_ALI.Increment_Last;
+      Binder_Options_From_ALI.Table (Binder_Options_From_ALI.Last) :=
+        new String'("-gnatiw");
+   end if;
+
    --  Locate all the necessary programs and verify required files are present
 
    Gcc_Path := GNAT.OS_Lib.Locate_Exec_On_Path (Gcc.all);
@@ -999,13 +1002,61 @@ begin
 
    if not Is_Regular_File (Ali_File_Name.all) then
       Exit_With_Error (Ali_File_Name.all & " not found.");
+
+   --  Read the ALI file of the main subprogram if the binder generated
+   --  file is in Ada, it need to be compiled and no --GCC= switch has
+   --  been specified. Fetch the back end switches from this ALI file and use
+   --  these switches to compile the binder generated file
+
+   elsif Ada_Bind_File
+     and then Compile_Bind_File
+     and then Standard_Gcc
+   then
+      --  Do some initializations
+
+      Initialize_ALI;
+      Namet.Initialize;
+      Name_Len := Ali_File_Name'Length;
+      Name_Buffer (1 .. Name_Len) := Ali_File_Name.all;
+
+      declare
+         use Types;
+         F : constant File_Name_Type := Name_Find;
+         T : Text_Buffer_Ptr;
+         A : ALI_Id;
+
+      begin
+         --  Osint.Add_Default_Search_Dirs;
+         --  Load the ALI file
+
+         T := Read_Library_Info (F, True);
+
+         --  Read it
+
+         A := Scan_ALI (F, T, False, False, False);
+
+         if A /= No_ALI_Id then
+            for
+              Index in Units.Table (ALIs.Table (A).First_Unit).First_Arg
+              .. Units.Table (ALIs.Table (A).First_Unit).Last_Arg
+            loop
+               --  Do not compile with the front end switches
+
+               if not Is_Front_End_Switch (Args.Table (Index).all) then
+                  Binder_Options_From_ALI.Increment_Last;
+                  Binder_Options_From_ALI.Table (Binder_Options_From_ALI.Last)
+                    := String_Access (Args.Table (Index));
+               end if;
+            end loop;
+         end if;
+      end;
    end if;
 
    if Verbose_Mode then
       Write_Eol;
       Write_Str ("GNATLINK ");
       Write_Str (Gnat_Version_String);
-      Write_Str (" Copyright 1996-2001 Free Software Foundation, Inc.");
+      Write_Str (" Copyright 1996-2002 Free Software Foundation, Inc.");
       Write_Eol;
    end if;
 
@@ -1129,11 +1180,17 @@ begin
    if Compile_Bind_File then
       Bind_Step : declare
          Success : Boolean;
-         Args    : Argument_List (1 .. Binder_Options.Last + 1);
+         Args    : Argument_List
+           (1 .. Binder_Options_From_ALI.Last + Binder_Options.Last + 1);
 
       begin
-         for J in Binder_Options.First .. Binder_Options.Last loop
-            Args (J) := Binder_Options.Table (J);
+         for J in 1 .. Binder_Options_From_ALI.Last loop
+            Args (J) := Binder_Options_From_ALI.Table (J);
+         end loop;
+
+         for J in 1 .. Binder_Options.Last loop
+            Args (Binder_Options_From_ALI.Last + J) :=
+              Binder_Options.Table (J);
          end loop;
 
          Args (Args'Last) := Binder_Body_Src_File;
@@ -1346,6 +1403,7 @@ begin
    Exit_Program (E_Success);
 
 exception
-   when others =>
+   when X : others =>
+      Write_Line (Exception_Information (X));
       Exit_With_Error ("INTERNAL ERROR. Please report.");
 end Gnatlink;