libgnat: Rename ?-[a-z]*-* into ?-[a-z]*__*

2017-09-11  Jerome Lambourg  <lambourg@adacore.com>

        * libgnat: Rename ?-[a-z]*-* into ?-[a-z]*__*
        * gcc-interface/Makefile.in, gcc-interface/Make-lang.in: Take this
	renaming into account.

From-SVN: r251968

85 files changed, 435 insertions, 140 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 93d9f6a..84608b3 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2017-09-11  Yannick Moy  <moy@adacore.com>
+
+	* lib-xref-spark_specific.adb: Minor rewrite.
+
+2017-09-11  Jerome Lambourg  <lambourg@adacore.com>
+
+        * libgnat: Rename ?-[a-z]*-* into ?-[a-z]*__*
+        * gcc-interface/Makefile.in, gcc-interface/Make-lang.in: Take this
+	renaming into account.
+
 2017-09-11  Jerome Lambourg  <lambourg@adacore.com>
 
 	* libgnarl: Rename ?-[a-z]*-* into ?-[a-z]*__*
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index b9d06b0..6582695 100644
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -636,11 +636,11 @@ CFLAGS-ada/raise-gcc.o += -I$(srcdir)/../libgcc -DEH_MECHANISM_$(EH_MECHANISM)
 
 ada/libgnat/s-excmac.o: ada/libgnat/s-excmac.ads ada/libgnat/s-excmac.adb
 
-ada/libgnat/s-excmac.ads: $(srcdir)/ada/libgnat/s-excmac-$(EH_MECHANISM).ads
+ada/libgnat/s-excmac.ads: $(srcdir)/ada/libgnat/s-excmac__$(EH_MECHANISM).ads
 	mkdir -p ada/libgnat
 	$(CP) $< $@
 
-ada/libgnat/s-excmac.adb: $(srcdir)/ada/libgnat/s-excmac-$(EH_MECHANISM).adb
+ada/libgnat/s-excmac.adb: $(srcdir)/ada/libgnat/s-excmac__$(EH_MECHANISM).adb
 	mkdir -p ada/libgnat
 	$(CP) $< $@
 
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index d30028d..c05395a 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -359,7 +359,7 @@ 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<libgnat/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 @@ GNATRTL_SOCKETS_OBJS = g-soccon$(objext) g-socket$(objext) g-socthi$(objext) \
   g-soliop$(objext) g-sothco$(objext)
 
 DUMMY_SOCKETS_TARGET_PAIRS = \
-  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
+  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<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
+  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<libgnat/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<libgnat/a-numaux-x86.ads \
-  a-numaux.adb<libgnat/a-numaux-x86.adb \
-  s-atocou.adb<libgnat/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<libgnat/a-numaux-x86.ads \
-  a-numaux.adb<libgnat/a-numaux-x86.adb \
-  s-atocou.adb<libgnat/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<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
+  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<libgnat/s-trasym-dwarf.adb \
-  s-mmosin.ads<libgnat/s-mmosin-mingw.ads \
-  s-mmosin.adb<libgnat/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 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworksspe vxworks7 vxworks7spe,
 
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<libgnarl/a-intnam__vxworks.ads \
-  a-numaux.ads<libgnat/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<libgnat/s-osprim-vxworks.adb \
-  s-parame.ads<libgnat/s-parame-vxworks.ads \
-  s-parame.adb<libgnat/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<libgnat/g-socthi-vxworks.ads \
-  g-socthi.adb<libgnat/g-socthi-vxworks.adb \
-  g-stsifd.adb<libgnat/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 powerpc% wrs vxworks vxworksspe vxworks7 vxworks7spe,
 
   ifeq ($(strip $(filter-out default,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS += \
-      s-stchop.ads<libgnat/s-stchop-limit.ads \
-      s-stchop.adb<libgnat/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
 
@@ -627,32 +627,32 @@ ifeq ($(strip $(filter-out %86 x86_64 wrs vxworks vxworks7,$(target_cpu) $(targe
 
   ifeq ($(strip $(filter-out x86_64, $(target_cpu))),)
      X86CPU=x86_64
-     LIBGNAT_TARGET_PAIRS=s-atocou.adb<libgnat/s-atocou-builtin.adb
+     LIBGNAT_TARGET_PAIRS=s-atocou.adb<libgnat/s-atocou__builtin.adb
   else
      X86CPU=x86
-     LIBGNAT_TARGET_PAIRS=s-atocou.adb<libgnat/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<libgnat/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<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-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<libgnat/g-socthi-vxworks.ads \
-  g-socthi.adb<libgnat/g-socthi-vxworks.adb \
-  g-stsifd.adb<libgnat/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) \
@@ -782,25 +782,25 @@ ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(ta
 
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<libgnarl/a-intnam__vxworks.ads \
-  a-numaux.ads<libgnat/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<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-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<libgnat/g-socthi-vxworks.ads \
-  g-socthi.adb<libgnat/g-socthi-vxworks.adb \
-  g-stsifd.adb<libgnat/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
 
@@ -872,7 +872,7 @@ ifeq ($(strip $(filter-out arm% linux-androideabi,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -900,13 +900,13 @@ ifeq ($(strip $(filter-out sparc% sun solaris%,$(target_cpu) $(target_vendor) $(
   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<libgnat/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<libgnat/g-soliop-solaris.ads \
+  g-soliop.ads<libgnat/g-soliop__solaris.ads \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-solaris-sparc.ads
@@ -933,13 +933,13 @@ ifeq ($(strip $(filter-out %86 %x86_64 solaris2%,$(target_cpu) $(target_os))),)
   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<libgnat/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<libgnat/g-soliop-solaris.ads \
+  g-soliop.ads<libgnat/g-soliop__solaris.ads \
   $(ATOMICS_TARGET_PAIRS) \
   system.ads<libgnat/system-solaris-x86.ads
 
@@ -982,8 +982,8 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   s-intman.adb<libgnarl/s-intman__posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
-  g-sercom.adb<libgnat/g-sercom-linux.adb \
-  s-tsmona.adb<libgnat/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 \
@@ -1000,7 +1000,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS += \
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
-  s-osprim.adb<libgnat/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 \
@@ -1028,7 +1028,7 @@ ifeq ($(strip $(filter-out %86 kfreebsd%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1056,7 +1056,7 @@ ifeq ($(strip $(filter-out %86 pc gnu,$(target_cpu) $(target_vendor) $(target_os
   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<libgnat/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 \
@@ -1078,13 +1078,13 @@ endif
 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<libgnat/a-numaux-x86.adb \
-  a-numaux.ads<libgnat/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<libgnat/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 \
@@ -1108,7 +1108,7 @@ ifeq ($(strip $(filter-out %aarch64 freebsd%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1134,7 +1134,7 @@ ifeq ($(strip $(filter-out %86 freebsd%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1162,7 +1162,7 @@ ifeq ($(strip $(filter-out %86_64 freebsd%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1190,7 +1190,7 @@ ifeq ($(strip $(filter-out %86_64 dragonfly%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1218,7 +1218,7 @@ ifeq ($(strip $(filter-out s390% linux%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1238,15 +1238,15 @@ endif
 # HP/PA HP-UX 10
 ifeq ($(strip $(filter-out hppa% hp hpux10%,$(target_cpu) $(target_vendor) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-excpol.adb<libgnat/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<libgnat/s-parame-hpux.ads \
-  s-osprim.adb<libgnat/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 \
@@ -1263,9 +1263,9 @@ ifeq ($(strip $(filter-out hppa% hp hpux11%,$(target_cpu) $(target_vendor) $(tar
   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<libgnat/s-parame-hpux.ads \
-  s-osprim.adb<libgnat/s-osprim-posix.adb \
-  s-traceb.adb<libgnat/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 \
@@ -1289,7 +1289,7 @@ ifeq ($(strip $(filter-out ibm aix%,$(target_vendor) $(target_os))),)
   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<libgnat/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 \
@@ -1321,8 +1321,8 @@ ifeq ($(strip $(filter-out rtems%,$(target_os))),)
   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<libgnat/s-osprim-posix.adb \
-  s-parame.adb<libgnat/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<libgnarl/s-tpopsp__tls.adb \
@@ -1348,7 +1348,7 @@ ifeq ($(strip $(filter-out %djgpp,$(target_os))),)
 	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<libgnat/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<libgnat/system-djgpp.ads \
@@ -1372,20 +1372,20 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(target_os))),)
     g-socthi.adb<libgnat/g-socthi.adb
   else
     LIBGNAT_TARGET_PAIRS = \
-    s-memory.adb<libgnat/s-memory-mingw.adb \
-    g-socthi.ads<libgnat/g-socthi-mingw.ads \
-    g-socthi.adb<libgnat/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<libgnat/a-dirval-mingw.adb \
-  a-excpol.adb<libgnat/a-excpol-abort.adb \
-  s-gloloc.adb<libgnat/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<libgnat/g-stsifd-sockets.adb \
-  g-soliop.ads<libgnat/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<libgnat/system-mingw.ads
 
@@ -1393,13 +1393,13 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(target_os))),)
   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<libgnat/g-sercom-mingw.adb \
-  s-tsmona.adb<libgnat/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<libgnat/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))),)
@@ -1450,13 +1450,13 @@ ifeq ($(strip $(filter-out mips% linux%,$(target_cpu) $(target_os))),)
   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<libgnat/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<libgnat/g-sercom-linux.adb \
+  g-sercom.adb<libgnat/g-sercom__linux.adb \
   system.ads<libgnat/system-linux-mips.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
@@ -1482,7 +1482,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
   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<libgnat/g-sercom-linux.adb \
+  g-sercom.adb<libgnat/g-sercom__linux.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
@@ -1491,7 +1491,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
     $(LIBGNAT_TARGET_PAIRS_COMMON) \
     s-mudido.adb<libgnarl/s-mudido__affinity.adb \
     s-osinte.ads<libgnarl/s-osinte__linux.ads \
-    s-osprim.adb<libgnat/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 \
@@ -1517,7 +1517,7 @@ ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1556,13 +1556,13 @@ ifeq ($(strip $(filter-out aarch64% linux%,$(target_cpu) $(target_os))),)
   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<libgnat/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<libgnat/g-sercom-linux.adb \
+  g-sercom.adb<libgnat/g-sercom__linux.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-arm.ads
@@ -1586,7 +1586,7 @@ ifeq ($(strip $(filter-out sparc% linux%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1613,7 +1613,7 @@ ifeq ($(strip $(filter-out hppa% linux%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1640,7 +1640,7 @@ ifeq ($(strip $(filter-out m68k% linux%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1667,7 +1667,7 @@ ifeq ($(strip $(filter-out sh4% linux%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1692,7 +1692,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1701,13 +1701,13 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   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<libgnat/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<libgnat/g-sercom-linux.adb \
+  g-sercom.adb<libgnat/g-sercom__linux.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ia64.ads
@@ -1731,7 +1731,7 @@ ifeq ($(strip $(filter-out ia64% hp hpux%,$(target_cpu) $(target_vendor) $(targe
   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<libgnat/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 \
@@ -1758,7 +1758,7 @@ ifeq ($(strip $(filter-out alpha% linux%,$(target_cpu) $(target_os))),)
   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<libgnat/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 \
@@ -1792,15 +1792,15 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   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<libgnat/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<libgnat/g-sercom-linux.adb \
+  g-sercom.adb<libgnat/g-sercom__linux.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona-linux.adb \
+  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-x86.ads
@@ -1832,13 +1832,13 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
   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<libgnat/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<libgnat/g-sercom-linux.adb \
+  g-sercom.adb<libgnat/g-sercom__linux.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-x86.ads
@@ -1864,13 +1864,13 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),)
     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<libgnat/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<libgnat/s-osprim-darwin.adb \
+      s-osprim.adb<libgnat/s-osprim__darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       system.ads<libgnat/system-darwin-x86.ads
 
@@ -1887,7 +1887,7 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),)
   ifeq ($(strip $(filter-out %x86_64,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
       s-intman.adb<libgnarl/s-intman__susv3.adb \
-      s-osprim.adb<libgnat/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) \
@@ -1907,9 +1907,9 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),)
   ifeq ($(strip $(filter-out powerpc%,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
       s-intman.adb<libgnarl/s-intman__posix.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 \
+      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<libgnat/system-darwin-ppc.ads
@@ -1922,7 +1922,7 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),)
   ifeq ($(strip $(filter-out arm,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
       s-intman.adb<libgnarl/s-intman__susv3.adb \
-      s-osprim.adb<libgnat/s-osprim-darwin.adb \
+      s-osprim.adb<libgnat/s-osprim__darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       $(ATOMICS_BUILTINS_TARGET_PAIRS)
 
@@ -1933,7 +1933,7 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),)
   ifeq ($(strip $(filter-out arm64 aarch64,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
       s-intman.adb<libgnarl/s-intman__susv3.adb \
-      s-osprim.adb<libgnat/s-osprim-darwin.adb \
+      s-osprim.adb<libgnat/s-osprim__darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       $(ATOMICS_BUILTINS_TARGET_PAIRS)
 
@@ -1955,16 +1955,16 @@ endif
 
 ifeq ($(EH_MECHANISM),-gcc)
   LIBGNAT_TARGET_PAIRS += \
-    s-excmac.ads<libgnat/s-excmac-gcc.ads \
-    s-excmac.adb<libgnat/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<libgnat/s-excmac-arm.ads \
-    s-excmac.adb<libgnat/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
@@ -2282,9 +2282,9 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR) install-gcc-specs
 # Remove files to be replaced by target dependent sources
 	$(RM) $(foreach PAIR,$(LIBGNAT_TARGET_PAIRS), \
 	                $(RTSDIR)/$(word 1,$(subst <, ,$(PAIR))))
-	for f in $(RTSDIR)/*-*-*.ads $(RTSDIR)/*-*-*.adb; do \
+	for f in $(RTSDIR)/*-*__*.ads $(RTSDIR)/*-*__*.adb; do \
 	  case "$$f" in \
-	    $(RTSDIR)/s-stratt-*) ;; \
+	    $(RTSDIR)/s-stratt__*) ;; \
 	    *) $(RM) $$f ;; \
 	  esac; \
 	done
diff --git a/gcc/ada/libgnat/a-coinho-shared.adb b/gcc/ada/libgnat/a-coinho__shared.adb
index e4da421..e4da421 100644
--- a/gcc/ada/libgnat/a-coinho-shared.adb
+++ b/gcc/ada/libgnat/a-coinho__shared.adb
diff --git a/gcc/ada/libgnat/a-coinho-shared.ads b/gcc/ada/libgnat/a-coinho__shared.ads
index 3faab9b..3faab9b 100644
--- a/gcc/ada/libgnat/a-coinho-shared.ads
+++ b/gcc/ada/libgnat/a-coinho__shared.ads
diff --git a/gcc/ada/libgnat/a-dirval-mingw.adb b/gcc/ada/libgnat/a-dirval__mingw.adb
index b0a9cc3..b0a9cc3 100644
--- a/gcc/ada/libgnat/a-dirval-mingw.adb
+++ b/gcc/ada/libgnat/a-dirval__mingw.adb
diff --git a/gcc/ada/libgnat/a-elchha-vxworks-ppc-full.adb b/gcc/ada/libgnat/a-elchha__vxworks-ppc-full.adb
index 1b03a18..1b03a18 100644
--- a/gcc/ada/libgnat/a-elchha-vxworks-ppc-full.adb
+++ b/gcc/ada/libgnat/a-elchha__vxworks-ppc-full.adb
diff --git a/gcc/ada/libgnat/a-excpol-abort.adb b/gcc/ada/libgnat/a-excpol__abort.adb
index 8ed2e66..8ed2e66 100644
--- a/gcc/ada/libgnat/a-excpol-abort.adb
+++ b/gcc/ada/libgnat/a-excpol__abort.adb
diff --git a/gcc/ada/libgnat/a-numaux-darwin.adb b/gcc/ada/libgnat/a-numaux__darwin.adb
index 88e9e7c..88e9e7c 100644
--- a/gcc/ada/libgnat/a-numaux-darwin.adb
+++ b/gcc/ada/libgnat/a-numaux__darwin.adb
diff --git a/gcc/ada/libgnat/a-numaux-darwin.ads b/gcc/ada/libgnat/a-numaux__darwin.ads
index 5767f4d..5767f4d 100644
--- a/gcc/ada/libgnat/a-numaux-darwin.ads
+++ b/gcc/ada/libgnat/a-numaux__darwin.ads
diff --git a/gcc/ada/libgnat/a-numaux-libc-x86.ads b/gcc/ada/libgnat/a-numaux__libc-x86.ads
index e6adf21..e6adf21 100644
--- a/gcc/ada/libgnat/a-numaux-libc-x86.ads
+++ b/gcc/ada/libgnat/a-numaux__libc-x86.ads
diff --git a/gcc/ada/libgnat/a-numaux-vxworks.ads b/gcc/ada/libgnat/a-numaux__vxworks.ads
index 31f57c0..31f57c0 100644
--- a/gcc/ada/libgnat/a-numaux-vxworks.ads
+++ b/gcc/ada/libgnat/a-numaux__vxworks.ads
diff --git a/gcc/ada/libgnat/a-numaux-x86.adb b/gcc/ada/libgnat/a-numaux__x86.adb
index 303b729..303b729 100644
--- a/gcc/ada/libgnat/a-numaux-x86.adb
+++ b/gcc/ada/libgnat/a-numaux__x86.adb
diff --git a/gcc/ada/libgnat/a-numaux-x86.ads b/gcc/ada/libgnat/a-numaux__x86.ads
index 2002ccd..2002ccd 100644
--- a/gcc/ada/libgnat/a-numaux-x86.ads
+++ b/gcc/ada/libgnat/a-numaux__x86.ads
diff --git a/gcc/ada/libgnat/a-strunb-shared.adb b/gcc/ada/libgnat/a-strunb__shared.adb
index 4347c06..4347c06 100644
--- a/gcc/ada/libgnat/a-strunb-shared.adb
+++ b/gcc/ada/libgnat/a-strunb__shared.adb
diff --git a/gcc/ada/libgnat/a-strunb-shared.ads b/gcc/ada/libgnat/a-strunb__shared.ads
index 3efa51c..3efa51c 100644
--- a/gcc/ada/libgnat/a-strunb-shared.ads
+++ b/gcc/ada/libgnat/a-strunb__shared.ads
diff --git a/gcc/ada/libgnat/a-stunau-shared.adb b/gcc/ada/libgnat/a-stunau__shared.adb
index 583deed..583deed 100644
--- a/gcc/ada/libgnat/a-stunau-shared.adb
+++ b/gcc/ada/libgnat/a-stunau__shared.adb
diff --git a/gcc/ada/libgnat/a-stwiun-shared.adb b/gcc/ada/libgnat/a-stwiun__shared.adb
index 479e66a..479e66a 100644
--- a/gcc/ada/libgnat/a-stwiun-shared.adb
+++ b/gcc/ada/libgnat/a-stwiun__shared.adb
diff --git a/gcc/ada/libgnat/a-stwiun-shared.ads b/gcc/ada/libgnat/a-stwiun__shared.ads
index a913df4..a913df4 100644
--- a/gcc/ada/libgnat/a-stwiun-shared.ads
+++ b/gcc/ada/libgnat/a-stwiun__shared.ads
diff --git a/gcc/ada/libgnat/a-stzunb-shared.adb b/gcc/ada/libgnat/a-stzunb__shared.adb
index e8b2372..e8b2372 100644
--- a/gcc/ada/libgnat/a-stzunb-shared.adb
+++ b/gcc/ada/libgnat/a-stzunb__shared.adb
diff --git a/gcc/ada/libgnat/a-stzunb-shared.ads b/gcc/ada/libgnat/a-stzunb__shared.ads
index f1ad923..f1ad923 100644
--- a/gcc/ada/libgnat/a-stzunb-shared.ads
+++ b/gcc/ada/libgnat/a-stzunb__shared.ads
diff --git a/gcc/ada/libgnat/a-suteio-shared.adb b/gcc/ada/libgnat/a-suteio__shared.adb
index 13d537d..13d537d 100644
--- a/gcc/ada/libgnat/a-suteio-shared.adb
+++ b/gcc/ada/libgnat/a-suteio__shared.adb
diff --git a/gcc/ada/libgnat/a-swunau-shared.adb b/gcc/ada/libgnat/a-swunau__shared.adb
index c65f7d0..c65f7d0 100644
--- a/gcc/ada/libgnat/a-swunau-shared.adb
+++ b/gcc/ada/libgnat/a-swunau__shared.adb
diff --git a/gcc/ada/libgnat/a-swuwti-shared.adb b/gcc/ada/libgnat/a-swuwti__shared.adb
index 1b1c127..1b1c127 100644
--- a/gcc/ada/libgnat/a-swuwti-shared.adb
+++ b/gcc/ada/libgnat/a-swuwti__shared.adb
diff --git a/gcc/ada/libgnat/a-szunau-shared.adb b/gcc/ada/libgnat/a-szunau__shared.adb
index 51737e0..51737e0 100644
--- a/gcc/ada/libgnat/a-szunau-shared.adb
+++ b/gcc/ada/libgnat/a-szunau__shared.adb
diff --git a/gcc/ada/libgnat/a-szuzti-shared.adb b/gcc/ada/libgnat/a-szuzti__shared.adb
index d8807af..d8807af 100644
--- a/gcc/ada/libgnat/a-szuzti-shared.adb
+++ b/gcc/ada/libgnat/a-szuzti__shared.adb
diff --git a/gcc/ada/libgnat/g-alleve-hard.adb b/gcc/ada/libgnat/g-alleve__hard.adb
index 4819211..4819211 100644
--- a/gcc/ada/libgnat/g-alleve-hard.adb
+++ b/gcc/ada/libgnat/g-alleve__hard.adb
diff --git a/gcc/ada/libgnat/g-alleve-hard.ads b/gcc/ada/libgnat/g-alleve__hard.ads
index 63a0a67..63a0a67 100644
--- a/gcc/ada/libgnat/g-alleve-hard.ads
+++ b/gcc/ada/libgnat/g-alleve__hard.ads
diff --git a/gcc/ada/libgnat/g-io-put-vxworks.adb b/gcc/ada/libgnat/g-io__put-vxworks.adb
index 65ee8db..65ee8db 100644
--- a/gcc/ada/libgnat/g-io-put-vxworks.adb
+++ b/gcc/ada/libgnat/g-io__put-vxworks.adb
diff --git a/gcc/ada/libgnat/g-sercom-linux.adb b/gcc/ada/libgnat/g-sercom__linux.adb
index 78e629f..78e629f 100644
--- a/gcc/ada/libgnat/g-sercom-linux.adb
+++ b/gcc/ada/libgnat/g-sercom__linux.adb
diff --git a/gcc/ada/libgnat/g-sercom-mingw.adb b/gcc/ada/libgnat/g-sercom__mingw.adb
index ed78a52..ed78a52 100644
--- a/gcc/ada/libgnat/g-sercom-mingw.adb
+++ b/gcc/ada/libgnat/g-sercom__mingw.adb
diff --git a/gcc/ada/libgnat/g-socket-dummy.adb b/gcc/ada/libgnat/g-socket__dummy.adb
index 6cf2eab..6cf2eab 100644
--- a/gcc/ada/libgnat/g-socket-dummy.adb
+++ b/gcc/ada/libgnat/g-socket__dummy.adb
diff --git a/gcc/ada/libgnat/g-socket-dummy.ads b/gcc/ada/libgnat/g-socket__dummy.ads
index 18caed9..18caed9 100644
--- a/gcc/ada/libgnat/g-socket-dummy.ads
+++ b/gcc/ada/libgnat/g-socket__dummy.ads
diff --git a/gcc/ada/libgnat/g-socthi-dummy.adb b/gcc/ada/libgnat/g-socthi__dummy.adb
index 4ee3dfd..4ee3dfd 100644
--- a/gcc/ada/libgnat/g-socthi-dummy.adb
+++ b/gcc/ada/libgnat/g-socthi__dummy.adb
diff --git a/gcc/ada/libgnat/g-socthi-dummy.ads b/gcc/ada/libgnat/g-socthi__dummy.ads
index 53c49f4..53c49f4 100644
--- a/gcc/ada/libgnat/g-socthi-dummy.ads
+++ b/gcc/ada/libgnat/g-socthi__dummy.ads
diff --git a/gcc/ada/libgnat/g-socthi-mingw.adb b/gcc/ada/libgnat/g-socthi__mingw.adb
index e0cde85..e0cde85 100644
--- a/gcc/ada/libgnat/g-socthi-mingw.adb
+++ b/gcc/ada/libgnat/g-socthi__mingw.adb
diff --git a/gcc/ada/libgnat/g-socthi-mingw.ads b/gcc/ada/libgnat/g-socthi__mingw.ads
index 48f5aeb..48f5aeb 100644
--- a/gcc/ada/libgnat/g-socthi-mingw.ads
+++ b/gcc/ada/libgnat/g-socthi__mingw.ads
diff --git a/gcc/ada/libgnat/g-socthi-vxworks.adb b/gcc/ada/libgnat/g-socthi__vxworks.adb
index 05bedc2..05bedc2 100644
--- a/gcc/ada/libgnat/g-socthi-vxworks.adb
+++ b/gcc/ada/libgnat/g-socthi__vxworks.adb
diff --git a/gcc/ada/libgnat/g-socthi-vxworks.ads b/gcc/ada/libgnat/g-socthi__vxworks.ads
index 9cb4018..9cb4018 100644
--- a/gcc/ada/libgnat/g-socthi-vxworks.ads
+++ b/gcc/ada/libgnat/g-socthi__vxworks.ads
diff --git a/gcc/ada/libgnat/g-soliop-lynxos.ads b/gcc/ada/libgnat/g-soliop__lynxos.ads
index b514094..b514094 100644
--- a/gcc/ada/libgnat/g-soliop-lynxos.ads
+++ b/gcc/ada/libgnat/g-soliop__lynxos.ads
diff --git a/gcc/ada/libgnat/g-soliop-mingw.ads b/gcc/ada/libgnat/g-soliop__mingw.ads
index 25d5605..25d5605 100644
--- a/gcc/ada/libgnat/g-soliop-mingw.ads
+++ b/gcc/ada/libgnat/g-soliop__mingw.ads
diff --git a/gcc/ada/libgnat/g-soliop-solaris.ads b/gcc/ada/libgnat/g-soliop__solaris.ads
index 734a2bc..734a2bc 100644
--- a/gcc/ada/libgnat/g-soliop-solaris.ads
+++ b/gcc/ada/libgnat/g-soliop__solaris.ads
diff --git a/gcc/ada/libgnat/g-sothco-dummy.adb b/gcc/ada/libgnat/g-sothco__dummy.adb
index cd2ec9c..cd2ec9c 100644
--- a/gcc/ada/libgnat/g-sothco-dummy.adb
+++ b/gcc/ada/libgnat/g-sothco__dummy.adb
diff --git a/gcc/ada/libgnat/g-sothco-dummy.ads b/gcc/ada/libgnat/g-sothco__dummy.ads
index 2f17b6c..2f17b6c 100644
--- a/gcc/ada/libgnat/g-sothco-dummy.ads
+++ b/gcc/ada/libgnat/g-sothco__dummy.ads
diff --git a/gcc/ada/libgnat/g-stsifd-sockets.adb b/gcc/ada/libgnat/g-stsifd__sockets.adb
index e491e1a..e491e1a 100644
--- a/gcc/ada/libgnat/g-stsifd-sockets.adb
+++ b/gcc/ada/libgnat/g-stsifd__sockets.adb
diff --git a/gcc/ada/libgnat/i-vxwork-x86.ads b/gcc/ada/libgnat/i-vxwork__x86.ads
index ef515d5..ef515d5 100644
--- a/gcc/ada/libgnat/i-vxwork-x86.ads
+++ b/gcc/ada/libgnat/i-vxwork__x86.ads
diff --git a/gcc/ada/libgnat/s-atocou-builtin.adb b/gcc/ada/libgnat/s-atocou__builtin.adb
index 1b5b66a..1b5b66a 100644
--- a/gcc/ada/libgnat/s-atocou-builtin.adb
+++ b/gcc/ada/libgnat/s-atocou__builtin.adb
diff --git a/gcc/ada/libgnat/s-atocou-x86.adb b/gcc/ada/libgnat/s-atocou__x86.adb
index eb69a49e..eb69a49e 100644
--- a/gcc/ada/libgnat/s-atocou-x86.adb
+++ b/gcc/ada/libgnat/s-atocou__x86.adb
diff --git a/gcc/ada/libgnat/s-excmac-arm.adb b/gcc/ada/libgnat/s-excmac__arm.adb
index cfaa853..cfaa853 100644
--- a/gcc/ada/libgnat/s-excmac-arm.adb
+++ b/gcc/ada/libgnat/s-excmac__arm.adb
diff --git a/gcc/ada/libgnat/s-excmac-arm.ads b/gcc/ada/libgnat/s-excmac__arm.ads
index 195d337..195d337 100644
--- a/gcc/ada/libgnat/s-excmac-arm.ads
+++ b/gcc/ada/libgnat/s-excmac__arm.ads
diff --git a/gcc/ada/libgnat/s-excmac-gcc.adb b/gcc/ada/libgnat/s-excmac__gcc.adb
index 7d39651..7d39651 100644
--- a/gcc/ada/libgnat/s-excmac-gcc.adb
+++ b/gcc/ada/libgnat/s-excmac__gcc.adb
diff --git a/gcc/ada/libgnat/s-excmac-gcc.ads b/gcc/ada/libgnat/s-excmac__gcc.ads
index dabf8b6..dabf8b6 100644
--- a/gcc/ada/libgnat/s-excmac-gcc.ads
+++ b/gcc/ada/libgnat/s-excmac__gcc.ads
diff --git a/gcc/ada/libgnat/s-flocon-none.adb b/gcc/ada/libgnat/s-flocon__none.adb
index 5826237..5826237 100644
--- a/gcc/ada/libgnat/s-flocon-none.adb
+++ b/gcc/ada/libgnat/s-flocon__none.adb
diff --git a/gcc/ada/libgnat/s-gloloc-mingw.adb b/gcc/ada/libgnat/s-gloloc__mingw.adb
index 404f1c8..404f1c8 100644
--- a/gcc/ada/libgnat/s-gloloc-mingw.adb
+++ b/gcc/ada/libgnat/s-gloloc__mingw.adb
diff --git a/gcc/ada/libgnat/s-memory-mingw.adb b/gcc/ada/libgnat/s-memory__mingw.adb
index f7e5ff8..f7e5ff8 100644
--- a/gcc/ada/libgnat/s-memory-mingw.adb
+++ b/gcc/ada/libgnat/s-memory__mingw.adb
diff --git a/gcc/ada/libgnat/s-mmauni-long.ads b/gcc/ada/libgnat/s-mmauni__long.ads
index 8a1f94a..8a1f94a 100644
--- a/gcc/ada/libgnat/s-mmauni-long.ads
+++ b/gcc/ada/libgnat/s-mmauni__long.ads
diff --git a/gcc/ada/libgnat/s-mmosin-mingw.adb b/gcc/ada/libgnat/s-mmosin__mingw.adb
index f32e540..f32e540 100644
--- a/gcc/ada/libgnat/s-mmosin-mingw.adb
+++ b/gcc/ada/libgnat/s-mmosin__mingw.adb
diff --git a/gcc/ada/libgnat/s-mmosin-mingw.ads b/gcc/ada/libgnat/s-mmosin__mingw.ads
index 3610065..3610065 100644
--- a/gcc/ada/libgnat/s-mmosin-mingw.ads
+++ b/gcc/ada/libgnat/s-mmosin__mingw.ads
diff --git a/gcc/ada/libgnat/s-mmosin-unix.adb b/gcc/ada/libgnat/s-mmosin__unix.adb
index aec2538..aec2538 100644
--- a/gcc/ada/libgnat/s-mmosin-unix.adb
+++ b/gcc/ada/libgnat/s-mmosin__unix.adb
diff --git a/gcc/ada/libgnat/s-mmosin-unix.ads b/gcc/ada/libgnat/s-mmosin__unix.ads
index 7162ddc..7162ddc 100644
--- a/gcc/ada/libgnat/s-mmosin-unix.ads
+++ b/gcc/ada/libgnat/s-mmosin__unix.ads
diff --git a/gcc/ada/libgnat/s-osprim-darwin.adb b/gcc/ada/libgnat/s-osprim__darwin.adb
index b0f5fff..b0f5fff 100644
--- a/gcc/ada/libgnat/s-osprim-darwin.adb
+++ b/gcc/ada/libgnat/s-osprim__darwin.adb
diff --git a/gcc/ada/libgnat/s-osprim-lynxos.ads b/gcc/ada/libgnat/s-osprim__lynxos.ads
index 26087fd..26087fd 100644
--- a/gcc/ada/libgnat/s-osprim-lynxos.ads
+++ b/gcc/ada/libgnat/s-osprim__lynxos.ads
diff --git a/gcc/ada/libgnat/s-osprim-mingw.adb b/gcc/ada/libgnat/s-osprim__mingw.adb
index d729d85..d729d85 100644
--- a/gcc/ada/libgnat/s-osprim-mingw.adb
+++ b/gcc/ada/libgnat/s-osprim__mingw.adb
diff --git a/gcc/ada/libgnat/s-osprim-posix.adb b/gcc/ada/libgnat/s-osprim__posix.adb
index 8911b16..8911b16 100644
--- a/gcc/ada/libgnat/s-osprim-posix.adb
+++ b/gcc/ada/libgnat/s-osprim__posix.adb
diff --git a/gcc/ada/libgnat/s-osprim-posix2008.adb b/gcc/ada/libgnat/s-osprim__posix2008.adb
index dd977a8..dd977a8 100644
--- a/gcc/ada/libgnat/s-osprim-posix2008.adb
+++ b/gcc/ada/libgnat/s-osprim__posix2008.adb
diff --git a/gcc/ada/libgnat/s-osprim-solaris.adb b/gcc/ada/libgnat/s-osprim__solaris.adb
index c1c7e75..c1c7e75 100644
--- a/gcc/ada/libgnat/s-osprim-solaris.adb
+++ b/gcc/ada/libgnat/s-osprim__solaris.adb
diff --git a/gcc/ada/libgnat/s-osprim-unix.adb b/gcc/ada/libgnat/s-osprim__unix.adb
index f273df6..f273df6 100644
--- a/gcc/ada/libgnat/s-osprim-unix.adb
+++ b/gcc/ada/libgnat/s-osprim__unix.adb
diff --git a/gcc/ada/libgnat/s-osprim-vxworks.adb b/gcc/ada/libgnat/s-osprim__vxworks.adb
index 2fa6cfe..2fa6cfe 100644
--- a/gcc/ada/libgnat/s-osprim-vxworks.adb
+++ b/gcc/ada/libgnat/s-osprim__vxworks.adb
diff --git a/gcc/ada/libgnat/s-osprim-x32.adb b/gcc/ada/libgnat/s-osprim__x32.adb
index 809e163..809e163 100644
--- a/gcc/ada/libgnat/s-osprim-x32.adb
+++ b/gcc/ada/libgnat/s-osprim__x32.adb
diff --git a/gcc/ada/libgnat/s-osvers__vxworks-653.ads b/gcc/ada/libgnat/s-osvers__vxworks-653.ads
new file mode 100644
index 0000000..48256b3
--- /dev/null
+++ b/gcc/ada/libgnat/s-osvers__vxworks-653.ads
@@ -0,0 +1,38 @@
+------------------------------------------------------------------------------
+--                                                                          --
+--                      GNAT RUN-TIME LIBRARY COMPONENTS                    --
+--                                                                          --
+--                      S Y S T E M . O S _ V E R S I O N                   --
+--                                                                          --
+--                                  S p e c                                 --
+--                                                                          --
+--                      Copyright (C) 2010-2017, AdaCore                    --
+--                                                                          --
+-- GNAT is free software;  you can  redistribute it  and/or modify it under --
+-- terms of the  GNU General Public License as published  by the Free Soft- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+-- or FITNESS FOR A PARTICULAR PURPOSE.                                     --
+--                                                                          --
+-- As a special exception under Section 7 of GPL version 3, you are granted --
+-- additional permissions described in the GCC Runtime Library Exception,   --
+-- version 3.1, as published by the Free Software Foundation.               --
+--                                                                          --
+-- You should have received a copy of the GNU General Public License and    --
+-- a copy of the GCC Runtime Library Exception along with this program;     --
+-- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
+-- <http://www.gnu.org/licenses/>.                                          --
+--                                                                          --
+------------------------------------------------------------------------------
+
+--  This is the VxWorks 653 Partition OS version of this file. If you add an OS
+--  variant please be sure to update type OS_Version in all variants of this
+--  file, which is part of the Level A certified run-time libraries.
+
+package System.OS_Versions is
+   pragma Pure (System.OS_Versions);
+   type OS_Version is
+     (LynxOS_178, VxWorks_Cert, VxWorks_Cert_RTP, VxWorks_653, VxWorks_MILS);
+   OS : constant OS_Version := VxWorks_653;
+end System.OS_Versions;
diff --git a/gcc/ada/libgnat/s-parame-ae653.ads b/gcc/ada/libgnat/s-parame__ae653.ads
index 8a787f0..8a787f0 100644
--- a/gcc/ada/libgnat/s-parame-ae653.ads
+++ b/gcc/ada/libgnat/s-parame__ae653.ads
diff --git a/gcc/ada/libgnat/s-parame-hpux.ads b/gcc/ada/libgnat/s-parame__hpux.ads
index f20cfbe..f20cfbe 100644
--- a/gcc/ada/libgnat/s-parame-hpux.ads
+++ b/gcc/ada/libgnat/s-parame__hpux.ads
diff --git a/gcc/ada/libgnat/s-parame-rtems.adb b/gcc/ada/libgnat/s-parame__rtems.adb
index aa13114..aa13114 100644
--- a/gcc/ada/libgnat/s-parame-rtems.adb
+++ b/gcc/ada/libgnat/s-parame__rtems.adb
diff --git a/gcc/ada/libgnat/s-parame-vxworks.adb b/gcc/ada/libgnat/s-parame__vxworks.adb
index 325aa2e..325aa2e 100644
--- a/gcc/ada/libgnat/s-parame-vxworks.adb
+++ b/gcc/ada/libgnat/s-parame__vxworks.adb
diff --git a/gcc/ada/libgnat/s-parame-vxworks.ads b/gcc/ada/libgnat/s-parame__vxworks.ads
index 919361a..919361a 100644
--- a/gcc/ada/libgnat/s-parame-vxworks.ads
+++ b/gcc/ada/libgnat/s-parame__vxworks.ads
diff --git a/gcc/ada/libgnat/s-stchop-limit.ads b/gcc/ada/libgnat/s-stchop__limit.ads
index 6ab2f0a..6ab2f0a 100644
--- a/gcc/ada/libgnat/s-stchop-limit.ads
+++ b/gcc/ada/libgnat/s-stchop__limit.ads
diff --git a/gcc/ada/libgnat/s-stchop-rtems.adb b/gcc/ada/libgnat/s-stchop__rtems.adb
index ac0cfd0..ac0cfd0 100644
--- a/gcc/ada/libgnat/s-stchop-rtems.adb
+++ b/gcc/ada/libgnat/s-stchop__rtems.adb
diff --git a/gcc/ada/libgnat/s-stchop-vxworks.adb b/gcc/ada/libgnat/s-stchop__vxworks.adb
index 25b07db..25b07db 100644
--- a/gcc/ada/libgnat/s-stchop-vxworks.adb
+++ b/gcc/ada/libgnat/s-stchop__vxworks.adb
diff --git a/gcc/ada/libgnat/s-stratt-xdr.adb b/gcc/ada/libgnat/s-stratt__xdr.adb
index f7c63ce..f7c63ce 100644
--- a/gcc/ada/libgnat/s-stratt-xdr.adb
+++ b/gcc/ada/libgnat/s-stratt__xdr.adb
diff --git a/gcc/ada/libgnat/s-traceb-hpux.adb b/gcc/ada/libgnat/s-traceb__hpux.adb
index a261104..a261104 100644
--- a/gcc/ada/libgnat/s-traceb-hpux.adb
+++ b/gcc/ada/libgnat/s-traceb__hpux.adb
diff --git a/gcc/ada/libgnat/s-traceb-mastop.adb b/gcc/ada/libgnat/s-traceb__mastop.adb
index 422d5c5..422d5c5 100644
--- a/gcc/ada/libgnat/s-traceb-mastop.adb
+++ b/gcc/ada/libgnat/s-traceb__mastop.adb
diff --git a/gcc/ada/libgnat/s-trasym-dwarf.adb b/gcc/ada/libgnat/s-trasym__dwarf.adb
index 9655722..9655722 100644
--- a/gcc/ada/libgnat/s-trasym-dwarf.adb
+++ b/gcc/ada/libgnat/s-trasym__dwarf.adb
diff --git a/gcc/ada/libgnat/s-tsmona-linux.adb b/gcc/ada/libgnat/s-tsmona__linux.adb
index 8c1f8b4..8c1f8b4 100644
--- a/gcc/ada/libgnat/s-tsmona-linux.adb
+++ b/gcc/ada/libgnat/s-tsmona__linux.adb
diff --git a/gcc/ada/libgnat/s-tsmona-mingw.adb b/gcc/ada/libgnat/s-tsmona__mingw.adb
index 46c35cd..46c35cd 100644
--- a/gcc/ada/libgnat/s-tsmona-mingw.adb
+++ b/gcc/ada/libgnat/s-tsmona__mingw.adb
diff --git a/gcc/ada/libgnat/s__thread-ae653.adb b/gcc/ada/libgnat/s__thread-ae653.adb
new file mode 100644
index 0000000..ca87128
--- /dev/null
+++ b/gcc/ada/libgnat/s__thread-ae653.adb
@@ -0,0 +1,247 @@
+------------------------------------------------------------------------------
+--                                                                          --
+--                         GNAT COMPILER COMPONENTS                         --
+--                                                                          --
+--                       S Y S T E M . T H R E A D S                        --
+--                                                                          --
+--                                 B o d y                                  --
+--                                                                          --
+--          Copyright (C) 1992-2017, Free Software Foundation, Inc.         --
+--                                                                          --
+-- GNAT is free software;  you can  redistribute it  and/or modify it under --
+-- terms of the  GNU General Public License as published  by the Free Soft- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+-- or FITNESS FOR A PARTICULAR PURPOSE.                                     --
+--                                                                          --
+-- As a special exception under Section 7 of GPL version 3, you are granted --
+-- additional permissions described in the GCC Runtime Library Exception,   --
+-- version 3.1, as published by the Free Software Foundation.               --
+--                                                                          --
+-- You should have received a copy of the GNU General Public License and    --
+-- a copy of the GCC Runtime Library Exception along with this program;     --
+-- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
+-- <http://www.gnu.org/licenses/>.                                          --
+--                                                                          --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
+--                                                                          --
+------------------------------------------------------------------------------
+
+--  This is the VxWorks 653 version of this package
+
+pragma Restrictions (No_Tasking);
+--  The VxWorks 653 version of this package is intended only for programs
+--  which do not use Ada tasking. This restriction ensures that this
+--  will be checked by the binder.
+
+with System.OS_Versions; use System.OS_Versions;
+with System.Secondary_Stack;
+pragma Elaborate_All (System.Secondary_Stack);
+
+package body System.Threads is
+
+   use Interfaces.C;
+
+   package SSS renames System.Secondary_Stack;
+
+   package SSL renames System.Soft_Links;
+
+   Current_ATSD : aliased System.Address := System.Null_Address;
+   pragma Export (C, Current_ATSD, "__gnat_current_atsd");
+
+   Main_ATSD : aliased ATSD;
+   --  TSD for environment task
+
+   Stack_Limit : Address;
+
+   pragma Import (C, Stack_Limit, "__gnat_stack_limit");
+
+   type Set_Stack_Limit_Proc_Acc is access procedure;
+   pragma Convention (C, Set_Stack_Limit_Proc_Acc);
+
+   Set_Stack_Limit_Hook : Set_Stack_Limit_Proc_Acc;
+   pragma Import (C, Set_Stack_Limit_Hook, "__gnat_set_stack_limit_hook");
+   --  Procedure to be called when a task is created to set stack limit if
+   --  limit checking is used.
+
+   --------------------------
+   -- VxWorks specific API --
+   --------------------------
+
+   ERROR : constant STATUS := Interfaces.C.int (-1);
+
+   function taskIdVerify (tid : t_id) return STATUS;
+   pragma Import (C, taskIdVerify, "taskIdVerify");
+
+   function taskIdSelf return t_id;
+   pragma Import (C, taskIdSelf, "taskIdSelf");
+
+   function taskVarAdd
+     (tid : t_id; pVar : System.Address) return int;
+   pragma Import (C, taskVarAdd, "taskVarAdd");
+
+   -----------------------
+   -- Local Subprograms --
+   -----------------------
+
+   procedure Init_RTS;
+   --  This procedure performs the initialization of the run-time lib.
+   --  It installs System.Threads versions of certain operations of the
+   --  run-time lib.
+
+   procedure Install_Handler;
+   pragma Import (C, Install_Handler, "__gnat_install_handler");
+
+   function  Get_Sec_Stack_Addr return  Address;
+
+   procedure Set_Sec_Stack_Addr (Addr : Address);
+
+   -----------------------
+   -- Thread_Body_Enter --
+   -----------------------
+
+   procedure Thread_Body_Enter
+     (Sec_Stack_Address    : System.Address;
+      Sec_Stack_Size       : Natural;
+      Process_ATSD_Address : System.Address)
+   is
+      --  Current_ATSD must already be a taskVar of taskIdSelf.
+      --  No assertion because taskVarGet is not available on VxWorks/CERT,
+      --  which is used on VxWorks 653 3.x as a guest OS.
+
+      TSD : constant ATSD_Access := From_Address (Process_ATSD_Address);
+
+   begin
+
+      TSD.Sec_Stack_Addr := Sec_Stack_Address;
+      SSS.SS_Init (TSD.Sec_Stack_Addr, Sec_Stack_Size);
+      Current_ATSD := Process_ATSD_Address;
+
+      Install_Handler;
+
+      --  Initialize stack limit if needed
+
+      if Current_ATSD /= Main_ATSD'Address
+        and then Set_Stack_Limit_Hook /= null
+      then
+         Set_Stack_Limit_Hook.all;
+      end if;
+   end Thread_Body_Enter;
+
+   ----------------------------------
+   -- Thread_Body_Exceptional_Exit --
+   ----------------------------------
+
+   procedure Thread_Body_Exceptional_Exit
+     (EO : Ada.Exceptions.Exception_Occurrence)
+   is
+      pragma Unreferenced (EO);
+
+   begin
+      --  No action for this target
+
+      null;
+   end Thread_Body_Exceptional_Exit;
+
+   -----------------------
+   -- Thread_Body_Leave --
+   -----------------------
+
+   procedure Thread_Body_Leave is
+   begin
+      --  No action for this target
+
+      null;
+   end Thread_Body_Leave;
+
+   --------------
+   -- Init_RTS --
+   --------------
+
+   procedure Init_RTS is
+      --  Register environment task
+      Result : constant Interfaces.C.int := Register (taskIdSelf);
+      pragma Assert (Result /= ERROR);
+
+   begin
+      Main_ATSD.Sec_Stack_Addr := SSL.Get_Sec_Stack_Addr_NT;
+      Current_ATSD := Main_ATSD'Address;
+      Install_Handler;
+      SSL.Get_Sec_Stack_Addr := Get_Sec_Stack_Addr'Access;
+      SSL.Set_Sec_Stack_Addr := Set_Sec_Stack_Addr'Access;
+   end Init_RTS;
+
+   ------------------------
+   -- Get_Sec_Stack_Addr --
+   ------------------------
+
+   function  Get_Sec_Stack_Addr return  Address is
+      CTSD : constant ATSD_Access := From_Address (Current_ATSD);
+   begin
+      pragma Assert (CTSD /= null);
+      return CTSD.Sec_Stack_Addr;
+   end Get_Sec_Stack_Addr;
+
+   --------------
+   -- Register --
+   --------------
+
+   function Register (T : Thread_Id) return STATUS is
+      Result : STATUS;
+
+   begin
+      --  It cannot be assumed that the caller of this routine has a ATSD;
+      --  so neither this procedure nor the procedures that it calls should
+      --  raise or handle exceptions, or make use of a secondary stack.
+
+      --  This routine is only necessary because taskVarAdd cannot be
+      --  executed once an VxWorks 653 partition has entered normal mode
+      --  (depending on configRecord.c, allocation could be disabled).
+      --  Otherwise, everything could have been done in Thread_Body_Enter.
+
+      if taskIdVerify (T) = ERROR then
+         return ERROR;
+      end if;
+
+      Result := taskVarAdd (T, Current_ATSD'Address);
+      pragma Assert (Result /= ERROR);
+
+      --  The same issue applies to the task variable that contains the stack
+      --  limit when that overflow checking mechanism is used instead of
+      --  probing. If stack checking is enabled and limit checking is used,
+      --  allocate the limit for this task. The environment task has this
+      --  initialized by the binder-generated main when
+      --  System.Stack_Check_Limits = True.
+
+      pragma Warnings (Off);
+      --  OS is a constant
+      if Result /= ERROR
+        and then OS /= VxWorks_653
+        and then Set_Stack_Limit_Hook /= null
+      then
+         Result := taskVarAdd (T, Stack_Limit'Address);
+         pragma Assert (Result /= ERROR);
+      end if;
+      pragma Warnings (On);
+
+      return Result;
+   end Register;
+
+   ------------------------
+   -- Set_Sec_Stack_Addr --
+   ------------------------
+
+   procedure Set_Sec_Stack_Addr (Addr : Address) is
+      CTSD : constant ATSD_Access := From_Address (Current_ATSD);
+   begin
+      pragma Assert (CTSD /= null);
+      CTSD.Sec_Stack_Addr := Addr;
+   end Set_Sec_Stack_Addr;
+
+begin
+   --  Initialize run-time library
+
+   Init_RTS;
+end System.Threads;