Makefile.in, [...]: Move libgnarl sources to libgnarl subdir.

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

	* gcc-interface/Makefile.in, a-extiti.ads, s-taprop-linux.adb,
	s-osinte-solaris.adb, a-intnam.ads, s-osinte-solaris.ads,
	s-tpobop.adb, s-intman-android.adb, s-tasinf.adb, s-tpobop.ads,
	s-tasinf.ads, i-vxinco.adb, a-exetim-posix.adb, i-vxinco.ads,
	a-astaco.adb, a-astaco.ads, s-tporft.adb, s-tpoaal.adb, a-taside.adb,
	a-taside.ads, s-tpopsp-posix.adb, s-tasdeb.adb, s-tasdeb.ads,
	s-tpoben.adb, a-dinopr.ads, s-inmaop-vxworks.adb, s-tpoben.ads,
	s-interr-vxworks.adb, s-interr-dummy.adb, s-tassta.adb,
	a-intnam-mingw.ads, s-tassta.ads, s-taasde.adb, a-stcoed.ads,
	s-taasde.ads, s-osinte-darwin.adb, s-proinf.adb, s-taprop-dummy.adb,
	s-osinte-darwin.ads, s-proinf.ads, s-linux.ads, a-intnam-linux.ads,
	s-tasren.adb, s-tasren.ads, s-mudido.adb, g-semaph.adb, s-mudido.ads,
	s-taprop-posix.adb, g-semaph.ads, s-osinte-mingw.ads, s-vxwork-x86.ads,
	s-tposen.adb, s-linux-sparc.ads, s-taprop-vxworks.adb, s-tasini.adb,
	s-tposen.ads, s-tasini.ads, a-etgrbu.ads, s-interr-hwint.adb,
	s-osinte-linux.ads, s-taprop.ads, s-tasque.adb, s-tasque.ads,
	s-taenca.adb, s-taspri-vxworks.ads, s-taenca.ads, a-dynpri.adb,
	s-tpopsp-solaris.adb, a-dynpri.ads, s-taprop-hpux-dce.adb,
	a-interr.adb, a-intnam-freebsd.ads, s-tarest.adb, a-interr.ads,
	s-intman-susv3.adb, a-synbar.adb, a-intnam-dummy.ads, s-tadeca.adb,
	s-osinte-vxworks.adb, s-tarest.ads, s-taskin.adb, a-synbar.ads,
	s-taspri-hpux-dce.ads, s-tadeca.ads, s-osinte-vxworks.ads,
	s-taskin.ads, s-intman-solaris.adb, a-sytaco.adb, s-vxwext-kernel.adb,
	s-mudido-affinity.adb, a-sytaco.ads, s-vxwext-kernel.ads, s-taprob.adb,
	s-intman-mingw.adb, s-taprob.ads, s-osinte-kfreebsd-gnu.ads,
	s-osinte-dummy.ads, s-osinte-gnu.adb, s-osinte-rtems.adb, s-interr.adb,
	s-inmaop.ads, s-vxwext-rtp.adb, s-osinte-gnu.ads, s-osinte-rtems.ads,
	a-synbar-posix.adb, s-interr.ads, s-taspri-posix-noaltstack.ads,
	s-vxwext-rtp.ads, a-synbar-posix.ads, a-extiin.ads, s-osinte-posix.adb,
	s-tpinop.adb, s-tasres.ads, s-tpinop.ads, a-disedf.ads, a-diroro.ads,
	s-linux-alpha.ads, a-tasatt.adb, s-solita.adb, a-intnam-solaris.ads,
	a-tasatt.ads, s-solita.ads, s-tasinf-solaris.adb, s-tasinf-solaris.ads,
	s-vxwork-arm.ads, s-tpopsp-posix-foreign.adb, s-intman-dummy.adb,
	s-intman.ads, s-stusta.adb, s-stusta.ads, s-intman-posix.adb,
	s-tpopsp-vxworks.adb, s-inmaop-dummy.adb, s-taspri-mingw.ads,
	a-intnam-darwin.ads, s-osinte-aix.adb, s-osinte-dragonfly.adb,
	s-osinte-aix.ads, s-tasinf-mingw.adb, s-osinte-dragonfly.ads,
	s-linux-hppa.ads, s-osinte-x32.adb, s-inmaop-posix.adb,
	s-tasinf-mingw.ads, s-intman-vxworks.adb, s-linux-mips.ads,
	s-intman-vxworks.ads, s-osinte-android.adb, s-tasinf-linux.adb,
	s-osinte-android.ads, s-vxwork-ppc.ads, s-tasinf-linux.ads,
	a-dispat.adb, a-dispat.ads, s-tadert.adb, g-thread.adb, s-tadert.ads,
	g-thread.ads, a-intnam-hpux.ads, s-linux-android.ads, s-tataat.adb,
	a-exetim.ads, s-tataat.ads, a-reatim.adb, a-reatim.ads, thread.c,
	g-boubuf.adb, s-osinte-freebsd.adb, g-boubuf.ads, s-osinte-freebsd.ads,
	s-tasuti.adb, s-taspri-dummy.ads, a-exetim-mingw.adb, s-linux-x32.ads,
	s-tasuti.ads, g-signal.adb, a-exetim-mingw.ads, s-interr-sigaction.adb,
	g-signal.ads, s-osinte-hpux.ads, a-intnam-vxworks.ads,
	s-osinte-hpux-dce.adb, s-taspri-posix.ads, s-osinte-hpux-dce.ads,
	s-tasinf-vxworks.ads, g-tastus.ads, s-tpopsp-tls.adb,
	s-taprop-solaris.adb, a-retide.adb, a-exetim-darwin.adb, a-retide.ads,
	s-vxwext.adb, s-vxwext.ads, a-rttiev.adb, a-rttiev.ads, g-boumai.ads,
	a-exetim-default.ads, s-taprop-mingw.adb, s-taspri-solaris.ads,
	a-intnam-aix.ads: Move libgnarl sources to libgnarl subdir.

From-SVN: r251891

1 files changed, 451 insertions, 450 deletions

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 9ad7783..ef3dbec 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -355,13 +355,13 @@ endif
 # Non-tasking case:
 
 LIBGNAT_TARGET_PAIRS = \
-a-intnam.ads<a-intnam-dummy.ads \
-s-inmaop.adb<s-inmaop-dummy.adb \
-s-intman.adb<s-intman-dummy.adb \
-s-osinte.ads<s-osinte-dummy.ads \
+a-intnam.ads<libgnarl/a-intnam-dummy.ads \
+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-taprop.adb<s-taprop-dummy.adb \
-s-taspri.ads<s-taspri-dummy.ads
+s-taprop.adb<libgnarl/s-taprop-dummy.adb \
+s-taspri.ads<libgnarl/s-taspri-dummy.ads
 
 # When using the GCC exception handling mechanism, we need to use an
 # alternate body for a-exexpr.adb (a-exexpr-gcc.adb)
@@ -506,20 +506,20 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworksspe vxworks7 vxworks7spe,
   endif
 
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-vxworks.ads \
+  a-intnam.ads<libgnarl/a-intnam-vxworks.ads \
   a-numaux.ads<a-numaux-vxworks.ads \
-  s-inmaop.adb<s-inmaop-vxworks.adb \
-  s-intman.ads<s-intman-vxworks.ads \
-  s-intman.adb<s-intman-vxworks.adb \
-  s-osinte.ads<s-osinte-vxworks.ads \
-  s-osinte.adb<s-osinte-vxworks.adb \
+  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-taprop.adb<s-taprop-vxworks.adb \
-  s-tasinf.ads<s-tasinf-vxworks.ads \
-  s-taspri.ads<s-taspri-vxworks.ads \
-  s-vxwork.ads<s-vxwork-ppc.ads \
+  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 \
@@ -544,8 +544,8 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworksspe vxworks7 vxworks7spe,
 
   ifeq ($(strip $(filter-out rtp,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS += \
-    s-vxwext.ads<s-vxwext-rtp.ads \
-    s-vxwext.adb<s-vxwext-rtp.adb \
+    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
 
@@ -553,10 +553,10 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworksspe vxworks7 vxworks7spe,
   else
     ifeq ($(strip $(filter-out rtp-smp,$(THREAD_KIND))),)
       LIBGNAT_TARGET_PAIRS += \
-      s-mudido.adb<s-mudido-affinity.adb \
-      s-vxwext.ads<s-vxwext-rtp.ads \
-      s-vxwext.adb<s-vxwext-rtp-smp.adb \
-      s-tpopsp.adb<s-tpopsp-vxworks-tls.adb \
+      s-mudido.adb<libgnarl/s-mudido-affinity.adb \
+      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
 
       EH_MECHANISM=-gcc
@@ -564,10 +564,10 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworksspe vxworks7 vxworks7spe,
     else
       ifeq ($(strip $(filter-out kernel-smp,$(THREAD_KIND))),)
         LIBGNAT_TARGET_PAIRS += \
-        s-interr.adb<s-interr-vxworks.adb \
-        s-mudido.adb<s-mudido-affinity.adb \
-        s-tpopsp.adb<s-tpopsp-vxworks-tls.adb \
-        s-vxwext.ads<s-vxwext-kernel.ads \
+        s-interr.adb<libgnarl/s-interr-vxworks.adb \
+        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
 
@@ -575,14 +575,14 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworksspe vxworks7 vxworks7spe,
         EXTRA_LIBGNAT_OBJS+=affinity.o
       else
         LIBGNAT_TARGET_PAIRS += \
-        s-interr.adb<s-interr-vxworks.adb \
-        s-tpopsp.adb<s-tpopsp-vxworks.adb
+        s-interr.adb<libgnarl/s-interr-vxworks.adb \
+        s-tpopsp.adb<libgnarl/s-tpopsp-vxworks.adb
 
         ifeq ($(strip $(filter-out kernel,$(THREAD_KIND))),)
           EH_MECHANISM=-gcc
           LIBGNAT_TARGET_PAIRS += \
-          s-vxwext.ads<s-vxwext-kernel.ads \
-          s-vxwext.adb<s-vxwext-kernel.adb \
+          s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \
+          s-vxwext.adb<libgnarl/s-vxwext-kernel.adb \
           system.ads<system-vxworks-$(ARCH_STR)-kernel.ads
         else
           LIBGNAT_TARGET_PAIRS += \
@@ -630,25 +630,25 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworksae vxworksaespe,$(target_cpu) $(t
   # target pairs for vthreads runtime
   LIBGNAT_TARGET_PAIRS = \
   a-elchha.adb<a-elchha-vxworks-ppc-full.adb \
-  a-intnam.ads<a-intnam-vxworks.ads \
+  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<s-inmaop-vxworks.adb \
-  s-interr.adb<s-interr-vxworks.adb \
-  s-intman.ads<s-intman-vxworks.ads \
-  s-intman.adb<s-intman-vxworks.adb \
-  s-osinte.adb<s-osinte-vxworks.adb \
-  s-osinte.ads<s-osinte-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-ae653.ads \
   s-parame.adb<s-parame-vxworks.adb \
-  s-taprop.adb<s-taprop-vxworks.adb \
-  s-tasinf.ads<s-tasinf-vxworks.ads \
-  s-taspri.ads<s-taspri-vxworks.ads \
-  s-tpopsp.adb<s-tpopsp-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<s-vxwext-vthreads.ads \
-  s-vxwork.ads<s-vxwork-ppc.ads \
+  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)
@@ -686,25 +686,25 @@ ifeq ($(strip $(filter-out %86 wrs vxworksae,$(target_cpu) $(target_vendor) $(ta
   # target pairs for kernel + vthreads runtime
   LIBGNAT_TARGET_PAIRS = \
   a-elchha.adb<a-elchha-vxworks-ppc-full.adb \
-  a-intnam.ads<a-intnam-vxworks.ads \
+  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<s-inmaop-vxworks.adb \
-  s-interr.adb<s-interr-vxworks.adb \
-  s-intman.ads<s-intman-vxworks.ads \
-  s-intman.adb<s-intman-vxworks.adb \
-  s-osinte.adb<s-osinte-vxworks.adb \
-  s-osinte.ads<s-osinte-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-ae653.ads \
   s-parame.adb<s-parame-vxworks.adb \
-  s-taprop.adb<s-taprop-vxworks.adb \
-  s-tasinf.ads<s-tasinf-vxworks.ads \
-  s-taspri.ads<s-taspri-vxworks.ads \
-  s-tpopsp.adb<s-tpopsp-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<s-vxwext-vthreads.ads \
-  s-vxwork.ads<s-vxwork-x86.ads \
+  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)
@@ -757,22 +757,22 @@ ifeq ($(strip $(filter-out %86 x86_64 wrs vxworks vxworks7,$(target_cpu) $(targe
   endif
 
   LIBGNAT_TARGET_PAIRS+= \
-  a-intnam.ads<a-intnam-vxworks.ads \
+  a-intnam.ads<libgnarl/a-intnam-vxworks.ads \
   i-vxwork.ads<i-vxwork-x86.ads \
-  s-osinte.adb<s-osinte-vxworks.adb \
-  s-osinte.ads<s-osinte-vxworks.ads \
-  s-inmaop.adb<s-inmaop-vxworks.adb \
-  s-intman.ads<s-intman-vxworks.ads \
-  s-intman.adb<s-intman-vxworks.adb \
+  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-taprop.adb<s-taprop-vxworks.adb \
-  s-tasinf.ads<s-tasinf-vxworks.ads \
-  s-taspri.ads<s-taspri-vxworks.ads \
-  s-vxwork.ads<s-vxwork-x86.ads \
+  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 \
@@ -822,41 +822,41 @@ ifeq ($(strip $(filter-out %86 x86_64 wrs vxworks vxworks7,$(target_cpu) $(targe
   ifeq ($(strip $(filter-out rtp,$(THREAD_KIND))),)
     # Runtime N/A for VxWorks7 (non-existent system file)
     LIBGNAT_TARGET_PAIRS += \
-    s-vxwext.ads<s-vxwext-rtp.ads \
-    s-vxwext.adb<s-vxwext-rtp.adb \
+    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
   else
     ifeq ($(strip $(filter-out rtp-smp, $(THREAD_KIND))),)
       LIBGNAT_TARGET_PAIRS += \
-      s-mudido.adb<s-mudido-affinity.adb \
-      s-vxwext.ads<s-vxwext-rtp.ads \
-      s-vxwext.adb<s-vxwext-rtp-smp.adb \
-      s-tpopsp.adb<s-tpopsp-vxworks-tls.adb \
+      s-mudido.adb<libgnarl/s-mudido-affinity.adb \
+      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
 
       EXTRA_LIBGNAT_OBJS+=affinity.o
     else
       ifeq ($(strip $(filter-out kernel-smp, $(THREAD_KIND))),)
         LIBGNAT_TARGET_PAIRS += \
-        s-interr.adb<s-interr-vxworks.adb \
-        s-mudido.adb<s-mudido-affinity.adb \
-        s-tpopsp.adb<s-tpopsp-vxworks-tls.adb \
-        s-vxwext.ads<s-vxwext-kernel.ads \
+        s-interr.adb<libgnarl/s-interr-vxworks.adb \
+        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
 
         EXTRA_LIBGNAT_OBJS+=affinity.o
       else
         LIBGNAT_TARGET_PAIRS += \
-        s-interr.adb<s-interr-vxworks.adb \
-        s-tpopsp.adb<s-tpopsp-vxworks.adb
+        s-interr.adb<libgnarl/s-interr-vxworks.adb \
+        s-tpopsp.adb<libgnarl/s-tpopsp-vxworks.adb
 
         ifeq ($(strip $(filter-out kernel,$(THREAD_KIND))),)
           # Runtime N/A for VxWorks7 (non-existent system file)
           LIBGNAT_TARGET_PAIRS += \
-          s-vxwext.ads<s-vxwext-kernel.ads \
-          s-vxwext.adb<s-vxwext-kernel.adb \
+          s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \
+          s-vxwext.adb<libgnarl/s-vxwext-kernel.adb \
           system.ads<$(SVX)-x86-kernel.ads
         else
           LIBGNAT_TARGET_PAIRS += \
@@ -904,23 +904,23 @@ ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(ta
   endif
 
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-vxworks.ads \
+  a-intnam.ads<libgnarl/a-intnam-vxworks.ads \
   a-numaux.ads<a-numaux-vxworks.ads \
-  s-inmaop.adb<s-inmaop-vxworks.adb \
-  s-interr.adb<s-interr-vxworks.adb \
-  s-intman.ads<s-intman-vxworks.ads \
-  s-intman.adb<s-intman-vxworks.adb \
-  s-osinte.adb<s-osinte-vxworks.adb \
-  s-osinte.ads<s-osinte-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-taprop.adb<s-taprop-vxworks.adb \
-  s-tasinf.ads<s-tasinf-vxworks.ads \
-  s-taspri.ads<s-taspri-vxworks.ads \
-  s-vxwork.ads<s-vxwork-arm.ads \
+  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
@@ -929,10 +929,10 @@ ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(ta
 
   ifeq ($(strip $(filter-out rtp-smp,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS += \
-    s-mudido.adb<s-mudido-affinity.adb \
-    s-vxwext.ads<s-vxwext-rtp.ads \
-    s-vxwext.adb<s-vxwext-rtp-smp.adb \
-    s-tpopsp.adb<s-tpopsp-vxworks-tls.adb \
+    s-mudido.adb<libgnarl/s-mudido-affinity.adb \
+    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
 
     EXTRA_LIBGNAT_OBJS+=affinity.o
@@ -942,9 +942,9 @@ ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(ta
   else
     ifeq ($(strip $(filter-out kernel-smp,$(THREAD_KIND))),)
       LIBGNAT_TARGET_PAIRS += \
-      s-mudido.adb<s-mudido-affinity.adb \
-      s-tpopsp.adb<s-tpopsp-vxworks-tls.adb \
-      s-vxwext.ads<s-vxwext-kernel.ads \
+      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
 
@@ -954,13 +954,13 @@ ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(ta
       EXTRA_LIBGNAT_SRCS+=$(VX_SIGTRAMP_EXTRA_SRCS)
     else
       LIBGNAT_TARGET_PAIRS += \
-      s-tpopsp.adb<s-tpopsp-vxworks.adb \
+      s-tpopsp.adb<libgnarl/s-tpopsp-vxworks.adb \
       system.ads<$(SVX)-arm.ads
 
       ifeq ($(strip $(filter-out kernel,$(THREAD_KIND))),)
         LIBGNAT_TARGET_PAIRS += \
-        s-vxwext.ads<s-vxwext-kernel.ads \
-        s-vxwext.adb<s-vxwext-kernel.adb
+        s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \
+        s-vxwext.adb<libgnarl/s-vxwext-kernel.adb
 
         EXTRA_LIBGNAT_OBJS+=$(SIGTRAMP_OBJ)
         EXTRA_LIBGNAT_SRCS+=$(VX_SIGTRAMP_EXTRA_SRCS)
@@ -989,16 +989,16 @@ endif
 # ARM android
 ifeq ($(strip $(filter-out arm% linux-androideabi,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-linux.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-android.adb \
-  s-linux.ads<s-linux-android.ads \
-  s-osinte.adb<s-osinte-android.adb \
-  s-osinte.ads<s-osinte-android.ads \
+  a-intnam.ads<libgnarl/a-intnam-linux.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  s-intman.adb<libgnarl/s-intman-android.adb \
+  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-taprop.adb<s-taprop-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.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
@@ -1017,18 +1017,18 @@ endif
 # Sparc Solaris
 ifeq ($(strip $(filter-out sparc% sun solaris%,$(target_cpu) $(target_vendor) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-solaris.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-solaris.adb \
-  s-mudido.adb<s-mudido-affinity.adb \
-  s-osinte.adb<s-osinte-solaris.adb \
-  s-osinte.ads<s-osinte-solaris.ads \
+  a-intnam.ads<libgnarl/a-intnam-solaris.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  s-intman.adb<libgnarl/s-intman-solaris.adb \
+  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-taprop.adb<s-taprop-solaris.adb \
-  s-tasinf.adb<s-tasinf-solaris.adb \
-  s-tasinf.ads<s-tasinf-solaris.ads \
-  s-taspri.ads<s-taspri-solaris.ads \
-  s-tpopsp.adb<s-tpopsp-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 \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
@@ -1050,18 +1050,18 @@ endif
 # x86 and x86-64 solaris
 ifeq ($(strip $(filter-out %86 %x86_64 solaris2%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS_COMMON = \
-  a-intnam.ads<a-intnam-solaris.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-solaris.adb \
-  s-mudido.adb<s-mudido-affinity.adb \
-  s-osinte.adb<s-osinte-solaris.adb \
-  s-osinte.ads<s-osinte-solaris.ads \
+  a-intnam.ads<libgnarl/a-intnam-solaris.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  s-intman.adb<libgnarl/s-intman-solaris.adb \
+  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-taprop.adb<s-taprop-solaris.adb \
-  s-tasinf.adb<s-tasinf-solaris.adb \
-  s-tasinf.ads<s-tasinf-solaris.ads \
-  s-taspri.ads<s-taspri-solaris.ads \
-  s-tpopsp.adb<s-tpopsp-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 \
   $(ATOMICS_TARGET_PAIRS) \
   system.ads<system-solaris-x86.ads
@@ -1098,19 +1098,19 @@ endif
 # x86 Linux
 ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-linux.ads \
-  a-synbar.adb<a-synbar-posix.adb \
-  a-synbar.ads<a-synbar-posix.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-tpopsp.adb<s-tpopsp-tls.adb \
+  a-intnam.ads<libgnarl/a-intnam-linux.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 \
+  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 \
-  a-exetim.adb<a-exetim-posix.adb \
-  a-exetim.ads<a-exetim-default.ads \
-  s-linux.ads<s-linux.ads \
-  s-osinte.adb<s-osinte-posix.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
 
@@ -1121,13 +1121,13 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   endif
 
   LIBGNAT_TARGET_PAIRS += \
-  s-mudido.adb<s-mudido-affinity.adb \
-  s-osinte.ads<s-osinte-linux.ads \
+  s-mudido.adb<libgnarl/s-mudido-affinity.adb \
+  s-osinte.ads<libgnarl/s-osinte-linux.ads \
   s-osprim.adb<s-osprim-posix.adb \
-  s-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-taspri.ads<s-taspri-posix.ads
+  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
 
   EH_MECHANISM=-gcc
   THREADSLIB = -lpthread -lrt
@@ -1146,15 +1146,15 @@ endif
 # x86 kfreebsd
 ifeq ($(strip $(filter-out %86 kfreebsd%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-freebsd.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-osinte.adb<s-osinte-posix.adb \
+  a-intnam.ads<libgnarl/a-intnam-freebsd.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<s-osinte-kfreebsd-gnu.ads \
-  s-osprim.adb<s-osprim-posix.adb \
-  s-taprop.adb<s-taprop-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  s-osprim.adb<libgnarl/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
@@ -1174,15 +1174,15 @@ endif
 # i[3456]86-pc-gnu i.e. GNU Hurd
 ifeq ($(strip $(filter-out %86 pc gnu,$(target_cpu) $(target_vendor) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-freebsd.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-osinte.adb<s-osinte-gnu.adb \
-  s-osinte.ads<s-osinte-gnu.ads \
+  a-intnam.ads<libgnarl/a-intnam-freebsd.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  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-taprop.adb<s-taprop-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.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
@@ -1202,17 +1202,17 @@ endif
 
 ifeq ($(strip $(filter-out x86_64 kfreebsd%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-freebsd.ads \
+  a-intnam.ads<libgnarl/a-intnam-freebsd.ads \
   a-numaux.adb<a-numaux-x86.adb \
   a-numaux.ads<a-numaux-x86.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-osinte.adb<s-osinte-posix.adb \
-  s-osinte.ads<s-osinte-kfreebsd-gnu.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-taprop.adb<s-taprop-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.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
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
@@ -1227,16 +1227,16 @@ endif
 # aarch64 FreeBSD
 ifeq ($(strip $(filter-out %aarch64 freebsd%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-freebsd.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-mudido.adb<s-mudido-affinity.adb \
-  s-osinte.adb<s-osinte-freebsd.adb \
-  s-osinte.ads<s-osinte-freebsd.ads \
+  a-intnam.ads<libgnarl/a-intnam-freebsd.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  s-intman.adb<libgnarl/s-intman-posix.adb \
+  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-taprop.adb<s-taprop-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-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
@@ -1255,16 +1255,16 @@ endif
 # x86 FreeBSD
 ifeq ($(strip $(filter-out %86 freebsd%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-freebsd.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-mudido.adb<s-mudido-affinity.adb \
-  s-osinte.adb<s-osinte-freebsd.adb \
-  s-osinte.ads<s-osinte-freebsd.ads \
+  a-intnam.ads<libgnarl/a-intnam-freebsd.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  s-intman.adb<libgnarl/s-intman-posix.adb \
+  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-taprop.adb<s-taprop-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-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
@@ -1283,16 +1283,16 @@ endif
 # x86-64 FreeBSD
 ifeq ($(strip $(filter-out %86_64 freebsd%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-freebsd.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-mudido.adb<s-mudido-affinity.adb \
-  s-osinte.adb<s-osinte-freebsd.adb \
-  s-osinte.ads<s-osinte-freebsd.ads \
+  a-intnam.ads<libgnarl/a-intnam-freebsd.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  s-intman.adb<libgnarl/s-intman-posix.adb \
+  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-taprop.adb<s-taprop-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-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
@@ -1311,16 +1311,16 @@ endif
 # x86-64 DragonFly
 ifeq ($(strip $(filter-out %86_64 dragonfly%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-dragonfly.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-mudido.adb<s-mudido-affinity.adb \
-  s-osinte.adb<s-osinte-dragonfly.adb \
-  s-osinte.ads<s-osinte-dragonfly.ads \
+  a-intnam.ads<libgnarl/a-intnam-dragonfly.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  s-intman.adb<libgnarl/s-intman-posix.adb \
+  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-taprop.adb<s-taprop-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-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
@@ -1341,18 +1341,18 @@ endif
 # S390 Linux
 ifeq ($(strip $(filter-out s390% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-linux.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-linux.ads<s-linux.ads \
-  s-osinte.adb<s-osinte-posix.adb \
-  s-osinte.ads<s-osinte-linux.ads \
+  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<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-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-taspri.ads<s-taspri-posix-noaltstack.ads \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.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
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
@@ -1368,17 +1368,17 @@ endif
 ifeq ($(strip $(filter-out hppa% hp hpux10%,$(target_cpu) $(target_vendor) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
   a-excpol.adb<a-excpol-abort.adb \
-  a-intnam.ads<a-intnam-hpux.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-interr.adb<s-interr-sigaction.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-osinte.adb<s-osinte-hpux-dce.adb \
-  s-osinte.ads<s-osinte-hpux-dce.ads \
+  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-taprop.adb<s-taprop-hpux-dce.adb \
-  s-taspri.ads<s-taspri-hpux-dce.ads \
-  s-tpopsp.adb<s-tpopsp-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
 
   EH_MECHANISM=-gcc
@@ -1387,17 +1387,17 @@ endif
 # HP/PA HP-UX 11
 ifeq ($(strip $(filter-out hppa% hp hpux11%,$(target_cpu) $(target_vendor) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-hpux.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-osinte.adb<s-osinte-posix.adb \
-  s-osinte.ads<s-osinte-hpux.ads \
+  a-intnam.ads<libgnarl/a-intnam-hpux.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-hpux.ads \
   s-parame.ads<s-parame-hpux.ads \
   s-osprim.adb<s-osprim-posix.adb \
   s-traceb.adb<s-traceb-hpux.adb \
-  s-taprop.adb<s-taprop-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.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
 
   EH_MECHANISM=-gcc
@@ -1413,15 +1413,15 @@ endif
 # IBM AIX
 ifeq ($(strip $(filter-out ibm aix%,$(target_vendor) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-aix.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-osinte.adb<s-osinte-aix.adb \
-  s-osinte.ads<s-osinte-aix.ads \
+  a-intnam.ads<libgnarl/a-intnam-aix.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  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-taprop.adb<s-taprop-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-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
@@ -1446,17 +1446,17 @@ ifeq ($(strip $(filter-out rtems%,$(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
   system.ads<system-rtems.ads \
   a-intnam.ads<a-intnam-rtems.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-osinte.adb<s-osinte-rtems.adb \
-  s-osinte.ads<s-osinte-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-taprop.adb<s-taprop-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
+  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-interr.adb<s-interr-hwint.adb
+  s-interr.adb<libgnarl/s-interr-hwint.adb
 endif
 
 # PikeOS
@@ -1473,13 +1473,13 @@ ifeq ($(strip $(filter-out %djgpp,$(target_os))),)
   GNATRTL_SOCKETS_OBJS =
 
   LIBGNAT_TARGET_PAIRS = \
-	a-intnam.ads<a-intnam-dummy.ads \
-	s-inmaop.adb<s-inmaop-dummy.adb \
-	s-intman.adb<s-intman-dummy.adb \
-	s-osinte.ads<s-osinte-dummy.ads \
+	a-intnam.ads<libgnarl/a-intnam-dummy.ads \
+	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-taprop.adb<s-taprop-dummy.adb \
-	s-taspri.ads<s-taspri-dummy.ads \
+	s-taprop.adb<libgnarl/s-taprop-dummy.adb \
+	s-taspri.ads<libgnarl/s-taspri-dummy.ads \
 	system.ads<system-djgpp.ads \
 	$(DUMMY_SOCKETS_TARGET_PAIRS)
 
@@ -1509,26 +1509,27 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(target_os))),)
   a-dirval.adb<a-dirval-mingw.adb \
   a-excpol.adb<a-excpol-abort.adb \
   s-gloloc.adb<s-gloloc-mingw.adb \
-  s-inmaop.adb<s-inmaop-dummy.adb \
-  s-taspri.ads<s-taspri-mingw.ads \
-  s-tasinf.adb<s-tasinf-mingw.adb \
-  s-tasinf.ads<s-tasinf-mingw.ads \
+  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 \
   $(ATOMICS_TARGET_PAIRS) \
   system.ads<system-mingw.ads
 
   LIBGNAT_TARGET_PAIRS += \
-  a-exetim.adb<a-exetim-mingw.adb \
-  a-exetim.ads<a-exetim-mingw.ads \
-  a-intnam.ads<a-intnam-mingw.ads \
+  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-interr.adb<s-interr-sigaction.adb \
-  s-intman.adb<s-intman-mingw.adb \
-  s-mudido.adb<s-mudido-affinity.adb \
-  s-osinte.ads<s-osinte-mingw.ads \
+  s-tsmona.adb<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-taprop.adb<s-taprop-mingw.adb
+  s-taprop.adb<libgnarl/s-taprop-mingw.adb
 
   ifeq ($(strip $(filter-out x86_64%,$(target_cpu))),)
     ifeq ($(strip $(MULTISUBDIR)),/32)
@@ -1572,18 +1573,18 @@ endif
 # Mips Linux
 ifeq ($(strip $(filter-out mips% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-linux.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-linux.ads<s-linux-mips.ads \
-  s-osinte.adb<s-osinte-posix.adb \
-  s-osinte.ads<s-osinte-linux.ads \
+  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<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-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-taspri.ads<s-taspri-posix-noaltstack.ads \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.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
 
@@ -1600,16 +1601,16 @@ endif
 # PowerPC and e500v2 Linux
 ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS_COMMON = \
-  a-exetim.adb<a-exetim-posix.adb \
-  a-exetim.ads<a-exetim-default.ads \
-  a-intnam.ads<a-intnam-linux.ads \
-  a-synbar.adb<a-synbar-posix.adb \
-  a-synbar.ads<a-synbar-posix.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-linux.ads<s-linux.ads \
-  s-osinte.adb<s-osinte-posix.adb \
-  s-tpopsp.adb<s-tpopsp-tls.adb \
+  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-synbar.adb<libgnarl/a-synbar-posix.adb \
+  a-synbar.ads<libgnarl/a-synbar-posix.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  s-intman.adb<libgnarl/s-intman-posix.adb \
+  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 \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
@@ -1617,13 +1618,13 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
 
   LIBGNAT_TARGET_PAIRS = \
     $(LIBGNAT_TARGET_PAIRS_COMMON) \
-    s-mudido.adb<s-mudido-affinity.adb \
-    s-osinte.ads<s-osinte-linux.ads \
+    s-mudido.adb<libgnarl/s-mudido-affinity.adb \
+    s-osinte.ads<libgnarl/s-osinte-linux.ads \
     s-osprim.adb<s-osprim-posix.adb \
-    s-taprop.adb<s-taprop-linux.adb \
-    s-tasinf.ads<s-tasinf-linux.ads \
-    s-tasinf.adb<s-tasinf-linux.adb \
-    s-taspri.ads<s-taspri-posix-noaltstack.ads
+    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
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
@@ -1639,18 +1640,18 @@ endif
 # ARM linux, GNU eabi
 ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-linux.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-linux.ads<s-linux.ads \
-  s-osinte.adb<s-osinte-posix.adb \
-  s-osinte.ads<s-osinte-linux.ads \
+  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<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-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-taspri.ads<s-taspri-posix-noaltstack.ads \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.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 \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<system-linux-arm.ads
@@ -1673,23 +1674,23 @@ endif
 # AArch64 Linux
 ifeq ($(strip $(filter-out aarch64% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-exetim.adb<a-exetim-posix.adb \
-  a-exetim.ads<a-exetim-default.ads \
-  a-intnam.ads<a-intnam-linux.ads \
-  a-synbar.adb<a-synbar-posix.adb \
-  a-synbar.ads<a-synbar-posix.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-linux.ads<s-linux.ads \
-  s-mudido.adb<s-mudido-affinity.adb \
-  s-osinte.ads<s-osinte-linux.ads \
-  s-osinte.adb<s-osinte-posix.adb \
+  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-synbar.adb<libgnarl/a-synbar-posix.adb \
+  a-synbar.ads<libgnarl/a-synbar-posix.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  s-intman.adb<libgnarl/s-intman-posix.adb \
+  s-linux.ads<libgnarl/s-linux.ads \
+  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-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-tpopsp.adb<s-tpopsp-tls.adb \
-  s-taspri.ads<s-taspri-posix.ads \
+  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 \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
@@ -1708,18 +1709,18 @@ endif
 # Sparc Linux
 ifeq ($(strip $(filter-out sparc% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-linux.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-linux.ads<s-linux-sparc.ads \
-  s-osinte.adb<s-osinte-posix.adb \
-  s-osinte.ads<s-osinte-linux.ads \
+  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<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-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-taspri.ads<s-taspri-posix-noaltstack.ads \
-  s-tpopsp.adb<s-tpopsp-tls.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
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
@@ -1735,18 +1736,18 @@ endif
 # HP/PA Linux
 ifeq ($(strip $(filter-out hppa% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-linux.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-linux.ads<s-linux-hppa.ads \
-  s-osinte.adb<s-osinte-posix.adb \
-  s-osinte.ads<s-osinte-linux.ads \
+  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<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-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-taspri.ads<s-taspri-posix-noaltstack.ads \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.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
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
@@ -1762,18 +1763,18 @@ endif
 # M68K Linux
 ifeq ($(strip $(filter-out m68k% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-linux.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
+  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-osinte.adb<s-osinte-posix.adb \
-  s-osinte.ads<s-osinte-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-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-taspri.ads<s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.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
 
   TOOLS_TARGET_PAIRS =  \
@@ -1791,18 +1792,18 @@ endif
 # SH4 Linux
 ifeq ($(strip $(filter-out sh4% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-linux.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-linux.ads<s-linux.ads \
-  s-osinte.adb<s-osinte-posix.adb \
-  s-osinte.ads<s-osinte-linux.ads \
+  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<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-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-taspri.ads<s-taspri-posix-noaltstack.ads \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.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
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-linux.adb
@@ -1819,24 +1820,24 @@ endif
 # IA64 Linux
 ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-exetim.adb<a-exetim-posix.adb \
-  a-exetim.ads<a-exetim-default.ads \
-  a-intnam.ads<a-intnam-linux.ads \
+  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-synbar.adb<a-synbar-posix.adb \
-  a-synbar.ads<a-synbar-posix.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-linux.ads<s-linux.ads \
-  s-mudido.adb<s-mudido-affinity.adb \
-  s-osinte.ads<s-osinte-linux.ads \
-  s-osinte.adb<s-osinte-posix.adb \
+  a-synbar.adb<libgnarl/a-synbar-posix.adb \
+  a-synbar.ads<libgnarl/a-synbar-posix.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  s-intman.adb<libgnarl/s-intman-posix.adb \
+  s-linux.ads<libgnarl/s-linux.ads \
+  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-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-tpopsp.adb<s-tpopsp-tls.adb \
-  s-taspri.ads<s-taspri-posix-noaltstack.ads \
+  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 \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
@@ -1856,15 +1857,15 @@ endif
 # IA64 HP-UX
 ifeq ($(strip $(filter-out ia64% hp hpux%,$(target_cpu) $(target_vendor) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-hpux.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-osinte.adb<s-osinte-posix.adb \
-  s-osinte.ads<s-osinte-hpux.ads \
+  a-intnam.ads<libgnarl/a-intnam-hpux.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-hpux.ads \
   s-osprim.adb<s-osprim-posix.adb \
-  s-taprop.adb<s-taprop-posix.adb \
-  s-taspri.ads<s-taspri-posix.ads \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.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
@@ -1882,18 +1883,18 @@ endif
 # Alpha Linux
 ifeq ($(strip $(filter-out alpha% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<a-intnam-linux.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-linux.ads<s-linux-alpha.ads \
-  s-osinte.ads<s-osinte-linux.ads \
-  s-osinte.adb<s-osinte-posix.adb \
+  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<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-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
-  s-taspri.ads<s-taspri-posix-noaltstack.ads \
+  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-posix-foreign.adb \
+  s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<system-linux-alpha.ads
@@ -1911,23 +1912,23 @@ endif
 # x86-64 Linux
 ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-exetim.adb<a-exetim-posix.adb \
-  a-exetim.ads<a-exetim-default.ads \
-  a-intnam.ads<a-intnam-linux.ads \
-  a-synbar.adb<a-synbar-posix.adb \
-  a-synbar.ads<a-synbar-posix.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-linux.ads<s-linux.ads \
-  s-mudido.adb<s-mudido-affinity.adb \
-  s-osinte.ads<s-osinte-linux.ads \
-  s-osinte.adb<s-osinte-posix.adb \
+  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-synbar.adb<libgnarl/a-synbar-posix.adb \
+  a-synbar.ads<libgnarl/a-synbar-posix.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  s-intman.adb<libgnarl/s-intman-posix.adb \
+  s-linux.ads<libgnarl/s-linux.ads \
+  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-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-tpopsp.adb<s-tpopsp-tls.adb \
-  s-taspri.ads<s-taspri-posix.ads \
+  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 \
   $(TRASYM_DWARF_UNIX_PAIRS) \
   s-tsmona.adb<s-tsmona-linux.adb \
@@ -1951,23 +1952,23 @@ endif
 
 ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-exetim.adb<a-exetim-posix.adb \
-  a-exetim.ads<a-exetim-default.ads \
-  a-intnam.ads<a-intnam-linux.ads \
-  a-synbar.adb<a-synbar-posix.adb \
-  a-synbar.ads<a-synbar-posix.ads \
-  s-inmaop.adb<s-inmaop-posix.adb \
-  s-intman.adb<s-intman-posix.adb \
-  s-linux.ads<s-linux-x32.ads \
-  s-mudido.adb<s-mudido-affinity.adb \
-  s-osinte.ads<s-osinte-linux.ads \
-  s-osinte.adb<s-osinte-x32.adb \
+  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-synbar.adb<libgnarl/a-synbar-posix.adb \
+  a-synbar.ads<libgnarl/a-synbar-posix.ads \
+  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+  s-intman.adb<libgnarl/s-intman-posix.adb \
+  s-linux.ads<libgnarl/s-linux-x32.ads \
+  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-taprop.adb<s-taprop-linux.adb \
-  s-tasinf.ads<s-tasinf-linux.ads \
-  s-tasinf.adb<s-tasinf-linux.adb \
-  s-tpopsp.adb<s-tpopsp-tls.adb \
-  s-taspri.ads<s-taspri-posix.ads \
+  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 \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
@@ -1988,18 +1989,18 @@ endif
 ifeq ($(strip $(filter-out darwin%,$(target_os))),)
   SO_OPTS = -shared-libgcc
   LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<a-intnam-darwin.ads \
-    s-inmaop.adb<s-inmaop-posix.adb \
-    s-osinte.adb<s-osinte-darwin.adb \
-    s-osinte.ads<s-osinte-darwin.ads \
-    s-taprop.adb<s-taprop-posix.adb \
-    s-taspri.ads<s-taspri-posix.ads \
+    a-intnam.ads<libgnarl/a-intnam-darwin.ads \
+    s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
+    s-osinte.adb<libgnarl/s-osinte-darwin.adb \
+    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 \
-    s-tpopsp.adb<s-tpopsp-posix-foreign.adb
+    s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb
 
   ifeq ($(strip $(filter-out %86,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
-      s-intman.adb<s-intman-susv3.adb \
+      s-intman.adb<libgnarl/s-intman-susv3.adb \
       s-osprim.adb<s-osprim-darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       system.ads<system-darwin-x86.ads
@@ -2016,10 +2017,10 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),)
 
   ifeq ($(strip $(filter-out %x86_64,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
-      s-intman.adb<s-intman-susv3.adb \
+      s-intman.adb<libgnarl/s-intman-susv3.adb \
       s-osprim.adb<s-osprim-darwin.adb \
-      a-exetim.ads<a-exetim-default.ads \
-      a-exetim.adb<a-exetim-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
 
@@ -2036,7 +2037,7 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),)
 
   ifeq ($(strip $(filter-out powerpc%,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
-      s-intman.adb<s-intman-posix.adb \
+      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 \
@@ -2051,7 +2052,7 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),)
 
   ifeq ($(strip $(filter-out arm,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
-      s-intman.adb<s-intman-susv3.adb \
+      s-intman.adb<libgnarl/s-intman-susv3.adb \
       s-osprim.adb<s-osprim-darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       $(ATOMICS_BUILTINS_TARGET_PAIRS)
@@ -2062,7 +2063,7 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),)
 
   ifeq ($(strip $(filter-out arm64 aarch64,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
-      s-intman.adb<s-intman-susv3.adb \
+      s-intman.adb<libgnarl/s-intman-susv3.adb \
       s-osprim.adb<s-osprim-darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       $(ATOMICS_BUILTINS_TARGET_PAIRS)
@@ -2125,7 +2126,7 @@ LIBGNAT_OBJS = adadecode.o adaint.o argv.o aux-io.o 			\
 
 LIBGNAT_SRCS = $(patsubst %.o,%.c,$(LIBGNAT_OBJS))			\
   adadecode.h adaint.h env.h gsocket.h raise.h standard.ads.h		\
-  tb-gcc.c thread.c $(EXTRA_LIBGNAT_SRCS)
+  tb-gcc.c libgnarl/thread.c $(EXTRA_LIBGNAT_SRCS)
 
 # GNATRTL_NONTASKING_OBJS and GNATRTL_TASKING_OBJS can be found in
 # the following include file:
@@ -2142,8 +2143,8 @@ ADA_INCLUDE_SRCS =\
  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 libgnarl/*.ads \
- libgnarl/*.adb
+ s-[a-o]*.adb s-[p-z]*.adb s-[a-o]*.ads s-[p-z]*.ads \
+ libgnarl/[agis]-[a-z]*.ad[sb]
 
 # Files that are in ADA_INCLUDE_SRCS but not in all configurations.
 # They will be removed from the run time if not used.