From patchwork Mon Sep 11 09:18:57 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Arnaud Charlet <charlet@adacore.com>
X-Patchwork-Id: 812261
Return-Path: 
 <gcc-patches-return-461800-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
	spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org
	(client-ip=209.132.180.131; helo=sourceware.org;
	envelope-from=gcc-patches-return-461800-incoming=patchwork.ozlabs.org@gcc.gnu.org;
	receiver=<UNKNOWN>)
Authentication-Results: ozlabs.org; dkim=pass (1024-bit key;
	unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org
	header.b="iuIGdm8P"; dkim-atps=neutral
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
	bits)) (No client certificate requested)
	by ozlabs.org (Postfix) with ESMTPS id 3xrMnS37bNz9s75
	for <incoming@patchwork.ozlabs.org>;
	Mon, 11 Sep 2017 19:19:23 +1000 (AEST)
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id
	:list-unsubscribe:list-archive:list-post:list-help:sender:date
	:from:to:cc:subject:message-id:mime-version:content-type; q=dns;
	s=default; b=cKncFX4Qp875rprW5wz0nHFoT0LBg8Q/i4sURcOEwzedV0FiZf
	G5FzpgEk9vtQcGHB5bE4Yw21RthLpo5APHX34IkC0n5MbxAJDpQuHNLyYMKi7c9j
	ghl7VDyeVQCOIQrDxRdy/MF6V8IwjED5PPPid0m3YaGWCUio1vaTwPj14=
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id
	:list-unsubscribe:list-archive:list-post:list-help:sender:date
	:from:to:cc:subject:message-id:mime-version:content-type; s=
	default; bh=Ngy6fG7PWkWhTkW07QNrh2pumGc=; b=iuIGdm8P1hfbB34gzWgY
	4VXv/ywjByI0zDG6vgsNyFsjA2d+Scaa2FssKO59+AV0FtgqmfqPPxPKUatnvKvL
	H5Mv+bBMZQxe5+BiCdwzHPnxc7Zmtj5OBnzEi4FBJ4piGlCaqSHS85rbFmG3PrMb
	Dbtwho9RJkeeXhROP8mHtR4=
Received: (qmail 15400 invoked by alias); 11 Sep 2017 09:19:08 -0000
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org
Received: (qmail 13845 invoked by uid 89); 11 Sep 2017 09:19:05 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-11.2 required=5.0 tests=AWL, BAYES_00,
	GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE,
	SPF_PASS autolearn=ham version=3.3.2 spammy=3456, Alpha
X-HELO: rock.gnat.com
Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by
	sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP;
	Mon, 11 Sep 2017 09:18:59 +0000
Received: from localhost (localhost.localdomain [127.0.0.1])	by
	filtered-rock.gnat.com (Postfix) with ESMTP id 96D745612D;
	Mon, 11 Sep 2017 05:18:57 -0400 (EDT)
Received: from rock.gnat.com ([127.0.0.1])	by localhost (rock.gnat.com
	[127.0.0.1]) (amavisd-new, port 10024)	with LMTP id
	8gXQueL3Qb+i; Mon, 11 Sep 2017 05:18:57 -0400 (EDT)
Received: from tron.gnat.com (tron.gnat.com [205.232.38.10])	by
	rock.gnat.com (Postfix) with ESMTP id 65B4E56127;
	Mon, 11 Sep 2017 05:18:57 -0400 (EDT)
Received: by tron.gnat.com (Postfix, from userid 4192)	id 61EA24F2;
	Mon, 11 Sep 2017 05:18:57 -0400 (EDT)
Date: Mon, 11 Sep 2017 05:18:57 -0400
From: Arnaud Charlet <charlet@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Jerome Lambourg <lambourg@adacore.com>
Subject: [Ada] Rename runtime variant files under libgnarl
Message-ID: <20170911091857.GA23259@adacore.com>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.23 (2014-03-12)

This is the next step in the source file and directory reorg in GNAT sources.
This time, we rename all files of the form ?-[a-z]*-* into ?-[a-z]*_*,
for example s-tpopsp-posix.adb becomes s-tpopsp__posix.adb. This is done
so that it's easier to see which files are platform specific variants (such
files will now always contain a double underscore).

This change is for the libgnarl directory, the next change will do the same
for the libgnat directory.

As with the previous changes, there's a small chance that some target got
forgotten in Makefile.in, but hopefully not! If this is the case, fixing it
is purely mechanical and is preapproved.

The diff is huge and mechanical, I'm only including the part in
gcc-interface/Makefile.in.

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

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

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

Index: gcc-interface/Makefile.in
===================================================================
--- gcc-interface/Makefile.in	(revision 251956)
+++ gcc-interface/Makefile.in	(working copy)
@@ -355,13 +355,13 @@
 # Non-tasking case:
 
 LIBGNAT_TARGET_PAIRS = \
-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 \
+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-taprop.adb<libgnarl/s-taprop-dummy.adb \
-s-taspri.ads<libgnarl/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 @@
   endif
 
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<libgnarl/a-intnam-vxworks.ads \
+  a-intnam.ads<libgnarl/a-intnam__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-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-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 \
+  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 \
@@ -544,19 +544,19 @@
 
   ifeq ($(strip $(filter-out rtp,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS += \
-    s-vxwext.ads<libgnarl/s-vxwext-rtp.ads \
-    s-vxwext.adb<libgnarl/s-vxwext-rtp.adb \
-    s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-rtp.adb \
+    s-vxwext.ads<libgnarl/s-vxwext__rtp.ads \
+    s-vxwext.adb<libgnarl/s-vxwext__rtp.adb \
+    s-tpopsp.adb<libgnarl/s-tpopsp__vxworks-rtp.adb \
     system.ads<libgnat/system-vxworks-$(ARCH_STR)-rtp.ads
 
     EH_MECHANISM=-gcc
   else
     ifeq ($(strip $(filter-out rtp-smp,$(THREAD_KIND))),)
       LIBGNAT_TARGET_PAIRS += \
-      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 \
+      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<libgnat/$(SVX)-$(ARCH_STR)-rtp-smp.ads
 
       EH_MECHANISM=-gcc
@@ -564,25 +564,25 @@
     else
       ifeq ($(strip $(filter-out kernel-smp,$(THREAD_KIND))),)
         LIBGNAT_TARGET_PAIRS += \
-        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<libgnarl/s-vxwext-kernel-smp.adb \
+        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<libgnarl/s-vxwext__kernel-smp.adb \
         system.ads<libgnat/system-vxworks-$(ARCH_STR)-kernel.ads
 
         EH_MECHANISM=-gcc
         EXTRA_LIBGNAT_OBJS+=affinity.o
       else
         LIBGNAT_TARGET_PAIRS += \
-        s-interr.adb<libgnarl/s-interr-vxworks.adb \
-        s-tpopsp.adb<libgnarl/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<libgnarl/s-vxwext-kernel.ads \
-          s-vxwext.adb<libgnarl/s-vxwext-kernel.adb \
+          s-vxwext.ads<libgnarl/s-vxwext__kernel.ads \
+          s-vxwext.adb<libgnarl/s-vxwext__kernel.adb \
           system.ads<libgnat/system-vxworks-$(ARCH_STR)-kernel.ads
         else
           LIBGNAT_TARGET_PAIRS += \
@@ -634,22 +634,22 @@
   endif
 
   LIBGNAT_TARGET_PAIRS+= \
-  a-intnam.ads<libgnarl/a-intnam-vxworks.ads \
+  a-intnam.ads<libgnarl/a-intnam__vxworks.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-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-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 \
+  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 \
@@ -699,41 +699,41 @@
   ifeq ($(strip $(filter-out rtp,$(THREAD_KIND))),)
     # Runtime N/A for VxWorks7 (non-existent system file)
     LIBGNAT_TARGET_PAIRS += \
-    s-vxwext.ads<libgnarl/s-vxwext-rtp.ads \
-    s-vxwext.adb<libgnarl/s-vxwext-rtp.adb \
-    s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-rtp.adb \
+    s-vxwext.ads<libgnarl/s-vxwext__rtp.ads \
+    s-vxwext.adb<libgnarl/s-vxwext__rtp.adb \
+    s-tpopsp.adb<libgnarl/s-tpopsp__vxworks-rtp.adb \
     system.ads<libgnat/system-vxworks-x86-rtp.ads
   else
     ifeq ($(strip $(filter-out rtp-smp, $(THREAD_KIND))),)
       LIBGNAT_TARGET_PAIRS += \
-      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 \
+      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<libgnat/$(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<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<libgnarl/s-vxwext-kernel-smp.adb \
+        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<libgnarl/s-vxwext__kernel-smp.adb \
         system.ads<libgnat/$(SVX)-$(X86CPU)-kernel.ads
 
         EXTRA_LIBGNAT_OBJS+=affinity.o
       else
         LIBGNAT_TARGET_PAIRS += \
-        s-interr.adb<libgnarl/s-interr-vxworks.adb \
-        s-tpopsp.adb<libgnarl/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<libgnarl/s-vxwext-kernel.ads \
-          s-vxwext.adb<libgnarl/s-vxwext-kernel.adb \
+          s-vxwext.ads<libgnarl/s-vxwext__kernel.ads \
+          s-vxwext.adb<libgnarl/s-vxwext__kernel.adb \
           system.ads<libgnat/$(SVX)-x86-kernel.ads
         else
           LIBGNAT_TARGET_PAIRS += \
@@ -781,23 +781,23 @@
   endif
 
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<libgnarl/a-intnam-vxworks.ads \
+  a-intnam.ads<libgnarl/a-intnam__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-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-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 \
+  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
@@ -806,10 +806,10 @@
 
   ifeq ($(strip $(filter-out rtp-smp,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS += \
-    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 \
+    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<libgnat/$(SVX)-arm-rtp-smp.ads
 
     EXTRA_LIBGNAT_OBJS+=affinity.o
@@ -819,10 +819,10 @@
   else
     ifeq ($(strip $(filter-out kernel-smp,$(THREAD_KIND))),)
       LIBGNAT_TARGET_PAIRS += \
-      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<libgnarl/s-vxwext-kernel-smp.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<libgnarl/s-vxwext__kernel-smp.adb \
       system.ads<libgnat/$(SVX)-arm.ads
 
       EXTRA_LIBGNAT_OBJS+=affinity.o
@@ -831,13 +831,13 @@
       EXTRA_LIBGNAT_SRCS+=$(VX_SIGTRAMP_EXTRA_SRCS)
     else
       LIBGNAT_TARGET_PAIRS += \
-      s-tpopsp.adb<libgnarl/s-tpopsp-vxworks.adb \
+      s-tpopsp.adb<libgnarl/s-tpopsp__vxworks.adb \
       system.ads<libgnat/$(SVX)-arm.ads
 
       ifeq ($(strip $(filter-out kernel,$(THREAD_KIND))),)
         LIBGNAT_TARGET_PAIRS += \
-        s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \
-        s-vxwext.adb<libgnarl/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)
@@ -866,16 +866,16 @@
 # ARM android
 ifeq ($(strip $(filter-out arm% linux-androideabi,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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<libgnat/system-linux-arm.ads
@@ -894,18 +894,18 @@
 # Sparc Solaris
 ifeq ($(strip $(filter-out sparc% sun solaris%,$(target_cpu) $(target_vendor) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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 \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
@@ -927,18 +927,18 @@
 # x86 and x86-64 solaris
 ifeq ($(strip $(filter-out %86 %x86_64 solaris2%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS_COMMON = \
-  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 \
+  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<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 \
+  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 \
   $(ATOMICS_TARGET_PAIRS) \
   system.ads<libgnat/system-solaris-x86.ads
@@ -975,19 +975,19 @@
 # x86 Linux
 ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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 \
+  s-osinte.adb<libgnarl/s-osinte__posix.adb \
   $(ATOMICS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-x86.ads
 
@@ -998,13 +998,13 @@
   endif
 
   LIBGNAT_TARGET_PAIRS += \
-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \
-  s-osinte.ads<libgnarl/s-osinte-linux.ads \
+  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-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-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
@@ -1023,15 +1023,15 @@
 # x86 kfreebsd
 ifeq ($(strip $(filter-out %86 kfreebsd%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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<libgnarl/s-osinte-kfreebsd-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__posix.adb \
+  s-osinte.ads<libgnarl/s-osinte__kfreebsd-gnu.ads \
   s-osprim.adb<libgnat/s-osprim-posix.adb \
-  s-taprop.adb<libgnarl/s-taprop-posix.adb \
-  s-taspri.ads<libgnarl/s-taspri-posix.ads \
-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \
+  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<libgnat/system-freebsd.ads
@@ -1051,15 +1051,15 @@
 # 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<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 \
+  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<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 \
+  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<libgnat/system-freebsd.ads
@@ -1077,17 +1077,17 @@
 
 ifeq ($(strip $(filter-out x86_64 kfreebsd%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<libgnarl/a-intnam-freebsd.ads \
+  a-intnam.ads<libgnarl/a-intnam__freebsd.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-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-taprop.adb<libgnarl/s-taprop-posix.adb \
-  s-taspri.ads<libgnarl/s-taspri-posix.ads \
-  s-tpopsp.adb<libgnarl/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<libgnat/system-freebsd.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
@@ -1102,16 +1102,16 @@
 # aarch64 FreeBSD
 ifeq ($(strip $(filter-out %aarch64 freebsd%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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<libgnat/system-freebsd.ads
@@ -1128,16 +1128,16 @@
 # x86 FreeBSD
 ifeq ($(strip $(filter-out %86 freebsd%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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<libgnat/system-freebsd.ads
@@ -1156,16 +1156,16 @@
 # x86-64 FreeBSD
 ifeq ($(strip $(filter-out %86_64 freebsd%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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<libgnat/system-freebsd.ads
@@ -1184,16 +1184,16 @@
 # x86-64 DragonFly
 ifeq ($(strip $(filter-out %86_64 dragonfly%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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<libgnat/system-dragonfly-x86_64.ads
@@ -1212,18 +1212,18 @@
 # S390 Linux
 ifeq ($(strip $(filter-out s390% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<libgnarl/a-intnam-linux.ads \
-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
-  s-intman.adb<libgnarl/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<libgnarl/s-linux.ads \
-  s-osinte.adb<libgnarl/s-osinte-posix.adb \
-  s-osinte.ads<libgnarl/s-osinte-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-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 \
+  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<libgnat/system-linux-s390.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
@@ -1239,17 +1239,17 @@
 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-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 \
+  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-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 \
+  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<libgnat/system-hpux.ads
 
   EH_MECHANISM=-gcc
@@ -1258,17 +1258,17 @@
 # HP/PA HP-UX 11
 ifeq ($(strip $(filter-out hppa% hp hpux11%,$(target_cpu) $(target_vendor) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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<libgnat/system-hpux.ads
 
   EH_MECHANISM=-gcc
@@ -1284,15 +1284,15 @@
 # IBM AIX
 ifeq ($(strip $(filter-out ibm aix%,$(target_vendor) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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<libgnat/system-aix.ads
@@ -1316,18 +1316,18 @@
 ifeq ($(strip $(filter-out rtems%,$(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
   system.ads<libgnat/system-rtems.ads \
-  a-intnam.ads<libgnarl/a-intnam-rtems.ads \
-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
-  s-intman.adb<libgnarl/s-intman-posix.adb \
-  s-osinte.adb<libgnarl/s-osinte-rtems.adb \
-  s-osinte.ads<libgnarl/s-osinte-rtems.ads \
+  a-intnam.ads<libgnarl/a-intnam__rtems.ads \
+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
+  s-intman.adb<libgnarl/s-intman__posix.adb \
+  s-osinte.adb<libgnarl/s-osinte__rtems.adb \
+  s-osinte.ads<libgnarl/s-osinte__rtems.ads \
   s-osprim.adb<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 \
-  s-stchop.adb<libgnat/s-stchop-rtems.adb \
-  s-interr.adb<libgnarl/s-interr-hwint.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 \
+  s-stchop.adb<libgnat/s-stchop__rtems.adb \
+  s-interr.adb<libgnarl/s-interr__hwint.adb
 endif
 
 # PikeOS
@@ -1344,13 +1344,13 @@
   GNATRTL_SOCKETS_OBJS =
 
   LIBGNAT_TARGET_PAIRS = \
-	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 \
+	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-unix.adb \
-	s-taprop.adb<libgnarl/s-taprop-dummy.adb \
-	s-taspri.ads<libgnarl/s-taspri-dummy.ads \
+	s-taprop.adb<libgnarl/s-taprop__dummy.adb \
+	s-taspri.ads<libgnarl/s-taspri__dummy.ads \
 	system.ads<libgnat/system-djgpp.ads \
 	$(DUMMY_SOCKETS_TARGET_PAIRS)
 
@@ -1380,27 +1380,27 @@
   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 \
+  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 \
   $(ATOMICS_TARGET_PAIRS) \
   system.ads<libgnat/system-mingw.ads
 
   LIBGNAT_TARGET_PAIRS += \
-  a-exetim.adb<libgnarl/a-exetim-mingw.adb \
-  a-exetim.ads<libgnarl/a-exetim-mingw.ads \
-  a-intnam.ads<libgnarl/a-intnam-mingw.ads \
+  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 \
-  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-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-taprop.adb<libgnarl/s-taprop-mingw.adb
+  s-taprop.adb<libgnarl/s-taprop__mingw.adb
 
   ifeq ($(strip $(filter-out x86_64%,$(target_cpu))),)
     ifeq ($(strip $(MULTISUBDIR)),/32)
@@ -1444,18 +1444,18 @@
 # Mips Linux
 ifeq ($(strip $(filter-out mips% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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 \
   system.ads<libgnat/system-linux-mips.ads
 
@@ -1472,16 +1472,16 @@
 # PowerPC and e500v2 Linux
 ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS_COMMON = \
-  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 \
+  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 \
+  s-osinte.adb<libgnarl/s-osinte__posix.adb \
+  s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   g-sercom.adb<libgnat/g-sercom-linux.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
@@ -1489,13 +1489,13 @@
 
   LIBGNAT_TARGET_PAIRS = \
     $(LIBGNAT_TARGET_PAIRS_COMMON) \
-    s-mudido.adb<libgnarl/s-mudido-affinity.adb \
-    s-osinte.ads<libgnarl/s-osinte-linux.ads \
+    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-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-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
 
@@ -1511,18 +1511,18 @@
 # ARM linux, GNU eabi
 ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<libgnarl/a-intnam-linux.ads \
-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
-  s-intman.adb<libgnarl/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<libgnarl/s-linux.ads \
-  s-osinte.adb<libgnarl/s-osinte-posix.adb \
-  s-osinte.ads<libgnarl/s-osinte-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-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 \
+  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<libgnat/system-linux-arm.ads
@@ -1545,23 +1545,23 @@
 # AArch64 Linux
 ifeq ($(strip $(filter-out aarch64% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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-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-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 \
+  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 \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
@@ -1580,18 +1580,18 @@
 # Sparc Linux
 ifeq ($(strip $(filter-out sparc% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<libgnat/s-osprim-posix.adb \
-  s-taprop.adb<libgnarl/s-taprop-linux.adb \
-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \
-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \
-  s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \
-  s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \
+  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<libgnat/system-linux-sparc.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
@@ -1607,18 +1607,18 @@
 # HP/PA Linux
 ifeq ($(strip $(filter-out hppa% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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<libgnat/system-linux-hppa.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
@@ -1634,18 +1634,18 @@
 # M68K Linux
 ifeq ($(strip $(filter-out m68k% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<libgnarl/a-intnam-linux.ads \
-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
-  s-intman.adb<libgnarl/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<libgnat/s-linux.ads \
-  s-osinte.adb<libgnarl/s-osinte-posix.adb \
-  s-osinte.ads<libgnarl/s-osinte-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-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 \
+  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<libgnat/system-linux-m68k.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
@@ -1661,18 +1661,18 @@
 # SH4 Linux
 ifeq ($(strip $(filter-out sh4% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<libgnarl/a-intnam-linux.ads \
-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \
-  s-intman.adb<libgnarl/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<libgnarl/s-linux.ads \
-  s-osinte.adb<libgnarl/s-osinte-posix.adb \
-  s-osinte.ads<libgnarl/s-osinte-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-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 \
+  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<libgnat/system-linux-sh4.ads
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-linux.adb
@@ -1689,24 +1689,24 @@
 # IA64 Linux
 ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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-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-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 \
+  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-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-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 \
+  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 \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
@@ -1726,15 +1726,15 @@
 # IA64 HP-UX
 ifeq ($(strip $(filter-out ia64% hp hpux%,$(target_cpu) $(target_vendor) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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<libgnat/system-hpux-ia64.ads
@@ -1752,18 +1752,18 @@
 # Alpha Linux
 ifeq ($(strip $(filter-out alpha% linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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-posix-foreign.adb \
-  s-taspri.ads<libgnarl/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<libgnat/system-linux-alpha.ads
@@ -1781,23 +1781,23 @@
 # x86-64 Linux
 ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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-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-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 \
+  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 \
   $(TRASYM_DWARF_UNIX_PAIRS) \
   s-tsmona.adb<libgnat/s-tsmona-linux.adb \
@@ -1821,23 +1821,23 @@
 
 ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
   LIBGNAT_TARGET_PAIRS = \
-  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 \
+  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<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 \
+  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 \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
@@ -1858,18 +1858,18 @@
 ifeq ($(strip $(filter-out darwin%,$(target_os))),)
   SO_OPTS = -shared-libgcc
   LIBGNAT_TARGET_PAIRS = \
-    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 \
+    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<libgnat/g-sercom-linux.adb \
-    s-tpopsp.adb<libgnarl/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<libgnarl/s-intman-susv3.adb \
+      s-intman.adb<libgnarl/s-intman__susv3.adb \
       s-osprim.adb<libgnat/s-osprim-darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       system.ads<libgnat/system-darwin-x86.ads
@@ -1886,10 +1886,10 @@
 
   ifeq ($(strip $(filter-out %x86_64,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
-      s-intman.adb<libgnarl/s-intman-susv3.adb \
+      s-intman.adb<libgnarl/s-intman__susv3.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 \
+      a-exetim.ads<libgnarl/a-exetim__default.ads \
+      a-exetim.adb<libgnarl/a-exetim__darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       system.ads<libgnat/system-darwin-x86.ads
 
@@ -1906,7 +1906,7 @@
 
   ifeq ($(strip $(filter-out powerpc%,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
-      s-intman.adb<libgnarl/s-intman-posix.adb \
+      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 \
@@ -1921,7 +1921,7 @@
 
   ifeq ($(strip $(filter-out arm,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
-      s-intman.adb<libgnarl/s-intman-susv3.adb \
+      s-intman.adb<libgnarl/s-intman__susv3.adb \
       s-osprim.adb<libgnat/s-osprim-darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       $(ATOMICS_BUILTINS_TARGET_PAIRS)
@@ -1932,7 +1932,7 @@
 
   ifeq ($(strip $(filter-out arm64 aarch64,$(target_cpu))),)
     LIBGNAT_TARGET_PAIRS += \
-      s-intman.adb<libgnarl/s-intman-susv3.adb \
+      s-intman.adb<libgnarl/s-intman__susv3.adb \
       s-osprim.adb<libgnat/s-osprim-darwin.adb \
       $(ATOMICS_TARGET_PAIRS) \
       $(ATOMICS_BUILTINS_TARGET_PAIRS)