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, 416 insertions, 117 deletions

diff --git a/gcc/ada/targparm.adb b/gcc/ada/targparm.adb
index 2621dbf2045..6e911fba3cb 100644
--- a/gcc/ada/targparm.adb
+++ b/gcc/ada/targparm.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          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- --
@@ -24,95 +24,175 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Namet;    use Namet;
-with Output;   use Output;
-with Sinput;   use Sinput;
-with Sinput.L; use Sinput.L;
-with Types;    use Types;
+with Csets;  use Csets;
+with Namet;  use Namet;
+with Opt;    use Opt;
+with Osint;  use Osint;
+with Output; use Output;
 
 package body Targparm is
+   use ASCII;
+
+   Parameters_Obtained : Boolean := False;
+   --  Set True after first call to Get_Target_Parameters. Used to avoid
+   --  reading system.ads more than once, since it cannot change.
+
+   --  The following array defines a tag name for each entry
 
    type Targparm_Tags is
-     (AAM,  --   AAMP;
-      BDC,  --   Backend_Divide_Checks;
-      BOC,  --   Backend_Overflow_Checks;
-      CLA,  --   Command_Line_Args;
-      DEN,  --   Denorm;
-      DSP,  --   Functions_Return_By_DSP;
-      FEL,  --   Frontend_Layout;
+     (AAM,  --   AAMP
+      BDC,  --   Backend_Divide_Checks
+      BOC,  --   Backend_Overflow_Checks
+      CLA,  --   Command_Line_Args
+      CRT,  --   Configurable_Run_Time
+      D32,  --   Duration_32_Bits
+      DEN,  --   Denorm
+      DSP,  --   Functions_Return_By_DSP
+      EXS,  --   Exit_Status_Supported
+      FEL,  --   Frontend_Layout
       FFO,  --   Fractional_Fixed_Ops
-      HIM,  --   High_Integrity_Mode;
-      LSI,  --   Long_Shifts_Inlined;
-      MOV,  --   Machine_Overflows;
-      MRN,  --   Machine_Rounds;
-      SCD,  --   Stack_Check_Default;
-      SCP,  --   Stack_Check_Probes;
-      SNZ,  --   Signed_Zeros;
-      UAM,  --   Use_Ada_Main_Program_Name;
-      VMS,  --   OpenVMS;
-      ZCD,  --   ZCX_By_Default;
-      ZCG,  --   GCC_ZCX_Support;
-      ZCF); --   Front_End_ZCX_Support;
+      MOV,  --   Machine_Overflows
+      MRN,  --   Machine_Rounds
+      S64,  --   Support_64_Bit_Divides
+      SAG,  --   Support_Aggregates
+      SCA,  --   Support_Composite_Assign
+      SCC,  --   Support_Composite_Compare
+      SCD,  --   Stack_Check_Default
+      SCP,  --   Stack_Check_Probes
+      SLS,  --   Support_Long_Shifts
+      SNZ,  --   Signed_Zeros
+      SSL,  --   Suppress_Standard_Library
+      UAM,  --   Use_Ada_Main_Program_Name
+      VMS,  --   OpenVMS
+      ZCD,  --   ZCX_By_Default
+      ZCG,  --   GCC_ZCX_Support
+      ZCF,  --   Front_End_ZCX_Support
+
+   --  The following entries are obsolete and can eventually be removed
+
+      HIM,  --   High_Integrity_Mode
+      LSI); --   Long_Shifts_Inlined
+
+   subtype Targparm_Tags_OK is Targparm_Tags range AAM .. ZCF;
+   --  Range excluding obsolete entries
 
    Targparm_Flags : array (Targparm_Tags) of Boolean := (others => False);
    --  Flag is set True if corresponding parameter is scanned
 
+   --  The following list of string constants gives the parameter names
+
    AAM_Str : aliased constant Source_Buffer := "AAMP";
    BDC_Str : aliased constant Source_Buffer := "Backend_Divide_Checks";
    BOC_Str : aliased constant Source_Buffer := "Backend_Overflow_Checks";
    CLA_Str : aliased constant Source_Buffer := "Command_Line_Args";
+   CRT_Str : aliased constant Source_Buffer := "Configurable_Run_Time";
+   D32_Str : aliased constant Source_Buffer := "Duration_32_Bits";
    DEN_Str : aliased constant Source_Buffer := "Denorm";
    DSP_Str : aliased constant Source_Buffer := "Functions_Return_By_DSP";
+   EXS_Str : aliased constant Source_Buffer := "Exit_Status_Supported";
    FEL_Str : aliased constant Source_Buffer := "Frontend_Layout";
    FFO_Str : aliased constant Source_Buffer := "Fractional_Fixed_Ops";
-   HIM_Str : aliased constant Source_Buffer := "High_Integrity_Mode";
-   LSI_Str : aliased constant Source_Buffer := "Long_Shifts_Inlined";
    MOV_Str : aliased constant Source_Buffer := "Machine_Overflows";
    MRN_Str : aliased constant Source_Buffer := "Machine_Rounds";
+   S64_Str : aliased constant Source_Buffer := "Support_64_Bit_Divides";
+   SAG_Str : aliased constant Source_Buffer := "Support_Aggregates";
+   SCA_Str : aliased constant Source_Buffer := "Support_Composite_Assign";
+   SCC_Str : aliased constant Source_Buffer := "Support_Composite_Compare";
    SCD_Str : aliased constant Source_Buffer := "Stack_Check_Default";
    SCP_Str : aliased constant Source_Buffer := "Stack_Check_Probes";
+   SLS_Str : aliased constant Source_Buffer := "Support_Long_Shifts";
    SNZ_Str : aliased constant Source_Buffer := "Signed_Zeros";
+   SSL_Str : aliased constant Source_Buffer := "Suppress_Standard_Library";
    UAM_Str : aliased constant Source_Buffer := "Use_Ada_Main_Program_Name";
    VMS_Str : aliased constant Source_Buffer := "OpenVMS";
    ZCD_Str : aliased constant Source_Buffer := "ZCX_By_Default";
    ZCG_Str : aliased constant Source_Buffer := "GCC_ZCX_Support";
    ZCF_Str : aliased constant Source_Buffer := "Front_End_ZCX_Support";
 
+   --  Obsolete entries
+
+   HIM_Str : aliased constant Source_Buffer := "High_Integrity_Mode";
+   LSI_Str : aliased constant Source_Buffer := "Long_Shifts_Inlined";
+
+   --  The following defines a set of pointers to the above strings,
+   --  indexed by the tag values.
+
    type Buffer_Ptr is access constant Source_Buffer;
-   Targparm_Str : array (Targparm_Tags) of Buffer_Ptr :=
+   Targparm_Str : constant array (Targparm_Tags) of Buffer_Ptr :=
      (AAM_Str'Access,
       BDC_Str'Access,
       BOC_Str'Access,
       CLA_Str'Access,
+      CRT_Str'Access,
+      D32_Str'Access,
       DEN_Str'Access,
       DSP_Str'Access,
+      EXS_Str'Access,
       FEL_Str'Access,
       FFO_Str'Access,
-      HIM_Str'Access,
-      LSI_Str'Access,
       MOV_Str'Access,
       MRN_Str'Access,
+      S64_Str'Access,
+      SAG_Str'Access,
+      SCA_Str'Access,
+      SCC_Str'Access,
       SCD_Str'Access,
       SCP_Str'Access,
+      SLS_Str'Access,
       SNZ_Str'Access,
+      SSL_Str'Access,
       UAM_Str'Access,
       VMS_Str'Access,
       ZCD_Str'Access,
       ZCG_Str'Access,
-      ZCF_Str'Access);
+      ZCF_Str'Access,
+
+      --  Obsolete entries
+
+      HIM_Str'Access,
+      LSI_Str'Access);
 
    ---------------------------
    -- Get_Target_Parameters --
    ---------------------------
 
+   --  Version which reads in system.ads
+
    procedure Get_Target_Parameters is
-      use ASCII;
+      Text : Source_Buffer_Ptr;
+      Hi   : Source_Ptr;
+
+   begin
+      if Parameters_Obtained then
+         return;
+      end if;
 
-      S : Source_File_Index;
-      N : Name_Id;
-      T : Source_Buffer_Ptr;
+      Name_Buffer (1 .. 10) := "system.ads";
+      Name_Len := 10;
+
+      Read_Source_File (Name_Find, Lo => 0, Hi => Hi, Src => Text);
+
+      if Text = null then
+         Write_Line ("fatal error, run-time library not installed correctly");
+         Write_Line ("cannot locate file system.ads");
+         raise Unrecoverable_Error;
+      end if;
+
+      Targparm.Get_Target_Parameters
+        (System_Text  => Text,
+         Source_First => 0,
+         Source_Last  => Hi);
+   end Get_Target_Parameters;
+
+   --  Version where caller supplies system.ads text
+
+   procedure Get_Target_Parameters
+     (System_Text  : Source_Buffer_Ptr;
+      Source_First : Source_Ptr;
+      Source_Last  : Source_Ptr)
+   is
       P : Source_Ptr;
-      Z : Source_Ptr;
+      V : Uint;
 
       Fatal : Boolean := False;
       --  Set True if a fatal error is detected
@@ -121,113 +201,332 @@ package body Targparm is
       --  Records boolean from system line
 
    begin
-      Name_Buffer (1 .. 10) := "system.ads";
-      Name_Len := 10;
-      N := Name_Find;
-      S := Load_Source_File (N);
+      if Parameters_Obtained then
+         return;
+      else
+         Parameters_Obtained := True;
+      end if;
 
-      if S = No_Source_File then
-         Write_Line ("fatal error, run-time library not installed correctly");
-         Write_Str ("cannot locate file ");
-         Write_Line (Name_Buffer (1 .. Name_Len));
-         raise Unrecoverable_Error;
+      P := Source_First;
+      Line_Loop : while System_Text (P .. P + 10) /= "end System;" loop
 
-      --  This must always be the first source file read, and we have defined
-      --  a constant Types.System_Source_File_Index as 1 to reflect this.
+         --  Skip comments quickly
 
-      else
-         pragma Assert (S = System_Source_File_Index);
-         null;
-      end if;
+         if System_Text (P) = '-' then
+            goto Line_Loop_Continue;
+
+         --  Test for pragma Restrictions
+
+         elsif System_Text (P .. P + 20) = "pragma Restrictions (" then
+            P := P + 21;
+
+            Rloop : for K in Partition_Restrictions loop
+               declare
+                  Rname : constant String := Restriction_Id'Image (K);
+
+               begin
+                  for J in Rname'Range loop
+                     if Fold_Upper (System_Text (P + Source_Ptr (J - 1)))
+                                                        /= Rname (J)
+                     then
+                        goto Rloop_Continue;
+                     end if;
+                  end loop;
+
+                  if System_Text (P + Rname'Length) = ')' then
+                     Restrictions_On_Target (K) := True;
+                     goto Line_Loop_Continue;
+                  end if;
+               end;
+
+            <<Rloop_Continue>>
+               null;
+            end loop Rloop;
+
+            Ploop : for K in Restriction_Parameter_Id loop
+               declare
+                  Rname : constant String :=
+                            Restriction_Parameter_Id'Image (K);
+
+               begin
+                  for J in Rname'Range loop
+                     if Fold_Upper (System_Text (P + Source_Ptr (J - 1)))
+                                                        /= Rname (J)
+                     then
+                        goto Ploop_Continue;
+                     end if;
+                  end loop;
+
+                  if System_Text (P + Rname'Length .. P + Rname'Length + 3) =
+                                                      " => "
+                  then
+                     P := P + Rname'Length + 4;
+                     V := Uint_0;
+
+                     loop
+                        if System_Text (P) in '0' .. '9' then
+                           V := 10 * V + Character'Pos (System_Text (P)) - 48;
+                        elsif System_Text (P) = '_' then
+                           null;
+                        elsif System_Text (P) = ')' then
+                           Restriction_Parameters_On_Target (K) := V;
+                           goto  Line_Loop_Continue;
+                        else
+                           goto Ploop_Continue;
+                        end if;
+
+                        P := P + 1;
+                     end loop;
+                  end if;
+               end;
+
+            <<Ploop_Continue>>
+               null;
+            end loop Ploop;
+
+            Set_Standard_Error;
+            Write_Line
+               ("fatal error: system.ads is incorrectly formatted");
+            Write_Str ("unrecognized restrictions pragma: ");
+
+            while System_Text (P) /= ')'
+                    and then
+                  System_Text (P) /= ASCII.LF
+            loop
+               Write_Char (System_Text (P));
+               P := P + 1;
+            end loop;
+
+            Write_Eol;
+            Fatal := True;
+            Set_Standard_Output;
+
+         --  Discard_Names
+
+         elsif System_Text (P .. P + 20) = "pragma Discard_Names;" then
+            P := P + 21;
+            Opt.Global_Discard_Names := True;
+            goto Line_Loop_Continue;
+
+         --  Locking Policy
+
+         elsif System_Text (P .. P + 22) = "pragma Locking_Policy (" then
+            P := P + 23;
+            Opt.Locking_Policy := System_Text (P);
+            Opt.Locking_Policy_Sloc := System_Location;
+            goto Line_Loop_Continue;
+
+         --  Normalize_Scalars
+
+         elsif System_Text (P .. P + 24) = "pragma Normalize_Scalars;" then
+            P := P + 25;
+            Opt.Normalize_Scalars := True;
+            Opt.Init_Or_Norm_Scalars := True;
+            goto Line_Loop_Continue;
 
-      P := Source_First (S);
-      Z := Source_Last  (S);
-      T := Source_Text  (S);
+         --  Polling (On)
 
-      while T (P .. P + 10) /= "end System;" loop
+         elsif System_Text (P .. P + 19) = "pragma Polling (On);" then
+            P := P + 20;
+            Opt.Polling_Required := True;
+            goto Line_Loop_Continue;
 
-         for K in Targparm_Tags loop
-            if T (P + 3 .. P + 2 + Targparm_Str (K)'Length) =
-                                                   Targparm_Str (K).all
+         --  Ignore pragma Pure (System)
+
+         elsif System_Text (P .. P + 20) = "pragma Pure (System);" then
+            P := P + 21;
+            goto Line_Loop_Continue;
+
+         --  Queuing Policy
+
+         elsif System_Text (P .. P + 22) = "pragma Queuing_Policy (" then
+            P := P + 23;
+            Opt.Queuing_Policy := System_Text (P);
+            Opt.Queuing_Policy_Sloc := System_Location;
+            goto Line_Loop_Continue;
+
+         --  Suppress_Exception_Locations
+
+         elsif System_Text (P .. P + 34) =
+                                "pragma Suppress_Exception_Locations;"
+         then
+            P := P + 35;
+            Opt.Exception_Locations_Suppressed := True;
+            goto Line_Loop_Continue;
+
+         --  Task_Dispatching Policy
+
+         elsif System_Text (P .. P + 31) =
+                                   "pragma Task_Dispatching_Policy ("
+         then
+            P := P + 32;
+            Opt.Task_Dispatching_Policy := System_Text (P);
+            Opt.Task_Dispatching_Policy_Sloc := System_Location;
+            goto Line_Loop_Continue;
+
+         --  No other pragmas are permitted
+
+         elsif System_Text (P .. P + 6) = "pragma " then
+            Set_Standard_Error;
+            Write_Line ("unrecognized line in system.ads: ");
+
+            while System_Text (P) /= ')'
+              and then System_Text (P) /= ASCII.LF
+            loop
+               Write_Char (System_Text (P));
+               P := P + 1;
+            end loop;
+
+            Write_Eol;
+            Set_Standard_Output;
+            Fatal := True;
+
+         --  See if we have a Run_Time_Name
+
+         elsif System_Text (P .. P + 38) =
+                  "   Run_Time_Name : constant String := """
+         then
+            P := P + 39;
+
+            Name_Len := 0;
+            while System_Text (P) in 'A' .. 'Z'
+                    or else
+                  System_Text (P) in 'a' .. 'z'
+                    or else
+                  System_Text (P) in '0' .. '9'
+                    or else
+                  System_Text (P) = ' '
+                    or else
+                  System_Text (P) = '_'
+            loop
+               Add_Char_To_Name_Buffer (System_Text (P));
+               P := P + 1;
+            end loop;
+
+            if System_Text (P) /= '"'
+              or else System_Text (P + 1) /= ';'
+              or else (System_Text (P + 2) /= ASCII.LF
+                         and then
+                       System_Text (P + 2) /= ASCII.CR)
             then
-               P := P + 3 + Targparm_Str (K)'Length;
+               Set_Standard_Error;
+               Write_Line
+                 ("incorrectly formatted Run_Time_Name in system.ads");
+               Set_Standard_Output;
+               Fatal := True;
+
+            else
+               Run_Time_Name_On_Target := Name_Enter;
+            end if;
+
+            goto Line_Loop_Continue;
+
+         --  Next See if we have a configuration parameter
+
+         else
+            Config_Param_Loop : for K in Targparm_Tags loop
+               if System_Text (P + 3 .. P + 2 + Targparm_Str (K)'Length) =
+                                                      Targparm_Str (K).all
+               then
+                  P := P + 3 + Targparm_Str (K)'Length;
+
 
-               if Targparm_Flags (K) then
-                  Set_Standard_Error;
-                  Write_Line
-                    ("fatal error: system.ads is incorrectly formatted");
-                  Write_Str ("duplicate line for parameter: ");
+                  if Targparm_Flags (K) then
+                     Set_Standard_Error;
+                     Write_Line
+                       ("fatal error: system.ads is incorrectly formatted");
+                     Write_Str ("duplicate line for parameter: ");
 
-                  for J in Targparm_Str (K)'Range loop
-                     Write_Char (Targparm_Str (K).all (J));
+                     for J in Targparm_Str (K)'Range loop
+                        Write_Char (Targparm_Str (K).all (J));
+                     end loop;
+
+                     Write_Eol;
+                     Set_Standard_Output;
+                     Fatal := True;
+
+                  else
+                     Targparm_Flags (K) := True;
+                  end if;
+
+                  while System_Text (P) /= ':'
+                     or else System_Text (P + 1) /= '='
+                  loop
+                     P := P + 1;
                   end loop;
 
-                  Write_Eol;
-                  Set_Standard_Output;
-                  Fatal := True;
+                  P := P + 2;
 
-               else
-                  Targparm_Flags (K) := True;
+                  while System_Text (P) = ' ' loop
+                     P := P + 1;
+                  end loop;
+
+                  Result := (System_Text (P) = 'T');
+
+                  case K is
+                     when AAM => AAMP_On_Target                      := Result;
+                     when BDC => Backend_Divide_Checks_On_Target     := Result;
+                     when BOC => Backend_Overflow_Checks_On_Target   := Result;
+                     when CLA => Command_Line_Args_On_Target         := Result;
+                     when CRT => Configurable_Run_Time_On_Target     := Result;
+                     when D32 => Duration_32_Bits_On_Target          := Result;
+                     when DEN => Denorm_On_Target                    := Result;
+                     when DSP => Functions_Return_By_DSP_On_Target   := Result;
+                     when EXS => Exit_Status_Supported_On_Target     := Result;
+                     when FEL => Frontend_Layout_On_Target           := Result;
+                     when FFO => Fractional_Fixed_Ops_On_Target      := Result;
+                     when MOV => Machine_Overflows_On_Target         := Result;
+                     when MRN => Machine_Rounds_On_Target            := Result;
+                     when S64 => Support_64_Bit_Divides_On_Target    := Result;
+                     when SAG => Support_Aggregates_On_Target        := Result;
+                     when SCA => Support_Composite_Assign_On_Target  := Result;
+                     when SCC => Support_Composite_Compare_On_Target := Result;
+                     when SCD => Stack_Check_Default_On_Target       := Result;
+                     when SCP => Stack_Check_Probes_On_Target        := Result;
+                     when SLS => Support_Long_Shifts_On_Target       := Result;
+                     when SSL => Suppress_Standard_Library_On_Target := Result;
+                     when SNZ => Signed_Zeros_On_Target              := Result;
+                     when UAM => Use_Ada_Main_Program_Name_On_Target := Result;
+                     when VMS => OpenVMS_On_Target                   := Result;
+                     when ZCD => ZCX_By_Default_On_Target            := Result;
+                     when ZCG => GCC_ZCX_Support_On_Target           := Result;
+                     when ZCF => Front_End_ZCX_Support_On_Target     := Result;
+
+                     --  Obsolete entries
+
+                     when HIM => null;
+                     when LSI => null;
+
+                     goto Line_Loop_Continue;
+                  end case;
                end if;
+            end loop Config_Param_Loop;
+         end if;
 
-               while T (P) /= ':' or else T (P + 1) /= '=' loop
-                  P := P + 1;
-               end loop;
-
-               P := P + 2;
-
-               while T (P) = ' ' loop
-                  P := P + 1;
-               end loop;
-
-               Result := (T (P) = 'T');
-
-               case K is
-                  when AAM => AAMP_On_Target                      := Result;
-                  when BDC => Backend_Divide_Checks_On_Target     := Result;
-                  when BOC => Backend_Overflow_Checks_On_Target   := Result;
-                  when CLA => Command_Line_Args_On_Target         := Result;
-                  when DEN => Denorm_On_Target                    := Result;
-                  when DSP => Functions_Return_By_DSP_On_Target   := Result;
-                  when FEL => Frontend_Layout_On_Target           := Result;
-                  when FFO => Fractional_Fixed_Ops_On_Target      := Result;
-                  when HIM => High_Integrity_Mode_On_Target       := Result;
-                  when LSI => Long_Shifts_Inlined_On_Target       := Result;
-                  when MOV => Machine_Overflows_On_Target         := Result;
-                  when MRN => Machine_Rounds_On_Target            := Result;
-                  when SCD => Stack_Check_Default_On_Target       := Result;
-                  when SCP => Stack_Check_Probes_On_Target        := Result;
-                  when SNZ => Signed_Zeros_On_Target              := Result;
-                  when UAM => Use_Ada_Main_Program_Name_On_Target := Result;
-                  when VMS => OpenVMS_On_Target                   := Result;
-                  when ZCD => ZCX_By_Default_On_Target            := Result;
-                  when ZCG => GCC_ZCX_Support_On_Target           := Result;
-                  when ZCF => Front_End_ZCX_Support_On_Target     := Result;
-               end case;
-
-               exit;
-            end if;
-         end loop;
+         --  Here after processing one line of System spec
+
+         <<Line_Loop_Continue>>
 
-         while T (P) /= CR and then T (P) /= LF loop
+         while System_Text (P) /= CR and then System_Text (P) /= LF loop
             P := P + 1;
-            exit when P >= Z;
+            exit when P >= Source_Last;
          end loop;
 
-         while T (P) = CR or else T (P) = LF loop
+         while System_Text (P) = CR or else System_Text (P) = LF loop
             P := P + 1;
-            exit when P >= Z;
+            exit when P >= Source_Last;
          end loop;
 
-         if P >= Z then
+         if P >= Source_Last then
             Set_Standard_Error;
             Write_Line ("fatal error, system.ads not formatted correctly");
             Set_Standard_Output;
-            raise Unrecoverable_Error;
          end if;
-      end loop;
+      end loop Line_Loop;
+
+      --  Check no missing target parameter settings
 
-      for K in Targparm_Tags loop
+      for K in Targparm_Tags_OK loop
          if not Targparm_Flags (K) then
             Set_Standard_Error;
             Write_Line