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, 307 insertions, 96 deletions

diff --git a/gcc/ada/osint.adb b/gcc/ada/osint.adb
index 5d90b1dd549..88fcd3fd94e 100644
--- a/gcc/ada/osint.adb
+++ b/gcc/ada/osint.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- --
@@ -227,15 +227,22 @@ package body Osint is
    -----------------------------
 
    procedure Add_Default_Search_Dirs is
-      Search_Dir  : String_Access;
-      Search_Path : String_Access;
+      Search_Dir     : String_Access;
+      Search_Path    : String_Access;
+      Path_File_Name : String_Access;
 
       procedure Add_Search_Dir
+        (Search_Dir            : String;
+         Additional_Source_Dir : Boolean);
+      procedure Add_Search_Dir
         (Search_Dir            : String_Access;
          Additional_Source_Dir : Boolean);
       --  Add a source search dir or a library search dir, depending on the
       --  value of Additional_Source_Dir.
 
+      procedure Get_Dirs_From_File (Additional_Source_Dir : Boolean);
+      --  Open a path file and read the directory to search, one per line
+
       function Get_Libraries_From_Registry return String_Ptr;
       --  On Windows systems, get the list of installed standard libraries
       --  from the registry key:
@@ -248,6 +255,18 @@ package body Osint is
       --------------------
 
       procedure Add_Search_Dir
+        (Search_Dir            : String;
+         Additional_Source_Dir : Boolean)
+      is
+      begin
+         if Additional_Source_Dir then
+            Add_Src_Search_Dir (Search_Dir);
+         else
+            Add_Lib_Search_Dir (Search_Dir);
+         end if;
+      end Add_Search_Dir;
+
+      procedure Add_Search_Dir
         (Search_Dir            : String_Access;
          Additional_Source_Dir : Boolean)
       is
@@ -259,6 +278,86 @@ package body Osint is
          end if;
       end Add_Search_Dir;
 
+      ------------------------
+      -- Get_Dirs_From_File --
+      ------------------------
+
+      procedure Get_Dirs_From_File (Additional_Source_Dir : Boolean) is
+         File_FD    : File_Descriptor;
+         Buffer     : String (1 .. Path_File_Name'Length + 1);
+         Len        : Natural;
+         Actual_Len : Natural;
+         S          : String_Access;
+         Curr       : Natural;
+         First      : Natural;
+         Ch         : Character;
+
+         Status : Boolean;
+         --  For the call to Close
+
+      begin
+         --  Construct a C compatible character string buffer.
+
+         Buffer (1 .. Buffer'Last - 1) := Path_File_Name.all;
+         Buffer (Buffer'Last) := ASCII.NUL;
+
+         File_FD := Open_Read (Buffer'Address, Binary);
+
+         --  If we cannot open the file, we ignore it, we don't fail
+
+         if File_FD = Invalid_FD then
+            return;
+         end if;
+
+         Len := Integer (File_Length (File_FD));
+
+         S := new String (1 .. Len);
+
+         --  Read the file. Note that the loop is not necessary since the
+         --  whole file is read at once except on VMS.
+
+         Curr := 1;
+         Actual_Len := Len;
+         while Curr <= Len and then Actual_Len /= 0 loop
+            Actual_Len := Read (File_FD, S (Curr)'Address, Len);
+            Curr := Curr + Actual_Len;
+         end loop;
+
+         --  We are done with the file, so we close it
+
+         Close (File_FD, Status);
+         --  We ignore any error here, because we have successfully read the
+         --  file.
+
+         --  Now, we read line by line
+
+         First := 1;
+         Curr := 0;
+
+         while Curr < Len loop
+            Ch := S (Curr + 1);
+
+            if Ch = ASCII.CR or else Ch = ASCII.LF
+              or else Ch = ASCII.FF or else Ch = ASCII.VT
+            then
+               if First <= Curr then
+                  Add_Search_Dir (S (First .. Curr), Additional_Source_Dir);
+               end if;
+
+               First := Curr + 2;
+            end if;
+
+            Curr := Curr + 1;
+         end loop;
+
+         --  Last line is a special case, if the file does not end with
+         --  an end of line mark.
+
+         if First <= S'Last then
+            Add_Search_Dir (S (First .. S'Last), Additional_Source_Dir);
+         end if;
+      end Get_Dirs_From_File;
+
       ---------------------------------
       -- Get_Libraries_From_Registry --
       ---------------------------------
@@ -299,7 +398,7 @@ package body Osint is
       for Additional_Source_Dir in False .. True loop
 
          if Additional_Source_Dir then
-            Search_Path := Getenv ("ADA_INCLUDE_PATH");
+            Search_Path := Getenv (Ada_Include_Path);
             if Search_Path'Length > 0 then
                if Hostparm.OpenVMS then
                   Search_Path := To_Canonical_Path_Spec ("ADA_INCLUDE_PATH:");
@@ -308,7 +407,7 @@ package body Osint is
                end if;
             end if;
          else
-            Search_Path := Getenv ("ADA_OBJECTS_PATH");
+            Search_Path := Getenv (Ada_Objects_Path);
             if Search_Path'Length > 0 then
                if Hostparm.OpenVMS then
                   Search_Path := To_Canonical_Path_Spec ("ADA_OBJECTS_PATH:");
@@ -326,49 +425,77 @@ package body Osint is
          end loop;
       end loop;
 
-      if not Opt.No_Stdinc then
-         --  For WIN32 systems, look for any system libraries defined in
-         --  the registry. These are added to both source and object
-         --  directories.
+      --  Check for eventual project path file env vars
 
-         Search_Path := String_Access (Get_Libraries_From_Registry);
-         Get_Next_Dir_In_Path_Init (Search_Path);
-         loop
-            Search_Dir := Get_Next_Dir_In_Path (Search_Path);
-            exit when Search_Dir = null;
-            Add_Search_Dir (Search_Dir, False);
-            Add_Search_Dir (Search_Dir, True);
-         end loop;
+      Path_File_Name := Getenv (Project_Include_Path_File);
 
-         --  The last place to look are the defaults
+      if Path_File_Name'Length > 0 then
+         Get_Dirs_From_File (Additional_Source_Dir => True);
+      end if;
 
-         Search_Path := Read_Default_Search_Dirs
-           (String_Access (Update_Path (Search_Dir_Prefix)),
-            Include_Search_File,
-            String_Access (Update_Path (Include_Dir_Default_Name)));
+      Path_File_Name := Getenv (Project_Objects_Path_File);
 
-         Get_Next_Dir_In_Path_Init (Search_Path);
-         loop
-            Search_Dir := Get_Next_Dir_In_Path (Search_Path);
-            exit when Search_Dir = null;
-            Add_Search_Dir (Search_Dir, True);
-         end loop;
+      if Path_File_Name'Length > 0 then
+         Get_Dirs_From_File (Additional_Source_Dir => False);
       end if;
 
-      if not Opt.No_Stdlib and not Opt.RTS_Switch then
-         Search_Path := Read_Default_Search_Dirs
-           (String_Access (Update_Path (Search_Dir_Prefix)),
-            Objects_Search_File,
-            String_Access (Update_Path (Object_Dir_Default_Name)));
+      --  For the compiler, if --RTS= was apecified, add the runtime
+      --  directories.
 
-         Get_Next_Dir_In_Path_Init (Search_Path);
-         loop
-            Search_Dir := Get_Next_Dir_In_Path (Search_Path);
-            exit when Search_Dir = null;
-            Add_Search_Dir (Search_Dir, False);
-         end loop;
-      end if;
+      if RTS_Src_Path_Name /= null and then
+         RTS_Lib_Path_Name /= null
+      then
+         Add_Search_Dirs (RTS_Src_Path_Name, Include);
+         Add_Search_Dirs (RTS_Lib_Path_Name, Objects);
+
+      else
+         if not Opt.No_Stdinc then
+
+            --  For WIN32 systems, look for any system libraries defined in
+            --  the registry. These are added to both source and object
+            --  directories.
+
+            Search_Path := String_Access (Get_Libraries_From_Registry);
+
+            Get_Next_Dir_In_Path_Init (Search_Path);
+            loop
+               Search_Dir := Get_Next_Dir_In_Path (Search_Path);
+               exit when Search_Dir = null;
+               Add_Search_Dir (Search_Dir, False);
+               Add_Search_Dir (Search_Dir, True);
+            end loop;
+
+            --  The last place to look are the defaults
+
+            Search_Path :=
+              Read_Default_Search_Dirs
+                (String_Access (Update_Path (Search_Dir_Prefix)),
+                 Include_Search_File,
+                 String_Access (Update_Path (Include_Dir_Default_Name)));
+
+            Get_Next_Dir_In_Path_Init (Search_Path);
+            loop
+               Search_Dir := Get_Next_Dir_In_Path (Search_Path);
+               exit when Search_Dir = null;
+               Add_Search_Dir (Search_Dir, True);
+            end loop;
+         end if;
 
+         if not Opt.No_Stdlib and not Opt.RTS_Switch then
+            Search_Path :=
+              Read_Default_Search_Dirs
+                (String_Access (Update_Path (Search_Dir_Prefix)),
+                 Objects_Search_File,
+                 String_Access (Update_Path (Object_Dir_Default_Name)));
+
+            Get_Next_Dir_In_Path_Init (Search_Path);
+            loop
+               Search_Dir := Get_Next_Dir_In_Path (Search_Path);
+               exit when Search_Dir = null;
+               Add_Search_Dir (Search_Dir, False);
+            end loop;
+         end if;
+      end if;
    end Add_Default_Search_Dirs;
 
    --------------
@@ -598,11 +725,13 @@ package body Osint is
       Get_Name_String (Name);
       Exec_Suffix := Get_Executable_Suffix;
 
-      for J in Exec_Suffix.all'Range loop
+      for J in Exec_Suffix'Range loop
          Name_Len := Name_Len + 1;
-         Name_Buffer (Name_Len) := Exec_Suffix.all (J);
+         Name_Buffer (Name_Len) := Exec_Suffix (J);
       end loop;
 
+      Free (Exec_Suffix);
+
       return Name_Enter;
    end Executable_Name;
 
@@ -616,17 +745,23 @@ package body Osint is
       --    0 if the object file has been generated (with or without warnings)
       --    1 if recompilation was not needed (smart recompilation)
       --    2 if gnat1 has been killed by a signal (detected by GCC)
-      --    3 if no code has been generated (spec)
       --    4 for a fatal error
       --    5 if there were errors
+      --    6 if no code has been generated (spec)
+      --
+      --  Note that exit code 3 is not used and must not be used as this is
+      --  the code returned by a program aborted via C abort() routine on
+      --  Windows. GCC checks for that case and thinks that the child process
+      --  has been aborted. This code (exit code 3) used to be the code used
+      --  for E_No_Code, but E_No_Code was changed to 6 for this reason.
 
       case Exit_Code is
          when E_Success    => OS_Exit (0);
          when E_Warnings   => OS_Exit (0);
          when E_No_Compile => OS_Exit (1);
-         when E_No_Code    => OS_Exit (3);
          when E_Fatal      => OS_Exit (4);
          when E_Errors     => OS_Exit (5);
+         when E_No_Code    => OS_Exit (6);
          when E_Abort      => OS_Abort;
       end case;
    end Exit_Program;
@@ -636,7 +771,6 @@ package body Osint is
    ----------
 
    procedure Fail (S1 : String; S2 : String := ""; S3 : String := "") is
-
    begin
       --  We use Output in case there is a special output set up.
       --  In this case Set_Standard_Error will have no immediate effect.
@@ -734,7 +868,15 @@ package body Osint is
             --  corresponding path name
 
             if File /= No_File then
-               return File;
+               --  For locally removed file, Error_Name is returned; then
+               --  return No_File, indicating the file is not a source.
+
+               if File = Error_Name then
+                  return No_File;
+
+               else
+                  return File;
+               end if;
             end if;
 
             --  First place to look is in the primary directory (i.e. the same
@@ -958,9 +1100,9 @@ package body Osint is
 
       if Search_Dir (Search_Dir'Last) /= Directory_Separator then
          Local_Search_Dir := new String'
-           (Concat (Search_Dir, String' (1 => Directory_Separator)));
+           (Concat (Search_Dir, String'(1 => Directory_Separator)));
       else
-         Local_Search_Dir := new String' (Search_Dir);
+         Local_Search_Dir := new String'(Search_Dir);
       end if;
 
       if File_Type = Include then
@@ -968,7 +1110,7 @@ package body Osint is
          Default_Suffix_Dir := new String'("adainclude");
       else
          Search_File := Objects_Search_File;
-         Default_Suffix_Dir := new String' ("adalib");
+         Default_Suffix_Dir := new String'("adalib");
       end if;
 
       Norm_Search_Dir := To_Canonical_Path_Spec (Local_Search_Dir.all);
@@ -1015,14 +1157,10 @@ package body Osint is
          end;
 
          Norm_Search_Dir :=
-           new String'
-             (Concat (Current_Dir.all, Local_Search_Dir.all));
+           new String'(Concat (Current_Dir.all, Local_Search_Dir.all));
 
          Result_Search_Dir :=
-           Read_Default_Search_Dirs
-             (String_Access (Update_Path (String_Ptr (Norm_Search_Dir))),
-              Search_File,
-              null);
+           Read_Default_Search_Dirs (Norm_Search_Dir, Search_File, null);
 
          Default_Search_Dir :=
            new String'
@@ -1041,13 +1179,11 @@ package body Osint is
 
             Norm_Search_Dir :=
               new String'
-                (Concat (Search_Dir_Prefix.all, Local_Search_Dir.all));
+              (Concat (Update_Path (Search_Dir_Prefix).all,
+                       Local_Search_Dir.all));
 
             Result_Search_Dir :=
-              Read_Default_Search_Dirs
-                (String_Access (Update_Path (String_Ptr (Norm_Search_Dir))),
-                 Search_File,
-                 null);
+              Read_Default_Search_Dirs (Norm_Search_Dir, Search_File, null);
 
             Default_Search_Dir :=
               new String'
@@ -1065,16 +1201,14 @@ package body Osint is
                --  We finally search in Search_Dir_Prefix/rts-Search_Dir
 
                Temp_String :=
-                 new String'(Concat (Search_Dir_Prefix.all, "rts-"));
+                 new String'
+                 (Concat (Update_Path (Search_Dir_Prefix).all, "rts-"));
 
                Norm_Search_Dir :=
-                 new String' (Concat (Temp_String.all, Local_Search_Dir.all));
+                 new String'(Concat (Temp_String.all, Local_Search_Dir.all));
 
                Result_Search_Dir :=
-                 Read_Default_Search_Dirs
-                   (String_Access (Update_Path (String_Ptr (Norm_Search_Dir))),
-                    Search_File,
-                    null);
+                 Read_Default_Search_Dirs (Norm_Search_Dir, Search_File, null);
 
                Default_Search_Dir :=
                  new String'
@@ -1095,6 +1229,39 @@ package body Osint is
       end if;
    end Get_RTS_Search_Dir;
 
+   ----------------
+   -- Initialize --
+   ----------------
+
+   procedure Initialize is
+   begin
+      Number_File_Names       := 0;
+      Current_File_Name_Index := 0;
+
+      Src_Search_Directories.Init;
+      Lib_Search_Directories.Init;
+
+      --  Start off by setting all suppress options to False, these will
+      --  be reset later (turning some on if -gnato is not specified, and
+      --  turning all of them on if -gnatp is specified).
+
+      Suppress_Options := (others => False);
+
+      --  Reserve the first slot in the search paths table. This is the
+      --  directory of the main source file or main library file and is
+      --  filled in by each call to Next_Main_Source/Next_Main_Lib_File with
+      --  the directory specified for this main source or library file. This
+      --  is the directory which is searched first by default. This default
+      --  search is inhibited by the option -I- for both source and library
+      --  files.
+
+      Src_Search_Directories.Set_Last (Primary_Directory);
+      Src_Search_Directories.Table (Primary_Directory) := new String'("");
+
+      Lib_Search_Directories.Set_Last (Primary_Directory);
+      Lib_Search_Directories.Table (Primary_Directory) := new String'("");
+   end Initialize;
+
    ----------------------------
    -- Is_Directory_Separator --
    ----------------------------
@@ -1181,7 +1348,7 @@ package body Osint is
       if T = Library then
          Dir_Name := Lib_Search_Directories.Table (Dir);
 
-      else pragma Assert (T = Source);
+      else pragma Assert (T /= Config);
          Dir_Name := Src_Search_Directories.Table (Dir);
       end if;
 
@@ -1352,7 +1519,7 @@ package body Osint is
 
       if Running_Program = Make then
          declare
-            Orig_Main : File_Name_Type := Current_Main;
+            Orig_Main : constant File_Name_Type := Current_Main;
 
          begin
             if Strip_Suffix (Orig_Main) = Orig_Main then
@@ -1378,14 +1545,53 @@ package body Osint is
    ------------------------------
 
    function Normalize_Directory_Name (Directory : String) return String_Ptr is
+
+      function Is_Quoted (Path : String) return Boolean;
+      pragma Inline (Is_Quoted);
+      --  Returns true if Path is quoted (either double or single quotes)
+
+      ---------------
+      -- Is_Quoted --
+      ---------------
+
+      function Is_Quoted (Path : String) return Boolean is
+         First : constant Character := Path (Path'First);
+         Last  : constant Character := Path (Path'Last);
+
+      begin
+         if (First = ''' and then Last = ''')
+               or else
+            (First = '"' and then Last = '"')
+         then
+            return True;
+         else
+            return False;
+         end if;
+      end Is_Quoted;
+
       Result : String_Ptr;
 
+   --  Start of processing for Normalize_Directory_Name
+
    begin
       if Directory'Length = 0 then
          Result := new String'(Hostparm.Normalized_CWD);
 
       elsif Is_Directory_Separator (Directory (Directory'Last)) then
          Result := new String'(Directory);
+
+      elsif Is_Quoted (Directory) then
+
+         --  This is a quoted string, it certainly means that the directory
+         --  contains some spaces for example. We can safely remove the quotes
+         --  here as the OS_Lib.Normalize_Arguments will be called before any
+         --  spawn routines. This ensure that quotes will be added when needed.
+
+         Result := new String (1 .. Directory'Length - 1);
+         Result (1 .. Directory'Length - 1) :=
+           Directory (Directory'First + 1 .. Directory'Last - 1);
+         Result (Result'Last) := Directory_Separator;
+
       else
          Result := new String (1 .. Directory'Length + 1);
          Result (1 .. Directory'Length) := Directory;
@@ -1592,7 +1798,7 @@ package body Osint is
 
          else
             if Prev_Was_Separator and then Is_Relative (S.all, J) then
-               S1 (J1 .. J1 + Prefix_Len) := Search_Dir_Prefix.all;
+               S1 (J1 .. J1 + Prefix_Len - 1) := Search_Dir_Prefix.all;
                J1 := J1 + Prefix_Len;
             end if;
 
@@ -1622,6 +1828,9 @@ package body Osint is
       Text : Text_Buffer_Ptr;
       --  Allocated text buffer.
 
+      Status : Boolean;
+      --  For the calls to Close
+
    begin
       Current_Full_Lib_Name := Find_File (Lib_File, Library);
       Current_Full_Obj_Name := Object_File_Name (Current_Full_Lib_Name);
@@ -1670,12 +1879,16 @@ package body Osint is
 
             elsif Fatal_Err then
                Get_Name_String (Current_Full_Obj_Name);
-               Close (Lib_FD);
+               Close (Lib_FD, Status);
+               --  No need to check the status, we fail anyway
+
                Fail ("Cannot find: ", Name_Buffer (1 .. Name_Len));
 
             else
                Current_Full_Obj_Stamp := Empty_Time_Stamp;
-               Close (Lib_FD);
+               Close (Lib_FD, Status);
+               --  No need to check the status, we return null anyway
+
                return null;
             end if;
          end if;
@@ -1685,11 +1898,14 @@ package body Osint is
          if Current_Full_Lib_Stamp > Current_Full_Obj_Stamp then
             if Fatal_Err then
                Get_Name_String (Current_Full_Obj_Name);
-               Close (Lib_FD);
+               Close (Lib_FD, Status);
+               --  No need to check the status, we fail anyway
                Fail ("Bad time stamp: ", Name_Buffer (1 .. Name_Len));
             else
                Current_Full_Obj_Stamp := Empty_Time_Stamp;
-               Close (Lib_FD);
+               Close (Lib_FD, Status);
+               --  No need to check the status, we return null anyway
+
                return null;
             end if;
          end if;
@@ -1698,13 +1914,13 @@ package body Osint is
       --  Read data from the file
 
       declare
-         Len : Integer := Integer (File_Length (Lib_FD));
+         Len : constant Integer := Integer (File_Length (Lib_FD));
          --  Length of source file text. If it doesn't fit in an integer
          --  we're probably stuck anyway (>2 gigs of source seems a lot!)
 
          Actual_Len : Integer := 0;
 
-         Lo : Text_Ptr := 0;
+         Lo : constant Text_Ptr := 0;
          --  Low bound for allocated text buffer
 
          Hi : Text_Ptr := Text_Ptr (Len);
@@ -1732,7 +1948,10 @@ package body Osint is
 
       --  Read is complete, close file and we are done
 
-      Close (Lib_FD);
+      Close (Lib_FD, Status);
+      --  The status should never be False. But, if it is, what can we do?
+      --  So, we don't test it.
+
       return Text;
 
    end Read_Library_Info;
@@ -1757,6 +1976,9 @@ package body Osint is
 
       Actual_Len : Integer;
 
+      Status : Boolean;
+      --  For the call to Close
+
    begin
       Current_Full_Source_Name  := Find_File (N, T);
       Current_Full_Source_Stamp := File_Stamp (Current_Full_Source_Name);
@@ -1846,7 +2068,9 @@ package body Osint is
 
       --  Read is complete, get time stamp and close file and we are done
 
-      Close (Source_File_FD);
+      Close (Source_File_FD, Status);
+      --  The status should never be False. But, if it is, what can we do?
+      --  So, we don't test it.
 
    end Read_Source_File;
 
@@ -2237,7 +2461,8 @@ package body Osint is
         Unchecked_Conversion (Source => Address,
                               Target => Path_String_Access);
 
-      Path_Access : Path_String_Access := Address_To_Access (Path_Addr);
+      Path_Access : constant Path_String_Access :=
+                      Address_To_Access (Path_Addr);
 
       Return_Val  : String_Access;
 
@@ -2300,7 +2525,8 @@ package body Osint is
    ------------------------
 
    procedure Write_Program_Name is
-      Save_Buffer : String (1 .. Name_Len) := Name_Buffer (1 .. Name_Len);
+      Save_Buffer : constant String (1 .. Name_Len) :=
+                      Name_Buffer (1 .. Name_Len);
 
    begin
 
@@ -2367,9 +2593,6 @@ begin
       --  Function to get maximum file name length for system
 
    begin
-      Src_Search_Directories.Init;
-      Lib_Search_Directories.Init;
-
       Identifier_Character_Set := Get_Default_Identifier_Character_Set;
       Maximum_File_Name_Length := Get_Maximum_File_Name_Length;
 
@@ -2380,25 +2603,13 @@ begin
          Maximum_File_Name_Length := Int'Last;
       end if;
 
-      --  Start off by setting all suppress options to False, these will
-      --  be reset later (turning some on if -gnato is not specified, and
-      --  turning all of them on if -gnatp is specified).
-
-      Suppress_Options := (others => False);
-
-      --  Reserve the first slot in the search paths table. This is the
-      --  directory of the main source file or main library file and is
-      --  filled in by each call to Next_Main_Source/Next_Main_Lib_File with
-      --  the directory specified for this main source or library file. This
-      --  is the directory which is searched first by default. This default
-      --  search is inhibited by the option -I- for both source and library
-      --  files.
-
       Src_Search_Directories.Set_Last (Primary_Directory);
       Src_Search_Directories.Table (Primary_Directory) := new String'("");
 
       Lib_Search_Directories.Set_Last (Primary_Directory);
       Lib_Search_Directories.Table (Primary_Directory) := new String'("");
+
+      Initialize;
    end Initialization;
 
 end Osint;