X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fada%2FMakefile.in;h=7457e2f36ae089f4ebf071d088f6342d8f4d0a4d;hb=86232b46e55cbaf14d0843a7607bd18b3622cc16;hp=a7cc267786039d0807535e16e509c1e852fef2e2;hpb=89dc5e05933bb1873036bec04b1390de496e8e3a;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index a7cc2677860..7457e2f36ae 100644
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -1,25 +1,25 @@
 # Makefile for GNU Ada Compiler (GNAT).
-#   Copyright (C) 1994-2002 Free Software Foundation, Inc.
+#   Copyright (C) 1994-2005 Free Software Foundation, Inc.
 
-#This file is part of GNU CC.
+#This file is part of GCC.
 
-#GNU CC is free software; you can redistribute it and/or modify
+#GCC is free software; you can redistribute it and/or modify
 #it under the terms of the GNU General Public License as published by
 #the Free Software Foundation; either version 2, or (at your option)
 #any later version.
 
-#GNU CC is distributed in the hope that it will be useful,
+#GCC is distributed in the hope that it will be useful,
 #but WITHOUT ANY WARRANTY; without even the implied warranty of
 #MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #GNU General Public License for more details.
 
 #You should have received a copy of the GNU General Public License
-#along with GNU CC; see the file COPYING.  If not, write to
+#along with GCC; see the file COPYING.  If not, write to
 #the Free Software Foundation, 59 Temple Place - Suite 330,
 #Boston, MA 02111-1307, USA.
 
 # The makefile built from this file lives in the language subdirectory.
-# It's purpose is to provide support for:
+# Its purpose is to provide support for:
 #
 # 1) recursion where necessary, and only then (building .o's), and
 # 2) building and debugging cc1 from the language subdirectory, and
@@ -89,20 +89,14 @@ X_ADAFLAGS =
 T_ADAFLAGS =
 
 CC = cc
-# Let the configure setting prevail only if CC hasn't been overridden
-# to xgcc by the top level Makefile (in a later stage of bootstrap).
-ifeq ($(findstring xgcc, $(CC)),)
-ADAC = @ADAC@
-else
-ADAC = $(CC)
-endif
-
 BISON = bison
 BISONFLAGS =
 ECHO = echo
 LEX = flex
 LEXFLAGS =
 CHMOD = chmod
+LN = ln
+LN_S = ln -s
 CP = cp -p
 MV = mv -f
 RM = rm -f
@@ -110,23 +104,23 @@ RMDIR = rm -rf
 MKDIR = mkdir -p
 AR = ar
 AR_FLAGS = rc
-# 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 ]
+LS = ls
+RANLIB = @RANLIB@
+RANLIB_FLAGS = @ranlib_flags@
+
 SHELL = @SHELL@
-PWD = $${PWDCMD-pwd}
+PWD_COMMAND = $${PWDCMD-pwd}
 # How to copy preserving the date
 INSTALL_DATA_DATE = cp -p
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
-GNATBIND = $(STAGE_PREFIX)gnatbind -C
+GNATBIND = $(STAGE_PREFIX)gnatbind
 GNATBIND_FLAGS = -static -x
 ADA_CFLAGS =
 ADAFLAGS = -W -Wall -gnatpg -gnata
 SOME_ADAFLAGS =-gnata
 FORCE_DEBUG_ADAFLAGS = -g
-GNATLIBFLAGS = -gnatpg
+GNATLIBFLAGS = -gnatpg -nostdinc
 GNATLIBCFLAGS = -g -O2
 GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
 	-DIN_RTS
@@ -139,21 +133,15 @@ THREAD_KIND = native
 THREADSLIB =
 GMEM_LIB =
 MISCLIB =
+SYMDEPS = $(LIBINTL_DEP)
+OUTPUT_OPTION = @OUTPUT_OPTION@
 
 objext = .o
 exeext =
 arext  = .a
 soext  = .so
 shext  =
-
-HOST_CC=$(CC)
-HOST_CFLAGS=$(ALL_CFLAGS)
-HOST_CLIB=$(CLIB)
-HOST_LDFLAGS=$(LDFLAGS)
-HOST_CPPFLAGS=$(ALL_CPPFLAGS)
-HOST_ALLOCA=$(ALLOCA)
-HOST_MALLOC=$(MALLOC)
-HOST_OBSTACK=$(OBSTACK)
+hyphen = -
 
 # Define this as & to perform parallel make on a Sequent.
 # Note that this has some bugs, and it seems currently necessary 
@@ -175,54 +163,63 @@ GCC_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS)
 program_transform_name =
 objdir = .
 
-target=@target@
 target_alias=@target_alias@
-xmake_file=@dep_host_xmake_file@
-tmake_file=@dep_tmake_file@
-host_canonical=@host_canonical@
+target=@target@
+xmake_file = @xmake_file@
+tmake_file = @tmake_file@
+host_canonical=@host@
 #version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.c`
 #mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c`
 
 # Directory where sources are, from where we are.
 srcdir = @srcdir@
-VPATH = @srcdir@
+VPATH = $(srcdir)
 
-fsrcdir := $(shell cd $(srcdir);${PWD})
-fsrcpfx := $(shell cd $(srcdir);${PWD})/
-fcurdir := $(shell ${PWD})
-fcurpfx := $(shell ${PWD})/
+fsrcdir := $(shell cd $(srcdir);${PWD_COMMAND})
+fsrcpfx := $(shell cd $(srcdir);${PWD_COMMAND})/
+fcurdir := $(shell ${PWD_COMMAND})
+fcurpfx := $(shell ${PWD_COMMAND})/
 
 # Top build directory, relative to here.
-top_builddir = ..
+top_builddir = ../..
 
 # Internationalization library.
-INTLLIBS = @INTLLIBS@
-INTLDEPS = @INTLDEPS@
+LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
 
 # Any system libraries needed just for GNAT.
 SYSLIBS = @GNAT_LIBEXC@
 
 # List of extra object files linked in with various programs.
-EXTRA_GNATTOOLS_OBJS = ../prefix.o
+EXTRA_GNATTOOLS_OBJS = ../../prefix.o ../../version.o
+
+# List of target dependent sources, overridden below as necessary
+TARGET_ADA_SRCS =
 
-# List extra gnattools
-EXTRA_GNATTOOLS =
+# Type of tools build we are doing; default is not compiling tools.
+TOOLSCASE =
 
 # End of variables for you to override.
 
-# Definition of `all' is here so that new rules inserted by sed
-# do not specify the default target.
 all: all.indirect
 
 # This tells GNU Make version 3 not to put all variables in the environment.
 .NOEXPORT:
 
-# sed inserts variable overrides after the following line.
-####target overrides
-@target_overrides@
+# tmake_file and xmake_file expand to lists with entries of the form
+# $(srcdir)/config/...  but here $(srcdir) is the ada subdirectory so we
+# need to adjust the paths.  There can't be spaces in the subst arguments
+# or we get spurious spaces in the actual list of files to include.
 
-####host overrides
-@host_overrides@
+# target overrides
+ifneq ($(tmake_file),)
+include $(subst /config,/../config,$(tmake_file))
+endif
+
+# host overrides
+ifneq ($(xmake_file),)
+include $(subst /config,/../config,$(xmake_file))
+endif
 
 # Now figure out from those variables how to compile and link.
 
@@ -246,10 +243,9 @@ LIBIBERTY = ../../libiberty/libiberty.a
 
 # How to link with both our special library facilities
 # and the system's installed libraries.
-LIBS = $(INTLLIBS) $(LIBIBERTY) $(SYSLIBS)
-LIBDEPS = $(INTLDEPS) $(LIBIBERTY)
-TOOLS_LIBS = ../../prefix.o $(LIBGNAT) ../../../libiberty/libiberty.a \
-	$(SYSLIBS)
+LIBS = $(LIBINTL) $(LIBIBERTY) $(SYSLIBS)
+LIBDEPS = $(LIBINTL_DEP) $(LIBIBERTY)
+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,
@@ -260,23 +256,36 @@ INCLUDES = -I- -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config \
 
 ADA_INCLUDES = -I- -I. -I$(srcdir)
 
-INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir) \
-	-I$(fsrcdir)/.. -I$(fsrcdir)/../config -I$(fsrcdir)/../../include
+INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir) -I$(fsrcdir)/../config \
+	-I$(fsrcdir)/../../include -I$(fsrcdir)/..
 ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)
 
 # Avoid a lot of time thinking about remaking Makefile.in and *.def.
 .SUFFIXES: .in .def
 
 # Say how to compile Ada programs.
-.SUFFIXES: .ada .adb .ads
+.SUFFIXES: .ada .adb .ads .asm
 
 # Always use -I$(srcdir)/config when compiling.
+.asm.o:
+	$(CC) -c -x assembler $< $(OUTPUT_OPTION)
+
 .c.o:
-	$(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $<
+	$(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< \
+	  $(OUTPUT_OPTION)
+
 .adb.o:
-	$(ADAC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $<
+	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
+
 .ads.o:
-	$(ADAC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $<
+	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
+
+# how to regenerate this file
+Makefile: ../config.status $(srcdir)/Makefile.in $(srcdir)/../version.c
+	cd ..; \
+	LANGUAGES="$(CONFIG_LANGUAGES)" \
+	CONFIG_HEADERS= \
+	CONFIG_FILES=ada/Makefile $(SHELL) config.status
 
 # This tells GNU make version 3 not to export all the variables
 # defined in this file into the environment.
@@ -284,25 +293,27 @@ ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)
 
 # Lists of files for various purposes.
 
-# Object files for gnat executables
-GNATLINK_OBJS = gnatlink.o link.o \
- ali.o alloc.o butil.o casing.o csets.o debug.o fmap.o fname.o gnatvsn.o \
- hostparm.o namet.o opt.o osint.o output.o rident.o sdefault.o stylesw.o \
- switch.o table.o tree_io.o types.o validsw.o widechar.o
-
-GNATMAKE_OBJS = ali.o ali-util.o \
- alloc.o atree.o binderr.o butil.o casing.o csets.o debug.o einfo.o elists.o \
- errout.o fmap.o fname.o fname-uf.o fname-sf.o \
- gnatmake.o gnatvsn.o hostparm.o krunch.o lib.o make.o makeusg.o \
- mlib.o mlib-fil.o mlib-prj.o mlib-tgt.o mlib-utl.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 indepsw.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 \
+ table.o tree_io.o types.o validsw.o widechar.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 \
+ 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-ext.o prj-nmsc.o \
+ prj.o prj-attr.o prj-attr-pm.o prj-com.o prj-dect.o prj-env.o prj-err.o prj-ext.o prj-nmsc.o \
  prj-pars.o prj-part.o prj-proc.o prj-strt.o prj-tree.o prj-util.o \
- rident.o scans.o scn.o sdefault.o sfn_scan.o sinfo.o sinfo-cn.o \
- sinput.o sinput-l.o sinput-p.o \
- snames.o stand.o stringt.o style.o stylesw.o validsw.o switch.o switch-m.o \
- switch-c.o table.o targparm.o tree_io.o types.o \
- uintp.o uname.o urealp.o usage.o widechar.o
+ rident.o s-exctab.o s-secsta.o s-stalib.o s-stoele.o \
+ scans.o scng.o sdefault.o sfn_scan.o s-purexc.o s-htable.o \
+ sinfo.o sinput.o sinput-c.o sinput-p.o \
+ snames.o stand.o stringt.o styleg.o stylesw.o system.o validsw.o switch.o switch-m.o \
+ table.o targparm.o tempdir.o tree_io.o types.o \
+ uintp.o  uname.o urealp.o usage.o widechar.o \
+ $(EXTRA_GNATMAKE_OBJS)
 
 # Convert the target variable into a space separated list of architecture,
 # manufacturer, and operating system and assign each of those to its own
@@ -327,13 +338,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
@@ -342,34 +353,49 @@ s-taspri.ads<5ntaspri.ads
 SO_OPTS = -Wl,-soname,
 
 # Default gnatlib-shared target.
-# This is needed on some targets to use a different gnatlib-shared target, e.g
-# gnatlib-shared-dual
-GNATLIB_SHARED = gnatlib-shared-default
+# By default, equivalent to gnatlib.
+# Set to gnatlib-shared-default, gnatlib-shared-dual, or a platform specific
+# target when supported.
+GNATLIB_SHARED = gnatlib
 
 # default value for gnatmake's target dependent file
 MLIB_TGT = mlib-tgt
 
+# By default, do not distribute prefix.o (in libgccprefix), since it is only
+# needed by external GNAT tools such as gnatdist and Glide.
+# Override this variable on native platforms when needed.
+PREFIX_OBJS =
+
+# To avoid duplicate code, use this variable to set PREFIX_OBJS when needed:
+PREFIX_REAL_OBJS = ../prefix.o \
+  ../../libiberty/concat.o     \
+  ../../libiberty/xmalloc.o    \
+  ../../libiberty/xstrdup.o    \
+  ../../libiberty/xexit.o
+
+LIB_VERSION = $(strip $(shell grep ' Library_Version :' $(fsrcpfx)gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/'))
+
 # $(filter-out PATTERN...,TEXT) removes all PATTERN words from TEXT.
 # $(strip STRING) removes leading and trailing spaces from STRING.
 # If what's left is null then it's a match.
 
 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 \
@@ -380,70 +406,76 @@ 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)
 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)
   SO_OPTS = -Wl,-h,
   GNATLIB_SHARED = gnatlib-shared-dual
-  LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
+  LIBRARY_VERSION := $(LIB_VERSION)
 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.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-taprop.adb<5ztaprop.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
@@ -451,562 +483,990 @@ 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.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-vxwork.ads<5kvxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5ksystem.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-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 vx%,$(targ))),)
+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.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-vxwork.ads<5pvxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5ysystem.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
+  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<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
+
+  EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o s-vxwexc.o
   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
 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.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-vxwork.ads<5svxwork.ads \
-  system.ads<5ysystem.ads
-
-  EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o
+  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
+endif
+
+ifeq ($(strip $(filter-out %86 wrs vxworks,$(targ))),)
+  LIBGNAT_TARGET_PAIRS = \
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  i-vxwork.ads<i-vxwork-x86.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 \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  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-x86.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-x86.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
+
+  ifeq ($(strip $(filter-out yes,$(TRACE))),)
+    LIBGNAT_TARGET_PAIRS += \
+    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
+
+  EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
+  EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
+endif
+
+ifeq ($(strip $(filter-out xscale% coff wrs vx%,$(targ))),)
+  LIBGNAT_TARGET_PAIRS = \
+  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
 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.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-vxwork.ads<5mvxwork.ads \
-  system.ads<5zsystem.ads
-
-  EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o
+  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
 endif
 
-ifeq ($(strip $(filter-out sparc sun solaris2% sunos5%,$(targ))),)
+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<5posprim.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-tpopse.adb<5stpopse.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-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
-  SYMLIB = -laddr2line -lbfd $(INTLLIBS)
   SO_OPTS = -Wl,-h,
   GNATLIB_SHARED = gnatlib-shared-dual
   GMEM_LIB = gmemlib
-  LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
 
   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<5posprim.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<5posprim.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<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<5posprim.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-tpopse.adb<5etpopse.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
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-solaris.adb
 
   THREADSLIB = -lposix4 -lthread
   MISCLIB = -lposix4 -lnsl -lsocket
   SO_OPTS = -Wl,-h,
   GNATLIB_SHARED = gnatlib-shared-dual
-  LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
+  GMEM_LIB = gmemlib
+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
 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<5lintman.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 \
-  system.ads<5lsystem.ads
-
-  TOOLS_TARGET_PAIRS = mlib-tgt.adb<5lml-tgt.adb
-  SYMLIB = -laddr2line -lbfd $(INTLLIBS)
+  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<mlib-tgt-linux.adb \
+    indepsw.adb<indepsw-linux.adb
+
   THREADSLIB = -lpthread
   GNATLIB_SHARED = gnatlib-shared-dual
   GMEM_LIB = gmemlib
-  LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
 
   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<5lintman.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
+endif
+
+ifeq ($(strip $(filter-out %86 freebsd%,$(arch) $(osys))),)
+  LIBGNAT_TARGET_PAIRS = \
+  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<mlib-tgt-linux.adb
+  GNATLIB_SHARED = gnatlib-shared-dual
+
+  THREADSLIB= -lc_r
+  GMEM_LIB = gmemlib
+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
 
-  ifeq ($(strip $(filter-out rt-linux RT-LINUX,$(THREAD_KIND))),)
+ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)
+  ifeq ($(strip $(filter-out s390x,$(arch))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4nintnam.ads \
-    s-inmaop.adb<5ninmaop.adb \
-    s-intman.adb<5nintman.adb \
-    s-osinte.adb<5qosinte.adb \
-    s-osinte.ads<5qosinte.ads \
-    s-osprim.adb<5qosprim.adb \
-    s-stache.adb<5qstache.adb \
-    s-taprop.adb<5qtaprop.adb \
-    s-taspri.ads<5qtaspri.ads \
-    system.ads<5lsystem.ads
-
-    RT_FLAGS = -D__RT__
+    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<5aosinte.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-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<5aosinte.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
-
-    THREADSLIB = -lathread
+    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<mlib-tgt-irix.adb
   TGT_LIB = -lexc
   MISCLIB = -lexc
-  SO_OPTS = -Wl,-all,-set_version,sgi1.0,-update_registry,../so_locations,-soname,
-  LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
+ifeq ($(strip $(filter-out hppa% hp hpux10%,$(targ))),)
+  LIBGNAT_TARGET_PAIRS = \
+  a-excpol.adb<a-excpol-abort.adb \
+  a-intnam.ads<a-intnam-hpux.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-sigaction.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.adb<s-osinte-hpux-dce.adb \
+  s-osinte.ads<s-osinte-hpux-dce.ads \
+  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 hpux%,$(targ))),)
+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
-
-  TGT_LIB = /usr/lib/libcl.a -lpthread
-  THREADSLIB = -lpthread -lc_r
-  SYMLIB = -laddr2line -lbfd $(INTLLIBS)
+  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
+  GMEM_LIB = gmemlib
   soext = .sl
   SO_OPTS = -Wl,+h,
+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
   GNATLIB_SHARED = gnatlib-shared-dual
+  LIBRARY_VERSION := $(LIB_VERSION)
 
   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 \
-    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
   endif
 endif
 
-ifeq ($(strip $(filter-out ibm aix4%,$(manu) $(osys))),)
+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<mlib-tgt-aix.adb \
+  indepsw.adb<indepsw-aix.adb
+
+  GMEM_LIB = gmemlib
 endif
 
 ifeq ($(strip $(filter-out lynxos,$(osys))),)
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-lynxos.adb 
+
   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<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<52system.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<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-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<5atpopsp.adb \
-      system.ads<52system.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
-
-  else
-    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<5atpopsp.adb \
-    system.ads<52system.ads
   endif
 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-osinte.adb<5rosinte.adb \
-  s-osinte.ads<5rosinte.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-parame.adb<5rparame.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<5atpopsp.adb
-endif
-
-ifeq ($(strip $(filter-out go32 msdos,$(osys))),)
+ifeq ($(strip $(filter-out rtems%,$(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4dintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-osinte.adb<7sosinte.adb \
-  s-osinte.ads<5dosinte.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<7stpopsp.adb
+  a-intnam.ads<a-intnam-rtems.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.adb<s-osinte-rtems.adb \
+  s-osinte.ads<s-osinte-rtems.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-parame.adb<s-parame-rtems.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-rtems.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
-
+  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
   THREADSLIB = -lpthread -lmach -lexc -lrt
-  SYMLIB = -laddr2line -lbfd $(INTLLIBS)
-  LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+  GNATLIB_SHARED = gnatlib-shared-default
+  LIBRARY_VERSION := $(LIB_VERSION)
 endif
 
-ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(host))),)
+ifeq ($(strip $(filter-out alpha% ia64 dec hp vms% openvms% alphavms%,$(host))),)
 
-EXTRA_GNAT1_OBJS = ../prefix.o vmshandler.o
-EXTRA_GNATBIND_OBJS = ../prefix.o vmshandler.o
+soext  = .exe
+hyphen = _
+LN = cp -p
+LN_S = cp -p
 
+ifeq ($(strip $(filter-out ia64 hp vms% openvms%,$(targ))),)
+AR = iar
 endif
 
-ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(targ))),)
+.SUFFIXES: .sym
 
-ifeq ($(strip $(filter-out alpha64% dec vms% openvms% alphavms%,$(targ))),)
-  LIBGNAT_TARGET_PAIRS_AUX =
+.o.sym: 
+	@ gnu:[bin]vmssymvec $<
+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 = \
+  g-enblsp.adb<g-enblsp-vms-ia64.adb \
+  s-auxdec.ads<s-auxdec-vms_64.ads \
+  s-crtl.ads<s-crtl-vms64.ads \
+  s-osinte.adb<s-osinte-vms-ia64.adb \
+  s-osinte.ads<s-osinte-vms-ia64.ads \
+  system.ads<system-vms_64.ads
 else
+ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(targ))),)
+  LIBGNAT_TARGET_PAIRS_AUX1 = \
+  g-enblsp.adb<g-enblsp-vms-alpha.adb \
+  s-asthan.adb<s-asthan-vms-alpha.adb \
+  s-crtl.ads<s-crtl-vms.ads \
+  s-osinte.adb<s-osinte-vms.adb \
+  s-osinte.ads<s-osinte-vms.ads \
+  s-vaflop.adb<s-vaflop-vms-alpha.adb \
+  system.ads<system-vms-zcx.ads
+endif
+endif
 ifeq ($(strip $(filter-out express EXPRESS,$(THREAD_KIND))),)
-  LIBGNAT_TARGET_PAIRS_AUX = \
-  s-parame.ads<5xparame.ads
+  LIBGNAT_TARGET_PAIRS_AUX2 = \
+  s-parame.ads<s-parame-vms-restrict.ads
 else
-  LIBGNAT_TARGET_PAIRS_AUX = \
-  s-parame.ads<5vparame.ads
-endif
+  LIBGNAT_TARGET_PAIRS_AUX2 = \
+  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-excpol.adb<4wexcpol.adb \
-  a-intnam.ads<4vintnam.ads \
-  g-enblsp.adb<3venblsp.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-osinte.adb<5vosinte.adb \
-  s-osinte.ads<5vosinte.ads \
-  s-osprim.adb<5vosprim.adb \
-  s-osprim.ads<5vosprim.ads \
-  s-taprop.adb<5vtaprop.adb \
-  s-taspri.ads<5vtaspri.ads \
-  s-tpopde.adb<5vtpopde.adb \
-  s-tpopde.ads<5vtpopde.ads \
-  s-vaflop.adb<5vvaflop.adb \
-  system.ads<5xsystem.ads   \
-  $(LIBGNAT_TARGET_PAIRS_AUX)
+  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-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-foreign.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 \
+  $(LIBGNAT_TARGET_PAIRS_AUX1) \
+  $(LIBGNAT_TARGET_PAIRS_AUX2)
+
+ifeq ($(strip $(filter-out ia64 hp vms% openvms%,$(targ))),)
+  TOOLS_TARGET_PAIRS= \
+  mlib-tgt.adb<mlib-tgt-vms-ia64.adb \
+  symbols.adb<symbols-vms-ia64.adb
+else
+  TOOLS_TARGET_PAIRS= \
+  mlib-tgt.adb<mlib-tgt-vms-alpha.adb \
+  symbols.adb<symbols-vms-alpha.adb
+endif
 
   GNATLIB_SHARED=gnatlib-shared-vms
+ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(targ))),)
   EXTRA_LIBGNAT_SRCS=vmshandler.asm
   EXTRA_LIBGNAT_OBJS=vmshandler.o
+endif
   EXTRA_GNATRTL_TASKING_OBJS=s-tpopde.o
-  EXTRA_GNATTOOLS_OBJS = ../prefix.o vmshandler.o
+  EXTRA_GNATTOOLS = \
+     ../../gnatlbr$(exeext)  \
+     ../../gnatsym$(exeext)  \
+     ../../vms_help$(exeext) \
+     ../../gnat.hlp
+  # This command transforms (YYYYMMDD) into YY,MMDD
+  GSMATCH_VERSION := $(shell grep "^ *Gnat_Static_Version_String" $(fsrcpfx)gnatvsn.ads | sed -e 's/.*(\(.*\)).*/\1/' -e 's/\(..\)\(..\)\(....\)/\2,\3/')
+  TOOLS_LIBS_LO := --for-linker=sys\\$$\$$library:trace.exe
+  LIBRARY_VERSION := $(subst .,_,$(LIB_VERSION))
 endif
 
 ifeq ($(strip $(filter-out cygwin32% mingw32% pe,$(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-calend.adb<4wcalend.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
+  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 \
+  s-parame.adb<s-parame-mingw.adb \
+  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 \
+  indepsw.adb<indepsw-mingw.adb
 
   MISCLIB = -lwsock32
-  SYMLIB = -laddr2line -lbfd $(INTLLIBS)
   GMEM_LIB = gmemlib
+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
   EXTRA_GNATTOOLS = ../../gnatdll$(exeext)
+  EXTRA_GNATMAKE_OBJS = mdll.o mdll-utl.o mdll-fil.o
   EXTRA_GNATRTL_NONTASKING_OBJS = g-regist.o
+  soext = .dll
+# ??? This will be replaced by gnatlib-shared-dual-win32 when GNAT auto-import
+# support for array/record will be done.
+  GNATLIB_SHARED = gnatlib-shared-win32
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
+ifeq ($(strip $(filter-out powerpc% linux%,$(arch) $(osys))),)
+  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-ppc.ads
+
+  TOOLS_TARGET_PAIRS =  \
+    mlib-tgt.adb<mlib-tgt-linux.adb \
+    indepsw.adb<indepsw-linux.adb
+
+  THREADSLIB = -lpthread
+  GNATLIB_SHARED = gnatlib-shared-dual
+  GMEM_LIB = gmemlib
+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
+ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
+  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-sparc.ads
+
+  TOOLS_TARGET_PAIRS =  \
+    mlib-tgt.adb<mlib-tgt-linux.adb \
+    indepsw.adb<indepsw-linux.adb
+
+  THREADSLIB = -lpthread
+  GNATLIB_SHARED = gnatlib-shared-dual
+  GMEM_LIB = gmemlib
+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
+ifeq ($(strip $(filter-out %ia64 linux%,$(arch) $(osys))),)
+  LIBGNAT_TARGET_PAIRS = \
+  a-intnam.ads<a-intnam-linux.ads \
+  a-numaux.ads<a-numaux-libc-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-ia64.ads
+
+  TOOLS_TARGET_PAIRS =  \
+    mlib-tgt.adb<mlib-tgt-linux.adb \
+    indepsw.adb<indepsw-linux.adb
+
+  MISCLIB=
+  THREADSLIB=-lpthread
+  GNATLIB_SHARED=gnatlib-shared-dual
+  GMEM_LIB = gmemlib
+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
+ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),)
+  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.ads<s-osinte-linux-alpha.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-alpha.ads
+
+  TOOLS_TARGET_PAIRS =  \
+    mlib-tgt.adb<mlib-tgt-linux.adb \
+    indepsw.adb<indepsw-linux.adb
+
+  MISCLIB=
+  THREADSLIB=-lpthread
+  GNATLIB_SHARED=gnatlib-shared-dual
+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
+ifeq ($(strip $(filter-out %x86_64 linux%,$(arch) $(osys))),)
+  LIBGNAT_TARGET_PAIRS = \
+  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 \
+    indepsw.adb<indepsw-linux.adb
+
+  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-darwin.ads \
+  a-numaux.ads<a-numaux-darwin.ads \
+  a-numaux.adb<a-numaux-darwin.adb \
+  system.ads<system-darwin-ppc.ads
+
+  TOOLS_TARGET_PAIRS =  \
+    mlib-tgt.adb<mlib-tgt-darwin.adb
+
+  GNATLIB_SHARED = gnatlib-shared-darwin
+  SO_OPTS = -Wl,-flat_namespace
+  RANLIB = ranlib -c
+  GMEM_LIB = gmemlib
+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+  soext = .dylib
 endif
 
 # The runtime library for gnat comprises two directories.  One contains the
@@ -1019,534 +1479,39 @@ endif
 # go into the directory.  The pthreads emulation is built in the threads
 # subdirectory and copied.
 LIBGNAT_SRCS = ada.h adaint.c adaint.h argv.c cio.c cstreams.c \
-  errno.c exit.c cal.c \
-  raise.h raise.c sysdep.c types.h aux-io.c init.c \
-  final.c tracebak.c expect.c mkdir.c $(EXTRA_LIBGNAT_SRCS)
+  errno.c exit.c cal.c ctrl_c.c \
+  raise.h raise.c sysdep.c aux-io.c init.c seh_init.c \
+  final.c tracebak.c tb-alvms.c tb-alvxw.c expect.c mkdir.c socket.c gsocket.h \
+  $(EXTRA_LIBGNAT_SRCS)
 
-LIBGNAT_OBJS = adaint.o argv.o cio.o cstreams.o errno.o exit.o \
-  raise.o sysdep.o aux-io.o init.o cal.o final.o \
-  tracebak.o expect.o mkdir.o $(EXTRA_LIBGNAT_OBJS)
+LIBGNAT_OBJS = adaint.o argv.o cio.o cstreams.o ctrl_c.o errno.o exit.o \
+  raise.o sysdep.o aux-io.o init.o seh_init.o cal.o final.o \
+  tracebak.o expect.o mkdir.o socket.o $(EXTRA_LIBGNAT_OBJS)
 
 # NOTE ??? - when the -I option for compiling Ada code is made to work,
 #  the library installation will change and there will be a
 #  GNAT_RTL_SRCS.  Right now we count on being able to build GNATRTL_OBJS
 #  from ADA_INCLUDE_SRCS.
 
-# Objects needed only for tasking
-GNATRTL_TASKING_OBJS= \
-  a-dynpri.o \
-  a-interr.o \
-  a-intsig.o \
-  a-intnam.o \
-  a-reatim.o \
-  a-retide.o \
-  a-sytaco.o \
-  a-taside.o \
-  g-thread.o \
-  s-asthan.o \
-  s-inmaop.o \
-  s-interr.o \
-  s-intman.o \
-  s-osinte.o \
-  s-proinf.o \
-  s-taenca.o \
-  s-taprob.o \
-  s-taprop.o \
-  s-tarest.o \
-  s-tasdeb.o \
-  s-tasinf.o \
-  s-tasini.o \
-  s-taskin.o \
-  s-taspri.o \
-  s-tasque.o \
-  s-tasres.o \
-  s-tasren.o \
-  s-tassta.o \
-  s-tasuti.o \
-  s-taasde.o \
-  s-tadeca.o \
-  s-tadert.o \
-  s-tataat.o \
-  s-tpinop.o \
-  s-tpoben.o \
-  s-tpobop.o \
-  s-tposen.o \
-  s-tratas.o $(EXTRA_GNATRTL_TASKING_OBJS)
-
-# Objects needed for non-tasking.
-GNATRTL_NONTASKING_OBJS= \
-  a-caldel.o \
-  a-calend.o \
-  a-chahan.o \
-  a-charac.o \
-  a-chlat1.o \
-  a-chlat9.o \
-  a-colien.o \
-  a-colire.o \
-  a-comlin.o \
-  a-cwila1.o \
-  a-cwila9.o \
-  a-decima.o \
-  a-einuoc.o \
-  a-except.o \
-  a-exctra.o \
-  a-filico.o \
-  a-finali.o \
-  a-flteio.o \
-  a-fwteio.o \
-  a-inteio.o \
-  a-ioexce.o \
-  a-iwteio.o \
-  a-lfteio.o \
-  a-lfwtio.o \
-  a-liteio.o \
-  a-liwtio.o \
-  a-llftio.o \
-  a-llfwti.o \
-  a-llitio.o \
-  a-lliwti.o \
-  a-ncelfu.o \
-  a-nlcefu.o \
-  a-nlcoty.o \
-  a-nlelfu.o \
-  a-nllcef.o \
-  a-nllcty.o \
-  a-nllefu.o \
-  a-nscefu.o \
-  a-nscoty.o \
-  a-nselfu.o \
-  a-nucoty.o \
-  a-nuelfu.o \
-  a-nuflra.o \
-  a-numaux.o \
-  a-numeri.o \
-  a-sfteio.o \
-  a-sfwtio.o \
-  a-siteio.o \
-  a-siwtio.o \
-  a-ssicst.o \
-  a-ssitio.o \
-  a-ssiwti.o \
-  a-stmaco.o \
-  a-strbou.o \
-  a-stream.o \
-  a-strfix.o \
-  a-string.o \
-  a-strmap.o \
-  a-strsea.o \
-  a-strunb.o \
-  a-ststio.o \
-  a-stunau.o \
-  a-stwibo.o \
-  a-stwifi.o \
-  a-stwima.o \
-  a-stwise.o \
-  a-stwiun.o \
-  a-suteio.o \
-  a-swuwti.o \
-  a-swmwco.o \
-  a-tags.o \
-  a-teioed.o \
-  a-textio.o \
-  a-ticoau.o \
-  a-tideau.o \
-  a-tienau.o \
-  a-tiflau.o \
-  a-tigeau.o \
-  a-tiinau.o \
-  a-timoau.o \
-  a-tiocst.o \
-  a-titest.o \
-  a-witeio.o \
-  a-wtcoau.o \
-  a-wtcstr.o \
-  a-wtdeau.o \
-  a-wtedit.o \
-  a-wtenau.o \
-  a-wtflau.o \
-  a-wtgeau.o \
-  a-wtinau.o \
-  a-wtmoau.o \
-  a-wttest.o \
-  ada.o \
-  calendar.o \
-  g-awk.o \
-  g-busora.o \
-  g-calend.o \
-  g-casuti.o \
-  g-catiio.o \
-  g-cgi.o    \
-  g-cgicoo.o \
-  g-cgideb.o \
-  g-comlin.o \
-  g-crc32.o \
-  g-curexc.o \
-  g-debuti.o \
-  g-debpoo.o \
-  g-diopit.o \
-  g-dirope.o \
-  g-except.o \
-  g-exctra.o \
-  g-expect.o \
-  g-flocon.o \
-  g-hesora.o \
-  g-htable.o \
-  g-io.o \
-  g-io_aux.o \
-  g-locfil.o \
-  g-md5.o \
-  g-moreex.o \
-  g-os_lib.o \
-  g-regexp.o \
-  g-regpat.o \
-  g-soccon.o \
-  g-socket.o \
-  g-socthi.o \
-  g-soliop.o \
-  g-souinf.o \
-  g-speche.o \
-  g-spipat.o \
-  g-spitbo.o \
-  g-sptabo.o \
-  g-sptain.o \
-  g-sptavs.o \
-  g-tasloc.o \
-  g-traceb.o \
-  gnat.o \
-  i-c.o \
-  i-cexten.o \
-  i-cobol.o \
-  i-cpp.o \
-  i-cstrea.o \
-  i-cstrin.o \
-  i-fortra.o \
-  i-pacdec.o \
-  interfac.o \
-  ioexcept.o \
-  machcode.o \
-  s-addima.o \
-  s-arit64.o \
-  s-assert.o \
-  s-auxdec.o \
-  s-bitops.o \
-  s-chepoo.o \
-  s-crc32.o  \
-  s-direio.o \
-  s-errrep.o \
-  s-except.o \
-  s-exctab.o \
-  s-exnflt.o \
-  s-exngen.o \
-  s-exnint.o \
-  s-exnlfl.o \
-  s-exnlin.o \
-  s-exnllf.o \
-  s-exnlli.o \
-  s-exnsfl.o \
-  s-exnsin.o \
-  s-exnssi.o \
-  s-expflt.o \
-  s-expgen.o \
-  s-expint.o \
-  s-explfl.o \
-  s-explin.o \
-  s-expllf.o \
-  s-explli.o \
-  s-expllu.o \
-  s-expmod.o \
-  s-expsfl.o \
-  s-expsin.o \
-  s-expssi.o \
-  s-expuns.o \
-  s-fatflt.o \
-  s-fatlfl.o \
-  s-fatllf.o \
-  s-fatsfl.o \
-  s-ficobl.o \
-  s-fileio.o \
-  s-finimp.o \
-  s-finroo.o \
-  s-fore.o \
-  s-imgbiu.o \
-  s-imgboo.o \
-  s-imgcha.o \
-  s-imgdec.o \
-  s-imgenu.o \
-  s-imgint.o \
-  s-imgllb.o \
-  s-imglld.o \
-  s-imglli.o \
-  s-imgllu.o \
-  s-imgllw.o \
-  s-imgrea.o \
-  s-imguns.o \
-  s-imgwch.o \
-  s-imgwiu.o \
-  s-io.o \
-  s-gloloc.o \
-  s-maccod.o \
-  s-mantis.o \
-  s-mastop.o \
-  s-osprim.o \
-  s-pack03.o \
-  s-pack05.o \
-  s-pack06.o \
-  s-pack07.o \
-  s-pack09.o \
-  s-pack10.o \
-  s-pack11.o \
-  s-pack12.o \
-  s-pack13.o \
-  s-pack14.o \
-  s-pack15.o \
-  s-pack17.o \
-  s-pack18.o \
-  s-pack19.o \
-  s-pack20.o \
-  s-pack21.o \
-  s-pack22.o \
-  s-pack23.o \
-  s-pack24.o \
-  s-pack25.o \
-  s-pack26.o \
-  s-pack27.o \
-  s-pack28.o \
-  s-pack29.o \
-  s-pack30.o \
-  s-pack31.o \
-  s-pack33.o \
-  s-pack34.o \
-  s-pack35.o \
-  s-pack36.o \
-  s-pack37.o \
-  s-pack38.o \
-  s-pack39.o \
-  s-pack40.o \
-  s-pack41.o \
-  s-pack42.o \
-  s-pack43.o \
-  s-pack44.o \
-  s-pack45.o \
-  s-pack46.o \
-  s-pack47.o \
-  s-pack48.o \
-  s-pack49.o \
-  s-pack50.o \
-  s-pack51.o \
-  s-pack52.o \
-  s-pack53.o \
-  s-pack54.o \
-  s-pack55.o \
-  s-pack56.o \
-  s-pack57.o \
-  s-pack58.o \
-  s-pack59.o \
-  s-pack60.o \
-  s-pack61.o \
-  s-pack62.o \
-  s-pack63.o \
-  s-parame.o \
-  s-parint.o \
-  s-pooglo.o \
-  s-pooloc.o \
-  s-poosiz.o \
-  s-powtab.o \
-  s-rpc.o \
-  s-scaval.o \
-  s-secsta.o \
-  s-sequio.o \
-  s-shasto.o \
-  s-sopco3.o \
-  s-sopco4.o \
-  s-sopco5.o \
-  s-stache.o \
-  s-stalib.o \
-  s-stoele.o \
-  s-stopoo.o \
-  s-stratt.o \
-  s-strops.o \
-  s-soflin.o \
-  s-memory.o \
-  s-traceb.o \
-  s-traces.o \
-  s-unstyp.o \
-  s-vaflop.o \
-  s-valboo.o \
-  s-valcha.o \
-  s-valdec.o \
-  s-valenu.o \
-  s-valint.o \
-  s-vallld.o \
-  s-vallli.o \
-  s-valllu.o \
-  s-valrea.o \
-  s-valuns.o \
-  s-valuti.o \
-  s-valwch.o \
-  s-vercon.o \
-  s-vmexta.o \
-  s-wchcnv.o \
-  s-wchcon.o \
-  s-wchjis.o \
-  s-wchstw.o \
-  s-wchwts.o \
-  s-widboo.o \
-  s-widcha.o \
-  s-widenu.o \
-  s-widlli.o \
-  s-widllu.o \
-  s-widwch.o \
-  s-wwdcha.o \
-  s-wwdenu.o \
-  s-wwdwch.o \
-  system.o \
-  text_io.o $(EXTRA_GNATRTL_NONTASKING_OBJS)
-
-GNATRTL_OBJS = $(GNATRTL_NONTASKING_OBJS) $(GNATRTL_TASKING_OBJS) g-trasym.o
-
-# Files which are suitable in no run time/hi integrity mode
-
-HIE_SOURCES = \
- system.ads   \
- ada.ads      \
- a-unccon.ads \
- a-uncdea.ads \
- gnat.ads     \
- g-souinf.ads \
- interfac.ads \
- s-stoele.ads \
- s-stoele.adb \
- unchconv.ads \
- unchdeal.ads \
- s-maccod.ads \
- s-unstyp.ads \
- s-fatgen.ads \
- s-fatgen.adb \
- s-fatflt.ads \
- s-fatlfl.ads \
- s-fatllf.ads \
- s-fatsfl.ads \
- s-secsta.ads \
- s-secsta.adb \
- a-tags.ads   \
- a-tags.adb $(EXTRA_HIE_SOURCES)
-
-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-secsta.o \
- a-tags.o $(EXTRA_HIE_OBJS)
-
-# Files which are needed in ravenscar mode
-
-RAVEN_SOURCES = \
- $(HIE_SOURCES) \
- s-parame.ads \
- s-parame.adb \
- g-except.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 $(EXTRA_RAVEN_SOURCES)
-
-# Objects to generate for the ravenscar run time
-
-RAVEN_OBJS = \
- $(HIE_OBJS) \
- s-parame.o  \
- g-except.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-taprob.o  \
- s-tposen.o  \
- s-tasres.o  \
- s-tarest.o  $(EXTRA_RAVEN_OBJS)
+# GNATRTL_NONTASKING_OBJS and GNATRTL_TASKING_OBJS can be found in
+# the following include file:
 
-# Default run time files
+include $(fsrcdir)/Makefile.rtl
 
-ADA_INCLUDE_DIR = $(libsubdir)/adainclude
-ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
+GNATRTL_OBJS = $(GNATRTL_NONTASKING_OBJS) $(GNATRTL_TASKING_OBJS) \
+  g-trasym.o memtrack.o
+
+# Default run time files
 
 ADA_INCLUDE_SRCS =\
  ada.ads calendar.ads directio.ads gnat.ads interfac.ads ioexcept.ads \
  machcode.ads text_io.ads unchconv.ads unchdeal.ads \
- sequenio.ads system.ads Makefile.adalib memtrack.adb \
- a-*.adb a-*.ads g-*.ad? i-*.ad? \
- s-[a-o]*.adb s-[p-z]*.adb \
- s-[a-o]*.ads s-[p-z]*.ads
+ sequenio.ads system.ads memtrack.adb \
+ a-[a-o]*.adb a-[p-z]*.adb a-[a-o]*.ads a-[p-z]*.ads g-*.ad? i-*.ad? \
+ s-[a-o]*.adb s-[p-z]*.adb s-[a-o]*.ads s-[p-z]*.ads  
 
-# Language-independent object files.
 LIBGNAT=../rts/libgnat.a 
-TOOLS_FLAGS_TO_PASS=		\
-        "CC=$(CC)" 		\
-        "CFLAGS=$(CFLAGS)"	\
-	"LDFLAGS=$(LDFLAGS)"	\
-        "ADAFLAGS=$(ADAFLAGS)"	\
-        "INCLUDES=$(INCLUDES_FOR_SUBDIR)"\
-	"ADA_INCLUDES=$(ADA_INCLUDES) $(ADA_INCLUDES_FOR_SUBDIR)"\
-	"libsubdir=$(libsubdir)"	\
-	"exeext=$(exeext)"	\
-	"srcdir=$(fsrcdir)"	\
-	"VPATH=$(fsrcdir)"      \
-        "TOOLS_LIBS=$(TOOLS_LIBS) $(TGT_LIB)"	\
-	"GNATMAKE=$(GNATMAKE)"	\
-	"GNATLINK=$(GNATLINK)"	\
-	"GNATBIND=$(GNATBIND)"
-
-# Build directory for the tools. Let's copy the target dependent
-# sources using the same mechanism as for gnatlib. The other sources are 
-# accessed using the vpath directive below
-
-../stamp-tools:
-	-$(RM) tools/*
-	-$(RMDIR) tools
-	-$(MKDIR) tools
-	-(cd tools; $(LN_S) ../sdefault.adb .)
-	-$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
-	          $(RM) tools/$(word 1,$(subst <, ,$(PAIR)));\
-	          $(LN_S) $(fsrcdir)/$(word 2,$(subst <, ,$(PAIR))) \
-	                tools/$(word 1,$(subst <, ,$(PAIR)));)
-	touch ../stamp-tools
+GCC_LINK="$(CC) -static-libgcc $(ADA_INCLUDES)"
 
 # when compiling the tools, the runtime has to be first on the path so that
 # it hides the runtime files lying with the rest of the sources
@@ -1566,129 +1531,98 @@ ifeq ($(TOOLSCASE),cross)
   vpath %.h   ../
 endif
 
-# gnatmake/link  tools cannot always be built with gnatmake/link for bootstrap 
-# reasons: gnatmake should be built with a recent compiler, a recent compiler
-# may not generate ALI files compatible with an old gnatmake so it is important
-# to be able to build gnatmake without a version of gnartmake around. Once 
-# everything has been compiled once, gnatmake can be recompiled with itself 
-# (see target gnattools1-re) 
-gnattools1: ../stamp-tools ../stamp-gnatlib
-	$(MAKE) -C tools -f ../Makefile $(TOOLS_FLAGS_TO_PASS) \
-	  TOOLSCASE=native \
-	  ../../gnatmake$(exeext) ../../gnatlink$(exeext) ../../gnatbl$(exeext)
-
-# gnatmake/link can be build with recent gnatmake/link if they are available.
-# This is especially convenient for building cross tools or for rebuilding
-# the tools when the original bootstrap has already be done.
-gnattools1-re: ../stamp-tools
-	$(MAKE) -C tools -f ../Makefile $(TOOLS_FLAGS_TO_PASS) \
-	  TOOLSCASE=cross INCLUDES="" gnatmake-re gnatlink-re
-
-# these tools are built with gnatmake & are common to native and cross
-gnattools2: ../stamp-tools
-	$(MAKE) -C tools -f ../Makefile $(TOOLS_FLAGS_TO_PASS) \
-	  TOOLSCASE=native \
-	  ../../gnatchop$(exeext) ../../gnat$(exeext) ../../gnatkr$(exeext) \
-	  ../../gnatls$(exeext) ../../gnatprep$(exeext) \
-	  ../../gnatpsta$(exeext) ../../gnatxref$(exeext) \
-          ../../gnatfind$(exeext) ../../gnatname$(exeext)
-
-# These tools are only built for the native version.
-gnattools3: ../stamp-tools
-#	$(MAKE) -C tools -f ../Makefile $(TOOLS_FLAGS_TO_PASS) \
-#	  TOOLSCASE=native \
-#	  top_builddir=../.. ../../gnatmem$(exeext) $(EXTRA_GNATTOOLS)
-
-../../gnatchop$(exeext):
+
+../../gnatchop$(exeext): 
 	$(GNATMAKE) -c $(ADA_INCLUDES) gnatchop --GCC="$(CC) $(ALL_ADAFLAGS)"
 	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatchop 
-	$(GNATLINK) -v gnatchop -o $@ --GCC="$(CC) $(ADA_INCLUDES)" \
-		$(TOOLS_LIBS)
+	$(GNATLINK) -v gnatchop -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
 
-../../gnat$(exeext):
+../../gnat$(exeext): 
 	$(GNATMAKE) -c $(ADA_INCLUDES) gnatcmd --GCC="$(CC) $(ALL_ADAFLAGS)"
 	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatcmd 
-	$(GNATLINK) -v gnatcmd -o $@ --GCC="$(CC) $(ADA_INCLUDES)" \
-		$(TOOLS_LIBS)
+	$(GNATLINK) -v gnatcmd -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
 
-../../gnatkr$(exeext):
+../../gnatkr$(exeext): 
 	$(GNATMAKE) -c $(ADA_INCLUDES) gnatkr --GCC="$(CC) $(ALL_ADAFLAGS)"
 	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatkr 
-	$(GNATLINK) -v gnatkr -o $@ --GCC="$(CC) $(ADA_INCLUDES)" $(TOOLS_LIBS)
+	$(GNATLINK) -v gnatkr -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
 
-../../gnatls$(exeext):
+../../gnatls$(exeext): 
 	$(GNATMAKE) -c $(ADA_INCLUDES) gnatls --GCC="$(CC) $(ALL_ADAFLAGS)"
 	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatls 
-	$(GNATLINK) -v gnatls -o $@ --GCC="$(CC) $(ADA_INCLUDES)" $(TOOLS_LIBS)
+	$(GNATLINK) -v gnatls -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
 
-../../gnatname$(exeext):
+../../gnatname$(exeext): 
 	$(GNATMAKE) -c $(ADA_INCLUDES) gnatname --GCC="$(CC) $(ALL_ADAFLAGS)"
 	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatname 
-	$(GNATLINK) -v gnatname -o $@ --GCC="$(CC) $(ADA_INCLUDES)" \
-		$(TOOLS_LIBS)
+	$(GNATLINK) -v gnatname -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
+
+../../gprmake$(exeext): 
+	$(GNATMAKE) -c $(ADA_INCLUDES) gprmake --GCC="$(CC) $(ALL_ADAFLAGS)"
+	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gprmake
+	$(GNATLINK) -v gprmake -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
 
-../../gnatprep$(exeext):
+../../gnatprep$(exeext): 
 	$(GNATMAKE) -c $(ADA_INCLUDES) gnatprep --GCC="$(CC) $(ALL_ADAFLAGS)"
 	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatprep 
-	$(GNATLINK) -v gnatprep -o $@ --GCC="$(CC) $(ADA_INCLUDES)" \
-		$(TOOLS_LIBS)
-
-../../gnatpsta$(exeext): deftarg.o
-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatpsta --GCC="$(CC) $(ALL_ADAFLAGS)"
-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatpsta 
-	$(GNATLINK) -v gnatpsta -o $@ --GCC="$(CC) $(ADA_INCLUDES)"\
-                      ../targtyps.o deftarg.o $(TOOLS_LIBS)
+	$(GNATLINK) -v gnatprep -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
 
-../../gnatxref$(exeext):
+../../gnatxref$(exeext): 
 	$(GNATMAKE) -c $(ADA_INCLUDES) gnatxref --GCC="$(CC) $(ALL_ADAFLAGS)"
 	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatxref 
-	$(GNATLINK) -v gnatxref -o $@ --GCC="$(CC) $(ADA_INCLUDES)" \
-		$(TOOLS_LIBS)
+	$(GNATLINK) -v gnatxref -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
 
-../../gnatfind$(exeext):
+../../gnatfind$(exeext): 
 	$(GNATMAKE) -c $(ADA_INCLUDES) gnatfind --GCC="$(CC) $(ALL_ADAFLAGS)"
 	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatfind 
-	$(GNATLINK) -v gnatfind -o $@ --GCC="$(CC) $(ADA_INCLUDES)" \
-		$(TOOLS_LIBS)
+	$(GNATLINK) -v gnatfind -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
 
-../../gnatmem$(exeext): gmem.o $(SYMDEPS)
-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatmem --GCC="$(CC) $(ALL_ADAFLAGS)"
-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatmem 
-	$(GNATLINK) -v gnatmem -o $@ --GCC="$(CC) $(ADA_INCLUDES)" \
-	            gmem.o $(SYMLIB) $(TOOLS_LIBS)
+../../gnatclean$(exeext): 
+	$(GNATMAKE) -c $(ADA_INCLUDES) gnatclean --GCC="$(CC) $(ALL_ADAFLAGS)"
+	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatclean
+	$(GNATLINK) -v gnatclean -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
 
-../../gnatdll$(exeext):
+../../gnatsym$(exeext): 
+	$(GNATMAKE) -c $(ADA_INCLUDES) gnatsym --GCC="$(CC) $(ALL_ADAFLAGS)"
+	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatsym
+	$(GNATLINK) -v gnatsym -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
+
+../../gnatdll$(exeext): 
 	$(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)"
 	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) $(GNATBIND_FLAGS) gnatdll
-	$(GNATLINK) -v gnatdll -o $@ --GCC="$(CC) $(ADA_INCLUDES)" \
-		$(TOOLS_LIBS)
+	$(GNATLINK) -v gnatdll -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
+
+../../vxaddr2line$(exeext): 
+	$(GNATMAKE) -c  $(ADA_INCLUDES) vxaddr2line --GCC="$(CC) $(ALL_ADAFLAGS)"
+	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vxaddr2line 
+	$(GNATLINK) -v vxaddr2line -o $@ --GCC=$(GCC_LINK) $(CLIB)
 
-gnatmake-re:
+gnatmake-re:  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 
 	$(GNATLINK) -v gnatmake -o ../../gnatmake$(exeext) \
-		--GCC="$(CC) $(ADA_INCLUDES)" $(TOOLS_LIBS)
+		--GCC=$(GCC_LINK) $(TOOLS_LIBS)
 
 # Note the use of the "mv" command in order to allow gnatlink to be linked with
 # with the former version of gnatlink itself which cannot override itself.
-gnatlink-re: link.o
+gnatlink-re:  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=$(GCC_LINK) $(TOOLS_LIBS)
 	$(MV)  ../../gnatlinknew$(exeext)  ../../gnatlink$(exeext)
   
-
 # Needs to be built with CC=gcc
 # Since the RTL should be built with the latest compiler, remove the
 #  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)
 
@@ -1696,8 +1630,8 @@ gnatlink-re: link.o
 	$(CC) -o $@ $(ALL_CFLAGS) $(LDFLAGS) gnatbl.o $(TOOLS_LIBS)
 
 gnatbl.o: gnatbl.c adaint.h
-	$(CC) $(ALL_CFLAGS) $(INCLUDES) -c $< 
-  
+	$(CC) $(ALL_CFLAGS) $(INCLUDES) -c $< $(OUTPUT_OPTION)
+
 ../stamp-gnatlib:
 	@if [ ! -f stamp-gnatlib ] ; \
 	then \
@@ -1711,38 +1645,43 @@ install-gnatlib: ../stamp-gnatlib
 #	Create the directory before deleting it, in case the directory is
 #	a list of directories (as it may be on VMS). This ensures we are
 #	deleting the right one.
-	-$(MKDIR) $(ADA_RTL_OBJ_DIR)
-	-$(MKDIR) $(ADA_INCLUDE_DIR)
-	$(RMDIR) $(ADA_RTL_OBJ_DIR)
-	$(RMDIR) $(ADA_INCLUDE_DIR)
-	-$(MKDIR) $(ADA_RTL_OBJ_DIR)
-	-$(MKDIR) $(ADA_INCLUDE_DIR)
-	-$(INSTALL_DATA) ada/rts/Makefile.adalib $(ADA_RTL_OBJ_DIR)
-	for file in ada/rts/*.ali; do \
-	    $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \
-	done
-	-for file in ada/rts/*$(arext);do \
-	    $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \
+	-$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
+	-$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR)
+	$(RMDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
+	$(RMDIR) $(DESTDIR)$(ADA_INCLUDE_DIR)
+	-$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
+	-$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR)
+	for file in rts/*.ali; do \
+	    $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
 	done
-ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(targ))),)
-	-for file in ada/rts/lib*$(soext);do \
-	    $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \
+	-$(INSTALL_DATA) rts/g-trasym$(objext) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
+	-cd rts; for file in *$(arext);do \
+	    $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
+	    $(RANLIB) $(RANLIB_FLAGS) $(DESTDIR)$(ADA_RTL_OBJ_DIR)/$$file; \
 	done
-else
-	-for file in ada/rts/lib*-**$(soext);do \
-	    $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \
+	-$(foreach file, $(EXTRA_ADALIB_FILES), \
+	    $(INSTALL_DATA_DATE) rts/$(file) $(DESTDIR)$(ADA_RTL_OBJ_DIR) && \
+	) true
+#     Install the shared libraries, if any, using $(INSTALL) instead
+#     of $(INSTALL_DATA). The latter may force a mode inappropriate
+#     for shared libraries on some targets, e.g. on HP-UX where the x
+#     permission is required.
+	for file in gnat gnarl; do \
+	   if [ -f rts/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
+	      $(INSTALL) rts/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
+			 $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
+	   fi; \
+	   if [ -f rts/lib$${file}$(soext) ]; then \
+	      $(LN_S) lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
+	      $(DESTDIR)$(ADA_RTL_OBJ_DIR)/lib$${file}$(soext); \
+	   fi; \
 	done
-endif
-	-$(LN_S) $(ADA_RTL_OBJ_DIR)/libgnat-*$(soext) \
-	       $(ADA_RTL_OBJ_DIR)/libgnat$(soext)
-	-$(LN_S) $(ADA_RTL_OBJ_DIR)/libgnarl-*$(soext) \
-	       $(ADA_RTL_OBJ_DIR)/libgnarl$(soext)
 # This copy must be done preserving the date on the original file.
-	for file in ada/rts/*.adb ada/rts/*.ads; do \
-	    $(INSTALL_DATA_DATE) $$file $(ADA_INCLUDE_DIR); \
+	for file in rts/*.adb rts/*.ads; do \
+	    $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_INCLUDE_DIR); \
 	done
-	cd $(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
-	cd $(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
+	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
+	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
 
 ../stamp-gnatlib2:
 	$(RM) rts/s-*.ali
@@ -1775,6 +1714,7 @@ endif
 # Remove files to be replaced by target dependent sources
 	$(RM) $(foreach PAIR,$(LIBGNAT_TARGET_PAIRS), \
 	                rts/$(word 1,$(subst <, ,$(PAIR))))
+	$(RM) rts/*-*-*.ads rts/*-*-*.adb
 # Copy new target dependent sources
 	$(foreach PAIR,$(LIBGNAT_TARGET_PAIRS), \
 	          $(LN_S) $(fsrcpfx)$(word 2,$(subst <, ,$(PAIR))) \
@@ -1790,155 +1730,46 @@ endif
 # Example: cd rts; ar rc libfoo.a $(LONG_LIST_OF_OBJS)
 # is guaranteed to overflow the buffer.
 
+# ??? GCC_FOR_TARGET is supposed to be passed from the top level
+# Makefile, but this is not the case from e.g. libada, so provide a suitable
+# default
+GCC_FOR_TARGET=./xgcc -B./ $(FLAGS_FOR_TARGET)
+
 gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
-#	../xgcc -B../ -dD -E ../tconfig.h $(INCLUDES) > rts/tconfig.h
-	$(MAKE) -C rts CC="../../xgcc -B../../" \
+	$(MAKE) -C rts \
+		CC="`echo \"$(GCC_FOR_TARGET)\" \
+		| sed -e 's^./xgcc^../../xgcc^' -e 's^-B./^-B../../^'`" \
 	        INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
                 CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \
 		srcdir=$(fsrcdir) \
-	        -f ../Makefile $(LIBGNAT_OBJS) prefix.o
-	$(MAKE) -C rts CC="../../xgcc -B../../" \
-	        ADA_INCLUDES="$(ADA_INCLUDES_FOR_SUBDIR)" \
-                CFLAGS="$(GNATLIBCFLAGS)" ADA_CFLAGS="$(GNATLIBCFLAGS)" \
+	        -f ../Makefile $(LIBGNAT_OBJS)
+	$(MAKE) -C rts \
+		CC="`echo \"$(GCC_FOR_TARGET)\" \
+		| sed -e 's^\./xgcc^../../xgcc^' -e 's^-B./^-B../../^'`" \
+	        ADA_INCLUDES="" \
+                CFLAGS="$(GNATLIBCFLAGS)" \
 	        ADAFLAGS="$(GNATLIBFLAGS)" \
-		srcdir=$(fsrcdir) VPATH=$(fsrcdir) \
+		srcdir=$(fsrcdir) \
 	        -f ../Makefile \
 	        $(GNATRTL_OBJS)
 	$(RM) rts/libgnat$(arext) rts/libgnarl$(arext)
 	$(AR) $(AR_FLAGS) rts/libgnat$(arext) \
-	   $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) prefix.o)
-	if $(RANLIB_TEST) ; then $(RANLIB) rts/libgnat$(arext); else true; fi
+	   $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
+        ifneq ($(PREFIX_OBJS),)
+		$(AR) $(AR_FLAGS) rts/libgccprefix$(arext) $(PREFIX_OBJS);
+		-$(RANLIB) rts/libgccprefix$(arext)
+        endif
+	-$(RANLIB) $(RANLIB_FLAGS) 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) $(RANLIB_FLAGS) 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) $(RANLIB_FLAGS) 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.adb<1atags.adb \
- s-secsta.ads<1ssecsta.ads \
- s-secsta.adb<1ssecsta.adb \
- i-c.ads<1ic.ads
-
-HIE_SUBST:='s/High_Integrity_Mode.*/High_Integrity_Mode      : constant Boolean := True;/'
-# 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 dependent 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)/*
-	$(LN) $(fsrcpfx)$(RTS_NAME).gpr rts-$(RTS_NAME)
-# Copy target independent sources
-	$(foreach f,$(RTS_SRCS), \
-	  $(LN) $(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), \
-	    $(LN) $(fsrcpfx)$(word 2,$(subst <, ,$(PAIR))) \
-	            rts-$(RTS_NAME)/adainclude/$(word 1,$(subst <, ,$(PAIR)));)
-# change system.High_Integrity_Mode to true for the none & ravenscar rts
-        ifeq ($(filter-out none ravenscar,$(RTS_NAME)),)
-	  sed -e $(HIE_SUBST) rts-$(RTS_NAME)/adainclude/system.ads \
-	      > dummy
-	  $(MV) dummy rts-$(RTS_NAME)/adainclude/system.ads
-        endif
-
-install-rts: force
-	$(CP) -r rts-$(RTS_NAME) $(libsubdir)/
-
-rts-none: force
-	$(MAKE) $(FLAGS_TO_PASS) prepare-rts \
-	   RTS_NAME=none RTS_SRCS="$(HIE_SOURCES)" \
-	   RTS_TARGET_PAIRS="$(HIE_NONE_TARGET_PAIRS)" 
-	-$(GNATMAKE) -Prts-none/none.gpr
-	$(RM) rts-none/adalib/*.o
-	$(CHMOD) a-wx rts-none/adalib/*.ali
-
-rts-ravenscar: force
-	$(MAKE)  $(FLAGS_TO_PASS) prepare-rts \
-	   RTS_NAME=ravenscar RTS_SRCS="$(RAVEN_SOURCES)" \
-	   RTS_TARGET_PAIRS="$(HIE_RAVEN_TARGET_PAIRS)" 
-	-$(GNATMAKE) -Prts-ravenscar/none.gpr
-	$(CHMOD) a-wx rts-ravenscar/adalib/*.ali
-
-internal-hielib: ../stamp-gnatlib1
-	sed -e 's/High_Integrity_Mode.*/High_Integrity_Mode       : constant Boolean := True;/' rts/system.ads > rts/s.ads
-	$(MV) rts/s.ads rts/system.ads
-	$(MAKE) -C rts CC="../../xgcc -B../../" \
-	  ADA_INCLUDES="$(ADA_INCLUDES_FOR_SUBDIR)" \
-	  CFLAGS="$(GNATLIBCFLAGS)" \
-	  ADAFLAGS="$(GNATLIBFLAGS)" \
-	  srcdir=$(fsrcdir) VPATH=$(fsrcdir) \
-	  -f ../Makefile \
-	  $(HIE_OBJS)
-	$(CHMOD) a-wx rts/*.ali
-	$(RM) $(addprefix rts/,$(HIE_OBJS))
-	touch ../stamp-gnatlib
-
-hielib:
-	$(MAKE) ADA_INCLUDE_SRCS="$(HIE_SOURCES)" LIBGNAT_SRCS="" \
-	  LIBGNAT_TARGET_PAIRS="a-except.ads<1aexcept.ads \
-	    a-except.adb<1aexcept.adb \
-	    a-tags.adb<1atags.adb \
-	    s-secsta.ads<1ssecsta.ads \
-	    s-secsta.adb<1ssecsta.adb \
-	    i-c.ads<1ic.ads" internal-hielib
-
-internal-ravenlib: ../stamp-gnatlib1
-	sed -e 's/High_Integrity_Mode.*/High_Integrity_Mode       : constant Boolean := True;/' rts/system.ads > rts/s.ads
-	$(MV) rts/s.ads rts/system.ads
-	$(MAKE) -C rts CC="../../xgcc -B../../" \
-	  ADA_INCLUDES="$(ADA_INCLUDES_FOR_SUBDIR)" \
-	  CFLAGS="$(GNATLIBCFLAGS)" \
-	  ADAFLAGS="$(GNATLIBFLAGS)" \
-	  srcdir=$(fsrcdir) VPATH=$(fsrcdir) \
-	  -f ../Makefile \
-	  $(RAVEN_OBJS)
-	$(CHMOD) a-wx rts/*.ali
-	touch ../stamp-gnatlib
-
-# Target for building a ravenscar run time for VxWorks/Cert PPC
-ravenppclib:
-	$(MAKE) ADA_INCLUDE_SRCS="$(RAVEN_SOURCES)" LIBGNAT_SRCS="" \
-	  LIBGNAT_TARGET_PAIRS="a-except.ads<1aexcept.ads \
-	    a-except.adb<1aexcept.adb \
-	    a-tags.adb<1atags.adb \
-	    s-secsta.ads<1ssecsta.ads \
-	    s-secsta.adb<1ssecsta.adb \
-	    i-c.ads<1ic.ads           \
-	    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-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 \
-	    a-sytaco.ads<1asytaco.ads \
-	    a-sytaco.adb<1asytaco.adb \
-	    a-intnam.ads<4zintnam.ads \
-	    s-osinte.adb<5zosinte.adb \
-	    s-osinte.ads<5zosinte.ads \
-	    s-taspri.ads<5ztaspri.ads \
-	    s-vxwork.ads<5pvxwork.ads \
-	    system.ads<5ysystem.ads" internal-ravenlib
-
 # Warning: this target assumes that LIBRARY_VERSION has been set correctly.
 gnatlib-shared-default:
 	$(MAKE) $(FLAGS_TO_PASS) \
@@ -1946,32 +1777,97 @@ gnatlib-shared-default:
 	     GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \
 	     THREAD_KIND="$(THREAD_KIND)" \
              gnatlib
-	$(RM) rts/libgnat$(soext) rts/libgnarl$(soext)
-	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
-		-o libgnat-$(LIBRARY_VERSION)$(soext) \
+	$(RM) rts/libgna*$(soext)
+	cd rts; ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \
+		$(TARGET_LIBGCC2_CFLAGS) \
+		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
-		$(SO_OPTS)libgnat-$(LIBRARY_VERSION)$(soext) $(MISCLIB) -lm
-	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
-		-o libgnarl-$(LIBRARY_VERSION)$(soext) \
+		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+		$(MISCLIB) -lm
+	cd rts; ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \
+		$(TARGET_LIBGCC2_CFLAGS) \
+		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
 		$(GNATRTL_TASKING_OBJS) \
-		$(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) $(THREADSLIB)
-	cd rts; $(LN_S) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext)
-	cd rts; $(LN_S) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext)
+		$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+		$(THREADSLIB)
+	cd rts; $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+		libgnat$(soext)
+	cd rts; $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+		libgnarl$(soext)
 
 gnatlib-shared-dual:
 	$(MAKE) $(FLAGS_TO_PASS) \
              GNATLIBFLAGS="$(GNATLIBFLAGS)" \
 	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
 	     THREAD_KIND="$(THREAD_KIND)" \
+             gnatlib-shared-default
+	$(MV) rts/libgna*$(soext) .
+	$(RM) ../stamp-gnatlib2
+	$(MAKE) $(FLAGS_TO_PASS) \
+             GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
+	     THREAD_KIND="$(THREAD_KIND)" \
              gnatlib
-	$(MV) rts/libgnat$(arext) rts/libgnarl$(arext) .
+	$(MV) libgna*$(soext) rts
+
+gnatlib-shared-dual-win32:
+	$(MAKE) $(FLAGS_TO_PASS) \
+             GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+	     GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \
+	     THREAD_KIND="$(THREAD_KIND)" \
+             gnatlib-shared-win32
+	$(MV) rts/libgna*$(soext) .
 	$(RM) ../stamp-gnatlib2
 	$(MAKE) $(FLAGS_TO_PASS) \
              GNATLIBFLAGS="$(GNATLIBFLAGS)" \
 	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
 	     THREAD_KIND="$(THREAD_KIND)" \
-             gnatlib-shared-default
-	$(MV) libgnat$(arext) libgnarl$(arext) rts
+             gnatlib
+	$(MV) libgna*$(soext) rts
+
+# ??? we need to add the option to support auto-import of arrays/records to
+# the GNATLIBFLAGS when this will be supported by GNAT. At this point we will
+# use the gnatlib-shared-dual-win32 target to build the GNAT runtimes on
+# Windows.
+gnatlib-shared-win32:
+	$(MAKE) $(FLAGS_TO_PASS) \
+             GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+	     GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \
+	     THREAD_KIND="$(THREAD_KIND)" \
+             gnatlib
+	$(RM) rts/libgna*$(soext)
+	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
+		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
+		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)
+	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
+		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+		$(GNATRTL_TASKING_OBJS) \
+		$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+		$(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)
+
+gnatlib-shared-darwin:
+	$(MAKE) $(FLAGS_TO_PASS) \
+	     GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+	     GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) \
+	                    -fno-common" \
+	     THREAD_KIND="$(THREAD_KIND)" \
+	     gnatlib
+	$(RM) rts/libgnat$(soext) rts/libgnarl$(soext)
+	cd rts; ../../xgcc -B../../ -dynamiclib $(TARGET_LIBGCC2_CFLAGS) \
+		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
+		$(SO_OPTS) \
+		$(MISCLIB) -lm
+	cd rts; ../../xgcc -B../../ -dynamiclib $(TARGET_LIBGCC2_CFLAGS) \
+		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+		$(GNATRTL_TASKING_OBJS) \
+		$(SO_OPTS) \
+		$(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)
+	cd rts; $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+		libgnat$(soext)
+	cd rts; $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+		libgnarl$(soext)
 
 gnatlib-shared-vms:
 	$(MAKE) $(FLAGS_TO_PASS) \
@@ -1979,23 +1875,28 @@ gnatlib-shared-vms:
 	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
 	     THREAD_KIND="$(THREAD_KIND)" \
              gnatlib
-	$(RM) rts/libgnat$(soext) rts/libgnarl$(soext)
-	rm -f rts/*.sym rts/gnatlib_symvec.opt 
-	make -C rts -f ../Makefile.vms \
-	   $(patsubst %.obj,%.sym,$(LIBGNAT_OBJS) $(GNATRTL_NONTASKING_OBJS)) 
-	append /new [.rts]*.sym [.rts]gnatlib_symvec.opt 
-	../xgcc.exe -g -B../ -nostartfiles -shared --for-linker=/noinform \
-	   -o rts/libgnat.exe rts/libgnat.olb \
-	   --for-linker=rts/gnatlib_symvec.opt \
-	   --for-linker=gsmatch=equal,YY,MMDD
-	rm -f rts/*.sym rts/gnatlib_symvec.opt 
-	make -C rts -f ../Makefile.vms \
-	   $(patsubst %.obj,%.sym,$(GNATRTL_TASKING_OBJS)) 
-	append /new [.rts]*.sym [.rts]gnatlib_symvec.opt 
-	../xgcc.exe -g -B../ -nostartfiles -shared --for-linker=/noinform \
-	   -o rts/libgnarl.exe rts/libgnarl.olb rts/libgnat.exe \
-	   --for-linker=rts/gnatlib_symvec.opt \
-	   --for-linker=gsmatch=equal,YY,MMDD
+	$(RM) rts/libgna*$(soext)
+	cd rts && echo "case_sensitive=yes" > SYMVEC_$$$$.opt && \
+	objdump --syms $(LIBGNAT_OBJS) $(GNATRTL_NONTASKING_OBJS) | \
+	$(SHLIB_SYMVEC) >> SYMVEC_$$$$.opt && \
+	echo "case_sensitive=NO" >> SYMVEC_$$$$.opt && \
+	../../xgcc -g -B../../ -nostartfiles -shared -shared-libgcc \
+	   -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) libgnat.a \
+	   sys\$$library:trace.exe \
+	   --for-linker=/noinform \
+	   --for-linker=SYMVEC_$$$$.opt \
+	   --for-linker=gsmatch=equal,$(GSMATCH_VERSION)
+	cd rts && echo "case_sensitive=yes" > SYMVEC_$$$$.opt && \
+	objdump --syms $(GNATRTL_TASKING_OBJS) | \
+	$(SHLIB_SYMVEC) >> SYMVEC_$$$$.opt && \
+	echo "case_sensitive=NO" >> SYMVEC_$$$$.opt && \
+	../../xgcc -g -B../../ -nostartfiles -shared -shared-libgcc \
+	   -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+	   libgnarl.a libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+	   sys\$$library:trace.exe \
+	   --for-linker=/noinform \
+	   --for-linker=SYMVEC_$$$$.opt \
+	   --for-linker=gsmatch=equal,$(GSMATCH_VERSION)
 
 gnatlib-shared:
 	$(MAKE) $(FLAGS_TO_PASS) \
@@ -2005,82 +1906,87 @@ gnatlib-shared:
 	     TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \
              $(GNATLIB_SHARED)
 
+gnatlib-sjlj: ../stamp-gnatlib1
+	sed -e 's/ZCX_By_Default.*/ZCX_By_Default            : constant Boolean := False;/' rts/system.ads > rts/s.ads
+	$(MV) rts/s.ads rts/system.ads
+	$(MAKE) $(FLAGS_TO_PASS) \
+             GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
+	     THREAD_KIND="$(THREAD_KIND)" \
+	     TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" gnatlib
+
+gnatlib-zcx: ../stamp-gnatlib1
+	sed -e 's/ZCX_By_Default.*/ZCX_By_Default            : constant Boolean := True;/' rts/system.ads > rts/s.ads
+	$(MV) rts/s.ads rts/system.ads
+	$(MAKE) $(FLAGS_TO_PASS) \
+	     GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
+	     THREAD_KIND="$(THREAD_KIND)" \
+	     TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" gnatlib
+
 # .s files for cross-building
 gnat-cross: force
-	make $(GNAT1_ADA_OBJS) CC="gcc -B../stage1/" CFLAGS="-S -gnatp" \
-		HOST_CFLAGS= HOST_CC=cc
+	make $(GNAT1_ADA_OBJS) CC="gcc -B../stage1/" CFLAGS="-S -gnatp"
 
 # Compiling object files from source files.
 
-# Ada language specific files.
+# Note that dependencies on obstack.h are not written
+# because that file is not part of GCC.
+# Dependencies on gvarargs.h are not written
+# because all that file does, when not compiling with GCC,
+# is include the system varargs.h.
 
 b_gnatl.c : $(GNATLINK_OBJS)
-	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatl.c gnatlink.ali
+	$(GNATBIND) -C $(ADA_INCLUDES) -o b_gnatl.c gnatlink.ali
 b_gnatl.o : b_gnatl.c
 
 b_gnatm.c : $(GNATMAKE_OBJS)
-	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatm.c gnatmake.ali
+	$(GNATBIND) -C $(ADA_INCLUDES) -o b_gnatm.c gnatmake.ali
 b_gnatm.o : b_gnatm.c
 
+ADA_INCLUDE_DIR = $(libsubdir)/adainclude
+ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
+
+# force no sibling call optimization on s-traceb.o so the number of stack
+# frames to be skipped when computing a call chain is not modified by
+# optimization. However we can do that only when building the runtime
+# (not the compiler) because the -fno-optimize-sibling-calls exists
+# only in GCC 3.
+
+ifneq (,$(findstring xgcc,$(CC)))
+NO_SIBLING_ADAFLAGS=-fno-optimize-sibling-calls
+else
+NO_SIBLING_ADAFLAGS=
+endif
+
+s-traceb.o  : s-traceb.adb
+	$(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) \
+	      $(NO_SIBLING_ADAFLAGS) $(ADA_INCLUDES) \
+      $< $(OUTPUT_OPTION)
+
 # force debugging information on s-tasdeb.o so that it is always
 # possible to set conditional breakpoints on tasks.
 
 s-tasdeb.o  : s-tasdeb.adb s-tasdeb.ads
-	$(ADAC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) $(ADA_INCLUDES) $<
-
-# force debugging information on s-vaflop.o so that it is always
-# possible to call the VAX float debug print routines.
-# force at least -O so that the inline assembly works.
-
-s-vaflop.o  : s-vaflop.adb s-vaflop.ads
-	$(ADAC) -c -O $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) \
-	 $(ADA_INCLUDES) $<
+	$(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O0 $(ADA_INCLUDES) \
+	      $< $(OUTPUT_OPTION)
 
 # force debugging information on a-except.o so that it is always
 # possible to set conditional breakpoints on exceptions.
 # use -O1 otherwise gdb isn't able to get a full backtrace on mips targets.
 
 a-except.o  : a-except.adb a-except.ads
-	$(ADAC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O1 -fno-inline \
-	 $(ADA_INCLUDES) $<
+	$(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O1 -fno-inline \
+	      $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
 
 # force debugging information on s-assert.o so that it is always
 # possible to set breakpoint on assert failures.
 
 s-assert.o  : s-assert.adb s-assert.ads a-except.ads
-	$(ADAC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O2 \
-	 $(ADA_INCLUDES) $<
-
-mdll.o : mdll.adb mdll.ads mdll-file.ads mdll-utl.ads
-	$(CC) -c $(ALL_ADAFLAGS) -O2 $(ADA_INCLUDES) $< 
-
-mdll-fil.o : mdll-fil.adb mdll.ads mdll-fil.ads
-	$(CC) -c $(ALL_ADAFLAGS) -O2 $(ADA_INCLUDES) $< 
-
-mdll-utl.o : mdll-utl.adb mdll.ads mdll-utl.ads sdefault.ads types.ads
-	$(CC) -c $(ALL_ADAFLAGS) -O2 $(ADA_INCLUDES) $< 
-  
-# force debugging information and no optimization on s-memory.o so that it 
-# is always possible to set breakpoint on __gnat_malloc and __gnat_free
-# this is important for gnatmem using GDB. memtrack.o is built from
-# memtrack.adb, and used by the post-mortem analysis with gnatmem.
-
-s-memory.o  : s-memory.adb s-memory.ads memtrack.o
-	$(ADAC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O0 \
-	 $(ADA_INCLUDES) $< 
-
-memtrack.o  : memtrack.adb s-memory.ads
-	$(ADAC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O0 \
-	 $(ADA_INCLUDES) $< 
-
-# Need to keep the frame pointer in this file to pop the stack properly on
-# some targets.
-
-traceb.o : traceb.c
-	$(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O0 $(ADA_INCLUDES) \
-	      $< 
-
+	$(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O2 $(ADA_INCLUDES) \
+	      $< $(OUTPUT_OPTION)
 
+adadecode.o : adadecode.c adadecode.h
 aux-io.o  : aux-io.c
 argv.o    : argv.c
 cal.o     : cal.c
@@ -2092,36 +1998,37 @@ final.o   : raise.h final.c
 gmem.o    : gmem.c
 link.o    : link.c
 mkdir.o   : mkdir.c
+socket.o  : socket.c gsocket.h
 sysdep.o  : sysdep.c
 
-cio.o     : cio.c 
-	$(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(RT_FLAGS) \
-	         $(ALL_CPPFLAGS) $(INCLUDES) $< 
+gen-soccon: gen-soccon.c gsocket.h
+	$(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) \
+		$(ALL_CPPFLAGS) $(INCLUDES) -DTARGET=\"$(target_alias)\" \
+		$< $(OUTPUT_OPTION)
+
+cio.o     : cio.c
+	$(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) \
+	         $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
 init.o    : init.c ada.h types.h raise.h
-	$(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(RT_FLAGS) \
-	         $(ALL_CPPFLAGS) $(INCLUDES) $< 
+	$(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) \
+	         $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
+
+# No optimization to compile this file as optimizations (-O1 or above) breaks
+# the SEH handling on Windows. The reasons are not clear.
+seh_init.o : seh_init.c raise.h
+	$(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) -O0 \
+	         $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
 raise.o   : raise.c raise.h
-	$(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(RT_FLAGS) \
-		 $(ALL_CPPFLAGS) $(INCLUDES) $< 
+	$(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) \
+		 $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
 # Need to keep the frame pointer in this file to pop the stack properly on
 # some targets.
-tracebak.o  : tracebak.c
-	$(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-	      -fno-omit-frame-pointer $< 
-
-targtyps.o : targtyps.c $(CONFIG_H) ada.h types.h atree.h nlists.h elists.h \
-   uintp.h sinfo.h einfo.h namet.h snames.h stringt.h urealp.h fe.h \
-   $(ADA_TREE_H) gigi.h
-
-# Rule to compile prefix.o for the run-time.
-
-prefix.o : $(srcdir)/../prefix.c
-	$(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(RT_FLAGS) \
-	      $(ALL_CPPFLAGS) $(INCLUDES) -I$(srcdir)/../.. -I../.. \
-	      -DPREFIX=\"$(prefix)\" $< 
+tracebak.o  : tracebak.c tb-alvms.c tb-alvxw.c
+	$(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+	      -fno-omit-frame-pointer $< $(OUTPUT_OPTION)
 
 # In GNU Make, ignore whether `stage*' exists.
 .PHONY: stage1 stage2 stage3 stage4 clean realclean TAGS bootstrap
@@ -2129,18 +2036,18 @@ prefix.o : $(srcdir)/../prefix.c
 
 force:
 
-# Gnatlbr is only used on VMS
+# Gnatlbr, Vms_help, and Gnat.hlp are only used on VMS
 
-GNATLBR_RTL_C_OBJS = adaint.o argv.o cio.o cstreams.o exit.o final.o init.o \
-  raise.o sysdep.o tracebak.o
-GNATLBR_C_OBJS = $(GNATLBR_RTL_C_OBJS)
+../../gnatlbr$(exeext): ../../prefix.o
+	$(GNATMAKE) -c $(ADA_INCLUDES) gnatlbr --GCC="$(CC) $(ALL_ADAFLAGS)"
+	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlbr
+	$(GNATLINK) -v gnatlbr -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
 
-../gnatlbr$(exeext):: sdefault.o $(GNATLBR_C_OBJS) $(EXTRA_GNATTOOLS_OBJS)
-	$(RM) $@
-../gnatlbr$(exeext):: force
-	$(GNATMAKE) -a --GCC="$(CC)" $(ALL_ADAFLAGS) $(ADA_INCLUDES) \
-	  --GNATBIND="$(GNATBIND)" --GNATLINK="$(GNATLINK)" \
-	  -nostdlib $(fsrcpfx)gnatlbr -o $@ \
-	  -largs --GCC="$(CC) $(ALL_CFLAGS) $(LDFLAGS)" \
-	  $(GNATLBR_C_OBJS) $(EXTRA_GNATTOOLS_OBJS)
+../../vms_help$(exeext):
+	$(GNATMAKE) -c $(ADA_INCLUDES) vms_help --GCC="$(CC) $(ALL_ADAFLAGS)"
+	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vms_help
+	$(GNATLINK) -v vms_help -o $@ --GCC=$(GCC_LINK)	$(TOOLS_LIBS)
 
+../../gnat.hlp: ../../vms_help$(exeext)
+	../../vms_help$(exeext) $(fsrcdir)/gnat.help_in \
+	                        $(fsrcdir)/vms_data.ads ../../gnat.hlp