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, 548 insertions, 299 deletions

diff --git a/gcc/ada/ali.adb b/gcc/ada/ali.adb
index 919bc87a144..0ad9d6e705e 100644
--- a/gcc/ada/ali.adb
+++ b/gcc/ada/ali.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- --
@@ -24,12 +24,13 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Butil;   use Butil;
-with Debug;   use Debug;
-with Fname;   use Fname;
-with Namet;   use Namet;
-with Osint;   use Osint;
-with Output;  use Output;
+with Butil;    use Butil;
+with Debug;    use Debug;
+with Fname;    use Fname;
+with Namet;    use Namet;
+with Opt;      use Opt;
+with Osint;    use Osint;
+with Output;   use Output;
 
 package body ALI is
 
@@ -45,12 +46,24 @@ package body ALI is
       --  When (re)initializing ALI data structures the ALI user expects to
       --  get a fresh set of data structures. Thus we first need to erase the
       --  marks put in the name table by the previous set of ALI routine calls.
-      --  This loop is empty and harmless the first time in.
+      --  These two loops are empty and harmless the first time in.
 
       for J in ALIs.First .. ALIs.Last loop
          Set_Name_Table_Info (ALIs.Table (J).Afile, 0);
       end loop;
 
+      for J in Units.First .. Units.Last loop
+         Set_Name_Table_Info (Units.Table (J).Uname, 0);
+      end loop;
+
+      --  Free argument table strings
+
+      for J in Args.First .. Args.Last loop
+         Free (Args.Table (J));
+      end loop;
+
+      --  Initialize all tables
+
       ALIs.Init;
       Units.Init;
       Withs.Init;
@@ -74,7 +87,6 @@ package body ALI is
       No_Normalize_Scalars_Specified       := False;
       No_Object_Specified                  := False;
       Normalize_Scalars_Specified          := False;
-      No_Run_Time_Specified                := False;
       Queuing_Policy_Specified             := ' ';
       Static_Elaboration_Model_Used        := False;
       Task_Dispatching_Policy_Specified    := ' ';
@@ -88,12 +100,14 @@ package body ALI is
    --------------
 
    function Scan_ALI
-     (F         : File_Name_Type;
-      T         : Text_Buffer_Ptr;
-      Ignore_ED : Boolean;
-      Err       : Boolean;
-      Read_Xref : Boolean := False)
-      return      ALI_Id
+     (F            : File_Name_Type;
+      T            : Text_Buffer_Ptr;
+      Ignore_ED    : Boolean;
+      Err          : Boolean;
+      Read_Xref    : Boolean := False;
+      Read_Lines   : String := "";
+      Ignore_Lines : String := "X")
+      return         ALI_Id
    is
       P         : Text_Ptr := T'First;
       Line      : Logical_Line_Number := 1;
@@ -102,6 +116,14 @@ package body ALI is
       NS_Found  : Boolean;
       First_Arg : Arg_Id;
 
+      Ignore : array (Character range 'A' .. 'Z') of Boolean;
+      --  Ignore (X) is set to True if lines starting with X are to
+      --  be ignored by Scan_ALI and skipped, and False if the lines
+      --  are to be read and processed.
+
+      Bad_ALI_Format : exception;
+      --  Exception raised by Fatal_Error if Err is True
+
       function At_Eol return Boolean;
       --  Test if at end of line
 
@@ -114,8 +136,6 @@ package body ALI is
       procedure Checkc (C : Character);
       --  Check next character is C. If so bump past it, if not fatal error
 
-      Bad_ALI_Format : exception;
-
       procedure Fatal_Error;
       --  Generate fatal error message for badly formatted ALI file if
       --  Err is false, or raise Bad_ALI_Format if Err is True.
@@ -123,19 +143,21 @@ package body ALI is
       function Getc return Character;
       --  Get next character, bumping P past the character obtained
 
-      function Get_Name (Lower : Boolean := False) return Name_Id;
+      function Get_Name (Lower : Boolean := False;
+                         Ignore_Spaces : Boolean := False) return Name_Id;
       --  Skip blanks, then scan out a name (name is left in Name_Buffer with
       --  length in Name_Len, as well as being returned in Name_Id form).
       --  If Lower is set to True then the Name_Buffer will be converted to
       --  all lower case, for systems where file names are not case sensitive.
       --  This ensures that gnatbind works correctly regardless of the case
       --  of the file name on all systems. The name is terminated by a either
-      --  white space or a typeref bracket or an equal sign except for the
-      --  special case of an operator name starting with a double quite which
-      --  is terminated by another double quote.
+      --  white space (when Ignore_Spaces is False) or a typeref bracket or
+      --  an equal sign except for the special case of an operator name
+      --  starting with a double quite which is terminated by another double
+      --  quote.
 
       function Get_Nat return Nat;
-      --  Skip blanks, then scan out an unsigned integer value in Nat range
+      --  Skip blanks, then scan out an unsigned integer value in Nat range.
 
       function Get_Stamp return Time_Stamp_Type;
       --  Skip blanks, then scan out a time stamp
@@ -144,7 +166,11 @@ package body ALI is
       --  Return current character without modifying pointer P
 
       procedure Skip_Eol;
-      --  Skip past end of line (fatal error if not at end of line)
+      --  Skip past spaces, then skip past end of line (fatal error if not
+      --  at end of line). Also skips past any following blank lines.
+
+      procedure Skip_Line;
+      --  Skip rest of current line and any following blank lines.
 
       procedure Skip_Space;
       --  Skip past white space (blanks or horizontal tab)
@@ -291,7 +317,8 @@ package body ALI is
       -- Get_Name --
       --------------
 
-      function Get_Name (Lower : Boolean := False) return Name_Id is
+      function Get_Name (Lower : Boolean := False;
+                         Ignore_Spaces : Boolean := False) return Name_Id is
       begin
          Name_Len := 0;
          Skip_Space;
@@ -304,13 +331,13 @@ package body ALI is
             Name_Len := Name_Len + 1;
             Name_Buffer (Name_Len) := Getc;
 
-            exit when At_End_Of_Field;
+            exit when At_End_Of_Field and not Ignore_Spaces;
 
             if Name_Buffer (1) = '"' then
                exit when Name_Len > 1 and then Name_Buffer (Name_Len) = '"';
 
             else
-               exit when At_End_Of_Field
+               exit when (At_End_Of_Field and not Ignore_Spaces)
                  or else Nextc = '(' or else Nextc = ')'
                  or else Nextc = '{' or else Nextc = '}'
                  or else Nextc = '<' or else Nextc = '>'
@@ -415,6 +442,7 @@ package body ALI is
       procedure Skip_Eol is
       begin
          Skip_Space;
+
          if not At_Eol then Fatal_Error; end if;
 
          --  Loop to skip past blank lines (first time through skips this EOL)
@@ -428,6 +456,19 @@ package body ALI is
          end loop;
       end Skip_Eol;
 
+      ---------------
+      -- Skip_Line --
+      ---------------
+
+      procedure Skip_Line is
+      begin
+         while not At_Eol loop
+            P := P + 1;
+         end loop;
+
+         Skip_Eol;
+      end Skip_Line;
+
       ----------------
       -- Skip_Space --
       ----------------
@@ -439,11 +480,36 @@ package body ALI is
          end loop;
       end Skip_Space;
 
-   --------------------------------------
-   -- Start of processing for Scan_ALI --
-   --------------------------------------
+   --  Start of processing for Scan_ALI
 
    begin
+      --  Acquire lines to be ignored
+
+      if Read_Xref then
+         Ignore := ('U' | 'W' | 'D' | 'X' => False, others => True);
+
+      --  Read_Lines parameter given
+
+      elsif Read_Lines /= "" then
+         Ignore := ('U' => False, others => True);
+
+         for J in Read_Lines'Range loop
+            Ignore (Read_Lines (J)) := False;
+         end loop;
+
+      --  Process Ignore_Lines parameter
+
+      else
+         Ignore := (others => False);
+
+         for J in Ignore_Lines'Range loop
+            pragma Assert (Ignore_Lines (J) /= 'U');
+            Ignore (Ignore_Lines (J)) := True;
+         end loop;
+      end if;
+
+      --  Setup ALI Table entry with appropriate defaults
+
       ALIs.Increment_Last;
       Id := ALIs.Last;
       Set_Name_Table_Info (F, Int (Id));
@@ -451,16 +517,17 @@ package body ALI is
       ALIs.Table (Id) := (
         Afile                      => F,
         Compile_Errors             => False,
+        First_Interrupt_State      => Interrupt_States.Last + 1,
         First_Sdep                 => No_Sdep_Id,
         First_Unit                 => No_Unit_Id,
         Float_Format               => 'I',
+        Last_Interrupt_State       => Interrupt_States.Last,
         Last_Sdep                  => No_Sdep_Id,
         Last_Unit                  => No_Unit_Id,
         Locking_Policy             => ' ',
         Main_Priority              => -1,
         Main_Program               => None,
         No_Object                  => False,
-        No_Run_Time                => False,
         Normalize_Scalars          => False,
         Ofile_Full_Name            => Full_Object_File_Name,
         Queuing_Policy             => ' ',
@@ -472,68 +539,87 @@ package body ALI is
         Unit_Exception_Table       => False,
         Ver                        => (others => ' '),
         Ver_Len                    => 0,
+        Interface                  => False,
         Zero_Cost_Exceptions       => False);
 
+      --  Now we acquire the input lines from the ALI file. Note that the
+      --  convention in the following code is that as we enter each section,
+      --  C is set to contain the first character of the following line.
+
+      C := Getc;
+
       --  Acquire library version
 
-      Checkc ('V');
-      Checkc (' ');
-      Skip_Space;
-      Checkc ('"');
+      if C /= 'V' then
+         Fatal_Error;
 
-      for J in 1 .. Ver_Len_Max loop
-         C := Getc;
-         exit when C = '"';
-         ALIs.Table (Id).Ver (J) := C;
-         ALIs.Table (Id).Ver_Len := J;
-      end loop;
+      elsif Ignore ('V') then
+         Skip_Line;
+
+      else
+         Checkc (' ');
+         Skip_Space;
+         Checkc ('"');
 
-      Skip_Eol;
+         for J in 1 .. Ver_Len_Max loop
+            C := Getc;
+            exit when C = '"';
+            ALIs.Table (Id).Ver (J) := C;
+            ALIs.Table (Id).Ver_Len := J;
+         end loop;
 
-      --  Acquire main program line if present
+         Skip_Eol;
+      end if;
 
       C := Getc;
 
-      if C = 'M' then
-         Checkc (' ');
-         Skip_Space;
+      --  Acquire main program line if present
 
-         C := Getc;
+      if C = 'M' then
+         if Ignore ('M') then
+            Skip_Line;
 
-         if C = 'F' then
-            ALIs.Table (Id).Main_Program := Func;
-         elsif C = 'P' then
-            ALIs.Table (Id).Main_Program := Proc;
          else
-            P := P - 1;
-            Fatal_Error;
-         end if;
+            Checkc (' ');
+            Skip_Space;
 
-         Skip_Space;
+            C := Getc;
 
-         if not At_Eol then
-            if Nextc < 'A' then
-               ALIs.Table (Id).Main_Priority := Get_Nat;
+            if C = 'F' then
+               ALIs.Table (Id).Main_Program := Func;
+            elsif C = 'P' then
+               ALIs.Table (Id).Main_Program := Proc;
+            else
+               P := P - 1;
+               Fatal_Error;
             end if;
 
             Skip_Space;
 
-            if Nextc = 'T' then
-               P := P + 1;
+            if not At_Eol then
+               if Nextc < 'A' then
+                  ALIs.Table (Id).Main_Priority := Get_Nat;
+               end if;
+
+               Skip_Space;
+
+               if Nextc = 'T' then
+                  P := P + 1;
+                  Checkc ('=');
+                  ALIs.Table (Id).Time_Slice_Value := Get_Nat;
+               end if;
+
+               Skip_Space;
+
+               Checkc ('W');
                Checkc ('=');
-               ALIs.Table (Id).Time_Slice_Value := Get_Nat;
+               ALIs.Table (Id).WC_Encoding := Getc;
             end if;
 
-            Skip_Space;
-
-            Checkc ('W');
-            Checkc ('=');
-            ALIs.Table (Id).WC_Encoding := Getc;
+            Skip_Eol;
          end if;
 
-         Skip_Eol;
          C := Getc;
-
       end if;
 
       --  Acquire argument lines
@@ -541,106 +627,151 @@ package body ALI is
       First_Arg := Args.Last + 1;
 
       Arg_Loop : while C = 'A' loop
-         Checkc (' ');
-         Name_Len := 0;
+         if Ignore ('A') then
+            Skip_Line;
 
-         while not At_Eol loop
-            Name_Len := Name_Len + 1;
-            Name_Buffer (Name_Len) := Getc;
-         end loop;
+         else
+            Checkc (' ');
+            Name_Len := 0;
+
+            while not At_Eol loop
+               Name_Len := Name_Len + 1;
+               Name_Buffer (Name_Len) := Getc;
+            end loop;
 
-         Args.Increment_Last;
-         Args.Table (Args.Last) := new String'(Name_Buffer (1 .. Name_Len));
+            Args.Increment_Last;
+            Args.Table (Args.Last) := new String'(Name_Buffer (1 .. Name_Len));
+
+            Skip_Eol;
+         end if;
 
-         Skip_Eol;
          C := Getc;
       end loop Arg_Loop;
 
-      --  Acquire P line, first set defaults
+      --  Acquire P line
 
       if C /= 'P' then
          Fatal_Error;
-      end if;
 
-      NS_Found := False;
+      elsif Ignore ('P') then
+         Skip_Line;
 
-      while not At_Eol loop
-         Checkc (' ');
-         Skip_Space;
-         C := Getc;
+      else
+         NS_Found := False;
 
-         if C = 'C' then
-            Checkc ('E');
-            ALIs.Table (Id).Compile_Errors := True;
+         while not At_Eol loop
+            Checkc (' ');
+            Skip_Space;
+            C := Getc;
+
+            --  Processing for CE
 
-         elsif C = 'F' then
-            Float_Format_Specified := Getc;
-            ALIs.Table (Id).Float_Format := Float_Format_Specified;
+            if C = 'C' then
+               Checkc ('E');
+               ALIs.Table (Id).Compile_Errors := True;
 
-         elsif C = 'L' then
-            Locking_Policy_Specified := Getc;
-            ALIs.Table (Id).Locking_Policy := Locking_Policy_Specified;
+            --  Processing for FD/FG/FI
 
-         elsif C = 'N' then
-            C := Getc;
+            elsif C = 'F' then
+               Float_Format_Specified := Getc;
+               ALIs.Table (Id).Float_Format := Float_Format_Specified;
 
-            if C = 'O' then
-               ALIs.Table (Id).No_Object := True;
-               No_Object_Specified := True;
+            --  Processing for Lx
 
-            elsif C = 'R' then
-               No_Run_Time_Specified := True;
-               ALIs.Table (Id).No_Run_Time := True;
+            elsif C = 'L' then
+               Locking_Policy_Specified := Getc;
+               ALIs.Table (Id).Locking_Policy := Locking_Policy_Specified;
+
+            --  Processing for flags starting with N
+
+            elsif C = 'N' then
+               C := Getc;
+
+               --  Processing for NO
+
+               if C = 'O' then
+                  ALIs.Table (Id).No_Object := True;
+                  No_Object_Specified := True;
+
+               --  Processing for NR
+
+               elsif C = 'R' then
+                  No_Run_Time_Mode           := True;
+                  Configurable_Run_Time_Mode := True;
+
+               --  Processing for NS
+
+               elsif C = 'S' then
+                  ALIs.Table (Id).Normalize_Scalars := True;
+                  Normalize_Scalars_Specified := True;
+                  NS_Found := True;
+
+               else
+                  Fatal_Error;
+               end if;
+
+            --  Processing for Qx
+
+            elsif C = 'Q' then
+               Queuing_Policy_Specified := Getc;
+               ALIs.Table (Id).Queuing_Policy := Queuing_Policy_Specified;
+
+            --  Processing for SL
 
             elsif C = 'S' then
-               ALIs.Table (Id).Normalize_Scalars := True;
-               Normalize_Scalars_Specified := True;
-               NS_Found := True;
+               Checkc ('L');
+               ALIs.Table (Id).Interface := True;
 
-            else
-               Fatal_Error;
-            end if;
+            --  Processing for Tx
 
-         elsif C = 'Q' then
-            Queuing_Policy_Specified := Getc;
-            ALIs.Table (Id).Queuing_Policy := Queuing_Policy_Specified;
+            elsif C = 'T' then
+               Task_Dispatching_Policy_Specified := Getc;
+               ALIs.Table (Id).Task_Dispatching_Policy :=
+                 Task_Dispatching_Policy_Specified;
 
-         elsif C = 'T' then
-            Task_Dispatching_Policy_Specified := Getc;
-            ALIs.Table (Id).Task_Dispatching_Policy :=
-              Task_Dispatching_Policy_Specified;
+            --  Processing for UA
 
-         elsif C = 'U' then
-            if Nextc = 'A' then
-               Unreserve_All_Interrupts_Specified := True;
-               C := Getc;
+            elsif C = 'U' then
+               if Nextc = 'A' then
+                  Unreserve_All_Interrupts_Specified := True;
+                  C := Getc;
 
-            else
+               --  Processing for UX
+
+               else
+                  Checkc ('X');
+                  ALIs.Table (Id).Unit_Exception_Table := True;
+               end if;
+
+            --  Processing for ZX
+
+            elsif C = 'Z' then
                Checkc ('X');
-               ALIs.Table (Id).Unit_Exception_Table := True;
-            end if;
+                  ALIs.Table (Id).Zero_Cost_Exceptions := True;
+                  Zero_Cost_Exceptions_Specified := True;
 
-         elsif C = 'Z' then
-            Checkc ('X');
-               ALIs.Table (Id).Zero_Cost_Exceptions := True;
-               Zero_Cost_Exceptions_Specified := True;
+            else
+               Fatal_Error;
+            end if;
+         end loop;
 
-         else
-            Fatal_Error;
+         if not NS_Found then
+            No_Normalize_Scalars_Specified := True;
          end if;
-      end loop;
 
-      if not NS_Found then
-         No_Normalize_Scalars_Specified := True;
+         Skip_Eol;
       end if;
 
-      Skip_Eol;
+      C := Getc;
 
       --  Acquire restrictions line
 
-      if Getc /= 'R' then
+      if C /= 'R' then
          Fatal_Error;
 
+      elsif Ignore ('R') then
+         Skip_Line;
+
       else
          Checkc (' ');
          Skip_Space;
@@ -666,17 +797,48 @@ package body ALI is
             end case;
          end loop;
 
-         if At_Eol then
-            Skip_Eol;
-            C := Getc;
+         Skip_Eol;
+      end if;
+
+      C := Getc;
+
+      --  Acquire 'I' lines if present
+
+      while C = 'I' loop
+         if Ignore ('I') then
+            Skip_Line;
+
          else
-            Fatal_Error;
+            declare
+               Int_Num : Nat;
+               I_State : Character;
+               Line_No : Nat;
+
+            begin
+               Int_Num := Get_Nat;
+               Skip_Space;
+               I_State := Getc;
+               Line_No := Get_Nat;
+
+               Interrupt_States.Append (
+                 (Interrupt_Id    => Int_Num,
+                  Interrupt_State => I_State,
+                  IS_Pragma_Line  => Line_No));
+
+               ALIs.Table (Id).Last_Interrupt_State := Interrupt_States.Last;
+               Skip_Eol;
+            end;
          end if;
-      end if;
+
+         C := Getc;
+      end loop;
 
       --  Loop to acquire unit entries
 
       Unit_Loop : while C = 'U' loop
+
+         --  Note: as per spec, we never ignore U lines
+
          Checkc (' ');
          Skip_Space;
          Units.Increment_Last;
@@ -708,6 +870,7 @@ package body ALI is
          Units.Table (Units.Last).First_With      := Withs.Last + 1;
          Units.Table (Units.Last).First_Arg       := First_Arg;
          Units.Table (Units.Last).Elab_Position   := 0;
+         Units.Table (Units.Last).Interface       := ALIs.Table (Id).Interface;
 
          if Debug_Flag_U then
             Write_Str (" ----> reading unit ");
@@ -790,6 +953,13 @@ package body ALI is
                   Units.Table (Units.Last).Version (J) := C;
                end loop;
 
+            --  BN parameter (Body needed)
+
+            elsif C = 'B' then
+               Checkc ('N');
+               Check_At_End_Of_Field;
+               Units.Table (Units.Last).Body_Needed_For_SAL := True;
+
             --  DE parameter (Dynamic elaboration checks
 
             elsif C = 'D' then
@@ -941,7 +1111,6 @@ package body ALI is
             else
                Fatal_Error;
             end if;
-
          end loop;
 
          Skip_Eol;
@@ -954,64 +1123,71 @@ package body ALI is
             Static_Elaboration_Model_Used := True;
          end if;
 
-         --  Scan out With lines for this unit
-
          C := Getc;
 
-         With_Loop : while C = 'W' loop
-            Checkc (' ');
-            Skip_Space;
-            Withs.Increment_Last;
-            Withs.Table (Withs.Last).Uname              := Get_Name;
-            Withs.Table (Withs.Last).Elaborate          := False;
-            Withs.Table (Withs.Last).Elaborate_All      := False;
-            Withs.Table (Withs.Last).Elab_All_Desirable := False;
+         --  Scan out With lines for this unit
 
-            --  Generic case with no object file available
+         With_Loop : while C = 'W' loop
+            if Ignore ('W') then
+               Skip_Line;
 
-            if At_Eol then
-               Withs.Table (Withs.Last).Sfile := No_File;
-               Withs.Table (Withs.Last).Afile := No_File;
+            else
+               Checkc (' ');
+               Skip_Space;
+               Withs.Increment_Last;
+               Withs.Table (Withs.Last).Uname              := Get_Name;
+               Withs.Table (Withs.Last).Elaborate          := False;
+               Withs.Table (Withs.Last).Elaborate_All      := False;
+               Withs.Table (Withs.Last).Elab_All_Desirable := False;
+               Withs.Table (Withs.Last).Interface          := False;
 
-            --  Normal case
+               --  Generic case with no object file available
 
-            else
-               Withs.Table (Withs.Last).Sfile := Get_Name (Lower => True);
-               Withs.Table (Withs.Last).Afile := Get_Name;
+               if At_Eol then
+                  Withs.Table (Withs.Last).Sfile := No_File;
+                  Withs.Table (Withs.Last).Afile := No_File;
 
-               --  Scan out possible E, EA, and NE parameters
+               --  Normal case
 
-               while not At_Eol loop
-                  Skip_Space;
+               else
+                  Withs.Table (Withs.Last).Sfile := Get_Name (Lower => True);
+                  Withs.Table (Withs.Last).Afile := Get_Name;
 
-                  if Nextc = 'E' then
-                     P := P + 1;
+                  --  Scan out possible E, EA, and NE parameters
 
-                     if At_End_Of_Field then
-                        Withs.Table (Withs.Last).Elaborate := True;
+                  while not At_Eol loop
+                     Skip_Space;
 
-                     elsif Nextc = 'A' then
+                     if Nextc = 'E' then
                         P := P + 1;
-                        Check_At_End_Of_Field;
-                        Withs.Table (Withs.Last).Elaborate_All := True;
 
-                     else
-                        Checkc ('D');
-                        Check_At_End_Of_Field;
+                        if At_End_Of_Field then
+                           Withs.Table (Withs.Last).Elaborate := True;
 
-                        --  Store ED indication unless ignore required
+                        elsif Nextc = 'A' then
+                           P := P + 1;
+                           Check_At_End_Of_Field;
+                           Withs.Table (Withs.Last).Elaborate_All := True;
+
+                        else
+                           Checkc ('D');
+                           Check_At_End_Of_Field;
 
-                        if not Ignore_ED then
-                           Withs.Table (Withs.Last).Elab_All_Desirable := True;
+                           --  Store ED indication unless ignore required
+
+                           if not Ignore_ED then
+                              Withs.Table (Withs.Last).Elab_All_Desirable :=
+                                True;
+                           end if;
                         end if;
                      end if;
-                  end if;
-               end loop;
+                  end loop;
+               end if;
+
+               Skip_Eol;
             end if;
 
-            Skip_Eol;
             C := Getc;
-
          end loop With_Loop;
 
          Units.Table (Units.Last).Last_With := Withs.Last;
@@ -1022,64 +1198,72 @@ package body ALI is
          Name_Len := 0;
 
          Linker_Options_Loop : while C = 'L' loop
-            Checkc (' ');
-            Skip_Space;
-            Checkc ('"');
-
-            loop
-               C := Getc;
-
-               if C < Character'Val (16#20#)
-                 or else C > Character'Val (16#7E#)
-               then
-                  Fatal_Error;
 
-               elsif C = '{' then
-                  C := Character'Val (0);
+            if Ignore ('L') then
+               Skip_Line;
 
-                  declare
-                     V : Natural;
+            else
+               Checkc (' ');
+               Skip_Space;
+               Checkc ('"');
 
-                  begin
-                     V := 0;
-                     for J in 1 .. 2 loop
-                        C := Getc;
+               loop
+                  C := Getc;
 
-                        if C in '0' .. '9' then
-                           V := V * 16 +
-                                  Character'Pos (C) - Character'Pos ('0');
+                  if C < Character'Val (16#20#)
+                    or else C > Character'Val (16#7E#)
+                  then
+                     Fatal_Error;
 
-                        elsif C in 'A' .. 'F' then
-                           V := V * 16 +
-                                  Character'Pos (C) - Character'Pos ('A') + 10;
+                  elsif C = '{' then
+                     C := Character'Val (0);
 
-                        else
-                           Fatal_Error;
-                        end if;
-                     end loop;
+                     declare
+                        V : Natural;
 
-                     Checkc ('}');
+                     begin
+                        V := 0;
+                        for J in 1 .. 2 loop
+                           C := Getc;
+
+                           if C in '0' .. '9' then
+                              V := V * 16 +
+                                     Character'Pos (C) -
+                                       Character'Pos ('0');
+
+                           elsif C in 'A' .. 'F' then
+                              V := V * 16 +
+                                     Character'Pos (C) -
+                                       Character'Pos ('A') +
+                                         10;
+
+                           else
+                              Fatal_Error;
+                           end if;
+                        end loop;
+
+                        Checkc ('}');
+                        Add_Char_To_Name_Buffer (Character'Val (V));
+                     end;
 
-                     Add_Char_To_Name_Buffer (Character'Val (V));
-                  end;
+                  else
+                     if C = '"' then
+                        exit when Nextc /= '"';
+                        C := Getc;
+                     end if;
 
-               else
-                  if C = '"' then
-                     exit when Nextc /= '"';
-                     C := Getc;
+                     Add_Char_To_Name_Buffer (C);
                   end if;
+               end loop;
 
-                  Add_Char_To_Name_Buffer (C);
-               end if;
-            end loop;
-
-            Add_Char_To_Name_Buffer (nul);
+               Add_Char_To_Name_Buffer (nul);
+               Skip_Eol;
+            end if;
 
-            Skip_Eol;
             C := Getc;
          end loop Linker_Options_Loop;
 
-         --  Store the linker options entry
+         --  Store the linker options entry if one was found
 
          if Name_Len /= 0 then
             Linker_Options.Increment_Last;
@@ -1126,24 +1310,30 @@ package body ALI is
       --  Scan out external version references and put in hash table
 
       while C = 'E' loop
-         Checkc (' ');
-         Skip_Space;
+         if Ignore ('E') then
+            Skip_Line;
 
-         Name_Len := 0;
-         Name_Len := 0;
-         loop
-            C := Getc;
+         else
+            Checkc (' ');
+            Skip_Space;
 
-            if C < ' ' then
-               Fatal_Error;
-            end if;
+            Name_Len := 0;
+            Name_Len := 0;
+            loop
+               C := Getc;
 
-            exit when At_End_Of_Field;
-            Add_Char_To_Name_Buffer (C);
-         end loop;
+               if C < ' ' then
+                  Fatal_Error;
+               end if;
+
+               exit when At_End_Of_Field;
+               Add_Char_To_Name_Buffer (C);
+            end loop;
+
+            Version_Ref.Set (new String'(Name_Buffer (1 .. Name_Len)), True);
+            Skip_Eol;
+         end if;
 
-         Version_Ref.Set (new String'(Name_Buffer (1 .. Name_Len)), True);
-         Skip_Eol;
          C := Getc;
       end loop;
 
@@ -1152,101 +1342,121 @@ package body ALI is
       ALIs.Table (Id).First_Sdep := Sdep.Last + 1;
 
       while C = 'D' loop
-         Checkc (' ');
-         Skip_Space;
-         Sdep.Increment_Last;
-         Sdep.Table (Sdep.Last).Sfile := Get_Name (Lower => True);
-         Sdep.Table (Sdep.Last).Stamp := Get_Stamp;
-         Sdep.Table (Sdep.Last).Dummy_Entry :=
-           (Sdep.Table (Sdep.Last).Stamp = Dummy_Time_Stamp);
+         if Ignore ('D') then
+            Skip_Line;
 
-         --  Acquire checksum value
+         else
+            Checkc (' ');
+            Skip_Space;
+            Sdep.Increment_Last;
+            Sdep.Table (Sdep.Last).Sfile := Get_Name (Lower => True);
+            Sdep.Table (Sdep.Last).Stamp := Get_Stamp;
+            Sdep.Table (Sdep.Last).Dummy_Entry :=
+              (Sdep.Table (Sdep.Last).Stamp = Dummy_Time_Stamp);
 
-         Skip_Space;
+            --  Acquire checksum value
 
-         declare
-            Ctr : Natural;
-            Chk : Word;
+            Skip_Space;
 
-         begin
-            Ctr := 0;
-            Chk := 0;
+            declare
+               Ctr : Natural;
+               Chk : Word;
 
-            loop
-               exit when At_Eol or else Ctr = 8;
+            begin
+               Ctr := 0;
+               Chk := 0;
 
-               if Nextc in '0' .. '9' then
-                  Chk := Chk * 16 +
-                           Character'Pos (Nextc) - Character'Pos ('0');
+               loop
+                  exit when At_Eol or else Ctr = 8;
 
-               elsif Nextc in 'a' .. 'f' then
-                  Chk := Chk * 16 +
-                           Character'Pos (Nextc) - Character'Pos ('a') + 10;
+                  if Nextc in '0' .. '9' then
+                     Chk := Chk * 16 +
+                              Character'Pos (Nextc) - Character'Pos ('0');
 
-               else
-                  exit;
-               end if;
+                  elsif Nextc in 'a' .. 'f' then
+                     Chk := Chk * 16 +
+                              Character'Pos (Nextc) - Character'Pos ('a') + 10;
 
-               Ctr := Ctr + 1;
-               P := P + 1;
-            end loop;
+                  else
+                     exit;
+                  end if;
 
-            if Ctr = 8 and then At_End_Of_Field then
-               Sdep.Table (Sdep.Last).Checksum := Chk;
-            else
-               Fatal_Error;
-            end if;
-         end;
+                  Ctr := Ctr + 1;
+                  P := P + 1;
+               end loop;
 
-         --  Acquire subunit and reference file name entries
+               if Ctr = 8 and then At_End_Of_Field then
+                  Sdep.Table (Sdep.Last).Checksum := Chk;
+               else
+                  Fatal_Error;
+               end if;
+            end;
 
-         Sdep.Table (Sdep.Last).Subunit_Name := No_Name;
-         Sdep.Table (Sdep.Last).Rfile        := Sdep.Table (Sdep.Last).Sfile;
-         Sdep.Table (Sdep.Last).Start_Line   := 1;
+            --  Acquire subunit and reference file name entries
 
-         if not At_Eol then
-            Skip_Space;
+            Sdep.Table (Sdep.Last).Subunit_Name := No_Name;
+            Sdep.Table (Sdep.Last).Rfile        :=
+              Sdep.Table (Sdep.Last).Sfile;
+            Sdep.Table (Sdep.Last).Start_Line   := 1;
 
-            --  Here for subunit name
+            if not At_Eol then
+               Skip_Space;
 
-            if Nextc not in '0' .. '9' then
-               Name_Len := 0;
+               --  Here for subunit name
 
-               while not At_End_Of_Field loop
-                  Name_Len := Name_Len + 1;
-                  Name_Buffer (Name_Len) := Getc;
-               end loop;
+               if Nextc not in '0' .. '9' then
+                  Name_Len := 0;
 
-               Sdep.Table (Sdep.Last).Subunit_Name := Name_Enter;
-               Skip_Space;
-            end if;
+                  while not At_End_Of_Field loop
+                     Name_Len := Name_Len + 1;
+                     Name_Buffer (Name_Len) := Getc;
+                  end loop;
 
-            --  Here for reference file name entry
+                  Sdep.Table (Sdep.Last).Subunit_Name := Name_Enter;
+                  Skip_Space;
+               end if;
 
-            if Nextc in '0' .. '9' then
-               Sdep.Table (Sdep.Last).Start_Line := Get_Nat;
-               Checkc (':');
+               --  Here for reference file name entry
 
-               Name_Len := 0;
+               if Nextc in '0' .. '9' then
+                  Sdep.Table (Sdep.Last).Start_Line := Get_Nat;
+                  Checkc (':');
 
-               while not At_End_Of_Field loop
-                  Name_Len := Name_Len + 1;
-                  Name_Buffer (Name_Len) := Getc;
-               end loop;
+                  Name_Len := 0;
+
+                  while not At_End_Of_Field loop
+                     Name_Len := Name_Len + 1;
+                     Name_Buffer (Name_Len) := Getc;
+                  end loop;
 
-               Sdep.Table (Sdep.Last).Rfile := Name_Enter;
+                  Sdep.Table (Sdep.Last).Rfile := Name_Enter;
+               end if;
             end if;
+
+            Skip_Eol;
          end if;
 
-         Skip_Eol;
          C := Getc;
       end loop;
 
       ALIs.Table (Id).Last_Sdep := Sdep.Last;
 
-      --  Loop through Xref sections (skip loop if not reading xref stuff)
+      --  We must at this stage be at an Xref line or the end of file
 
-      while Read_Xref and then C = 'X' loop
+      if C /= EOF and then C /= 'X' then
+         Fatal_Error;
+      end if;
+
+      --  If we are ignoring Xref sections we are done (we ignore all
+      --  remaining lines since only xref related lines follow X).
+
+      if Ignore ('X') and then not Debug_Flag_X then
+         return Id;
+      end if;
+
+      --  Loop through Xref sections
+
+      while C = 'X' loop
 
          --  Make new entry in section table
 
@@ -1266,6 +1476,8 @@ package body ALI is
 
             Current_File_Num := XS.File_Num;
 
+            Skip_Space;
+
             Skip_Eol;
             C := Nextc;
 
@@ -1339,6 +1551,8 @@ package body ALI is
                   XE.Lib    := (Getc = '*');
                   XE.Entity := Get_Name;
 
+                  Current_File_Num := XS.File_Num;
+
                   --  Renaming reference is present
 
                   if Nextc = '=' then
@@ -1379,7 +1593,8 @@ package body ALI is
                         XE.Tref_Line            := 0;
                         XE.Tref_Type            := ' ';
                         XE.Tref_Col             := 0;
-                        XE.Tref_Standard_Entity := Get_Name;
+                        XE.Tref_Standard_Entity :=
+                          Get_Name (Ignore_Spaces => True);
 
                      else
                         N := Get_Nat;
@@ -1400,6 +1615,31 @@ package body ALI is
                         XE.Tref_Standard_Entity := No_Name;
                      end if;
 
+                     --  ??? Temporary workaround for nested generics case:
+                     --     4i4 Directories{1|4I9[4|6[3|3]]}
+                     --  See C918-002
+
+                     declare
+                        Nested_Brackets : Natural := 0;
+                        C               : Character;
+
+                     begin
+                        loop
+                           case Nextc is
+                              when '['   =>
+                                 Nested_Brackets := Nested_Brackets + 1;
+                              when ']' =>
+                                 Nested_Brackets := Nested_Brackets - 1;
+                              when others =>
+                                 if Nested_Brackets = 0 then
+                                    exit;
+                                 end if;
+                           end case;
+
+                           C := Getc;
+                        end loop;
+                     end;
+
                      P := P + 1; -- skip closing bracket
                      Skip_Space;
 
@@ -1417,8 +1657,6 @@ package body ALI is
 
                   --  Loop through cross-references for this entity
 
-                  Current_File_Num := XS.File_Num;
-
                   loop
                      Skip_Space;
 
@@ -1449,6 +1687,17 @@ package body ALI is
 
                         XR.Line  := N;
                         XR.Rtype := Getc;
+
+                        --  Imported entities reference as in:
+                        --    494b<c,__gnat_copy_attribs>25
+                        --  ??? Simply skipped for now
+
+                        if Nextc = '<' then
+                           while Getc /= '>' loop
+                              null;
+                           end loop;
+                        end if;
+
                         XR.Col   := Get_Nat;
 
                         if Nextc = '[' then