get:
Show a patch.

patch:
Update a patch.

put:
Update a patch.

GET /api/1.2/patches/812261/?format=api
HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 812261,
    "url": "http://patchwork.ozlabs.org/api/1.2/patches/812261/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/gcc/patch/20170911091857.GA23259@adacore.com/",
    "project": {
        "id": 17,
        "url": "http://patchwork.ozlabs.org/api/1.2/projects/17/?format=api",
        "name": "GNU Compiler Collection",
        "link_name": "gcc",
        "list_id": "gcc-patches.gcc.gnu.org",
        "list_email": "gcc-patches@gcc.gnu.org",
        "web_url": null,
        "scm_url": null,
        "webscm_url": null,
        "list_archive_url": "",
        "list_archive_url_format": "",
        "commit_url_format": ""
    },
    "msgid": "<20170911091857.GA23259@adacore.com>",
    "list_archive_url": null,
    "date": "2017-09-11T09:18:57",
    "name": "[Ada] Rename runtime variant files under libgnarl",
    "commit_ref": null,
    "pull_url": null,
    "state": "new",
    "archived": false,
    "hash": "d5101b7944e0f11bed6b8d9c8287fd467627d597",
    "submitter": {
        "id": 4418,
        "url": "http://patchwork.ozlabs.org/api/1.2/people/4418/?format=api",
        "name": "Arnaud Charlet",
        "email": "charlet@adacore.com"
    },
    "delegate": null,
    "mbox": "http://patchwork.ozlabs.org/project/gcc/patch/20170911091857.GA23259@adacore.com/mbox/",
    "series": [
        {
            "id": 2463,
            "url": "http://patchwork.ozlabs.org/api/1.2/series/2463/?format=api",
            "web_url": "http://patchwork.ozlabs.org/project/gcc/list/?series=2463",
            "date": "2017-09-11T09:18:57",
            "name": "[Ada] Rename runtime variant files under libgnarl",
            "version": 1,
            "mbox": "http://patchwork.ozlabs.org/series/2463/mbox/"
        }
    ],
    "comments": "http://patchwork.ozlabs.org/api/patches/812261/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/812261/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "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",
            "mailing list gcc-patches@gcc.gnu.org"
        ],
        "Authentication-Results": [
            "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=gcc-patches-return-461800-incoming=patchwork.ozlabs.org@gcc.gnu.org;\n\treceiver=<UNKNOWN>)",
            "ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org\n\theader.b=\"iuIGdm8P\"; dkim-atps=neutral",
            "sourceware.org; auth=none"
        ],
        "Received": [
            "from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrMnS37bNz9s75\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 11 Sep 2017 19:19:23 +1000 (AEST)",
            "(qmail 15400 invoked by alias); 11 Sep 2017 09:19:08 -0000",
            "(qmail 13845 invoked by uid 89); 11 Sep 2017 09:19:05 -0000",
            "from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by\n\tsourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP;\n\tMon, 11 Sep 2017 09:18:59 +0000",
            "from localhost (localhost.localdomain [127.0.0.1])\tby\n\tfiltered-rock.gnat.com (Postfix) with ESMTP id 96D745612D;\n\tMon, 11 Sep 2017 05:18:57 -0400 (EDT)",
            "from rock.gnat.com ([127.0.0.1])\tby localhost (rock.gnat.com\n\t[127.0.0.1]) (amavisd-new, port 10024)\twith LMTP id\n\t8gXQueL3Qb+i; Mon, 11 Sep 2017 05:18:57 -0400 (EDT)",
            "from tron.gnat.com (tron.gnat.com [205.232.38.10])\tby\n\trock.gnat.com (Postfix) with ESMTP id 65B4E56127;\n\tMon, 11 Sep 2017 05:18:57 -0400 (EDT)",
            "by tron.gnat.com (Postfix, from userid 4192)\tid 61EA24F2;\n\tMon, 11 Sep 2017 05:18:57 -0400 (EDT)"
        ],
        "DomainKey-Signature": "a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id\n\t:list-unsubscribe:list-archive:list-post:list-help:sender:date\n\t:from:to:cc:subject:message-id:mime-version:content-type; q=dns;\n\ts=default; b=cKncFX4Qp875rprW5wz0nHFoT0LBg8Q/i4sURcOEwzedV0FiZf\n\tG5FzpgEk9vtQcGHB5bE4Yw21RthLpo5APHX34IkC0n5MbxAJDpQuHNLyYMKi7c9j\n\tghl7VDyeVQCOIQrDxRdy/MF6V8IwjED5PPPid0m3YaGWCUio1vaTwPj14=",
        "DKIM-Signature": "v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id\n\t:list-unsubscribe:list-archive:list-post:list-help:sender:date\n\t:from:to:cc:subject:message-id:mime-version:content-type; s=\n\tdefault; bh=Ngy6fG7PWkWhTkW07QNrh2pumGc=; b=iuIGdm8P1hfbB34gzWgY\n\t4VXv/ywjByI0zDG6vgsNyFsjA2d+Scaa2FssKO59+AV0FtgqmfqPPxPKUatnvKvL\n\tH5Mv+bBMZQxe5+BiCdwzHPnxc7Zmtj5OBnzEi4FBJ4piGlCaqSHS85rbFmG3PrMb\n\tDbtwho9RJkeeXhROP8mHtR4=",
        "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",
        "X-Virus-Found": "No",
        "X-Spam-SWARE-Status": "No, score=-11.2 required=5.0 tests=AWL, BAYES_00,\n\tGIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE,\n\tSPF_PASS autolearn=ham version=3.3.2 spammy=3456, Alpha",
        "X-HELO": "rock.gnat.com",
        "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-Type": "multipart/mixed; boundary=\"W/nzBZO5zC0uMSeA\"",
        "Content-Disposition": "inline",
        "User-Agent": "Mutt/1.5.23 (2014-03-12)"
    },
    "content": "This is the next step in the source file and directory reorg in GNAT sources.\nThis time, we rename all files of the form ?-[a-z]*-* into ?-[a-z]*_*,\nfor example s-tpopsp-posix.adb becomes s-tpopsp__posix.adb. This is done\nso that it's easier to see which files are platform specific variants (such\nfiles will now always contain a double underscore).\n\nThis change is for the libgnarl directory, the next change will do the same\nfor the libgnat directory.\n\nAs with the previous changes, there's a small chance that some target got\nforgotten in Makefile.in, but hopefully not! If this is the case, fixing it\nis purely mechanical and is preapproved.\n\nThe diff is huge and mechanical, I'm only including the part in\ngcc-interface/Makefile.in.\n\nTested on x86_64-pc-linux-gnu, committed on trunk\n\n2017-09-11  Jerome Lambourg  <lambourg@adacore.com>\n\n        * libgnarl: Rename ?-[a-z]*-* into ?-[a-z]*__*\n        * gcc-interface/Makefile.in: Take this renaming into account.",
    "diff": "Index: gcc-interface/Makefile.in\n===================================================================\n--- gcc-interface/Makefile.in\t(revision 251956)\n+++ gcc-interface/Makefile.in\t(working copy)\n@@ -355,13 +355,13 @@\n # Non-tasking case:\n \n LIBGNAT_TARGET_PAIRS = \\\n-a-intnam.ads<libgnarl/a-intnam-dummy.ads \\\n-s-inmaop.adb<libgnarl/s-inmaop-dummy.adb \\\n-s-intman.adb<libgnarl/s-intman-dummy.adb \\\n-s-osinte.ads<libgnarl/s-osinte-dummy.ads \\\n+a-intnam.ads<libgnarl/a-intnam__dummy.ads \\\n+s-inmaop.adb<libgnarl/s-inmaop__dummy.adb \\\n+s-intman.adb<libgnarl/s-intman__dummy.adb \\\n+s-osinte.ads<libgnarl/s-osinte__dummy.ads \\\n s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-s-taprop.adb<libgnarl/s-taprop-dummy.adb \\\n-s-taspri.ads<libgnarl/s-taspri-dummy.ads\n+s-taprop.adb<libgnarl/s-taprop__dummy.adb \\\n+s-taspri.ads<libgnarl/s-taspri__dummy.ads\n \n # When using the GCC exception handling mechanism, we need to use an\n # alternate body for a-exexpr.adb (a-exexpr-gcc.adb)\n@@ -506,20 +506,20 @@\n   endif\n \n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-vxworks.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__vxworks.ads \\\n   a-numaux.ads<libgnat/a-numaux-vxworks.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-vxworks.adb \\\n-  s-intman.ads<libgnarl/s-intman-vxworks.ads \\\n-  s-intman.adb<libgnarl/s-intman-vxworks.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-vxworks.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-vxworks.adb \\\n+  s-inmaop.adb<libgnarl/s-inmaop__vxworks.adb \\\n+  s-intman.ads<libgnarl/s-intman__vxworks.ads \\\n+  s-intman.adb<libgnarl/s-intman__vxworks.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__vxworks.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__vxworks.adb \\\n   s-osprim.adb<libgnat/s-osprim-vxworks.adb \\\n   s-parame.ads<libgnat/s-parame-vxworks.ads \\\n   s-parame.adb<libgnat/s-parame-vxworks.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-vxworks.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-vxworks.ads \\\n-  s-taspri.ads<libgnarl/s-taspri-vxworks.ads \\\n-  s-vxwork.ads<libgnarl/s-vxwork-ppc.ads \\\n+  s-taprop.adb<libgnarl/s-taprop__vxworks.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__vxworks.ads \\\n+  s-taspri.ads<libgnarl/s-taspri__vxworks.ads \\\n+  s-vxwork.ads<libgnarl/s-vxwork__ppc.ads \\\n   g-socthi.ads<libgnat/g-socthi-vxworks.ads \\\n   g-socthi.adb<libgnat/g-socthi-vxworks.adb \\\n   g-stsifd.adb<libgnat/g-stsifd-sockets.adb \\\n@@ -544,19 +544,19 @@\n \n   ifeq ($(strip $(filter-out rtp,$(THREAD_KIND))),)\n     LIBGNAT_TARGET_PAIRS += \\\n-    s-vxwext.ads<libgnarl/s-vxwext-rtp.ads \\\n-    s-vxwext.adb<libgnarl/s-vxwext-rtp.adb \\\n-    s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-rtp.adb \\\n+    s-vxwext.ads<libgnarl/s-vxwext__rtp.ads \\\n+    s-vxwext.adb<libgnarl/s-vxwext__rtp.adb \\\n+    s-tpopsp.adb<libgnarl/s-tpopsp__vxworks-rtp.adb \\\n     system.ads<libgnat/system-vxworks-$(ARCH_STR)-rtp.ads\n \n     EH_MECHANISM=-gcc\n   else\n     ifeq ($(strip $(filter-out rtp-smp,$(THREAD_KIND))),)\n       LIBGNAT_TARGET_PAIRS += \\\n-      s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-      s-vxwext.ads<libgnarl/s-vxwext-rtp.ads \\\n-      s-vxwext.adb<libgnarl/s-vxwext-rtp-smp.adb \\\n-      s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-tls.adb \\\n+      s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+      s-vxwext.ads<libgnarl/s-vxwext__rtp.ads \\\n+      s-vxwext.adb<libgnarl/s-vxwext__rtp-smp.adb \\\n+      s-tpopsp.adb<libgnarl/s-tpopsp__vxworks-tls.adb \\\n       system.ads<libgnat/$(SVX)-$(ARCH_STR)-rtp-smp.ads\n \n       EH_MECHANISM=-gcc\n@@ -564,25 +564,25 @@\n     else\n       ifeq ($(strip $(filter-out kernel-smp,$(THREAD_KIND))),)\n         LIBGNAT_TARGET_PAIRS += \\\n-        s-interr.adb<libgnarl/s-interr-vxworks.adb \\\n-        s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-        s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-tls.adb \\\n-        s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \\\n-        s-vxwext.adb<libgnarl/s-vxwext-kernel-smp.adb \\\n+        s-interr.adb<libgnarl/s-interr__vxworks.adb \\\n+        s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+        s-tpopsp.adb<libgnarl/s-tpopsp__vxworks-tls.adb \\\n+        s-vxwext.ads<libgnarl/s-vxwext__kernel.ads \\\n+        s-vxwext.adb<libgnarl/s-vxwext__kernel-smp.adb \\\n         system.ads<libgnat/system-vxworks-$(ARCH_STR)-kernel.ads\n \n         EH_MECHANISM=-gcc\n         EXTRA_LIBGNAT_OBJS+=affinity.o\n       else\n         LIBGNAT_TARGET_PAIRS += \\\n-        s-interr.adb<libgnarl/s-interr-vxworks.adb \\\n-        s-tpopsp.adb<libgnarl/s-tpopsp-vxworks.adb\n+        s-interr.adb<libgnarl/s-interr__vxworks.adb \\\n+        s-tpopsp.adb<libgnarl/s-tpopsp__vxworks.adb\n \n         ifeq ($(strip $(filter-out kernel,$(THREAD_KIND))),)\n           EH_MECHANISM=-gcc\n           LIBGNAT_TARGET_PAIRS += \\\n-          s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \\\n-          s-vxwext.adb<libgnarl/s-vxwext-kernel.adb \\\n+          s-vxwext.ads<libgnarl/s-vxwext__kernel.ads \\\n+          s-vxwext.adb<libgnarl/s-vxwext__kernel.adb \\\n           system.ads<libgnat/system-vxworks-$(ARCH_STR)-kernel.ads\n         else\n           LIBGNAT_TARGET_PAIRS += \\\n@@ -634,22 +634,22 @@\n   endif\n \n   LIBGNAT_TARGET_PAIRS+= \\\n-  a-intnam.ads<libgnarl/a-intnam-vxworks.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__vxworks.ads \\\n   i-vxwork.ads<libgnat/i-vxwork-x86.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-vxworks.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-vxworks.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-vxworks.adb \\\n-  s-intman.ads<libgnarl/s-intman-vxworks.ads \\\n-  s-intman.adb<libgnarl/s-intman-vxworks.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__vxworks.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__vxworks.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__vxworks.adb \\\n+  s-intman.ads<libgnarl/s-intman__vxworks.ads \\\n+  s-intman.adb<libgnarl/s-intman__vxworks.adb \\\n   s-osprim.adb<libgnat/s-osprim-vxworks.adb \\\n   s-parame.ads<libgnat/s-parame-vxworks.ads \\\n   s-parame.adb<libgnat/s-parame-vxworks.adb \\\n   s-stchop.ads<libgnat/s-stchop-limit.ads \\\n   s-stchop.adb<libgnat/s-stchop-vxworks.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-vxworks.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-vxworks.ads \\\n-  s-taspri.ads<libgnarl/s-taspri-vxworks.ads \\\n-  s-vxwork.ads<libgnarl/s-vxwork-x86.ads \\\n+  s-taprop.adb<libgnarl/s-taprop__vxworks.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__vxworks.ads \\\n+  s-taspri.ads<libgnarl/s-taspri__vxworks.ads \\\n+  s-vxwork.ads<libgnarl/s-vxwork__x86.ads \\\n   g-socthi.ads<libgnat/g-socthi-vxworks.ads \\\n   g-socthi.adb<libgnat/g-socthi-vxworks.adb \\\n   g-stsifd.adb<libgnat/g-stsifd-sockets.adb \\\n@@ -699,41 +699,41 @@\n   ifeq ($(strip $(filter-out rtp,$(THREAD_KIND))),)\n     # Runtime N/A for VxWorks7 (non-existent system file)\n     LIBGNAT_TARGET_PAIRS += \\\n-    s-vxwext.ads<libgnarl/s-vxwext-rtp.ads \\\n-    s-vxwext.adb<libgnarl/s-vxwext-rtp.adb \\\n-    s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-rtp.adb \\\n+    s-vxwext.ads<libgnarl/s-vxwext__rtp.ads \\\n+    s-vxwext.adb<libgnarl/s-vxwext__rtp.adb \\\n+    s-tpopsp.adb<libgnarl/s-tpopsp__vxworks-rtp.adb \\\n     system.ads<libgnat/system-vxworks-x86-rtp.ads\n   else\n     ifeq ($(strip $(filter-out rtp-smp, $(THREAD_KIND))),)\n       LIBGNAT_TARGET_PAIRS += \\\n-      s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-      s-vxwext.ads<libgnarl/s-vxwext-rtp.ads \\\n-      s-vxwext.adb<libgnarl/s-vxwext-rtp-smp.adb \\\n-      s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-tls.adb \\\n+      s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+      s-vxwext.ads<libgnarl/s-vxwext__rtp.ads \\\n+      s-vxwext.adb<libgnarl/s-vxwext__rtp-smp.adb \\\n+      s-tpopsp.adb<libgnarl/s-tpopsp__vxworks-tls.adb \\\n       system.ads<libgnat/$(SVX)-$(X86CPU)-rtp-smp.ads\n \n       EXTRA_LIBGNAT_OBJS+=affinity.o\n     else\n       ifeq ($(strip $(filter-out kernel-smp, $(THREAD_KIND))),)\n         LIBGNAT_TARGET_PAIRS += \\\n-        s-interr.adb<libgnarl/s-interr-vxworks.adb \\\n-        s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-        s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-tls.adb \\\n-        s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \\\n-        s-vxwext.adb<libgnarl/s-vxwext-kernel-smp.adb \\\n+        s-interr.adb<libgnarl/s-interr__vxworks.adb \\\n+        s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+        s-tpopsp.adb<libgnarl/s-tpopsp__vxworks-tls.adb \\\n+        s-vxwext.ads<libgnarl/s-vxwext__kernel.ads \\\n+        s-vxwext.adb<libgnarl/s-vxwext__kernel-smp.adb \\\n         system.ads<libgnat/$(SVX)-$(X86CPU)-kernel.ads\n \n         EXTRA_LIBGNAT_OBJS+=affinity.o\n       else\n         LIBGNAT_TARGET_PAIRS += \\\n-        s-interr.adb<libgnarl/s-interr-vxworks.adb \\\n-        s-tpopsp.adb<libgnarl/s-tpopsp-vxworks.adb\n+        s-interr.adb<libgnarl/s-interr__vxworks.adb \\\n+        s-tpopsp.adb<libgnarl/s-tpopsp__vxworks.adb\n \n         ifeq ($(strip $(filter-out kernel,$(THREAD_KIND))),)\n           # Runtime N/A for VxWorks7 (non-existent system file)\n           LIBGNAT_TARGET_PAIRS += \\\n-          s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \\\n-          s-vxwext.adb<libgnarl/s-vxwext-kernel.adb \\\n+          s-vxwext.ads<libgnarl/s-vxwext__kernel.ads \\\n+          s-vxwext.adb<libgnarl/s-vxwext__kernel.adb \\\n           system.ads<libgnat/$(SVX)-x86-kernel.ads\n         else\n           LIBGNAT_TARGET_PAIRS += \\\n@@ -781,23 +781,23 @@\n   endif\n \n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-vxworks.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__vxworks.ads \\\n   a-numaux.ads<libgnat/a-numaux-vxworks.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-vxworks.adb \\\n-  s-interr.adb<libgnarl/s-interr-vxworks.adb \\\n-  s-intman.ads<libgnarl/s-intman-vxworks.ads \\\n-  s-intman.adb<libgnarl/s-intman-vxworks.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-vxworks.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-vxworks.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__vxworks.adb \\\n+  s-interr.adb<libgnarl/s-interr__vxworks.adb \\\n+  s-intman.ads<libgnarl/s-intman__vxworks.ads \\\n+  s-intman.adb<libgnarl/s-intman__vxworks.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__vxworks.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__vxworks.ads \\\n   s-osprim.adb<libgnat/s-osprim-vxworks.adb \\\n   s-parame.ads<libgnat/s-parame-vxworks.ads \\\n   s-parame.adb<libgnat/s-parame-vxworks.adb \\\n   s-stchop.ads<libgnat/s-stchop-limit.ads \\\n   s-stchop.adb<libgnat/s-stchop-vxworks.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-vxworks.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-vxworks.ads \\\n-  s-taspri.ads<libgnarl/s-taspri-vxworks.ads \\\n-  s-vxwork.ads<libgnarl/s-vxwork-arm.ads \\\n+  s-taprop.adb<libgnarl/s-taprop__vxworks.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__vxworks.ads \\\n+  s-taspri.ads<libgnarl/s-taspri__vxworks.ads \\\n+  s-vxwork.ads<libgnarl/s-vxwork__arm.ads \\\n   g-socthi.ads<libgnat/g-socthi-vxworks.ads \\\n   g-socthi.adb<libgnat/g-socthi-vxworks.adb \\\n   g-stsifd.adb<libgnat/g-stsifd-sockets.adb\n@@ -806,10 +806,10 @@\n \n   ifeq ($(strip $(filter-out rtp-smp,$(THREAD_KIND))),)\n     LIBGNAT_TARGET_PAIRS += \\\n-    s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-    s-vxwext.ads<libgnarl/s-vxwext-rtp.ads \\\n-    s-vxwext.adb<libgnarl/s-vxwext-rtp-smp.adb \\\n-    s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-tls.adb \\\n+    s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+    s-vxwext.ads<libgnarl/s-vxwext__rtp.ads \\\n+    s-vxwext.adb<libgnarl/s-vxwext__rtp-smp.adb \\\n+    s-tpopsp.adb<libgnarl/s-tpopsp__vxworks-tls.adb \\\n     system.ads<libgnat/$(SVX)-arm-rtp-smp.ads\n \n     EXTRA_LIBGNAT_OBJS+=affinity.o\n@@ -819,10 +819,10 @@\n   else\n     ifeq ($(strip $(filter-out kernel-smp,$(THREAD_KIND))),)\n       LIBGNAT_TARGET_PAIRS += \\\n-      s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-      s-tpopsp.adb<libgnarl/s-tpopsp-vxworks-tls.adb \\\n-      s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \\\n-      s-vxwext.adb<libgnarl/s-vxwext-kernel-smp.adb \\\n+      s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+      s-tpopsp.adb<libgnarl/s-tpopsp__vxworks-tls.adb \\\n+      s-vxwext.ads<libgnarl/s-vxwext__kernel.ads \\\n+      s-vxwext.adb<libgnarl/s-vxwext__kernel-smp.adb \\\n       system.ads<libgnat/$(SVX)-arm.ads\n \n       EXTRA_LIBGNAT_OBJS+=affinity.o\n@@ -831,13 +831,13 @@\n       EXTRA_LIBGNAT_SRCS+=$(VX_SIGTRAMP_EXTRA_SRCS)\n     else\n       LIBGNAT_TARGET_PAIRS += \\\n-      s-tpopsp.adb<libgnarl/s-tpopsp-vxworks.adb \\\n+      s-tpopsp.adb<libgnarl/s-tpopsp__vxworks.adb \\\n       system.ads<libgnat/$(SVX)-arm.ads\n \n       ifeq ($(strip $(filter-out kernel,$(THREAD_KIND))),)\n         LIBGNAT_TARGET_PAIRS += \\\n-        s-vxwext.ads<libgnarl/s-vxwext-kernel.ads \\\n-        s-vxwext.adb<libgnarl/s-vxwext-kernel.adb\n+        s-vxwext.ads<libgnarl/s-vxwext__kernel.ads \\\n+        s-vxwext.adb<libgnarl/s-vxwext__kernel.adb\n \n         EXTRA_LIBGNAT_OBJS+=$(SIGTRAMP_OBJ)\n         EXTRA_LIBGNAT_SRCS+=$(VX_SIGTRAMP_EXTRA_SRCS)\n@@ -866,16 +866,16 @@\n # ARM android\n ifeq ($(strip $(filter-out arm% linux-androideabi,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-android.adb \\\n-  s-linux.ads<libgnarl/s-linux-android.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-android.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-android.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__android.adb \\\n+  s-linux.ads<libgnarl/s-linux__android.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__android.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__android.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(ATOMICS_BUILTINS_TARGET_PAIRS) \\\n   system.ads<libgnat/system-linux-arm.ads\n@@ -894,18 +894,18 @@\n # Sparc Solaris\n ifeq ($(strip $(filter-out sparc% sun solaris%,$(target_cpu) $(target_vendor) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-solaris.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-solaris.adb \\\n-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-solaris.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-solaris.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__solaris.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__solaris.adb \\\n+  s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__solaris.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__solaris.ads \\\n   s-osprim.adb<libgnat/s-osprim-solaris.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-solaris.adb \\\n-  s-tasinf.adb<libgnarl/s-tasinf-solaris.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-solaris.ads \\\n-  s-taspri.ads<libgnarl/s-taspri-solaris.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-solaris.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__solaris.adb \\\n+  s-tasinf.adb<libgnarl/s-tasinf__solaris.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__solaris.ads \\\n+  s-taspri.ads<libgnarl/s-taspri__solaris.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__solaris.adb \\\n   g-soliop.ads<libgnat/g-soliop-solaris.ads \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(ATOMICS_BUILTINS_TARGET_PAIRS) \\\n@@ -927,18 +927,18 @@\n # x86 and x86-64 solaris\n ifeq ($(strip $(filter-out %86 %x86_64 solaris2%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS_COMMON = \\\n-  a-intnam.ads<libgnarl/a-intnam-solaris.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-solaris.adb \\\n-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-solaris.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-solaris.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__solaris.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__solaris.adb \\\n+  s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__solaris.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__solaris.ads \\\n   s-osprim.adb<libgnat/s-osprim-solaris.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-solaris.adb \\\n-  s-tasinf.adb<libgnarl/s-tasinf-solaris.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-solaris.ads \\\n-  s-taspri.ads<libgnarl/s-taspri-solaris.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-solaris.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__solaris.adb \\\n+  s-tasinf.adb<libgnarl/s-tasinf__solaris.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__solaris.ads \\\n+  s-taspri.ads<libgnarl/s-taspri__solaris.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__solaris.adb \\\n   g-soliop.ads<libgnat/g-soliop-solaris.ads \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   system.ads<libgnat/system-solaris-x86.ads\n@@ -975,19 +975,19 @@\n # x86 Linux\n ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  a-synbar.adb<libgnarl/a-synbar-posix.adb \\\n-  a-synbar.ads<libgnarl/a-synbar-posix.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  a-synbar.adb<libgnarl/a-synbar__posix.adb \\\n+  a-synbar.ads<libgnarl/a-synbar__posix.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \\\n   $(TRASYM_DWARF_UNIX_PAIRS) \\\n   g-sercom.adb<libgnat/g-sercom-linux.adb \\\n   s-tsmona.adb<libgnat/s-tsmona-linux.adb \\\n-  a-exetim.adb<libgnarl/a-exetim-posix.adb \\\n-  a-exetim.ads<libgnarl/a-exetim-default.ads \\\n+  a-exetim.adb<libgnarl/a-exetim__posix.adb \\\n+  a-exetim.ads<libgnarl/a-exetim__default.ads \\\n   s-linux.ads<libgnarl/s-linux.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   system.ads<libgnat/system-linux-x86.ads\n \n@@ -998,13 +998,13 @@\n   endif\n \n   LIBGNAT_TARGET_PAIRS += \\\n-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n+  s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads\n \n   EH_MECHANISM=-gcc\n   THREADSLIB = -lpthread -lrt\n@@ -1023,15 +1023,15 @@\n # x86 kfreebsd\n ifeq ($(strip $(filter-out %86 kfreebsd%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-freebsd.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-kfreebsd-gnu.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__freebsd.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__kfreebsd-gnu.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(X86_TARGET_PAIRS) \\\n   system.ads<libgnat/system-freebsd.ads\n@@ -1051,15 +1051,15 @@\n # i[3456]86-pc-gnu i.e. GNU Hurd\n ifeq ($(strip $(filter-out %86 pc gnu,$(target_cpu) $(target_vendor) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-freebsd.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-gnu.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-gnu.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__freebsd.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__gnu.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__gnu.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(X86_TARGET_PAIRS) \\\n   system.ads<libgnat/system-freebsd.ads\n@@ -1077,17 +1077,17 @@\n \n ifeq ($(strip $(filter-out x86_64 kfreebsd%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-freebsd.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__freebsd.ads \\\n   a-numaux.adb<libgnat/a-numaux-x86.adb \\\n   a-numaux.ads<libgnat/a-numaux-x86.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-kfreebsd-gnu.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__kfreebsd-gnu.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n   system.ads<libgnat/system-freebsd.ads\n \n   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb\n@@ -1102,16 +1102,16 @@\n # aarch64 FreeBSD\n ifeq ($(strip $(filter-out %aarch64 freebsd%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-freebsd.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-freebsd.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-freebsd.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__freebsd.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__freebsd.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__freebsd.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(ATOMICS_BUILTINS_TARGET_PAIRS) \\\n   system.ads<libgnat/system-freebsd.ads\n@@ -1128,16 +1128,16 @@\n # x86 FreeBSD\n ifeq ($(strip $(filter-out %86 freebsd%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-freebsd.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-freebsd.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-freebsd.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__freebsd.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__freebsd.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__freebsd.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(X86_TARGET_PAIRS) \\\n   system.ads<libgnat/system-freebsd.ads\n@@ -1156,16 +1156,16 @@\n # x86-64 FreeBSD\n ifeq ($(strip $(filter-out %86_64 freebsd%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-freebsd.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-freebsd.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-freebsd.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__freebsd.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__freebsd.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__freebsd.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(X86_64_TARGET_PAIRS) \\\n   system.ads<libgnat/system-freebsd.ads\n@@ -1184,16 +1184,16 @@\n # x86-64 DragonFly\n ifeq ($(strip $(filter-out %86_64 dragonfly%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-dragonfly.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-dragonfly.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-dragonfly.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__dragonfly.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__dragonfly.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__dragonfly.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(X86_64_TARGET_PAIRS) \\\n   system.ads<libgnat/system-dragonfly-x86_64.ads\n@@ -1212,18 +1212,18 @@\n # S390 Linux\n ifeq ($(strip $(filter-out s390% linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n   s-linux.ads<libgnarl/s-linux.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n   system.ads<libgnat/system-linux-s390.ads\n \n   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb\n@@ -1239,17 +1239,17 @@\n ifeq ($(strip $(filter-out hppa% hp hpux10%,$(target_cpu) $(target_vendor) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n   a-excpol.adb<libgnat/a-excpol-abort.adb \\\n-  a-intnam.ads<libgnarl/a-intnam-hpux.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-interr.adb<libgnarl/s-interr-sigaction.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-hpux-dce.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-hpux-dce.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__hpux.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-interr.adb<libgnarl/s-interr__sigaction.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__hpux-dce.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__hpux-dce.ads \\\n   s-parame.ads<libgnat/s-parame-hpux.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-hpux-dce.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-hpux-dce.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__hpux-dce.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__hpux-dce.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix.adb \\\n   system.ads<libgnat/system-hpux.ads\n \n   EH_MECHANISM=-gcc\n@@ -1258,17 +1258,17 @@\n # HP/PA HP-UX 11\n ifeq ($(strip $(filter-out hppa% hp hpux11%,$(target_cpu) $(target_vendor) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-hpux.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-hpux.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__hpux.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__hpux.ads \\\n   s-parame.ads<libgnat/s-parame-hpux.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n   s-traceb.adb<libgnat/s-traceb-hpux.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n   system.ads<libgnat/system-hpux.ads\n \n   EH_MECHANISM=-gcc\n@@ -1284,15 +1284,15 @@\n # IBM AIX\n ifeq ($(strip $(filter-out ibm aix%,$(target_vendor) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-aix.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-aix.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-aix.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__aix.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__aix.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__aix.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(ATOMICS_BUILTINS_TARGET_PAIRS) \\\n   system.ads<libgnat/system-aix.ads\n@@ -1316,18 +1316,18 @@\n ifeq ($(strip $(filter-out rtems%,$(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n   system.ads<libgnat/system-rtems.ads \\\n-  a-intnam.ads<libgnarl/a-intnam-rtems.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-rtems.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-rtems.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__rtems.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__rtems.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__rtems.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n   s-parame.adb<libgnat/s-parame-rtems.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \\\n-  s-stchop.adb<libgnat/s-stchop-rtems.adb \\\n-  s-interr.adb<libgnarl/s-interr-hwint.adb\n+  s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \\\n+  s-stchop.adb<libgnat/s-stchop__rtems.adb \\\n+  s-interr.adb<libgnarl/s-interr__hwint.adb\n endif\n \n # PikeOS\n@@ -1344,13 +1344,13 @@\n   GNATRTL_SOCKETS_OBJS =\n \n   LIBGNAT_TARGET_PAIRS = \\\n-\ta-intnam.ads<libgnarl/a-intnam-dummy.ads \\\n-\ts-inmaop.adb<libgnarl/s-inmaop-dummy.adb \\\n-\ts-intman.adb<libgnarl/s-intman-dummy.adb \\\n-\ts-osinte.ads<libgnarl/s-osinte-dummy.ads \\\n+\ta-intnam.ads<libgnarl/a-intnam__dummy.ads \\\n+\ts-inmaop.adb<libgnarl/s-inmaop__dummy.adb \\\n+\ts-intman.adb<libgnarl/s-intman__dummy.adb \\\n+\ts-osinte.ads<libgnarl/s-osinte__dummy.ads \\\n \ts-osprim.adb<libgnat/s-osprim-unix.adb \\\n-\ts-taprop.adb<libgnarl/s-taprop-dummy.adb \\\n-\ts-taspri.ads<libgnarl/s-taspri-dummy.ads \\\n+\ts-taprop.adb<libgnarl/s-taprop__dummy.adb \\\n+\ts-taspri.ads<libgnarl/s-taspri__dummy.ads \\\n \tsystem.ads<libgnat/system-djgpp.ads \\\n \t$(DUMMY_SOCKETS_TARGET_PAIRS)\n \n@@ -1380,27 +1380,27 @@\n   a-dirval.adb<libgnat/a-dirval-mingw.adb \\\n   a-excpol.adb<libgnat/a-excpol-abort.adb \\\n   s-gloloc.adb<libgnat/s-gloloc-mingw.adb \\\n-  s-inmaop.adb<libgnarl/s-inmaop-dummy.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-mingw.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-mingw.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-mingw.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__dummy.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__mingw.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__mingw.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__mingw.ads \\\n   g-stsifd.adb<libgnat/g-stsifd-sockets.adb \\\n   g-soliop.ads<libgnat/g-soliop-mingw.ads \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   system.ads<libgnat/system-mingw.ads\n \n   LIBGNAT_TARGET_PAIRS += \\\n-  a-exetim.adb<libgnarl/a-exetim-mingw.adb \\\n-  a-exetim.ads<libgnarl/a-exetim-mingw.ads \\\n-  a-intnam.ads<libgnarl/a-intnam-mingw.ads \\\n+  a-exetim.adb<libgnarl/a-exetim__mingw.adb \\\n+  a-exetim.ads<libgnarl/a-exetim__mingw.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__mingw.ads \\\n   g-sercom.adb<libgnat/g-sercom-mingw.adb \\\n   s-tsmona.adb<libgnat/s-tsmona-mingw.adb \\\n-  s-interr.adb<libgnarl/s-interr-sigaction.adb \\\n-  s-intman.adb<libgnarl/s-intman-mingw.adb \\\n-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-mingw.ads \\\n+  s-interr.adb<libgnarl/s-interr__sigaction.adb \\\n+  s-intman.adb<libgnarl/s-intman__mingw.adb \\\n+  s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__mingw.ads \\\n   s-osprim.adb<libgnat/s-osprim-mingw.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-mingw.adb\n+  s-taprop.adb<libgnarl/s-taprop__mingw.adb\n \n   ifeq ($(strip $(filter-out x86_64%,$(target_cpu))),)\n     ifeq ($(strip $(MULTISUBDIR)),/32)\n@@ -1444,18 +1444,18 @@\n # Mips Linux\n ifeq ($(strip $(filter-out mips% linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-linux.ads<libgnarl/s-linux-mips.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-linux.ads<libgnarl/s-linux__mips.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n   g-sercom.adb<libgnat/g-sercom-linux.adb \\\n   system.ads<libgnat/system-linux-mips.ads\n \n@@ -1472,16 +1472,16 @@\n # PowerPC and e500v2 Linux\n ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS_COMMON = \\\n-  a-exetim.adb<libgnarl/a-exetim-posix.adb \\\n-  a-exetim.ads<libgnarl/a-exetim-default.ads \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  a-synbar.adb<libgnarl/a-synbar-posix.adb \\\n-  a-synbar.ads<libgnarl/a-synbar-posix.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n+  a-exetim.adb<libgnarl/a-exetim__posix.adb \\\n+  a-exetim.ads<libgnarl/a-exetim__default.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  a-synbar.adb<libgnarl/a-synbar__posix.adb \\\n+  a-synbar.ads<libgnarl/a-synbar__posix.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n   s-linux.ads<libgnarl/s-linux.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \\\n   g-sercom.adb<libgnat/g-sercom-linux.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(ATOMICS_BUILTINS_TARGET_PAIRS) \\\n@@ -1489,13 +1489,13 @@\n \n   LIBGNAT_TARGET_PAIRS = \\\n     $(LIBGNAT_TARGET_PAIRS_COMMON) \\\n-    s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-    s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n+    s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+    s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n     s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-    s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-    s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-    s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-    s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads\n+    s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+    s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+    s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+    s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads\n \n   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb\n \n@@ -1511,18 +1511,18 @@\n # ARM linux, GNU eabi\n ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n   s-linux.ads<libgnarl/s-linux.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(ATOMICS_BUILTINS_TARGET_PAIRS) \\\n   system.ads<libgnat/system-linux-arm.ads\n@@ -1545,23 +1545,23 @@\n # AArch64 Linux\n ifeq ($(strip $(filter-out aarch64% linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-exetim.adb<libgnarl/a-exetim-posix.adb \\\n-  a-exetim.ads<libgnarl/a-exetim-default.ads \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  a-synbar.adb<libgnarl/a-synbar-posix.adb \\\n-  a-synbar.ads<libgnarl/a-synbar-posix.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n+  a-exetim.adb<libgnarl/a-exetim__posix.adb \\\n+  a-exetim.ads<libgnarl/a-exetim__default.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  a-synbar.adb<libgnarl/a-synbar__posix.adb \\\n+  a-synbar.ads<libgnarl/a-synbar__posix.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n   s-linux.ads<libgnarl/s-linux.ads \\\n-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n+  s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n   g-sercom.adb<libgnat/g-sercom-linux.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(ATOMICS_BUILTINS_TARGET_PAIRS) \\\n@@ -1580,18 +1580,18 @@\n # Sparc Linux\n ifeq ($(strip $(filter-out sparc% linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-linux.ads<libgnarl/s-linux-sparc.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-linux.ads<libgnarl/s-linux__sparc.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \\\n   system.ads<libgnat/system-linux-sparc.ads\n \n   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb\n@@ -1607,18 +1607,18 @@\n # HP/PA Linux\n ifeq ($(strip $(filter-out hppa% linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-linux.ads<libgnarl/s-linux-hppa.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-linux.ads<libgnarl/s-linux__hppa.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n   system.ads<libgnat/system-linux-hppa.ads\n \n   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb\n@@ -1634,18 +1634,18 @@\n # M68K Linux\n ifeq ($(strip $(filter-out m68k% linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n   s-linux.ads<libgnat/s-linux.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n   system.ads<libgnat/system-linux-m68k.ads\n \n   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb\n@@ -1661,18 +1661,18 @@\n # SH4 Linux\n ifeq ($(strip $(filter-out sh4% linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n   s-linux.ads<libgnarl/s-linux.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n   system.ads<libgnat/system-linux-sh4.ads\n \n   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-linux.adb\n@@ -1689,24 +1689,24 @@\n # IA64 Linux\n ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-exetim.adb<libgnarl/a-exetim-posix.adb \\\n-  a-exetim.ads<libgnarl/a-exetim-default.ads \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n+  a-exetim.adb<libgnarl/a-exetim__posix.adb \\\n+  a-exetim.ads<libgnarl/a-exetim__default.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n   a-numaux.ads<libgnat/a-numaux-libc-x86.ads \\\n-  a-synbar.adb<libgnarl/a-synbar-posix.adb \\\n-  a-synbar.ads<libgnarl/a-synbar-posix.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n+  a-synbar.adb<libgnarl/a-synbar__posix.adb \\\n+  a-synbar.ads<libgnarl/a-synbar__posix.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n   s-linux.ads<libgnarl/s-linux.ads \\\n-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n+  s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \\\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \\\n   g-sercom.adb<libgnat/g-sercom-linux.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(ATOMICS_BUILTINS_TARGET_PAIRS) \\\n@@ -1726,15 +1726,15 @@\n # IA64 HP-UX\n ifeq ($(strip $(filter-out ia64% hp hpux%,$(target_cpu) $(target_vendor) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-hpux.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-hpux.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__hpux.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__hpux.ads \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n+  s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(ATOMICS_BUILTINS_TARGET_PAIRS) \\\n   system.ads<libgnat/system-hpux-ia64.ads\n@@ -1752,18 +1752,18 @@\n # Alpha Linux\n ifeq ($(strip $(filter-out alpha% linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-linux.ads<libgnarl/s-linux-alpha.ads \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-linux.ads<libgnarl/s-linux__alpha.ads \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix-noaltstack.ads \\\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(ATOMICS_BUILTINS_TARGET_PAIRS) \\\n   system.ads<libgnat/system-linux-alpha.ads\n@@ -1781,23 +1781,23 @@\n # x86-64 Linux\n ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-exetim.adb<libgnarl/a-exetim-posix.adb \\\n-  a-exetim.ads<libgnarl/a-exetim-default.ads \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  a-synbar.adb<libgnarl/a-synbar-posix.adb \\\n-  a-synbar.ads<libgnarl/a-synbar-posix.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n+  a-exetim.adb<libgnarl/a-exetim__posix.adb \\\n+  a-exetim.ads<libgnarl/a-exetim__default.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  a-synbar.adb<libgnarl/a-synbar__posix.adb \\\n+  a-synbar.ads<libgnarl/a-synbar__posix.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n   s-linux.ads<libgnarl/s-linux.ads \\\n-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-posix.adb \\\n+  s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__posix.adb \\\n   s-osprim.adb<libgnat/s-osprim-posix.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n   g-sercom.adb<libgnat/g-sercom-linux.adb \\\n   $(TRASYM_DWARF_UNIX_PAIRS) \\\n   s-tsmona.adb<libgnat/s-tsmona-linux.adb \\\n@@ -1821,23 +1821,23 @@\n \n ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)\n   LIBGNAT_TARGET_PAIRS = \\\n-  a-exetim.adb<libgnarl/a-exetim-posix.adb \\\n-  a-exetim.ads<libgnarl/a-exetim-default.ads \\\n-  a-intnam.ads<libgnarl/a-intnam-linux.ads \\\n-  a-synbar.adb<libgnarl/a-synbar-posix.adb \\\n-  a-synbar.ads<libgnarl/a-synbar-posix.ads \\\n-  s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-  s-intman.adb<libgnarl/s-intman-posix.adb \\\n-  s-linux.ads<libgnarl/s-linux-x32.ads \\\n-  s-mudido.adb<libgnarl/s-mudido-affinity.adb \\\n-  s-osinte.ads<libgnarl/s-osinte-linux.ads \\\n-  s-osinte.adb<libgnarl/s-osinte-x32.adb \\\n+  a-exetim.adb<libgnarl/a-exetim__posix.adb \\\n+  a-exetim.ads<libgnarl/a-exetim__default.ads \\\n+  a-intnam.ads<libgnarl/a-intnam__linux.ads \\\n+  a-synbar.adb<libgnarl/a-synbar__posix.adb \\\n+  a-synbar.ads<libgnarl/a-synbar__posix.ads \\\n+  s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+  s-intman.adb<libgnarl/s-intman__posix.adb \\\n+  s-linux.ads<libgnarl/s-linux__x32.ads \\\n+  s-mudido.adb<libgnarl/s-mudido__affinity.adb \\\n+  s-osinte.ads<libgnarl/s-osinte__linux.ads \\\n+  s-osinte.adb<libgnarl/s-osinte__x32.adb \\\n   s-osprim.adb<libgnat/s-osprim-x32.adb \\\n-  s-taprop.adb<libgnarl/s-taprop-linux.adb \\\n-  s-tasinf.ads<libgnarl/s-tasinf-linux.ads \\\n-  s-tasinf.adb<libgnarl/s-tasinf-linux.adb \\\n-  s-tpopsp.adb<libgnarl/s-tpopsp-tls.adb \\\n-  s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n+  s-taprop.adb<libgnarl/s-taprop__linux.adb \\\n+  s-tasinf.ads<libgnarl/s-tasinf__linux.ads \\\n+  s-tasinf.adb<libgnarl/s-tasinf__linux.adb \\\n+  s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \\\n+  s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n   g-sercom.adb<libgnat/g-sercom-linux.adb \\\n   $(ATOMICS_TARGET_PAIRS) \\\n   $(X86_64_TARGET_PAIRS) \\\n@@ -1858,18 +1858,18 @@\n ifeq ($(strip $(filter-out darwin%,$(target_os))),)\n   SO_OPTS = -shared-libgcc\n   LIBGNAT_TARGET_PAIRS = \\\n-    a-intnam.ads<libgnarl/a-intnam-darwin.ads \\\n-    s-inmaop.adb<libgnarl/s-inmaop-posix.adb \\\n-    s-osinte.adb<libgnarl/s-osinte-darwin.adb \\\n-    s-osinte.ads<libgnarl/s-osinte-darwin.ads \\\n-    s-taprop.adb<libgnarl/s-taprop-posix.adb \\\n-    s-taspri.ads<libgnarl/s-taspri-posix.ads \\\n+    a-intnam.ads<libgnarl/a-intnam__darwin.ads \\\n+    s-inmaop.adb<libgnarl/s-inmaop__posix.adb \\\n+    s-osinte.adb<libgnarl/s-osinte__darwin.adb \\\n+    s-osinte.ads<libgnarl/s-osinte__darwin.ads \\\n+    s-taprop.adb<libgnarl/s-taprop__posix.adb \\\n+    s-taspri.ads<libgnarl/s-taspri__posix.ads \\\n     g-sercom.adb<libgnat/g-sercom-linux.adb \\\n-    s-tpopsp.adb<libgnarl/s-tpopsp-posix-foreign.adb\n+    s-tpopsp.adb<libgnarl/s-tpopsp__posix-foreign.adb\n \n   ifeq ($(strip $(filter-out %86,$(target_cpu))),)\n     LIBGNAT_TARGET_PAIRS += \\\n-      s-intman.adb<libgnarl/s-intman-susv3.adb \\\n+      s-intman.adb<libgnarl/s-intman__susv3.adb \\\n       s-osprim.adb<libgnat/s-osprim-darwin.adb \\\n       $(ATOMICS_TARGET_PAIRS) \\\n       system.ads<libgnat/system-darwin-x86.ads\n@@ -1886,10 +1886,10 @@\n \n   ifeq ($(strip $(filter-out %x86_64,$(target_cpu))),)\n     LIBGNAT_TARGET_PAIRS += \\\n-      s-intman.adb<libgnarl/s-intman-susv3.adb \\\n+      s-intman.adb<libgnarl/s-intman__susv3.adb \\\n       s-osprim.adb<libgnat/s-osprim-darwin.adb \\\n-      a-exetim.ads<libgnarl/a-exetim-default.ads \\\n-      a-exetim.adb<libgnarl/a-exetim-darwin.adb \\\n+      a-exetim.ads<libgnarl/a-exetim__default.ads \\\n+      a-exetim.adb<libgnarl/a-exetim__darwin.adb \\\n       $(ATOMICS_TARGET_PAIRS) \\\n       system.ads<libgnat/system-darwin-x86.ads\n \n@@ -1906,7 +1906,7 @@\n \n   ifeq ($(strip $(filter-out powerpc%,$(target_cpu))),)\n     LIBGNAT_TARGET_PAIRS += \\\n-      s-intman.adb<libgnarl/s-intman-posix.adb \\\n+      s-intman.adb<libgnarl/s-intman__posix.adb \\\n       s-osprim.adb<libgnat/s-osprim-posix.adb \\\n       a-numaux.ads<libgnat/a-numaux-darwin.ads \\\n       a-numaux.adb<libgnat/a-numaux-darwin.adb \\\n@@ -1921,7 +1921,7 @@\n \n   ifeq ($(strip $(filter-out arm,$(target_cpu))),)\n     LIBGNAT_TARGET_PAIRS += \\\n-      s-intman.adb<libgnarl/s-intman-susv3.adb \\\n+      s-intman.adb<libgnarl/s-intman__susv3.adb \\\n       s-osprim.adb<libgnat/s-osprim-darwin.adb \\\n       $(ATOMICS_TARGET_PAIRS) \\\n       $(ATOMICS_BUILTINS_TARGET_PAIRS)\n@@ -1932,7 +1932,7 @@\n \n   ifeq ($(strip $(filter-out arm64 aarch64,$(target_cpu))),)\n     LIBGNAT_TARGET_PAIRS += \\\n-      s-intman.adb<libgnarl/s-intman-susv3.adb \\\n+      s-intman.adb<libgnarl/s-intman__susv3.adb \\\n       s-osprim.adb<libgnat/s-osprim-darwin.adb \\\n       $(ATOMICS_TARGET_PAIRS) \\\n       $(ATOMICS_BUILTINS_TARGET_PAIRS)\n",
    "prefixes": [
        "Ada"
    ]
}