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, 101 insertions, 86 deletions

diff --git a/gcc/ada/sem_cat.adb b/gcc/ada/sem_cat.adb
index 3360f6e5db7..bb33f4cf27f 100644
--- a/gcc/ada/sem_cat.adb
+++ b/gcc/ada/sem_cat.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2001, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2003, 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- --
@@ -34,6 +34,7 @@ with Fname;    use Fname;
 with Lib;      use Lib;
 with Nlists;   use Nlists;
 with Sem;      use Sem;
+with Sem_Eval; use Sem_Eval;
 with Sem_Util; use Sem_Util;
 with Sinfo;    use Sinfo;
 with Snames;   use Snames;
@@ -93,7 +94,7 @@ package body Sem_Cat is
    --  a preelaborated library unit.
 
    procedure Validate_Remote_Access_Object_Type_Declaration (T : Entity_Id);
-   --  Check validity of declaration if RCI unit. It should not contain
+   --  Check validity of declaration if RCI or RT unit. It should not contain
    --  the declaration of an access-to-object type unless it is a
    --  general access type that designates a class-wide limited
    --  private type. There are also constraints about the primitive
@@ -114,7 +115,7 @@ package body Sem_Cat is
       Info_Node       : Node_Id;
       Is_Subunit      : Boolean)
    is
-      N                  : Node_Id := Info_Node;
+      N : constant Node_Id := Info_Node;
 
       type Categorization is
          (Pure, Shared_Passive, Remote_Types,
@@ -127,6 +128,10 @@ package body Sem_Cat is
       --  Check categorization flags from entity, and return in the form
       --  of a corresponding enumeration value.
 
+      ------------------------
+      -- Get_Categorization --
+      ------------------------
+
       function Get_Categorization (E : Entity_Id) return Categorization is
       begin
          if Is_Preelaborated (E) then
@@ -220,8 +225,8 @@ package body Sem_Cat is
            and then not Is_Static_Expression (Expression (Component_Decl))
          then
             Error_Msg_Sloc := Sloc (Component_Decl);
-            Error_Msg_N
-              ("object in preelaborated unit has nonstatic default#",
+            Error_Msg_F
+              ("object in preelaborated unit has non-static default#",
                Obj_Decl);
 
          --  Fix this later ???
@@ -333,7 +338,6 @@ package body Sem_Cat is
 
    function In_Subprogram_Task_Protected_Unit return Boolean is
       E : Entity_Id;
-      K : Entity_Kind;
 
    begin
       --  The following is to verify that a declaration is inside
@@ -344,16 +348,11 @@ package body Sem_Cat is
 
       E := Current_Scope;
       loop
-         K := Ekind (E);
-
-         if        K = E_Procedure
-           or else K = E_Function
-           or else K = E_Generic_Procedure
-           or else K = E_Generic_Function
-           or else K = E_Task_Type
-           or else K = E_Task_Subtype
-           or else K = E_Protected_Type
-           or else K = E_Protected_Subtype
+         if Is_Subprogram (E)
+              or else
+            Is_Generic_Subprogram (E)
+              or else
+            Is_Concurrent_Type (E)
          then
             return True;
 
@@ -363,7 +362,6 @@ package body Sem_Cat is
 
          E := Scope (E);
       end loop;
-
    end In_Subprogram_Task_Protected_Unit;
 
    -------------------------------
@@ -546,10 +544,59 @@ package body Sem_Cat is
       end;
    end Set_Categorization_From_Pragmas;
 
+   -----------------------------------
+   -- Set_Categorization_From_Scope --
+   -----------------------------------
+
+   procedure Set_Categorization_From_Scope (E : Entity_Id; Scop : Entity_Id) is
+      Declaration   : Node_Id := Empty;
+      Specification : Node_Id := Empty;
+
+   begin
+      Set_Is_Pure (E,
+        Is_Pure (Scop) and then Is_Library_Level_Entity (E));
+
+      if not Is_Remote_Call_Interface (E) then
+         if Ekind (E) in Subprogram_Kind then
+            Declaration := Unit_Declaration_Node (E);
+
+            if False
+              or else Nkind (Declaration) = N_Subprogram_Body
+              or else Nkind (Declaration) = N_Subprogram_Renaming_Declaration
+            then
+               Specification := Corresponding_Spec (Declaration);
+            end if;
+         end if;
+
+         --  A subprogram body or renaming-as-body is a remote call
+         --  interface if it serves as the completion of a subprogram
+         --  declaration that is a remote call interface.
+
+         if Nkind (Specification) in N_Entity then
+            Set_Is_Remote_Call_Interface
+              (E, Is_Remote_Call_Interface (Specification));
+
+         --  A subprogram declaration is a remote call interface when it is
+         --  declared within the visible part of, or declared by, a library
+         --  unit declaration that is a remote call interface.
+
+         else
+            Set_Is_Remote_Call_Interface
+              (E, Is_Remote_Call_Interface (Scop)
+                    and then not (In_Private_Part (Scop)
+                                    or else In_Package_Body (Scop)));
+         end if;
+      end if;
+
+      Set_Is_Remote_Types (E, Is_Remote_Types (Scop));
+   end Set_Categorization_From_Scope;
+
    ------------------------------
    -- Static_Discriminant_Expr --
    ------------------------------
 
+   --  We need to accomodate a Why_Not_Static call somehow here ???
+
    function Static_Discriminant_Expr (L : List_Id) return Boolean is
       Discriminant_Spec : Node_Id;
 
@@ -600,9 +647,9 @@ package body Sem_Cat is
                  ("named access type not allowed in pure unit", T);
             end if;
 
-            --  Check for RCI unit type declaration. It should not contain
-            --  the declaration of an access-to-object type unless it is a
-            --  general access type that designates a class-wide limited
+            --  Check for RCI or RT unit type declaration. It should not
+            --  contain the declaration of an access-to-object type unless it
+            --  is a general access type that designates a class-wide limited
             --  private type. There are also constraints about the primitive
             --  subprograms of the class-wide type.
 
@@ -617,22 +664,18 @@ package body Sem_Cat is
          when others => null;
       end case;
 
-      --  Set Categorization flag of package on entity as well, to allow
-      --  easy checks later on for required validations of RCI units. This
-      --  is only done for entities that are in the original source.
-
-      if Comes_From_Source (T) then
-         if Is_Remote_Call_Interface (Scope (T))
-           and then not In_Package_Body (Scope (T))
-         then
-            Set_Is_Remote_Call_Interface (T);
-         end if;
+      --  Set categorization flag from package on entity as well, to allow
+      --  easy checks later on for required validations of RCI or RT units.
+      --  This is only done for entities that are in the original source.
 
-         if Is_Remote_Types (Scope (T))
-           and then not In_Package_Body (Scope (T))
-         then
-            Set_Is_Remote_Types (T);
-         end if;
+      if Comes_From_Source (T)
+        and then not (In_Package_Body (Scope (T))
+                        or else In_Private_Part (Scope (T)))
+      then
+         Set_Is_Remote_Call_Interface
+           (T, Is_Remote_Call_Interface (Scope (T)));
+         Set_Is_Remote_Types
+           (T, Is_Remote_Types (Scope (T)));
       end if;
    end Validate_Access_Type_Declaration;
 
@@ -641,8 +684,8 @@ package body Sem_Cat is
    ----------------------------
 
    procedure Validate_Ancestor_Part (N : Node_Id) is
-      A : constant Node_Id := Ancestor_Part (N);
-      T : Entity_Id        := Entity (A);
+      A : constant Node_Id   := Ancestor_Part (N);
+      T : constant Entity_Id := Entity (A);
 
    begin
       if In_Preelaborated_Unit
@@ -718,7 +761,7 @@ package body Sem_Cat is
          return;
       end if;
 
-      --  Process with clauses
+      --  Process explicit with_clauses that are not limited.
 
       declare
          Item             : Node_Id;
@@ -729,7 +772,8 @@ package body Sem_Cat is
 
          while Present (Item) loop
             if Nkind (Item) = N_With_Clause
-              and then not Implicit_With (Item)
+              and then not (Implicit_With (Item)
+                              or else Limited_Present (Item))
             then
                Entity_Of_Withed := Entity (Name (Item));
                Check_Categorization_Dependencies
@@ -1053,13 +1097,12 @@ package body Sem_Cat is
 
    begin
       E := First_Entity (P);
-
       while Present (E) loop
          if Comes_From_Source (E) then
-
             if Is_Limited_Type (E) then
                Error_Msg_N
                  ("Limited type not allowed in rci unit", Parent (E));
+               Explain_Limited_Type (E, Parent (E));
 
             elsif Ekind (E) = E_Generic_Function
               or else Ekind (E) = E_Generic_Package
@@ -1103,7 +1146,7 @@ package body Sem_Cat is
    -----------------------------------------
 
    procedure Validate_RCI_Subprogram_Declaration (N : Node_Id) is
-      K               : Node_Kind := Nkind (N);
+      K               : constant Node_Kind := Nkind (N);
       Profile         : List_Id;
       Id              : Node_Id;
       Param_Spec      : Node_Id;
@@ -1178,7 +1221,6 @@ package body Sem_Cat is
                           and then not (Has_Private_Declaration (Param_Type))
                           and then Comes_From_Source (N)))
             then
-
                --  A limited parameter is legal only if user-specified
                --  Read and Write attributes exist for it.
                --  second part of RM E.2.3 (14)
@@ -1186,7 +1228,7 @@ package body Sem_Cat is
                if No (Full_View (Param_Type))
                  and then Ekind (Param_Type) /= E_Record_Type
                then
-                  --  type does not have completion yet, so if declared in
+                  --  Type does not have completion yet, so if declared in
                   --  in the current RCI scope it is illegal, and will be
                   --  flagged subsequently.
                   return;
@@ -1194,10 +1236,10 @@ package body Sem_Cat is
 
                Base_Param_Type := Base_Type (Underlying_Type (Param_Type));
 
-               if No (TSS (Base_Param_Type, Name_uRead))
-                 or else No (TSS (Base_Param_Type, Name_uWrite))
+               if No (TSS (Base_Param_Type, TSS_Stream_Read))
+                    or else
+                  No (TSS (Base_Param_Type, TSS_Stream_Write))
                then
-
                   if K = N_Subprogram_Declaration then
                      Error_Node := Param_Spec;
                   end if;
@@ -1205,6 +1247,7 @@ package body Sem_Cat is
                   Error_Msg_N
                     ("limited parameter in rci unit "
                        & "must have read/write attributes ", Error_Node);
+                  Explain_Limited_Type (Param_Type, Error_Node);
                end if;
             end if;
 
@@ -1226,7 +1269,6 @@ package body Sem_Cat is
       Profile                : List_Id;
       Param_Spec             : Node_Id;
       Param_Type             : Entity_Id;
-      Limited_Type_Decl      : Node_Id;
 
    begin
       --  We are called from Analyze_Type_Declaration, and the Nkind
@@ -1247,8 +1289,8 @@ package body Sem_Cat is
          return;
       end if;
 
-      --  Check RCI unit type declaration. It should not contain the
-      --  declaration of an access-to-object type unless it is a
+      --  Check RCI or RT unit type declaration. It may not contain
+      --  the declaration of an access-to-object type unless it is a
       --  general access type that designates a class-wide limited
       --  private type. There are also constraints about the primitive
       --  subprograms of the class-wide type (RM E.2.3(14)).
@@ -1269,7 +1311,6 @@ package body Sem_Cat is
       end if;
 
       Direct_Designated_Type := Designated_Type (T);
-
       Desig_Type := Etype (Direct_Designated_Type);
 
       if not Is_Recursively_Limited_Private (Desig_Type) then
@@ -1326,23 +1367,22 @@ package body Sem_Cat is
             then
                --  Not a controlling parameter, so type must have Read
                --  and Write attributes.
-               --  ??? I suspect this to be dead code because any violation
-               --  should be caught before in sem_attr.adb (with the message
-               --  "limited type ... used in ... has no stream attr.").  ST
 
                if Nkind (Param_Type) in N_Has_Etype
                  and then Nkind (Parent (Etype (Param_Type))) =
                           N_Private_Type_Declaration
                then
                   Param_Type := Etype (Param_Type);
-                  Limited_Type_Decl := Parent (Param_Type);
 
-                  if No (TSS (Param_Type, Name_uRead))
-                    or else No (TSS (Param_Type, Name_uWrite))
+                  if No (TSS (Param_Type, TSS_Stream_Read))
+                       or else
+                     No (TSS (Param_Type, TSS_Stream_Write))
                   then
                      Error_Msg_N
                        ("limited formal must have Read and Write attributes",
                          Param_Spec);
+                     Explain_Limited_Type
+                       (Etype (Defining_Identifier (Param_Spec)), Param_Spec);
                   end if;
                end if;
             end if;
@@ -1497,33 +1537,6 @@ package body Sem_Cat is
       end if;
    end Validate_Remote_Access_To_Class_Wide_Type;
 
-   -----------------------------------------------
-   -- Validate_Remote_Access_To_Subprogram_Type --
-   -----------------------------------------------
-
-   procedure Validate_Remote_Access_To_Subprogram_Type (N : Node_Id) is
-      Type_Def          : constant Node_Id := Type_Definition (N);
-      Current_Parameter : Node_Id;
-
-   begin
-      if Present (Parameter_Specifications (Type_Def)) then
-         Current_Parameter := First (Parameter_Specifications (Type_Def));
-         while Present (Current_Parameter) loop
-            if Nkind (Parameter_Type (Current_Parameter)) =
-                                                         N_Access_Definition
-            then
-               Error_Msg_N
-                 ("remote access to subprogram type declaration contains",
-                  Current_Parameter);
-               Error_Msg_N
-                 ("\parameter of an anonymous access type", Current_Parameter);
-            end if;
-
-            Current_Parameter := Next (Current_Parameter);
-         end loop;
-      end if;
-   end Validate_Remote_Access_To_Subprogram_Type;
-
    ------------------------------------------
    -- Validate_Remote_Type_Type_Conversion --
    ------------------------------------------
@@ -1764,7 +1777,8 @@ package body Sem_Cat is
                    or else Present (Enclosing_Generic_Body (N)))
       then
          if Ekind (Entity (N)) = E_Variable then
-            Error_Msg_N ("non-static object name in preelaborated unit", N);
+            Flag_Non_Static_Expr
+              ("non-static object name in preelaborated unit", N);
 
          --  We take the view that a constant defined in another preelaborated
          --  unit is preelaborable, even though it may have a private type and
@@ -1793,7 +1807,8 @@ package body Sem_Cat is
             then
                null;
             else
-               Error_Msg_N ("non-static constant in preelaborated unit", N);
+               Flag_Non_Static_Expr
+                 ("non-static constant in preelaborated unit", N);
             end if;
          end if;
       end if;