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, 53 insertions, 360 deletions

diff --git a/gcc/ada/exp_dbug.adb b/gcc/ada/exp_dbug.adb
index 251ee5fb464..9e7bcc0eeab 100644
--- a/gcc/ada/exp_dbug.adb
+++ b/gcc/ada/exp_dbug.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1996-2002 Free Software Foundation, Inc.          --
+--          Copyright (C) 1996-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,14 +28,10 @@ with Alloc;    use Alloc;
 with Atree;    use Atree;
 with Debug;    use Debug;
 with Einfo;    use Einfo;
-with Exp_Util; use Exp_Util;
-with Freeze;   use Freeze;
-with Lib;      use Lib;
-with Hostparm; use Hostparm;
 with Namet;    use Namet;
 with Nlists;   use Nlists;
 with Nmake;    use Nmake;
-with Opt;      use Opt;
+with Opt;
 with Output;   use Output;
 with Sem_Eval; use Sem_Eval;
 with Sem_Util; use Sem_Util;
@@ -46,8 +42,6 @@ with Stringt;  use Stringt;
 with Table;
 with Urealp;   use Urealp;
 
-with GNAT.HTable;
-
 package body Exp_Dbug is
 
    --  The following table is used to queue up the entities passed as
@@ -62,36 +56,6 @@ package body Exp_Dbug is
      Table_Increment      => Alloc.Name_Qualify_Units_Increment,
      Table_Name           => "Name_Qualify_Units");
 
-   --  Define hash table for compressed debug names
-
-   --  This hash table keeps track of qualification prefix strings
-   --  that have been compressed. The element is the corresponding
-   --  hash value used in the compressed symbol.
-
-   type Hindex is range 0 .. 4096;
-   --  Type to define range of headers
-
-   function SHash (S : String_Ptr) return Hindex;
-   --  Hash function for this table
-
-   function SEq (F1, F2 : String_Ptr) return Boolean;
-   --  Equality function for this table
-
-   type Elmt is record
-      W : Word;
-      S : String_Ptr;
-   end record;
-
-   No_Elmt : Elmt := (0, null);
-
-   package CDN is new GNAT.HTable.Simple_HTable (
-     Header_Num => Hindex,
-     Element    => Elmt,
-     No_Element => No_Elmt,
-     Key        => String_Ptr,
-     Hash       => SHash,
-     Equal      => SEq);
-
    --------------------------------
    -- Use of Qualification Flags --
    --------------------------------
@@ -169,23 +133,6 @@ package body Exp_Dbug is
    --  Determine whether the bounds of E match the size of the type. This is
    --  used to determine whether encoding is required for a discrete type.
 
-   function CDN_Hash (S : String) return Word;
-   --  This is the hash function used to compress debug symbols. The string
-   --  S is the prefix which is a list of qualified names separated by double
-   --  underscore (no trailing double underscore). The returned value is the
-   --  hash value used in the compressed names. It is also used for the hash
-   --  table used to keep track of what prefixes have been compressed so far.
-
-   procedure Compress_Debug_Name (E : Entity_Id);
-   --  If the name of the entity E is too long, or compression is to be
-   --  attempted on all names (Compress_Debug_Names set), then an attempt
-   --  is made to compress the name of the entity.
-
-   function Double_Underscore (S : String; J : Natural) return Boolean;
-   --  Returns True if J is the start of a double underscore
-   --  sequence in the string S (defined as two underscores
-   --  which are preceded and followed by a non-underscore)
-
    procedure Output_Homonym_Numbers_Suffix;
    --  If homonym numbers are stored, then output them into Name_Buffer.
 
@@ -196,9 +143,6 @@ package body Exp_Dbug is
    procedure Prepend_Uint_To_Buffer (U : Uint);
    --  Prepend image of universal integer to Name_Buffer, updating Name_Len
 
-   procedure Put_Hex (W : Word; N : Natural);
-   --  Output W as 8 hex digits (0-9, a-f) in Name_Buffer (N .. N + 7)
-
    procedure Qualify_Entity_Name (Ent : Entity_Id);
    --  If not already done, replaces the Chars field of the given entity
    --  with the appropriate fully qualified name.
@@ -273,7 +217,7 @@ package body Exp_Dbug is
 
          begin
             while Present (H) loop
-               if (Scope (H) = Scope (E)) then
+               if Scope (H) = Scope (E) then
                   Nr := Nr + 1;
                end if;
 
@@ -345,108 +289,6 @@ package body Exp_Dbug is
       end if;
    end Bounds_Match_Size;
 
-   --------------
-   -- CDN_Hash --
-   --------------
-
-   function CDN_Hash (S : String) return Word is
-      H : Word;
-
-      function Rotate_Left (Value : Word; Amount : Natural) return Word;
-      pragma Import (Intrinsic, Rotate_Left);
-
-   begin
-      H := 0;
-      for J in S'Range loop
-         H := Rotate_Left (H, 3) + Character'Pos (S (J));
-      end loop;
-
-      return H;
-   end CDN_Hash;
-
-   -------------------------
-   -- Compress_Debug_Name --
-   -------------------------
-
-   procedure Compress_Debug_Name (E : Entity_Id) is
-      Ptr  : Natural;
-      Sptr : String_Ptr;
-      Cod  : Word;
-
-   begin
-      if not Compress_Debug_Names
-        and then Length_Of_Name (Chars (E)) <= Max_Debug_Name_Length
-      then
-         return;
-      end if;
-
-      Get_Name_String (Chars (E));
-
-      --  Find rightmost double underscore
-
-      Ptr := Name_Len - 2;
-      loop
-         exit when Double_Underscore (Name_Buffer, Ptr);
-
-         --  Cannot compress if no double underscore anywhere
-
-         if Ptr < 2 then
-            return;
-         end if;
-
-         Ptr := Ptr  - 1;
-      end loop;
-
-      --  At this stage we have
-
-      --    Name_Buffer (1 .. Ptr - 1)         string to compress
-      --    Name_Buffer (Ptr)                  underscore
-      --    Name_Buffer (Ptr + 1)              underscore
-      --    Name_Buffer (Ptr + 2 .. Name_Len)  simple name to retain
-
-      --  See if we already have an entry for the compression string
-
-      --  No point in compressing if it does not make things shorter
-
-      if Name_Len <= (2 + 8 + 1) + (Name_Len - (Ptr + 1)) then
-         return;
-      end if;
-
-      --  Do not compress any reference to entity in internal file
-
-      if Name_Buffer (1 .. 5) = "ada__"
-           or else
-         Name_Buffer (1 .. 8) = "system__"
-           or else
-         Name_Buffer (1 .. 6) = "gnat__"
-           or else
-         Name_Buffer (1 .. 12) = "interfaces__"
-           or else
-             (OpenVMS and then Name_Buffer (1 .. 5) = "dec__")
-      then
-         return;
-      end if;
-
-      Sptr := Name_Buffer (1 .. Ptr - 1)'Unrestricted_Access;
-      Cod := CDN.Get (Sptr).W;
-
-      if Cod = 0 then
-         Cod := CDN_Hash (Sptr.all);
-         Sptr := new String'(Sptr.all);
-         CDN.Set (Sptr, (Cod, Sptr));
-      end if;
-
-      Name_Buffer (1) := 'X';
-      Name_Buffer (2) := 'C';
-      Put_Hex (Cod, 3);
-      Name_Buffer (11) := '_';
-      Name_Buffer (12 .. Name_Len - Ptr + 10) :=
-        Name_Buffer (Ptr + 2 .. Name_Len);
-      Name_Len := Name_Len - Ptr + 10;
-
-      Set_Chars (E, Name_Enter);
-   end Compress_Debug_Name;
-
    --------------------------------
    -- Debug_Renaming_Declaration --
    --------------------------------
@@ -496,7 +338,9 @@ package body Exp_Dbug is
    --  Start of processing for Debug_Renaming_Declaration
 
    begin
-      if not Comes_From_Source (N) then
+      if not Comes_From_Source (N)
+        and then not Needs_Debug_Info (Ent)
+      then
          return Empty;
       end if;
 
@@ -628,132 +472,6 @@ package body Exp_Dbug is
          return Make_Null_Statement (Loc);
    end Debug_Renaming_Declaration;
 
-   -----------------------
-   -- Double_Underscore --
-   -----------------------
-
-   function Double_Underscore (S : String; J : Natural) return Boolean is
-   begin
-      if J = S'First or else J > S'Last - 2 then
-         return False;
-
-      else
-         return S (J) = '_'
-           and then S (J + 1) = '_'
-           and then S (J - 1) /= '_'
-           and then S (J + 2) /= '_';
-      end if;
-   end Double_Underscore;
-
-   ------------------------------
-   -- Generate_Auxiliary_Types --
-   ------------------------------
-
-   --  Note: right now there is only one auxiliary type to be generated,
-   --  namely the enumeration type for the compression sequences if used.
-
-   procedure Generate_Auxiliary_Types is
-      Loc     : constant Source_Ptr := Sloc (Cunit (Current_Sem_Unit));
-      E       : Elmt;
-      Code    : Entity_Id;
-      Lit     : Entity_Id;
-      Start   : Natural;
-      Ptr     : Natural;
-      Discard : List_Id;
-
-      Literal_List : List_Id := New_List;
-      --  Gathers the list of literals for the declaration
-
-      procedure Output_Literal;
-      --  Adds suffix of form Xnnn to name in Name_Buffer, where nnn is
-      --  a serial number that is one greater on each call, and then
-      --  builds an enumeration literal and adds it to the literal list.
-
-      Serial : Nat := 0;
-      --  Current serial number
-
-      procedure Output_Literal is
-      begin
-         Serial := Serial + 1;
-         Add_Char_To_Name_Buffer ('X');
-         Add_Nat_To_Name_Buffer (Serial);
-
-         Lit :=
-           Make_Defining_Identifier (Loc,
-             Chars => Name_Find);
-         Set_Has_Qualified_Name (Lit, True);
-         Append (Lit, Literal_List);
-      end Output_Literal;
-
-   --  Start of processing for Auxiliary_Types
-
-   begin
-      E := CDN.Get_First;
-      if E.S /= null then
-         while E.S /= null loop
-
-            --  We have E.S a String_Ptr that contains a string of the form:
-
-            --    b__c__d
-
-            --  In E.W is a 32-bit word representing the hash value
-
-            --  Our mission is to construct a type
-
-            --     type XChhhhhhhh is (b,c,d);
-
-            --  where hhhhhhhh is the 8 hex digits of the E.W value.
-            --  and append this type declaration to the result list
-
-            Name_Buffer (1) := 'X';
-            Name_Buffer (2) := 'C';
-            Put_Hex (E.W, 3);
-            Name_Len := 10;
-            Output_Literal;
-
-            Start := E.S'First;
-            Ptr   := E.S'First;
-            while Ptr <= E.S'Last loop
-               if Ptr = E.S'Last
-                 or else Double_Underscore (E.S.all, Ptr + 1)
-               then
-                  Name_Len := Ptr - Start + 1;
-                  Name_Buffer (1 .. Name_Len) := E.S (Start .. Ptr);
-                  Output_Literal;
-                  Start := Ptr + 3;
-                  Ptr := Start;
-               else
-                  Ptr := Ptr + 1;
-               end if;
-            end loop;
-
-            E := CDN.Get_Next;
-         end loop;
-
-         Name_Buffer (1) := 'X';
-         Name_Buffer (2) := 'C';
-         Name_Len := 2;
-
-         Code :=
-           Make_Defining_Identifier (Loc,
-             Chars => Name_Find);
-         Set_Has_Qualified_Name (Code, True);
-
-         Insert_Library_Level_Action (
-           Make_Full_Type_Declaration (Loc,
-             Defining_Identifier => Code,
-             Type_Definition =>
-               Make_Enumeration_Type_Definition (Loc,
-                 Literals => Literal_List)));
-
-         --  We have to manually freeze this entity, since it is inserted
-         --  very late on into the tree, and otherwise will not be frozen.
-         --  No freeze actions are generated, so we can discard the result.
-
-         Discard := Freeze_Entity (Code,  Loc);
-      end if;
-   end Generate_Auxiliary_Types;
-
    ----------------------
    -- Get_Encoded_Name --
    ----------------------
@@ -835,8 +553,8 @@ package body Exp_Dbug is
             Lo : constant Node_Id := Type_Low_Bound (E);
             Hi : constant Node_Id := Type_High_Bound (E);
 
-            Lo_Stat : constant Boolean := Is_OK_Static_Expression (Lo);
-            Hi_Stat : constant Boolean := Is_OK_Static_Expression (Hi);
+            Lo_Con : constant Boolean := Compile_Time_Known_Value (Lo);
+            Hi_Con : constant Boolean := Compile_Time_Known_Value (Hi);
 
             Lo_Discr : constant Boolean :=
                          Nkind (Lo) = N_Identifier
@@ -848,8 +566,8 @@ package body Exp_Dbug is
                            and then
                          Ekind (Entity (Hi)) = E_Discriminant;
 
-            Lo_Encode : constant Boolean := Lo_Stat or Lo_Discr;
-            Hi_Encode : constant Boolean := Hi_Stat or Hi_Discr;
+            Lo_Encode : constant Boolean := Lo_Con or Lo_Discr;
+            Hi_Encode : constant Boolean := Hi_Con or Hi_Discr;
 
          begin
             if Lo_Encode or Hi_Encode then
@@ -863,7 +581,7 @@ package body Exp_Dbug is
                   Add_Str_To_Name_Buffer ("U_");
                end if;
 
-               if Lo_Stat then
+               if Lo_Con then
                   Add_Uint_To_Buffer (Expr_Rep_Value (Lo));
                elsif Lo_Discr then
                   Get_Name_String_And_Append (Chars (Entity (Lo)));
@@ -873,7 +591,7 @@ package body Exp_Dbug is
                   Add_Str_To_Name_Buffer ("__");
                end if;
 
-               if Hi_Stat then
+               if Hi_Con then
                   Add_Uint_To_Buffer (Expr_Rep_Value (Hi));
                elsif Hi_Discr then
                   Get_Name_String_And_Append (Chars (Entity (Hi)));
@@ -963,14 +681,6 @@ package body Exp_Dbug is
         and then No (Address_Clause (E))
         and then not Has_Suffix
       then
-         --  The following code needs explanation ???
-
-         if Convention (E) = Convention_Stdcall
-            and then Ekind (E) = E_Variable
-         then
-            Add_Str_To_Name_Buffer ("_imp__");
-         end if;
-
          Add_String_To_Name_Buffer (Strval (Interface_Name (E)));
 
       --  All other cases besides the interface name case
@@ -996,6 +706,10 @@ package body Exp_Dbug is
          if Is_Generic_Instance (E)
            and then Is_Subprogram (E)
            and then not Is_Compilation_Unit (Scope (E))
+           and then (Ekind (Scope (E)) = E_Package
+                      or else
+                     Ekind (Scope (E)) = E_Package_Body)
+           and then Present (Related_Instance (Scope (E)))
          then
             E := Related_Instance (Scope (E));
          end if;
@@ -1015,7 +729,23 @@ package body Exp_Dbug is
       Suffix : String)
    is
       Has_Suffix : constant Boolean := (Suffix /= "");
+      use type Opt.Operating_Mode_Type;
+
    begin
+      if Opt.Operating_Mode /= Opt.Generate_Code then
+
+         --  If we are not in code generation mode, we still may call this
+         --  procedure from Back_End (more specifically - from gigi for doing
+         --  type representation annotation or some representation-specific
+         --  checks). But in this mode there is no need to mess with external
+         --  names. Furthermore, the call causes difficulties in this case
+         --  because the string representing the homonym number is not
+         --  correctly reset as a part of the call to
+         --  Output_Homonym_Numbers_Suffix (which is not called in gigi)
+
+         return;
+      end if;
+
       Get_External_Name (Entity, Has_Suffix);
 
       if Has_Suffix then
@@ -1190,7 +920,6 @@ package body Exp_Dbug is
 
    procedure Prepend_String_To_Buffer (S : String) is
       N : constant Integer := S'Length;
-
    begin
       Name_Buffer (1 + N .. Name_Len + N) := Name_Buffer (1 .. Name_Len);
       Name_Buffer (1 .. N) := S;
@@ -1212,24 +941,6 @@ package body Exp_Dbug is
       end if;
    end Prepend_Uint_To_Buffer;
 
-   -------------
-   -- Put_Hex --
-   -------------
-
-   procedure Put_Hex (W : Word; N : Natural) is
-      Hex : constant array (Word range 0 .. 15) of Character :=
-              "0123456789abcdef";
-
-      Cod : Word;
-
-   begin
-      Cod := W;
-      for J in reverse N .. N + 7 loop
-         Name_Buffer (J) := Hex (Cod and 16#F#);
-         Cod := Cod / 16;
-      end loop;
-   end Put_Hex;
-
    ------------------------------
    -- Qualify_All_Entity_Names --
    ------------------------------
@@ -1255,20 +966,6 @@ package body Exp_Dbug is
             exit when Ent = E;
          end loop;
       end loop;
-
-      --  Second loop compresses any names that need compressing
-
-      for J in Name_Qualify_Units.First .. Name_Qualify_Units.Last loop
-         E := Defining_Entity (Name_Qualify_Units.Table (J));
-         Compress_Debug_Name (E);
-
-         Ent := First_Entity (E);
-         while Present (Ent) loop
-            Compress_Debug_Name (Ent);
-            Next_Entity (Ent);
-            exit when Ent = E;
-         end loop;
-      end loop;
    end Qualify_All_Entity_Names;
 
    -------------------------
@@ -1367,11 +1064,26 @@ package body Exp_Dbug is
                Get_Name_String (Chars (E));
             end if;
 
-            Full_Qualify_Name
-              (Full_Qualify_Len + 1 .. Full_Qualify_Len + Name_Len) :=
-                Name_Buffer (1 .. Name_Len);
-            Full_Qualify_Len := Full_Qualify_Len + Name_Len;
-            Append_Homonym_Number (E);
+            --  A special check here, we never add internal block or loop
+            --  names, since they intefere with debugging. We identify these
+            --  by the fact that they start with an upper case B or L.
+            --  But do add these if what we are qualifying is a __clean
+            --  procedure since those need to be made unique.
+
+            if (Name_Buffer (1) = 'B' or else Name_Buffer (1) = 'L')
+                and then (not Debug_Flag_VV)
+                and then Full_Qualify_Len > 2
+                and then Chars (Ent) /= Name_uClean
+            then
+               Full_Qualify_Len := Full_Qualify_Len - 2;
+
+            else
+               Full_Qualify_Name
+                 (Full_Qualify_Len + 1 .. Full_Qualify_Len + Name_Len) :=
+                   Name_Buffer (1 .. Name_Len);
+               Full_Qualify_Len := Full_Qualify_Len + Name_Len;
+               Append_Homonym_Number (E);
+            end if;
          end if;
 
          if Is_BNPE (E) then
@@ -1499,7 +1211,7 @@ package body Exp_Dbug is
         and then Present (Debug_Renaming_Link (Ent))
       then
          Name_Len := 0;
-         Set_Entity_Name (Debug_Renaming_Link (Ent));
+         Qualify_Entity_Name (Debug_Renaming_Link (Ent));
          Get_Name_String (Chars (Ent));
          Prepend_String_To_Buffer
            (Get_Name_String (Chars (Debug_Renaming_Link (Ent))));
@@ -1566,25 +1278,6 @@ package body Exp_Dbug is
       Name_Qualify_Units.Append (N);
    end Qualify_Entity_Names;
 
-   ---------
-   -- SEq --
-   ---------
-
-   function SEq (F1, F2 : String_Ptr) return Boolean is
-   begin
-      return F1.all = F2.all;
-   end SEq;
-
-   -----------
-   -- SHash --
-   -----------
-
-   function SHash (S : String_Ptr) return Hindex is
-   begin
-      return Hindex
-        (Hindex'First + Hindex (CDN_Hash (S.all) mod Hindex'Range_Length));
-   end SHash;
-
    --------------------
    -- Strip_Suffixes --
    --------------------