2003-10-21 Arnaud Charlet <charlet@act-europe.fr>

	* 3psoccon.ads, 3veacodu.adb, 3vexpect.adb, 3vsoccon.ads,
	3vsocthi.adb, 3vsocthi.ads, 3vtrasym.adb, 3zsoccon.ads,
	3zsocthi.adb, 3zsocthi.ads, 50system.ads, 51system.ads,
	55system.ads, 56osinte.adb, 56osinte.ads, 56taprop.adb,
	56taspri.ads, 56tpopsp.adb, 57system.ads, 58system.ads,
	59system.ads, 5aml-tgt.adb, 5bml-tgt.adb, 5csystem.ads,
	5dsystem.ads, 5fosinte.adb, 5gml-tgt.adb, 5hml-tgt.adb,
	5isystem.ads, 5lparame.adb, 5msystem.ads, 5psystem.ads,
	5sml-tgt.adb, 5sosprim.adb, 5stpopsp.adb, 5tsystem.ads,
	5usystem.ads, 5vml-tgt.adb, 5vsymbol.adb, 5vtraent.adb,
	5vtraent.ads, 5wml-tgt.adb, 5xparame.ads, 5xsystem.ads,
	5xvxwork.ads, 5yparame.ads, 5ytiitho.adb, 5zinit.adb,
	5zml-tgt.adb, 5zparame.ads, 5ztaspri.ads, 5ztfsetr.adb,
	5zthrini.adb, 5ztiitho.adb, 5ztpopsp.adb, 7stfsetr.adb,
	7straces.adb, 7strafor.adb, 7strafor.ads, 7stratas.adb,
	a-excach.adb, a-exexda.adb, a-exexpr.adb, a-exextr.adb,
	a-exstat.adb, a-strsup.adb, a-strsup.ads, a-stwisu.adb,
	a-stwisu.ads, bld.adb, bld.ads, bld-io.adb,
	bld-io.ads, clean.adb, clean.ads, ctrl_c.c,
	erroutc.adb, erroutc.ads, errutil.adb, errutil.ads,
	err_vars.ads, final.c, g-arrspl.adb, g-arrspl.ads,
	g-boubuf.adb, g-boubuf.ads, g-boumai.ads, g-bubsor.adb,
	g-bubsor.ads, g-comver.adb, g-comver.ads, g-ctrl_c.ads,
	g-dynhta.adb, g-dynhta.ads, g-eacodu.adb, g-excact.adb,
	g-excact.ads, g-heasor.adb, g-heasor.ads, g-memdum.adb,
	g-memdum.ads, gnatclean.adb, gnatsym.adb, g-pehage.adb,
	g-pehage.ads, g-perhas.ads, gpr2make.adb, gpr2make.ads,
	gprcmd.adb, gprep.adb, gprep.ads, g-semaph.adb,
	g-semaph.ads, g-string.adb, g-string.ads, g-strspl.ads,
	g-wistsp.ads, i-vthrea.adb, i-vthrea.ads, i-vxwoio.adb,
	i-vxwoio.ads, Makefile.generic, Makefile.prolog, Makefile.rtl,
	prep.adb, prep.ads, prepcomp.adb, prepcomp.ads,
	prj-err.adb, prj-err.ads, s-boarop.ads, s-carsi8.adb,
	s-carsi8.ads, s-carun8.adb, s-carun8.ads, s-casi16.adb,
	s-casi16.ads, s-casi32.adb, s-casi32.ads, s-casi64.adb,
	s-casi64.ads, s-casuti.adb, s-casuti.ads, s-caun16.adb,
	s-caun16.ads, s-caun32.adb, s-caun32.ads, s-caun64.adb,
	s-caun64.ads, scng.adb, scng.ads, s-exnint.adb,
	s-exnllf.adb, s-exnlli.adb, s-expint.adb, s-explli.adb,
	s-geveop.adb, s-geveop.ads, s-hibaen.ads, s-htable.adb,
	s-htable.ads, sinput-c.adb, sinput-c.ads, s-memcop.ads,
	socket.c, s-purexc.ads, s-scaval.adb, s-stopoo.adb,
	s-strcom.adb, s-strcom.ads, s-strxdr.adb, s-rident.ads,
	s-thread.adb, s-thread.ads, s-tpae65.adb, s-tpae65.ads,
	s-tporft.adb, s-traent.adb, s-traent.ads, styleg.adb,
	styleg.ads, styleg-c.adb, styleg-c.ads, s-veboop.adb,
	s-veboop.ads, s-vector.ads, symbols.adb, symbols.ads,
	tb-alvms.c, tb-alvxw.c, tempdir.adb, tempdir.ads,
	vms_conv.ads, vms_conv.adb, vms_data.ads,
	vxaddr2line.adb: Files added. Merge with ACT tree.

	* 4dintnam.ads, 4mintnam.ads, 4uintnam.ads, 52system.ads,
	5dosinte.ads, 5etpopse.adb, 5mosinte.ads, 5qosinte.adb,
	5qosinte.ads, 5qstache.adb, 5qtaprop.adb, 5qtaspri.ads,
	5stpopse.adb, 5uintman.adb, 5uosinte.ads, adafinal.c,
	g-enblsp.adb, io-aux.c, scn-nlit.adb, scn-slit.adb,
	s-exnflt.ads, s-exngen.adb, s-exngen.ads, s-exnlfl.ads,
	s-exnlin.ads, s-exnsfl.ads, s-exnsin.ads, s-exnssi.ads,
	s-expflt.ads, s-expgen.adb, s-expgen.ads, s-explfl.ads,
	s-explin.ads, s-expllf.ads, s-expsfl.ads, s-expsin.ads,
	s-expssi.ads, style.adb: Files removed. Merge with ACT tree.

	* 1ic.ads, 31soccon.ads, 31soliop.ads, 3asoccon.ads,
	3bsoccon.ads, 3gsoccon.ads, 3hsoccon.ads, 3ssoccon.ads,
	3ssoliop.ads, 3wsoccon.ads, 3wsocthi.adb, 3wsocthi.ads,
	3wsoliop.ads, 41intnam.ads, 42intnam.ads, 4aintnam.ads,
	4cintnam.ads, 4gintnam.ads, 4hexcpol.adb, 4hintnam.ads,
	4lintnam.ads, 4nintnam.ads, 4ointnam.ads, 4onumaux.ads,
	4pintnam.ads, 4sintnam.ads, 4vcaldel.adb, 4vcalend.adb,
	4vintnam.ads, 4wexcpol.adb, 4wintnam.ads, 4zintnam.ads,
	51osinte.adb, 51osinte.ads, 52osinte.adb, 52osinte.ads,
	53osinte.ads, 54osinte.ads, 5aosinte.adb, 5aosinte.ads,
	5asystem.ads, 5ataprop.adb, 5atasinf.ads, 5ataspri.ads,
	5atpopsp.adb, 5avxwork.ads, 5bosinte.adb, 5bosinte.ads,
	5bsystem.ads, 5cosinte.ads, 5esystem.ads, 5fintman.adb,
	5fosinte.ads, 5fsystem.ads, 5ftaprop.adb, 5ftasinf.ads,
	5ginterr.adb, 5gintman.adb, 5gmastop.adb, 5gosinte.ads,
	5gproinf.ads, 5gsystem.ads, 5gtaprop.adb, 5gtasinf.ads,
	5gtpgetc.adb, 5hosinte.adb, 5hosinte.ads, 5hsystem.ads,
	5htaprop.adb, 5htaspri.ads, 5htraceb.adb, 5iosinte.adb,
	5itaprop.adb, 5itaspri.ads, 5ksystem.ads, 5kvxwork.ads,
	5lintman.adb, 5lml-tgt.adb, 5losinte.ads, 5lsystem.ads,
	5mvxwork.ads, 5ninmaop.adb, 5nintman.adb, 5nosinte.ads,
	5ntaprop.adb, 5ntaspri.ads, 5ointerr.adb, 5omastop.adb,
	5oosinte.adb, 5oosinte.ads, 5oosprim.adb, 5oparame.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5posinte.ads,
	5posprim.adb, 5pvxwork.ads, 5sintman.adb, 5sosinte.adb,
	5sosinte.ads, 5ssystem.ads, 5staprop.adb, 5stasinf.ads,
	5staspri.ads, 5svxwork.ads, 5tosinte.ads, 5vasthan.adb,
	5vinmaop.adb, 5vinterr.adb, 5vintman.adb, 5vintman.ads,
	5vmastop.adb, 5vosinte.adb, 5vosinte.ads, 5vosprim.adb,
	5vsystem.ads, 5vtaprop.adb, 5vtaspri.ads, 5vtpopde.adb,
	5vtpopde.ads, 5wgloloc.adb, 5wintman.adb, 5wmemory.adb,
	5wosprim.adb, 5wsystem.ads, 5wtaprop.adb, 5wtaspri.ads,
	5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb,
	5zosinte.ads, 5zosprim.adb, 5zsystem.ads, 5ztaprop.adb,
	6vcpp.adb, 6vcstrea.adb, 6vinterf.ads, 7sinmaop.adb,
	7sintman.adb, 7sosinte.adb, 7sosprim.adb, 7staprop.adb,
	7staspri.ads, 7stpopsp.adb, 7straceb.adb, 9drpc.adb,
	a-caldel.adb, a-caldel.ads, a-charac.ads, a-colien.ads,
	a-comlin.adb, adaint.c, adaint.h, ada-tree.def,
	a-diocst.adb, a-diocst.ads, a-direio.adb, a-except.adb,
	a-except.ads, a-excpol.adb, a-exctra.adb, a-exctra.ads,
	a-filico.adb, a-interr.adb, a-intsig.adb, a-intsig.ads,
	ali.adb, ali.ads, ali-util.adb, ali-util.ads,
	a-ngcefu.adb, a-ngcoty.adb, a-ngelfu.adb, a-nudira.adb,
	a-nudira.ads, a-nuflra.adb, a-nuflra.ads, a-reatim.adb,
	a-reatim.ads, a-retide.ads, a-sequio.adb, a-siocst.adb,
	a-siocst.ads, a-ssicst.adb, a-ssicst.ads, a-strbou.adb,
	a-strbou.ads, a-strfix.adb, a-strmap.adb, a-strsea.ads,
	a-strunb.adb, a-strunb.ads, a-ststio.adb, a-stunau.adb,
	a-stunau.ads, a-stwibo.adb, a-stwibo.ads, a-stwifi.adb,
	a-stwima.adb, a-stwiun.adb, a-stwiun.ads, a-tags.adb,
	a-tags.ads, a-tasatt.adb, a-taside.adb, a-teioed.adb,
	a-textio.adb, a-textio.ads, a-tienau.adb, a-tifiio.adb,
	a-tiflau.adb, a-tiflio.adb, a-tigeau.adb, a-tigeau.ads,
	a-tiinau.adb, a-timoau.adb, a-tiocst.adb, a-tiocst.ads,
	atree.adb, atree.ads, a-witeio.adb, a-witeio.ads,
	a-wtcstr.adb, a-wtcstr.ads, a-wtdeio.adb, a-wtedit.adb,
	a-wtenau.adb, a-wtflau.adb, a-wtinau.adb, a-wtmoau.adb,
	bcheck.adb, binde.adb, bindgen.adb, bindusg.adb,
	checks.adb, checks.ads, cio.c, comperr.adb,
	comperr.ads, csets.adb, cstand.adb, cstreams.c,
	debug_a.adb, debug_a.ads, debug.adb, decl.c,
	einfo.adb, einfo.ads, errout.adb, errout.ads,
	eval_fat.adb, eval_fat.ads, exp_aggr.adb, expander.adb,
	expander.ads, exp_attr.adb, exp_ch11.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_ch8.adb, exp_ch9.adb, exp_code.adb, exp_dbug.adb,
	exp_dbug.ads, exp_disp.adb, exp_dist.adb, expect.c,
	exp_fixd.adb, exp_imgv.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_strm.adb, exp_strm.ads, exp_tss.adb,
	exp_tss.ads, exp_util.adb, exp_util.ads, exp_vfpt.adb,
	fe.h, fmap.adb, fmap.ads, fname.adb,
	fname.ads, fname-uf.adb, fname-uf.ads, freeze.adb,
	freeze.ads, frontend.adb, g-awk.adb, g-awk.ads,
	g-busora.adb, g-busora.ads, g-busorg.adb, g-busorg.ads,
	g-casuti.adb, g-casuti.ads, g-catiio.adb, g-catiio.ads,
	g-cgi.adb, g-cgi.ads, g-cgicoo.adb, g-cgicoo.ads,
	g-cgideb.adb, g-cgideb.ads, g-comlin.adb, g-comlin.ads,
	g-crc32.adb, g-crc32.ads, g-debpoo.adb, g-debpoo.ads,
	g-debuti.adb, g-debuti.ads, g-diopit.adb, g-diopit.ads,
	g-dirope.adb, g-dirope.ads, g-dyntab.adb, g-dyntab.ads,
	g-except.ads, g-exctra.adb, g-exctra.ads, g-expect.adb,
	g-expect.ads, g-hesora.adb, g-hesora.ads, g-hesorg.adb,
	g-hesorg.ads, g-htable.adb, g-htable.ads, gigi.h,
	g-io.adb, g-io.ads, g-io_aux.adb, g-io_aux.ads,
	g-locfil.adb, g-locfil.ads, g-md5.adb, g-md5.ads,
	gmem.c, gnat1drv.adb, gnatbind.adb, gnatchop.adb,
	gnatcmd.adb, gnatfind.adb, gnatkr.adb, gnatlbr.adb,
	gnatlink.adb, gnatls.adb, gnatmake.adb, gnatmem.adb,
	gnatname.adb, gnatprep.adb, gnatprep.ads, gnatpsta.adb,
	gnatxref.adb, g-os_lib.adb, g-os_lib.ads, g-regexp.adb,
	g-regexp.ads, g-regist.adb, g-regist.ads, g-regpat.adb,
	g-regpat.ads, g-soccon.ads, g-socket.adb, g-socket.ads,
	g-socthi.adb, g-socthi.ads, g-soliop.ads, g-souinf.ads,
	g-speche.adb, g-speche.ads, g-spipat.adb, g-spipat.ads,
	g-spitbo.adb, g-spitbo.ads, g-sptabo.ads, g-sptain.ads,
	g-sptavs.ads, g-table.adb, g-table.ads, g-tasloc.adb,
	g-tasloc.ads, g-thread.adb, g-thread.ads, g-traceb.adb,
	g-traceb.ads, g-trasym.adb, g-trasym.ads, hostparm.ads,
	i-c.ads, i-cobol.adb, i-cpp.adb, i-cstrea.ads,
	i-cstrin.adb, i-cstrin.ads, impunit.adb, init.c,
	inline.adb, interfac.ads, i-pacdec.ads, itypes.adb,
	itypes.ads, i-vxwork.ads, lang.opt, lang-specs.h,
	layout.adb, lib.adb, lib.ads, lib-list.adb,
	lib-load.adb, lib-load.ads, lib-sort.adb, lib-util.adb,
	lib-writ.adb, lib-writ.ads, lib-xref.adb, lib-xref.ads,
	link.c, live.adb, make.adb, make.ads,
	Makefile.adalib, Makefile.in, Make-lang.in, makeusg.adb,
	mdll.adb, mdll-fil.adb, mdll-fil.ads, mdll-utl.adb,
	mdll-utl.ads, memroot.adb, memroot.ads, memtrack.adb,
	misc.c, mkdir.c, mlib.adb, mlib.ads,
	mlib-fil.adb, mlib-fil.ads, mlib-prj.adb, mlib-prj.ads,
	mlib-tgt.adb, mlib-tgt.ads, mlib-utl.adb, mlib-utl.ads,
	namet.adb, namet.ads, namet.h, nlists.ads,
	nlists.h, nmake.adt, opt.adb, opt.ads,
	osint.adb, osint.ads, osint-b.adb, osint-c.adb,
	par.adb, par-ch10.adb, par-ch11.adb, par-ch2.adb,
	par-ch3.adb, par-ch4.adb, par-ch5.adb, par-ch6.adb,
	par-ch9.adb, par-endh.adb, par-labl.adb, par-load.adb,
	par-prag.adb, par-sync.adb, par-tchk.adb, par-util.adb,
	prj.adb, prj.ads, prj-attr.adb, prj-attr.ads,
	prj-com.adb, prj-com.ads, prj-dect.adb, prj-dect.ads,
	prj-env.adb, prj-env.ads, prj-ext.adb, prj-ext.ads,
	prj-makr.adb, prj-makr.ads, prj-nmsc.adb, prj-nmsc.ads,
	prj-pars.adb, prj-pars.ads, prj-part.adb, prj-part.ads,
	prj-pp.adb, prj-pp.ads, prj-proc.adb, prj-proc.ads,
	prj-strt.adb, prj-strt.ads, prj-tree.adb, prj-tree.ads,
	prj-util.adb, prj-util.ads, raise.c, raise.h,
	repinfo.adb, repinfo.h, restrict.adb, restrict.ads,
	rident.ads, rtsfind.adb, rtsfind.ads, s-addima.ads,
	s-arit64.adb, s-assert.adb, s-assert.ads, s-atacco.adb,
	s-atacco.ads, s-auxdec.adb, s-auxdec.ads, s-bitops.adb,
	scans.ads, scn.adb, scn.ads, s-crc32.adb,
	s-crc32.ads, s-direio.adb, sem.adb, sem.ads,
	sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb,
	sem_case.ads, sem_cat.adb, sem_cat.ads, sem_ch10.adb,
	sem_ch11.adb, sem_ch12.adb, sem_ch12.ads, sem_ch13.adb,
	sem_ch13.ads, sem_ch3.adb, sem_ch3.ads, sem_ch4.adb,
	sem_ch5.adb, sem_ch5.ads, sem_ch6.adb, sem_ch6.ads,
	sem_ch7.adb, sem_ch7.ads, sem_ch8.adb, sem_ch8.ads,
	sem_ch9.adb, sem_disp.adb, sem_disp.ads, sem_dist.adb,
	sem_elab.adb, sem_eval.adb, sem_eval.ads, sem_intr.adb,
	sem_maps.adb, sem_mech.adb, sem_prag.adb, sem_prag.ads,
	sem_res.adb, sem_res.ads, sem_type.adb, sem_type.ads,
	sem_util.adb, sem_util.ads, sem_warn.adb, s-errrep.adb,
	s-errrep.ads, s-exctab.adb, s-exctab.ads, s-exnint.ads,
	s-exnllf.ads, s-exnlli.ads, s-expint.ads, s-explli.ads,
	s-expuns.ads, s-fatflt.ads, s-fatgen.adb, s-fatgen.ads,
	s-fatlfl.ads, s-fatllf.ads, s-fatsfl.ads, s-fileio.adb,
	s-fileio.ads, s-finimp.adb, s-finimp.ads, s-finroo.adb,
	s-finroo.ads, sfn_scan.adb, s-gloloc.adb, s-gloloc.ads,
	s-imgdec.adb, s-imgenu.adb, s-imgrea.adb, s-imgwch.adb,
	sinfo.adb, sinfo.ads, s-inmaop.ads, sinput.adb,
	sinput.ads, sinput-d.adb, sinput-l.adb, sinput-l.ads,
	sinput-p.adb, sinput-p.ads, s-interr.adb, s-interr.ads,
	s-intman.ads, s-maccod.ads, s-mastop.adb, s-mastop.ads,
	s-memory.adb, s-memory.ads, snames.adb, snames.ads,
	snames.h, s-osprim.ads, s-parame.ads, s-parint.ads,
	s-pooloc.adb, s-pooloc.ads, s-poosiz.adb, sprint.adb,
	s-proinf.ads, s-scaval.ads, s-secsta.adb, s-secsta.ads,
	s-sequio.adb, s-shasto.adb, s-shasto.ads, s-soflin.ads,
	s-stache.adb, s-stache.ads, s-stalib.adb, s-stalib.ads,
	s-stoele.ads, s-stopoo.ads, s-stratt.adb, s-stratt.ads,
	s-strops.adb, s-strops.ads, 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-taprob.ads,
	s-taprop.ads, s-tarest.adb, s-tarest.ads, s-tasdeb.adb,
	s-tasdeb.ads, s-tasinf.adb, s-tasinf.ads, 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-tasres.ads,
	s-tassta.adb, s-tassta.ads, s-tasuti.adb, s-tasuti.ads,
	s-tataat.adb, s-tataat.ads, s-tpinop.adb, s-tpinop.ads,
	s-tpoben.adb, s-tpoben.ads, s-tpobop.adb, s-tpobop.ads,
	s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads,
	stringt.adb, stringt.ads, stringt.h, style.ads,
	stylesw.adb, stylesw.ads, s-unstyp.ads, s-vaflop.ads,
	s-valrea.adb, s-valuti.adb, s-vercon.adb, s-vmexta.adb,
	s-wchcnv.ads, s-wchcon.ads, s-widcha.adb, switch.adb,
	switch.ads, switch-b.adb, switch-c.adb, switch-m.adb,
	s-wwdcha.adb, s-wwdwch.adb, sysdep.c, system.ads,
	table.adb, table.ads, targparm.adb, targparm.ads,
	targtyps.c, tbuild.adb, tbuild.ads, tracebak.c,
	trans.c, tree_io.adb, treepr.adb, treeprs.adt,
	ttypes.ads, types.ads, types.h, uintp.adb,
	uintp.ads, uintp.h, uname.adb, urealp.adb,
	urealp.ads, urealp.h, usage.adb, utils2.c,
	utils.c, validsw.adb, validsw.ads, widechar.adb,
	xeinfo.adb, xnmake.adb, xref_lib.adb, xref_lib.ads,
	xr_tabls.adb, xr_tabls.ads, xtreeprs.adb, xsnames.adb,
	einfo.h, sinfo.h, treeprs.ads, nmake.ads, nmake.adb,
	gnatvsn.ads: Merge with ACT tree.

	* gnatvsn.adb: Rewritten in a simpler and more efficient way.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72751 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 158 insertions, 198 deletions

diff --git a/gcc/ada/a-tasatt.adb b/gcc/ada/a-tasatt.adb
index 6d9d114d7f4..92f9f7921bd 100644
--- a/gcc/ada/a-tasatt.adb
+++ b/gcc/ada/a-tasatt.adb
@@ -6,7 +6,8 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---             Copyright (C) 1991-2002 Florida State University             --
+--             Copyright (C) 1991-1994, Florida State University            --
+--             Copyright (C) 1995-2003, Ada Core Technologies               --
 --                                                                          --
 -- 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- --
@@ -26,8 +27,8 @@
 -- however invalidate  any other reasons why  the executable file  might be --
 -- 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. (http://www.gnat.com).     --
+-- GNARL was developed by the GNARL team at Florida State University.       --
+-- Extensive contributions were provided by Ada Core Technologies, Inc.     --
 --                                                                          --
 ------------------------------------------------------------------------------
 
@@ -120,7 +121,7 @@
 --  finalization for that type of attribute. On task termination, the
 --  runtime system uses the pointer to call the appropriate deallocator.
 
---  While this gets around the limitation that instantiations be at
+--  While this gets around the limitation that instantations be at
 --  the library level, it relies on an implementation feature that
 --  may not always be safe, i.e. that it is safe to call the
 --  Deallocate procedure for an instantiation of Ada.Task_Attributes
@@ -286,11 +287,6 @@ package body Ada.Task_Attributes is
    -- Unchecked Conversions --
    ---------------------------
 
-   pragma Warnings (Off);
-   --  These unchecked conversions can give warnings when alignments
-   --  are incorrect, but they will not be used in such cases anyway,
-   --  so the warnings can be safely ignored.
-
    --  The following type corresponds to Dummy_Wrapper,
    --  declared in System.Tasking.Task_Attributes.
 
@@ -306,7 +302,9 @@ package body Ada.Task_Attributes is
    --  they will not actually be used.
 
    function To_Attribute_Handle is new Unchecked_Conversion
-     (Access_Address, Attribute_Handle);
+     (System.Address, Attribute_Handle);
+   function To_Direct_Attribute_Element is new Unchecked_Conversion
+     (System.Address, Direct_Attribute_Element);
    --  For reference to directly addressed task attributes
 
    type Access_Integer_Address is access all
@@ -346,11 +344,7 @@ package body Ada.Task_Attributes is
      (Task_Identification.Task_Id, Task_ID);
    --  To access TCB of identified task
 
-   Null_ID : constant Task_ID := To_Task_ID (Task_Identification.Null_Task_Id);
-   --  ??? need comments on use and purpose
-
-   type Local_Deallocator is
-      access procedure (P : in out Access_Node);
+   type Local_Deallocator is access procedure (P : in out Access_Node);
 
    function To_Lib_Level_Deallocator is new Unchecked_Conversion
      (Local_Deallocator, Deallocator);
@@ -380,6 +374,12 @@ package body Ada.Task_Attributes is
       --  The generic formal type, may be controlled
    end record;
 
+   --  A number of unchecked conversions involving Wrapper_Access sources
+   --  are performed in this unit. We have to ensure that the designated
+   --  object is always strictly enough aligned.
+
+   for Wrapper'Alignment use Standard'Maximum_Alignment;
+
    procedure Free is
       new Unchecked_Deallocation (Wrapper, Access_Wrapper);
 
@@ -388,10 +388,6 @@ package body Ada.Task_Attributes is
 
    begin
       Free (T);
-
-   exception
-      when others =>
-         pragma Assert (Shutdown ("Exception in Deallocate")); null;
    end Deallocate;
 
    ---------------
@@ -403,12 +399,11 @@ package body Ada.Task_Attributes is
       return Attribute_Handle
    is
       TT            : Task_ID := To_Task_ID (T);
-      Error_Message : constant String := "Trying to get the reference of a";
+      Error_Message : constant String := "Trying to get the reference of a ";
 
    begin
-      if TT = Null_ID then
-         Raise_Exception (Program_Error'Identity,
-           Error_Message & "null task");
+      if TT = null then
+         Raise_Exception (Program_Error'Identity, Error_Message & "null task");
       end if;
 
       if TT.Common.State = Terminated then
@@ -416,71 +411,67 @@ package body Ada.Task_Attributes is
            Error_Message & "terminated task");
       end if;
 
-      begin
-         Defer_Abortion;
-         POP.Lock_RTS;
+      --  Directly addressed case
 
-         --  Directly addressed case
-
-         if Local.Index /= 0 then
-            POP.Unlock_RTS;
-            Undefer_Abortion;
+      if Local.Index /= 0 then
 
-            --  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).
+         --  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);
+         pragma Warnings (Off);
+         return
+           To_Attribute_Handle (TT.Direct_Attributes (Local.Index)'Address);
+         pragma Warnings (On);
 
-         --  Not directly addressed
+      --  Not directly addressed
 
-         else
-            declare
-               P : Access_Node := To_Access_Node (TT.Indirect_Attributes);
-               W : Access_Wrapper;
+      else
+         declare
+            P : Access_Node := To_Access_Node (TT.Indirect_Attributes);
+            W : Access_Wrapper;
 
-            begin
-               while P /= null loop
-                  if P.Instance = Access_Instance'(Local'Unchecked_Access) then
-                     POP.Unlock_RTS;
-                     Undefer_Abortion;
-                     return To_Access_Wrapper (P.Wrapper).Value'Access;
-                  end if;
+         begin
+            Defer_Abortion;
+            POP.Lock_RTS;
 
-                  P := P.Next;
-               end loop;
+            while P /= null loop
+               if P.Instance = Access_Instance'(Local'Unchecked_Access) then
+                  POP.Unlock_RTS;
+                  Undefer_Abortion;
+                  return To_Access_Wrapper (P.Wrapper).Value'Access;
+               end if;
 
-               --  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.
+               P := P.Next;
+            end loop;
 
-               POP.Unlock_RTS;
-               W := new Wrapper'
-                     ((null, Local'Unchecked_Access, null), Initial_Value);
-               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_RTS;
-               Undefer_Abortion;
-               return W.Value'Access;
-            end;
-         end if;
+            --  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.
 
-         pragma Assert (Shutdown ("Should never get here in Reference"));
-         return null;
+            POP.Unlock_RTS;
+            W := new Wrapper'
+                  ((null, Local'Unchecked_Access, null), Initial_Value);
+            POP.Lock_RTS;
 
-      exception
-         when others =>
+            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_RTS;
             Undefer_Abortion;
-            raise;
-      end;
+            return W.Value'Access;
+
+         exception
+            when others =>
+               POP.Unlock_RTS;
+               Undefer_Abortion;
+               raise;
+         end;
+      end if;
+
+      pragma Assert (Shutdown ("Should never get here in Reference"));
+      return null;
 
    exception
       when Tasking_Error | Program_Error =>
@@ -498,12 +489,11 @@ package body Ada.Task_Attributes is
      (T : Task_Identification.Task_Id := Task_Identification.Current_Task)
    is
       TT : Task_ID := To_Task_ID (T);
-      Error_Message : constant String := "Trying to Reinitialize a";
+      Error_Message : constant String := "Trying to Reinitialize a ";
 
    begin
-      if TT = Null_ID then
-         Raise_Exception (Program_Error'Identity,
-           Error_Message & "null task");
+      if TT = null then
+         Raise_Exception (Program_Error'Identity, Error_Message & "null task");
       end if;
 
       if TT.Common.State = Terminated then
@@ -511,11 +501,12 @@ package body Ada.Task_Attributes is
            Error_Message & "terminated task");
       end if;
 
-      if Local.Index = 0 then
+      if Local.Index /= 0 then
+         Set_Value (Initial_Value, T);
+      else
          declare
             P, Q : Access_Node;
             W    : Access_Wrapper;
-
          begin
             Defer_Abortion;
             POP.Lock_RTS;
@@ -547,10 +538,8 @@ package body Ada.Task_Attributes is
             when others =>
                POP.Unlock_RTS;
                Undefer_Abortion;
+               raise;
          end;
-
-      else
-         Set_Value (Initial_Value, T);
       end if;
 
    exception
@@ -569,13 +558,12 @@ package body Ada.Task_Attributes is
      (Val : Attribute;
       T   : Task_Identification.Task_Id := Task_Identification.Current_Task)
    is
-      TT          : Task_ID := To_Task_ID (T);
-      Error_Message : constant String := "Trying to Set the Value of a";
+      TT            : Task_ID := To_Task_ID (T);
+      Error_Message : constant String := "Trying to Set the Value of a ";
 
    begin
-      if TT = Null_ID then
-         Raise_Exception (Program_Error'Identity,
-           Error_Message & "null task");
+      if TT = null then
+         Raise_Exception (Program_Error'Identity, Error_Message & "null task");
       end if;
 
       if TT.Common.State = Terminated then
@@ -583,61 +571,55 @@ package body Ada.Task_Attributes is
            Error_Message & "terminated task");
       end if;
 
-      begin
-         Defer_Abortion;
-         POP.Lock_RTS;
+      --  Directly addressed case
 
-         --  Directly addressed case
+      if Local.Index /= 0 then
 
-         if Local.Index /= 0 then
+         --  Set attribute handle, warnings off, because this code can generate
+         --  alignment warnings with large attributes (but of course will not
+         --  be executed in this case, since we never have direct addressing in
+         --  such cases).
 
-            --  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)'Address).all := Val;
+         pragma Warnings (On);
+         return;
+      end if;
 
-            pragma Warnings (Off);
-            To_Attribute_Handle
-               (TT.Direct_Attributes (Local.Index)'Access).all := Val;
-            pragma Warnings (On);
-            POP.Unlock_RTS;
-            Undefer_Abortion;
-            return;
+      --  Not directly addressed
 
-         --  Not directly addressed
+      declare
+         P : Access_Node := To_Access_Node (TT.Indirect_Attributes);
+         W : Access_Wrapper;
 
-         else
-            declare
-               P : Access_Node := To_Access_Node (TT.Indirect_Attributes);
-               W : Access_Wrapper;
+      begin
+         Defer_Abortion;
+         POP.Lock_RTS;
 
-            begin
-               while P /= null loop
+         while P /= null loop
 
-                  if P.Instance = Access_Instance'(Local'Unchecked_Access) then
-                     To_Access_Wrapper (P.Wrapper).Value := Val;
-                     POP.Unlock_RTS;
-                     Undefer_Abortion;
-                     return;
-                  end if;
+            if P.Instance = Access_Instance'(Local'Unchecked_Access) then
+               To_Access_Wrapper (P.Wrapper).Value := Val;
+               POP.Unlock_RTS;
+               Undefer_Abortion;
+               return;
+            end if;
 
-                  P := P.Next;
-               end loop;
+            P := P.Next;
+         end loop;
 
-               --  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.
+         --  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_RTS;
-               W := new Wrapper'
-                     ((null, Local'Unchecked_Access, null), Val);
-               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);
-            end;
-         end if;
+         POP.Unlock_RTS;
+         W := new Wrapper'((null, Local'Unchecked_Access, null), Val);
+         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_RTS;
          Undefer_Abortion;
@@ -649,15 +631,12 @@ package body Ada.Task_Attributes is
             raise;
       end;
 
-      return;
-
    exception
       when Tasking_Error | Program_Error =>
          raise;
 
       when others =>
          raise Program_Error;
-
    end Set_Value;
 
    -----------
@@ -668,14 +647,12 @@ package body Ada.Task_Attributes is
      (T    : Task_Identification.Task_Id := Task_Identification.Current_Task)
       return Attribute
    is
-      Result        : Attribute;
       TT            : Task_ID := To_Task_ID (T);
-      Error_Message : constant String := "Trying to get the Value of a";
+      Error_Message : constant String := "Trying to get the Value of a ";
 
    begin
-      if TT = Null_ID then
-         Raise_Exception
-           (Program_Error'Identity, Error_Message & "null task");
+      if TT = null then
+         Raise_Exception (Program_Error'Identity, Error_Message & "null task");
       end if;
 
       if TT.Common.State = Terminated then
@@ -683,56 +660,52 @@ package body Ada.Task_Attributes is
            (Program_Error'Identity, Error_Message & "terminated task");
       end if;
 
-      begin
-         --  Directly addressed case
-
-         if Local.Index /= 0 then
+      --  Directly addressed case
 
-            --  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);
+      if Local.Index /= 0 then
 
-         --  Not directly addressed
+         --  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.
 
-         else
-            declare
-               P : Access_Node;
+         pragma Warnings (Off);
+         return To_Attribute_Handle
+           (TT.Direct_Attributes (Local.Index)'Address).all;
+         pragma Warnings (On);
+      end if;
 
-            begin
-               Defer_Abortion;
-               POP.Lock_RTS;
-               P := To_Access_Node (TT.Indirect_Attributes);
+      --  Not directly addressed
 
-               while P /= null loop
-                  if P.Instance = Access_Instance'(Local'Unchecked_Access) then
-                     POP.Unlock_RTS;
-                     Undefer_Abortion;
-                     return To_Access_Wrapper (P.Wrapper).Value;
-                  end if;
+      declare
+         P      : Access_Node;
+         Result : Attribute;
 
-                  P := P.Next;
-               end loop;
+      begin
+         Defer_Abortion;
+         POP.Lock_RTS;
+         P := To_Access_Node (TT.Indirect_Attributes);
 
-               Result := Initial_Value;
+         while P /= null loop
+            if P.Instance = Access_Instance'(Local'Unchecked_Access) then
+               Result := To_Access_Wrapper (P.Wrapper).Value;
                POP.Unlock_RTS;
                Undefer_Abortion;
+               return Result;
+            end if;
 
-            exception
-               when others =>
-                  POP.Unlock_RTS;
-                  Undefer_Abortion;
-                  raise;
-            end;
-         end if;
+            P := P.Next;
+         end loop;
 
-         return Result;
+         POP.Unlock_RTS;
+         Undefer_Abortion;
+         return Initial_Value;
+
+      exception
+         when others =>
+            POP.Unlock_RTS;
+            Undefer_Abortion;
+            raise;
       end;
 
    exception
@@ -774,11 +747,11 @@ begin
       --  Try to find space for the attribute in the TCB.
 
       Local.Index := 0;
-      Two_To_J := 2 ** Direct_Index'First;
+      Two_To_J := 1;
 
       if Attribute'Size <= System.Address'Size then
-         for J in Direct_Index loop
-            if (Two_To_J and In_Use) /= 0 then
+         for J in Direct_Index_Range loop
+            if (Two_To_J and In_Use) = 0 then
 
                --  Reserve location J for this attribute
 
@@ -804,7 +777,6 @@ begin
       --  Attribute goes directly in the TCB
 
       if Local.Index /= 0 then
-
          --  Replace stub for initialization routine
          --  that is called at task creation.
 
@@ -815,13 +787,11 @@ begin
 
          declare
             C : System.Tasking.Task_ID := System.Tasking.All_Tasks_List;
-
          begin
             while C /= null loop
-               POP.Write_Lock (C);
                C.Direct_Attributes (Local.Index) :=
-                 System.Storage_Elements.To_Address (Local.Initial_Value);
-               POP.Unlock (C);
+                 To_Direct_Attribute_Element
+                   (System.Storage_Elements.To_Address (Local.Initial_Value));
                C := C.Common.All_Tasks_Link;
             end loop;
          end;
@@ -834,19 +804,9 @@ begin
 
          Initialization.Finalize_Attributes_Link :=
            System.Tasking.Task_Attributes.Finalize_Attributes'Access;
-
       end if;
 
       POP.Unlock_RTS;
       Undefer_Abortion;
-
-   exception
-      when others => null;
-         pragma Assert (Shutdown ("Exception in task attribute initializer"));
-
-         --  If we later decide to allow exceptions to propagate, we need to
-         --  not only release locks and undefer abortion, we also need to undo
-         --  any initializations that succeeded up to this point, or we will
-         --  risk a dangling reference when the task terminates.
    end;
 end Ada.Task_Attributes;