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, 343 insertions, 54 deletions

diff --git a/gcc/ada/targparm.ads b/gcc/ada/targparm.ads
index 7aff79d53f3..cf7aa2398ba 100644
--- a/gcc/ada/targparm.ads
+++ b/gcc/ada/targparm.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1999-2001 Free Software Foundation, Inc.          --
+--          Copyright (C) 1999-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- --
@@ -28,13 +28,18 @@
 --  System, to indicate parameters relevant to the target environment.
 
 --  Conceptually, these parameters could be obtained using rtsfind, but
---  we do not do this for three reasons:
+--  we do not do this for four reasons:
 
 --    1. Compiling System for every compilation wastes time
+
 --    2. This compilation impedes debugging by adding extra compile steps
+
 --    3. There are recursion problems coming from compiling System itself
 --        or any of its children.
 
+--    4. The binder also needs the parameters, and we do not want to have
+--        to drag a lot of front end stuff into the binder.
+
 --  For all these reasons, we read in the source of System, and then scan
 --  it at the text level to extract the parameter values.
 
@@ -43,8 +48,109 @@
 --  computed and set in the ali file. This partially negates points 1 and 2
 --  above although just parsing is quick and does not impact debugging much.
 
+--  The parameters acquired by this routine from system.ads fall into three
+--  categories:
+
+--     1. Configuration pragmas, that must appear at the start of the file.
+--        Any such pragmas automatically apply to any unit compiled in the
+--        presence of this system file. Only a limited set of such pragmas
+--        may appear as documented in the corresponding section below,
+
+--     2. Target parameters. These are boolean constants that are defined
+--        in the private part of the package giving fixed information
+--        about the target architecture, and the capabilities of the
+--        code generator and run-time library.
+
+--     3. Identification information. This is an optional string constant
+--        that gives the name of the run-time library configuration. This
+--        line may be ommitted for a version of system.ads to be used with
+--        the full Ada 95 run time.
+
+with Rident; use Rident;
+with Types;  use Types;
+with Uintp;  use Uintp;
+
 package Targparm is
 
+   ---------------------------
+   -- Configuration Pragmas --
+   ---------------------------
+
+   --  The following switches get set if the corresponding configuration
+   --  pragma is scanned from the source of system.ads. No other pragmas
+   --  are permitted to appear at the start of the system.ads source file.
+
+   --  If a pragma Discard_Names appears, then Opt.Global_Discard_Names is
+   --  set to True to indicate that all units must be compiled in this mode.
+
+   --  If a pragma Locking_Policy appears, then Opt.Locking_Policy is set
+   --  to the first character of the policy name, and Opt.Locking_Policy_Sloc
+   --  is set to System_Location.
+
+   --  If a pragma Normalize_Scalars appears, then Opt.Normalize_Scalars
+   --  is set True, as well as Opt.Init_Or_Norm_Scalars.
+
+   --  If a pragma Queuing_Policy appears, then Opt.Queuing_Policy is set
+   --  to the first character of the policy name, and Opt.Queuing_Policy_Sloc
+   --  is set to System_Location.
+
+   --  If a pragma Task_Dispatching_Policy appears, then the flag
+   --  Opt.Task_Dispatching_Policy is set to the first character of the
+   --  policy name, and Opt.Task_Dispatching_Policy_Sloc is set to
+   --  System_Location.
+
+   --  If a pragma Polling (On) appears, then the flag Opt.Polling_Required
+   --  is set to True.
+
+   --  if a pragma Suppress_Exception_Locations appears, then the flag
+   --  Opt.Exception_Locations_Suppressed is set to True.
+
+   --  The only other pragma allowed is a pragma Restrictions that gives the
+   --  simple name of a restriction for which partition consistency is always
+   --  required (see definition of Rident.Partition_Restrictions).
+
+   Restrictions_On_Target :
+     array (Partition_Restrictions) of Boolean := (others => False);
+   --  Element is set True if a pragma Restrictions for the corresponding
+   --  identifier appears in system.ads. Note that only partition restriction
+   --  identifiers are permitted as arguments for pragma Restrictions for
+   --  pragmas appearing at the start of system.ads.
+
+   Restriction_Parameters_On_Target :
+     array (Restriction_Parameter_Id) of Uint := (others => No_Uint);
+   --  Element is set to specified value if a pragma Restrictions for the
+   --  corresponding restriction parameter value is set.
+
+   -------------------
+   -- Run Time Name --
+   -------------------
+
+   --  This parameter should be regarded as read only by all clients of
+   --  of package. The only way they get modified is by calling the
+   --  Get_Target_Parameters routine which reads the values from a provided
+   --  text buffer containing the source of the system package.
+
+   --  The corresponding string constant is placed immediately at the start
+   --  of the private part of system.ads if is present, e.g. in the form:
+
+   --    Run_Time_Name : constant String := "Zero Footprint Run Time";
+
+   --  the corresponding messages will look something like
+
+   --    xxx not supported (Zero Footprint Run Time)
+
+   Run_Time_Name_On_Target : Name_Id := No_Name;
+   --  Set to appropriate names table entry Id value if a Run_Time_Name
+   --  string constant is defined in system.ads. This name is used only
+   --  for the configurable run-time case, and is used to parametrize
+   --  messages that complain about non-supported run-time features.
+   --  The name should contain only letters A-Z, digits 1-9, spaces,
+   --  and underscores.
+
+   -----------------------
+   -- Target Parameters --
+   -----------------------
+
    --  The following parameters correspond to the variables defined in the
    --  private part of System (without the terminating _On_Target). Note
    --  that it is required that all parameters defined here be specified
@@ -52,7 +158,18 @@ package Targparm is
 
    --  All these parameters should be regarded as read only by all clients
    --  of the package. The only way they get modified is by calling the
-   --  Get_Target_Parameters routine which reads the values from System.
+   --  Get_Target_Parameters routine which reads the values from a provided
+   --  text buffer containing the source of the system package.
+
+   ----------------------------
+   -- Special Target Control --
+   ----------------------------
+
+   --  The great majority of GNAT ports are based on GCC. The switches in
+   --  This section indicate the use of some non-standard target back end.
+
+   AAMP_On_Target : Boolean;
+   --  Set to True if target is AAMP.
 
    -------------------------------
    -- Backend Arithmetic Checks --
@@ -78,9 +195,9 @@ package Targparm is
    -- Control of Exception Handling --
    -----------------------------------
 
-   --  GNAT provides two methods of implementing exceptions:
+   --  GNAT implements three methods of implementing exceptions:
 
-   --    Longjmp/Setjmp (-gnatL)
+   --    Front-End Longjmp/Setjmp Exceptions
 
    --      This approach uses longjmp/setjmp to handle exceptions. It
    --      uses less storage, and can often propagate exceptions faster,
@@ -88,7 +205,14 @@ package Targparm is
    --      up an exception handler. This approach is available on all
    --      targets, and is the default where it is the only approach.
 
-   --    Zero Cost (-gnatZ)
+   --      The generation of the setjmp and longjmp calls is handled by
+   --      the front end of the compiler (this includes gigi in the case
+   --      of the standard GCC back end). It does not use any back end
+   --      suport (such as the GCC3 exception handling mechanism). When
+   --      this approach is used, the compiler generates special exception
+   --      handlers for handling cleanups when an exception is raised.
+
+   --    Front-End Zero Cost Exceptions
 
    --      This approach uses separate exception tables. These use extra
    --      storage, and exception propagation can be quite slow, but there
@@ -97,28 +221,193 @@ package Targparm is
    --      is only available on some targets, and is the default where it is
    --      available.
 
+   --      The generation of the exception tables is handled by the front
+   --      end of the compiler. It does not use any back end support (such
+   --      as the GCC3 exception handling mechanism). When this approach
+   --      is used, the compiler generates special exception handlers for
+   --      handling cleanups when an exception is raised.
+
+   --    Back-End Zero Cost Exceptions
+
+   --      With this approach, the back end handles the generation and
+   --      handling of exceptions. For example, the GCC3 exception handling
+   --      mechanisms are used in this mode. The front end simply generates
+   --      code for explicit exception handlers, and AT END cleanup handlers
+   --      are simply passed unchanged to the backend for generating cleanups
+   --      both in the exceptional and non-exceptional cases.
+
+   --      As the name implies, this approach generally uses a zero-cost
+   --      mechanism with tables, but the tables are generated by the back
+   --      end. However, since the back-end is entirely responsible for the
+   --      handling of exceptions, another mechanism might be used. In the
+   --      case of GCC3 for instance, it might be the case that the compiler
+   --      is configured for setjmp/longjmp handling, then everything will
+   --      work correctly. However, it is definitely preferred that the
+   --      back end provide zero cost exception handling.
+
+   --    Controlling the selection of methods
+
+   --      The Front-End Longjmp/Setjmp approach is always available in
+   --      all implementations. If it is not the default method, then it
+   --      may be explicitly specified by the use of -gnatL. Note however
+   --      that there is a requirement that all Ada units in a partition
+   --      be compiled with this overriding option if it is not the default.
+
+   --      On some, but not all, implementations of GNAT, one of the two
+   --      ZCX approaches (but not both) is implemented. If this is the
+   --      case, and ZCX is not the default mechanism, then ZCX handling
+   --      (front-end or back-end according to the implementation) may be
+   --      specified by use of the -gnatZ switch. Again, this switch must
+   --      be used to compile all Ada units in a partition. The use of
+   --      the -gnatZ switch will cause termination with a fatal error.
+
+   --      Finally the debug option -gnatdX can be used to force the
+   --      compiler to operate in front-end ZCX exception mode and force
+   --      the front end to generate exception tables. This is only useful
+   --      for debugging purposes for implementations which do not provide
+   --      the possibility of front-end ZCX mode. The resulting object file
+   --      is unusable, but this debug switch may still be useful (e.g. in
+   --      conjunction with -gnatG) for front-end debugging purposes.
+
+   --    Control of Available Methods and Defaults
+
+   --      The following switches specify which of the two ZCX methods
+   --      (if any) is available in an implementation, and which method
+   --      is the default method.
+
    ZCX_By_Default_On_Target : Boolean;
-   --  Indicates if zero cost exceptions are active by default.
+   --  Indicates if zero cost exceptions are active by default. If this
+   --  variable is False, then the only possible exception method is the
+   --  front-end setjmp/longjmp approach, and this is the default. If
+   --  this variable is True, then one of the following two flags must
+   --  be True, and represents the method to be used by default.
 
    GCC_ZCX_Support_On_Target  : Boolean;
-   --  Indicates that when ZCX is active the mechanism to be used is the
-   --  standard GCC ZCX mechanism  (introduced in GCC 3.1)
+   --  Indicates that when ZCX is active, the mechanism to be used is the
+   --  back-end ZCX exception approach. If this variable is set to True,
+   --  then Front_End_ZCX_Support_On_Target must be False.
 
    Front_End_ZCX_Support_On_Target : Boolean;
-   --  Indicates that when ZCX is active (and GCC_ZCX_Support is not set)
-   --  the mechanism to be used is the GNAT front end specific ZCX mechanism
-
-   ---------------------------------------
-   -- High_Integrity (No Run Time) Mode --
-   ---------------------------------------
-
-   --  In High_Integrity mode, there is no system run-time, and the flag
-   --  Opt.No_Run_Time is set so that the language is appropriately
-   --  restricted to forbid construct that would generate run-time calls.
-
-   High_Integrity_Mode_On_Target : Boolean;
-   --  Indicates that this build is for a high integrity mode version of
-   --  GNAT, so that no run time is permitted.
+   --  Indicates that when ZCX is active, the mechanism to be used is the
+   --  front-end ZCX exception approach. If this variable is set to True,
+   --  then GCC_ZCX_Support_On_Target must be False.
+
+   --------------------------------
+   -- Configurable Run-Time Mode --
+   --------------------------------
+
+   --  In configurable run-time mode, the system run-time may not support
+   --  the full Ada language. The effect of setting this switch is to let
+   --  the compiler know that it is not surprising (i.e. the system is not
+   --  misconfigured) if run-time library units or entities within units are
+   --  not present in the run-time.
+
+   Configurable_Run_Time_On_Target : Boolean;
+   --  Indicates that the system.ads file is for a configurable run-time
+   --
+   --  This has some specific effects as follows
+   --
+   --    The binder generates the gnat_argc/argv/envp variables in the
+   --    binder file instead of being imported from the run-time library.
+   --    If Command_Line_Args_On_Target is set to False, then the
+   --    generation of these variables is suppressed completely.
+   --
+   --    The binder generates the gnat_exit_status variable in the binder
+   --    file instead of being imported from the run-time library. If
+   --    Exit_Status_Supported_On_Target is set to False, then the
+   --    generation of this variable is suppressed entirely.
+   --
+   --    The routine __gnat_break_start is defined within the binder file
+   --    instead of being imported from the run-time library.
+   --
+   --    The variable __gnat_exit_status is generated within the binder file
+   --    instead of being imported from the run-time library.
+   --
+   --    No -Ldir switches are added for the linker step
+   --
+   --    No standard switches are added after user file entries to the
+   --    linker line. All such switches must be explicit. In other words
+   --    the option -nostdlib is implicit with a configurable run-time.
+
+   Suppress_Standard_Library_On_Target : Boolean;
+   --  If this flag is True, then the standard library is not included by
+   --  default in the executable (see unit System.Standard_Library in file
+   --  s-stalib.ads for details of what this includes). This is for example
+   --  set True for the zero foot print case, where these files should not
+   --  be included by default.
+   --
+   --  This flag has some other related effects:
+   --
+   --    The generation of global variables in the bind file is suppressed,
+   --    with the exception of the priority of the environment task, which
+   --    is needed by the Ravenscar run-time.
+   --
+   --    The generation of exception tables is suppressed for front end
+   --    ZCX exception handling (since we assume no exception handling).
+   --
+   --    The calls to __gnat_initialize and __gnat_finalize are omitted
+   --
+   --    All finalization and initialization (controlled types) is omitted
+   --
+   --    The routine __gnat_handler_installed is not imported
+
+   ---------------------
+   -- Duration Format --
+   ---------------------
+
+   --  By default, type Duration is a 64-bit fixed-point type with a delta
+   --  and small of 10**(-9) (i.e. it is a count in nanoseconds. This flag
+   --  allows that standard format to be modified.
+
+   Duration_32_Bits_On_Target : Boolean;
+   --  If True, then Duration is represented in 32 bits and the delta and
+   --  small values are set to 20.0*(10**(-3)) (i.e. it is a count in units
+   --  of 20 milliseconds.
+
+   ------------------------------------
+   -- Back-End Code Generation Flags --
+   ------------------------------------
+
+   --  These flags indicate possible limitations in what the code generator
+   --  can handle. They will all be True for a full run-time, but one or more
+   --  of these may be false for a configurable run-time, and if a feature is
+   --  used at the source level, and the corresponding flag is false, then an
+   --  error message will be issued saying the feature is not supported.
+
+   Support_64_Bit_Divides_On_Target : Boolean;
+   --  If True, the back end supports 64-bit divide operations. If False, then
+   --  the source program may not contain 64-bit divide operations. This is
+   --  specifically useful in the zero foot-print case, where the issue is
+   --  whether there is a hardware divide instruction for 64-bits so that
+   --  no run-time support is required. It should always be set True if the
+   --  necessary run-time support is present.
+
+   Support_Aggregates_On_Target : Boolean;
+   --  In the general case, the use of aggregates may generate calls
+   --  to run-time routines in the C library, including memset, memcpy,
+   --  memmove, and bcopy. This flag is set to True if these routines
+   --  are available. If any of these routines is not available, then
+   --  this flag is False, and the use of aggregates is not permitted.
+
+   Support_Composite_Assign_On_Target : Boolean;
+   --  The assignment of composite objects other than small records and
+   --  arrays whose size is 64-bits or less and is set by an explicit
+   --  size clause may generate calls to memcpy, memmove, and bcopy.
+   --  If versions of all these routines are available, then this flag
+   --  is set to True. If any of these routines is not available, then
+   --  the flag is set False, and composite assignments are not allowed.
+
+   Support_Composite_Compare_On_Target : Boolean;
+   --  If this flag is True, then the back end supports bit-wise comparison
+   --  of composite objects for equality, either generating inline code or
+   --  calling appropriate (and available) run-time routines. If this flag
+   --  is False, then the back end does not provide this support, and the
+   --  front end uses component by component comparison for composites.
+
+   Support_Long_Shifts_On_Target : Boolean;
+   --  If True, the back end supports 64-bit shift operations. If False, then
+   --  the source program may not contain explicit 64-bit shifts. In addition,
+   --  the code generated for packed arrays will avoid the use of long shifts.
 
    -------------------------------
    -- Control of Stack Checking --
@@ -164,13 +453,23 @@ package Targparm is
 
    --  For most ports of GNAT, command line arguments are supported. The
    --  following flag is set to False for targets that do not support
-   --  command line arguments (notably VxWorks).
+   --  command line arguments (VxWorks and AAMP). Note that support of
+   --  command line arguments is not required on such targets (RM A.15(13)).
 
    Command_Line_Args_On_Target : Boolean;
-   --  Set False if no command line arguments on target
+   --  Set False if no command line arguments on target. Note that if this
+   --  is False in with Configurable_Run_Time_On_Target set to True, then
+   --  this causes suppression of generation of the argv/argc variables
+   --  used to record command line arguments.
+
+   --  Similarly, most ports support the use of an exit status, but AAMP
+   --  is an exception (as allowed by RM A.15(18-20))
 
-   --  Note: this is prepared for future use, but not yet used, since we
-   --  do not yet have a way of propagating Targparm params to the binder
+   Exit_Status_Supported_On_Target : Boolean;
+   --  Set False if returning of an exit status is not supported on target.
+   --  Note that if this False in with Configurable_Run_Time_On_Target
+   --  set to True, then this causes suppression of the gnat_exit_status
+   --  variable used to recod the exit status.
 
    -----------------------
    -- Main Program Name --
@@ -186,28 +485,6 @@ package Targparm is
    Use_Ada_Main_Program_Name_On_Target : Boolean;
    --  Set True to use the Ada main program name as the main name
 
-   --  Note: this is prepared for future use, but not yet used, since we
-   --  do not yet have a way of propagating Targparm params to the binder
-
-   ----------------------------
-   -- Support of Long Shifts --
-   ----------------------------
-
-   --  In GNORT mode, we cannot call library routines, and in particular
-   --  we cannot call routines for long (64-bit) shifts if such routines
-   --  are required on the target. This comes up in the context of support
-   --  of packed arrays. We can only represent packed arrays whose length
-   --  is in the range 33- to 64-bits as modular types if long shifts are
-   --  done with inline code.
-
-   --  For the default version, for now we set long shifts inlined as True
-   --  This may not be quite accurate, but until we get proper separate
-   --  System's for each target, it is a safer choice.
-
-   Long_Shifts_Inlined_On_Target : Boolean;
-   --  Indicates if long (double word) shifts are generated using inlined
-   --  code (and thus are permissible in No_Run_Time mode).
-
    ----------------------------------------------
    -- Boolean-Valued Floating-Point Attributes --
    ----------------------------------------------
@@ -226,9 +503,6 @@ package Targparm is
    --  the partition. We probably should add such consistency checks in future,
    --  but for now we don't do this.
 
-   AAMP_On_Target : Boolean;
-   --  Set to True if target is AAMP.
-
    Denorm_On_Target : Boolean;
    --  Set to False on targets that do not reliably support denormals.
    --  Reliably here means for all settings of the relevant -m flag, so
@@ -313,8 +587,23 @@ package Targparm is
    -- Subprograms --
    -----------------
 
+   --  These subprograms are used to initialize the target parameter values
+   --  from the system.ads file. Note that this is only done once, so if more
+   --  than one call is made to either routine, the second and subsequent
+   --  calls are ignored.
+
+   procedure Get_Target_Parameters
+     (System_Text  : Source_Buffer_Ptr;
+      Source_First : Source_Ptr;
+      Source_Last  : Source_Ptr);
+   --  Called at the start of execution to obtain target parameters from
+   --  the source of package System. The parameters provide the source
+   --  text to be scanned (in System_Text (Source_First .. Source_Last)).
+
    procedure Get_Target_Parameters;
-   --  Called at the start of execution to read the source of System and
-   --  obtain and set the values of the above parameters.
+   --  This version reads in system.ads using Osint. The idea is that the
+   --  caller uses the first version if they have to read system.ads anyway
+   --  (e.g. the compiler) and uses this simpler interface if system.ads is
+   --  not otherwise needed.
 
 end Targparm;