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

diff --git a/gcc/ada/a-tasatt.adb b/gcc/ada/a-tasatt.adb
index 18c11d34d68..594bfec935e 100644
--- a/gcc/ada/a-tasatt.adb
+++ b/gcc/ada/a-tasatt.adb
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision: 1.1 $
+--                            $Revision$
 --                                                                          --
---             Copyright (C) 1991-2000 Florida State University             --
+--             Copyright (C) 1991-2002 Florida State University             --
 --                                                                          --
 -- GNARL 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- --
@@ -29,8 +29,7 @@
 -- covered by the  GNU Public License.                                      --
 --                                                                          --
 -- GNARL was developed by the GNARL team at Florida State University. It is --
--- now maintained by Ada Core Technologies Inc. in cooperation with Florida --
--- State University (http://www.gnat.com).                                  --
+-- now maintained by Ada Core Technologies, Inc. (http://www.gnat.com).     --
 --                                                                          --
 ------------------------------------------------------------------------------
 
@@ -182,8 +181,7 @@
 --  The latter initialization requires a list of all the instantiation
 --  descriptors. Updates to this list, as well as the bit-vector that
 --  is used to reserve slots for attributes in the TCB, require mutual
---  exclusion. That is provided by the lock
---  System.Tasking.Task_Attributes.All_Attrs_L.
+--  exclusion. That is provided by the Lock/Unlock_RTS.
 
 --  One special problem that added complexity to the design is that
 --  the per-task list of indirect attributes contains objects of
@@ -243,7 +241,7 @@ with System.Storage_Elements;
 with System.Task_Primitives.Operations;
 --  used for Write_Lock
 --           Unlock
---           Lock/Unlock_All_Tasks_List
+--           Lock/Unlock_RTS
 
 with System.Tasking;
 --  used for Access_Address
@@ -301,6 +299,14 @@ package body Ada.Task_Attributes is
    type Wrapper;
    type Access_Wrapper is access all Wrapper;
 
+   pragma Warnings (Off);
+   --  We turn warnings off for the following declarations of the
+   --  To_Attribute_Handle conversions, since these are used only
+   --  for small attributes where we know that there are no problems
+   --  with alignment, but the compiler will generate warnings for
+   --  the occurrences in the large attribute case, even though
+   --  they will not actually be used.
+
    function To_Attribute_Handle is new Unchecked_Conversion
      (Access_Address, Attribute_Handle);
    --  For reference to directly addressed task attributes
@@ -312,6 +318,10 @@ package body Ada.Task_Attributes is
      (Access_Integer_Address, Attribute_Handle);
    --  For reference to directly addressed task attributes
 
+   pragma Warnings (On);
+   --  End of warnings off region for directly addressed
+   --  attribute conversion functions.
+
    function To_Access_Address is new Unchecked_Conversion
      (Access_Node, Access_Address);
    --  To store pointer to list of indirect attributes
@@ -320,9 +330,15 @@ package body Ada.Task_Attributes is
      (Access_Address, Access_Node);
    --  To fetch pointer to list of indirect attributes
 
+   pragma Warnings (Off);
    function To_Access_Wrapper is new Unchecked_Conversion
      (Access_Dummy_Wrapper, Access_Wrapper);
-   --  To fetch pointer to actual wrapper of attribute node
+   pragma Warnings (On);
+   --  To fetch pointer to actual wrapper of attribute node. We turn off
+   --  warnings since this may generate an alignment warning. The warning
+   --  can be ignored since Dummy_Wrapper is only a non-generic standin
+   --  for the real wrapper type (we never actually allocate objects of
+   --  type Dummy_Wrapper).
 
    function To_Access_Dummy_Wrapper is new Unchecked_Conversion
      (Access_Wrapper, Access_Dummy_Wrapper);
@@ -388,7 +404,7 @@ package body Ada.Task_Attributes is
      (T    : Task_Identification.Task_Id := Task_Identification.Current_Task)
       return Attribute_Handle
    is
-      TT          : Task_ID := To_Task_ID (T);
+      TT            : Task_ID := To_Task_ID (T);
       Error_Message : constant String := "Trying to get the reference of a";
 
    begin
@@ -404,13 +420,24 @@ package body Ada.Task_Attributes is
 
       begin
          Defer_Abortion;
-         POP.Write_Lock (All_Attrs_L'Access);
+         POP.Lock_RTS;
+
+         --  Directly addressed case
 
          if Local.Index /= 0 then
-            POP.Unlock (All_Attrs_L'Access);
+            POP.Unlock_RTS;
             Undefer_Abortion;
+
+            --  Return the attribute handle. Warnings off because this return
+            --  statement generates alignment warnings for large attributes
+            --  (but will never be executed in this case anyway).
+
+            pragma Warnings (Off);
             return
               To_Attribute_Handle (TT.Direct_Attributes (Local.Index)'Access);
+            pragma Warnings (On);
+
+         --  Not directly addressed
 
          else
             declare
@@ -420,7 +447,7 @@ package body Ada.Task_Attributes is
             begin
                while P /= null loop
                   if P.Instance = Access_Instance'(Local'Unchecked_Access) then
-                     POP.Unlock (All_Attrs_L'Access);
+                     POP.Unlock_RTS;
                      Undefer_Abortion;
                      return To_Access_Wrapper (P.Wrapper).Value'Access;
                   end if;
@@ -428,20 +455,20 @@ package body Ada.Task_Attributes is
                   P := P.Next;
                end loop;
 
-               --  Unlock All_Attrs_L here to follow the lock ordering rule
+               --  Unlock the RTS here to follow the lock ordering rule
                --  that prevent us from using new (i.e the Global_Lock) while
                --  holding any other lock.
 
-               POP.Unlock (All_Attrs_L'Access);
+               POP.Unlock_RTS;
                W := new Wrapper'
                      ((null, Local'Unchecked_Access, null), Initial_Value);
-               POP.Write_Lock (All_Attrs_L'Access);
+               POP.Lock_RTS;
 
                P := W.Noed'Unchecked_Access;
                P.Wrapper := To_Access_Dummy_Wrapper (W);
                P.Next := To_Access_Node (TT.Indirect_Attributes);
                TT.Indirect_Attributes := To_Access_Address (P);
-               POP.Unlock (All_Attrs_L'Access);
+               POP.Unlock_RTS;
                Undefer_Abortion;
                return W.Value'Access;
             end;
@@ -452,7 +479,7 @@ package body Ada.Task_Attributes is
 
       exception
          when others =>
-            POP.Unlock (All_Attrs_L'Access);
+            POP.Unlock_RTS;
             Undefer_Abortion;
             raise;
       end;
@@ -493,9 +520,9 @@ package body Ada.Task_Attributes is
 
          begin
             Defer_Abortion;
-            POP.Write_Lock (All_Attrs_L'Access);
-
+            POP.Lock_RTS;
             Q := To_Access_Node (TT.Indirect_Attributes);
+
             while Q /= null loop
                if Q.Instance = Access_Instance'(Local'Unchecked_Access) then
                   if P = null then
@@ -506,7 +533,7 @@ package body Ada.Task_Attributes is
 
                   W := To_Access_Wrapper (Q.Wrapper);
                   Free (W);
-                  POP.Unlock (All_Attrs_L'Access);
+                  POP.Unlock_RTS;
                   Undefer_Abortion;
                   return;
                end if;
@@ -515,12 +542,12 @@ package body Ada.Task_Attributes is
                Q := Q.Next;
             end loop;
 
-            POP.Unlock (All_Attrs_L'Access);
+            POP.Unlock_RTS;
             Undefer_Abortion;
 
          exception
             when others =>
-               POP.Unlock (All_Attrs_L'Access);
+               POP.Unlock_RTS;
                Undefer_Abortion;
          end;
 
@@ -560,15 +587,27 @@ package body Ada.Task_Attributes is
 
       begin
          Defer_Abortion;
-         POP.Write_Lock (All_Attrs_L'Access);
+         POP.Lock_RTS;
+
+         --  Directly addressed case
 
          if Local.Index /= 0 then
+
+            --  Set attribute handle, warnings off, because this code can
+            --  generate alignment warnings with large attributes (but of
+            --  course wil not be executed in this case, since we never
+            --  have direct addressing in such cases).
+
+            pragma Warnings (Off);
             To_Attribute_Handle
                (TT.Direct_Attributes (Local.Index)'Access).all := Val;
-            POP.Unlock (All_Attrs_L'Access);
+            pragma Warnings (On);
+            POP.Unlock_RTS;
             Undefer_Abortion;
             return;
 
+         --  Not directly addressed
+
          else
             declare
                P : Access_Node := To_Access_Node (TT.Indirect_Attributes);
@@ -579,7 +618,7 @@ package body Ada.Task_Attributes is
 
                   if P.Instance = Access_Instance'(Local'Unchecked_Access) then
                      To_Access_Wrapper (P.Wrapper).Value := Val;
-                     POP.Unlock (All_Attrs_L'Access);
+                     POP.Unlock_RTS;
                      Undefer_Abortion;
                      return;
                   end if;
@@ -587,15 +626,14 @@ package body Ada.Task_Attributes is
                   P := P.Next;
                end loop;
 
-               --  Unlock TT here to follow the lock ordering rule that
+               --  Unlock RTS here to follow the lock ordering rule that
                --  prevent us from using new (i.e the Global_Lock) while
                --  holding any other lock.
 
-               POP.Unlock (All_Attrs_L'Access);
+               POP.Unlock_RTS;
                W := new Wrapper'
                      ((null, Local'Unchecked_Access, null), Val);
-               POP.Write_Lock (All_Attrs_L'Access);
-
+               POP.Lock_RTS;
                P := W.Noed'Unchecked_Access;
                P.Wrapper := To_Access_Dummy_Wrapper (W);
                P.Next := To_Access_Node (TT.Indirect_Attributes);
@@ -603,12 +641,12 @@ package body Ada.Task_Attributes is
             end;
          end if;
 
-         POP.Unlock (All_Attrs_L'Access);
+         POP.Unlock_RTS;
          Undefer_Abortion;
 
       exception
          when others =>
-            POP.Unlock (All_Attrs_L'Access);
+            POP.Unlock_RTS;
             Undefer_Abortion;
             raise;
       end;
@@ -648,10 +686,22 @@ package body Ada.Task_Attributes is
       end if;
 
       begin
+         --  Directly addressed case
+
          if Local.Index /= 0 then
+
+            --  Get value of attribute. Warnings off, because for large
+            --  attributes, this code can generate alignment warnings.
+            --  But of course large attributes are never directly addressed
+            --  so in fact we will never execute the code in this case.
+
+            pragma Warnings (Off);
             Result :=
               To_Attribute_Handle
                 (TT.Direct_Attributes (Local.Index)'Access).all;
+            pragma Warnings (On);
+
+         --  Not directly addressed
 
          else
             declare
@@ -659,12 +709,12 @@ package body Ada.Task_Attributes is
 
             begin
                Defer_Abortion;
-               POP.Write_Lock (All_Attrs_L'Access);
-
+               POP.Lock_RTS;
                P := To_Access_Node (TT.Indirect_Attributes);
+
                while P /= null loop
                   if P.Instance = Access_Instance'(Local'Unchecked_Access) then
-                     POP.Unlock (All_Attrs_L'Access);
+                     POP.Unlock_RTS;
                      Undefer_Abortion;
                      return To_Access_Wrapper (P.Wrapper).Value;
                   end if;
@@ -673,12 +723,12 @@ package body Ada.Task_Attributes is
                end loop;
 
                Result := Initial_Value;
-               POP.Unlock (All_Attrs_L'Access);
+               POP.Unlock_RTS;
                Undefer_Abortion;
 
             exception
                when others =>
-                  POP.Unlock (All_Attrs_L'Access);
+                  POP.Unlock_RTS;
                   Undefer_Abortion;
                   raise;
             end;
@@ -707,11 +757,15 @@ begin
    pragma Warnings (On);
 
    declare
-      Two_To_J    : Direct_Index_Vector;
-
+      Two_To_J : Direct_Index_Vector;
    begin
       Defer_Abortion;
-      POP.Write_Lock (All_Attrs_L'Access);
+
+      --  Need protection for updating links to per-task initialization and
+      --  finalization routines, in case some task is being created or
+      --  terminated concurrently.
+
+      POP.Lock_RTS;
 
       --  Add this instantiation to the list of all instantiations.
 
@@ -749,12 +803,6 @@ begin
          end loop;
       end if;
 
-      --  Need protection of All_Tasks_L for updating links to
-      --  per-task initialization and finalization routines,
-      --  in case some task is being created or terminated concurrently.
-
-      POP.Lock_All_Tasks_List;
-
       --  Attribute goes directly in the TCB
 
       if Local.Index /= 0 then
@@ -791,8 +839,7 @@ begin
 
       end if;
 
-      POP.Unlock_All_Tasks_List;
-      POP.Unlock (All_Attrs_L'Access);
+      POP.Unlock_RTS;
       Undefer_Abortion;
 
    exception
@@ -804,5 +851,4 @@ begin
          --  any initializations that succeeded up to this point, or we will
          --  risk a dangling reference when the task terminates.
    end;
-
 end Ada.Task_Attributes;