Merge basic-improvements-branch to trunk

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60174 138bc75d-0d04-0410-961f-82ee72b054a4

11 files changed, 350 insertions, 312 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 834922e2363..27e49962c0d 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -4,13 +4,20 @@
 
 2002-12-14   Geert Bosch <bosch@gnat.com>
 
-	* sem_ch6.adb (Analyze_Subprogram_Body): Recognize additional 
-        case of a body created for a Renaming_As_Body, on which 
-        conformance checks are not performed. Fixes PR ada/5690.
+	* sem_ch6.adb (Analyze_Subprogram_Body): Recognize additional
+	case of a body created for a Renaming_As_Body, on which
+	conformance checks are not performed. Fixes PR ada/5690.
+
+2002-11-30  Zack Weinberg  <zack@codesourcery.com>
+
+	* cuintp.c, decl.c, deftarg.c, misc.c, targtyps.c, trans.c,
+	utils.c, utils2.c: Include coretypes.h and tm.h, and system.h when
+	not already included.
+	* Make-lang.in: Update dependencies.
 
 2002-11-18  Nathanael Nerode  <neroden@gcc.gnu.org>
 	* adaint.c (__gnat_tmp_name): Better, but good enough for now,
-	solution to buffer overflow bug on GNU/Linux.	
+	solution to buffer overflow bug on GNU/Linux.
 
 2002-11-14  Nathanael Nerode  <neroden@gcc.gnu.org>
 	Closes PR ada/5856 and PR ada/6919 !
@@ -32,7 +39,7 @@
 2002-11-05  Graham Stott  <graham.stott@btinternet.com>
 	PR ada/8358
 	* trans.c (gnu_pending_elaboration_lists): New GC root.
-	(build_unit_elab): Use.. 
+	(build_unit_elab): Use..
 
 2002-10-30   Geert Bosch <bosch@gnat.com>
 	PR ada/6558
@@ -41,12 +48,12 @@
 	* Make-lang.in (misc.o): Add dependency on optabs.h
 
 2002-10-29   Geert Bosch <bosch@gnat.com>
-        PR ada/6558
+	PR ada/6558
 	* Make-lang.in (gnatbind): Depend on CONFIG_H
 
 2002-10-29  Geert bosch  <bosch@gnat.com>
-        PR ada/6558
-        * misc.c: Unrevert misc.c (1.13)
+	PR ada/6558
+	* misc.c: Unrevert misc.c (1.13)
 
 2002-10-28  Nathanael Nerode  <neroden@gcc.gnu.org>
 
@@ -55,265 +62,265 @@
 
 2002-09-25  Nathanael Nerode  <neroden@gcc.gnu.org>
 	PR ada/5904
-	* 5ataprop.adb 5atpopsp.adb 5bosinte.adb 5ftaprop.adb 
-	5gtaprop.adb 5htaprop.adb 5rosinte.ads 5staprop.adb 
-	5stpopse.adb 5vtaspri.ads 5zintman.adb 5ztaprop.adb 
-	7staprop.adb: Correct statements in comments about 
+	* 5ataprop.adb 5atpopsp.adb 5bosinte.adb 5ftaprop.adb
+	5gtaprop.adb 5htaprop.adb 5rosinte.ads 5staprop.adb
+	5stpopse.adb 5vtaspri.ads 5zintman.adb 5ztaprop.adb
+	7staprop.adb: Correct statements in comments about
 	maintainership of GNAT.
 
 	PR ada/5904
-	* 1ssecsta.adb 1ssecsta.ads adadecode.c adadecode.h aux-io.c 
-	gnatname.adb gnatname.ads mkdir.c osint-b.adb osint-b.ads 
-	osint-c.adb osint-c.ads osint-l.adb osint-l.ads osint-m.adb 
-	osint-m.ads prj-makr.adb prj-makr.ads prj-pp.adb prj-pp.ads 
-	s-atacco.ads s-traceb.adb s-traceb.ads s-traces.adb 
-	s-traces.ads s-tratas.adb s-tratas.ads sinput-d.adb 
-	sinput-d.ads switch-b.adb switch-b.ads switch-c.adb 
+	* 1ssecsta.adb 1ssecsta.ads adadecode.c adadecode.h aux-io.c
+	gnatname.adb gnatname.ads mkdir.c osint-b.adb osint-b.ads
+	osint-c.adb osint-c.ads osint-l.adb osint-l.ads osint-m.adb
+	osint-m.ads prj-makr.adb prj-makr.ads prj-pp.adb prj-pp.ads
+	s-atacco.ads s-traceb.adb s-traceb.ads s-traces.adb
+	s-traces.ads s-tratas.adb s-tratas.ads sinput-d.adb
+	sinput-d.ads switch-b.adb switch-b.ads switch-c.adb
 	switch-c.ads switch-m.adb switch-m.ads: Correct statements in
 	comments about maintainership of GNAT.
 
 	PR ada/6919 (forward port of patch for PR ada/5904)
-	* 1aexcept.adb 1aexcept.ads 41intnam.ads 42intnam.ads 
-	4aintnam.ads 4cintnam.ads 4dintnam.ads 4hexcpol.adb 
-	4lintnam.ads 4mintnam.ads 4nintnam.ads 4onumaux.ads 
-	4pintnam.ads 4rintnam.ads 4sintnam.ads 4uintnam.ads 
-	4vcalend.adb 4vintnam.ads 4wcalend.adb 4wexcpol.adb 
-	4wintnam.ads 4zintnam.ads 4znumaux.ads 4zsytaco.adb 
-	4zsytaco.ads 51osinte.adb 51osinte.ads 52osinte.adb 
-	52osinte.ads 52system.ads 53osinte.ads 5aosinte.ads 
-	5asystem.ads 5atasinf.ads 5ataspri.ads 5avxwork.ads 
-	5bosinte.ads 5bsystem.ads 5cosinte.ads 5dosinte.ads 
-	5esystem.ads 5fosinte.ads 5fsystem.ads 5ftasinf.ads 
-	5ginterr.adb 5gmastop.adb 5gosinte.ads 5gproinf.adb 
-	5gproinf.ads 5gsystem.ads 5gtasinf.adb 5gtasinf.ads 
-	5gtpgetc.adb 5hparame.ads 5hsystem.ads 5htaspri.ads 
-	5iosinte.ads 5itaspri.ads 5ksystem.ads 5kvxwork.ads 
-	5losinte.ads 5lsystem.ads 5mosinte.ads 5mvxwork.ads 
-	5ninmaop.adb 5nintman.adb 5nosinte.ads 5ntaspri.ads 
-	5oosprim.adb 5oparame.adb 5osystem.ads 5posinte.ads 
-	5posprim.adb 5pvxwork.ads 5rosinte.ads 5rparame.adb 
-	5sintman.adb 5sosinte.ads 5sparame.adb 5ssystem.ads 
-	5stasinf.adb 5stasinf.ads 5staspri.ads 5svxwork.ads 
-	5tosinte.ads 5uosinte.ads 5vasthan.adb 5vinterr.adb 
-	5vintman.ads 5vosinte.ads 5vosprim.adb 5vosprim.ads 
-	5vparame.ads 5vsystem.ads 5vtaspri.ads 5vtpopde.adb 
-	5vtpopde.ads 5vvaflop.adb 5wintman.adb 5wmemory.adb 
-	5wosinte.ads 5wosprim.adb 5wsystem.ads 5wtaprop.adb 
-	5wtaspri.ads 5ysystem.ads 5zinterr.adb 5zosinte.adb 
-	5zosinte.ads 5zosprim.adb 5zsystem.ads 6vcpp.adb 6vcstrea.adb 
-	7sosprim.adb 86numaux.adb 86numaux.ads 9drpc.adb a-astaco.adb 
-	a-caldel.ads a-calend.adb a-calend.ads a-chahan.adb 
-	a-chahan.ads a-colien.adb a-colien.ads a-colire.adb 
-	a-colire.ads a-comlin.adb a-comlin.ads a-cwila1.ads 
-	a-decima.adb a-decima.ads a-diocst.adb a-diocst.ads 
-	a-direio.adb a-direio.ads a-einuoc.adb a-einuoc.ads 
-	a-except.adb a-except.ads a-excpol.adb a-exctra.adb 
-	a-exctra.ads a-filico.adb a-filico.ads a-finali.adb 
-	a-finali.ads a-interr.ads a-intsig.adb a-intsig.ads 
-	a-ngcefu.adb a-ngcoty.adb a-ngcoty.ads a-ngelfu.adb 
-	a-nudira.adb a-nudira.ads a-nuflra.adb a-nuflra.ads 
-	a-numaux.ads a-reatim.ads a-retide.ads a-sequio.adb 
-	a-sequio.ads a-siocst.adb a-siocst.ads a-ssicst.adb 
-	a-ssicst.ads a-stmaco.ads a-storio.adb a-strbou.adb 
-	a-strbou.ads a-stream.ads a-strfix.adb a-strfix.ads 
-	a-strmap.adb a-strmap.ads a-strsea.adb a-strsea.ads 
-	a-strunb.adb a-strunb.ads a-ststio.adb a-ststio.ads 
-	a-stunau.adb a-stunau.ads a-stwibo.adb a-stwibo.ads 
-	a-stwifi.adb a-stwima.adb a-stwima.ads a-stwise.adb 
-	a-stwise.ads a-stwiun.adb a-stwiun.ads a-suteio.adb 
-	a-suteio.ads a-swmwco.ads a-swuwti.adb a-swuwti.ads 
-	a-sytaco.adb a-sytaco.ads a-tags.adb a-tags.ads a-tasatt.ads 
-	a-taside.adb a-taside.ads a-teioed.adb a-teioed.ads 
-	a-textio.adb a-textio.ads a-ticoau.adb a-ticoau.ads 
-	a-ticoio.adb a-ticoio.ads a-tideau.adb a-tideau.ads 
-	a-tideio.adb a-tideio.ads a-tienau.adb a-tienau.ads 
-	a-tienio.adb a-tienio.ads a-tifiio.adb a-tifiio.ads 
-	a-tiflau.adb a-tiflau.ads a-tiflio.adb a-tiflio.ads 
-	a-tigeau.adb a-tigeau.ads a-tiinau.adb a-tiinau.ads 
-	a-tiinio.adb a-tiinio.ads a-timoau.adb a-timoau.ads 
-	a-timoio.adb a-timoio.ads a-tiocst.adb a-tiocst.ads 
-	a-titest.adb a-witeio.adb a-witeio.ads a-wtcoau.adb 
-	a-wtcoau.ads a-wtcoio.adb a-wtcstr.adb a-wtcstr.ads 
-	a-wtdeau.adb a-wtdeau.ads a-wtdeio.adb a-wtdeio.ads 
-	a-wtedit.adb a-wtedit.ads a-wtenau.adb a-wtenau.ads 
-	a-wtenio.adb a-wtenio.ads a-wtfiio.adb a-wtfiio.ads 
-	a-wtflau.adb a-wtflau.ads a-wtflio.adb a-wtflio.ads 
-	a-wtgeau.adb a-wtgeau.ads a-wtinau.adb a-wtinau.ads 
-	a-wtinio.adb a-wtmoau.adb a-wtmoau.ads a-wtmoio.adb 
-	a-wtmoio.ads a-wttest.adb ada-tree.def ada-tree.h ada.h 
-	adaint.c adaint.h ali-util.adb ali-util.ads ali.adb ali.ads 
-	alloc.ads argv.c atree.adb atree.ads atree.h back_end.adb 
-	back_end.ads bcheck.adb bcheck.ads binde.adb binde.ads 
-	binderr.adb binderr.ads bindgen.adb bindgen.ads bindusg.adb 
-	bindusg.ads butil.adb butil.ads cal.c casing.adb casing.ads 
-	ceinfo.adb checks.adb checks.ads cio.c comperr.adb comperr.ads 
-	csets.adb csets.ads csinfo.adb cstand.adb cstand.ads 
-	cstreams.c cuintp.c debug.adb debug.ads debug_a.adb 
-	debug_a.ads dec-io.adb dec-io.ads dec.ads decl.c deftarg.c 
-	einfo.adb einfo.ads einfo.h elists.adb elists.ads elists.h 
-	errno.c errout.adb errout.ads eval_fat.adb eval_fat.ads exit.c 
-	exp_aggr.adb exp_aggr.ads exp_attr.adb exp_attr.ads 
-	exp_ch10.ads exp_ch11.adb exp_ch11.ads exp_ch12.adb 
-	exp_ch12.ads exp_ch13.adb exp_ch13.ads exp_ch2.adb exp_ch2.ads 
-	exp_ch3.adb exp_ch3.ads exp_ch4.adb exp_ch4.ads exp_ch5.adb 
-	exp_ch5.ads exp_ch6.adb exp_ch6.ads exp_ch7.adb exp_ch7.ads 
-	exp_ch8.adb exp_ch8.ads exp_ch9.adb exp_ch9.ads exp_code.adb 
-	exp_code.ads exp_dbug.adb exp_dbug.ads exp_disp.adb 
-	exp_disp.ads exp_dist.adb exp_dist.ads exp_fixd.adb 
-	exp_fixd.ads exp_imgv.adb exp_imgv.ads exp_intr.adb 
-	exp_intr.ads exp_pakd.adb exp_pakd.ads exp_prag.adb 
-	exp_prag.ads exp_smem.adb exp_smem.ads exp_strm.adb 
-	exp_strm.ads exp_tss.adb exp_tss.ads exp_util.adb exp_util.ads 
-	exp_vfpt.adb exp_vfpt.ads expander.adb expander.ads fe.h 
-	final.c fmap.adb fmap.ads fname-sf.adb fname-sf.ads 
-	fname-uf.adb fname-uf.ads fname.adb fname.ads freeze.adb 
-	freeze.ads frontend.adb frontend.ads g-calend.ads g-comlin.adb 
-	g-debpoo.adb g-debpoo.ads g-locfil.adb g-os_lib.ads 
-	g-regist.adb g-regist.ads get_targ.adb get_targ.ads gigi.h 
-	gmem.c gnat1drv.adb gnat1drv.ads gnat_ug.texi gnatbind.adb 
-	gnatbind.ads gnatbl.c gnatcmd.adb gnatcmd.ads gnatdll.adb 
-	gnatfind.adb gnatkr.adb gnatkr.ads gnatlbr.adb gnatlink.adb 
-	gnatlink.ads gnatls.adb gnatls.ads gnatmake.adb gnatmake.ads 
-	gnatmem.adb gnatprep.adb gnatprep.ads gnatpsta.adb gnatvsn.ads 
-	gnatxref.adb hlo.adb hlo.ads hostparm.ads i-c.adb i-cexten.ads 
-	i-cobol.adb i-cobol.ads i-cpoint.adb i-cpoint.ads i-cpp.adb 
-	i-cpp.ads i-cstrea.adb i-cstrea.ads i-cstrin.adb i-cstrin.ads 
-	i-fortra.adb i-os2err.ads i-os2lib.adb i-os2lib.ads 
-	i-os2syn.ads i-os2thr.ads i-pacdec.adb i-pacdec.ads 
-	impunit.adb impunit.ads init.c inline.adb inline.ads io-aux.c 
-	itypes.adb itypes.ads krunch.adb krunch.ads lang-options.h 
-	lang-specs.h layout.adb layout.ads lib-list.adb lib-load.adb 
-	lib-load.ads lib-sort.adb lib-util.adb lib-util.ads 
-	lib-writ.adb lib-writ.ads lib-xref.adb lib-xref.ads lib.adb 
-	lib.ads link.c live.adb live.ads make.adb make.ads makeusg.adb 
-	makeusg.ads math_lib.adb mdll.adb mdll.ads memtrack.adb misc.c 
-	namet.adb namet.ads namet.h nlists.adb nlists.ads nlists.h 
-	nmake.adb nmake.ads nmake.adt opt.adb opt.ads osint.adb 
-	osint.ads output.adb output.ads par-ch10.adb par-ch11.adb 
-	par-ch12.adb par-ch13.adb par-ch2.adb par-ch3.adb par-ch4.adb 
-	par-ch5.adb par-ch6.adb par-ch7.adb par-ch8.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 par.adb par.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-nmsc.adb prj-nmsc.ads prj-pars.adb prj-pars.ads 
-	prj-part.adb prj-part.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 prj.adb prj.ads raise.c raise.h 
-	repinfo.adb repinfo.ads repinfo.h restrict.adb restrict.ads 
-	rident.ads rtsfind.adb rtsfind.ads s-addima.adb s-addima.ads 
-	s-arit64.adb s-arit64.ads s-assert.adb s-assert.ads 
-	s-asthan.adb s-asthan.ads s-atacco.adb s-auxdec.adb 
-	s-auxdec.ads s-bitops.adb s-bitops.ads s-chepoo.ads 
-	s-direio.adb s-direio.ads s-except.ads s-exctab.adb 
-	s-exctab.ads s-exnflt.ads s-exngen.adb s-exngen.ads 
-	s-exnint.ads s-exnlfl.ads s-exnlin.ads s-exnllf.ads 
-	s-exnlli.ads s-exnsfl.ads s-exnsin.ads s-exnssi.ads 
-	s-expflt.ads s-expgen.adb s-expgen.ads s-expint.ads 
-	s-explfl.ads s-explin.ads s-expllf.ads s-explli.ads 
-	s-expllu.adb s-expllu.ads s-expmod.adb s-expmod.ads 
-	s-expsfl.ads s-expsin.ads s-expssi.ads s-expuns.adb 
-	s-expuns.ads s-fatflt.ads s-fatgen.adb s-fatgen.ads 
-	s-fatlfl.ads s-fatllf.ads s-fatsfl.ads s-ficobl.ads 
-	s-fileio.adb s-fileio.ads s-finimp.adb s-finimp.ads 
-	s-finroo.adb s-finroo.ads s-fore.adb s-fore.ads s-imgbiu.adb 
-	s-imgbiu.ads s-imgboo.adb s-imgboo.ads s-imgcha.adb 
-	s-imgcha.ads s-imgdec.adb s-imgdec.ads s-imgenu.adb 
-	s-imgenu.ads s-imgint.adb s-imgint.ads s-imgllb.adb 
-	s-imgllb.ads s-imglld.adb s-imglld.ads s-imglli.adb 
-	s-imglli.ads s-imgllu.adb s-imgllu.ads s-imgllw.adb 
-	s-imgllw.ads s-imgrea.adb s-imgrea.ads s-imguns.adb 
-	s-imguns.ads s-imgwch.adb s-imgwch.ads s-imgwiu.adb 
-	s-imgwiu.ads s-inmaop.ads s-interr.adb s-interr.ads 
-	s-intman.ads s-io.adb s-io.ads s-maccod.ads s-mantis.adb 
-	s-mantis.ads s-memory.adb s-memory.ads s-osprim.ads 
-	s-pack03.adb s-pack03.ads s-pack05.adb s-pack05.ads 
-	s-pack06.adb s-pack06.ads s-pack07.adb s-pack07.ads 
-	s-pack09.adb s-pack09.ads s-pack10.adb s-pack10.ads 
-	s-pack11.adb s-pack11.ads s-pack12.adb s-pack12.ads 
-	s-pack13.adb s-pack13.ads s-pack14.adb s-pack14.ads 
-	s-pack15.adb s-pack15.ads s-pack17.adb s-pack17.ads 
-	s-pack18.adb s-pack18.ads s-pack19.adb s-pack19.ads 
-	s-pack20.adb s-pack20.ads s-pack21.adb s-pack21.ads 
-	s-pack22.adb s-pack22.ads s-pack23.adb s-pack23.ads 
-	s-pack24.adb s-pack24.ads s-pack25.adb s-pack25.ads 
-	s-pack26.adb s-pack26.ads s-pack27.adb s-pack27.ads 
-	s-pack28.adb s-pack28.ads s-pack29.adb s-pack29.ads 
-	s-pack30.adb s-pack30.ads s-pack31.adb s-pack31.ads 
-	s-pack33.adb s-pack33.ads s-pack34.adb s-pack34.ads 
-	s-pack35.adb s-pack35.ads s-pack36.adb s-pack36.ads 
-	s-pack37.adb s-pack37.ads s-pack38.adb s-pack38.ads 
-	s-pack39.adb s-pack39.ads s-pack40.adb s-pack40.ads 
-	s-pack41.adb s-pack41.ads s-pack42.adb s-pack42.ads 
-	s-pack43.adb s-pack43.ads s-pack44.adb s-pack44.ads 
-	s-pack45.adb s-pack45.ads s-pack46.adb s-pack46.ads 
-	s-pack47.adb s-pack47.ads s-pack48.adb s-pack48.ads 
-	s-pack49.adb s-pack49.ads s-pack50.adb s-pack50.ads 
-	s-pack51.adb s-pack51.ads s-pack52.adb s-pack52.ads 
-	s-pack53.adb s-pack53.ads s-pack54.adb s-pack54.ads 
-	s-pack55.adb s-pack55.ads s-pack56.adb s-pack56.ads 
-	s-pack57.adb s-pack57.ads s-pack58.adb s-pack58.ads 
-	s-pack59.adb s-pack59.ads s-pack60.adb s-pack60.ads 
-	s-pack61.adb s-pack61.ads s-pack62.adb s-pack62.ads 
-	s-pack63.adb s-pack63.ads s-parame.adb s-parame.ads 
-	s-parint.adb s-parint.ads s-pooglo.adb s-pooglo.ads 
-	s-pooloc.adb s-pooloc.ads s-poosiz.adb s-poosiz.ads 
-	s-powtab.ads s-proinf.adb s-proinf.ads s-rpc.adb s-rpc.ads 
-	s-scaval.ads s-secsta.adb s-secsta.ads s-sequio.adb 
-	s-sequio.ads s-shasto.adb s-shasto.ads s-soflin.adb 
-	s-soflin.ads s-sopco3.adb s-sopco3.ads s-sopco4.adb 
-	s-sopco4.ads s-sopco5.adb s-sopco5.ads s-stache.adb 
-	s-stache.ads s-stalib.adb s-stalib.ads s-stoele.adb 
-	s-stopoo.ads s-stratt.adb s-stratt.ads s-strops.adb 
-	s-strops.ads s-taprob.ads s-taprop.ads s-tarest.ads 
-	s-tasdeb.adb s-tasdeb.ads s-tasinf.adb s-tasinf.ads 
-	s-tasini.ads s-taskin.ads s-tasren.ads s-tasres.ads 
-	s-tassta.ads s-tpinop.adb s-tpinop.ads s-tpoben.ads 
-	s-tpobop.ads s-unstyp.ads s-vaflop.adb s-vaflop.ads 
-	s-valboo.adb s-valboo.ads s-valcha.adb s-valcha.ads 
-	s-valdec.adb s-valdec.ads s-valenu.adb s-valenu.ads 
-	s-valint.adb s-valint.ads s-vallld.adb s-vallld.ads 
-	s-vallli.adb s-vallli.ads s-valllu.adb s-valllu.ads 
-	s-valrea.adb s-valrea.ads s-valuns.adb s-valuns.ads 
-	s-valuti.adb s-valuti.ads s-valwch.adb s-valwch.ads 
-	s-vercon.adb s-vercon.ads s-vmexta.adb s-vmexta.ads 
-	s-wchcnv.adb s-wchcnv.ads s-wchcon.ads s-wchjis.adb 
-	s-wchjis.ads s-wchstw.adb s-wchstw.ads s-wchwts.adb 
-	s-wchwts.ads s-widboo.adb s-widboo.ads s-widcha.adb 
-	s-widcha.ads s-widenu.adb s-widenu.ads s-widlli.adb 
-	s-widlli.ads s-widllu.adb s-widllu.ads s-widwch.adb 
-	s-widwch.ads s-wwdcha.adb s-wwdcha.ads s-wwdenu.adb 
-	s-wwdenu.ads s-wwdwch.adb s-wwdwch.ads scans.adb scans.ads 
-	scn-nlit.adb scn-slit.adb scn.adb scn.ads sdefault.ads sem.adb 
-	sem.ads sem_aggr.adb sem_aggr.ads sem_attr.adb sem_attr.ads 
-	sem_case.adb sem_case.ads sem_cat.adb sem_cat.ads sem_ch10.adb 
-	sem_ch10.ads sem_ch11.adb sem_ch11.ads sem_ch12.adb 
-	sem_ch12.ads sem_ch13.adb sem_ch13.ads sem_ch2.adb sem_ch2.ads 
-	sem_ch3.adb sem_ch3.ads sem_ch4.adb sem_ch4.ads 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_ch9.ads sem_disp.adb 
-	sem_disp.ads sem_dist.adb sem_dist.ads sem_elab.adb 
-	sem_elab.ads sem_elim.adb sem_elim.ads sem_eval.adb 
-	sem_eval.ads sem_intr.adb sem_intr.ads sem_maps.adb 
-	sem_maps.ads sem_mech.adb sem_mech.ads sem_prag.adb 
-	sem_prag.ads sem_res.adb sem_res.ads sem_smem.adb sem_smem.ads 
-	sem_type.adb sem_type.ads sem_util.adb sem_util.ads 
-	sem_vfpt.adb sem_vfpt.ads sem_warn.adb sem_warn.ads 
-	sfn_scan.adb sfn_scan.ads sinfo-cn.adb sinfo-cn.ads sinfo.adb 
-	sinfo.ads sinfo.h sinput-l.adb sinput-l.ads sinput-p.adb 
-	sinput-p.ads sinput.adb sinput.ads snames.adb snames.ads 
-	snames.h sprint.adb sprint.ads stand.adb stand.ads stringt.adb 
-	stringt.ads stringt.h style.adb style.ads stylesw.adb 
-	stylesw.ads switch.adb switch.ads sysdep.c system.ads 
-	table.adb table.ads targparm.adb targparm.ads targtyps.c 
-	tbuild.adb tbuild.ads trans.c tree_gen.adb tree_gen.ads 
-	tree_in.adb tree_in.ads tree_io.adb tree_io.ads treepr.adb 
-	treepr.ads treeprs.ads treeprs.adt ttypef.ads ttypes.ads 
-	types.adb types.ads types.h uintp.adb uintp.ads uintp.h 
-	uname.adb uname.ads urealp.adb urealp.ads urealp.h usage.adb 
-	usage.ads utils.c utils2.c validsw.adb validsw.ads 
-	widechar.adb widechar.ads xeinfo.adb xnmake.adb xr_tabls.adb 
-	xr_tabls.ads xref_lib.adb xref_lib.ads xsinfo.adb xsnames.adb 
+	* 1aexcept.adb 1aexcept.ads 41intnam.ads 42intnam.ads
+	4aintnam.ads 4cintnam.ads 4dintnam.ads 4hexcpol.adb
+	4lintnam.ads 4mintnam.ads 4nintnam.ads 4onumaux.ads
+	4pintnam.ads 4rintnam.ads 4sintnam.ads 4uintnam.ads
+	4vcalend.adb 4vintnam.ads 4wcalend.adb 4wexcpol.adb
+	4wintnam.ads 4zintnam.ads 4znumaux.ads 4zsytaco.adb
+	4zsytaco.ads 51osinte.adb 51osinte.ads 52osinte.adb
+	52osinte.ads 52system.ads 53osinte.ads 5aosinte.ads
+	5asystem.ads 5atasinf.ads 5ataspri.ads 5avxwork.ads
+	5bosinte.ads 5bsystem.ads 5cosinte.ads 5dosinte.ads
+	5esystem.ads 5fosinte.ads 5fsystem.ads 5ftasinf.ads
+	5ginterr.adb 5gmastop.adb 5gosinte.ads 5gproinf.adb
+	5gproinf.ads 5gsystem.ads 5gtasinf.adb 5gtasinf.ads
+	5gtpgetc.adb 5hparame.ads 5hsystem.ads 5htaspri.ads
+	5iosinte.ads 5itaspri.ads 5ksystem.ads 5kvxwork.ads
+	5losinte.ads 5lsystem.ads 5mosinte.ads 5mvxwork.ads
+	5ninmaop.adb 5nintman.adb 5nosinte.ads 5ntaspri.ads
+	5oosprim.adb 5oparame.adb 5osystem.ads 5posinte.ads
+	5posprim.adb 5pvxwork.ads 5rosinte.ads 5rparame.adb
+	5sintman.adb 5sosinte.ads 5sparame.adb 5ssystem.ads
+	5stasinf.adb 5stasinf.ads 5staspri.ads 5svxwork.ads
+	5tosinte.ads 5uosinte.ads 5vasthan.adb 5vinterr.adb
+	5vintman.ads 5vosinte.ads 5vosprim.adb 5vosprim.ads
+	5vparame.ads 5vsystem.ads 5vtaspri.ads 5vtpopde.adb
+	5vtpopde.ads 5vvaflop.adb 5wintman.adb 5wmemory.adb
+	5wosinte.ads 5wosprim.adb 5wsystem.ads 5wtaprop.adb
+	5wtaspri.ads 5ysystem.ads 5zinterr.adb 5zosinte.adb
+	5zosinte.ads 5zosprim.adb 5zsystem.ads 6vcpp.adb 6vcstrea.adb
+	7sosprim.adb 86numaux.adb 86numaux.ads 9drpc.adb a-astaco.adb
+	a-caldel.ads a-calend.adb a-calend.ads a-chahan.adb
+	a-chahan.ads a-colien.adb a-colien.ads a-colire.adb
+	a-colire.ads a-comlin.adb a-comlin.ads a-cwila1.ads
+	a-decima.adb a-decima.ads a-diocst.adb a-diocst.ads
+	a-direio.adb a-direio.ads a-einuoc.adb a-einuoc.ads
+	a-except.adb a-except.ads a-excpol.adb a-exctra.adb
+	a-exctra.ads a-filico.adb a-filico.ads a-finali.adb
+	a-finali.ads a-interr.ads a-intsig.adb a-intsig.ads
+	a-ngcefu.adb a-ngcoty.adb a-ngcoty.ads a-ngelfu.adb
+	a-nudira.adb a-nudira.ads a-nuflra.adb a-nuflra.ads
+	a-numaux.ads a-reatim.ads a-retide.ads a-sequio.adb
+	a-sequio.ads a-siocst.adb a-siocst.ads a-ssicst.adb
+	a-ssicst.ads a-stmaco.ads a-storio.adb a-strbou.adb
+	a-strbou.ads a-stream.ads a-strfix.adb a-strfix.ads
+	a-strmap.adb a-strmap.ads a-strsea.adb a-strsea.ads
+	a-strunb.adb a-strunb.ads a-ststio.adb a-ststio.ads
+	a-stunau.adb a-stunau.ads a-stwibo.adb a-stwibo.ads
+	a-stwifi.adb a-stwima.adb a-stwima.ads a-stwise.adb
+	a-stwise.ads a-stwiun.adb a-stwiun.ads a-suteio.adb
+	a-suteio.ads a-swmwco.ads a-swuwti.adb a-swuwti.ads
+	a-sytaco.adb a-sytaco.ads a-tags.adb a-tags.ads a-tasatt.ads
+	a-taside.adb a-taside.ads a-teioed.adb a-teioed.ads
+	a-textio.adb a-textio.ads a-ticoau.adb a-ticoau.ads
+	a-ticoio.adb a-ticoio.ads a-tideau.adb a-tideau.ads
+	a-tideio.adb a-tideio.ads a-tienau.adb a-tienau.ads
+	a-tienio.adb a-tienio.ads a-tifiio.adb a-tifiio.ads
+	a-tiflau.adb a-tiflau.ads a-tiflio.adb a-tiflio.ads
+	a-tigeau.adb a-tigeau.ads a-tiinau.adb a-tiinau.ads
+	a-tiinio.adb a-tiinio.ads a-timoau.adb a-timoau.ads
+	a-timoio.adb a-timoio.ads a-tiocst.adb a-tiocst.ads
+	a-titest.adb a-witeio.adb a-witeio.ads a-wtcoau.adb
+	a-wtcoau.ads a-wtcoio.adb a-wtcstr.adb a-wtcstr.ads
+	a-wtdeau.adb a-wtdeau.ads a-wtdeio.adb a-wtdeio.ads
+	a-wtedit.adb a-wtedit.ads a-wtenau.adb a-wtenau.ads
+	a-wtenio.adb a-wtenio.ads a-wtfiio.adb a-wtfiio.ads
+	a-wtflau.adb a-wtflau.ads a-wtflio.adb a-wtflio.ads
+	a-wtgeau.adb a-wtgeau.ads a-wtinau.adb a-wtinau.ads
+	a-wtinio.adb a-wtmoau.adb a-wtmoau.ads a-wtmoio.adb
+	a-wtmoio.ads a-wttest.adb ada-tree.def ada-tree.h ada.h
+	adaint.c adaint.h ali-util.adb ali-util.ads ali.adb ali.ads
+	alloc.ads argv.c atree.adb atree.ads atree.h back_end.adb
+	back_end.ads bcheck.adb bcheck.ads binde.adb binde.ads
+	binderr.adb binderr.ads bindgen.adb bindgen.ads bindusg.adb
+	bindusg.ads butil.adb butil.ads cal.c casing.adb casing.ads
+	ceinfo.adb checks.adb checks.ads cio.c comperr.adb comperr.ads
+	csets.adb csets.ads csinfo.adb cstand.adb cstand.ads
+	cstreams.c cuintp.c debug.adb debug.ads debug_a.adb
+	debug_a.ads dec-io.adb dec-io.ads dec.ads decl.c deftarg.c
+	einfo.adb einfo.ads einfo.h elists.adb elists.ads elists.h
+	errno.c errout.adb errout.ads eval_fat.adb eval_fat.ads exit.c
+	exp_aggr.adb exp_aggr.ads exp_attr.adb exp_attr.ads
+	exp_ch10.ads exp_ch11.adb exp_ch11.ads exp_ch12.adb
+	exp_ch12.ads exp_ch13.adb exp_ch13.ads exp_ch2.adb exp_ch2.ads
+	exp_ch3.adb exp_ch3.ads exp_ch4.adb exp_ch4.ads exp_ch5.adb
+	exp_ch5.ads exp_ch6.adb exp_ch6.ads exp_ch7.adb exp_ch7.ads
+	exp_ch8.adb exp_ch8.ads exp_ch9.adb exp_ch9.ads exp_code.adb
+	exp_code.ads exp_dbug.adb exp_dbug.ads exp_disp.adb
+	exp_disp.ads exp_dist.adb exp_dist.ads exp_fixd.adb
+	exp_fixd.ads exp_imgv.adb exp_imgv.ads exp_intr.adb
+	exp_intr.ads exp_pakd.adb exp_pakd.ads exp_prag.adb
+	exp_prag.ads exp_smem.adb exp_smem.ads exp_strm.adb
+	exp_strm.ads exp_tss.adb exp_tss.ads exp_util.adb exp_util.ads
+	exp_vfpt.adb exp_vfpt.ads expander.adb expander.ads fe.h
+	final.c fmap.adb fmap.ads fname-sf.adb fname-sf.ads
+	fname-uf.adb fname-uf.ads fname.adb fname.ads freeze.adb
+	freeze.ads frontend.adb frontend.ads g-calend.ads g-comlin.adb
+	g-debpoo.adb g-debpoo.ads g-locfil.adb g-os_lib.ads
+	g-regist.adb g-regist.ads get_targ.adb get_targ.ads gigi.h
+	gmem.c gnat1drv.adb gnat1drv.ads gnat_ug.texi gnatbind.adb
+	gnatbind.ads gnatbl.c gnatcmd.adb gnatcmd.ads gnatdll.adb
+	gnatfind.adb gnatkr.adb gnatkr.ads gnatlbr.adb gnatlink.adb
+	gnatlink.ads gnatls.adb gnatls.ads gnatmake.adb gnatmake.ads
+	gnatmem.adb gnatprep.adb gnatprep.ads gnatpsta.adb gnatvsn.ads
+	gnatxref.adb hlo.adb hlo.ads hostparm.ads i-c.adb i-cexten.ads
+	i-cobol.adb i-cobol.ads i-cpoint.adb i-cpoint.ads i-cpp.adb
+	i-cpp.ads i-cstrea.adb i-cstrea.ads i-cstrin.adb i-cstrin.ads
+	i-fortra.adb i-os2err.ads i-os2lib.adb i-os2lib.ads
+	i-os2syn.ads i-os2thr.ads i-pacdec.adb i-pacdec.ads
+	impunit.adb impunit.ads init.c inline.adb inline.ads io-aux.c
+	itypes.adb itypes.ads krunch.adb krunch.ads lang-options.h
+	lang-specs.h layout.adb layout.ads lib-list.adb lib-load.adb
+	lib-load.ads lib-sort.adb lib-util.adb lib-util.ads
+	lib-writ.adb lib-writ.ads lib-xref.adb lib-xref.ads lib.adb
+	lib.ads link.c live.adb live.ads make.adb make.ads makeusg.adb
+	makeusg.ads math_lib.adb mdll.adb mdll.ads memtrack.adb misc.c
+	namet.adb namet.ads namet.h nlists.adb nlists.ads nlists.h
+	nmake.adb nmake.ads nmake.adt opt.adb opt.ads osint.adb
+	osint.ads output.adb output.ads par-ch10.adb par-ch11.adb
+	par-ch12.adb par-ch13.adb par-ch2.adb par-ch3.adb par-ch4.adb
+	par-ch5.adb par-ch6.adb par-ch7.adb par-ch8.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 par.adb par.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-nmsc.adb prj-nmsc.ads prj-pars.adb prj-pars.ads
+	prj-part.adb prj-part.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 prj.adb prj.ads raise.c raise.h
+	repinfo.adb repinfo.ads repinfo.h restrict.adb restrict.ads
+	rident.ads rtsfind.adb rtsfind.ads s-addima.adb s-addima.ads
+	s-arit64.adb s-arit64.ads s-assert.adb s-assert.ads
+	s-asthan.adb s-asthan.ads s-atacco.adb s-auxdec.adb
+	s-auxdec.ads s-bitops.adb s-bitops.ads s-chepoo.ads
+	s-direio.adb s-direio.ads s-except.ads s-exctab.adb
+	s-exctab.ads s-exnflt.ads s-exngen.adb s-exngen.ads
+	s-exnint.ads s-exnlfl.ads s-exnlin.ads s-exnllf.ads
+	s-exnlli.ads s-exnsfl.ads s-exnsin.ads s-exnssi.ads
+	s-expflt.ads s-expgen.adb s-expgen.ads s-expint.ads
+	s-explfl.ads s-explin.ads s-expllf.ads s-explli.ads
+	s-expllu.adb s-expllu.ads s-expmod.adb s-expmod.ads
+	s-expsfl.ads s-expsin.ads s-expssi.ads s-expuns.adb
+	s-expuns.ads s-fatflt.ads s-fatgen.adb s-fatgen.ads
+	s-fatlfl.ads s-fatllf.ads s-fatsfl.ads s-ficobl.ads
+	s-fileio.adb s-fileio.ads s-finimp.adb s-finimp.ads
+	s-finroo.adb s-finroo.ads s-fore.adb s-fore.ads s-imgbiu.adb
+	s-imgbiu.ads s-imgboo.adb s-imgboo.ads s-imgcha.adb
+	s-imgcha.ads s-imgdec.adb s-imgdec.ads s-imgenu.adb
+	s-imgenu.ads s-imgint.adb s-imgint.ads s-imgllb.adb
+	s-imgllb.ads s-imglld.adb s-imglld.ads s-imglli.adb
+	s-imglli.ads s-imgllu.adb s-imgllu.ads s-imgllw.adb
+	s-imgllw.ads s-imgrea.adb s-imgrea.ads s-imguns.adb
+	s-imguns.ads s-imgwch.adb s-imgwch.ads s-imgwiu.adb
+	s-imgwiu.ads s-inmaop.ads s-interr.adb s-interr.ads
+	s-intman.ads s-io.adb s-io.ads s-maccod.ads s-mantis.adb
+	s-mantis.ads s-memory.adb s-memory.ads s-osprim.ads
+	s-pack03.adb s-pack03.ads s-pack05.adb s-pack05.ads
+	s-pack06.adb s-pack06.ads s-pack07.adb s-pack07.ads
+	s-pack09.adb s-pack09.ads s-pack10.adb s-pack10.ads
+	s-pack11.adb s-pack11.ads s-pack12.adb s-pack12.ads
+	s-pack13.adb s-pack13.ads s-pack14.adb s-pack14.ads
+	s-pack15.adb s-pack15.ads s-pack17.adb s-pack17.ads
+	s-pack18.adb s-pack18.ads s-pack19.adb s-pack19.ads
+	s-pack20.adb s-pack20.ads s-pack21.adb s-pack21.ads
+	s-pack22.adb s-pack22.ads s-pack23.adb s-pack23.ads
+	s-pack24.adb s-pack24.ads s-pack25.adb s-pack25.ads
+	s-pack26.adb s-pack26.ads s-pack27.adb s-pack27.ads
+	s-pack28.adb s-pack28.ads s-pack29.adb s-pack29.ads
+	s-pack30.adb s-pack30.ads s-pack31.adb s-pack31.ads
+	s-pack33.adb s-pack33.ads s-pack34.adb s-pack34.ads
+	s-pack35.adb s-pack35.ads s-pack36.adb s-pack36.ads
+	s-pack37.adb s-pack37.ads s-pack38.adb s-pack38.ads
+	s-pack39.adb s-pack39.ads s-pack40.adb s-pack40.ads
+	s-pack41.adb s-pack41.ads s-pack42.adb s-pack42.ads
+	s-pack43.adb s-pack43.ads s-pack44.adb s-pack44.ads
+	s-pack45.adb s-pack45.ads s-pack46.adb s-pack46.ads
+	s-pack47.adb s-pack47.ads s-pack48.adb s-pack48.ads
+	s-pack49.adb s-pack49.ads s-pack50.adb s-pack50.ads
+	s-pack51.adb s-pack51.ads s-pack52.adb s-pack52.ads
+	s-pack53.adb s-pack53.ads s-pack54.adb s-pack54.ads
+	s-pack55.adb s-pack55.ads s-pack56.adb s-pack56.ads
+	s-pack57.adb s-pack57.ads s-pack58.adb s-pack58.ads
+	s-pack59.adb s-pack59.ads s-pack60.adb s-pack60.ads
+	s-pack61.adb s-pack61.ads s-pack62.adb s-pack62.ads
+	s-pack63.adb s-pack63.ads s-parame.adb s-parame.ads
+	s-parint.adb s-parint.ads s-pooglo.adb s-pooglo.ads
+	s-pooloc.adb s-pooloc.ads s-poosiz.adb s-poosiz.ads
+	s-powtab.ads s-proinf.adb s-proinf.ads s-rpc.adb s-rpc.ads
+	s-scaval.ads s-secsta.adb s-secsta.ads s-sequio.adb
+	s-sequio.ads s-shasto.adb s-shasto.ads s-soflin.adb
+	s-soflin.ads s-sopco3.adb s-sopco3.ads s-sopco4.adb
+	s-sopco4.ads s-sopco5.adb s-sopco5.ads s-stache.adb
+	s-stache.ads s-stalib.adb s-stalib.ads s-stoele.adb
+	s-stopoo.ads s-stratt.adb s-stratt.ads s-strops.adb
+	s-strops.ads s-taprob.ads s-taprop.ads s-tarest.ads
+	s-tasdeb.adb s-tasdeb.ads s-tasinf.adb s-tasinf.ads
+	s-tasini.ads s-taskin.ads s-tasren.ads s-tasres.ads
+	s-tassta.ads s-tpinop.adb s-tpinop.ads s-tpoben.ads
+	s-tpobop.ads s-unstyp.ads s-vaflop.adb s-vaflop.ads
+	s-valboo.adb s-valboo.ads s-valcha.adb s-valcha.ads
+	s-valdec.adb s-valdec.ads s-valenu.adb s-valenu.ads
+	s-valint.adb s-valint.ads s-vallld.adb s-vallld.ads
+	s-vallli.adb s-vallli.ads s-valllu.adb s-valllu.ads
+	s-valrea.adb s-valrea.ads s-valuns.adb s-valuns.ads
+	s-valuti.adb s-valuti.ads s-valwch.adb s-valwch.ads
+	s-vercon.adb s-vercon.ads s-vmexta.adb s-vmexta.ads
+	s-wchcnv.adb s-wchcnv.ads s-wchcon.ads s-wchjis.adb
+	s-wchjis.ads s-wchstw.adb s-wchstw.ads s-wchwts.adb
+	s-wchwts.ads s-widboo.adb s-widboo.ads s-widcha.adb
+	s-widcha.ads s-widenu.adb s-widenu.ads s-widlli.adb
+	s-widlli.ads s-widllu.adb s-widllu.ads s-widwch.adb
+	s-widwch.ads s-wwdcha.adb s-wwdcha.ads s-wwdenu.adb
+	s-wwdenu.ads s-wwdwch.adb s-wwdwch.ads scans.adb scans.ads
+	scn-nlit.adb scn-slit.adb scn.adb scn.ads sdefault.ads sem.adb
+	sem.ads sem_aggr.adb sem_aggr.ads sem_attr.adb sem_attr.ads
+	sem_case.adb sem_case.ads sem_cat.adb sem_cat.ads sem_ch10.adb
+	sem_ch10.ads sem_ch11.adb sem_ch11.ads sem_ch12.adb
+	sem_ch12.ads sem_ch13.adb sem_ch13.ads sem_ch2.adb sem_ch2.ads
+	sem_ch3.adb sem_ch3.ads sem_ch4.adb sem_ch4.ads 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_ch9.ads sem_disp.adb
+	sem_disp.ads sem_dist.adb sem_dist.ads sem_elab.adb
+	sem_elab.ads sem_elim.adb sem_elim.ads sem_eval.adb
+	sem_eval.ads sem_intr.adb sem_intr.ads sem_maps.adb
+	sem_maps.ads sem_mech.adb sem_mech.ads sem_prag.adb
+	sem_prag.ads sem_res.adb sem_res.ads sem_smem.adb sem_smem.ads
+	sem_type.adb sem_type.ads sem_util.adb sem_util.ads
+	sem_vfpt.adb sem_vfpt.ads sem_warn.adb sem_warn.ads
+	sfn_scan.adb sfn_scan.ads sinfo-cn.adb sinfo-cn.ads sinfo.adb
+	sinfo.ads sinfo.h sinput-l.adb sinput-l.ads sinput-p.adb
+	sinput-p.ads sinput.adb sinput.ads snames.adb snames.ads
+	snames.h sprint.adb sprint.ads stand.adb stand.ads stringt.adb
+	stringt.ads stringt.h style.adb style.ads stylesw.adb
+	stylesw.ads switch.adb switch.ads sysdep.c system.ads
+	table.adb table.ads targparm.adb targparm.ads targtyps.c
+	tbuild.adb tbuild.ads trans.c tree_gen.adb tree_gen.ads
+	tree_in.adb tree_in.ads tree_io.adb tree_io.ads treepr.adb
+	treepr.ads treeprs.ads treeprs.adt ttypef.ads ttypes.ads
+	types.adb types.ads types.h uintp.adb uintp.ads uintp.h
+	uname.adb uname.ads urealp.adb urealp.ads urealp.h usage.adb
+	usage.ads utils.c utils2.c validsw.adb validsw.ads
+	widechar.adb widechar.ads xeinfo.adb xnmake.adb xr_tabls.adb
+	xr_tabls.ads xref_lib.adb xref_lib.ads xsinfo.adb xsnames.adb
 	xtreeprs.adb: Correct statements in comments about maintainership
 	of GNAT.
 
diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index 6669eb4c64f..d7a6aff87b5 100644
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -972,14 +972,13 @@ ada/memtrack.o  : ada/memtrack.adb ada/s-memory.ads
 	$(ADAC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O0 \
 	 $(ADA_INCLUDES) $< $(OUTPUT_OPTION) 
 
-ada/adadecode.o : ada/adadecode.c ada/adadecode.h $(CONFIG_H) $(SYSTEM_H) \
-	ada/adadecode.h 
-ada/adaint.o  : ada/adaint.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h
-ada/argv.o    : ada/argv.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h
+ada/adadecode.o : ada/adadecode.c $(CONFIG_H) $(SYSTEM_H) ada/adadecode.h
+ada/adaint.o   : ada/adaint.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h
+ada/argv.o     : ada/argv.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h
 ada/cstreams.o : ada/cstreams.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h
-ada/exit.o    : ada/exit.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h
-ada/final.o   : ada/final.c $(CONFIG_H) $(SYSTEM_H) ada/raise.h 
-ada/link.o    : ada/link.c
+ada/exit.o     : ada/exit.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h
+ada/final.o    : ada/final.c $(CONFIG_H) $(SYSTEM_H) ada/raise.h 
+ada/link.o     : ada/link.c
 
 ada/cio.o     : ada/cio.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h
 	$(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(RT_FLAGS) \
@@ -999,44 +998,41 @@ ada/tracebak.o  : ada/tracebak.c $(CONFIG_H) $(SYSTEM_H)
 	$(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 	      -fno-omit-frame-pointer $< $(OUTPUT_OPTION) 
 
-ada/cuintp.o : ada/cuintp.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) ada/ada.h \
-   ada/types.h ada/uintp.h ada/atree.h ada/stringt.h ada/elists.h \
+ada/cuintp.o : ada/cuintp.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
+   ada/ada.h ada/types.h ada/uintp.h ada/atree.h ada/stringt.h ada/elists.h \
    ada/nlists.h ada/fe.h ada/gigi.h
 
-ada/decl.o : ada/decl.c $(CONFIG_H) $(TREE_H) $(srcdir)/flags.h \
-   $(srcdir)/toplev.h $(srcdir)/convert.h ada/ada.h ada/types.h ada/atree.h \
-   ada/nlists.h ada/elists.h ada/uintp.h ada/sinfo.h ada/einfo.h ada/snames.h \
-   ada/namet.h ada/stringt.h ada/repinfo.h ada/fe.h $(ADA_TREE_H) ada/gigi.h \
-   gt-ada-decl.h
-
-ada/misc.o : ada/misc.c $(CONFIG_H) $(TREE_H) $(RTL_H) $(srcdir)/expr.h \
-   insn-codes.h insn-flags.h insn-config.h $(srcdir)/recog.h \
-   $(srcdir)/flags.h $(srcdir)/diagnostic.h $(srcdir)/output.h \
-   $(srcdir)/except.h tm_p.h $(srcdir)/langhooks.h $(srcdir)/debug.h \
-   $(srcdir)/langhooks-def.h $(srcdir)/libfuncs.h $(srcdir)/optabs.h \
-   ada/ada.h ada/types.h ada/atree.h ada/nlists.h ada/elists.h ada/sinfo.h \
-   ada/einfo.h ada/namet.h ada/stringt.h ada/uintp.h ada/fe.h $(ADA_TREE_H) \
-   ada/gigi.h ada/adadecode.h
-
-ada/targtyps.o : ada/targtyps.c $(CONFIG_H) ada/ada.h ada/types.h ada/atree.h \
-   ada/nlists.h ada/elists.h ada/uintp.h ada/sinfo.h ada/einfo.h ada/namet.h \
-   ada/snames.h ada/stringt.h ada/urealp.h ada/fe.h $(ADA_TREE_H) ada/gigi.h
-
-ada/trans.o : ada/trans.c $(CONFIG_H) $(TREE_H) $(RTL_H) $(srcdir)/flags.h \
-   ada/ada.h $(srcdir)/except.h ada/types.h ada/atree.h ada/nlists.h \
+ada/decl.o : ada/decl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
+   flags.h toplev.h convert.h ada/ada.h ada/types.h ada/atree.h ada/nlists.h \
+   ada/elists.h ada/uintp.h ada/sinfo.h ada/einfo.h ada/snames.h ada/namet.h \
+   ada/stringt.h ada/repinfo.h ada/fe.h $(ADA_TREE_H) ada/gigi.h gt-ada-decl.h
+
+ada/misc.o : ada/misc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
+   $(RTL_H) expr.h insn-codes.h insn-flags.h insn-config.h recog.h flags.h \
+   diagnostic.h output.h except.h $(TM_P_H) langhooks.h debug.h $(LANGHOOKS_DEF_H) \
+   libfuncs.h $(OPTABS_H) ada/ada.h ada/types.h ada/atree.h ada/nlists.h \
+   ada/elists.h ada/sinfo.h ada/einfo.h ada/namet.h ada/stringt.h ada/uintp.h \
+   ada/fe.h $(ADA_TREE_H) ada/gigi.h ada/adadecode.h
+
+ada/targtyps.o : ada/targtyps.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
+   ada/ada.h ada/types.h ada/atree.h ada/nlists.h ada/elists.h ada/uintp.h \
+   ada/sinfo.h ada/einfo.h ada/namet.h ada/snames.h ada/stringt.h ada/urealp.h \
+   ada/fe.h $(ADA_TREE_H) ada/gigi.h
+
+ada/trans.o : ada/trans.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
+   $(RTL_H) flags.h ada/ada.h except.h ada/types.h ada/atree.h ada/nlists.h \
    ada/elists.h ada/uintp.h ada/sinfo.h ada/einfo.h ada/namet.h ada/snames.h \
    ada/stringt.h ada/urealp.h ada/fe.h $(ADA_TREE_H) ada/gigi.h gt-ada-trans.h
 
-ada/utils.o : ada/utils.c $(CONFIG_H) $(TREE_H) $(srcdir)/flags.h \
-   $(srcdir)/expr.h $(srcdir)/convert.h $(srcdir)/defaults.h ada/ada.h \
-   ada/types.h ada/atree.h ada/nlists.h ada/elists.h ada/sinfo.h ada/einfo.h \
-   ada/namet.h ada/stringt.h ada/uintp.h ada/fe.h $(ADA_TREE_H) ada/gigi.h \
-   gt-ada-utils.h gtype-ada.h
+ada/utils.o : ada/utils.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
+   flags.h expr.h convert.h defaults.h ada/ada.h ada/types.h ada/atree.h \
+   ada/nlists.h ada/elists.h ada/sinfo.h ada/einfo.h ada/namet.h ada/stringt.h \
+   ada/uintp.h ada/fe.h $(ADA_TREE_H) ada/gigi.h gt-ada-utils.h gtype-ada.h
 
-ada/utils2.o : ada/utils2.c $(CONFIG_H) $(TREE_H) $(srcdir)/flags.h ada/ada.h \
-   ada/types.h ada/atree.h ada/nlists.h ada/elists.h ada/sinfo.h ada/einfo.h \
-   ada/namet.h ada/snames.h ada/stringt.h ada/uintp.h ada/fe.h $(ADA_TREE_H) \
-   ada/gigi.h
+ada/utils2.o : ada/utils2.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
+   $(TREE_H) flags.h ada/ada.h ada/types.h ada/atree.h ada/nlists.h \
+   ada/elists.h ada/sinfo.h ada/einfo.h ada/namet.h ada/snames.h ada/stringt.h \
+   ada/uintp.h ada/fe.h $(ADA_TREE_H) ada/gigi.h
 
 #
 # DO NOT PUT SPECIAL RULES BELOW, THIS SECTION IS UPDATED AUTOMATICALLY
diff --git a/gcc/ada/cuintp.c b/gcc/ada/cuintp.c
index e390cfcec85..d5eeb2d2ce1 100644
--- a/gcc/ada/cuintp.c
+++ b/gcc/ada/cuintp.c
@@ -30,6 +30,8 @@
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
 #include "ada.h"
 #include "types.h"
diff --git a/gcc/ada/decl.c b/gcc/ada/decl.c
index 8a2e6017527..adf648111b3 100644
--- a/gcc/ada/decl.c
+++ b/gcc/ada/decl.c
@@ -27,6 +27,8 @@
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
 #include "flags.h"
 #include "toplev.h"
diff --git a/gcc/ada/deftarg.c b/gcc/ada/deftarg.c
index 9640b65c6fd..d69ce227188 100644
--- a/gcc/ada/deftarg.c
+++ b/gcc/ada/deftarg.c
@@ -34,6 +34,8 @@
 /* Include a default definition for TARGET_FLAGS for gnatpsta.  */
 
 #include "config.h"
-#define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
+#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 
 int target_flags = TARGET_DEFAULT;
diff --git a/gcc/ada/lang-specs.h b/gcc/ada/lang-specs.h
index 4f2dfeb5006..1c41f87d56a 100644
--- a/gcc/ada/lang-specs.h
+++ b/gcc/ada/lang-specs.h
@@ -31,12 +31,13 @@
   {".ads", "@ada", 0},
   {".adb", "@ada", 0},
   {"@ada",
-   "gnat1 %{^I*} %{k8:-gnatk8} %{w:-gnatws} %1 %{!Q:-quiet} %{nostdinc*}\
+   "\
+ %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
+ %{!gnatc:%{!gnatz:%{!gnats:%{!S:%{!c:\
+    %eone of -c, -S, -gnatc, -gnatz, or -gnats is required for Ada}}}}}\
+ gnat1 %{I*} %{k8:-gnatk8} %{w:-gnatws} %1 %{!Q:-quiet} %{nostdinc*}\
     -dumpbase %{.adb:%b.adb}%{.ads:%b.ads}%{!.adb:%{!.ads:%b.ada}}\
     %{g*} %{O*} %{W*} %{w} %{p} %{pg:-p} %{m*} %{a} %{f*} %{d*}\
     %{!S:%{o*:%w%*-gnatO}} \
- %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
-    %i %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
-    %{!S:%{!gnatc:%{!gnatz:%{!gnats:as %a %Y %{c:%W{o*}%{!o*:-o %w%b%O}}\
-				    %{!c:%e-c or -S required for Ada}\
-				    %{!pipe:%g.s} %A\n}}}} ", 0},
+    %i %{S:%W{o*}%{!o*:-o %b.s}} \
+    %{!gnatc:%{!gnatz:%{!gnats:%(invoke_as)}}}", 0},
diff --git a/gcc/ada/misc.c b/gcc/ada/misc.c
index ad431066343..a8293e709fb 100644
--- a/gcc/ada/misc.c
+++ b/gcc/ada/misc.c
@@ -37,6 +37,8 @@
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
 #include "rtl.h"
 #include "errors.h"
@@ -207,8 +209,8 @@ gnat_parse_file (set_yydebug)
 
 /* Decode all the language specific options that cannot be decoded by GCC.
    The option decoding phase of GCC calls this routine on the flags that
-   it cannot decode. This routine returns 1 if it is successful, otherwise
-   it returns 0. */
+   it cannot decode.  This routine returns the number of consecutive arguments
+   from ARGV that it successfully decoded; 0 indicates failure.  */
 
 static int
 gnat_decode_option (argc, argv)
@@ -220,10 +222,28 @@ gnat_decode_option (argc, argv)
 
   if (!strncmp (p, "-I", 2))
     {
-      /* Pass the -I switches as-is. */
-      gnat_argv[gnat_argc] = p;
-      gnat_argc ++;
-      return 1;
+      /* We might get -I foo or -Ifoo.  Canonicalize to the latter.  */
+      if (p[2] == '\0')
+	{
+	  char *q;
+
+	  if (argv[1] == 0)
+	    return 0;
+
+	  q = xmalloc (sizeof("-I") + strlen (argv[1]));
+	  strcpy (q, "-I");
+	  strcat (q, argv[1]);
+
+	  gnat_argv[gnat_argc] = q;
+	  gnat_argc ++;
+	  return 2;  /* consumed argument */
+	}
+      else
+	{
+	  gnat_argv[gnat_argc] = p;
+	  gnat_argc ++;
+	  return 1;
+	}
     }
 
   else if (!strncmp (p, "-gant", 5))
diff --git a/gcc/ada/targtyps.c b/gcc/ada/targtyps.c
index 76b71cbb679..39a009b0e94 100644
--- a/gcc/ada/targtyps.c
+++ b/gcc/ada/targtyps.c
@@ -35,6 +35,8 @@
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
 #include "real.h"
 #include "rtl.h"
diff --git a/gcc/ada/trans.c b/gcc/ada/trans.c
index 68ebacc735c..68bb09ed4e9 100644
--- a/gcc/ada/trans.c
+++ b/gcc/ada/trans.c
@@ -27,6 +27,8 @@
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
 #include "real.h"
 #include "flags.h"
diff --git a/gcc/ada/utils.c b/gcc/ada/utils.c
index c352186b15b..a5d2860652f 100644
--- a/gcc/ada/utils.c
+++ b/gcc/ada/utils.c
@@ -27,6 +27,8 @@
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
 #include "flags.h"
 #include "defaults.h"
diff --git a/gcc/ada/utils2.c b/gcc/ada/utils2.c
index 4d4cb60ac91..3777a5b2cdd 100644
--- a/gcc/ada/utils2.c
+++ b/gcc/ada/utils2.c
@@ -27,6 +27,8 @@
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
 #include "flags.h"
 #include "ada.h"