OSDN Git Service

2004-05-17 Steve Kargl <kargls@comcast.net>
[pf3gnuchains/gcc-fork.git] / gcc / ada / Makefile.in
index ad17a50..a094a82 100644 (file)
@@ -105,10 +105,7 @@ MKDIR = mkdir -p
 AR = ar
 AR_FLAGS = rc
 LS = ls
-# How to invoke ranlib.
-RANLIB = ranlib
-# Test to use to see whether ranlib exists on the system.
-RANLIB_TEST = [ -f /usr/bin/ranlib -o -f /bin/ranlib ]
+RANLIB = @RANLIB@
 
 SHELL = @SHELL@
 PWD_COMMAND = $${PWDCMD-pwd}
@@ -251,7 +248,7 @@ LIBIBERTY = ../../libiberty/libiberty.a
 # and the system's installed libraries.
 LIBS = $(LIBINTL) $(LIBIBERTY) $(SYSLIBS)
 LIBDEPS = $(LIBINTL_DEP) $(LIBIBERTY)
-TOOLS_LIBS = $(LIBGNAT) $(EXTRA_GNATTOOLS_OBJS) ../../../libiberty/libiberty.a $(SYSLIBS)
+TOOLS_LIBS = $(LIBGNAT) $(EXTRA_GNATTOOLS_OBJS) link.o ../../../libiberty/libiberty.a $(SYSLIBS)
 
 # Specify the directories to be searched for header files.
 # Both . and srcdir are used, in that order,
@@ -299,7 +296,7 @@ Makefile: ../config.status $(srcdir)/Makefile.in $(srcdir)/../version.c
 \f
 # Lists of files for various purposes.
 
-GNATLINK_OBJS = gnatlink.o link.o \
+GNATLINK_OBJS = gnatlink.o \
  a-except.o ali.o alloc.o butil.o casing.o csets.o debug.o fmap.o fname.o gnatvsn.o \
  hostparm.o interfac.o i-c.o i-cstrin.o namet.o opt.o osint.o output.o rident.o \
  s-exctab.o s-secsta.o s-stalib.o s-stoele.o sdefault.o stylesw.o switch.o system.o \
@@ -308,7 +305,7 @@ GNATLINK_OBJS = gnatlink.o link.o \
 GNATMAKE_OBJS = a-except.o ctrl_c.o ali.o ali-util.o s-casuti.o \
  alloc.o atree.o binderr.o butil.o casing.o csets.o debug.o elists.o einfo.o\
  erroutc.o errutil.o err_vars.o fmap.o fname.o fname-uf.o fname-sf.o \
- gnatmake.o gnatvsn.o hostparm.o interfac.o i-c.o i-cstrin.o krunch.o lib.o link.o \
+ gnatmake.o gnatvsn.o hostparm.o interfac.o i-c.o i-cstrin.o krunch.o lib.o \
  make.o makeusg.o makeutl.o mlib.o mlib-fil.o mlib-prj.o mlib-tgt.o mlib-utl.o \
  namet.o nlists.o opt.o osint.o osint-m.o output.o \
  prj.o prj-attr.o prj-com.o prj-dect.o prj-env.o prj-err.o prj-ext.o prj-nmsc.o \
@@ -344,13 +341,13 @@ endif
 # Non-tasking case:
 
 LIBGNAT_TARGET_PAIRS = \
-a-intnam.ads<4nintnam.ads \
-s-inmaop.adb<5ninmaop.adb \
-s-intman.adb<5nintman.adb \
-s-osinte.ads<5nosinte.ads \
-s-osprim.adb<7sosprim.adb \
-s-taprop.adb<5ntaprop.adb \
-s-taspri.ads<5ntaspri.ads
+a-intnam.ads<a-intnam-dummy.ads \
+s-inmaop.adb<s-inmaop-dummy.adb \
+s-intman.adb<s-intman-dummy.adb \
+s-osinte.ads<s-osinte-dummy.ads \
+s-osprim.adb<s-osprim-posix.adb \
+s-taprop.adb<s-taprop-dummy.adb \
+s-taspri.ads<s-taspri-dummy.ads
 
 # Default shared object option. Note that we rely on the fact that the "soname"
 # option will always be present and last in this flag, so that we can have
@@ -387,21 +384,21 @@ LIB_VERSION = $(strip $(shell grep ' Library_Version :' $(fsrcpfx)gnatvsn.ads |
 
 ifeq ($(strip $(filter-out %86 os2 OS2 os2_emx,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-excpol.adb<4wexcpol.adb \
-  a-intnam.ads<4nintnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  s-inmaop.adb<5ninmaop.adb \
-  s-interr.adb<5ointerr.adb \
-  s-intman.adb<5nintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-osinte.adb<5oosinte.adb \
-  s-osinte.ads<5oosinte.ads \
-  s-osprim.adb<5oosprim.adb \
-  s-parame.adb<5oparame.adb \
-  system.ads<5osystem.ads \
-  s-taprop.adb<5otaprop.adb \
-  s-taspri.ads<5otaspri.ads
+  a-excpol.adb<a-excpol-abort.adb \
+  a-intnam.ads<a-intnam-dummy.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  s-inmaop.adb<s-inmaop-dummy.adb \
+  s-interr.adb<s-interr-dummy.adb \
+  s-intman.adb<s-intman-dummy.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-osinte.adb<s-osinte-os2.adb \
+  s-osinte.ads<s-osinte-os2.ads \
+  s-osprim.adb<s-osprim-os2.adb \
+  s-parame.adb<s-parame-os2.adb \
+  system.ads<system-os2.ads \
+  s-taprop.adb<s-taprop-os2.adb \
+  s-taspri.ads<s-taspri-os2.ads
 
   EXTRA_GNATRTL_NONTASKING_OBJS = \
   i-os2err.o \
@@ -412,21 +409,21 @@ endif
 
 ifeq ($(strip $(filter-out %86 interix%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-excpol.adb<4hexcpol.adb \
-  a-intnam.ads<4pintnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  g-soccon.ads<3psoccon.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-osinte.adb<7sosinte.adb \
-  s-osinte.ads<5posinte.ads \
-  s-osprim.adb<5posprim.adb \
-  s-taprop.adb<7staprop.adb \
-  system.ads<5psystem.ads \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<7stpopsp.adb
+  a-excpol.adb<a-excpol-interix.adb \
+  a-intnam.ads<a-intnam-interix.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  g-soccon.ads<g-soccon-interix.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-osinte.adb<s-osinte-fsu.adb \
+  s-osinte.ads<s-osinte-interix.ads \
+  s-osprim.adb<s-osprim-unix.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  system.ads<system-interix.ads \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-posix.adb
 
   THREADSLIB = -lgthreads -lmalloc
   PREFIX_OBJS=$(PREFIX_REAL_OBJS)
@@ -435,22 +432,22 @@ endif
 # sysv5uw is SCO UnixWare 7
 ifeq ($(strip $(filter-out %86 sysv5uw%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-excpol.adb<4wexcpol.adb \
-  a-intnam.ads<41intnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-osinte.ads<51osinte.ads \
-  s-osinte.adb<51osinte.adb \
-  s-osprim.adb<5posprim.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<5atpopsp.adb \
-  system.ads<51system.ads \
-  g-soccon.ads<31soccon.ads \
-  g-soliop.ads<31soliop.ads
+  a-excpol.adb<a-excpol-abort.adb \
+  a-intnam.ads<a-intnam-unixware.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-osinte.ads<s-osinte-unixware.ads \
+  s-osinte.adb<s-osinte-unixware.adb \
+  s-osprim.adb<s-osprim-unix.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  system.ads<system-unixware.ads \
+  g-soccon.ads<g-soccon-unixware.ads \
+  g-soliop.ads<g-soliop-unixware.ads
 
   THREADSLIB = -lthread
   PREFIX_OBJS=$(PREFIX_REAL_OBJS)
@@ -461,27 +458,27 @@ endif
 
 ifeq ($(strip $(filter-out alpha% dec vx%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-sytaco.ads<4zsytaco.ads \
-  a-sytaco.adb<4zsytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  a-numaux.ads<4znumaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5zinterr.adb \
-  s-intman.ads<5zintman.ads \
-  s-intman.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-parame.ads<5zparame.ads \
-  s-stchop.adb<5zstchop.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-tpopsp.adb<5ztpopsp.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-vxwork.ads<5avxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5zsystem.ads
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  a-numaux.ads<a-numaux-vxworks.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-vxworks.adb \
+  s-intman.ads<s-intman-vxworks.ads \
+  s-intman.adb<s-intman-vxworks.adb \
+  s-osinte.adb<s-osinte-vxworks.adb \
+  s-osinte.ads<s-osinte-vxworks.ads \
+  s-osprim.adb<s-osprim-vxworks.adb \
+  s-parame.ads<s-parame-vxworks.ads \
+  s-stchop.adb<s-stchop-vxworks.adb \
+  s-taprop.adb<s-taprop-vxworks.adb \
+  s-tpopsp.adb<s-tpopsp-vxworks.adb \
+  s-taspri.ads<s-taspri-vxworks.ads \
+  s-vxwork.ads<s-vxwork-alpha.ads \
+  g-soccon.ads<g-soccon-vxworks.ads \
+  g-socthi.ads<g-socthi-vxworks.ads \
+  g-socthi.adb<g-socthi-vxworks.adb \
+  system.ads<system-vxworks-alpha.ads
 
   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
@@ -489,155 +486,104 @@ endif
 
 ifeq ($(strip $(filter-out m68k% wrs vx%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-sytaco.ads<4zsytaco.ads \
-  a-sytaco.adb<4zsytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  a-numaux.ads<4znumaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5zinterr.adb \
-  s-intman.ads<5zintman.ads \
-  s-intman.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-parame.ads<5zparame.ads \
-  s-stchop.adb<5zstchop.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-tpopsp.adb<5ztpopsp.adb \
-  s-vxwork.ads<5kvxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5ksystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5zml-tgt.adb
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  a-numaux.ads<a-numaux-vxworks.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-vxworks.adb \
+  s-intman.ads<s-intman-vxworks.ads \
+  s-intman.adb<s-intman-vxworks.adb \
+  s-osinte.adb<s-osinte-vxworks.adb \
+  s-osinte.ads<s-osinte-vxworks.ads \
+  s-osprim.adb<s-osprim-vxworks.adb \
+  s-parame.ads<s-parame-vxworks.ads \
+  s-stchop.adb<s-stchop-vxworks.adb \
+  s-taprop.adb<s-taprop-vxworks.adb \
+  s-taspri.ads<s-taspri-vxworks.ads \
+  s-tpopsp.adb<s-tpopsp-vxworks.adb \
+  s-vxwork.ads<s-vxwork-m68k.ads \
+  g-soccon.ads<g-soccon-vxworks.ads \
+  g-socthi.ads<g-socthi-vxworks.ads \
+  g-socthi.adb<g-socthi-vxworks.adb \
+  system.ads<system-vxworks-m68k.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
 
   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
 
   ifeq ($(strip $(filter-out yes,$(TRACE))),)
     LIBGNAT_TARGET_PAIRS += \
-    s-traces.adb<7straces.adb \
-    s-tratas.adb<7stratas.adb \
-    s-trafor.adb<7strafor.adb \
-    s-trafor.ads<7strafor.ads \
-    s-tfsetr.adb<5ztfsetr.adb 
+    s-traces.adb<s-traces-default.adb \
+    s-tratas.adb<s-tratas-default.adb \
+    s-trafor.adb<s-trafor-default.adb \
+    s-trafor.ads<s-trafor-default.ads \
+    s-tfsetr.adb<s-tfsetr-vxworks.adb 
   endif
 endif
 
 ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-sytaco.ads<4zsytaco.ads \
-  a-sytaco.adb<4zsytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  a-numaux.ads<4znumaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5zinterr.adb \
-  s-intman.ads<5zintman.ads \
-  s-intman.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-parame.ads<5zparame.ads \
-  s-stchop.adb<5zstchop.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-tpopsp.adb<5ztpopsp.adb \
-  s-vxwork.ads<5pvxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5ysystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5zml-tgt.adb
-
-  EXTRA_HIE_NONE_TARGET_PAIRS= \
-  system.ads<50system.ads
-
-  EXTRA_RAVEN_SOURCES=i-vxwork.ads s-vxwork.ads
-  EXTRA_RAVEN_OBJS=i-vxwork.o s-vxwork.o
-  EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
-  EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
-  HIE_RAVEN_TARGET_PAIRS=\
-  $(HIE_NONE_TARGET_PAIRS) \
-  a-reatim.ads<1areatim.ads \
-  a-reatim.adb<1areatim.adb \
-  a-retide.adb<1aretide.adb \
-  a-interr.adb<1ainterr.adb \
-  s-interr.ads<1sinterr.ads \
-  s-interr.adb<1sinterr.adb \
-  s-taskin.ads<1staskin.ads \
-  s-taskin.adb<1staskin.adb \
-  s-taspri.ads<1staspri.ads \
-  s-tarest.adb<1starest.adb \
-  s-tposen.ads<1stposen.ads \
-  s-tposen.adb<1stposen.adb \
-  s-osinte.adb<1sosinte.adb \
-  s-taprop.ads<1staprop.ads \
-  s-taprop.adb<1staprop.adb \
-  s-taprob.ads<1staprob.ads \
-  s-taprob.adb<1staprob.adb \
-  a-sytaco.ads<1asytaco.ads \
-  a-sytaco.adb<1asytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  s-osinte.ads<5zosinte.ads \
-  s-parame.ads<5zparame.ads \
-  s-taspri.ads<5ztaspri.ads \
-  s-vxwork.ads<5pvxwork.ads \
-  a-taside.adb<1ataside.adb \
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  a-numaux.ads<a-numaux-vxworks.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-vxworks.adb \
+  s-intman.ads<s-intman-vxworks.ads \
+  s-intman.adb<s-intman-vxworks.adb \
+  s-osinte.adb<s-osinte-vxworks.adb \
+  s-osinte.ads<s-osinte-vxworks.ads \
+  s-osprim.adb<s-osprim-vxworks.adb \
+  s-parame.ads<s-parame-vxworks.ads \
+  s-stchop.adb<s-stchop-vxworks.adb \
+  s-taprop.adb<s-taprop-vxworks.adb \
+  s-taspri.ads<s-taspri-vxworks.ads \
+  s-tpopsp.adb<s-tpopsp-vxworks.adb \
+  s-vxwork.ads<s-vxwork-ppc.ads \
+  g-soccon.ads<g-soccon-vxworks.ads \
+  g-socthi.ads<g-socthi-vxworks.ads \
+  g-socthi.adb<g-socthi-vxworks.adb \
+  system.ads<system-vxworks-ppc.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
 
   ifeq ($(strip $(filter-out yes,$(TRACE))),)
     LIBGNAT_TARGET_PAIRS += \
-    s-traces.adb<7straces.adb \
-    s-trafor.adb<7strafor.adb \
-    s-trafor.ads<7strafor.ads \
-    s-tratas.adb<7stratas.adb \
-    s-tfsetr.adb<5ztfsetr.adb 
+    s-traces.adb<s-traces-default.adb \
+    s-trafor.adb<s-trafor-default.adb \
+    s-trafor.ads<s-trafor-default.ads \
+    s-tratas.adb<s-tratas-default.adb \
+    s-tfsetr.adb<s-tfsetr-vxworks.adb 
   endif
 endif
 
-ifeq ($(strip $(filter-out powerpc% unknown elf,$(targ))),)
-  EXTRA_HIE_NONE_TARGET_PAIRS= \
-  system.ads<59system.ads
-
-  LIBGNAT_TARGET_PAIRS = \
-  $(HIE_NONE_TARGET_PAIRS)
-endif
-
-ifeq ($(strip $(filter-out sparc% unknown elf,$(targ))),)
-  EXTRA_HIE_NONE_TARGET_PAIRS= \
-  system.ads<5rsystem.ads
-
-  LIBGNAT_TARGET_PAIRS = \
-  $(HIE_NONE_TARGET_PAIRS)
-endif
-
 ifeq ($(strip $(filter-out sparc% wrs vx%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-sytaco.ads<4zsytaco.ads \
-  a-sytaco.adb<4zsytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  a-numaux.ads<4znumaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5zinterr.adb \
-  s-intman.ads<5zintman.ads \
-  s-intman.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-parame.ads<5zparame.ads \
-  s-stchop.adb<5zstchop.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-tpopsp.adb<5ztpopsp.adb \
-  s-vxwork.ads<5svxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5csystem.ads   \
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5zml-tgt.adb
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  a-numaux.ads<a-numaux-vxworks.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-vxworks.adb \
+  s-intman.ads<s-intman-vxworks.ads \
+  s-intman.adb<s-intman-vxworks.adb \
+  s-osinte.adb<s-osinte-vxworks.adb \
+  s-osinte.ads<s-osinte-vxworks.ads \
+  s-osprim.adb<s-osprim-vxworks.adb \
+  s-parame.ads<s-parame-vxworks.ads \
+  s-stchop.adb<s-stchop-vxworks.adb \
+  s-taprop.adb<s-taprop-vxworks.adb \
+  s-taspri.ads<s-taspri-vxworks.ads \
+  s-tpopsp.adb<s-tpopsp-vxworks.adb \
+  s-vxwork.ads<s-vxwork-sparcv9.ads \
+  g-soccon.ads<g-soccon-vxworks.ads \
+  g-socthi.ads<g-socthi-vxworks.ads \
+  g-socthi.adb<g-socthi-vxworks.adb \
+  system.ads<system-vxworks-sparcv9.ads   \
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
 
   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
@@ -645,29 +591,29 @@ endif
 
 ifeq ($(strip $(filter-out xscale% coff wrs vx%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-sytaco.ads<4zsytaco.ads \
-  a-sytaco.adb<4zsytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  a-numaux.ads<4znumaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5zinterr.adb \
-  s-intman.ads<5zintman.ads \
-  s-intman.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-parame.ads<5zparame.ads \
-  s-stchop.adb<5zstchop.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-tpopsp.adb<5ztpopsp.adb \
-  s-vxwork.ads<5xvxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5rsystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5zml-tgt.adb
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  a-numaux.ads<a-numaux-vxworks.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-vxworks.adb \
+  s-intman.ads<s-intman-vxworks.ads \
+  s-intman.adb<s-intman-vxworks.adb \
+  s-osinte.adb<s-osinte-vxworks.adb \
+  s-osinte.ads<s-osinte-vxworks.ads \
+  s-osprim.adb<s-osprim-vxworks.adb \
+  s-parame.ads<s-parame-vxworks.ads \
+  s-stchop.adb<s-stchop-vxworks.adb \
+  s-taprop.adb<s-taprop-vxworks.adb \
+  s-taspri.ads<s-taspri-vxworks.ads \
+  s-tpopsp.adb<s-tpopsp-vxworks.adb \
+  s-vxwork.ads<s-vxwork-xscale.ads \
+  g-soccon.ads<g-soccon-vxworks.ads \
+  g-socthi.ads<g-socthi-vxworks.ads \
+  g-socthi.adb<g-socthi-vxworks.adb \
+  system.ads<system-elf-sparc.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
 
   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
@@ -675,29 +621,29 @@ endif
 
 ifeq ($(strip $(filter-out mips% wrs vx%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-sytaco.ads<4zsytaco.ads \
-  a-sytaco.adb<4zsytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  a-numaux.ads<4znumaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5zinterr.adb \
-  s-intman.ads<5zintman.ads \
-  s-intman.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-parame.ads<5zparame.ads \
-  s-stchop.adb<5zstchop.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-tpopsp.adb<5ztpopsp.adb \
-  s-vxwork.ads<5mvxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5msystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5zml-tgt.adb
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  a-numaux.ads<a-numaux-vxworks.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-vxworks.adb \
+  s-intman.ads<s-intman-vxworks.ads \
+  s-intman.adb<s-intman-vxworks.adb \
+  s-osinte.adb<s-osinte-vxworks.adb \
+  s-osinte.ads<s-osinte-vxworks.ads \
+  s-osprim.adb<s-osprim-vxworks.adb \
+  s-parame.ads<s-parame-vxworks.ads \
+  s-stchop.adb<s-stchop-vxworks.adb \
+  s-taprop.adb<s-taprop-vxworks.adb \
+  s-taspri.ads<s-taspri-vxworks.ads \
+  s-tpopsp.adb<s-tpopsp-vxworks.adb \
+  s-vxwork.ads<s-vxwork-mips.ads \
+  g-soccon.ads<g-soccon-vxworks.ads \
+  g-socthi.ads<g-socthi-vxworks.ads \
+  g-socthi.adb<g-socthi-vxworks.adb \
+  system.ads<system-vxworks-mips.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
 
   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
@@ -705,23 +651,23 @@ endif
 
 ifeq ($(strip $(filter-out sparc sun solaris%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4sintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<5sintman.adb \
-  s-osinte.adb<5sosinte.adb \
-  s-osinte.ads<5sosinte.ads \
-  s-osprim.adb<5sosprim.adb \
-  s-parame.adb<5sparame.adb \
-  s-taprop.adb<5staprop.adb \
-  s-tasinf.adb<5stasinf.adb \
-  s-tasinf.ads<5stasinf.ads \
-  s-taspri.ads<5staspri.ads \
-  s-tpopsp.adb<5stpopsp.adb \
-  g-soccon.ads<3ssoccon.ads \
-  g-soliop.ads<3ssoliop.ads \
-  system.ads<5ssystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5sml-tgt.adb
+  a-intnam.ads<a-intnam-solaris.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-solaris.adb \
+  s-osinte.adb<s-osinte-solaris.adb \
+  s-osinte.ads<s-osinte-solaris.ads \
+  s-osprim.adb<s-osprim-solaris.adb \
+  s-parame.adb<s-parame-solaris.adb \
+  s-taprop.adb<s-taprop-solaris.adb \
+  s-tasinf.adb<s-tasinf-solaris.adb \
+  s-tasinf.ads<s-tasinf-solaris.ads \
+  s-taspri.ads<s-taspri-solaris.ads \
+  s-tpopsp.adb<s-tpopsp-solaris.adb \
+  g-soccon.ads<g-soccon-solaris.ads \
+  g-soliop.ads<g-soliop-solaris.ads \
+  system.ads<system-solaris-sparc.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-solaris.adb
 
   THREADSLIB = -lposix4 -lthread
   MISCLIB = -lposix4 -lnsl -lsocket
@@ -734,80 +680,80 @@ ifeq ($(strip $(filter-out sparc sun solaris%,$(targ))),)
 
   ifeq ($(strip $(filter-out fsu FSU,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4sintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<5sintman.adb \
-    s-osinte.adb<7sosinte.adb \
-    s-osinte.ads<5tosinte.ads \
-    s-osprim.adb<5sosprim.adb \
-    s-taprop.adb<7staprop.adb \
-    s-taspri.ads<7staspri.ads \
-    s-tpopsp.adb<7stpopsp.adb \
-    g-soccon.ads<3ssoccon.ads \
-    g-soliop.ads<3ssoliop.ads \
-    system.ads<5ssystem.ads
+    a-intnam.ads<a-intnam-solaris.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-solaris.adb \
+    s-osinte.adb<s-osinte-fsu.adb \
+    s-osinte.ads<s-osinte-solaris-fsu.ads \
+    s-osprim.adb<s-osprim-solaris.adb \
+    s-taprop.adb<s-taprop-posix.adb \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-tpopsp.adb<s-tpopsp-posix.adb \
+    g-soccon.ads<g-soccon-solaris.ads \
+    g-soliop.ads<g-soliop-solaris.ads \
+    system.ads<system-solaris-sparc.ads
 
     THREADSLIB = -lgthreads -lmalloc
   endif
 
   ifeq ($(strip $(filter-out pthread PTHREAD,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4sintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<7sintman.adb \
-    s-osinte.adb<5iosinte.adb \
-    s-osinte.ads<54osinte.ads \
-    s-osprim.adb<5sosprim.adb \
-    s-taprop.adb<7staprop.adb \
-    s-taspri.ads<7staspri.ads \
-    s-tpopsp.adb<5atpopsp.adb \
-    g-soccon.ads<3ssoccon.ads \
-    g-soliop.ads<3ssoliop.ads \
-    system.ads<5ssystem.ads
+    a-intnam.ads<a-intnam-solaris.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-osinte.adb<s-osinte-posix.adb \
+    s-osinte.ads<s-osinte-solaris-posix.ads \
+    s-osprim.adb<s-osprim-solaris.adb \
+    s-taprop.adb<s-taprop-posix.adb \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+    g-soccon.ads<g-soccon-solaris.ads \
+    g-soliop.ads<g-soliop-solaris.ads \
+    system.ads<system-solaris-sparc.ads
 
     THREADSLIB = -lposix4 -lpthread
   endif
 
   ifeq ($(strip $(filter-out m64,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4sintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<5sintman.adb \
-    s-osinte.adb<5sosinte.adb \
-    s-osinte.ads<5sosinte.ads \
-    s-osprim.adb<5sosprim.adb \
-    s-parame.adb<5sparame.adb \
-    s-taprop.adb<5staprop.adb \
-    s-tasinf.adb<5stasinf.adb \
-    s-tasinf.ads<5stasinf.ads \
-    s-taspri.ads<5staspri.ads \
-    s-tpopsp.adb<5stpopsp.adb \
-    g-soccon.ads<3ssoccon.ads \
-    g-soliop.ads<3ssoliop.ads \
-    system.ads<5usystem.ads
+    a-intnam.ads<a-intnam-solaris.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-solaris.adb \
+    s-osinte.adb<s-osinte-solaris.adb \
+    s-osinte.ads<s-osinte-solaris.ads \
+    s-osprim.adb<s-osprim-solaris.adb \
+    s-parame.adb<s-parame-solaris.adb \
+    s-taprop.adb<s-taprop-solaris.adb \
+    s-tasinf.adb<s-tasinf-solaris.adb \
+    s-tasinf.ads<s-tasinf-solaris.ads \
+    s-taspri.ads<s-taspri-solaris.ads \
+    s-tpopsp.adb<s-tpopsp-solaris.adb \
+    g-soccon.ads<g-soccon-solaris.ads \
+    g-soliop.ads<g-soliop-solaris.ads \
+    system.ads<system-solaris-sparcv9.ads
   endif
 endif
 
 ifeq ($(strip $(filter-out %86 solaris2%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  a-intnam.ads<4sintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<5sintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-osinte.adb<5sosinte.adb \
-  s-osinte.ads<5sosinte.ads \
-  s-osprim.adb<5sosprim.adb \
-  s-parame.adb<5sparame.adb \
-  s-taprop.adb<5staprop.adb \
-  s-tasinf.adb<5stasinf.adb \
-  s-tasinf.ads<5stasinf.ads \
-  s-taspri.ads<5staspri.ads \
-  s-tpopsp.adb<5stpopsp.adb \
-  g-soccon.ads<3ssoccon.ads \
-  g-soliop.ads<3ssoliop.ads \
-  system.ads<5esystem.ads
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  a-intnam.ads<a-intnam-solaris.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-solaris.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-osinte.adb<s-osinte-solaris.adb \
+  s-osinte.ads<s-osinte-solaris.ads \
+  s-osprim.adb<s-osprim-solaris.adb \
+  s-parame.adb<s-parame-solaris.adb \
+  s-taprop.adb<s-taprop-solaris.adb \
+  s-tasinf.adb<s-tasinf-solaris.adb \
+  s-tasinf.ads<s-tasinf-solaris.ads \
+  s-taspri.ads<s-taspri-solaris.ads \
+  s-tpopsp.adb<s-tpopsp-solaris.adb \
+  g-soccon.ads<g-soccon-solaris.ads \
+  g-soliop.ads<g-soliop-solaris.ads \
+  system.ads<system-solaris-x86.ads
 
   THREADSLIB = -lposix4 -lthread
   MISCLIB = -lposix4 -lnsl -lsocket
@@ -819,23 +765,23 @@ endif
 
 ifeq ($(strip $(filter-out %86 linux%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4lintnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-osinte.adb<5iosinte.adb \
-  s-osinte.ads<5iosinte.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<5itaprop.adb \
-  s-taspri.ads<5itaspri.ads \
-  s-tpopsp.adb<5atpopsp.adb \
-  s-parame.adb<5lparame.adb \
-  system.ads<5lsystem.ads
+  a-intnam.ads<a-intnam-linux.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-osinte.adb<s-osinte-posix.adb \
+  s-osinte.ads<s-osinte-linux.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-linux.adb \
+  s-taspri.ads<s-taspri-linux.ads \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  s-parame.adb<s-parame-linux.adb \
+  system.ads<system-linux-x86.ads
 
   TOOLS_TARGET_PAIRS =  \
-    mlib-tgt.adb<5lml-tgt.adb
+    mlib-tgt.adb<mlib-tgt-linux.adb
 
   SYMLIB = $(ADDR2LINE_SYMLIB)
   THREADSLIB = -lpthread
@@ -846,19 +792,19 @@ ifeq ($(strip $(filter-out %86 linux%,$(arch) $(osys))),)
 
   ifeq ($(strip $(filter-out fsu FSU,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4lintnam.ads \
-    a-numaux.adb<86numaux.adb \
-    a-numaux.ads<86numaux.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<7sintman.adb \
-    s-mastop.adb<5omastop.adb \
-    s-osinte.adb<7sosinte.adb \
-    s-osinte.ads<5losinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-taprop.adb<7staprop.adb \
-    s-taspri.ads<7staspri.ads \
-    s-tpopsp.adb<7stpopsp.adb \
-    system.ads<5lsystem.ads
+    a-intnam.ads<a-intnam-linux.ads \
+    a-numaux.adb<a-numaux-x86.adb \
+    a-numaux.ads<a-numaux-x86.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-mastop.adb<s-mastop-x86.adb \
+    s-osinte.adb<s-osinte-fsu.adb \
+    s-osinte.ads<s-osinte-linux-fsu.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-taprop.adb<s-taprop-posix.adb \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-tpopsp.adb<s-tpopsp-posix.adb \
+    system.ads<system-linux-x86.ads
 
     THREADSLIB = -lgthreads -lmalloc
   endif
@@ -866,23 +812,23 @@ endif
 
 ifeq ($(strip $(filter-out %86 freebsd%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<45intnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  g-soccon.ads<35soccon.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-osinte.adb<55osinte.adb \
-  s-osinte.ads<55osinte.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<7stpopsp.adb \
-  system.ads<56system.ads
+  a-intnam.ads<a-intnam-freebsd.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  g-soccon.ads<g-soccon-freebsd.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-osinte.adb<s-osinte-freebsd.adb \
+  s-osinte.ads<s-osinte-freebsd.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-posix.adb \
+  system.ads<system-freebsd-x86.ads
 
   TOOLS_TARGET_PAIRS = \
-  mlib-tgt.adb<5lml-tgt.adb
+  mlib-tgt.adb<mlib-tgt-linux.adb
   GNATLIB_SHARED = gnatlib-shared-dual
 
   SYMLIB = $(ADDR2LINE_SYMLIB)
@@ -892,51 +838,89 @@ ifeq ($(strip $(filter-out %86 freebsd%,$(arch) $(osys))),)
   LIBRARY_VERSION := $(LIB_VERSION)
 endif
 
+ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)
+  ifeq ($(strip $(filter-out s390x,$(arch))),)
+    LIBGNAT_TARGET_PAIRS = \
+    a-intnam.ads<a-intnam-linux.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-osinte.adb<s-osinte-posix.adb \
+    s-osinte.ads<s-osinte-linux.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-taprop.adb<s-taprop-linux.adb \
+    s-taspri.ads<s-taspri-linux.ads \
+    s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+    s-parame.adb<s-parame-linux.adb \
+    system.ads<system-linux-s390x.ads
+  else
+    LIBGNAT_TARGET_PAIRS = \
+    a-intnam.ads<a-intnam-linux.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-osinte.adb<s-osinte-posix.adb \
+    s-osinte.ads<s-osinte-linux.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-taprop.adb<s-taprop-linux.adb \
+    s-taspri.ads<s-taspri-linux.ads \
+    s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+    s-parame.adb<s-parame-linux.adb \
+    system.ads<system-linux-s390.ads
+  endif
+
+  TOOLS_TARGET_PAIRS =  \
+    mlib-tgt.adb<mlib-tgt-linux.adb
+
+  THREADSLIB = -lpthread
+  GNATLIB_SHARED = gnatlib-shared-dual
+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
 ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),)
   ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4gintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<5fintman.adb \
-    s-mastop.adb<5gmastop.adb \
-    s-osinte.adb<5fosinte.adb \
-    s-osinte.ads<5fosinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-proinf.adb<5gproinf.adb \
-    s-proinf.ads<5gproinf.ads \
-    s-taprop.adb<5ftaprop.adb \
-    s-tasinf.ads<5ftasinf.ads \
-    s-taspri.ads<7staspri.ads \
-    s-tpopsp.adb<7stpopsp.adb \
-    s-traceb.adb<7straceb.adb \
-    g-soccon.ads<3gsoccon.ads \
-    system.ads<5gsystem.ads
+    a-intnam.ads<a-intnam-irix.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-irix.adb \
+    s-mastop.adb<s-mastop-irix.adb \
+    s-osinte.adb<s-osinte-irix.adb \
+    s-osinte.ads<s-osinte-irix.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-proinf.adb<s-proinf-irix-athread.adb \
+    s-proinf.ads<s-proinf-irix-athread.ads \
+    s-taprop.adb<s-taprop-irix.adb \
+    s-tasinf.ads<s-tasinf-irix.ads \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-tpopsp.adb<s-tpopsp-posix.adb \
+    s-traceb.adb<s-traceb-mastop.adb \
+    g-soccon.ads<g-soccon-irix.ads \
+    system.ads<system-irix-n32.ads
 
     THREADSLIB = -lpthread
     GNATLIB_SHARED = gnatlib-shared-default
 
   else
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4gintnam.ads \
-    s-inmaop.adb<5ninmaop.adb \
-    s-interr.adb<5ginterr.adb \
-    s-intman.adb<5gintman.adb \
-    s-mastop.adb<5gmastop.adb \
-    s-osinte.adb<5fosinte.adb \
-    s-osinte.ads<5gosinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-proinf.adb<5gproinf.adb \
-    s-proinf.ads<5gproinf.ads \
-    s-taprop.adb<5gtaprop.adb \
-    s-tasinf.adb<5gtasinf.adb \
-    s-tasinf.ads<5gtasinf.ads \
-    s-taspri.ads<7staspri.ads \
-    s-traceb.adb<7straceb.adb \
-    g-soccon.ads<3gsoccon.ads \
-    system.ads<5fsystem.ads
+    a-intnam.ads<a-intnam-irix.ads \
+    s-inmaop.adb<s-inmaop-dummy.adb \
+    s-interr.adb<s-interr-sigaction.adb \
+    s-intman.adb<s-intman-irix-athread.adb \
+    s-mastop.adb<s-mastop-irix.adb \
+    s-osinte.adb<s-osinte-irix.adb \
+    s-osinte.ads<s-osinte-irix-athread.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-proinf.adb<s-proinf-irix-athread.adb \
+    s-proinf.ads<s-proinf-irix-athread.ads \
+    s-taprop.adb<s-taprop-irix-athread.adb \
+    s-tasinf.adb<s-tasinf-irix-athread.adb \
+    s-tasinf.ads<s-tasinf-irix-athread.ads \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-traceb.adb<s-traceb-mastop.adb \
+    g-soccon.ads<g-soccon-irix.ads \
+    system.ads<system-irix-o32.ads
   endif
 
-  TOOLS_TARGET_PAIRS = mlib-tgt.adb<5gml-tgt.adb
+  TOOLS_TARGET_PAIRS = mlib-tgt.adb<mlib-tgt-irix.adb
   TGT_LIB = -lexc
   MISCLIB = -lexc
   SO_OPTS = -Wl,-all,-set_version,sgi1.0,-update_registry,../so_locations,-soname,
@@ -946,41 +930,41 @@ endif
 
 ifeq ($(strip $(filter-out hppa% hp hpux10%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-excpol.adb<4wexcpol.adb \
-  a-intnam.ads<4hintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5ginterr.adb \
-  s-intman.adb<7sintman.adb \
-  s-osinte.adb<5hosinte.adb \
-  s-osinte.ads<5hosinte.ads \
-  s-parame.ads<5hparame.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<5htaprop.adb \
-  s-taspri.ads<5htaspri.ads \
-  s-tpopsp.adb<7stpopsp.adb \
-  g-soccon.ads<3hsoccon.ads \
-  system.ads<5hsystem.ads
+  a-excpol.adb<a-excpol-abort.adb \
+  a-intnam.ads<a-intnam-hpux.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-sigaction.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.adb<s-osinte-hpux-dce.adb \
+  s-osinte.ads<s-osinte-hpux-dce.ads \
+  s-parame.ads<s-parame-hpux.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-hpux-dce.adb \
+  s-taspri.ads<s-taspri-hpux-dce.ads \
+  s-tpopsp.adb<s-tpopsp-posix.adb \
+  g-soccon.ads<g-soccon-hpux.ads \
+  system.ads<system-hpux.ads
 
   PREFIX_OBJS = $(PREFIX_REAL_OBJS)
 endif
 
 ifeq ($(strip $(filter-out hppa% hp hpux11%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4hintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-osinte.adb<5iosinte.adb \
-  s-osinte.ads<53osinte.ads \
-  s-parame.ads<5hparame.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-traceb.adb<5htraceb.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<5atpopsp.adb \
-  g-soccon.ads<3hsoccon.ads \
-  system.ads<5hsystem.ads
-
-  TOOLS_TARGET_PAIRS = mlib-tgt.adb<5hml-tgt.adb
+  a-intnam.ads<a-intnam-hpux.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.adb<s-osinte-posix.adb \
+  s-osinte.ads<s-osinte-hpux.ads \
+  s-parame.ads<s-parame-hpux.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-traceb.adb<s-traceb-hpux.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  g-soccon.ads<g-soccon-hpux.ads \
+  system.ads<system-hpux.ads
+
+  TOOLS_TARGET_PAIRS = mlib-tgt.adb<mlib-tgt-hpux.adb
   TGT_LIB = /usr/lib/libcl.a
   THREADSLIB = -lpthread
   SYMLIB = $(ADDR2LINE_SYMLIB)
@@ -993,20 +977,20 @@ ifeq ($(strip $(filter-out hppa% hp hpux11%,$(targ))),)
 
   ifeq ($(strip $(filter-out dce DCE,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-excpol.adb<4wexcpol.adb \
-    a-intnam.ads<4hintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-interr.adb<5ginterr.adb \
-    s-intman.adb<7sintman.adb \
-    s-osinte.adb<5hosinte.adb \
-    s-osinte.ads<5hosinte.ads \
-    s-parame.ads<5hparame.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-taprop.adb<5htaprop.adb \
-    s-taspri.ads<5htaspri.ads \
-    s-tpopsp.adb<7stpopsp.adb \
-    g-soccon.ads<3hsoccon.ads \
-    system.ads<5hsystem.ads
+    a-excpol.adb<a-excpol-abort.adb \
+    a-intnam.ads<a-intnam-hpux.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-interr.adb<s-interr-sigaction.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-osinte.adb<s-osinte-hpux-dce.adb \
+    s-osinte.ads<s-osinte-hpux-dce.ads \
+    s-parame.ads<s-parame-hpux.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-taprop.adb<s-taprop-hpux-dce.adb \
+    s-taspri.ads<s-taspri-hpux-dce.ads \
+    s-tpopsp.adb<s-tpopsp-posix.adb \
+    g-soccon.ads<g-soccon-hpux.ads \
+    system.ads<system-hpux.ads
 
     TGT_LIB =
     THREADSLIB = -lcma
@@ -1015,39 +999,39 @@ endif
 
 ifeq ($(strip $(filter-out ibm aix%,$(manu) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4cintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-osinte.adb<5bosinte.adb \
-  s-osinte.ads<5bosinte.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<7stpopsp.adb \
-  g-soccon.ads<3bsoccon.ads \
-  system.ads<5bsystem.ads
+  a-intnam.ads<a-intnam-aix.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.adb<s-osinte-aix.adb \
+  s-osinte.ads<s-osinte-aix.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-posix.adb \
+  g-soccon.ads<g-soccon-aix.ads \
+  system.ads<system-aix.ads
 
   THREADSLIB = -lpthreads
   PREFIX_OBJS=$(PREFIX_REAL_OBJS)
 
   ifeq ($(strip $(filter-out fsu FSU,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4cintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<7sintman.adb \
-    s-osinte.adb<7sosinte.adb \
-    s-osinte.ads<5cosinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-taprop.adb<7staprop.adb \
-    s-taspri.ads<7staspri.ads \
-    s-tpopsp.adb<7stpopsp.adb \
-    g-soccon.ads<3bsoccon.ads \
-    system.ads<5bsystem.ads
+    a-intnam.ads<a-intnam-aix.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-osinte.adb<s-osinte-fsu.adb \
+    s-osinte.ads<s-osinte-aix-fsu.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-taprop.adb<s-taprop-posix.adb \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-tpopsp.adb<s-tpopsp-posix.adb \
+    g-soccon.ads<g-soccon-aix.ads \
+    system.ads<system-aix.ads
 
     THREADSLIB = -lgthreads -lmalloc
   endif
 
-  TOOLS_TARGET_PAIRS = mlib-tgt.adb<5bml-tgt.adb
+  TOOLS_TARGET_PAIRS = mlib-tgt.adb<mlib-tgt-aix.adb
   GMEM_LIB = gmemlib
   SYMLIB = $(ADDR2LINE_SYMLIB)
 
@@ -1056,47 +1040,47 @@ endif
 ifeq ($(strip $(filter-out lynxos,$(osys))),)
   ifeq ($(strip $(filter-out %86 lynxos,$(arch) $(osys))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-numaux.adb<86numaux.adb \
-    a-numaux.ads<86numaux.ads \
-    a-intnam.ads<42intnam.ads \
-    s-mastop.adb<5omastop.adb \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<7sintman.adb \
-    s-osinte.adb<56osinte.adb \
-    s-osinte.ads<56osinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-taprop.adb<56taprop.adb \
-    s-taspri.ads<56taspri.ads \
-    s-tpopsp.adb<56tpopsp.adb \
-    system.ads<58system.ads
+    a-numaux.adb<a-numaux-x86.adb \
+    a-numaux.ads<a-numaux-x86.ads \
+    a-intnam.ads<a-intnam-lynxos.ads \
+    s-mastop.adb<s-mastop-x86.adb \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-osinte.adb<s-osinte-lynxos.adb \
+    s-osinte.ads<s-osinte-lynxos.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-taprop.adb<s-taprop-lynxos.adb \
+    s-taspri.ads<s-taspri-lynxos.ads \
+    s-tpopsp.adb<s-tpopsp-lynxos.adb \
+    system.ads<system-lynxos-x86.ads
 
     PREFIX_OBJS=$(PREFIX_REAL_OBJS)
 
   else
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<42intnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<7sintman.adb \
-    s-osinte.adb<52osinte.adb \
-    s-osinte.ads<52osinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-taprop.adb<7staprop.adb \
-    s-taspri.ads<7staspri.ads \
-    s-tpopsp.adb<7stpopsp.adb \
-    system.ads<57system.ads
+    a-intnam.ads<a-intnam-lynxos.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-osinte.adb<s-osinte-lynxos-3.adb \
+    s-osinte.ads<s-osinte-lynxos-3.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-taprop.adb<s-taprop-posix.adb \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-tpopsp.adb<s-tpopsp-posix.adb \
+    system.ads<system-lynxos-ppc.ads
 
     ifeq ($(strip $(filter-out pthread PTHREAD,$(THREAD_KIND))),)
       LIBGNAT_TARGET_PAIRS = \
-      a-intnam.ads<42intnam.ads \
-      s-inmaop.adb<7sinmaop.adb \
-      s-intman.adb<7sintman.adb \
-      s-osinte.adb<56osinte.adb \
-      s-osinte.ads<56osinte.ads \
-      s-osprim.adb<7sosprim.adb \
-      s-taprop.adb<56taprop.adb \
-      s-taspri.ads<56taspri.ads \
-      s-tpopsp.adb<56tpopsp.adb \
-      system.ads<57system.ads
+      a-intnam.ads<a-intnam-lynxos.ads \
+      s-inmaop.adb<s-inmaop-posix.adb \
+      s-intman.adb<s-intman-posix.adb \
+      s-osinte.adb<s-osinte-lynxos.adb \
+      s-osinte.ads<s-osinte-lynxos.ads \
+      s-osprim.adb<s-osprim-posix.adb \
+      s-taprop.adb<s-taprop-lynxos.adb \
+      s-taspri.ads<s-taspri-lynxos.ads \
+      s-tpopsp.adb<s-tpopsp-lynxos.adb \
+      system.ads<system-lynxos-ppc.ads
     endif
 
   endif
@@ -1105,35 +1089,35 @@ endif
 ifeq ($(strip $(filter-out rtems%,$(osys))),)
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<4rintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
   s-osinte.adb<5rosinte.adb \
   s-osinte.ads<5rosinte.ads \
-  s-osprim.adb<7sosprim.adb \
+  s-osprim.adb<s-osprim-posix.adb \
   s-parame.adb<5rparame.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
   s-tpopsp.adb<5rtpopsp.adb
 endif
 
 ifeq ($(strip $(filter-out alpha% dec osf%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4aintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-mastop.adb<5amastop.adb \
-  s-osinte.adb<5aosinte.adb \
-  s-osinte.ads<5aosinte.ads \
-  s-osprim.adb<5posprim.adb \
-  s-taprop.adb<5ataprop.adb \
-  s-tasinf.ads<5atasinf.ads \
-  s-taspri.ads<5ataspri.ads \
-  s-tpopsp.adb<5atpopsp.adb \
-  s-traceb.adb<7straceb.adb \
-  g-soccon.ads<3asoccon.ads \
-  system.ads<5asystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5aml-tgt.adb
+  a-intnam.ads<a-intnam-tru64.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-mastop.adb<s-mastop-tru64.adb \
+  s-osinte.adb<s-osinte-tru64.adb \
+  s-osinte.ads<s-osinte-tru64.ads \
+  s-osprim.adb<s-osprim-unix.adb \
+  s-taprop.adb<s-taprop-tru64.adb \
+  s-tasinf.ads<s-tasinf-tru64.ads \
+  s-taspri.ads<s-taspri-tru64.ads \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  s-traceb.adb<s-traceb-mastop.adb \
+  g-soccon.ads<g-soccon-tru64.ads \
+  system.ads<system-tru64.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-tru64.adb
 
   GMEM_LIB=gmemlib
   SYMLIB = $(ADDR2LINE_SYMLIB)
@@ -1148,6 +1132,10 @@ ifeq ($(strip $(filter-out alpha% ia64 dec hp vms% openvms% alphavms%,$(host))),
 soext  = .exe
 hyphen = _
 
+ifeq ($(strip $(filter-out ia64 hp vms% openvms%,$(targ))),)
+AR = iar
+endif
+
 .SUFFIXES: .sym
 
 .o.sym: 
@@ -1157,62 +1145,63 @@ endif
 ifeq ($(strip $(filter-out alpha% ia64 dec hp vms% openvms% alphavms%,$(targ))),)
 ifeq ($(strip $(filter-out ia64 hp vms% openvms%,$(targ))),)
   LIBGNAT_TARGET_PAIRS_AUX1 = \
-  s-crtl.ads<5xcrtl.ads \
-  s-osinte.adb<5xosinte.adb \
-  s-osinte.ads<5xosinte.ads \
+  s-auxdec.ads<5qauxdec.ads \
+  s-crtl.ads<s-crtl-vms.ads \
+  s-osinte.adb<s-osinte-vms-ia64.adb \
+  s-osinte.ads<s-osinte-vms-ia64.ads \
   system.ads<5qsystem.ads
 else
 ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(targ))),)
   LIBGNAT_TARGET_PAIRS_AUX1 = \
-  s-crtl.ads<5vcrtl.ads \
-  s-osinte.adb<5vosinte.adb \
-  s-osinte.ads<5vosinte.ads \
-  system.ads<5xsystem.ads
+  s-crtl.ads<s-crtl-vms.ads \
+  s-osinte.adb<s-osinte-vms.adb \
+  s-osinte.ads<s-osinte-vms.ads \
+  system.ads<system-vms-zcx.ads
 endif
 endif
 ifeq ($(strip $(filter-out express EXPRESS,$(THREAD_KIND))),)
   LIBGNAT_TARGET_PAIRS_AUX2 = \
-  s-parame.ads<5xparame.ads
+  s-parame.ads<s-parame-vms-restrict.ads
 else
   LIBGNAT_TARGET_PAIRS_AUX2 = \
-  s-parame.ads<5vparame.ads
+  s-parame.ads<s-parame-vms.ads
 endif
 
   LIBGNAT_TARGET_PAIRS = \
-  a-caldel.adb<4vcaldel.adb \
-  a-calend.adb<4vcalend.adb \
-  a-calend.ads<4vcalend.ads \
-  a-dirval.adb<5vdirval.adb \
-  a-excpol.adb<4wexcpol.adb \
-  a-intnam.ads<4vintnam.ads \
-  a-numaux.ads<4vnumaux.ads \
-  g-expect.adb<3vexpect.adb \
-  g-soccon.ads<3vsoccon.ads \
-  g-socthi.ads<3vsocthi.ads \
-  g-socthi.adb<3vsocthi.adb \
-  g-trasym.adb<3vtrasym.adb \
-  i-cstrea.adb<6vcstrea.adb \
-  i-cpp.adb<6vcpp.adb \
-  interfac.ads<6vinterf.ads \
-  s-asthan.adb<5vasthan.adb \
-  s-inmaop.adb<5vinmaop.adb \
-  s-interr.adb<5vinterr.adb \
-  s-intman.adb<5vintman.adb \
-  s-intman.ads<5vintman.ads \
-  s-osprim.adb<5vosprim.adb \
-  s-osprim.ads<5vosprim.ads \
-  s-taprop.adb<5vtaprop.adb \
-  s-taspri.ads<5vtaspri.ads \
-  s-tpopsp.adb<7stpopsp.adb \
-  s-tpopde.adb<5vtpopde.adb \
-  s-tpopde.ads<5vtpopde.ads \
-  s-traent.adb<5vtraent.adb \
-  s-traent.ads<5vtraent.ads \
-  s-vaflop.adb<5vvaflop.adb \
+  a-caldel.adb<a-caldel-vms.adb \
+  a-calend.adb<a-calend-vms.adb \
+  a-calend.ads<a-calend-vms.ads \
+  a-dirval.adb<a-dirval-vms.adb \
+  a-excpol.adb<a-excpol-abort.adb \
+  a-intnam.ads<a-intnam-vms.ads \
+  a-numaux.ads<a-numaux-vms.ads \
+  g-expect.adb<g-expect-vms.adb \
+  g-soccon.ads<g-soccon-vms.adb \
+  g-socthi.ads<g-socthi-vms.ads \
+  g-socthi.adb<g-socthi-vms.adb \
+  g-trasym.adb<g-trasym-vms.adb \
+  i-cstrea.adb<i-cstrea-vms.adb \
+  i-cpp.adb<i-cpp-vms.adb \
+  interfac.ads<interfac-vms.ads \
+  s-asthan.adb<s-asthan-vms.adb \
+  s-inmaop.adb<s-inmaop-vms.adb \
+  s-interr.adb<s-interr-vms.adb \
+  s-intman.adb<s-intman-vms.adb \
+  s-intman.ads<s-intman-vms.ads \
+  s-osprim.adb<s-osprim-vms.adb \
+  s-osprim.ads<s-osprim-vms.ads \
+  s-taprop.adb<s-taprop-vms.adb \
+  s-taspri.ads<s-taspri-vms.ads \
+  s-tpopsp.adb<s-tpopsp-posix.adb \
+  s-tpopde.adb<s-tpopde-vms.adb \
+  s-tpopde.ads<s-tpopde-vms.ads \
+  s-traent.adb<s-traent-vms.adb \
+  s-traent.ads<s-traent-vms.ads \
+  s-vaflop.adb<s-vaflop-vms.adb \
   $(LIBGNAT_TARGET_PAIRS_AUX1) \
   $(LIBGNAT_TARGET_PAIRS_AUX2)
 
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5vml-tgt.adb
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vms.adb
 
   GNATLIB_SHARED=gnatlib-shared-vms
 ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(targ))),)
@@ -1231,29 +1220,29 @@ endif
 
 ifeq ($(strip $(filter-out cygwin32% mingw32% pe,$(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-calend.adb<4wcalend.adb \
-  a-dirval.adb<5wdirval.adb \
-  a-excpol.adb<4wexcpol.adb \
-  a-intnam.ads<4wintnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  s-gloloc.adb<5wgloloc.adb \
-  s-inmaop.adb<5ninmaop.adb \
-  s-interr.adb<5ginterr.adb \
-  s-intman.adb<5wintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-memory.adb<5wmemory.adb \
-  s-osinte.ads<5wosinte.ads \
-  s-osprim.adb<5wosprim.adb \
-  s-taprop.adb<5wtaprop.adb \
-  s-taspri.ads<5wtaspri.ads \
-  g-socthi.ads<3wsocthi.ads \
-  g-socthi.adb<3wsocthi.adb \
-  g-soccon.ads<3wsoccon.ads \
-  g-soliop.ads<3wsoliop.ads \
-  system.ads<5wsystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5wml-tgt.adb
+  a-calend.adb<a-calend-mingw.adb \
+  a-dirval.adb<a-dirval-mingw.adb \
+  a-excpol.adb<a-excpol-abort.adb \
+  a-intnam.ads<a-intnam-mingw.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  s-gloloc.adb<s-gloloc-mingw.adb \
+  s-inmaop.adb<s-inmaop-dummy.adb \
+  s-interr.adb<s-interr-sigaction.adb \
+  s-intman.adb<s-intman-mingw.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-memory.adb<s-memory-mingw.adb \
+  s-osinte.ads<s-osinte-mingw.ads \
+  s-osprim.adb<s-osprim-mingw.adb \
+  s-taprop.adb<s-taprop-mingw.adb \
+  s-taspri.ads<s-taspri-mingw.ads \
+  g-socthi.ads<g-socthi-mingw.ads \
+  g-socthi.adb<g-socthi-mingw.adb \
+  g-soccon.ads<g-soccon-mingw.ads \
+  g-soliop.ads<g-soliop-mingw.ads \
+  system.ads<system-mingw.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-mingw.adb
   MISCLIB = -lwsock32
   SYMLIB = $(ADDR2LINE_SYMLIB)
   GMEM_LIB = gmemlib
@@ -1270,18 +1259,18 @@ endif
 
 ifeq ($(strip $(filter-out %ia64 linux%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4lintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-osinte.ads<5iosinte.ads \
-  s-osinte.adb<5iosinte.adb \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<5itaprop.adb \
-  s-tpopsp.adb<5atpopsp.adb \
-  s-taspri.ads<5itaspri.ads \
-  system.ads<55system.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
+  a-intnam.ads<a-intnam-linux.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.ads<s-osinte-linux.ads \
+  s-osinte.adb<s-osinte-posix.adb \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-linux.adb \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  s-taspri.ads<s-taspri-linux.ads \
+  system.ads<s-osinte-linux-ia64.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-linux.adb
   MISCLIB=
   THREADSLIB=-lpthread
   GNATLIB_SHARED=gnatlib-shared-dual
@@ -1291,27 +1280,41 @@ endif
 
 ifeq ($(strip $(filter-out %x86_64 linux%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4lintnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-osinte.ads<5iosinte.ads \
-  s-osinte.adb<5iosinte.adb \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<5itaprop.adb \
-  s-tpopsp.adb<5atpopsp.adb \
-  s-taspri.ads<5itaspri.ads \
-  system.ads<5nsystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
+  a-intnam.ads<a-intnam-linux.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.ads<s-osinte-linux.ads \
+  s-osinte.adb<s-osinte-posix.adb \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-linux.adb \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  s-taspri.ads<s-taspri-linux.ads \
+  system.ads<system-linux-x86_64.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-linux.adb
   SYMLIB = $(ADDR2LINE_SYMLIB)
   THREADSLIB=-lpthread
   GNATLIB_SHARED=gnatlib-shared-dual
   GMEM_LIB = gmemlib
   PREFIX_OBJS=$(PREFIX_REAL_OBJS)
   LIBRARY_VERSION := $(LIB_VERSION)
+endif
 
+ifeq ($(strip $(filter-out powerpc darwin%,$(arch) $(osys))),)
+  LIBGNAT_TARGET_PAIRS = \
+  a-intnam.ads<a-intnam-darwin.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.adb<s-osinte-darwin.adb \
+  s-osinte.ads<s-osinte-darwin.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  g-soccon.ads<g-soccon-aix.ads \
+  system.ads<system-darwin-ppc.ads
 endif
 
 # The runtime library for gnat comprises two directories.  One contains the
@@ -1346,131 +1349,6 @@ include $(fsrcdir)/Makefile.rtl
 GNATRTL_OBJS = $(GNATRTL_NONTASKING_OBJS) $(GNATRTL_TASKING_OBJS) \
   g-trasym.o memtrack.o
 
-# Files which are suitable in no run time/hi integrity mode
-
-COMPILABLE_HIE_SOURCES= \
- system.ads   \
- ada.ads      \
- gnat.ads     \
- g-souinf.ads \
- interfac.ads \
- i-c.ads      \
- s-stoele.ads \
- s-stoele.adb \
- s-maccod.ads \
- s-unstyp.ads \
- s-fatflt.ads \
- s-fatlfl.ads \
- s-fatllf.ads \
- s-fatsfl.ads \
- s-secsta.ads \
- s-secsta.adb \
- a-tags.ads   \
- a-tags.adb  \
- a-except.ads \
- a-except.adb $(EXTRA_HIE_SOURCES)
-
-NON_COMPILABLE_HIE_SOURCES= \
- a-unccon.ads \
- a-uncdea.ads \
- s-fatgen.adb \
- s-fatgen.ads \
- unchconv.ads \
- s-atacco.ads \
- s-atacco.adb \
- unchdeal.ads
-
-
-HIE_SOURCES = $(NON_COMPILABLE_HIE_SOURCES) $(COMPILABLE_HIE_SOURCES)
-
-# Object to generate for the HI run time
-
-HIE_OBJS =  \
- system.o   \
- ada.o      \
- a-except.o \
- gnat.o     \
- g-souinf.o \
- interfac.o \
- i-c.o      \
- s-stoele.o \
- s-maccod.o \
- s-unstyp.o \
- s-fatflt.o \
- s-fatlfl.o \
- s-fatllf.o \
- s-fatsfl.o \
- s-secsta.o \
- a-tags.o $(EXTRA_HIE_OBJS)
-
-# Files which are needed in ravenscar mode
-
-COMPILABLE_RAVEN_SOURCES = \
-$(COMPILABLE_HIE_SOURCES) \
- s-parame.ads \
- s-parame.adb \
- s-purexc.ads \
- s-osinte.ads \
- s-osinte.adb \
- s-tasinf.ads \
- s-tasinf.adb \
- s-taspri.ads \
- s-taprop.ads \
- s-taprop.adb \
- s-taskin.ads \
- s-taskin.adb \
- s-interr.ads \
- s-interr.adb \
- a-interr.ads \
- a-interr.adb \
- a-intnam.ads \
- a-reatim.ads \
- a-reatim.adb \
- a-retide.ads \
- a-retide.adb \
- s-taprob.ads \
- s-taprob.adb \
- s-tposen.ads \
- s-tposen.adb \
- s-tasres.ads \
- s-tarest.ads \
- s-tarest.adb \
- a-sytaco.ads \
- a-sytaco.adb \
- a-taside.ads \
- a-taside.adb $(EXTRA_RAVEN_SOURCES)
-
-NON_COMPILABLE_RAVEN_SOURCES= $(NON_COMPILABLE_HIE_SOURCES)
-
-RAVEN_SOURCES = $(NON_COMPILABLE_RAVEN_SOURCES) $(COMPILABLE_RAVEN_SOURCES)
-
-# Objects to generate for the ravenscar run time
-
-RAVEN_LIBGNARL_OBJS = \
- s-parame.o  \
- s-purexc.o  \
- s-osinte.o  \
- s-tasinf.o  \
- s-taspri.o  \
- s-taprop.o  \
- s-taskin.o  \
- s-interr.o  \
- a-interr.o  \
- a-intnam.o  \
- a-reatim.o  \
- a-retide.o  \
- s-osinte.o  \
- s-taprob.o  \
- s-tposen.o  \
- s-tasres.o  \
- s-tarest.o  \
- a-sytaco.o \
- a-taside.o $(EXTRA_RAVEN_OBJS)
-
-RAVEN_OBJS = \
- $(HIE_OBJS) \
- $(RAVEN_LIBGNARL_OBJS)
-
 # Default run time files
 
 ADA_INCLUDE_SRCS =\
@@ -1558,7 +1436,7 @@ gnattools2: ../stamp-tools
          ../../gnatls$(exeext) ../../gnatprep$(exeext) \
          ../../gnatxref$(exeext) \
          ../../gnatfind$(exeext) ../../gnatname$(exeext) \
-         ../../gnatclean$(exeext) \
+         ../../gnatclean$(exeext) ../../gprmake$(exeext) \
          ../../gprcmd$(exeext)   ../../gpr2make$(exeext)
 
 # These tools are only built for the native version.
@@ -1600,6 +1478,12 @@ gnattools4: ../stamp-tools
        $(GNATLINK) -v gnatname -o $@ --GCC="$(CC) $(ADA_INCLUDES)" \
                    $(TOOLS_LIBS)
 
+../../gprmake$(exeext): ../stamp-tools
+       $(GNATMAKE) -c $(ADA_INCLUDES) gprmake --GCC="$(CC) $(ALL_ADAFLAGS)"
+       $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gprmake
+       $(GNATLINK) -v gprmake -o $@ --GCC="$(CC) $(ADA_INCLUDES)" \
+                   $(TOOLS_LIBS)
+
 ../../gpr2make$(exeext): ../stamp-tools
        $(GNATMAKE) -c $(ADA_INCLUDES) gpr2make --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gpr2make 
@@ -1660,7 +1544,7 @@ endif
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vxaddr2line 
        $(GNATLINK) -v vxaddr2line -o $@ --GCC="$(CC) $(ADA_INCLUDES)" $(CLIB)
 
-gnatmake-re: ../stamp-tools
+gnatmake-re: ../stamp-tools link.o
        $(GNATMAKE) $(ADA_INCLUDES) -u sdefault --GCC="$(CC) $(MOST_ADA_FLAGS)"
        $(GNATMAKE) -c $(ADA_INCLUDES) gnatmake --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatmake 
@@ -1673,7 +1557,7 @@ gnatlink-re: ../stamp-tools link.o
        $(GNATMAKE) -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink 
        $(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \
-                   --GCC="$(CC) $(ADA_INCLUDES)" link.o $(TOOLS_LIBS)
+                   --GCC="$(CC) $(ADA_INCLUDES)" $(TOOLS_LIBS)
        $(MV)  ../../gnatlinknew$(exeext)  ../../gnatlink$(exeext)
   
 # Needs to be built with CC=gcc
@@ -1681,11 +1565,11 @@ gnatlink-re: ../stamp-tools link.o
 #  stamp target in the parent directory whenever gnat1 is rebuilt
 
 # Likewise for the tools
-../../gnatmake$(exeext): $(P) b_gnatm.o $(GNATMAKE_OBJS)
+../../gnatmake$(exeext): $(P) b_gnatm.o link.o $(GNATMAKE_OBJS)
        $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) \
              $(TOOLS_LIBS)
 
-../../gnatlink$(exeext): $(P) b_gnatl.o $(GNATLINK_OBJS)
+../../gnatlink$(exeext): $(P) b_gnatl.o link.o $(GNATLINK_OBJS)
        $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) \
              $(TOOLS_LIBS)
 
@@ -1723,8 +1607,9 @@ install-gnatlib: ../stamp-gnatlib
            $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
        done
        -$(INSTALL_DATA) rts/g-trasym$(objext) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
-       -for file in rts/*$(arext);do \
+       -cd rts; for file in *$(arext);do \
            $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
+           $(RANLIB) $(DESTDIR)$(ADA_RTL_OBJ_DIR)/$$file; \
        done
 #     Install the shared libraries, if any, using $(INSTALL) instead
 #     of $(INSTALL_DATA). The latter may force a mode inappropriate
@@ -1812,98 +1697,17 @@ gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
         ifneq ($(PREFIX_OBJS),)
                $(AR) $(AR_FLAGS) rts/libgccprefix$(arext) $(PREFIX_OBJS);
         endif
-       if $(RANLIB_TEST) ; then $(RANLIB) rts/libgnat$(arext); else true; fi
+       -$(RANLIB) rts/libgnat$(arext)
        $(AR) $(AR_FLAGS) rts/libgnarl$(arext) \
           $(addprefix rts/,$(GNATRTL_TASKING_OBJS))
-       if $(RANLIB_TEST) ; then $(RANLIB) rts/libgnarl$(arext); else true; fi
+       -$(RANLIB) rts/libgnarl$(arext)
         ifeq ($(GMEM_LIB),gmemlib)
-               $(AR) $(AR_FLAGS) rts/libgmem$(arext) rts/memtrack.o;
+               $(AR) $(AR_FLAGS) rts/libgmem$(arext) rts/memtrack.o
+               -$(RANLIB) rts/libgmem$(arext)
         endif
        $(CHMOD) a-wx rts/*.ali
        touch ../stamp-gnatlib
 
-HIE_NONE_TARGET_PAIRS=\
- a-except.ads<1aexcept.ads \
- a-except.adb<1aexcept.adb \
- a-tags.ads<1atags.ads \
- a-tags.adb<1atags.adb \
- s-secsta.ads<1ssecsta.ads \
- s-secsta.adb<1ssecsta.adb \
- i-c.ads<1ic.ads $(EXTRA_HIE_NONE_TARGET_PAIRS)
-
-# This target needs RTS_NAME, RTS_SRCS, RTS_TARGET_PAIRS to be set properly
-# it creates a rts with the proper structure and the right target 
-# dependant srcs
-prepare-rts:
-       $(RMDIR) rts-$(RTS_NAME)
-       $(MKDIR) rts-$(RTS_NAME)
-       $(CHMOD) u+w rts-$(RTS_NAME)
-       $(MKDIR) rts-$(RTS_NAME)/adalib
-       $(MKDIR) rts-$(RTS_NAME)/adainclude
-       $(CHMOD) u+w rts-$(RTS_NAME)/*
-# Generate the project file
-       $(ECHO) "project $(RTS_NAME) is" > rts-$(RTS_NAME)/$(RTS_NAME).gpr
-       $(ECHO) "   for Source_Dirs use (\"adainclude\");" \
-               >> rts-$(RTS_NAME)/$(RTS_NAME).gpr
-       $(ECHO) "   for Object_Dir use \"adalib\";" \
-               >> rts-$(RTS_NAME)/$(RTS_NAME).gpr
-       $(ECHO) "   for Source_List_File use " \
-               >>rts-$(RTS_NAME)/$(RTS_NAME).gpr
-       $(ECHO) "      \"rts-$(RTS_NAME)_source_list.txt\";" \
-               >>rts-$(RTS_NAME)/$(RTS_NAME).gpr
-       $(ECHO) "   package Builder is" >>rts-$(RTS_NAME)/$(RTS_NAME).gpr
-       $(ECHO) "     for Default_Switches (\"Ada\") use (\"-a\");" \
-                >>rts-$(RTS_NAME)/$(RTS_NAME).gpr
-       $(ECHO) "  end Builder;" >>rts-$(RTS_NAME)/$(RTS_NAME).gpr
-       $(ECHO) "  package Compiler is" >> rts-$(RTS_NAME)/$(RTS_NAME).gpr
-       $(ECHO) "     for Default_Switches (\"Ada\") use (\"-nostdinc\");" \
-                >>rts-$(RTS_NAME)/$(RTS_NAME).gpr
-       $(ECHO) "  end Compiler;" >>rts-$(RTS_NAME)/$(RTS_NAME).gpr
-       $(ECHO) "end $(RTS_NAME);" >>rts-$(RTS_NAME)/$(RTS_NAME).gpr
-
-       $(foreach f, $(COMPILABLE_SOURCES), \
-               $(ECHO) $(f) >> \
-                       rts-$(RTS_NAME)/rts-$(RTS_NAME)_source_list.txt ;) true
-# Copy target independent sources
-       $(foreach f,$(RTS_SRCS), \
-         $(CP) $(fsrcpfx)$(f) rts-$(RTS_NAME)/adainclude/ ;) true
-# Remove files to be replaced by target dependent sources
-       $(RM) $(foreach PAIR,$(RTS_TARGET_PAIRS), \
-                rts-$(RTS_NAME)/adainclude/$(word 1,$(subst <, ,$(PAIR))))
-# Copy new target dependent sources
-       $(foreach PAIR,$(RTS_TARGET_PAIRS), \
-           $(CP) $(fsrcpfx)$(word 2,$(subst <, ,$(PAIR))) \
-                   rts-$(RTS_NAME)/adainclude/$(word 1,$(subst <, ,$(PAIR)));)
-
-install-rts: force
-       $(CP) -r rts-$(RTS_NAME) $(DESTDIR)$(libsubdir)/
-
-rts-zfp: force
-       $(MAKE) $(FLAGS_TO_PASS) prepare-rts \
-          RTS_NAME=zfp RTS_SRCS="$(HIE_SOURCES)" \
-          RTS_TARGET_PAIRS="$(HIE_NONE_TARGET_PAIRS)" \
-          COMPILABLE_SOURCES="$(COMPILABLE_HIE_SOURCES)" 
-       $(GNATMAKE) -Prts-zfp/zfp.gpr --GCC="../../../xgcc -B../../../"
-       cd rts-zfp/adalib/ ; $(AR) r libgnat.a *.o
-       $(RM) rts-zfp/adalib/*.o
-       $(CHMOD) a-wx rts-zfp/adalib/*.ali
-       $(CHMOD) a-wx rts-zfp/adalib/libgnat.a
-
-rts-ravenscar: force
-       $(MAKE)  $(FLAGS_TO_PASS) prepare-rts \
-          RTS_NAME=ravenscar RTS_SRCS="$(RAVEN_SOURCES)" \
-          RTS_TARGET_PAIRS="$(HIE_RAVEN_TARGET_PAIRS)" \
-          COMPILABLE_SOURCES="$(COMPILABLE_RAVEN_SOURCES)" 
-       $(GNATMAKE) -Prts-ravenscar/ravenscar.gpr \
-          --GCC="../../../xgcc -B../../../"
-       cd rts-ravenscar/adalib ; \
-       $(foreach FILE,$(RAVEN_LIBGNARL_OBJS), $(AR) r libgnarl.a $(FILE);) \
-       $(foreach FILE,$(HIE_OBJS), $(AR) r libgnat.a $(FILE);)
-       $(RM) rts-ravenscar/adalib/*.o
-       $(CHMOD) a-wx rts-ravenscar/adalib/*.ali
-       $(CHMOD) a-wx rts-ravenscar/adalib/libgnat.a
-       $(CHMOD) a-wx rts-ravenscar/adalib/libgnarl.a
-
 # Warning: this target assumes that LIBRARY_VERSION has been set correctly.
 gnatlib-shared-default:
        $(MAKE) $(FLAGS_TO_PASS) \
@@ -1911,7 +1715,7 @@ gnatlib-shared-default:
             GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \
             THREAD_KIND="$(THREAD_KIND)" \
              gnatlib
-       $(RM) rts/libgnat$(soext) rts/libgnarl$(soext)
+       $(RM) rts/libgna*$(soext)
        cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
                -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
                $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
@@ -1967,7 +1771,7 @@ gnatlib-shared-win32:
             GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \
             THREAD_KIND="$(THREAD_KIND)" \
              gnatlib
-       $(RM) rts/libgnat$(soext) rts/libgnarl$(soext)
+       $(RM) rts/libgna*$(soext)
        cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
                -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
                $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
@@ -1984,7 +1788,7 @@ gnatlib-shared-vms:
             GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
             THREAD_KIND="$(THREAD_KIND)" \
              gnatlib
-       $(RM) rts/libgnat*$(soext) rts/libgnarl*$(soext)
+       $(RM) rts/libgna*$(soext)
        cd rts && echo "case_sensitive=yes" > SYMVEC_$$$$.opt && \
        objdump --syms $(LIBGNAT_OBJS) $(GNATRTL_NONTASKING_OBJS) | \
        $(SHLIB_SYMVEC) >> SYMVEC_$$$$.opt && \