diff mbox series

[Ada] Move non-tasking runtime sources to libgnat subdirectory

Message ID 20170908151359.GA137855@adacore.com
State New
Headers show
Series [Ada] Move non-tasking runtime sources to libgnat subdirectory | expand

Commit Message

Arnaud Charlet Sept. 8, 2017, 3:13 p.m. UTC 
This is the second big source reorg in the GNAT sources, this time all
runtimme source belonging to libgnat are moved to a new subdirectory
libgnat.

Diff is too large to be attached, even compressed with bzip2 -9. I'm
only including the diff on gcc-interface which is the not completely
trivial and not completely mechanical part.

Note that this change requires a complete removal of your build/obj dir
and a new build from scratch (configure; make). In other words, incremental
builds will not survive this change.

Tested on x86_64-pc-linux-gnu, committed on trunk

2017-09-08  Nicolas Roche  <roche@adacore.com>

	* gcc-interface/Make-lang.in, gcc-interface/Makefile.in: Find runtime
	source in libgnat/
	* a-lfztio.ads, g-timsta.ads, g-sercom-linux.adb, s-osprim-solaris.adb,
	a-inteio.ads, s-stchop-rtems.adb, s-casuti.adb, s-pack39.adb,
	i-vxwork-x86.ads, a-strbou.adb, a-stzmap.adb, s-assert.adb,
	a-sfecin.ads, a-cohama.adb, s-casuti.ads, a-suenco.adb, s-pack39.ads,
	a-stzmap.ads, a-strbou.ads, s-stalib.adb, s-trasym.adb, g-comver.adb,
	s-assert.ads, s-vector.ads, g-cgi.adb, a-cohama.ads, s-wchcnv.adb,
	a-titest.adb, s-pack48.adb, a-suenco.ads, a-strunb.adb, s-stalib.ads,
	s-trasym.ads, a-nudira.adb, g-comver.ads, a-nuflra.adb, g-cgi.ads,
	a-chacon.adb, s-wchcnv.ads, a-excach.adb, s-pack48.ads, a-titest.ads,
	a-strunb.ads, s-dwalin.adb, a-nudira.ads, a-chtgbo.adb, s-resfil.adb,
	a-scteio.ads, a-nuflra.ads, g-soliop-mingw.ads, s-pack57.adb,
	a-chacon.ads, s-bytswa.ads, s-pooloc.adb, g-os_lib.adb, s-dwalin.ads,
	a-szuzha.adb, s-resfil.ads, a-chtgbo.ads, s-spsufi.adb, s-pack57.ads,
	s-pooloc.ads, g-os_lib.ads, a-stfiha.ads, a-lcteio.ads, a-wtcoau.adb,
	a-szuzha.ads, s-mmosin-unix.adb, a-stmaco.ads, s-spsufi.ads,
	s-stchop-limit.ads, a-wtcoau.ads, a-exctra.adb, s-mmosin-unix.ads,
	s-sequio.adb, s-conca2.adb, g-table.adb, s-imglli.adb,
	a-numaux-x86.adb, a-strsea.adb, s-wchstw.adb, a-clrefi.adb,
	a-wwboio.adb, a-exctra.ads, s-sequio.ads, s-conca2.ads, a-wwunio.ads,
	system-linux-hppa.ads, g-table.ads, s-dimkio.ads, s-imglli.ads,
	a-cofove.adb, a-numaux-x86.ads, s-wchstw.ads, a-strsea.ads,
	a-clrefi.ads, a-wwboio.ads, s-stratt-xdr.adb, s-crc32.adb,
	s-excmac-arm.adb, g-busora.adb, a-cofove.ads, s-osprim-unix.adb,
	g-io.adb, s-pack49.adb, s-crc32.ads, s-excmac-arm.ads, a-fzteio.ads,
	g-busora.ads, s-stausa.adb, system-linux-mips.ads, sequenio.ads,
	g-exctra.adb, g-rewdat.adb, a-cgaaso.adb, g-io.ads, s-pack49.ads,
	a-wtflau.adb, a-undesu.adb, s-stausa.ads, a-ztenau.adb, g-enutst.ads,
	calendar.ads, s-pack58.adb, g-rewdat.ads, g-exctra.ads, s-ststop.adb,
	a-cgaaso.ads, a-strfix.adb, a-comlin.adb, a-strunb-shared.adb,
	a-wtflau.ads, a-undesu.ads, a-cbhase.adb, a-ztenau.ads, s-os_lib.adb,
	a-coorse.adb, a-chlat1.ads, s-pack58.ads, s-ststop.ads, a-strfix.ads,
	a-comlin.ads, a-strunb-shared.ads, a-nscefu.ads, s-valboo.adb,
	directio.ads, a-chtgke.adb, a-cbhase.ads, a-wtinau.adb,
	system-linux-alpha.ads, s-os_lib.ads, a-coorse.ads,
	system-linux-s390.ads, s-imgwiu.adb, a-chtgop.adb, s-valboo.ads,
	a-chtgke.ads, a-tienio.adb, s-conca3.adb, a-wtinau.ads,
	system-darwin-ppc.ads, i-c.adb, s-expllu.adb, g-expect.adb,
	g-sha256.ads, s-vallld.adb, s-imgwiu.ads, a-chtgop.ads, a-strmap.adb,
	a-tienio.ads, s-conca3.ads, s-imgint.adb, i-c.ads, s-expllu.ads,
	s-osprim-darwin.adb, a-cogeso.adb, g-expect.ads, a-iwteio.ads,
	s-vallld.ads, a-coinho-shared.adb, g-shsh64.adb, a-strmap.ads,
	g-comlin.adb, a-excpol.adb, s-imgint.ads, a-ztdeau.adb, a-cogeso.ads,
	a-coinho-shared.ads, g-shsh64.ads, g-comlin.ads, a-stzsup.adb,
	a-rbtgbk.adb, a-wtmoau.adb, a-ztdeau.ads, s-exnlli.adb, g-tty.adb,
	g-heasor.adb, g-socthi-dummy.adb, s-llflex.ads, a-zchara.ads,
	a-stzsup.ads, a-ztcstr.adb, a-rbtgbk.ads, a-sfwtio.ads, a-wtmoau.ads,
	a-sulcin.adb, s-exnlli.ads, system-freebsd.ads, a-stunha.adb,
	a-charac.ads, g-tty.ads, g-heasor.ads, s-exctra.adb,
	g-socthi-dummy.ads, a-coboho.adb, a-ztcstr.ads, a-tideio.adb,
	a-sulcin.ads, a-wrstfi.adb, g-alleve.adb, s-pack59.adb, a-ngrear.adb,
	a-stboha.adb, a-stunau-shared.adb, a-stunha.ads, a-lfwtio.ads,
	s-fileio.adb, s-exctra.ads, a-coboho.ads, a-ioexce.ads, a-tideio.ads,
	a-ngrear.ads, a-wrstfi.ads, s-pack59.ads, g-alleve.ads, a-stboha.ads,
	s-poosiz.adb, g-traceb.adb, g-rannum.adb, machcode.ads, s-purexc.ads,
	s-fileio.ads, a-cfinve.adb, a-crbtgk.adb, system-solaris-x86.ads,
	s-poosiz.ads, g-rannum.ads, g-traceb.ads, a-except.adb, s-conca4.adb,
	a-stream.adb, a-cfinve.ads, a-crbtgk.ads, s-wchwts.adb,
	system-mingw.ads, a-except.ads, s-conca4.ads, a-chzla9.ads,
	s-valenu.adb, s-soflin.adb, a-stream.ads, a-cgarso.adb, s-valllu.adb,
	g-crc32.adb, s-wchwts.ads, s-fatflt.ads, s-imguns.adb, s-strcom.adb,
	g-decstr.adb, s-valenu.ads, s-soflin.ads, a-cgarso.ads, a-cwila1.ads,
	s-valllu.ads, g-crc32.ads, s-imguns.ads, g-spipat.adb, s-valwch.adb,
	s-strcom.ads, g-decstr.ads, text_io.ads, g-debuti.adb, s-stchop.adb,
	g-spipat.ads, s-valwch.ads, a-string.ads, s-exnint.adb, g-awk.adb,
	g-tasloc.adb, s-wwdenu.adb, s-boustr.adb, a-zchuni.adb, s-stchop.ads,
	g-debuti.ads, s-stopoo.adb, system-dragonfly-x86_64.ads,
	system-linux-x86.ads, s-exnint.ads, g-awk.ads, a-stzhas.adb,
	g-tasloc.ads, s-wwdenu.ads, g-debpoo.adb, g-except.ads,
	g-sse.ads, s-boustr.ads, a-zchuni.ads, s-bitops.adb, s-wwdwch.adb,
	s-stopoo.ads, a-catizo.adb, a-stzhas.ads, a-nlcefu.ads, g-debpoo.ads,
	i-vxwoio.adb, s-bitops.ads, g-io-put-vxworks.adb, s-wwdwch.ads,
	g-sehamd.adb, a-ssicst.adb, a-catizo.ads, s-mmap.adb, g-string.adb,
	s-traceb.adb, a-swunau.adb, s-rannum.adb, a-ticoau.adb, i-vxwoio.ads,
	g-sehamd.ads, a-stwiun.adb, a-ssicst.ads, s-conca5.adb, a-ssitio.ads,
	s-mmap.ads, a-zttest.adb, g-string.ads, g-sercom.adb, a-cdlili.adb,
	a-swunau.ads, s-traceb.ads, s-rannum.ads, a-ticoau.ads, system-aix.ads,
	a-cforma.adb, a-stwiun.ads, s-conca5.ads, s-carsi8.adb, a-zttest.ads,
	g-sercom.ads, a-cdlili.ads, a-cihama.adb, g-sptain.ads, a-cforma.ads,
	s-maccod.ads, s-carsi8.ads, a-strsup.adb, g-sha1.adb, a-cihama.ads,
	g-stseme.adb, s-traent.adb, s-valcha.adb, g-curexc.ads, a-strsup.ads,
	g-sha1.ads, a-sflcin.ads, s-traent.ads, s-pack10.adb, s-valcha.ads,
	a-coteio.ads, s-tasloc.adb, g-utf_32.adb, a-suteio.adb, s-except.adb,
	a-direct.adb, g-stsifd-sockets.adb, a-numaux-vxworks.ads, s-winext.ads,
	s-pack10.ads, a-ztexio.adb, a-tiflau.adb, system-vxworks-arm.ads,
	s-tasloc.ads, a-suteio.ads, g-utf_32.ads, s-except.ads,
	a-direct.ads, a-swbwha.adb, g-hesorg.adb, s-wwdcha.adb, a-wtedit.adb,
	a-ztexio.ads, a-wtcoio.adb, a-tiflau.ads, a-ssizti.ads, s-casi32.adb,
	a-swbwha.ads, s-veboop.adb, g-hesorg.ads, s-parame-rtems.adb,
	s-wwdcha.ads, a-wtedit.ads, a-stuten.adb, a-coinve.adb, a-wtcoio.ads,
	s-casi32.ads, s-string.adb, a-tiinau.adb, a-cusyqu.adb, s-conca6.adb,
	s-veboop.ads, a-cgcaso.adb, a-numaux-darwin.adb, a-envvar.adb,
	a-stuten.ads, s-secsta.adb, a-coinve.ads, s-string.ads, a-cusyqu.ads,
	a-tiinau.ads, s-osprim-vxworks.adb, s-conca6.ads, g-spchge.adb,
	s-parint.adb, a-cuprqu.adb, a-cgcaso.ads, a-numaux-darwin.ads,
	a-envvar.ads, s-secsta.ads, g-spchge.ads, s-parint.ads, a-cuprqu.ads,
	a-swuwti.adb, a-flteio.ads, a-sbhcin.adb, a-coprnu.adb, g-u3spch.adb,
	s-atocou.adb, g-ctrl_c.adb, a-swuwti.ads, a-calend.adb, a-sbhcin.ads,
	a-coprnu.ads, g-dirope.adb, g-sha512.ads, g-u3spch.ads, s-atocou.ads,
	g-ctrl_c.ads, a-timoau.adb, a-witeio.adb, s-pack11.adb, a-strhas.adb,
	a-wtflio.adb, g-spitbo.adb, a-calend.ads, a-ztenio.adb, g-dirope.ads,
	a-slcain.adb, g-sechas.adb, a-timoau.ads, a-witeio.ads, s-pack11.ads,
	s-shasto.adb, s-traceb-mastop.adb, a-ciorse.adb, s-utf_32.adb,
	a-strhas.ads, a-wtflio.ads, g-spitbo.ads, a-ztenio.ads, a-slcain.ads,
	g-sechas.ads, s-gearop.adb, a-siztio.ads, s-pack20.adb, s-shasto.ads,
	a-ciorse.ads, s-utf_32.ads, s-crtl.ads, a-wtinio.adb, s-elaall.adb,
	s-explli.adb, s-chepoo.ads, s-gearop.ads, a-einuoc.adb, s-pack20.ads,
	system-linux-ia64.ads, a-swunau-shared.adb, a-wtinio.ads, g-alvety.ads,
	a-liztio.ads, g-calend.adb, s-conca7.adb, s-elaall.ads, s-explli.ads,
	a-einuoc.ads, s-widboo.adb, s-imgdec.adb, a-cbhama.adb, g-calend.ads,
	s-conca7.ads, a-llitio.ads, i-cexten.ads, a-coorma.adb, s-widboo.ads,
	s-diflio.adb, g-souinf.ads, s-imgdec.ads, g-strhas.ads, a-cbhama.ads,
	g-shshco.adb, a-ztdeio.adb, s-gloloc.adb, a-coorma.ads, g-wispch.adb,
	s-pack03.adb, g-eacodu.adb, s-casi16.adb, s-diflio.ads, a-colien.adb,
	g-shshco.ads, a-wtmoio.adb, a-rbtgbo.adb, a-ztdeio.ads,
	system-rtems.ads, s-gloloc.ads, a-csquin.ads, a-cofuse.adb,
	g-wispch.ads, s-pack03.ads, s-casi16.ads, s-io.adb, a-colien.ads,
	g-alveop.adb, gnat.ads, s-diinio.adb, a-cfdlli.adb, g-pehage.adb,
	a-wtmoio.ads, a-stwiha.adb, a-locale.adb, a-tirsfi.adb, a-nscoty.ads,
	a-rbtgbo.ads, s-pack12.adb, a-cofuse.ads, a-sfteio.ads, s-io.ads,
	g-alveop.ads, a-cfdlli.ads, s-diinio.ads, a-stwiha.ads, g-pehage.ads,
	a-locale.ads, a-tirsfi.ads, s-pack12.ads, s-valuti.adb, g-cppexc.adb,
	system-vxworks-ppc.ads, g-memdum.adb, a-lfteio.ads, s-pack21.adb,
	s-unstyp.ads, s-valuti.ads, g-cppexc.ads, system-hpux-ia64.ads,
	g-memdum.ads, g-soccon.ads, g-altive.ads, a-crbtgo.adb, s-pack21.ads,
	a-llizti.ads, a-numaux-libc-x86.ads, s-expint.adb, s-conca8.adb,
	a-crbtgo.ads, s-pack30.adb, s-vallli.adb, s-geveop.adb, s-expint.ads,
	a-direio.adb, s-conca8.ads, a-widcha.ads, s-pack30.ads, s-vallli.ads,
	s-strhas.adb, s-geveop.ads, g-md5.adb, a-direio.ads, a-numaux.ads,
	s-ransee.adb, a-szbzha.adb, i-cobol.adb, g-busorg.adb, s-strhas.ads,
	g-md5.ads, s-widenu.adb, s-ransee.ads, s-widllu.adb, a-szbzha.ads,
	a-ststio.adb, i-cobol.ads, g-busorg.ads, g-regpat.adb, s-widenu.ads,
	a-secain.adb, s-widllu.ads, s-pack13.adb, g-encstr.adb, a-ztcoau.adb,
	a-ststio.ads, s-widwch.adb, g-regpat.ads, s-atacco.adb, a-cborse.adb,
	a-secain.ads, s-pack13.ads, g-encstr.ads, a-ztcoau.ads, s-widwch.ads,
	g-io_aux.adb, s-atacco.ads, a-ncelfu.ads, interfac.ads, a-cborse.ads,
	g-regexp.adb, s-pack22.adb, a-szuzti.adb, g-io_aux.ads, s-caun32.adb,
	a-nselfu.ads, g-regexp.ads, s-pack22.ads, a-ticoio.adb, a-szuzti.ads,
	g-diopit.adb, s-caun32.ads, s-conca9.adb, a-tags.adb, a-swmwco.ads,
	a-sbecin.adb, s-pack31.adb, s-expuns.adb, a-ticoio.ads, s-valint.adb,
	s-conca9.ads, g-diopit.ads, a-tags.ads, a-nllcef.ads, a-izteio.ads,
	a-sbecin.ads, s-expuns.ads, s-pack31.ads, g-dyntab.adb, s-powtab.ads,
	s-flocon-none.adb, s-valint.ads, a-ssiwti.ads, s-mmosin-mingw.adb,
	s-pack40.adb, s-pack05.adb, a-ztflau.adb, g-dyntab.ads,
	a-szuzti-shared.adb, g-alvevi.ads, a-stwise.adb, s-mmosin-mingw.ads,
	s-pack40.ads, a-diocst.adb, a-ztflau.ads, s-pack05.ads, a-nlcoty.ads,
	a-contai.ads, a-stwisu.adb, g-byorma.adb, a-siwtio.ads, a-stwise.ads,
	s-regpat.adb, g-mbdira.adb, s-pack14.adb, a-diocst.ads, g-flocon.ads,
	g-mbflra.adb, a-ztinau.adb, s-dim.ads, s-mantis.adb, a-stwisu.ads,
	g-byorma.ads, s-atopri.adb, g-wistsp.ads, a-uncdea.ads, s-widcha.adb,
	a-caldel.adb, s-regpat.ads, g-mbdira.ads, a-tiflio.adb, s-pack14.ads,
	s-parame.adb, a-liwtio.ads, s-memory.adb, g-mbflra.ads, a-ztinau.ads,
	a-wtgeau.adb, s-direio.adb, s-mantis.ads, s-atopri.ads, s-widcha.ads,
	a-caldel.ads, s-pack23.adb, a-unccon.ads, a-tiflio.ads, s-parame.ads,
	a-llftio.ads, s-memory.ads, s-regexp.adb, a-wtgeau.ads, a-exexda.adb,
	s-direio.ads, s-pack23.ads, g-stheme.adb, a-tiinio.adb, g-sestin.ads,
	s-regexp.ads, a-wtfiio.adb, a-comutr.adb, a-exexpr.adb, a-tiinio.ads,
	a-ztmoau.adb, a-cohata.ads, a-wtfiio.ads, s-imgrea.adb, ada.ads,
	a-szunau-shared.adb, a-comutr.ads, s-valuns.adb, a-ztmoau.ads,
	system-linux-arm.ads, s-osprim-x32.adb, s-pack41.adb, s-pack06.adb,
	s-imgrea.ads, s-valuns.ads, s-finroo.adb, s-caun16.adb, s-pooglo.adb,
	a-zrstfi.adb, a-suenst.adb, s-pack41.ads, g-binenv.adb, s-pack06.ads,
	a-calari.adb, a-nlcoar.ads, s-finroo.ads, a-timoio.adb, s-caun16.ads,
	s-flocon.adb, a-suenst.ads, a-zrstfi.ads, s-pooglo.ads, s-wchcon.adb,
	s-traceb-hpux.adb, s-pack50.adb, i-fortra.adb, s-pack15.adb,
	a-ngcefu.adb, g-sptavs.ads, g-binenv.ads, s-wchjis.adb, a-calari.ads,
	a-timoio.ads, a-decima.adb, s-flocon.ads, s-wchcon.ads, a-llfzti.ads,
	i-fortra.ads, s-pack50.ads, s-pack15.ads, a-ngcefu.ads, a-cfhase.adb,
	s-wchjis.ads, g-soliop.ads, a-decima.ads, a-chlat9.ads, s-pack24.adb,
	a-nlelfu.ads, a-cfhase.ads, g-locfil.adb, s-atocou-builtin.adb,
	s-memcop.ads, a-szunau.adb, s-pack24.ads, s-imgllb.adb, s-auxdec.adb,
	g-locfil.ads, s-pack33.adb, a-szunau.ads, s-parame-vxworks.adb,
	s-imgllb.ads, a-ciorma.adb, s-auxdec.ads, a-cobove.adb, s-dsaser.ads,
	a-elchha.adb, s-pack33.ads, a-cofuve.adb, s-parame-vxworks.ads,
	a-ciorma.ads, system-darwin-x86.ads, s-multip.adb, a-stwiun-shared.adb,
	a-wichun.adb, a-cobove.ads, s-imgbiu.adb, s-tsmona-mingw.adb,
	a-coormu.adb, a-siocst.adb, s-win32.ads, a-elchha.ads, s-pack42.adb,
	s-pack07.adb, a-cofuve.ads, system-hpux.ads, a-teioed.adb,
	a-convec.adb, g-speche.adb, s-multip.ads, a-stwiun-shared.ads,
	a-wichun.ads, s-imgbiu.ads, a-numeri.ads, a-siocst.ads, a-coormu.ads,
	a-lliwti.ads, s-pack42.ads, s-pack07.ads, a-teioed.ads, a-convec.ads,
	g-speche.ads, g-socthi.adb, a-nucoty.ads, a-szmzco.ads, s-pack51.adb,
	s-osprim-mingw.adb, s-casi64.adb, g-strspl.ads, g-socthi.ads,
	g-socket-dummy.adb, s-pack51.ads, s-dimmks.ads, s-casi64.ads,
	a-wtenau.adb, s-stchop-vxworks.adb, s-pack60.adb,
	system-solaris-sparc.ads, s-pack25.adb, g-socket-dummy.ads,
	a-exstat.adb, a-cofuma.adb, s-tsmona-linux.adb, a-wtenau.ads,
	s-pack60.ads, s-pack25.ads, i-cstrea.adb, a-cofuma.ads, g-exptty.adb,
	a-chzla1.ads, s-pack34.adb, i-cstrea.ads, s-excdeb.adb, a-iteint.ads,
	g-exptty.ads, i-pacdec.adb, s-pack34.ads, s-rident.ads, s-sopco3.adb,
	i-vxwork.ads, s-excdeb.ads, system-linux-ppc.ads, a-swuwti-shared.adb,
	s-widlli.adb, s-pack43.adb, i-pacdec.ads, a-cwila9.ads, s-sopco3.ads,
	a-fwteio.ads, s-widlli.ads, s-pack43.ads, a-suhcin.adb, a-wtdeau.adb,
	g-allein.ads, a-suezst.adb, a-dirval-mingw.adb, g-zspche.adb,
	s-bignum.adb, a-ztedit.adb, g-regist.adb, a-nllefu.ads, a-ztcoio.adb,
	s-pack52.adb, a-llctio.ads, a-nucoar.ads, s-pack17.adb, a-suhcin.ads,
	a-wtdeau.ads, a-suezst.ads, a-dirval.adb, g-zspche.ads, g-regist.ads,
	a-ztedit.ads, s-bignum.ads, a-wtcstr.adb, system.ads, s-pack52.ads,
	a-ztcoio.ads, s-pack17.ads, s-imgboo.adb, a-rbtgso.adb, a-dirval.ads,
	a-cohase.adb, s-pack61.adb, a-wtcstr.ads, s-pack26.adb, s-osprim.ads,
	a-tigeau.adb, s-imgboo.ads, a-nuelfu.ads, a-swfwha.ads, s-commun.adb,
	g-socthi-vxworks.adb, a-rbtgso.ads, a-cohase.ads, g-zstspl.ads,
	s-pack61.ads, s-pack26.ads, a-intnam-dragonfly.ads, s-imglld.adb,
	a-tigeau.ads, s-commun.ads, g-socthi-vxworks.ads, a-cborma.adb,
	a-stwifi.adb, g-moreex.adb, s-pack35.adb, s-imglld.ads, s-valdec.adb,
	a-tifiio.adb, a-cborma.ads, g-moreex.ads, a-stwifi.ads, s-pack35.ads,
	s-sopco4.adb, g-sha224.ads, g-socket.adb, a-intnam-rtems.ads,
	s-finmas.adb, s-valdec.ads, s-addima.adb, a-finali.adb, a-tifiio.ads,
	s-rpc.adb, a-ztflio.adb, s-pack44.adb, s-pack09.adb, a-sblcin.adb,
	s-sopco4.ads, a-textio.adb, g-socket.ads, g-sptabo.ads, s-finmas.ads,
	g-shsh32.adb, s-addima.ads, a-finali.ads, s-mmauni-long.ads, s-rpc.ads,
	a-ztflio.ads, system-djgpp.ads, s-stache.adb, s-pack44.ads,
	s-pack09.ads, a-sblcin.ads, a-textio.ads, a-cidlli.adb, g-shsh32.ads,
	a-chtgbk.adb, a-tiocst.adb, s-pack53.adb, s-pack18.adb, s-stache.ads,
	a-zchhan.adb, s-fatlfl.ads, a-ztinio.adb, s-strops.adb, a-siteio.ads,
	a-cidlli.ads, a-chtgbk.ads, g-ssvety.ads, a-tiocst.ads, s-pack53.ads,
	s-parame-hpux.ads, s-pack18.ads, a-zchhan.ads, s-strops.ads,
	a-ztinio.ads, a-wichha.adb, a-stwima.adb, a-nlrear.ads, a-liteio.ads,
	s-pack62.adb, s-pack27.adb, s-fore.adb, s-vercon.adb, a-wichha.ads,
	a-stwima.ads, s-pack62.ads, system-linux-sparc.ads, s-pack27.ads,
	g-dynhta.adb, s-fore.ads, s-vercon.ads, a-cofuba.adb, a-cimutr.adb,
	i-cpoint.adb, s-imgenu.adb, a-stwibo.adb, s-pack36.adb, i-cstrin.adb,
	s-imgllu.adb, a-suteio-shared.adb, g-excact.adb, s-stoele.adb,
	s-addope.adb, g-dynhta.ads, a-cofuba.ads, a-ztmoio.adb, a-llfwti.ads,
	a-cimutr.ads, i-cpoint.ads, s-imgenu.ads, a-stwibo.ads, a-wttest.adb,
	s-pack36.ads, a-tgdico.ads, s-sopco5.adb, s-scaval.adb, i-cstrin.ads,
	s-imgllu.ads, g-excact.ads, s-stoele.ads, g-deutst.ads, s-addope.ads,
	s-imgwch.adb, g-sha384.ads, a-ztmoio.ads, s-pack45.adb, a-wttest.ads,
	s-sopco5.ads, s-excmac-gcc.adb, s-scaval.ads, a-storio.adb,
	a-coinho.adb, a-btgbso.adb, s-imgwch.ads, s-carun8.adb, memtrack.adb,
	s-pack45.ads, a-sfhcin.ads, s-excmac-gcc.ads, a-storio.ads,
	a-coinho.ads, a-btgbso.ads, s-stratt.adb, s-carun8.ads, a-shcain.adb,
	s-pack54.adb, s-pack19.adb, a-colire.adb, a-tigeli.adb, s-caun64.adb,
	s-stratt.ads, s-fatgen.adb, a-shcain.ads, a-stzunb-shared.adb,
	s-pack54.ads, s-pack19.ads, a-colire.ads, a-calcon.adb, s-caun64.ads,
	s-fatgen.ads, s-pack63.adb, g-arrspl.adb, a-stzunb-shared.ads,
	s-pack28.adb, a-nllrar.ads, a-zzboio.adb, a-zzunio.ads, a-stunau.adb,
	a-calcon.ads, g-cgideb.adb, s-objrea.adb, s-mastop.adb, a-tienau.adb,
	g-altcon.adb, g-arrspl.ads, s-pack63.ads, s-restri.adb, s-pack28.ads,
	a-zzboio.ads, a-stunau.ads, g-cgideb.ads, g-htable.adb, g-sothco.adb,
	s-objrea.ads, g-soliop-solaris.ads, s-mastop.ads, a-tienau.ads,
	system-linux-m68k.ads, g-altcon.ads, s-dmotpr.ads, s-memory-mingw.adb,
	g-cgicoo.adb, s-pack37.adb, s-restri.ads, s-fatllf.ads, s-expmod.adb,
	a-swuwha.adb, a-exextr.adb, a-cfhama.adb, s-gloloc-mingw.adb,
	a-tiboio.adb, g-forstr.adb, g-sothco.ads, a-stzbou.adb, a-nllcty.ads,
	a-suecin.adb, g-htable.ads, s-exctab.adb, a-tiunio.ads, g-cgicoo.ads,
	s-osprim-posix.adb, s-pack37.ads, a-ciormu.adb, s-atocou-x86.adb,
	a-swuwha.ads, s-expmod.ads, a-cfhama.ads, s-ficobl.ads, a-ngcoty.adb,
	g-forstr.ads, a-tiboio.ads, a-calfor.adb, a-stzbou.ads, a-suecin.ads,
	a-conhel.adb, a-crbltr.ads, s-exctab.ads, a-dhfina.ads, s-imgcha.adb,
	s-pack46.adb, a-ciormu.ads, system-linux-sh4.ads, a-chahan.adb,
	a-ngcoty.ads, a-stzunb.adb, a-szfzha.ads, a-calfor.ads, a-cbdlli.adb,
	a-conhel.ads, s-imgcha.ads, s-pack46.ads, a-assert.adb, a-chahan.ads,
	a-stzunb.ads, a-crdlli.adb, s-pack55.adb, a-cbdlli.ads, a-tideau.adb,
	a-assert.ads, ioexcept.ads, s-boarop.ads, g-hesora.adb, a-crdlli.ads,
	s-pack55.ads, a-tideau.ads, g-bubsor.adb, a-wtenio.adb, a-cbsyqu.adb,
	g-hesora.ads, s-pack29.adb, a-nurear.ads, g-catiio.adb, s-stposu.adb,
	g-bubsor.ads, a-wtenio.ads, a-cbsyqu.ads, a-suewst.adb,
	system-vxworks-x86.ads, s-pack29.ads, a-cbmutr.adb, a-cbprqu.adb,
	s-imenne.adb, g-sothco-dummy.adb, g-casuti.adb, g-catiio.ads,
	s-stposu.ads, a-stzsea.adb, s-pack38.adb, a-suewst.ads, s-imgllw.adb,
	a-cbprqu.ads, a-cbmutr.ads, s-imenne.ads, g-sothco-dummy.ads,
	g-casuti.ads, s-htable.adb, s-fatsfl.ads, g-trasym.adb, unchconv.ads,
	a-stzsea.ads, s-arit64.adb, s-pack38.ads, a-nllcar.ads, s-valrea.adb,
	s-imgllw.ads, s-htable.ads, a-sequio.adb, g-trasym.ads, a-ngcoar.adb,
	s-exnllf.adb, s-pack47.adb, s-arit64.ads, g-sercom-mingw.adb,
	s-valrea.ads, g-socthi-mingw.adb, g-bytswa.adb, g-sehash.adb,
	unchdeal.ads, a-sequio.ads, a-ngcoar.ads, s-exnllf.ads, a-wtdeio.adb,
	s-pack47.ads, g-socthi-mingw.ads, a-excpol-abort.adb, a-ztgeau.adb,
	g-bytswa.ads, g-sehash.ads, s-pack56.adb, a-wtdeio.ads, a-ngelfu.adb,
	a-ztgeau.ads, a-cforse.adb, s-filatt.ads, a-stzfix.adb, a-cihase.adb,
	s-pack56.ads, a-sfztio.ads, a-ngelfu.ads, s-trasym-dwarf.adb,
	a-cforse.ads, a-ztfiio.adb, g-timsta.adb, a-stzfix.ads, a-cihase.ads,
	a-ztfiio.ads, system-darwin-arm.ads: Move non-tasking runtime sources
	to libgnat subdirectory.

Comments

Joseph Myers Sept. 8, 2017, 5:13 p.m. UTC | #1 
On Fri, 8 Sep 2017, Arnaud Charlet wrote:

> This is the second big source reorg in the GNAT sources, this time all
> runtimme source belonging to libgnat are moved to a new subdirectory
> libgnat.

Given that you're moving the files, I wonder what the rationale is for 
moving them to another subdirectory within gcc/ada, rather than to 
something within the top-level libada directory (or some other top-level 
directory or directories, as appropriate), since such top-level 
directories outside gcc/ are the normal location for target library files?
Arnaud Charlet Sept. 8, 2017, 6:16 p.m. UTC | #2 
> Given that you're moving the files, I wonder what the rationale is for
> moving them to another subdirectory within gcc/ada, rather than to
> something within the top-level libada directory (or some other top-level
> directory or directories, as appropriate), since such top-level
> directories outside gcc/ are the normal location for target library files?

The main reason is that it's much more practical wrt to our source setup
at AdaCore since Ada sources are standalone and can be used e.g. without
GCC, so depending on the GCC layout for GNAT sources isn't very convenient.

Arno
diff mbox series

Patch

Index: gcc-interface/Makefile.in
===================================================================
--- gcc-interface/Makefile.in	(revision 251892)
+++ gcc-interface/Makefile.in	(working copy)
@@ -359,7 +359,7 @@ 
 s-inmaop.adb<libgnarl/s-inmaop-dummy.adb \
 s-intman.adb<libgnarl/s-intman-dummy.adb \
 s-osinte.ads<libgnarl/s-osinte-dummy.ads \
-s-osprim.adb<s-osprim-posix.adb \
+s-osprim.adb<libgnat/s-osprim-posix.adb \
 s-taprop.adb<libgnarl/s-taprop-dummy.adb \
 s-taspri.ads<libgnarl/s-taspri-dummy.ads
 
@@ -388,58 +388,58 @@ 
   g-soliop$(objext) g-sothco$(objext)
 
 DUMMY_SOCKETS_TARGET_PAIRS = \
-  g-socket.adb<g-socket-dummy.adb \
-  g-socket.ads<g-socket-dummy.ads \
-  g-socthi.adb<g-socthi-dummy.adb \
-  g-socthi.ads<g-socthi-dummy.ads \
-  g-sothco.adb<g-sothco-dummy.adb \
-  g-sothco.ads<g-sothco-dummy.ads
+  g-socket.adb<libgnat/g-socket-dummy.adb \
+  g-socket.ads<libgnat/g-socket-dummy.ads \
+  g-socthi.adb<libgnat/g-socthi-dummy.adb \
+  g-socthi.ads<libgnat/g-socthi-dummy.ads \
+  g-sothco.adb<libgnat/g-sothco-dummy.adb \
+  g-sothco.ads<libgnat/g-sothco-dummy.ads
 
 # On platforms where atomic increment/decrement operations are supported,
 # special version of Ada.Strings.Unbounded package can be used.
 
 ATOMICS_TARGET_PAIRS = \
-  a-coinho.adb<a-coinho-shared.adb \
-  a-coinho.ads<a-coinho-shared.ads \
-  a-stunau.adb<a-stunau-shared.adb \
-  a-suteio.adb<a-suteio-shared.adb \
-  a-strunb.ads<a-strunb-shared.ads \
-  a-strunb.adb<a-strunb-shared.adb \
-  a-stwiun.adb<a-stwiun-shared.adb \
-  a-stwiun.ads<a-stwiun-shared.ads \
-  a-swunau.adb<a-swunau-shared.adb \
-  a-swuwti.adb<a-swuwti-shared.adb \
-  a-stzunb.adb<a-stzunb-shared.adb \
-  a-stzunb.ads<a-stzunb-shared.ads \
-  a-szunau.adb<a-szunau-shared.adb \
-  a-szuzti.adb<a-szuzti-shared.adb
+  a-coinho.adb<libgnat/a-coinho-shared.adb \
+  a-coinho.ads<libgnat/a-coinho-shared.ads \
+  a-stunau.adb<libgnat/a-stunau-shared.adb \
+  a-suteio.adb<libgnat/a-suteio-shared.adb \
+  a-strunb.ads<libgnat/a-strunb-shared.ads \
+  a-strunb.adb<libgnat/a-strunb-shared.adb \
+  a-stwiun.adb<libgnat/a-stwiun-shared.adb \
+  a-stwiun.ads<libgnat/a-stwiun-shared.ads \
+  a-swunau.adb<libgnat/a-swunau-shared.adb \
+  a-swuwti.adb<libgnat/a-swuwti-shared.adb \
+  a-stzunb.adb<libgnat/a-stzunb-shared.adb \
+  a-stzunb.ads<libgnat/a-stzunb-shared.ads \
+  a-szunau.adb<libgnat/a-szunau-shared.adb \
+  a-szuzti.adb<libgnat/a-szuzti-shared.adb
 
 ATOMICS_BUILTINS_TARGET_PAIRS = \
-  s-atocou.adb<s-atocou-builtin.adb
+  s-atocou.adb<libgnat/s-atocou-builtin.adb
 
 # Special version of units for x86 and x86-64 platforms.
 
 X86_TARGET_PAIRS = \
-  a-numaux.ads<a-numaux-x86.ads \
-  a-numaux.adb<a-numaux-x86.adb \
-  s-atocou.adb<s-atocou-x86.adb
+  a-numaux.ads<libgnat/a-numaux-x86.ads \
+  a-numaux.adb<libgnat/a-numaux-x86.adb \
+  s-atocou.adb<libgnat/s-atocou-x86.adb
 
 X86_64_TARGET_PAIRS = \
-  a-numaux.ads<a-numaux-x86.ads \
-  a-numaux.adb<a-numaux-x86.adb \
-  s-atocou.adb<s-atocou-builtin.adb
+  a-numaux.ads<libgnat/a-numaux-x86.ads \
+  a-numaux.adb<libgnat/a-numaux-x86.adb \
+  s-atocou.adb<libgnat/s-atocou-builtin.adb
 
 # Implementation of symbolic traceback based on dwarf
 TRASYM_DWARF_UNIX_PAIRS = \
-  s-trasym.adb<s-trasym-dwarf.adb \
-  s-mmosin.ads<s-mmosin-unix.ads \
-  s-mmosin.adb<s-mmosin-unix.adb \
-  s-mmauni.ads<s-mmauni-long.ads
+  s-trasym.adb<libgnat/s-trasym-dwarf.adb \
+  s-mmosin.ads<libgnat/s-mmosin-unix.ads \
+  s-mmosin.adb<libgnat/s-mmosin-unix.adb \
+  s-mmauni.ads<libgnat/s-mmauni-long.ads
 
 TRASYM_DWARF_MINGW_PAIRS = \
-  s-trasym.adb<s-trasym-dwarf.adb \
-  s-mmosin.ads<s-mmosin-mingw.ads \
-  s-mmosin.adb<s-mmosin-mingw.adb
+  s-trasym.adb<libgnat/s-trasym-dwarf.adb \
+  s-mmosin.ads<libgnat/s-mmosin-mingw.ads \
+  s-mmosin.adb<libgnat/s-mmosin-mingw.adb
 
 TRASYM_DWARF_COMMON_OBJS = s-objrea$(objext) s-dwalin$(objext) s-mmap$(objext) \
   s-mmosin$(objext)
@@ -507,22 +507,22 @@ 
 
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<libgnarl/a-intnam-vxworks.ads \
-  a-numaux.ads<a-numaux-vxworks.ads \
+  a-numaux.ads<libgnat/a-numaux-vxworks.ads \
   s-inmaop.adb<libgnarl/s-inmaop-vxworks.adb \
   s-intman.ads<libgnarl/s-intman-vxworks.ads \
   s-intman.adb<libgnarl/s-intman-vxworks.adb \
   s-osinte.ads<libgnarl/s-osinte-vxworks.ads \
   s-osinte.adb<libgnarl/s-osinte-vxworks.adb \
-  s-osprim.adb<s-osprim-vxworks.adb \
-  s-parame.ads<s-parame-vxworks.ads \
-  s-parame.adb<s-parame-vxworks.adb \
+  s-osprim.adb<libgnat/s-osprim-vxworks.adb \
+  s-parame.ads<libgnat/s-parame-vxworks.ads \
+  s-parame.adb<libgnat/s-parame-vxworks.adb \
   s-taprop.adb<libgnarl/s-taprop-vxworks.adb \
   s-tasinf.ads<libgnarl/s-tasinf-vxworks.ads \
   s-taspri.ads<libgnarl/s-taspri-vxworks.ads \
   s-vxwork.ads<libgnarl/s-vxwork-ppc.ads \
-  g-socthi.ads<g-socthi-vxworks.ads \
-  g-socthi.adb<g-socthi-vxworks.adb \
-  g-stsifd.adb<g-stsifd-sockets.adb \
+  g-socthi.ads<libgnat/g-socthi-vxworks.ads \
+  g-socthi.adb<libgnat/g-socthi-vxworks.adb \
+  g-stsifd.adb<libgnat/g-stsifd-sockets.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS)
 
@@ -535,8 +535,8 @@ 
 
   ifeq ($(strip $(filter-out default,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS += \
-      s-stchop.ads<s-stchop-limit.ads \
-      s-stchop.adb<s-stchop-vxworks.adb
+      s-stchop.ads<libgnat/s-stchop-limit.ads \
+      s-stchop.adb<libgnat/s-stchop-vxworks.adb
     EXTRA_GNATRTL_NONTASKING_OBJS+=s-stchop.o
   endif
 
@@ -546,8 +546,8 @@ 
     LIBGNAT_TARGET_PAIRS += \
     s-vxwext.ads<libgnarl/s-vxwext-rtp.ads \
     s-vxwext.adb<libgnarl/s-vxwext-rtp.adb \
-    s-tpopsp.adb<s-tpopsp-vxworks-rtp.adb \
-    system.ads<system-vxworks-$(ARCH_STR)-rtp.ads
+    s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-rtp.adb \
+    system.ads<libgnat/system-vxworks-$(ARCH_STR)-rtp.ads
 
     EH_MECHANISM=-gcc
   else
@@ -557,7 +557,7 @@ 
       s-vxwext.ads<libgnarl/s-vxwext-rtp.ads \
       s-vxwext.adb<libgnarl/s-vxwext-rtp-smp.adb \
       s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-tls.adb \
-      system.ads<$(SVX)-$(ARCH_STR)-rtp-smp.ads
+      system.ads<libgnat/$(SVX)-$(ARCH_STR)-rtp-smp.ads
 
       EH_MECHANISM=-gcc
       EXTRA_LIBGNAT_OBJS+=affinity.o
@@ -568,8 +568,8 @@ 
         s-mudido.adb<libgnarl/s-mudido-affinity.adb \
         s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-tls.adb \
         s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \
-        s-vxwext.adb<s-vxwext-kernel-smp.adb \
-        system.ads<system-vxworks-$(ARCH_STR)-kernel.ads
+        s-vxwext.adb<libgnarl/s-vxwext-kernel-smp.adb \
+        system.ads<libgnat/system-vxworks-$(ARCH_STR)-kernel.ads
 
         EH_MECHANISM=-gcc
         EXTRA_LIBGNAT_OBJS+=affinity.o
@@ -583,10 +583,10 @@ 
           LIBGNAT_TARGET_PAIRS += \
           s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \
           s-vxwext.adb<libgnarl/s-vxwext-kernel.adb \
-          system.ads<system-vxworks-$(ARCH_STR)-kernel.ads
+          system.ads<libgnat/system-vxworks-$(ARCH_STR)-kernel.ads
         else
           LIBGNAT_TARGET_PAIRS += \
-          system.ads<system-vxworks-ppc.ads
+          system.ads<libgnat/system-vxworks-ppc.ads
         endif
       endif
       EXTRA_GNATRTL_NONTASKING_OBJS+=i-vxinco.o i-vxwork.o i-vxwoio.o
@@ -614,129 +614,6 @@ 
   endif
 endif
 
-# PowerPC and e500v2 VxWorks 653
-ifeq ($(strip $(filter-out powerpc% wrs vxworksae vxworksaespe,$(target_cpu) $(target_vendor) $(target_os))),)
-
-  ifeq ($(strip $(filter-out e500%, $(target_alias))),)
-     ARCH_STR=e500
-     # gcc config translates the target e500v2-wrs-vxworks to
-     # powerpc-wrs-vxworksspe. Let's keep the original alias here when
-     # generating s-oscons.ads.
-     target=$(target_alias)
-  else
-     ARCH_STR=ppc
-  endif
-
-  # target pairs for vthreads runtime
-  LIBGNAT_TARGET_PAIRS = \
-  a-elchha.adb<a-elchha-vxworks-ppc-full.adb \
-  a-intnam.ads<libgnarl/a-intnam-vxworks.ads \
-  a-numaux.ads<a-numaux-vxworks.ads \
-  g-io.adb<g-io-vxworks-ppc-cert.adb \
-  s-inmaop.adb<libgnarl/s-inmaop-vxworks.adb \
-  s-interr.adb<libgnarl/s-interr-vxworks.adb \
-  s-intman.ads<libgnarl/s-intman-vxworks.ads \
-  s-intman.adb<libgnarl/s-intman-vxworks.adb \
-  s-osinte.adb<libgnarl/s-osinte-vxworks.adb \
-  s-osinte.ads<libgnarl/s-osinte-vxworks.ads \
-  s-osprim.adb<s-osprim-vxworks.adb \
-  s-parame.ads<s-parame-ae653.ads \
-  s-parame.adb<s-parame-vxworks.adb \
-  s-taprop.adb<libgnarl/s-taprop-vxworks.adb \
-  s-tasinf.ads<libgnarl/s-tasinf-vxworks.ads \
-  s-taspri.ads<libgnarl/s-taspri-vxworks.ads \
-  s-tpopsp.adb<libgnarl/s-tpopsp-vxworks.adb \
-  s-vxwext.adb<s-vxwext-noints.adb \
-  s-vxwext.ads<libgnarl/s-vxwext-vthreads.ads \
-  s-vxwork.ads<libgnarl/s-vxwork-ppc.ads \
-  system.ads<system-vxworks-$(ARCH_STR)-vthread.ads \
-  $(ATOMICS_TARGET_PAIRS) \
-  $(ATOMICS_BUILTINS_TARGET_PAIRS)
-
-  EH_MECHANISM=-gcc
-
-  TOOLS_TARGET_PAIRS=indepsw.adb<indepsw-gnu.adb
-
-  EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
-  EXTRA_GNATRTL_TASKING_OBJS=i-vxinco.o s-vxwork.o s-vxwext.o
-
-  EXTRA_LIBGNAT_OBJS+=sigtramp-vxworks.o
-  EXTRA_LIBGNAT_SRCS+=$(VX_SIGTRAMP_EXTRA_SRCS)
-
-  # Extra pairs for the vthreads runtime
-  ifeq ($(strip $(filter-out vthreads,$(THREAD_KIND))),)
-    LIBGNAT_TARGET_PAIRS += \
-    s-thread.adb<s-thread-ae653.adb \
-    s-osvers.ads<s-osvers-vxworks-653.ads \
-    $(DUMMY_SOCKETS_TARGET_PAIRS)
-
-    GNATRTL_SOCKETS_OBJS =
-    EXTRA_GNATRTL_NONTASKING_OBJS += s-thread.o s-osvers.o
-  else
-    LIBGNAT_TARGET_PAIRS += \
-    g-socthi.ads<g-socthi-vxworks.ads \
-    g-socthi.adb<g-socthi-vxworks.adb \
-    g-stsifd.adb<g-stsifd-sockets.adb
-  endif
-
-endif
-
-# VxWorksae / VxWorks 653 for x86 (vxsim) - ?? VxWorks mils not implemented
-ifeq ($(strip $(filter-out %86 wrs vxworksae,$(target_cpu) $(target_vendor) $(target_os))),)
-  # target pairs for kernel + vthreads runtime
-  LIBGNAT_TARGET_PAIRS = \
-  a-elchha.adb<a-elchha-vxworks-ppc-full.adb \
-  a-intnam.ads<libgnarl/a-intnam-vxworks.ads \
-  a-numaux.ads<a-numaux-vxworks.ads \
-  g-io.adb<g-io-vxworks-ppc-cert.adb \
-  s-inmaop.adb<libgnarl/s-inmaop-vxworks.adb \
-  s-interr.adb<libgnarl/s-interr-vxworks.adb \
-  s-intman.ads<libgnarl/s-intman-vxworks.ads \
-  s-intman.adb<libgnarl/s-intman-vxworks.adb \
-  s-osinte.adb<libgnarl/s-osinte-vxworks.adb \
-  s-osinte.ads<libgnarl/s-osinte-vxworks.ads \
-  s-osprim.adb<s-osprim-vxworks.adb \
-  s-parame.ads<s-parame-ae653.ads \
-  s-parame.adb<s-parame-vxworks.adb \
-  s-taprop.adb<libgnarl/s-taprop-vxworks.adb \
-  s-tasinf.ads<libgnarl/s-tasinf-vxworks.ads \
-  s-taspri.ads<libgnarl/s-taspri-vxworks.ads \
-  s-tpopsp.adb<libgnarl/s-tpopsp-vxworks.adb \
-  s-vxwext.adb<s-vxwext-noints.adb \
-  s-vxwext.ads<libgnarl/s-vxwext-vthreads.ads \
-  s-vxwork.ads<libgnarl/s-vxwork-x86.ads \
-  system.ads<system-vxworks-x86-vthread.ads \
-  $(ATOMICS_TARGET_PAIRS) \
-  $(ATOMICS_BUILTINS_TARGET_PAIRS)
-
-  EH_MECHANISM=-gcc
-
-  TOOLS_TARGET_PAIRS=indepsw.adb<indepsw-gnu.adb
-
-  EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o s-thread.o
-  EXTRA_GNATRTL_TASKING_OBJS=i-vxinco.o s-vxwork.o s-vxwext.o
-
-  EXTRA_LIBGNAT_OBJS+=vx_stack_info.o
-  GNATRTL_SOCKETS_OBJS =
-
-  # Extra pairs for the vthreads runtime
-  ifeq ($(strip $(filter-out vthreads,$(THREAD_KIND))),)
-    LIBGNAT_TARGET_PAIRS += \
-    s-thread.adb<s-thread-ae653.adb \
-    s-osvers.ads<s-osvers-vxworks-653.ads \
-    $(DUMMY_SOCKETS_TARGET_PAIRS)
-
-    GNATRTL_SOCKETS_OBJS =
-    EXTRA_GNATRTL_NONTASKING_OBJS += s-thread.o s-osvers.o
-  else
-    LIBGNAT_TARGET_PAIRS += \
-    g-socthi.ads<g-socthi-vxworks.ads \
-    g-socthi.adb<g-socthi-vxworks.adb \
-    g-stsifd.adb<g-stsifd-sockets.adb
-  endif
-
-endif
-
 # x86/x86_64 VxWorks
 ifeq ($(strip $(filter-out %86 x86_64 wrs vxworks vxworks7,$(target_cpu) $(target_vendor) $(target_os))),)
 
@@ -750,32 +627,32 @@ 
 
   ifeq ($(strip $(filter-out x86_64, $(target_cpu))),)
      X86CPU=x86_64
-     LIBGNAT_TARGET_PAIRS=s-atocou.adb<s-atocou-builtin.adb
+     LIBGNAT_TARGET_PAIRS=s-atocou.adb<libgnat/s-atocou-builtin.adb
   else
      X86CPU=x86
-     LIBGNAT_TARGET_PAIRS=s-atocou.adb<s-atocou-x86.adb
+     LIBGNAT_TARGET_PAIRS=s-atocou.adb<libgnat/s-atocou-x86.adb
   endif
 
   LIBGNAT_TARGET_PAIRS+= \
   a-intnam.ads<libgnarl/a-intnam-vxworks.ads \
-  i-vxwork.ads<i-vxwork-x86.ads \
+  i-vxwork.ads<libgnat/i-vxwork-x86.ads \
   s-osinte.adb<libgnarl/s-osinte-vxworks.adb \
   s-osinte.ads<libgnarl/s-osinte-vxworks.ads \
   s-inmaop.adb<libgnarl/s-inmaop-vxworks.adb \
   s-intman.ads<libgnarl/s-intman-vxworks.ads \
   s-intman.adb<libgnarl/s-intman-vxworks.adb \
-  s-osprim.adb<s-osprim-vxworks.adb \
-  s-parame.ads<s-parame-vxworks.ads \
-  s-parame.adb<s-parame-vxworks.adb \
-  s-stchop.ads<s-stchop-limit.ads \
-  s-stchop.adb<s-stchop-vxworks.adb \
+  s-osprim.adb<libgnat/s-osprim-vxworks.adb \
+  s-parame.ads<libgnat/s-parame-vxworks.ads \
+  s-parame.adb<libgnat/s-parame-vxworks.adb \
+  s-stchop.ads<libgnat/s-stchop-limit.ads \
+  s-stchop.adb<libgnat/s-stchop-vxworks.adb \
   s-taprop.adb<libgnarl/s-taprop-vxworks.adb \
   s-tasinf.ads<libgnarl/s-tasinf-vxworks.ads \
   s-taspri.ads<libgnarl/s-taspri-vxworks.ads \
   s-vxwork.ads<libgnarl/s-vxwork-x86.ads \
-  g-socthi.ads<g-socthi-vxworks.ads \
-  g-socthi.adb<g-socthi-vxworks.adb \
-  g-stsifd.adb<g-stsifd-sockets.adb \
+  g-socthi.ads<libgnat/g-socthi-vxworks.ads \
+  g-socthi.adb<libgnat/g-socthi-vxworks.adb \
+  g-stsifd.adb<libgnat/g-stsifd-sockets.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(CERTMATH_TARGET_PAIRS) \
   $(CERTMATH_TARGET_PAIRS_SQRT_FPU) \
@@ -824,8 +701,8 @@ 
     LIBGNAT_TARGET_PAIRS += \
     s-vxwext.ads<libgnarl/s-vxwext-rtp.ads \
     s-vxwext.adb<libgnarl/s-vxwext-rtp.adb \
-    s-tpopsp.adb<s-tpopsp-vxworks-rtp.adb \
-    system.ads<system-vxworks-x86-rtp.ads
+    s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-rtp.adb \
+    system.ads<libgnat/system-vxworks-x86-rtp.ads
   else
     ifeq ($(strip $(filter-out rtp-smp, $(THREAD_KIND))),)
       LIBGNAT_TARGET_PAIRS += \
@@ -833,7 +710,7 @@ 
       s-vxwext.ads<libgnarl/s-vxwext-rtp.ads \
       s-vxwext.adb<libgnarl/s-vxwext-rtp-smp.adb \
       s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-tls.adb \
-      system.ads<$(SVX)-$(X86CPU)-rtp-smp.ads
+      system.ads<libgnat/$(SVX)-$(X86CPU)-rtp-smp.ads
 
       EXTRA_LIBGNAT_OBJS+=affinity.o
     else
@@ -843,8 +720,8 @@ 
         s-mudido.adb<libgnarl/s-mudido-affinity.adb \
         s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-tls.adb \
         s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \
-        s-vxwext.adb<s-vxwext-kernel-smp.adb \
-        system.ads<$(SVX)-$(X86CPU)-kernel.ads
+        s-vxwext.adb<libgnarl/s-vxwext-kernel-smp.adb \
+        system.ads<libgnat/$(SVX)-$(X86CPU)-kernel.ads
 
         EXTRA_LIBGNAT_OBJS+=affinity.o
       else
@@ -857,10 +734,10 @@ 
           LIBGNAT_TARGET_PAIRS += \
           s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \
           s-vxwext.adb<libgnarl/s-vxwext-kernel.adb \
-          system.ads<$(SVX)-x86-kernel.ads
+          system.ads<libgnat/$(SVX)-x86-kernel.ads
         else
           LIBGNAT_TARGET_PAIRS += \
-          system.ads<system-vxworks-x86.ads
+          system.ads<libgnat/system-vxworks-x86.ads
         endif
       endif
 
@@ -905,25 +782,25 @@ 
 
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<libgnarl/a-intnam-vxworks.ads \
-  a-numaux.ads<a-numaux-vxworks.ads \
+  a-numaux.ads<libgnat/a-numaux-vxworks.ads \
   s-inmaop.adb<libgnarl/s-inmaop-vxworks.adb \
   s-interr.adb<libgnarl/s-interr-vxworks.adb \
   s-intman.ads<libgnarl/s-intman-vxworks.ads \
   s-intman.adb<libgnarl/s-intman-vxworks.adb \
   s-osinte.adb<libgnarl/s-osinte-vxworks.adb \
   s-osinte.ads<libgnarl/s-osinte-vxworks.ads \
-  s-osprim.adb<s-osprim-vxworks.adb \
-  s-parame.ads<s-parame-vxworks.ads \
-  s-parame.adb<s-parame-vxworks.adb \
-  s-stchop.ads<s-stchop-limit.ads \
-  s-stchop.adb<s-stchop-vxworks.adb \
+  s-osprim.adb<libgnat/s-osprim-vxworks.adb \
+  s-parame.ads<libgnat/s-parame-vxworks.ads \
+  s-parame.adb<libgnat/s-parame-vxworks.adb \
+  s-stchop.ads<libgnat/s-stchop-limit.ads \
+  s-stchop.adb<libgnat/s-stchop-vxworks.adb \
   s-taprop.adb<libgnarl/s-taprop-vxworks.adb \
   s-tasinf.ads<libgnarl/s-tasinf-vxworks.ads \
   s-taspri.ads<libgnarl/s-taspri-vxworks.ads \
   s-vxwork.ads<libgnarl/s-vxwork-arm.ads \
-  g-socthi.ads<g-socthi-vxworks.ads \
-  g-socthi.adb<g-socthi-vxworks.adb \
-  g-stsifd.adb<g-stsifd-sockets.adb
+  g-socthi.ads<libgnat/g-socthi-vxworks.ads \
+  g-socthi.adb<libgnat/g-socthi-vxworks.adb \
+  g-stsifd.adb<libgnat/g-stsifd-sockets.adb
 
   TOOLS_TARGET_PAIRS=indepsw.adb<indepsw-gnu.adb
 
@@ -933,7 +810,7 @@ 
     s-vxwext.ads<libgnarl/s-vxwext-rtp.ads \
     s-vxwext.adb<libgnarl/s-vxwext-rtp-smp.adb \
     s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-tls.adb \
-    system.ads<$(SVX)-arm-rtp-smp.ads
+    system.ads<libgnat/$(SVX)-arm-rtp-smp.ads
 
     EXTRA_LIBGNAT_OBJS+=affinity.o
 
@@ -945,8 +822,8 @@ 
       s-mudido.adb<libgnarl/s-mudido-affinity.adb \
       s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-tls.adb \
       s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \
-      s-vxwext.adb<s-vxwext-kernel-smp.adb \
-      system.ads<$(SVX)-arm.ads
+      s-vxwext.adb<libgnarl/s-vxwext-kernel-smp.adb \
+      system.ads<libgnat/$(SVX)-arm.ads
 
       EXTRA_LIBGNAT_OBJS+=affinity.o
 
@@ -955,7 +832,7 @@ 
     else
       LIBGNAT_TARGET_PAIRS += \
       s-tpopsp.adb<libgnarl/s-tpopsp-vxworks.adb \
-      system.ads<$(SVX)-arm.ads
+      system.ads<libgnat/$(SVX)-arm.ads
 
       ifeq ($(strip $(filter-out kernel,$(THREAD_KIND))),)
         LIBGNAT_TARGET_PAIRS += \
@@ -995,13 +872,13 @@ 
   s-linux.ads<libgnarl/s-linux-android.ads \
   s-osinte.adb<libgnarl/s-osinte-android.adb \
   s-osinte.ads<libgnarl/s-osinte-android.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-posix.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-  system.ads<system-linux-arm.ads
+  system.ads<libgnat/system-linux-arm.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1023,16 +900,16 @@ 
   s-mudido.adb<libgnarl/s-mudido-affinity.adb \
   s-osinte.adb<libgnarl/s-osinte-solaris.adb \
   s-osinte.ads<libgnarl/s-osinte-solaris.ads \
-  s-osprim.adb<s-osprim-solaris.adb \
+  s-osprim.adb<libgnat/s-osprim-solaris.adb \
   s-taprop.adb<libgnarl/s-taprop-solaris.adb \
   s-tasinf.adb<libgnarl/s-tasinf-solaris.adb \
   s-tasinf.ads<libgnarl/s-tasinf-solaris.ads \
   s-taspri.ads<libgnarl/s-taspri-solaris.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-solaris.adb \
-  g-soliop.ads<g-soliop-solaris.ads \
+  g-soliop.ads<libgnat/g-soliop-solaris.ads \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-  system.ads<system-solaris-sparc.ads
+  system.ads<libgnat/system-solaris-sparc.ads
 
   EH_MECHANISM=-gcc
   THREADSLIB = -lposix4 -lthread
@@ -1056,15 +933,15 @@ 
   s-mudido.adb<libgnarl/s-mudido-affinity.adb \
   s-osinte.adb<libgnarl/s-osinte-solaris.adb \
   s-osinte.ads<libgnarl/s-osinte-solaris.ads \
-  s-osprim.adb<s-osprim-solaris.adb \
+  s-osprim.adb<libgnat/s-osprim-solaris.adb \
   s-taprop.adb<libgnarl/s-taprop-solaris.adb \
   s-tasinf.adb<libgnarl/s-tasinf-solaris.adb \
   s-tasinf.ads<libgnarl/s-tasinf-solaris.ads \
   s-taspri.ads<libgnarl/s-taspri-solaris.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-solaris.adb \
-  g-soliop.ads<g-soliop-solaris.ads \
+  g-soliop.ads<libgnat/g-soliop-solaris.ads \
   $(ATOMICS_TARGET_PAIRS) \
-  system.ads<system-solaris-x86.ads
+  system.ads<libgnat/system-solaris-x86.ads
 
   ifeq ($(strip $(filter-out %86 solaris2%,$(target_cpu) $(target_os))),)
     ifeq ($(strip $(MULTISUBDIR)),/amd64)
@@ -1105,14 +982,14 @@ 
   s-intman.adb<libgnarl/s-intman-posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
-  g-sercom.adb<g-sercom-linux.adb \
-  s-tsmona.adb<s-tsmona-linux.adb \
+  g-sercom.adb<libgnat/g-sercom-linux.adb \
+  s-tsmona.adb<libgnat/s-tsmona-linux.adb \
   a-exetim.adb<libgnarl/a-exetim-posix.adb \
   a-exetim.ads<libgnarl/a-exetim-default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
   $(ATOMICS_TARGET_PAIRS) \
-  system.ads<system-linux-x86.ads
+  system.ads<libgnat/system-linux-x86.ads
 
   ifeq ($(strip $(MULTISUBDIR)),/64)
     LIBGNAT_TARGET_PAIRS += $(X86_64_TARGET_PAIRS)
@@ -1123,7 +1000,7 @@ 
   LIBGNAT_TARGET_PAIRS += \
   s-mudido.adb<libgnarl/s-mudido-affinity.adb \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
@@ -1150,14 +1027,14 @@ 
   s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
   s-intman.adb<libgnarl/s-intman-posix.adb \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
-  s-osinte.ads<s-osinte-kfreebsd-gnu.ads \
-  s-osprim.adb<libgnarl/s-osprim-posix.adb \
+  s-osinte.ads<libgnarl/s-osinte-kfreebsd-gnu.ads \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-posix.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_TARGET_PAIRS) \
-  system.ads<system-freebsd.ads
+  system.ads<libgnat/system-freebsd.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1179,17 +1056,15 @@ 
   s-intman.adb<libgnarl/s-intman-posix.adb \
   s-osinte.adb<libgnarl/s-osinte-gnu.adb \
   s-osinte.ads<libgnarl/s-osinte-gnu.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-posix.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_TARGET_PAIRS) \
-  system.ads<system-freebsd.ads
+  system.ads<libgnat/system-freebsd.ads
 
-  TOOLS_TARGET_PAIRS =  \
-    mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
-    indepsw.adb<indepsw-gnu.adb
+  TOOLS_TARGET_PAIRS =  indepsw.adb<indepsw-gnu.adb
 
   EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
 
@@ -1203,17 +1078,17 @@ 
 ifeq ($(strip $(filter-out x86_64 kfreebsd%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<libgnarl/a-intnam-freebsd.ads \
-  a-numaux.adb<a-numaux-x86.adb \
-  a-numaux.ads<a-numaux-x86.ads \
+  a-numaux.adb<libgnat/a-numaux-x86.adb \
+  a-numaux.ads<libgnat/a-numaux-x86.ads \
   s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
   s-intman.adb<libgnarl/s-intman-posix.adb \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
   s-osinte.ads<libgnarl/s-osinte-kfreebsd-gnu.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-posix.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
-  system.ads<system-freebsd.ads
+  system.ads<libgnat/system-freebsd.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1233,16 +1108,14 @@ 
   s-mudido.adb<libgnarl/s-mudido-affinity.adb \
   s-osinte.adb<libgnarl/s-osinte-freebsd.adb \
   s-osinte.ads<libgnarl/s-osinte-freebsd.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-posix.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-  system.ads<system-freebsd.ads
+  system.ads<libgnat/system-freebsd.ads
 
-  TOOLS_TARGET_PAIRS = \
-  mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb
   GNATLIB_SHARED = gnatlib-shared-dual
 
   EH_MECHANISM=-gcc
@@ -1261,13 +1134,13 @@ 
   s-mudido.adb<libgnarl/s-mudido-affinity.adb \
   s-osinte.adb<libgnarl/s-osinte-freebsd.adb \
   s-osinte.ads<libgnarl/s-osinte-freebsd.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-posix.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_TARGET_PAIRS) \
-  system.ads<system-freebsd.ads
+  system.ads<libgnat/system-freebsd.ads
 
   GNATLIB_SHARED = gnatlib-shared-dual
 
@@ -1289,13 +1162,13 @@ 
   s-mudido.adb<libgnarl/s-mudido-affinity.adb \
   s-osinte.adb<libgnarl/s-osinte-freebsd.adb \
   s-osinte.ads<libgnarl/s-osinte-freebsd.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-posix.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
-  system.ads<system-freebsd.ads
+  system.ads<libgnat/system-freebsd.ads
 
   GNATLIB_SHARED = gnatlib-shared-dual
 
@@ -1317,16 +1190,14 @@ 
   s-mudido.adb<libgnarl/s-mudido-affinity.adb \
   s-osinte.adb<libgnarl/s-osinte-dragonfly.adb \
   s-osinte.ads<libgnarl/s-osinte-dragonfly.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-posix.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
-  system.ads<system-dragonfly-x86_64.ads
+  system.ads<libgnat/system-dragonfly-x86_64.ads
 
-  TOOLS_TARGET_PAIRS = \
-  mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb
   GNATLIB_SHARED = gnatlib-shared-dual
 
   EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
@@ -1347,13 +1218,13 @@ 
   s-linux.ads<libgnarl/s-linux.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
   s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
-  system.ads<system-linux-s390.ads
+  system.ads<libgnat/system-linux-s390.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1367,19 +1238,19 @@ 
 # HP/PA HP-UX 10
 ifeq ($(strip $(filter-out hppa% hp hpux10%,$(target_cpu) $(target_vendor) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-excpol.adb<a-excpol-abort.adb \
+  a-excpol.adb<libgnat/a-excpol-abort.adb \
   a-intnam.ads<libgnarl/a-intnam-hpux.ads \
   s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
   s-interr.adb<libgnarl/s-interr-sigaction.adb \
   s-intman.adb<libgnarl/s-intman-posix.adb \
   s-osinte.adb<libgnarl/s-osinte-hpux-dce.adb \
   s-osinte.ads<libgnarl/s-osinte-hpux-dce.ads \
-  s-parame.ads<s-parame-hpux.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-parame.ads<libgnat/s-parame-hpux.ads \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-hpux-dce.adb \
   s-taspri.ads<libgnarl/s-taspri-hpux-dce.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix.adb \
-  system.ads<system-hpux.ads
+  system.ads<libgnat/system-hpux.ads
 
   EH_MECHANISM=-gcc
 endif
@@ -1392,13 +1263,13 @@ 
   s-intman.adb<libgnarl/s-intman-posix.adb \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
   s-osinte.ads<libgnarl/s-osinte-hpux.ads \
-  s-parame.ads<s-parame-hpux.ads \
-  s-osprim.adb<s-osprim-posix.adb \
-  s-traceb.adb<s-traceb-hpux.adb \
+  s-parame.ads<libgnat/s-parame-hpux.ads \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
+  s-traceb.adb<libgnat/s-traceb-hpux.adb \
   s-taprop.adb<libgnarl/s-taprop-posix.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
-  system.ads<system-hpux.ads
+  system.ads<libgnat/system-hpux.ads
 
   EH_MECHANISM=-gcc
   TGT_LIB = /usr/lib/libcl.a
@@ -1418,13 +1289,13 @@ 
   s-intman.adb<libgnarl/s-intman-posix.adb \
   s-osinte.adb<libgnarl/s-osinte-aix.adb \
   s-osinte.ads<libgnarl/s-osinte-aix.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-posix.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-  system.ads<system-aix.ads
+  system.ads<libgnat/system-aix.ads
 
   ifeq ($(findstring ppc64, \
 	  $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) \
@@ -1444,18 +1315,18 @@ 
 # RTEMS
 ifeq ($(strip $(filter-out rtems%,$(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  system.ads<system-rtems.ads \
-  a-intnam.ads<a-intnam-rtems.ads \
+  system.ads<libgnat/system-rtems.ads \
+  a-intnam.ads<libgnarl/a-intnam-rtems.ads \
   s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
   s-intman.adb<libgnarl/s-intman-posix.adb \
   s-osinte.adb<libgnarl/s-osinte-rtems.adb \
   s-osinte.ads<libgnarl/s-osinte-rtems.ads \
-  s-osprim.adb<s-osprim-posix.adb \
-  s-parame.adb<s-parame-rtems.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
+  s-parame.adb<libgnat/s-parame-rtems.adb \
   s-taprop.adb<libgnarl/s-taprop-posix.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-tls.adb \
-  s-stchop.adb<s-stchop-rtems.adb \
+  s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \
+  s-stchop.adb<libgnat/s-stchop-rtems.adb \
   s-interr.adb<libgnarl/s-interr-hwint.adb
 endif
 
@@ -1477,10 +1348,10 @@ 
 	s-inmaop.adb<libgnarl/s-inmaop-dummy.adb \
 	s-intman.adb<libgnarl/s-intman-dummy.adb \
 	s-osinte.ads<libgnarl/s-osinte-dummy.ads \
-	s-osprim.adb<s-osprim-unix.adb \
+	s-osprim.adb<libgnat/s-osprim-unix.adb \
 	s-taprop.adb<libgnarl/s-taprop-dummy.adb \
 	s-taspri.ads<libgnarl/s-taspri-dummy.ads \
-	system.ads<system-djgpp.ads \
+	system.ads<libgnat/system-djgpp.ads \
 	$(DUMMY_SOCKETS_TARGET_PAIRS)
 
   EH_MECHANISM=-gcc
@@ -1496,39 +1367,39 @@ 
   # a long-term project to disentangle them.
   ifeq ($(strip $(filter-out cygwin%,$(target_os))),)
     LIBGNAT_TARGET_PAIRS = \
-    s-memory.adb<s-memory.adb \
-    g-socthi.ads<g-socthi.ads \
-    g-socthi.adb<g-socthi.adb
+    s-memory.adb<libgnat/s-memory.adb \
+    g-socthi.ads<libgnat/g-socthi.ads \
+    g-socthi.adb<libgnat/g-socthi.adb
   else
     LIBGNAT_TARGET_PAIRS = \
-    s-memory.adb<s-memory-mingw.adb \
-    g-socthi.ads<g-socthi-mingw.ads \
-    g-socthi.adb<g-socthi-mingw.adb
+    s-memory.adb<libgnat/s-memory-mingw.adb \
+    g-socthi.ads<libgnat/g-socthi-mingw.ads \
+    g-socthi.adb<libgnat/g-socthi-mingw.adb
   endif
   LIBGNAT_TARGET_PAIRS += \
-  a-dirval.adb<a-dirval-mingw.adb \
-  a-excpol.adb<a-excpol-abort.adb \
-  s-gloloc.adb<s-gloloc-mingw.adb \
+  a-dirval.adb<libgnat/a-dirval-mingw.adb \
+  a-excpol.adb<libgnat/a-excpol-abort.adb \
+  s-gloloc.adb<libgnat/s-gloloc-mingw.adb \
   s-inmaop.adb<libgnarl/s-inmaop-dummy.adb \
   s-taspri.ads<libgnarl/s-taspri-mingw.ads \
   s-tasinf.adb<libgnarl/s-tasinf-mingw.adb \
   s-tasinf.ads<libgnarl/s-tasinf-mingw.ads \
-  g-stsifd.adb<g-stsifd-sockets.adb \
-  g-soliop.ads<g-soliop-mingw.ads \
+  g-stsifd.adb<libgnat/g-stsifd-sockets.adb \
+  g-soliop.ads<libgnat/g-soliop-mingw.ads \
   $(ATOMICS_TARGET_PAIRS) \
-  system.ads<system-mingw.ads
+  system.ads<libgnat/system-mingw.ads
 
   LIBGNAT_TARGET_PAIRS += \
   a-exetim.adb<libgnarl/a-exetim-mingw.adb \
   a-exetim.ads<libgnarl/a-exetim-mingw.ads \
   a-intnam.ads<libgnarl/a-intnam-mingw.ads \
-  g-sercom.adb<g-sercom-mingw.adb \
-  s-tsmona.adb<s-tsmona-mingw.adb \
+  g-sercom.adb<libgnat/g-sercom-mingw.adb \
+  s-tsmona.adb<libgnat/s-tsmona-mingw.adb \
   s-interr.adb<libgnarl/s-interr-sigaction.adb \
   s-intman.adb<libgnarl/s-intman-mingw.adb \
   s-mudido.adb<libgnarl/s-mudido-affinity.adb \
   s-osinte.ads<libgnarl/s-osinte-mingw.ads \
-  s-osprim.adb<s-osprim-mingw.adb \
+  s-osprim.adb<libgnat/s-osprim-mingw.adb \
   s-taprop.adb<libgnarl/s-taprop-mingw.adb
 
   ifeq ($(strip $(filter-out x86_64%,$(target_cpu))),)
@@ -1579,14 +1450,14 @@ 
   s-linux.ads<libgnarl/s-linux-mips.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
   s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
-  g-sercom.adb<g-sercom-linux.adb \
-  system.ads<system-linux-mips.ads
+  g-sercom.adb<libgnat/g-sercom-linux.adb \
+  system.ads<libgnat/system-linux-mips.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1611,16 +1482,16 @@ 
   s-linux.ads<libgnarl/s-linux.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \
-  g-sercom.adb<g-sercom-linux.adb \
+  g-sercom.adb<libgnat/g-sercom-linux.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-  system.ads<system-linux-ppc.ads
+  system.ads<libgnat/system-linux-ppc.ads
 
   LIBGNAT_TARGET_PAIRS = \
     $(LIBGNAT_TARGET_PAIRS_COMMON) \
     s-mudido.adb<libgnarl/s-mudido-affinity.adb \
     s-osinte.ads<libgnarl/s-osinte-linux.ads \
-    s-osprim.adb<s-osprim-posix.adb \
+    s-osprim.adb<libgnat/s-osprim-posix.adb \
     s-taprop.adb<libgnarl/s-taprop-linux.adb \
     s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
     s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
@@ -1646,7 +1517,7 @@ 
   s-linux.ads<libgnarl/s-linux.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
@@ -1654,7 +1525,7 @@ 
   s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-  system.ads<system-linux-arm.ads
+  system.ads<libgnat/system-linux-arm.ads
 
   ifeq ($(strip $(filter-out arm%b,$(target_cpu))),)
     EH_MECHANISM=
@@ -1685,16 +1556,16 @@ 
   s-mudido.adb<libgnarl/s-mudido-affinity.adb \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
-  g-sercom.adb<g-sercom-linux.adb \
+  g-sercom.adb<libgnat/g-sercom-linux.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-  system.ads<system-linux-arm.ads
+  system.ads<libgnat/system-linux-arm.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1715,13 +1586,13 @@ 
   s-linux.ads<libgnarl/s-linux-sparc.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
   s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \
-  system.ads<system-linux-sparc.ads
+  system.ads<libgnat/system-linux-sparc.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1742,13 +1613,13 @@ 
   s-linux.ads<libgnarl/s-linux-hppa.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
   s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
-  system.ads<system-linux-hppa.ads
+  system.ads<libgnat/system-linux-hppa.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1766,20 +1637,18 @@ 
   a-intnam.ads<libgnarl/a-intnam-linux.ads \
   s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
   s-intman.adb<libgnarl/s-intman-posix.adb \
-  s-linux.ads<s-linux.ads \
+  s-linux.ads<libgnat/s-linux.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
-  system.ads<system-linux-m68k.ads
+  system.ads<libgnat/system-linux-m68k.ads
 
-  TOOLS_TARGET_PAIRS =  \
-    mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
-    indepsw.adb<indepsw-gnu.adb
+  TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
   EXTRA_GNATRTL_TASKING_OBJS=s-linux.o
   EH_MECHANISM=-gcc
@@ -1798,13 +1667,13 @@ 
   s-linux.ads<libgnarl/s-linux.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
   s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
-  system.ads<system-linux-sh4.ads
+  system.ads<libgnat/system-linux-sh4.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-linux.adb
 
@@ -1823,7 +1692,7 @@ 
   a-exetim.adb<libgnarl/a-exetim-posix.adb \
   a-exetim.ads<libgnarl/a-exetim-default.ads \
   a-intnam.ads<libgnarl/a-intnam-linux.ads \
-  a-numaux.ads<a-numaux-libc-x86.ads \
+  a-numaux.ads<libgnat/a-numaux-libc-x86.ads \
   a-synbar.adb<libgnarl/a-synbar-posix.adb \
   a-synbar.ads<libgnarl/a-synbar-posix.ads \
   s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
@@ -1832,16 +1701,16 @@ 
   s-mudido.adb<libgnarl/s-mudido-affinity.adb \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \
   s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \
-  g-sercom.adb<g-sercom-linux.adb \
+  g-sercom.adb<libgnat/g-sercom-linux.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-  system.ads<system-linux-ia64.ads
+  system.ads<libgnat/system-linux-ia64.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1862,13 +1731,13 @@ 
   s-intman.adb<libgnarl/s-intman-posix.adb \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
   s-osinte.ads<libgnarl/s-osinte-hpux.ads \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-posix.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
   s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-  system.ads<system-hpux-ia64.ads
+  system.ads<libgnat/system-hpux-ia64.ads
 
   MISCLIB=
   EH_MECHANISM=-gcc
@@ -1889,7 +1758,7 @@ 
   s-linux.ads<libgnarl/s-linux-alpha.ads \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
@@ -1897,7 +1766,7 @@ 
   s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-  system.ads<system-linux-alpha.ads
+  system.ads<libgnat/system-linux-alpha.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1923,18 +1792,18 @@ 
   s-mudido.adb<libgnarl/s-mudido-affinity.adb \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
   s-osinte.adb<libgnarl/s-osinte-posix.adb \
-  s-osprim.adb<s-osprim-posix.adb \
+  s-osprim.adb<libgnat/s-osprim-posix.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
-  g-sercom.adb<g-sercom-linux.adb \
+  g-sercom.adb<libgnat/g-sercom-linux.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<s-tsmona-linux.adb \
+  s-tsmona.adb<libgnat/s-tsmona-linux.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
-  system.ads<system-linux-x86.ads
+  system.ads<libgnat/system-linux-x86.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1963,16 +1832,16 @@ 
   s-mudido.adb<libgnarl/s-mudido-affinity.adb \
   s-osinte.ads<libgnarl/s-osinte-linux.ads \
   s-osinte.adb<libgnarl/s-osinte-x32.adb \
-  s-osprim.adb<s-osprim-x32.adb \
+  s-osprim.adb<libgnat/s-osprim-x32.adb \
   s-taprop.adb<libgnarl/s-taprop-linux.adb \
   s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
   s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \
   s-taspri.ads<libgnarl/s-taspri-posix.ads \
-  g-sercom.adb<g-sercom-linux.adb \
+  g-sercom.adb<libgnat/g-sercom-linux.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
-  system.ads<system-linux-x86.ads
+  system.ads<libgnat/system-linux-x86.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1995,15 +1864,15 @@ 
     s-osinte.ads<libgnarl/s-osinte-darwin.ads \
     s-taprop.adb<libgnarl/s-taprop-posix.adb \
     s-taspri.ads<libgnarl/s-taspri-posix.ads \
-    g-sercom.adb<g-sercom-linux.adb \
+    g-sercom.adb<libgnat/g-sercom-linux.adb \
     s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb
 
   ifeq ($(strip $(filter-out %86,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
       s-intman.adb<libgnarl/s-intman-susv3.adb \
-      s-osprim.adb<s-osprim-darwin.adb \
+      s-osprim.adb<libgnat/s-osprim-darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
-      system.ads<system-darwin-x86.ads
+      system.ads<libgnat/system-darwin-x86.ads
 
     ifeq ($(strip $(MULTISUBDIR)),/x86_64)
       SO_OPTS += -m64
@@ -2018,11 +1887,11 @@ 
   ifeq ($(strip $(filter-out %x86_64,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
       s-intman.adb<libgnarl/s-intman-susv3.adb \
-      s-osprim.adb<s-osprim-darwin.adb \
+      s-osprim.adb<libgnat/s-osprim-darwin.adb \
       a-exetim.ads<libgnarl/a-exetim-default.ads \
       a-exetim.adb<libgnarl/a-exetim-darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
-      system.ads<system-darwin-x86.ads
+      system.ads<libgnat/system-darwin-x86.ads
 
     ifeq ($(strip $(MULTISUBDIR)),/i386)
       SO_OPTS += -m32
@@ -2038,12 +1907,12 @@ 
   ifeq ($(strip $(filter-out powerpc%,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
       s-intman.adb<libgnarl/s-intman-posix.adb \
-      s-osprim.adb<s-osprim-posix.adb \
-      a-numaux.ads<a-numaux-darwin.ads \
-      a-numaux.adb<a-numaux-darwin.adb \
+      s-osprim.adb<libgnat/s-osprim-posix.adb \
+      a-numaux.ads<libgnat/a-numaux-darwin.ads \
+      a-numaux.adb<libgnat/a-numaux-darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-      system.ads<system-darwin-ppc.ads
+      system.ads<libgnat/system-darwin-ppc.ads
 
     ifeq ($(strip $(MULTISUBDIR)),/ppc64)
         SO_OPTS += -m64
@@ -2053,25 +1922,25 @@ 
   ifeq ($(strip $(filter-out arm,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
       s-intman.adb<libgnarl/s-intman-susv3.adb \
-      s-osprim.adb<s-osprim-darwin.adb \
+      s-osprim.adb<libgnat/s-osprim-darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       $(ATOMICS_BUILTINS_TARGET_PAIRS)
 
     LIBGNAT_TARGET_PAIRS += \
-      system.ads<system-darwin-arm.ads
+      system.ads<libgnat/system-darwin-arm.ads
   endif
 
   ifeq ($(strip $(filter-out arm64 aarch64,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
       s-intman.adb<libgnarl/s-intman-susv3.adb \
-      s-osprim.adb<s-osprim-darwin.adb \
+      s-osprim.adb<libgnat/s-osprim-darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       $(ATOMICS_BUILTINS_TARGET_PAIRS)
 
     EXTRA_LIBGNAT_OBJS+=sigtramp-ios.o
     EXTRA_LIBGNAT_SRCS+=sigtramp.h
     LIBGNAT_TARGET_PAIRS += \
-      system.ads<system-darwin-arm.ads
+      system.ads<libgnat/system-darwin-arm.ads
   endif
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-darwin.adb
@@ -2086,16 +1955,16 @@ 
 
 ifeq ($(EH_MECHANISM),-gcc)
   LIBGNAT_TARGET_PAIRS += \
-    s-excmac.ads<s-excmac-gcc.ads \
-    s-excmac.adb<s-excmac-gcc.adb
+    s-excmac.ads<libgnat/s-excmac-gcc.ads \
+    s-excmac.adb<libgnat/s-excmac-gcc.adb
   EXTRA_LIBGNAT_OBJS+=raise-gcc.o
   EXTRA_GNATRTL_NONTASKING_OBJS+=g-cppexc.o s-excmac.o
 endif
 
 ifeq ($(EH_MECHANISM),-arm)
   LIBGNAT_TARGET_PAIRS += \
-    s-excmac.ads<s-excmac-arm.ads \
-    s-excmac.adb<s-excmac-arm.adb
+    s-excmac.ads<libgnat/s-excmac-arm.ads \
+    s-excmac.adb<libgnat/s-excmac-arm.adb
   EXTRA_LIBGNAT_OBJS+=raise-gcc.o
   EXTRA_GNATRTL_NONTASKING_OBJS+=g-cppexc.o s-excmac.o
 endif
@@ -2138,12 +2007,21 @@ 
   memtrack.o
 
 # Run time source files
+# Note that libgnat contains a significant number of files. In orde to avoid
+# command line length limitations the source regexp has been split for that
+# directory.
 ADA_INCLUDE_SRCS =\
- ada.ads calendar.ads directio.ads gnat.ads interfac.ads ioexcept.ads \
- machcode.ads text_io.ads unchconv.ads unchdeal.ads \
- sequenio.ads system.ads memtrack.adb \
- a-[a-o]*.adb a-[p-z]*.adb a-[a-o]*.ads a-[p-z]*.ads g-*.ad? i-*.ad? \
- s-[a-o]*.adb s-[p-z]*.adb s-[a-o]*.ads s-[p-z]*.ads \
+ libgnat/ada.ads libgnat/calendar.ads libgnat/directio.ads libgnat/gnat.ads libgnat/interfac.ads libgnat/ioexcept.ads \
+ libgnat/machcode.ads libgnat/text_io.ads libgnat/unchconv.ads libgnat/unchdeal.ads \
+ libgnat/sequenio.ads libgnat/system.ads libgnat/memtrack.adb \
+ libgnat/a-[a-o]*.adb libgnat/a-[a-o]*.ads \
+ libgnat/a-[p-z]*.adb libgnat/a-[p-z]*.ads \
+ libgnat/g-[a-o]*.adb libgnat/g-[a-o]*.ads \
+ libgnat/g-[p-z]*.adb libgnat/g-[p-z]*.ads \
+ libgnat/s-[a-o]*.adb libgnat/s-[a-o]*.ads \
+ libgnat/s-[p-z]*.adb libgnat/s-[p-z]*.ads \
+ libgnat/i-[a-o]*.adb libgnat/i-[a-o]*.ads \
+ libgnat/i-[p-z]*.adb libgnat/i-[p-z]*.ads \
  libgnarl/[agis]-[a-z]*.ad[sb]
 
 # Files that are in ADA_INCLUDE_SRCS but not in all configurations.
Index: gcc-interface/Make-lang.in
===================================================================
--- gcc-interface/Make-lang.in	(revision 251892)
+++ gcc-interface/Make-lang.in	(working copy)
@@ -68,7 +68,7 @@ 
   $(CFLAGS) $(ADA_CFLAGS) $(ADAFLAGS) $(CHECKING_ADAFLAGS) $(WARN_ADAFLAGS)
 FORCE_DEBUG_ADAFLAGS = -g
 ADA_CFLAGS =
-ADA_INCLUDES = -nostdinc -I- -I. -Iada/generated -Iada -I$(srcdir)/ada -I$(srcdir)/ada/gcc-interface
+ADA_INCLUDES = -nostdinc -I- -I. -Iada/generated -Iada -I$(srcdir)/ada -I$(srcdir)/ada/gcc-interface -Iada/libgnat -I$(srcdir)/ada/libgnat
 GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
 GNATLIBCFLAGS= -g -O2 $(TCFLAGS)
 ADA_INCLUDE_DIR = $(libsubdir)/adainclude
@@ -104,23 +104,41 @@ 
 	$(COMPILE) $<
 	$(POSTCOMPILE)
 
-# Function that dumps the dependencies of an Ada object file by parsing the
-# associated ALI file.  We match the lines starting with D to achieve that.
-ADA_DEPS=case $@ in \
-            *sdefault.o);; \
-            *)a="`echo $@ | sed -e 's/.o$$/.ali/'`"; \
-                echo "$@: `cat $$a | \
-                sed -ne 's;^D \([a-z0-9_\.-]*\).*;ada/\1;gp' | \
-                sed -e 's;ada/gnatvsn.ads;ada/generated/gnatvsn.ads;g' | \
-                tr -d '\015' | tr '\n' ' '`" > $(dir $@)/$(DEPDIR)/$(patsubst %.o,%.Po,$(notdir $@));; \
-         esac;
+# Function that dumps the dependencies of an Ada object. Dependency only work
+# fully if the compiler support -gnatd.n. Otherwise a fallback mechanism is
+# used. The fallback mechanism add dependency on all ada sources in the same
+# directory as the original source.
+ifeq ($(findstring -gnatd.n,$(ALL_ADAFLAGS)),)
+ADA_DEPS=\
+   mkdir -p $(dir $@)/$(DEPDIR); \
+   (o="$@: $<"; \
+    for d in $(dir $<)/*.ad[sb]; do \
+       o="$$o $$d"; \
+    done; \
+    echo "$$o"; echo) \
+    >$(dir $@)/$(DEPDIR)/$(patsubst %.o,%.Po,$(notdir $@))
+ADA_OUTPUT_OPTION = $(OUTPUT_OPTION)
+else
+ADA_DEPS=\
+   mkdir -p $(dir $@)/$(DEPDIR); \
+   (o="$@: $<"; \
+    for d in `cat $@.gnatd.n`; do \
+       o="$$o $$d"; \
+    done; \
+    echo "$$o"; echo) \
+   >$(dir $@)/$(DEPDIR)/$(patsubst %.o,%.Po,$(notdir $@))
+ADA_OUTPUT_OPTION = $(OUTPUT_OPTION) > $@.gnatd.n
+endif
 
+
 .adb.o:
-	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
+	mkdir -p $(dir $@)
+	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION)
 	@$(ADA_DEPS)
 
 .ads.o:
-	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
+	mkdir -p $(dir $@)
+	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION)
 	@$(ADA_DEPS)
 
 # Define the names for selecting Ada in LANGUAGES.
@@ -229,13 +247,13 @@ 
 
 # Object files from Ada sources that are used by gnat1
 GNAT_ADA_OBJS =	\
- ada/a-charac.o	\
- ada/a-chlat1.o	\
- ada/a-elchha.o	\
- ada/a-except.o	\
- ada/a-exctra.o \
- ada/a-ioexce.o	\
- ada/ada.o	\
+ ada/libgnat/a-charac.o	\
+ ada/libgnat/a-chlat1.o	\
+ ada/libgnat/a-elchha.o	\
+ ada/libgnat/a-except.o	\
+ ada/libgnat/a-exctra.o \
+ ada/libgnat/a-ioexce.o	\
+ ada/libgnat/ada.o	\
  ada/spark_xrefs.o	\
  ada/ali.o	\
  ada/alloc.o	\
@@ -293,21 +311,21 @@ 
  ada/fname.o	\
  ada/freeze.o	\
  ada/frontend.o	\
- ada/g-byorma.o	\
- ada/g-hesora.o	\
- ada/g-htable.o	\
- ada/g-spchge.o	\
- ada/g-speche.o	\
- ada/g-u3spch.o	\
+ ada/libgnat/g-byorma.o	\
+ ada/libgnat/g-hesora.o	\
+ ada/libgnat/g-htable.o	\
+ ada/libgnat/g-spchge.o	\
+ ada/libgnat/g-speche.o	\
+ ada/libgnat/g-u3spch.o	\
  ada/get_spark_xrefs.o	\
  ada/get_targ.o	\
  ada/ghost.o	\
- ada/gnat.o	\
+ ada/libgnat/gnat.o	\
  ada/gnatvsn.o	\
  ada/hostparm.o	\
  ada/impunit.o	\
  ada/inline.o	\
- ada/interfac.o	\
+ ada/libgnat/interfac.o	\
  ada/itypes.o	\
  ada/krunch.o	\
  ada/layout.o	\
@@ -335,60 +353,60 @@ 
  ada/restrict.o	\
  ada/rident.o	\
  ada/rtsfind.o	\
- ada/s-addope.o	\
- ada/s-addima.o \
- ada/s-assert.o	\
- ada/s-bitops.o	\
- ada/s-carun8.o	\
- ada/s-casuti.o	\
- ada/s-conca2.o	\
- ada/s-conca3.o	\
- ada/s-conca4.o	\
- ada/s-conca5.o	\
- ada/s-conca6.o	\
- ada/s-conca7.o	\
- ada/s-conca8.o	\
- ada/s-conca9.o	\
- ada/s-crc32.o	\
- ada/s-crtl.o	\
- ada/s-excdeb.o	\
- ada/s-except.o	\
- ada/s-exctab.o	\
- ada/s-excmac.o \
- ada/s-htable.o	\
- ada/s-imenne.o	\
- ada/s-imgenu.o	\
- ada/s-imgint.o \
- ada/s-mastop.o	\
- ada/s-memory.o	\
- ada/s-os_lib.o	\
- ada/s-parame.o	\
- ada/s-purexc.o	\
- ada/s-restri.o	\
- ada/s-secsta.o	\
- ada/s-soflin.o	\
- ada/s-sopco3.o	\
- ada/s-sopco4.o	\
- ada/s-sopco5.o	\
- ada/s-stache.o	\
- ada/s-stalib.o	\
- ada/s-stoele.o	\
- ada/s-strcom.o	\
- ada/s-strhas.o	\
- ada/s-string.o	\
- ada/s-strops.o	\
- ada/s-traceb.o \
- ada/s-traent.o	\
- ada/s-trasym.o \
- ada/s-unstyp.o	\
- ada/s-utf_32.o	\
- ada/s-valint.o	\
- ada/s-valuns.o	\
- ada/s-valuti.o	\
- ada/s-wchcnv.o	\
- ada/s-wchcon.o	\
- ada/s-wchjis.o	\
- ada/s-wchstw.o \
+ ada/libgnat/s-addope.o	\
+ ada/libgnat/s-addima.o \
+ ada/libgnat/s-assert.o	\
+ ada/libgnat/s-bitops.o	\
+ ada/libgnat/s-carun8.o	\
+ ada/libgnat/s-casuti.o	\
+ ada/libgnat/s-conca2.o	\
+ ada/libgnat/s-conca3.o	\
+ ada/libgnat/s-conca4.o	\
+ ada/libgnat/s-conca5.o	\
+ ada/libgnat/s-conca6.o	\
+ ada/libgnat/s-conca7.o	\
+ ada/libgnat/s-conca8.o	\
+ ada/libgnat/s-conca9.o	\
+ ada/libgnat/s-crc32.o	\
+ ada/libgnat/s-crtl.o	\
+ ada/libgnat/s-excdeb.o	\
+ ada/libgnat/s-except.o	\
+ ada/libgnat/s-exctab.o	\
+ ada/libgnat/s-excmac.o \
+ ada/libgnat/s-htable.o	\
+ ada/libgnat/s-imenne.o	\
+ ada/libgnat/s-imgenu.o	\
+ ada/libgnat/s-imgint.o \
+ ada/libgnat/s-mastop.o	\
+ ada/libgnat/s-memory.o	\
+ ada/libgnat/s-os_lib.o	\
+ ada/libgnat/s-parame.o	\
+ ada/libgnat/s-purexc.o	\
+ ada/libgnat/s-restri.o	\
+ ada/libgnat/s-secsta.o	\
+ ada/libgnat/s-soflin.o	\
+ ada/libgnat/s-sopco3.o	\
+ ada/libgnat/s-sopco4.o	\
+ ada/libgnat/s-sopco5.o	\
+ ada/libgnat/s-stache.o	\
+ ada/libgnat/s-stalib.o	\
+ ada/libgnat/s-stoele.o	\
+ ada/libgnat/s-strcom.o	\
+ ada/libgnat/s-strhas.o	\
+ ada/libgnat/s-string.o	\
+ ada/libgnat/s-strops.o	\
+ ada/libgnat/s-traceb.o \
+ ada/libgnat/s-traent.o	\
+ ada/libgnat/s-trasym.o \
+ ada/libgnat/s-unstyp.o	\
+ ada/libgnat/s-utf_32.o	\
+ ada/libgnat/s-valint.o	\
+ ada/libgnat/s-valuns.o	\
+ ada/libgnat/s-valuti.o	\
+ ada/libgnat/s-wchcnv.o	\
+ ada/libgnat/s-wchcon.o	\
+ ada/libgnat/s-wchjis.o	\
+ ada/libgnat/s-wchstw.o \
  ada/scans.o	\
  ada/scil_ll.o	\
  ada/scn.o	\
@@ -443,7 +461,7 @@ 
  ada/stylesw.o	\
  ada/switch-c.o	\
  ada/switch.o	\
- ada/system.o	\
+ ada/libgnat/system.o	\
  ada/table.o	\
  ada/targparm.o	\
  ada/tbuild.o	\
@@ -468,9 +486,9 @@ 
 GNAT1_OBJS = $(GNAT1_C_OBJS) $(GNAT1_ADA_OBJS) ada/b_gnat1.o
 
 GNATBIND_OBJS = \
- ada/a-elchha.o   \
- ada/a-except.o   \
- ada/ada.o        \
+ ada/libgnat/a-elchha.o   \
+ ada/libgnat/a-except.o   \
+ ada/libgnat/ada.o        \
  ada/adaint.o     \
  ada/ali-util.o   \
  ada/ali.o        \
@@ -500,16 +518,16 @@ 
  ada/fmap.o       \
  ada/fname-uf.o   \
  ada/fname.o      \
- ada/g-byorma.o   \
- ada/g-hesora.o   \
- ada/g-htable.o   \
- ada/gnat.o       \
+ ada/libgnat/g-byorma.o   \
+ ada/libgnat/g-hesora.o   \
+ ada/libgnat/g-htable.o   \
+ ada/libgnat/gnat.o       \
  ada/gnatbind.o   \
  ada/gnatvsn.o    \
  ada/hostparm.o   \
  ada/init.o       \
  ada/initialize.o \
- ada/interfac.o   \
+ ada/libgnat/interfac.o   \
  ada/krunch.o     \
  ada/lib.o        \
  ada/link.o       \
@@ -525,53 +543,53 @@ 
  ada/rident.o     \
  ada/rtfinal.o    \
  ada/rtinit.o     \
- ada/s-addope.o   \
- ada/s-assert.o   \
- ada/s-carun8.o   \
- ada/s-casuti.o   \
- ada/s-conca2.o   \
- ada/s-conca3.o   \
- ada/s-conca4.o   \
- ada/s-conca5.o   \
- ada/s-conca6.o   \
- ada/s-conca7.o   \
- ada/s-conca8.o   \
- ada/s-conca9.o   \
- ada/s-crc32.o    \
- ada/s-crtl.o     \
- ada/s-excdeb.o   \
- ada/s-except.o   \
- ada/s-excmac.o   \
- ada/s-exctab.o   \
- ada/s-htable.o   \
- ada/s-imenne.o   \
- ada/s-imgenu.o   \
- ada/s-imgint.o   \
- ada/s-mastop.o   \
- ada/s-memory.o   \
- ada/s-os_lib.o   \
- ada/s-parame.o   \
- ada/s-resfil.o   \
- ada/s-restri.o   \
- ada/s-secsta.o   \
- ada/s-soflin.o   \
- ada/s-sopco3.o   \
- ada/s-sopco4.o   \
- ada/s-sopco5.o   \
- ada/s-stache.o   \
- ada/s-stalib.o   \
- ada/s-stoele.o   \
- ada/s-strhas.o   \
- ada/s-string.o   \
- ada/s-strops.o   \
- ada/s-traent.o   \
- ada/s-traceb.o   \
- ada/s-unstyp.o   \
- ada/s-utf_32.o   \
- ada/s-wchcnv.o   \
- ada/s-wchcon.o   \
- ada/s-wchjis.o   \
- ada/s-wchstw.o   \
+ ada/libgnat/s-addope.o   \
+ ada/libgnat/s-assert.o   \
+ ada/libgnat/s-carun8.o   \
+ ada/libgnat/s-casuti.o   \
+ ada/libgnat/s-conca2.o   \
+ ada/libgnat/s-conca3.o   \
+ ada/libgnat/s-conca4.o   \
+ ada/libgnat/s-conca5.o   \
+ ada/libgnat/s-conca6.o   \
+ ada/libgnat/s-conca7.o   \
+ ada/libgnat/s-conca8.o   \
+ ada/libgnat/s-conca9.o   \
+ ada/libgnat/s-crc32.o    \
+ ada/libgnat/s-crtl.o     \
+ ada/libgnat/s-excdeb.o   \
+ ada/libgnat/s-except.o   \
+ ada/libgnat/s-excmac.o   \
+ ada/libgnat/s-exctab.o   \
+ ada/libgnat/s-htable.o   \
+ ada/libgnat/s-imenne.o   \
+ ada/libgnat/s-imgenu.o   \
+ ada/libgnat/s-imgint.o   \
+ ada/libgnat/s-mastop.o   \
+ ada/libgnat/s-memory.o   \
+ ada/libgnat/s-os_lib.o   \
+ ada/libgnat/s-parame.o   \
+ ada/libgnat/s-resfil.o   \
+ ada/libgnat/s-restri.o   \
+ ada/libgnat/s-secsta.o   \
+ ada/libgnat/s-soflin.o   \
+ ada/libgnat/s-sopco3.o   \
+ ada/libgnat/s-sopco4.o   \
+ ada/libgnat/s-sopco5.o   \
+ ada/libgnat/s-stache.o   \
+ ada/libgnat/s-stalib.o   \
+ ada/libgnat/s-stoele.o   \
+ ada/libgnat/s-strhas.o   \
+ ada/libgnat/s-string.o   \
+ ada/libgnat/s-strops.o   \
+ ada/libgnat/s-traent.o   \
+ ada/libgnat/s-traceb.o   \
+ ada/libgnat/s-unstyp.o   \
+ ada/libgnat/s-utf_32.o   \
+ ada/libgnat/s-wchcnv.o   \
+ ada/libgnat/s-wchcon.o   \
+ ada/libgnat/s-wchjis.o   \
+ ada/libgnat/s-wchstw.o   \
  ada/scans.o      \
  ada/scil_ll.o    \
  ada/scng.o       \
@@ -589,7 +607,7 @@ 
  ada/stylesw.o    \
  ada/switch-b.o   \
  ada/switch.o     \
- ada/system.o     \
+ ada/libgnat/system.o     \
  ada/table.o      \
  ada/targext.o    \
  ada/targparm.o   \
@@ -616,12 +634,14 @@ 
 # For unwind-pe.h
 CFLAGS-ada/raise-gcc.o += -I$(srcdir)/../libgcc -DEH_MECHANISM_$(EH_MECHANISM)
 
-ada/s-excmac.o: ada/s-excmac.ads ada/s-excmac.adb
+ada/libgnat/s-excmac.o: ada/libgnat/s-excmac.ads ada/libgnat/s-excmac.adb
 
-ada/s-excmac.ads: $(srcdir)/ada/s-excmac-$(EH_MECHANISM).ads
+ada/libgnat/s-excmac.ads: $(srcdir)/ada/libgnat/s-excmac-$(EH_MECHANISM).ads
+	mkdir -p ada/libgnat
 	$(CP) $< $@
 
-ada/s-excmac.adb: $(srcdir)/ada/s-excmac-$(EH_MECHANISM).adb
+ada/libgnat/s-excmac.adb: $(srcdir)/ada/libgnat/s-excmac-$(EH_MECHANISM).adb
+	mkdir -p ada/libgnat
 	$(CP) $< $@
 
 # Needs to be built with CC=gcc
@@ -977,16 +997,16 @@ 
         # Do not use ADAFLAGS to get rid of -gnatg which generates a lot
         # of style messages.
 	$(CC) -c $(CFLAGS) $(ADA_CFLAGS) -gnatp -gnatws $(ADA_INCLUDES) \
-	    $< $(OUTPUT_OPTION)
+	    $< $(ADA_OUTPUT_OPTION)
 
-ada/b_gnatb.adb : $(GNATBIND_OBJS) ada/gnatbind.o ada/interfac.o
+ada/b_gnatb.adb : $(GNATBIND_OBJS) ada/gnatbind.o ada/libgnat/interfac.o
         # Old gnatbind do not allow a path for -o.
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatb.adb ada/gnatbind.ali
 	$(MV) b_gnatb.adb b_gnatb.ads ada/
 
 ada/b_gnatb.o : ada/b_gnatb.adb
 	$(CC) -c $(CFLAGS) $(ADA_CFLAGS) -gnatp -gnatws $(ADA_INCLUDES) \
-	    $< $(OUTPUT_OPTION)
+	    $< $(ADA_OUTPUT_OPTION)
 
 include $(srcdir)/ada/Make-generated.in
 
@@ -995,35 +1015,35 @@ 
 	$(RM) $(addprefix $(srcdir)/ada/,$(notdir $^))
 	$(CP) $^ $(srcdir)/ada
 
-ada/sdefault.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \
-   ada/a-uncdea.ads ada/alloc.ads ada/debug.ads ada/hostparm.ads ada/namet.ads \
+ada/sdefault.o : ada/libgnat/ada.ads ada/libgnat/a-except.ads ada/libgnat/a-unccon.ads \
+   ada/libgnat/a-uncdea.ads ada/alloc.ads ada/debug.ads ada/hostparm.ads ada/namet.ads \
    ada/opt.ads ada/osint.ads ada/output.ads ada/sdefault.ads ada/sdefault.adb \
-   ada/s-exctab.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \
-   ada/s-stalib.ads ada/s-strops.ads ada/s-sopco3.ads ada/s-sopco4.ads \
-   ada/s-sopco5.ads ada/s-string.ads ada/s-traent.ads ada/s-unstyp.ads \
-   ada/s-wchcon.ads ada/system.ads ada/table.adb ada/table.ads ada/tree_io.ads \
-   ada/types.ads ada/unchdeal.ads ada/unchconv.ads
+   ada/libgnat/s-exctab.ads ada/libgnat/s-memory.ads ada/libgnat/s-os_lib.ads ada/libgnat/s-parame.ads \
+   ada/libgnat/s-stalib.ads ada/libgnat/s-strops.ads ada/libgnat/s-sopco3.ads ada/libgnat/s-sopco4.ads \
+   ada/libgnat/s-sopco5.ads ada/libgnat/s-string.ads ada/libgnat/s-traent.ads ada/libgnat/s-unstyp.ads \
+   ada/libgnat/s-wchcon.ads ada/libgnat/system.ads ada/table.adb ada/table.ads ada/tree_io.ads \
+   ada/types.ads ada/libgnat/unchdeal.ads ada/libgnat/unchconv.ads
 
 # Special flags - see gcc-interface/Makefile.in for the template.
 
-ada/a-except.o : ada/a-except.adb ada/a-except.ads ada/s-excmac.ads ada/s-excmac.adb
+ada/libgnat/a-except.o : ada/libgnat/a-except.adb ada/libgnat/a-except.ads ada/libgnat/s-excmac.ads ada/libgnat/s-excmac.adb
 	$(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O1 -fno-inline \
-	 $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
+	 $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION)
 	@$(ADA_DEPS)
 
-ada/s-excdeb.o : ada/s-excdeb.adb ada/s-excdeb.ads
+ada/libgnat/s-excdeb.o : ada/libgnat/s-excdeb.adb ada/libgnat/s-excdeb.ads
 	$(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O0 \
-	 $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
+	 $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION)
 	@$(ADA_DEPS)
 
-ada/s-assert.o  : ada/s-assert.adb ada/s-assert.ads
+ada/libgnat/s-assert.o  : ada/libgnat/s-assert.adb ada/libgnat/s-assert.ads
 	$(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) $(ADA_INCLUDES) \
-	  $< $(OUTPUT_OPTION)
+	  $< $(ADA_OUTPUT_OPTION)
 	@$(ADA_DEPS)
 
-ada/a-tags.o  : ada/a-tags.adb ada/a-tags.ads
+ada/libgnat/a-tags.o  : ada/libgnat/a-tags.adb ada/libgnat/a-tags.ads
 	$(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) $(ADA_INCLUDES) \
-	  $< $(OUTPUT_OPTION)
+	  $< $(ADA_OUTPUT_OPTION)
 	@$(ADA_DEPS)
 
 # Handling of gnatvsn version string
@@ -1041,19 +1061,19 @@ 
 	cat $< | sed -e "/Version/s/(\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\).*)/($$d$$s)/g" >$@
 
 ada/gnatvsn.o : ada/gnatvsn.adb ada/generated/gnatvsn.ads
-	$(CC) -c $(ALL_ADAFLAGS) -Iada/generated -I../ada/generated $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
+	$(CC) -c $(ALL_ADAFLAGS) -Iada/generated -I../ada/generated $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION)
 	@$(ADA_DEPS)
 
 # Dependencies for windows specific tool (mdll)
 
 ada/mdll.o : ada/mdll.adb ada/mdll.ads ada/mdll-fil.ads ada/mdll-utl.ads
-	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
+	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION)
 
 ada/mdll-fil.o : ada/mdll-fil.adb ada/mdll.ads ada/mdll-fil.ads
-	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
+	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION)
 
 ada/mdll-utl.o : ada/mdll-utl.adb ada/mdll.ads ada/mdll-utl.ads ada/sdefault.ads ada/types.ads
-	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
+	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION)
 
 ada_generated_files = ada/sinfo.h ada/einfo.h ada/nmake.adb ada/nmake.ads \
 		      ada/treeprs.ads ada/snames.ads ada/snames.adb ada/snames.h \