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, 353 insertions, 141 deletions

diff --git a/gcc/ada/rtsfind.adb b/gcc/ada/rtsfind.adb
index b4876838eb1..5759855b9b9 100644
--- a/gcc/ada/rtsfind.adb
+++ b/gcc/ada/rtsfind.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2002, 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- --
@@ -24,33 +24,41 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Atree;     use Atree;
-with Casing;    use Casing;
-with Csets;     use Csets;
-with Debug;     use Debug;
-with Einfo;     use Einfo;
-with Elists;    use Elists;
-with Fname;     use Fname;
-with Fname.UF;  use Fname.UF;
-with Lib;       use Lib;
-with Lib.Load;  use Lib.Load;
-with Namet;     use Namet;
-with Nlists;    use Nlists;
-with Nmake;     use Nmake;
-with Output;    use Output;
-with Opt;       use Opt;
-with Restrict;  use Restrict;
-with Sem;       use Sem;
-with Sem_Ch7;   use Sem_Ch7;
-with Sem_Util;  use Sem_Util;
-with Sinfo;     use Sinfo;
-with Stand;     use Stand;
-with Snames;    use Snames;
-with Tbuild;    use Tbuild;
-with Uname;     use Uname;
+with Atree;    use Atree;
+with Casing;   use Casing;
+with Csets;    use Csets;
+with Debug;    use Debug;
+with Einfo;    use Einfo;
+with Elists;   use Elists;
+with Errout;   use Errout;
+with Fname;    use Fname;
+with Fname.UF; use Fname.UF;
+with Lib;      use Lib;
+with Lib.Load; use Lib.Load;
+with Namet;    use Namet;
+with Nlists;   use Nlists;
+with Nmake;    use Nmake;
+with Output;   use Output;
+with Opt;      use Opt;
+with Sem;      use Sem;
+with Sem_Ch7;  use Sem_Ch7;
+with Sem_Util; use Sem_Util;
+with Sinfo;    use Sinfo;
+with Stand;    use Stand;
+with Snames;   use Snames;
+with Tbuild;   use Tbuild;
+with Uname;    use Uname;
 
 package body Rtsfind is
 
+   RTE_Available_Call : Boolean := False;
+   --  Set True during call to RTE from RTE_Available. Tells RTE to set
+   --  RTE_Is_Available to False rather than generating an error message.
+
+   RTE_Is_Available : Boolean;
+   --  Set True by RTE_Available on entry. When RTE_Available_Call is set
+   --  True, set False if RTE would otherwise generate an error message.
+
    ----------------
    -- Unit table --
    ----------------
@@ -89,38 +97,56 @@ package body Rtsfind is
    --------------------------
 
    --  When a unit is implicitly loaded as a result of a call to RTE, it
-   --  is necessary to create an implicit with to ensure that the object
-   --  is correctly loaded by the binder. Such with statements are only
+   --  is necessary to create an implicit WITH to ensure that the object
+   --  is correctly loaded by the binder. Such WITH statements are only
    --  required when the request is from the extended main unit (if a
-   --  client needs a with, that will be taken care of when the client
-   --  is compiled.
+   --  client needs a WITH, that will be taken care of when the client
+   --  is compiled).
 
-   --  We always attach the with to the main unit. This is not perfectly
+   --  We always attach the WITH to the main unit. This is not perfectly
    --  accurate in terms of elaboration requirements, but it is close
    --  enough, since the units that are accessed using rtsfind do not
    --  have delicate elaboration requirements.
 
    --  The flag Withed in the unit table record is initially set to False.
-   --  It is set True if a with has been generated for the main unit for
+   --  It is set True if a WITH has been generated for the main unit for
    --  the corresponding unit.
 
    -----------------------
    -- Local Subprograms --
    -----------------------
 
-   procedure Load_Fail (S : String; U_Id : RTU_Id; Ent_Name : String := "");
-   --  Internal procedure called if we can't find the entity or unit.
-   --  The parameter is a detailed error message that is to be given.
-   --  S is a reason for failing to compile the file. U_Id is the unit
-   --  id, and Ent_Name, if non-null, is the associated entity name.
+   procedure Entity_Not_Defined (Id : RE_Id);
+   --  Outputs error messages for an entity that is not defined in the
+   --  run-time library (the form of the error message is tailored for
+   --  no run time/configurable run time mode as required).
+
+   procedure Load_Fail (S : String; U_Id : RTU_Id; Id : RE_Id);
+   --  Internal procedure called if we can't sucessfully locate or
+   --  process a run-time unit. The parameters give information about
+   --  the error message to be given. S is a reason for failing to
+   --  compile the file and U_Id is the unit id. RE_Id is the RE_Id
+   --  originally passed to RTE. The message in S is one of the
+   --  following:
+   --
+   --     "not found"
+   --     "had parser errors"
+   --     "had semantic errors"
+   --
+   --  The "not found" case is treated specially in that it is considered
+   --  a normal situation in configurable run-time mode (and the message in
+   --  this case is suppressed unless we are operating in All_Errors_Mode).
 
    function Get_Unit_Name (U_Id : RTU_Id) return Unit_Name_Type;
    --  Retrieves the Unit Name given a unit id represented by its
    --  enumaration value in RTU_Id.
 
-   procedure Load_RTU (U_Id : RTU_Id; Use_Setting : Boolean := False);
+   procedure Load_RTU
+     (U_Id        : RTU_Id;
+      Id          : RE_Id   := RE_Null;
+      Use_Setting : Boolean := False);
    --  Load the unit whose Id is given if not already loaded. The unit is
-   --  loaded, analyzed, and added to the with list, and the entry in
+   --  loaded, analyzed, and added to the WITH list, and the entry in
    --  RT_Unit_Table is updated to reflect the load. The second parameter
    --  indicates the initial setting for the Is_Potentially_Use_Visible
    --  flag of the entity for the loaded unit (if it is indeed loaded).
@@ -128,10 +154,26 @@ package body Rtsfind is
    --  True indicates that this flag must be set to True. It is needed
    --  only in the Text_IO_Kludge procedure, which may materialize an
    --  entity of Text_IO (or Wide_Text_IO) that was previously unknown.
+   --  Id is the RE_Id value of the entity which was originally requested.
+   --  Id is used only for error message detail, and if it is RE_Null, then
+   --  the attempt to output the entity name is ignored.
+
+   procedure Output_Entity_Name (Id : RE_Id; Msg : String);
+   --  Output continuation error message giving qualified name of entity
+   --  corresponding to Id, appending the string given by Msg. This call
+   --  is only effective in All_Errors mode.
 
    function RE_Chars (E : RE_Id) return Name_Id;
    --  Given a RE_Id value returns the Chars of the corresponding entity.
 
+   procedure RTE_Error_Msg (Msg : String);
+   --  Generates a message by calling Error_Msg_N specifying Current_Error_Node
+   --  as the node location using the given Msg text. Special processing in the
+   --  case where RTE_Available_Call is set. In this case, no message is output
+   --  and instead RTE_Is_Available is set to False. Note that this can only be
+   --  used if you are sure that the message comes directly or indirectly from
+   --  a call to the RTE function.
+
    -------------------
    -- Get_Unit_Name --
    -------------------
@@ -153,6 +195,9 @@ package body Rtsfind is
          elsif U_Id in Ada_Finalization_Child then
             Name_Buffer (17) := '.';
 
+         elsif U_Id in Ada_Interrupts_Child then
+            Name_Buffer (15) := '.';
+
          elsif U_Id in Ada_Real_Time_Child then
             Name_Buffer (14) := '.';
 
@@ -310,6 +355,16 @@ package body Rtsfind is
       end if;
    end Is_RTE;
 
+   ------------
+   -- Is_RTU --
+   ------------
+
+   function Is_RTU (Ent : Entity_Id;  U : RTU_Id) return Boolean is
+      E : constant Entity_Id := RT_Unit_Table (U).Entity;
+   begin
+      return Present (E) and then E = Ent;
+   end Is_RTU;
+
    ----------------------------
    -- Is_Text_IO_Kludge_Unit --
    ----------------------------
@@ -344,62 +399,82 @@ package body Rtsfind is
         Nkind (Sel) = N_Identifier
           and then
         Chars (Sel) in Text_IO_Package_Name;
-
    end Is_Text_IO_Kludge_Unit;
 
+   ------------------------
+   -- Entity_Not_Defined --
+   ------------------------
+
+   procedure Entity_Not_Defined (Id : RE_Id) is
+   begin
+      if No_Run_Time_Mode then
+         RTE_Error_Msg ("|construct not allowed in no run time mode");
+      elsif Configurable_Run_Time_Mode then
+         RTE_Error_Msg ("|construct not allowed in this configuration>");
+      else
+         RTE_Error_Msg ("run-time configuration error");
+      end if;
+
+      Output_Entity_Name (Id, "not defined");
+   end Entity_Not_Defined;
+
    ---------------
    -- Load_Fail --
    ---------------
 
-   procedure Load_Fail (S : String; U_Id : RTU_Id; Ent_Name : String := "") is
+   procedure Load_Fail (S : String; U_Id : RTU_Id; Id : RE_Id) is
+      M : String (1 .. 100);
+      P : Natural := 0;
+
    begin
-      Set_Standard_Error;
+      --  Output header message
 
-      Write_Str ("fatal error: run-time library configuration error");
-      Write_Eol;
+      if Configurable_Run_Time_Mode then
+         RTE_Error_Msg ("construct not allowed in configurable run-time mode");
+      else
+         RTE_Error_Msg ("run-time library configuration error");
+      end if;
 
-      if Ent_Name /= "" then
-         Write_Str ("cannot locate """);
+      --  Output file name and reason string
 
-         --  Copy name skipping initial RE_ or RO_XX characters
+      if S /= "not found"
+        or else not Configurable_Run_Time_Mode
+      then
+         M (1 .. 6) := "\file ";
+         P := 6;
 
-         if Ent_Name (1 .. 2) = "RE" then
-            for J in 4 .. Ent_Name'Length loop
-               Name_Buffer (J - 3) := Ent_Name (J);
-            end loop;
-         else
-            for J in 7 .. Ent_Name'Length loop
-               Name_Buffer (J - 6) := Ent_Name (J);
-            end loop;
-         end if;
+         Get_Name_String
+           (Get_File_Name (RT_Unit_Table (U_Id).Uname, Subunit => False));
+         M (P + 1 .. P + Name_Len) := Name_Buffer (1 .. Name_Len);
+         P := P + Name_Len;
 
-         Name_Len := Ent_Name'Length - 3;
-         Set_Casing (Mixed_Case);
-         Write_Str (Name_Buffer (1 .. Name_Len));
-         Write_Str (""" in file """);
+         M (P + 1) := ' ';
+         P := P + 1;
 
-      else
-         Write_Str ("cannot load file """);
+         M (P + 1 .. P + S'Length) := S;
+         P := P + S'Length;
+
+         RTE_Error_Msg (M (1 .. P));
+
+         --  Output entity name
+
+         Output_Entity_Name (Id, "not available");
       end if;
 
-      Write_Name
-        (Get_File_Name (RT_Unit_Table (U_Id).Uname, Subunit => False));
-      Write_Str (""" (");
-      Write_Str (S);
-      Write_Char (')');
-      Write_Eol;
-      Set_Standard_Output;
-      raise Unrecoverable_Error;
+      raise RE_Not_Available;
    end Load_Fail;
 
    --------------
    -- Load_RTU --
    --------------
 
-   procedure Load_RTU (U_Id : RTU_Id; Use_Setting : Boolean := False) is
-      Loaded   : Boolean;
+   procedure Load_RTU
+     (U_Id        : RTU_Id;
+      Id          : RE_Id   := RE_Null;
+      Use_Setting : Boolean := False)
+   is
       U        : RT_Unit_Table_Record renames RT_Unit_Table (U_Id);
-      Priv_Par : Elist_Id := New_Elmt_List;
+      Priv_Par : constant Elist_Id := New_Elmt_List;
       Lib_Unit : Node_Id;
 
       procedure Save_Private_Visibility;
@@ -469,7 +544,14 @@ package body Rtsfind is
 
       U.Uname  := Get_Unit_Name (U_Id);
       U.Withed := False;
-      Loaded   := Is_Loaded (U.Uname);
+
+      declare
+         Loaded : Boolean;
+         pragma Warnings (Off, Loaded);
+
+      begin
+         Loaded := Is_Loaded (U.Uname);
+      end;
 
       --  Now do the load call, note that setting Error_Node to Empty is
       --  a signal to Load_Unit that we will regard a failure to find the
@@ -484,22 +566,23 @@ package body Rtsfind is
            Error_Node => Empty);
 
       if U.Unum = No_Unit then
-         Load_Fail ("unit not found", U_Id);
+         Load_Fail ("not found", U_Id, Id);
 
       elsif Fatal_Error (U.Unum) then
-         Load_Fail ("parser errors", U_Id);
+         Load_Fail ("had parser errors", U_Id, Id);
       end if;
 
       --  Make sure that the unit is analyzed
 
       declare
-         Was_Analyzed : Boolean := Analyzed (Cunit (Current_Sem_Unit));
+         Was_Analyzed : constant Boolean :=
+                          Analyzed (Cunit (Current_Sem_Unit));
 
       begin
-         --  Pretend that the current unit is analysed, in case it is
-         --  System or some such. This allows us to put some declarations,
-         --  such as exceptions and packed arrays of Boolean, into System
-         --  even though expanding them requires System...
+         --  Pretend that the current unit is analyzed, in case it is System
+         --  or some such. This allows us to put some declarations, such as
+         --  exceptions and packed arrays of Boolean, into System even though
+         --  expanding them requires System...
 
          --  This is a bit odd but works fine. If the RTS unit does not depend
          --  in any way on the current unit, then it never gets back into the
@@ -509,7 +592,7 @@ package body Rtsfind is
 
          --  If the RTS Unit *does* depend on the current unit, for instance,
          --  when you are compiling System, then you had better have finished
-         --  Analyzing the part of System that is depended on before you try
+         --  analyzing the part of System that is depended on before you try
          --  to load the RTS Unit. This means having the System ordered in an
          --  appropriate manner.
 
@@ -522,7 +605,7 @@ package body Rtsfind is
             Restore_Private_Visibility;
 
             if Fatal_Error (U.Unum) then
-               Load_Fail ("semantic errors", U_Id);
+               Load_Fail ("had semantic errors", U_Id, Id);
             end if;
          end if;
 
@@ -539,6 +622,60 @@ package body Rtsfind is
       end if;
    end Load_RTU;
 
+   -----------------------
+   -- Output_Entity_Name --
+   ------------------------
+
+   procedure Output_Entity_Name (Id : RE_Id; Msg : String) is
+      M : String (1 .. 2048);
+      P : Natural := 0;
+      --  M (1 .. P) is current message to be output
+
+      RE_Image : constant String := RE_Id'Image (Id);
+
+   begin
+      if Id = RE_Null or else not All_Errors_Mode then
+         return;
+      end if;
+
+      M (1 .. 9) := "\entity """;
+      P := 9;
+
+      --  Add unit name to message, excluding %s or %b at end
+
+      Get_Name_String (Get_Unit_Name (RE_Unit_Table (Id)));
+      Name_Len := Name_Len - 2;
+      Set_Casing (Mixed_Case);
+      M (P + 1 .. P + Name_Len) := Name_Buffer (1 .. Name_Len);
+      P := P + Name_Len;
+
+      --  Add a qualifying period
+
+      M (P + 1) := '.';
+      P := P + 1;
+
+      --  Add entity name and closing quote to message
+
+      Name_Len := RE_Image'Length - 3;
+      Name_Buffer (1 .. Name_Len) := RE_Image (4 .. RE_Image'Length);
+      Set_Casing (Mixed_Case);
+      M (P + 1 .. P + Name_Len) := Name_Buffer (1 .. Name_Len);
+      P := P + Name_Len;
+      M (P + 1) := '"';
+      P := P + 1;
+
+      --  Add message
+
+      M (P + 1) := ' ';
+      P := P + 1;
+      M (P + 1 .. P + Msg'Length) := Msg;
+      P := P + Msg'Length;
+
+      --  Output message at current error node location
+
+      RTE_Error_Msg (M (1 .. P));
+   end Output_Entity_Name;
+
    --------------
    -- RE_Chars --
    --------------
@@ -579,19 +716,22 @@ package body Rtsfind is
       Pkg_Ent  : Entity_Id;
       Ename    : Name_Id;
 
-      Ravenscar : constant Boolean := Restricted_Profile;
-
       --  The following flag is used to disable front-end inlining when RTE
       --  is invoked. This prevents the analysis of other runtime bodies when
       --  a particular spec is loaded through Rtsfind. This is both efficient,
       --  and it prevents spurious visibility conflicts between use-visible
       --  user entities, and entities in run-time packages.
 
-      --  In No_Run_Time mode, subprograms marked Inlined_Always must be
-      --  inlined, so in the case we retain the Front_End_Inlining mode.
+      --  In configurable run-time mode, subprograms marked Inlined_Always must
+      --  be inlined, so in the case we retain the Front_End_Inlining mode.
 
       Save_Front_End_Inlining : Boolean;
 
+      function Check_CRT (Eid : Entity_Id) return Entity_Id;
+      --  Check entity Eid to ensure that configurable run-time restrictions
+      --  are met. May generate an error message and raise RE_Not_Available
+      --  if the entity E does not exist (i.e. Eid is Empty)
+
       procedure Check_RPC;
       --  Reject programs that make use of distribution features not supported
       --  on the current target. On such targets (VMS, Vxworks, others?) we
@@ -604,7 +744,36 @@ package body Rtsfind is
 
       function Make_Unit_Name (N : Node_Id) return Node_Id;
       --  If the unit is a child unit, build fully qualified name for use
-      --  in with_clause.
+      --  in With_Clause.
+
+      ---------------
+      -- Check_CRT --
+      ---------------
+
+      function Check_CRT (Eid : Entity_Id) return Entity_Id is
+      begin
+         if No (Eid) then
+            Entity_Not_Defined (E);
+            raise RE_Not_Available;
+
+         --  Entity is available
+
+         else
+            --  If in No_Run_Time mode and entity is not in one of the
+            --  specially permitted units, raise the exception.
+
+            if No_Run_Time_Mode
+                 and then not OK_No_Run_Time_Unit (U_Id)
+            then
+               Entity_Not_Defined (E);
+               raise RE_Not_Available;
+            end if;
+
+            --  Otherwise entity is accessible
+
+            return Eid;
+         end if;
+      end Check_CRT;
 
       ---------------
       -- Check_RPC --
@@ -649,7 +818,8 @@ package body Rtsfind is
 
             if Unum /= No_Unit then
                declare
-                  Decls : List_Id := Declarations (Unit (Cunit (Unum)));
+                  Decls : constant List_Id :=
+                            Declarations (Unit (Cunit (Unum)));
 
                begin
                   if Present (Decls)
@@ -722,20 +892,6 @@ package body Rtsfind is
    --  Start of processing for RTE
 
    begin
-
-      --  Check violation of no run time and ravenscar mode
-
-      if No_Run_Time
-        and then not OK_To_Use_In_No_Run_Time_Mode (U_Id)
-      then
-         if not Ravenscar
-           or else not OK_To_Use_In_Ravenscar_Mode (U_Id)
-         then
-            Disallow_In_No_Run_Time_Mode (Current_Error_Node);
-            return Empty;
-         end if;
-      end if;
-
       --  Doing a rtsfind in system.ads is special, as we cannot do this
       --  when compiling System itself. So if we are compiling system then
       --  we should already have acquired and processed the declaration
@@ -751,16 +907,16 @@ package body Rtsfind is
         and then Analyzed (Main_Unit_Entity)
         and then not Is_Child_Unit (Main_Unit_Entity)
       then
-         return Find_Local_Entity (E);
+         return Check_CRT (Find_Local_Entity (E));
       end if;
 
       Save_Front_End_Inlining := Front_End_Inlining;
-      Front_End_Inlining := No_Run_Time;
+      Front_End_Inlining := Configurable_Run_Time_Mode;
 
       --  Load unit if unit not previously loaded
 
       if No (RE_Table (E)) then
-         Load_RTU (U_Id);
+         Load_RTU (U_Id, Id => E);
          Lib_Unit := Unit (Cunit (U.Unum));
 
          --  In the subprogram case, we are all done, the entity we want
@@ -772,55 +928,54 @@ package body Rtsfind is
          if Nkind (Lib_Unit) = N_Subprogram_Declaration then
             RE_Table (E) := U.Entity;
 
-         --  Otherwise we must have the package case, and here we have to
-         --  search the package entity chain for the entity we want. The
-         --  entity we want must be present in this chain, or we have a
-         --  misconfigured runtime.
+         --  Otherwise we must have the package case. First check package
+         --  entity itself (e.g. RTE_Name for System.Interrupts.Name)
 
          else
             pragma Assert (Nkind (Lib_Unit) = N_Package_Declaration);
             Ename := RE_Chars (E);
 
-            Pkg_Ent := First_Entity (U.Entity);
+            --  First we search the package entity chain
 
-            while Present (Pkg_Ent) loop
-               if Ename = Chars (Pkg_Ent) then
-                  RE_Table (E) := Pkg_Ent;
-                  Check_RPC;
-                  goto Found;
-               end if;
-
-               Next_Entity (Pkg_Ent);
-            end loop;
+               Pkg_Ent := First_Entity (U.Entity);
+               while Present (Pkg_Ent) loop
+                  if Ename = Chars (Pkg_Ent) then
+                     RE_Table (E) := Pkg_Ent;
+                     Check_RPC;
+                     goto Found;
+                  end if;
 
-            --  If we didn't find the unit we want, something is wrong
-            --  although in no run time mode, we already gave a suitable
-            --  message, and so we simply return Empty, and the caller must
-            --  be prepared to handle this if the RTE call is otherwise
-            --  possible in high integrity mode.
+                  Next_Entity (Pkg_Ent);
+               end loop;
 
-            if No_Run_Time
-              and then not OK_To_Use_In_No_Run_Time_Mode (U_Id)
-            then
-               Front_End_Inlining := Save_Front_End_Inlining;
-               return Empty;
+            --  If we did not find the entity in the package entity chain,
+            --  then check if the package entity itself matches. Note that
+            --  we do this check after searching the entity chain, since
+            --  the rule is that in case of ambiguity, we prefer the entity
+            --  defined within the package, rather than the package itself.
 
-            else
-               Load_Fail ("entity not in package", U_Id,  RE_Id'Image (E));
-               raise Program_Error;
+            if Ename = Chars (U.Entity) then
+               RE_Table (E) := U.Entity;
             end if;
+
+            --  If we didn't find the entity we want, something is wrong.
+            --  We just leave RE_Table (E) set to Empty and the appropriate
+            --  action will be taken by Check_CRT when we exit.
+
          end if;
       end if;
 
-      --  See if we have to generate a with for this entity. We generate
-      --  a with if the current unit is part of the extended main code
-      --  unit, and if we have not already added the with. The with is
-      --  added to the appropriate unit (the current one).
+      --  See if we have to generate a WITH for this entity. We generate
+      --  a WITH if the current unit is part of the extended main code
+      --  unit, and if we have not already added the with. The WITH is
+      --  added to the appropriate unit (the current one). We do not need
+      --  to generate a WITH for an
 
    <<Found>>
       if (not U.Withed)
         and then
           In_Extended_Main_Code_Unit (Cunit_Entity (Current_Sem_Unit))
+        and then not RTE_Available_Call
       then
          U.Withed := True;
 
@@ -846,9 +1001,62 @@ package body Rtsfind is
       end if;
 
       Front_End_Inlining := Save_Front_End_Inlining;
-      return RE_Table (E);
+      return Check_CRT (RE_Table (E));
    end RTE;
 
+   -------------------
+   -- RTE_Available --
+   -------------------
+
+   function RTE_Available (E : RE_Id) return Boolean is
+      Dummy : Entity_Id;
+      pragma Warnings (Off, Dummy);
+
+      Result : Boolean;
+
+      Save_RTE_Available_Call : constant Boolean := RTE_Available_Call;
+      Save_RTE_Is_Available   : constant Boolean := RTE_Is_Available;
+      --  These are saved recursively because the call to load a unit
+      --  caused by an upper level call may perform a recursive call
+      --  to this routine during analysis of the corresponding unit.
+
+   begin
+      RTE_Available_Call := True;
+      RTE_Is_Available := True;
+      Dummy := RTE (E);
+      Result := RTE_Is_Available;
+      RTE_Available_Call := Save_RTE_Available_Call;
+      RTE_Is_Available   := Save_RTE_Is_Available;
+      return Result;
+
+   exception
+      when RE_Not_Available =>
+         RTE_Available_Call := Save_RTE_Available_Call;
+         RTE_Is_Available   := Save_RTE_Is_Available;
+         return False;
+   end RTE_Available;
+
+   -------------------
+   -- RTE_Error_Msg --
+   -------------------
+
+   procedure RTE_Error_Msg (Msg : String) is
+   begin
+      if RTE_Available_Call then
+         RTE_Is_Available := False;
+      else
+         Error_Msg_N (Msg, Current_Error_Node);
+
+         --  Bump count of violations if we are in configurable run-time
+         --  mode and this is not a continuation message.
+
+         if Configurable_Run_Time_Mode and then Msg (1) /= '\' then
+            Configurable_Run_Time_Violations :=
+              Configurable_Run_Time_Violations + 1;
+         end if;
+      end if;
+   end RTE_Error_Msg;
+
    --------------------
    -- Text_IO_Kludge --
    --------------------
@@ -858,7 +1066,7 @@ package body Rtsfind is
 
       type Name_Map_Type is array (Text_IO_Package_Name) of RTU_Id;
 
-      Name_Map : Name_Map_Type := Name_Map_Type'(
+      Name_Map : constant Name_Map_Type := Name_Map_Type'(
         Name_Decimal_IO     => Ada_Text_IO_Decimal_IO,
         Name_Enumeration_IO => Ada_Text_IO_Enumeration_IO,
         Name_Fixed_IO       => Ada_Text_IO_Fixed_IO,
@@ -866,7 +1074,7 @@ package body Rtsfind is
         Name_Integer_IO     => Ada_Text_IO_Integer_IO,
         Name_Modular_IO     => Ada_Text_IO_Modular_IO);
 
-      Wide_Name_Map : Name_Map_Type := Name_Map_Type'(
+      Wide_Name_Map : constant Name_Map_Type := Name_Map_Type'(
         Name_Decimal_IO     => Ada_Wide_Text_IO_Decimal_IO,
         Name_Enumeration_IO => Ada_Wide_Text_IO_Enumeration_IO,
         Name_Fixed_IO       => Ada_Wide_Text_IO_Fixed_IO,
@@ -913,12 +1121,16 @@ package body Rtsfind is
                --  we must indicate that they are visible.
 
                if Name_Buffer (1 .. 12) = "a-textio.ads" then
-                  Load_RTU (Name_Map (Chrs), In_Use (Cunit_Entity (U)));
+                  Load_RTU
+                    (Name_Map (Chrs),
+                     Use_Setting => In_Use (Cunit_Entity (U)));
                   Set_Is_Visible_Child_Unit
                     (RT_Unit_Table (Name_Map (Chrs)).Entity);
 
                elsif Name_Buffer (1 .. 12) = "a-witeio.ads" then
-                  Load_RTU (Wide_Name_Map (Chrs), In_Use (Cunit_Entity (U)));
+                  Load_RTU
+                    (Wide_Name_Map (Chrs),
+                     Use_Setting => In_Use (Cunit_Entity (U)));
                   Set_Is_Visible_Child_Unit
                     (RT_Unit_Table (Wide_Name_Map (Chrs)).Entity);
                end if;