Renaming of target specific files for clarity

        * Makefile.in: Rename GNAT target specific files.

	* 31soccon.ads, 31soliop.ads 35soccon.ads, 3asoccon.ads,
	3bsoccon.ads, 3gsoccon.ads, 3hsoccon.ads, 3psoccon.ads,
	3ssoccon.ads, 3ssoliop.ads, 3veacodu.adb, 3vexpect.adb,
	3vsoccon.ads, 3vsocthi.adb, 3vsocthi.ads, 3vtrasym.adb,
	3wsoccon.ads, 3wsocthi.adb, 3wsocthi.ads, 3wsoliop.ads,
	3zsoccon.ads, 3zsocthi.adb, 3zsocthi.ads, 41intnam.ads,
	42intnam.ads, 45intnam.ads, 4aintnam.ads, 4cintnam.ads,
	4gintnam.ads, 4hexcpol.adb, 4hintnam.ads, 4lintnam.ads,
	4nintnam.ads, 4ointnam.ads, 4onumaux.ads, 4pintnam.ads,
	4sintnam.ads, 4vcaldel.adb, 4vcalend.adb, 4vcalend.ads,
	4vintnam.ads, 4wcalend.adb, 4wexcpol.adb, 4wintnam.ads,
	4zintnam.ads, 4znumaux.ads, 4zsytaco.adb, 4zsytaco.ads,
	51osinte.adb, 51osinte.ads, 51system.ads,
	52osinte.adb, 52osinte.ads, 53osinte.ads, 54osinte.ads,
	55osinte.adb, 55osinte.ads, 55system.ads, 56osinte.adb,
	56osinte.ads, 56system.ads, 56taprop.adb, 56taspri.ads,
	56tpopsp.adb, 57system.ads, 58system.ads,
	5amastop.adb, 5aml-tgt.adb, 5aosinte.adb, 5aosinte.ads,
	5asystem.ads, 5ataprop.adb, 5atasinf.ads, 5ataspri.ads,
	5atpopsp.adb, 5avxwork.ads, 5bml-tgt.adb, 5bosinte.adb,
	5bosinte.ads, 5bsystem.ads, 5cosinte.ads, 5csystem.ads,
	5dsystem.ads, 5esystem.ads, 5fintman.adb, 5fosinte.adb,
	5fosinte.ads, 5fsystem.ads, 5ftaprop.adb, 5ftasinf.ads,
	5ginterr.adb, 5gintman.adb, 5gmastop.adb, 5gml-tgt.adb,
	5gosinte.ads, 5gproinf.adb, 5gproinf.ads, 5gsystem.ads,
	5gtaprop.adb, 5gtasinf.adb, 5gtasinf.ads, 5gtpgetc.adb,
	5hml-tgt.adb, 5hosinte.adb, 5hosinte.ads, 5hparame.ads,
	5hsystem.ads, 5htaprop.adb, 5htaspri.ads, 5htraceb.adb,
	5iosinte.adb, 5iosinte.ads, 5itaprop.adb, 5itaspri.ads,
	5ksystem.ads, 5kvxwork.ads, 5lml-tgt.adb, 5losinte.ads,
	5lparame.adb, 5lsystem.ads, 5msystem.ads, 5mvxwork.ads,
	5ninmaop.adb, 5nintman.adb, 5nosinte.ads, 5nsystem.ads,
	5ntaprop.adb, 5ntaspri.ads, 5ointerr.adb, 5omastop.adb,
	5oosinte.adb, 5oosinte.ads, 5oosprim.adb, 5oparame.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5posinte.ads,
	5posprim.adb, 5psystem.ads, 5pvxwork.ads, 5sintman.adb,
	5sml-tgt.adb, 5sosinte.adb, 5sosinte.ads, 5sosprim.adb,
	5sparame.adb, 5ssystem.ads, 5staprop.adb, 5stasinf.adb,
	5stasinf.ads, 5staspri.ads, 5stpopsp.adb, 5svxwork.ads,
	5tosinte.ads, 5usystem.ads, 5vasthan.adb, 5vdirval.adb,
	5vinmaop.adb, 5vinterr.adb, 5vintman.adb, 5vintman.ads,
	5vmastop.adb, 5vml-tgt.adb, 5vosinte.adb, 5vosinte.ads,
	5vosprim.adb, 5vosprim.ads, 5vparame.ads, 5vsymbol.adb,
	5vsystem.ads, 5vtaprop.adb, 5vtaspri.ads, 5vtpopde.adb,
	5vtpopde.ads, 5vtraent.adb, 5vtraent.ads, 5vvaflop.adb,
	5wdirval.adb, 5wgloloc.adb, 5wintman.adb, 5wmemory.adb,
	5wml-tgt.adb, 5wosinte.ads, 5wosprim.adb, 5wsystem.ads,
	5wtaprop.adb, 5wtaspri.ads, 5xparame.ads, 5xsystem.ads,
	5xvxwork.ads, 5yparame.ads, 5ysystem.ads, 5zinterr.adb,
	5zintman.adb, 5zintman.ads, 5zml-tgt.adb, 5zosinte.adb,
	5zosinte.ads, 5zosprim.adb, 5zparame.ads, 5zstchop.adb,
	5zsystem.ads, 5ztaprop.adb, 5ztaspri.ads, 5ztfsetr.adb,
	5ztpopsp.adb, 6vcpp.adb, 6vcstrea.adb, 6vinterf.ads,
	7sinmaop.adb, 7sintman.adb, 7sosinte.adb, 7sosprim.adb,
	7staprop.adb, 7staspri.ads, 7stfsetr.adb, 7stpopsp.adb,
	7straceb.adb, 7straces.adb, 7strafor.adb, 7strafor.ads,
	7stratas.adb, 86numaux.adb, 86numaux.ads: Replaced by files below.

	* a-caldel-vms.adb, a-calend-mingw.adb, a-calend-vms.adb,
	a-calend-vms.ads, a-dirval-mingw.adb, a-dirval-vms.adb,
	a-excpol-abort.adb, a-excpol-interix.adb, a-intnam-aix.ads,
	a-intnam-dummy.ads, a-intnam-freebsd.ads, a-intnam-hpux.ads,
	a-intnam-interix.ads, a-intnam-irix.ads, a-intnam-linux.ads,
	a-intnam-lynxos.ads, a-intnam-mingw.ads, a-intnam-os2.ads,
	a-intnam-solaris.ads, a-intnam-tru64.ads, a-intnam-unixware.ads,
	a-intnam-vms.ads, a-intnam-vxworks.ads, a-numaux-libc-x86.ads,
	a-numaux-vxworks.ads, a-numaux-x86.adb, a-numaux-x86.ads,
	a-sytaco-vxworks.adb, a-sytaco-vxworks.ads, g-eacodu-vms.adb,
	g-expect-vms.adb, g-soccon-aix.ads, g-soccon-freebsd.ads,
	g-soccon-hpux.ads, g-soccon-interix.ads, g-soccon-irix.ads,
	g-soccon-mingw.ads, g-soccon-solaris.ads, g-soccon-tru64.ads,
	g-soccon-unixware.ads, g-soccon-vms.adb, g-soccon-vxworks.ads,
	g-socthi-mingw.adb, g-socthi-mingw.ads, g-socthi-vms.adb,
	g-socthi-vms.ads, g-socthi-vxworks.adb, g-socthi-vxworks.ads,
	g-soliop-mingw.ads, g-soliop-solaris.ads, g-soliop-unixware.ads,
	g-trasym-vms.adb, i-cpp-vms.adb, i-cstrea-vms.adb,
	interfac-vms.ads, mlib-tgt-aix.adb, mlib-tgt-hpux.adb,
	mlib-tgt-irix.adb, mlib-tgt-linux.adb, mlib-tgt-mingw.adb,
	mlib-tgt-solaris.adb, mlib-tgt-tru64.adb, mlib-tgt-vms.adb,
	mlib-tgt-vxworks.adb, s-asthan-vms.adb, s-gloloc-mingw.adb,
	s-inmaop-dummy.adb, s-inmaop-posix.adb, s-inmaop-vms.adb,
	s-interr-dummy.adb, s-interr-sigaction.adb, s-interr-vms.adb,
	s-interr-vxworks.adb, s-intman-dummy.adb, s-intman-irix.adb,
	s-intman-irix-athread.adb, s-intman-mingw.adb, s-intman-posix.adb,
	s-intman-solaris.adb, s-intman-vms.adb, s-intman-vms.ads,
	s-intman-vxworks.adb, s-intman-vxworks.ads, s-mastop-irix.adb,
	s-mastop-tru64.adb, s-mastop-vms.adb, s-mastop-x86.adb,
	s-memory-mingw.adb, s-osinte-aix.adb, s-osinte-aix.ads,
	s-osinte-aix-fsu.ads, s-osinte-dummy.ads, s-osinte-freebsd.adb,
	s-osinte-freebsd.ads, s-osinte-fsu.adb, s-osinte-hpux.ads,
	s-osinte-hpux-dce.adb, s-osinte-hpux-dce.ads, s-osinte-interix.ads,
	s-osinte-irix.adb, s-osinte-irix.ads, s-osinte-irix-athread.ads,
	s-osinte-linux.ads, s-osinte-linux-fsu.ads, s-osinte-linux-ia64.ads,
	s-osinte-lynxos-3.adb, s-osinte-lynxos-3.ads, s-osinte-lynxos.adb,
	s-osinte-lynxos.ads, s-osinte-mingw.ads, s-osinte-os2.adb,
	s-osinte-os2.ads, s-osinte-posix.adb, s-osinte-solaris.adb,
	s-osinte-solaris.ads, s-osinte-solaris-fsu.ads,
	s-osinte-solaris-posix.ads, s-osinte-tru64.adb, s-osinte-tru64.ads,
	s-osinte-unixware.adb, s-osinte-unixware.ads, s-osinte-vms.adb,
	s-osinte-vms.ads, s-osinte-vxworks.adb,
	s-osinte-vxworks.ads, s-osprim-mingw.adb,
	s-osprim-os2.adb, s-osprim-posix.adb, s-osprim-solaris.adb,
	s-osprim-unix.adb, s-osprim-vms.adb, s-osprim-vms.ads,
	s-osprim-vxworks.adb, s-parame-ae653.ads, s-parame-hpux.ads,
	s-parame-linux.adb, s-parame-os2.adb, s-parame-solaris.adb,
	s-parame-vms.ads, s-parame-vms-restrict.ads, s-parame-vxworks.ads,
	s-proinf-irix-athread.adb, s-proinf-irix-athread.ads,
	s-stchop-vxworks.adb, s-taprop-dummy.adb,
	s-taprop-hpux-dce.adb, s-taprop-irix.adb,
	s-taprop-irix-athread.adb, s-taprop-linux.adb, s-taprop-lynxos.adb,
	s-taprop-mingw.adb, s-taprop-os2.adb, s-taprop-posix.adb,
	s-taprop-solaris.adb, s-taprop-tru64.adb, s-taprop-vms.adb,
	s-taprop-vxworks.adb, s-tasinf-irix.ads, s-tasinf-irix-athread.adb,
	s-tasinf-irix-athread.ads, s-tasinf-solaris.adb, s-tasinf-solaris.ads,
	s-tasinf-tru64.ads, s-taspri-dummy.ads, s-taspri-hpux-dce.ads,
	s-taspri-linux.ads, s-taspri-lynxos.ads, s-taspri-mingw.ads,
	s-taspri-os2.ads, s-taspri-posix.ads, s-taspri-solaris.ads,
	s-taspri-tru64.ads, s-taspri-vms.ads, s-taspri-vxworks.ads,
	s-tfsetr-default.adb, s-tfsetr-vxworks.adb, s-tpopde-vms.adb,
	s-tpopde-vms.ads, s-tpopsp-lynxos.adb, s-tpopsp-posix.adb,
	s-tpopsp-posix-foreign.adb, s-tpopsp-solaris.adb, s-tpopsp-vxworks.adb,
	s-traceb-hpux.adb, s-traceb-mastop.adb, s-traces-default.adb,
	s-traent-vms.adb, s-traent-vms.ads, s-trafor-default.adb,
	s-trafor-default.ads, s-tratas-default.adb, s-vaflop-vms.adb,
	s-vxwork-alpha.ads, s-vxwork-m68k.ads, s-vxwork-mips.ads,
	s-vxwork-ppc.ads, s-vxwork-sparcv9.ads, s-vxwork-xscale.ads,
	symbols-vms.adb, system-aix.ads, system-freebsd-x86.ads,
	system-hpux.ads, system-interix.ads, system-irix-n32.ads,
	system-irix-o32.ads, system-linux-x86_64.ads,
	system-linux-x86.ads, system-lynxos-ppc.ads, system-lynxos-x86.ads,
	system-mingw.ads, system-os2.ads, system-solaris-sparc.ads,
	system-solaris-sparcv9.ads, system-solaris-x86.ads, system-tru64.ads,
	system-unixware.ads, system-vms.ads, system-vms-zcx.ads,
	system-vxworks-alpha.ads, system-vxworks-m68k.ads,
	system-vxworks-mips.ads, system-vxworks-ppc.ads,
	system-vxworks-sparcv9.ads, system-vxworks-xscale.ads: Replace files
	above.

From-SVN: r81834

227 files changed, 740 insertions, 803 deletions

diff --git a/gcc/ada/5gtpgetc.adb b/gcc/ada/5gtpgetc.adb
deleted file mode 100644
index 6b36c9d..0000000
--- a/gcc/ada/5gtpgetc.adb
+++ /dev/null
@@ -1,207 +0,0 @@
-------------------------------------------------------------------------------
---                                                                          --
---                GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS               --
---                                                                          --
---     S Y S T E M . T A S K _ P R I M I T I V E S . G E N _ T C B I N F    --
---                                                                          --
---                                 B o d y                                  --
---                                                                          --
---              Copyright (C) 1999-2000 Free Software Fundation             --
---                                                                          --
--- GNARL is free software; you can  redistribute it  and/or modify it under --
--- terms of the  GNU General Public License as published  by the Free Soft- --
--- ware  Foundation;  either version 2,  or (at your option) any later ver- --
--- sion. GNARL is distributed in the hope that it will be useful, but WITH- --
--- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
--- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
--- for  more details.  You should have  received  a copy of the GNU General --
--- Public License  distributed with GNARL; see file COPYING.  If not, write --
--- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
--- MA 02111-1307, USA.                                                      --
---                                                                          --
--- As a special exception,  if other files  instantiate  generics from this --
--- unit, or you link  this unit with other files  to produce an executable, --
--- this  unit  does not  by itself cause  the resulting  executable  to  be --
--- covered  by the  GNU  General  Public  License.  This exception does not --
--- however invalidate  any other reasons why  the executable file  might be --
--- covered by the  GNU Public License.                                      --
---                                                                          --
--- GNARL was developed by the GNARL team at Florida State University.       --
--- Extensive contributions were provided by Ada Core Technologies, Inc.     --
---                                                                          --
-------------------------------------------------------------------------------
-
---  This is an SGI Irix version of this package
-
---  This procedure creates the file "a-tcbinf.c"
---  "A-tcbinf.c" is subsequently compiled and made part of the RTL
---  to be referenced by the SGI Workshop debugger. The main procedure:
---  "Gen_Tcbinf" imports this child procedure and runs as part of the
---  RTL build process. Because of the complex process used to build
---  the GNAT RTL for all the different systems and the frequent changes
---  made to the internal data structures, its impractical to create
---  "a-tcbinf.c" using a standalone process.
-with System.Tasking;
-with Ada.Text_IO;
-with Unchecked_Conversion;
-
-procedure System.Task_Primitives.Gen_Tcbinf is
-
-   use System.Tasking;
-
-   subtype Version_String is String (1 .. 4);
-
-   Version : constant Version_String := "3.11";
-
-   function To_Integer is new Unchecked_Conversion
-     (Version_String, Integer);
-
-   type Dummy_TCB_Ptr is access Ada_Task_Control_Block (Entry_Num => 0);
-   Dummy_TCB : constant Dummy_TCB_Ptr := new Ada_Task_Control_Block (0);
-
-   C_File : Ada.Text_IO.File_Type;
-
-   procedure Pl (S : String);
-   procedure Nl (C : Ada.Text_IO.Positive_Count := 1);
-   function State_Name (S : Task_States) return String;
-
-   procedure Pl (S : String) is
-   begin
-      Ada.Text_IO.Put_Line (C_File, S);
-   end Pl;
-
-   procedure Nl (C : Ada.Text_IO.Positive_Count := 1) is
-   begin
-      Ada.Text_IO.New_Line (C_File, C);
-   end Nl;
-
-   function State_Name (S : Task_States) return String is
-   begin
-      case S is
-         when Unactivated =>
-            return "Unactivated";
-         when Runnable =>
-            return "Runnable";
-         when Terminated =>
-            return "Terminated";
-         when Activator_Sleep =>
-            return "Child Activation Wait";
-         when Acceptor_Sleep =>
-            return "Accept/Select Wait";
-         when Entry_Caller_Sleep =>
-            return "Waiting on Entry Call";
-         when Async_Select_Sleep =>
-            return "Async_Select Wait";
-         when Delay_Sleep =>
-            return "Delay Sleep";
-         when Master_Completion_Sleep =>
-            return "Child Termination Wait";
-         when Master_Phase_2_Sleep =>
-            return "Wait Child in Term Alt";
-         when Interrupt_Server_Idle_Sleep =>
-            return "Int Server Idle Sleep";
-         when Interrupt_Server_Blocked_Interrupt_Sleep =>
-            return "Int Server Blk Int Sleep";
-         when Timer_Server_Sleep =>
-            return "Timer Server Sleep";
-         when AST_Server_Sleep =>
-            return "AST Server Sleep";
-         when Asynchronous_Hold =>
-            return "Asynchronous Hold";
-         when Interrupt_Server_Blocked_On_Event_Flag =>
-            return "Int Server Blk Evt Flag";
-      end case;
-   end State_Name;
-
-   All_Tasks_Link_Offset   : constant Integer
-     := Dummy_TCB.Common'Position + Dummy_TCB.Common.All_Tasks_Link'Position;
-   Entry_Count_Offset      : constant Integer
-     := Dummy_TCB.Entry_Num'Position;
-   Entry_Point_Offset      : constant Integer
-     := Dummy_TCB.Common'Position + Dummy_TCB.Common.Task_Entry_Point'Position;
-   Parent_Offset           : constant Integer
-     := Dummy_TCB.Common'Position + Dummy_TCB.Common.Parent'Position;
-   Base_Priority_Offset    : constant Integer
-     := Dummy_TCB.Common'Position + Dummy_TCB.Common.Base_Priority'Position;
-   Current_Priority_Offset : constant Integer
-     := Dummy_TCB.Common'Position + Dummy_TCB.Common.Current_Priority'Position;
-   Stack_Size_Offset       : constant Integer
-     := Dummy_TCB.Common'Position +
-       Dummy_TCB.Common.Compiler_Data.Pri_Stack_Info.Size'Position;
-   State_Offset            : constant Integer
-     := Dummy_TCB.Common'Position + Dummy_TCB.Common.State'Position;
-   Task_Image_Offset       : constant Integer
-     := Dummy_TCB.Common'Position + Dummy_TCB.Common.Task_Image'Position;
-   Thread_Offset           : constant Integer
-     := Dummy_TCB.Common'Position + Dummy_TCB.Common.LL'Position +
-        Dummy_TCB.Common.LL.Thread'Position;
-
-begin
-
-   Ada.Text_IO.Create (C_File, Ada.Text_IO.Out_File, "a-tcbinf.c");
-
-   Pl ("");
-   Pl ("#include <sys/types.h>");
-   Pl ("");
-   Pl ("#define TCB_INFO_VERSION 2");
-   Pl ("#define TCB_LIBRARY_VERSION "
-     & Integer'Image (To_Integer (Version)));
-   Pl ("");
-   Pl ("typedef struct {");
-   Pl ("");
-   Pl ("   __uint32_t   info_version;");
-   Pl ("   __uint32_t   library_version;");
-   Pl ("");
-   Pl ("   __uint32_t   All_Tasks_Link_Offset;");
-   Pl ("   __uint32_t   Entry_Count_Offset;");
-   Pl ("   __uint32_t   Entry_Point_Offset;");
-   Pl ("   __uint32_t   Parent_Offset;");
-   Pl ("   __uint32_t   Base_Priority_Offset;");
-   Pl ("   __uint32_t   Current_Priority_Offset;");
-   Pl ("   __uint32_t   Stack_Size_Offset;");
-   Pl ("   __uint32_t   State_Offset;");
-   Pl ("   __uint32_t   Task_Image_Offset;");
-   Pl ("   __uint32_t   Thread_Offset;");
-   Pl ("");
-   Pl ("   char         **state_names;");
-   Pl ("   __uint32_t   state_names_max;");
-   Pl ("");
-   Pl ("} task_control_block_info_t;");
-   Pl ("");
-   Pl ("static char *accepting_state_names = NULL;");
-
-   Pl ("");
-   Pl ("static char *task_state_names[] = {");
-
-   for State in Task_States loop
-      Pl ("   """ & State_Name (State) & """,");
-   end loop;
-   Pl ("   """"};");
-
-   Pl ("");
-   Pl ("");
-   Pl ("task_control_block_info_t __task_control_block_info = {");
-   Pl ("");
-   Pl ("   TCB_INFO_VERSION,");
-   Pl ("   TCB_LIBRARY_VERSION,");
-   Pl ("");
-   Pl ("   " & All_Tasks_Link_Offset'Img & ",");
-   Pl ("   " & Entry_Count_Offset'Img & ",");
-   Pl ("   " & Entry_Point_Offset'Img & ",");
-   Pl ("   " & Parent_Offset'Img & ",");
-   Pl ("   " & Base_Priority_Offset'Img & ",");
-   Pl ("   " & Current_Priority_Offset'Img & ",");
-   Pl ("   " & Stack_Size_Offset'Img & ",");
-   Pl ("   " & State_Offset'Img & ",");
-   Pl ("   " & Task_Image_Offset'Img & ",");
-   Pl ("   " & Thread_Offset'Img & ",");
-   Pl ("");
-   Pl ("   task_state_names,");
-   Pl ("   sizeof (task_state_names),");
-   Pl ("");
-   Pl ("");
-   Pl ("};");
-
-   Ada.Text_IO.Close (C_File);
-
-end System.Task_Primitives.Gen_Tcbinf;
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 4ae1cfd..7ba15df 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,147 @@
+2004-05-14  Arnaud Charlet  <charlet@act-europe.fr>
+
+	Renaming of target specific files for clarity
+
+        * Makefile.in: Rename GNAT target specific files.
+
+	* 31soccon.ads, 31soliop.ads 35soccon.ads, 3asoccon.ads,
+	3bsoccon.ads, 3gsoccon.ads, 3hsoccon.ads, 3psoccon.ads,
+	3ssoccon.ads, 3ssoliop.ads, 3veacodu.adb, 3vexpect.adb,
+	3vsoccon.ads, 3vsocthi.adb, 3vsocthi.ads, 3vtrasym.adb,
+	3wsoccon.ads, 3wsocthi.adb, 3wsocthi.ads, 3wsoliop.ads,
+	3zsoccon.ads, 3zsocthi.adb, 3zsocthi.ads, 41intnam.ads,
+	42intnam.ads, 45intnam.ads, 4aintnam.ads, 4cintnam.ads,
+	4gintnam.ads, 4hexcpol.adb, 4hintnam.ads, 4lintnam.ads,
+	4nintnam.ads, 4ointnam.ads, 4onumaux.ads, 4pintnam.ads,
+	4sintnam.ads, 4vcaldel.adb, 4vcalend.adb, 4vcalend.ads,
+	4vintnam.ads, 4wcalend.adb, 4wexcpol.adb, 4wintnam.ads,
+	4zintnam.ads, 4znumaux.ads, 4zsytaco.adb, 4zsytaco.ads,
+	51osinte.adb, 51osinte.ads, 51system.ads,
+	52osinte.adb, 52osinte.ads, 53osinte.ads, 54osinte.ads,
+	55osinte.adb, 55osinte.ads, 55system.ads, 56osinte.adb,
+	56osinte.ads, 56system.ads, 56taprop.adb, 56taspri.ads,
+	56tpopsp.adb, 57system.ads, 58system.ads,
+	5amastop.adb, 5aml-tgt.adb, 5aosinte.adb, 5aosinte.ads,
+	5asystem.ads, 5ataprop.adb, 5atasinf.ads, 5ataspri.ads,
+	5atpopsp.adb, 5avxwork.ads, 5bml-tgt.adb, 5bosinte.adb,
+	5bosinte.ads, 5bsystem.ads, 5cosinte.ads, 5csystem.ads,
+	5dsystem.ads, 5esystem.ads, 5fintman.adb, 5fosinte.adb,
+	5fosinte.ads, 5fsystem.ads, 5ftaprop.adb, 5ftasinf.ads,
+	5ginterr.adb, 5gintman.adb, 5gmastop.adb, 5gml-tgt.adb,
+	5gosinte.ads, 5gproinf.adb, 5gproinf.ads, 5gsystem.ads,
+	5gtaprop.adb, 5gtasinf.adb, 5gtasinf.ads, 5gtpgetc.adb,
+	5hml-tgt.adb, 5hosinte.adb, 5hosinte.ads, 5hparame.ads,
+	5hsystem.ads, 5htaprop.adb, 5htaspri.ads, 5htraceb.adb,
+	5iosinte.adb, 5iosinte.ads, 5itaprop.adb, 5itaspri.ads,
+	5ksystem.ads, 5kvxwork.ads, 5lml-tgt.adb, 5losinte.ads,
+	5lparame.adb, 5lsystem.ads, 5msystem.ads, 5mvxwork.ads,
+	5ninmaop.adb, 5nintman.adb, 5nosinte.ads, 5nsystem.ads,
+	5ntaprop.adb, 5ntaspri.ads, 5ointerr.adb, 5omastop.adb,
+	5oosinte.adb, 5oosinte.ads, 5oosprim.adb, 5oparame.adb,
+	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5posinte.ads,
+	5posprim.adb, 5psystem.ads, 5pvxwork.ads, 5sintman.adb,
+	5sml-tgt.adb, 5sosinte.adb, 5sosinte.ads, 5sosprim.adb,
+	5sparame.adb, 5ssystem.ads, 5staprop.adb, 5stasinf.adb,
+	5stasinf.ads, 5staspri.ads, 5stpopsp.adb, 5svxwork.ads,
+	5tosinte.ads, 5usystem.ads, 5vasthan.adb, 5vdirval.adb,
+	5vinmaop.adb, 5vinterr.adb, 5vintman.adb, 5vintman.ads,
+	5vmastop.adb, 5vml-tgt.adb, 5vosinte.adb, 5vosinte.ads,
+	5vosprim.adb, 5vosprim.ads, 5vparame.ads, 5vsymbol.adb,
+	5vsystem.ads, 5vtaprop.adb, 5vtaspri.ads, 5vtpopde.adb,
+	5vtpopde.ads, 5vtraent.adb, 5vtraent.ads, 5vvaflop.adb,
+	5wdirval.adb, 5wgloloc.adb, 5wintman.adb, 5wmemory.adb,
+	5wml-tgt.adb, 5wosinte.ads, 5wosprim.adb, 5wsystem.ads,
+	5wtaprop.adb, 5wtaspri.ads, 5xparame.ads, 5xsystem.ads,
+	5xvxwork.ads, 5yparame.ads, 5ysystem.ads, 5zinterr.adb,
+	5zintman.adb, 5zintman.ads, 5zml-tgt.adb, 5zosinte.adb,
+	5zosinte.ads, 5zosprim.adb, 5zparame.ads, 5zstchop.adb,
+	5zsystem.ads, 5ztaprop.adb, 5ztaspri.ads, 5ztfsetr.adb,
+	5ztpopsp.adb, 6vcpp.adb, 6vcstrea.adb, 6vinterf.ads,
+	7sinmaop.adb, 7sintman.adb, 7sosinte.adb, 7sosprim.adb,
+	7staprop.adb, 7staspri.ads, 7stfsetr.adb, 7stpopsp.adb,
+	7straceb.adb, 7straces.adb, 7strafor.adb, 7strafor.ads,
+	7stratas.adb, 86numaux.adb, 86numaux.ads: Replaced by files below.
+
+	* a-caldel-vms.adb, a-calend-mingw.adb, a-calend-vms.adb,
+	a-calend-vms.ads, a-dirval-mingw.adb, a-dirval-vms.adb,
+	a-excpol-abort.adb, a-excpol-interix.adb, a-intnam-aix.ads,
+	a-intnam-dummy.ads, a-intnam-freebsd.ads, a-intnam-hpux.ads,
+	a-intnam-interix.ads, a-intnam-irix.ads, a-intnam-linux.ads,
+	a-intnam-lynxos.ads, a-intnam-mingw.ads, a-intnam-os2.ads,
+	a-intnam-solaris.ads, a-intnam-tru64.ads, a-intnam-unixware.ads,
+	a-intnam-vms.ads, a-intnam-vxworks.ads, a-numaux-libc-x86.ads,
+	a-numaux-vxworks.ads, a-numaux-x86.adb, a-numaux-x86.ads,
+	a-sytaco-vxworks.adb, a-sytaco-vxworks.ads, g-eacodu-vms.adb,
+	g-expect-vms.adb, g-soccon-aix.ads, g-soccon-freebsd.ads,
+	g-soccon-hpux.ads, g-soccon-interix.ads, g-soccon-irix.ads,
+	g-soccon-mingw.ads, g-soccon-solaris.ads, g-soccon-tru64.ads,
+	g-soccon-unixware.ads, g-soccon-vms.adb, g-soccon-vxworks.ads,
+	g-socthi-mingw.adb, g-socthi-mingw.ads, g-socthi-vms.adb,
+	g-socthi-vms.ads, g-socthi-vxworks.adb, g-socthi-vxworks.ads,
+	g-soliop-mingw.ads, g-soliop-solaris.ads, g-soliop-unixware.ads,
+	g-trasym-vms.adb, i-cpp-vms.adb, i-cstrea-vms.adb,
+	interfac-vms.ads, mlib-tgt-aix.adb, mlib-tgt-hpux.adb,
+	mlib-tgt-irix.adb, mlib-tgt-linux.adb, mlib-tgt-mingw.adb,
+	mlib-tgt-solaris.adb, mlib-tgt-tru64.adb, mlib-tgt-vms.adb,
+	mlib-tgt-vxworks.adb, s-asthan-vms.adb, s-gloloc-mingw.adb,
+	s-inmaop-dummy.adb, s-inmaop-posix.adb, s-inmaop-vms.adb,
+	s-interr-dummy.adb, s-interr-sigaction.adb, s-interr-vms.adb,
+	s-interr-vxworks.adb, s-intman-dummy.adb, s-intman-irix.adb,
+	s-intman-irix-athread.adb, s-intman-mingw.adb, s-intman-posix.adb,
+	s-intman-solaris.adb, s-intman-vms.adb, s-intman-vms.ads,
+	s-intman-vxworks.adb, s-intman-vxworks.ads, s-mastop-irix.adb,
+	s-mastop-tru64.adb, s-mastop-vms.adb, s-mastop-x86.adb,
+	s-memory-mingw.adb, s-osinte-aix.adb, s-osinte-aix.ads,
+	s-osinte-aix-fsu.ads, s-osinte-dummy.ads, s-osinte-freebsd.adb,
+	s-osinte-freebsd.ads, s-osinte-fsu.adb, s-osinte-hpux.ads,
+	s-osinte-hpux-dce.adb, s-osinte-hpux-dce.ads, s-osinte-interix.ads,
+	s-osinte-irix.adb, s-osinte-irix.ads, s-osinte-irix-athread.ads,
+	s-osinte-linux.ads, s-osinte-linux-fsu.ads, s-osinte-linux-ia64.ads,
+	s-osinte-lynxos-3.adb, s-osinte-lynxos-3.ads, s-osinte-lynxos.adb,
+	s-osinte-lynxos.ads, s-osinte-mingw.ads, s-osinte-os2.adb,
+	s-osinte-os2.ads, s-osinte-posix.adb, s-osinte-solaris.adb,
+	s-osinte-solaris.ads, s-osinte-solaris-fsu.ads,
+	s-osinte-solaris-posix.ads, s-osinte-tru64.adb, s-osinte-tru64.ads,
+	s-osinte-unixware.adb, s-osinte-unixware.ads, s-osinte-vms.adb,
+	s-osinte-vms.ads, s-osinte-vxworks.adb,
+	s-osinte-vxworks.ads, s-osprim-mingw.adb,
+	s-osprim-os2.adb, s-osprim-posix.adb, s-osprim-solaris.adb,
+	s-osprim-unix.adb, s-osprim-vms.adb, s-osprim-vms.ads,
+	s-osprim-vxworks.adb, s-parame-ae653.ads, s-parame-hpux.ads,
+	s-parame-linux.adb, s-parame-os2.adb, s-parame-solaris.adb,
+	s-parame-vms.ads, s-parame-vms-restrict.ads, s-parame-vxworks.ads,
+	s-proinf-irix-athread.adb, s-proinf-irix-athread.ads,
+	s-stchop-vxworks.adb, s-taprop-dummy.adb,
+	s-taprop-hpux-dce.adb, s-taprop-irix.adb,
+	s-taprop-irix-athread.adb, s-taprop-linux.adb, s-taprop-lynxos.adb,
+	s-taprop-mingw.adb, s-taprop-os2.adb, s-taprop-posix.adb,
+	s-taprop-solaris.adb, s-taprop-tru64.adb, s-taprop-vms.adb,
+	s-taprop-vxworks.adb, s-tasinf-irix.ads, s-tasinf-irix-athread.adb,
+	s-tasinf-irix-athread.ads, s-tasinf-solaris.adb, s-tasinf-solaris.ads,
+	s-tasinf-tru64.ads, s-taspri-dummy.ads, s-taspri-hpux-dce.ads,
+	s-taspri-linux.ads, s-taspri-lynxos.ads, s-taspri-mingw.ads,
+	s-taspri-os2.ads, s-taspri-posix.ads, s-taspri-solaris.ads,
+	s-taspri-tru64.ads, s-taspri-vms.ads, s-taspri-vxworks.ads,
+	s-tfsetr-default.adb, s-tfsetr-vxworks.adb, s-tpopde-vms.adb,
+	s-tpopde-vms.ads, s-tpopsp-lynxos.adb, s-tpopsp-posix.adb,
+	s-tpopsp-posix-foreign.adb, s-tpopsp-solaris.adb, s-tpopsp-vxworks.adb,
+	s-traceb-hpux.adb, s-traceb-mastop.adb, s-traces-default.adb,
+	s-traent-vms.adb, s-traent-vms.ads, s-trafor-default.adb,
+	s-trafor-default.ads, s-tratas-default.adb, s-vaflop-vms.adb,
+	s-vxwork-alpha.ads, s-vxwork-m68k.ads, s-vxwork-mips.ads,
+	s-vxwork-ppc.ads, s-vxwork-sparcv9.ads, s-vxwork-xscale.ads,
+	symbols-vms.adb, system-aix.ads, system-freebsd-x86.ads,
+	system-hpux.ads, system-interix.ads, system-irix-n32.ads,
+	system-irix-o32.ads, system-linux-x86_64.ads,
+	system-linux-x86.ads, system-lynxos-ppc.ads, system-lynxos-x86.ads,
+	system-mingw.ads, system-os2.ads, system-solaris-sparc.ads,
+	system-solaris-sparcv9.ads, system-solaris-x86.ads, system-tru64.ads,
+	system-unixware.ads, system-vms.ads, system-vms-zcx.ads,
+	system-vxworks-alpha.ads, system-vxworks-m68k.ads,
+	system-vxworks-mips.ads, system-vxworks-ppc.ads,
+	system-vxworks-sparcv9.ads, system-vxworks-xscale.ads: Replace files
+	above.
+
 2004-05-13  Zack Weinberg  <zack@codesourcery.com>
 
 	* trans.c (gnat_stabilize_reference_1): Remove case 'b'.
diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index 6b075b8..a094a82 100644
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -341,13 +341,13 @@ endif
 # Non-tasking case:
 
 LIBGNAT_TARGET_PAIRS = \
-a-intnam.ads<4nintnam.ads \
-s-inmaop.adb<5ninmaop.adb \
-s-intman.adb<5nintman.adb \
-s-osinte.ads<5nosinte.ads \
-s-osprim.adb<7sosprim.adb \
-s-taprop.adb<5ntaprop.adb \
-s-taspri.ads<5ntaspri.ads
+a-intnam.ads<a-intnam-dummy.ads \
+s-inmaop.adb<s-inmaop-dummy.adb \
+s-intman.adb<s-intman-dummy.adb \
+s-osinte.ads<s-osinte-dummy.ads \
+s-osprim.adb<s-osprim-posix.adb \
+s-taprop.adb<s-taprop-dummy.adb \
+s-taspri.ads<s-taspri-dummy.ads
 
 # Default shared object option. Note that we rely on the fact that the "soname"
 # option will always be present and last in this flag, so that we can have
@@ -384,21 +384,21 @@ LIB_VERSION = $(strip $(shell grep ' Library_Version :' $(fsrcpfx)gnatvsn.ads |
 
 ifeq ($(strip $(filter-out %86 os2 OS2 os2_emx,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-excpol.adb<4wexcpol.adb \
-  a-intnam.ads<4nintnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  s-inmaop.adb<5ninmaop.adb \
-  s-interr.adb<5ointerr.adb \
-  s-intman.adb<5nintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-osinte.adb<5oosinte.adb \
-  s-osinte.ads<5oosinte.ads \
-  s-osprim.adb<5oosprim.adb \
-  s-parame.adb<5oparame.adb \
-  system.ads<5osystem.ads \
-  s-taprop.adb<5otaprop.adb \
-  s-taspri.ads<5otaspri.ads
+  a-excpol.adb<a-excpol-abort.adb \
+  a-intnam.ads<a-intnam-dummy.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  s-inmaop.adb<s-inmaop-dummy.adb \
+  s-interr.adb<s-interr-dummy.adb \
+  s-intman.adb<s-intman-dummy.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-osinte.adb<s-osinte-os2.adb \
+  s-osinte.ads<s-osinte-os2.ads \
+  s-osprim.adb<s-osprim-os2.adb \
+  s-parame.adb<s-parame-os2.adb \
+  system.ads<system-os2.ads \
+  s-taprop.adb<s-taprop-os2.adb \
+  s-taspri.ads<s-taspri-os2.ads
 
   EXTRA_GNATRTL_NONTASKING_OBJS = \
   i-os2err.o \
@@ -409,21 +409,21 @@ endif
 
 ifeq ($(strip $(filter-out %86 interix%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-excpol.adb<4hexcpol.adb \
-  a-intnam.ads<4pintnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  g-soccon.ads<3psoccon.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-osinte.adb<7sosinte.adb \
-  s-osinte.ads<5posinte.ads \
-  s-osprim.adb<5posprim.adb \
-  s-taprop.adb<7staprop.adb \
-  system.ads<5psystem.ads \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<7stpopsp.adb
+  a-excpol.adb<a-excpol-interix.adb \
+  a-intnam.ads<a-intnam-interix.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  g-soccon.ads<g-soccon-interix.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-osinte.adb<s-osinte-fsu.adb \
+  s-osinte.ads<s-osinte-interix.ads \
+  s-osprim.adb<s-osprim-unix.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  system.ads<system-interix.ads \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-posix.adb
 
   THREADSLIB = -lgthreads -lmalloc
   PREFIX_OBJS=$(PREFIX_REAL_OBJS)
@@ -432,22 +432,22 @@ endif
 # sysv5uw is SCO UnixWare 7
 ifeq ($(strip $(filter-out %86 sysv5uw%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-excpol.adb<4wexcpol.adb \
-  a-intnam.ads<41intnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-osinte.ads<51osinte.ads \
-  s-osinte.adb<51osinte.adb \
-  s-osprim.adb<5posprim.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<5atpopsp.adb \
-  system.ads<51system.ads \
-  g-soccon.ads<31soccon.ads \
-  g-soliop.ads<31soliop.ads
+  a-excpol.adb<a-excpol-abort.adb \
+  a-intnam.ads<a-intnam-unixware.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-osinte.ads<s-osinte-unixware.ads \
+  s-osinte.adb<s-osinte-unixware.adb \
+  s-osprim.adb<s-osprim-unix.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  system.ads<system-unixware.ads \
+  g-soccon.ads<g-soccon-unixware.ads \
+  g-soliop.ads<g-soliop-unixware.ads
 
   THREADSLIB = -lthread
   PREFIX_OBJS=$(PREFIX_REAL_OBJS)
@@ -458,27 +458,27 @@ endif
 
 ifeq ($(strip $(filter-out alpha% dec vx%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-sytaco.ads<4zsytaco.ads \
-  a-sytaco.adb<4zsytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  a-numaux.ads<4znumaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5zinterr.adb \
-  s-intman.ads<5zintman.ads \
-  s-intman.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-parame.ads<5zparame.ads \
-  s-stchop.adb<5zstchop.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-tpopsp.adb<5ztpopsp.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-vxwork.ads<5avxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5zsystem.ads
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  a-numaux.ads<a-numaux-vxworks.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-vxworks.adb \
+  s-intman.ads<s-intman-vxworks.ads \
+  s-intman.adb<s-intman-vxworks.adb \
+  s-osinte.adb<s-osinte-vxworks.adb \
+  s-osinte.ads<s-osinte-vxworks.ads \
+  s-osprim.adb<s-osprim-vxworks.adb \
+  s-parame.ads<s-parame-vxworks.ads \
+  s-stchop.adb<s-stchop-vxworks.adb \
+  s-taprop.adb<s-taprop-vxworks.adb \
+  s-tpopsp.adb<s-tpopsp-vxworks.adb \
+  s-taspri.ads<s-taspri-vxworks.ads \
+  s-vxwork.ads<s-vxwork-alpha.ads \
+  g-soccon.ads<g-soccon-vxworks.ads \
+  g-socthi.ads<g-socthi-vxworks.ads \
+  g-socthi.adb<g-socthi-vxworks.adb \
+  system.ads<system-vxworks-alpha.ads
 
   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
@@ -486,104 +486,104 @@ endif
 
 ifeq ($(strip $(filter-out m68k% wrs vx%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-sytaco.ads<4zsytaco.ads \
-  a-sytaco.adb<4zsytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  a-numaux.ads<4znumaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5zinterr.adb \
-  s-intman.ads<5zintman.ads \
-  s-intman.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-parame.ads<5zparame.ads \
-  s-stchop.adb<5zstchop.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-tpopsp.adb<5ztpopsp.adb \
-  s-vxwork.ads<5kvxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5ksystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5zml-tgt.adb
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  a-numaux.ads<a-numaux-vxworks.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-vxworks.adb \
+  s-intman.ads<s-intman-vxworks.ads \
+  s-intman.adb<s-intman-vxworks.adb \
+  s-osinte.adb<s-osinte-vxworks.adb \
+  s-osinte.ads<s-osinte-vxworks.ads \
+  s-osprim.adb<s-osprim-vxworks.adb \
+  s-parame.ads<s-parame-vxworks.ads \
+  s-stchop.adb<s-stchop-vxworks.adb \
+  s-taprop.adb<s-taprop-vxworks.adb \
+  s-taspri.ads<s-taspri-vxworks.ads \
+  s-tpopsp.adb<s-tpopsp-vxworks.adb \
+  s-vxwork.ads<s-vxwork-m68k.ads \
+  g-soccon.ads<g-soccon-vxworks.ads \
+  g-socthi.ads<g-socthi-vxworks.ads \
+  g-socthi.adb<g-socthi-vxworks.adb \
+  system.ads<system-vxworks-m68k.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
 
   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
 
   ifeq ($(strip $(filter-out yes,$(TRACE))),)
     LIBGNAT_TARGET_PAIRS += \
-    s-traces.adb<7straces.adb \
-    s-tratas.adb<7stratas.adb \
-    s-trafor.adb<7strafor.adb \
-    s-trafor.ads<7strafor.ads \
-    s-tfsetr.adb<5ztfsetr.adb 
+    s-traces.adb<s-traces-default.adb \
+    s-tratas.adb<s-tratas-default.adb \
+    s-trafor.adb<s-trafor-default.adb \
+    s-trafor.ads<s-trafor-default.ads \
+    s-tfsetr.adb<s-tfsetr-vxworks.adb 
   endif
 endif
 
 ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-sytaco.ads<4zsytaco.ads \
-  a-sytaco.adb<4zsytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  a-numaux.ads<4znumaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5zinterr.adb \
-  s-intman.ads<5zintman.ads \
-  s-intman.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-parame.ads<5zparame.ads \
-  s-stchop.adb<5zstchop.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-tpopsp.adb<5ztpopsp.adb \
-  s-vxwork.ads<5pvxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5ysystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5zml-tgt.adb
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  a-numaux.ads<a-numaux-vxworks.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-vxworks.adb \
+  s-intman.ads<s-intman-vxworks.ads \
+  s-intman.adb<s-intman-vxworks.adb \
+  s-osinte.adb<s-osinte-vxworks.adb \
+  s-osinte.ads<s-osinte-vxworks.ads \
+  s-osprim.adb<s-osprim-vxworks.adb \
+  s-parame.ads<s-parame-vxworks.ads \
+  s-stchop.adb<s-stchop-vxworks.adb \
+  s-taprop.adb<s-taprop-vxworks.adb \
+  s-taspri.ads<s-taspri-vxworks.ads \
+  s-tpopsp.adb<s-tpopsp-vxworks.adb \
+  s-vxwork.ads<s-vxwork-ppc.ads \
+  g-soccon.ads<g-soccon-vxworks.ads \
+  g-socthi.ads<g-socthi-vxworks.ads \
+  g-socthi.adb<g-socthi-vxworks.adb \
+  system.ads<system-vxworks-ppc.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
 
   ifeq ($(strip $(filter-out yes,$(TRACE))),)
     LIBGNAT_TARGET_PAIRS += \
-    s-traces.adb<7straces.adb \
-    s-trafor.adb<7strafor.adb \
-    s-trafor.ads<7strafor.ads \
-    s-tratas.adb<7stratas.adb \
-    s-tfsetr.adb<5ztfsetr.adb 
+    s-traces.adb<s-traces-default.adb \
+    s-trafor.adb<s-trafor-default.adb \
+    s-trafor.ads<s-trafor-default.ads \
+    s-tratas.adb<s-tratas-default.adb \
+    s-tfsetr.adb<s-tfsetr-vxworks.adb 
   endif
 endif
 
 ifeq ($(strip $(filter-out sparc% wrs vx%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-sytaco.ads<4zsytaco.ads \
-  a-sytaco.adb<4zsytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  a-numaux.ads<4znumaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5zinterr.adb \
-  s-intman.ads<5zintman.ads \
-  s-intman.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-parame.ads<5zparame.ads \
-  s-stchop.adb<5zstchop.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-tpopsp.adb<5ztpopsp.adb \
-  s-vxwork.ads<5svxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5csystem.ads   \
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5zml-tgt.adb
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  a-numaux.ads<a-numaux-vxworks.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-vxworks.adb \
+  s-intman.ads<s-intman-vxworks.ads \
+  s-intman.adb<s-intman-vxworks.adb \
+  s-osinte.adb<s-osinte-vxworks.adb \
+  s-osinte.ads<s-osinte-vxworks.ads \
+  s-osprim.adb<s-osprim-vxworks.adb \
+  s-parame.ads<s-parame-vxworks.ads \
+  s-stchop.adb<s-stchop-vxworks.adb \
+  s-taprop.adb<s-taprop-vxworks.adb \
+  s-taspri.ads<s-taspri-vxworks.ads \
+  s-tpopsp.adb<s-tpopsp-vxworks.adb \
+  s-vxwork.ads<s-vxwork-sparcv9.ads \
+  g-soccon.ads<g-soccon-vxworks.ads \
+  g-socthi.ads<g-socthi-vxworks.ads \
+  g-socthi.adb<g-socthi-vxworks.adb \
+  system.ads<system-vxworks-sparcv9.ads   \
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
 
   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
@@ -591,29 +591,29 @@ endif
 
 ifeq ($(strip $(filter-out xscale% coff wrs vx%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-sytaco.ads<4zsytaco.ads \
-  a-sytaco.adb<4zsytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  a-numaux.ads<4znumaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5zinterr.adb \
-  s-intman.ads<5zintman.ads \
-  s-intman.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-parame.ads<5zparame.ads \
-  s-stchop.adb<5zstchop.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-tpopsp.adb<5ztpopsp.adb \
-  s-vxwork.ads<5xvxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5rsystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5zml-tgt.adb
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  a-numaux.ads<a-numaux-vxworks.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-vxworks.adb \
+  s-intman.ads<s-intman-vxworks.ads \
+  s-intman.adb<s-intman-vxworks.adb \
+  s-osinte.adb<s-osinte-vxworks.adb \
+  s-osinte.ads<s-osinte-vxworks.ads \
+  s-osprim.adb<s-osprim-vxworks.adb \
+  s-parame.ads<s-parame-vxworks.ads \
+  s-stchop.adb<s-stchop-vxworks.adb \
+  s-taprop.adb<s-taprop-vxworks.adb \
+  s-taspri.ads<s-taspri-vxworks.ads \
+  s-tpopsp.adb<s-tpopsp-vxworks.adb \
+  s-vxwork.ads<s-vxwork-xscale.ads \
+  g-soccon.ads<g-soccon-vxworks.ads \
+  g-socthi.ads<g-socthi-vxworks.ads \
+  g-socthi.adb<g-socthi-vxworks.adb \
+  system.ads<system-elf-sparc.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
 
   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
@@ -621,29 +621,29 @@ endif
 
 ifeq ($(strip $(filter-out mips% wrs vx%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-sytaco.ads<4zsytaco.ads \
-  a-sytaco.adb<4zsytaco.adb \
-  a-intnam.ads<4zintnam.ads \
-  a-numaux.ads<4znumaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5zinterr.adb \
-  s-intman.ads<5zintman.ads \
-  s-intman.adb<5zintman.adb \
-  s-osinte.adb<5zosinte.adb \
-  s-osinte.ads<5zosinte.ads \
-  s-osprim.adb<5zosprim.adb \
-  s-parame.ads<5zparame.ads \
-  s-stchop.adb<5zstchop.adb \
-  s-taprop.adb<5ztaprop.adb \
-  s-taspri.ads<5ztaspri.ads \
-  s-tpopsp.adb<5ztpopsp.adb \
-  s-vxwork.ads<5mvxwork.ads \
-  g-soccon.ads<3zsoccon.ads \
-  g-socthi.ads<3zsocthi.ads \
-  g-socthi.adb<3zsocthi.adb \
-  system.ads<5msystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5zml-tgt.adb
+  a-sytaco.ads<a-sytaco-vxworks.ads \
+  a-sytaco.adb<a-sytaco-vxworks.adb \
+  a-intnam.ads<a-intnam-vxworks.ads \
+  a-numaux.ads<a-numaux-vxworks.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-vxworks.adb \
+  s-intman.ads<s-intman-vxworks.ads \
+  s-intman.adb<s-intman-vxworks.adb \
+  s-osinte.adb<s-osinte-vxworks.adb \
+  s-osinte.ads<s-osinte-vxworks.ads \
+  s-osprim.adb<s-osprim-vxworks.adb \
+  s-parame.ads<s-parame-vxworks.ads \
+  s-stchop.adb<s-stchop-vxworks.adb \
+  s-taprop.adb<s-taprop-vxworks.adb \
+  s-taspri.ads<s-taspri-vxworks.ads \
+  s-tpopsp.adb<s-tpopsp-vxworks.adb \
+  s-vxwork.ads<s-vxwork-mips.ads \
+  g-soccon.ads<g-soccon-vxworks.ads \
+  g-socthi.ads<g-socthi-vxworks.ads \
+  g-socthi.adb<g-socthi-vxworks.adb \
+  system.ads<system-vxworks-mips.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
 
   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
@@ -651,23 +651,23 @@ endif
 
 ifeq ($(strip $(filter-out sparc sun solaris%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4sintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<5sintman.adb \
-  s-osinte.adb<5sosinte.adb \
-  s-osinte.ads<5sosinte.ads \
-  s-osprim.adb<5sosprim.adb \
-  s-parame.adb<5sparame.adb \
-  s-taprop.adb<5staprop.adb \
-  s-tasinf.adb<5stasinf.adb \
-  s-tasinf.ads<5stasinf.ads \
-  s-taspri.ads<5staspri.ads \
-  s-tpopsp.adb<5stpopsp.adb \
-  g-soccon.ads<3ssoccon.ads \
-  g-soliop.ads<3ssoliop.ads \
-  system.ads<5ssystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5sml-tgt.adb
+  a-intnam.ads<a-intnam-solaris.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-solaris.adb \
+  s-osinte.adb<s-osinte-solaris.adb \
+  s-osinte.ads<s-osinte-solaris.ads \
+  s-osprim.adb<s-osprim-solaris.adb \
+  s-parame.adb<s-parame-solaris.adb \
+  s-taprop.adb<s-taprop-solaris.adb \
+  s-tasinf.adb<s-tasinf-solaris.adb \
+  s-tasinf.ads<s-tasinf-solaris.ads \
+  s-taspri.ads<s-taspri-solaris.ads \
+  s-tpopsp.adb<s-tpopsp-solaris.adb \
+  g-soccon.ads<g-soccon-solaris.ads \
+  g-soliop.ads<g-soliop-solaris.ads \
+  system.ads<system-solaris-sparc.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-solaris.adb
 
   THREADSLIB = -lposix4 -lthread
   MISCLIB = -lposix4 -lnsl -lsocket
@@ -680,80 +680,80 @@ ifeq ($(strip $(filter-out sparc sun solaris%,$(targ))),)
 
   ifeq ($(strip $(filter-out fsu FSU,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4sintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<5sintman.adb \
-    s-osinte.adb<7sosinte.adb \
-    s-osinte.ads<5tosinte.ads \
-    s-osprim.adb<5sosprim.adb \
-    s-taprop.adb<7staprop.adb \
-    s-taspri.ads<7staspri.ads \
-    s-tpopsp.adb<7stpopsp.adb \
-    g-soccon.ads<3ssoccon.ads \
-    g-soliop.ads<3ssoliop.ads \
-    system.ads<5ssystem.ads
+    a-intnam.ads<a-intnam-solaris.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-solaris.adb \
+    s-osinte.adb<s-osinte-fsu.adb \
+    s-osinte.ads<s-osinte-solaris-fsu.ads \
+    s-osprim.adb<s-osprim-solaris.adb \
+    s-taprop.adb<s-taprop-posix.adb \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-tpopsp.adb<s-tpopsp-posix.adb \
+    g-soccon.ads<g-soccon-solaris.ads \
+    g-soliop.ads<g-soliop-solaris.ads \
+    system.ads<system-solaris-sparc.ads
 
     THREADSLIB = -lgthreads -lmalloc
   endif
 
   ifeq ($(strip $(filter-out pthread PTHREAD,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4sintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<7sintman.adb \
-    s-osinte.adb<5iosinte.adb \
-    s-osinte.ads<54osinte.ads \
-    s-osprim.adb<5sosprim.adb \
-    s-taprop.adb<7staprop.adb \
-    s-taspri.ads<7staspri.ads \
-    s-tpopsp.adb<5atpopsp.adb \
-    g-soccon.ads<3ssoccon.ads \
-    g-soliop.ads<3ssoliop.ads \
-    system.ads<5ssystem.ads
+    a-intnam.ads<a-intnam-solaris.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-osinte.adb<s-osinte-posix.adb \
+    s-osinte.ads<s-osinte-solaris-posix.ads \
+    s-osprim.adb<s-osprim-solaris.adb \
+    s-taprop.adb<s-taprop-posix.adb \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+    g-soccon.ads<g-soccon-solaris.ads \
+    g-soliop.ads<g-soliop-solaris.ads \
+    system.ads<system-solaris-sparc.ads
 
     THREADSLIB = -lposix4 -lpthread
   endif
 
   ifeq ($(strip $(filter-out m64,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4sintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<5sintman.adb \
-    s-osinte.adb<5sosinte.adb \
-    s-osinte.ads<5sosinte.ads \
-    s-osprim.adb<5sosprim.adb \
-    s-parame.adb<5sparame.adb \
-    s-taprop.adb<5staprop.adb \
-    s-tasinf.adb<5stasinf.adb \
-    s-tasinf.ads<5stasinf.ads \
-    s-taspri.ads<5staspri.ads \
-    s-tpopsp.adb<5stpopsp.adb \
-    g-soccon.ads<3ssoccon.ads \
-    g-soliop.ads<3ssoliop.ads \
-    system.ads<5usystem.ads
+    a-intnam.ads<a-intnam-solaris.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-solaris.adb \
+    s-osinte.adb<s-osinte-solaris.adb \
+    s-osinte.ads<s-osinte-solaris.ads \
+    s-osprim.adb<s-osprim-solaris.adb \
+    s-parame.adb<s-parame-solaris.adb \
+    s-taprop.adb<s-taprop-solaris.adb \
+    s-tasinf.adb<s-tasinf-solaris.adb \
+    s-tasinf.ads<s-tasinf-solaris.ads \
+    s-taspri.ads<s-taspri-solaris.ads \
+    s-tpopsp.adb<s-tpopsp-solaris.adb \
+    g-soccon.ads<g-soccon-solaris.ads \
+    g-soliop.ads<g-soliop-solaris.ads \
+    system.ads<system-solaris-sparcv9.ads
   endif
 endif
 
 ifeq ($(strip $(filter-out %86 solaris2%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  a-intnam.ads<4sintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<5sintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-osinte.adb<5sosinte.adb \
-  s-osinte.ads<5sosinte.ads \
-  s-osprim.adb<5sosprim.adb \
-  s-parame.adb<5sparame.adb \
-  s-taprop.adb<5staprop.adb \
-  s-tasinf.adb<5stasinf.adb \
-  s-tasinf.ads<5stasinf.ads \
-  s-taspri.ads<5staspri.ads \
-  s-tpopsp.adb<5stpopsp.adb \
-  g-soccon.ads<3ssoccon.ads \
-  g-soliop.ads<3ssoliop.ads \
-  system.ads<5esystem.ads
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  a-intnam.ads<a-intnam-solaris.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-solaris.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-osinte.adb<s-osinte-solaris.adb \
+  s-osinte.ads<s-osinte-solaris.ads \
+  s-osprim.adb<s-osprim-solaris.adb \
+  s-parame.adb<s-parame-solaris.adb \
+  s-taprop.adb<s-taprop-solaris.adb \
+  s-tasinf.adb<s-tasinf-solaris.adb \
+  s-tasinf.ads<s-tasinf-solaris.ads \
+  s-taspri.ads<s-taspri-solaris.ads \
+  s-tpopsp.adb<s-tpopsp-solaris.adb \
+  g-soccon.ads<g-soccon-solaris.ads \
+  g-soliop.ads<g-soliop-solaris.ads \
+  system.ads<system-solaris-x86.ads
 
   THREADSLIB = -lposix4 -lthread
   MISCLIB = -lposix4 -lnsl -lsocket
@@ -765,23 +765,23 @@ endif
 
 ifeq ($(strip $(filter-out %86 linux%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4lintnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-osinte.adb<5iosinte.adb \
-  s-osinte.ads<5iosinte.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<5itaprop.adb \
-  s-taspri.ads<5itaspri.ads \
-  s-tpopsp.adb<5atpopsp.adb \
-  s-parame.adb<5lparame.adb \
-  system.ads<5lsystem.ads
+  a-intnam.ads<a-intnam-linux.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-osinte.adb<s-osinte-posix.adb \
+  s-osinte.ads<s-osinte-linux.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-linux.adb \
+  s-taspri.ads<s-taspri-linux.ads \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  s-parame.adb<s-parame-linux.adb \
+  system.ads<system-linux-x86.ads
 
   TOOLS_TARGET_PAIRS =  \
-    mlib-tgt.adb<5lml-tgt.adb
+    mlib-tgt.adb<mlib-tgt-linux.adb
 
   SYMLIB = $(ADDR2LINE_SYMLIB)
   THREADSLIB = -lpthread
@@ -792,19 +792,19 @@ ifeq ($(strip $(filter-out %86 linux%,$(arch) $(osys))),)
 
   ifeq ($(strip $(filter-out fsu FSU,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4lintnam.ads \
-    a-numaux.adb<86numaux.adb \
-    a-numaux.ads<86numaux.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<7sintman.adb \
-    s-mastop.adb<5omastop.adb \
-    s-osinte.adb<7sosinte.adb \
-    s-osinte.ads<5losinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-taprop.adb<7staprop.adb \
-    s-taspri.ads<7staspri.ads \
-    s-tpopsp.adb<7stpopsp.adb \
-    system.ads<5lsystem.ads
+    a-intnam.ads<a-intnam-linux.ads \
+    a-numaux.adb<a-numaux-x86.adb \
+    a-numaux.ads<a-numaux-x86.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-mastop.adb<s-mastop-x86.adb \
+    s-osinte.adb<s-osinte-fsu.adb \
+    s-osinte.ads<s-osinte-linux-fsu.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-taprop.adb<s-taprop-posix.adb \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-tpopsp.adb<s-tpopsp-posix.adb \
+    system.ads<system-linux-x86.ads
 
     THREADSLIB = -lgthreads -lmalloc
   endif
@@ -812,23 +812,23 @@ endif
 
 ifeq ($(strip $(filter-out %86 freebsd%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<45intnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  g-soccon.ads<35soccon.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-osinte.adb<55osinte.adb \
-  s-osinte.ads<55osinte.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<7stpopsp.adb \
-  system.ads<56system.ads
+  a-intnam.ads<a-intnam-freebsd.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  g-soccon.ads<g-soccon-freebsd.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-osinte.adb<s-osinte-freebsd.adb \
+  s-osinte.ads<s-osinte-freebsd.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-posix.adb \
+  system.ads<system-freebsd-x86.ads
 
   TOOLS_TARGET_PAIRS = \
-  mlib-tgt.adb<5lml-tgt.adb
+  mlib-tgt.adb<mlib-tgt-linux.adb
   GNATLIB_SHARED = gnatlib-shared-dual
 
   SYMLIB = $(ADDR2LINE_SYMLIB)
@@ -841,34 +841,34 @@ endif
 ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)
   ifeq ($(strip $(filter-out s390x,$(arch))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4lintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<7sintman.adb \
-    s-osinte.adb<5iosinte.adb \
-    s-osinte.ads<5iosinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-taprop.adb<5itaprop.adb \
-    s-taspri.ads<5itaspri.ads \
-    s-tpopsp.adb<5atpopsp.adb \
-    s-parame.adb<5lparame.adb \
+    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<4lintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<7sintman.adb \
-    s-osinte.adb<5iosinte.adb \
-    s-osinte.ads<5iosinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-taprop.adb<5itaprop.adb \
-    s-taspri.ads<5itaspri.ads \
-    s-tpopsp.adb<5atpopsp.adb \
-    s-parame.adb<5lparame.adb \
+    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<5lml-tgt.adb
+    mlib-tgt.adb<mlib-tgt-linux.adb
 
   THREADSLIB = -lpthread
   GNATLIB_SHARED = gnatlib-shared-dual
@@ -879,48 +879,48 @@ endif
 ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),)
   ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4gintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<5fintman.adb \
-    s-mastop.adb<5gmastop.adb \
-    s-osinte.adb<5fosinte.adb \
-    s-osinte.ads<5fosinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-proinf.adb<5gproinf.adb \
-    s-proinf.ads<5gproinf.ads \
-    s-taprop.adb<5ftaprop.adb \
-    s-tasinf.ads<5ftasinf.ads \
-    s-taspri.ads<7staspri.ads \
-    s-tpopsp.adb<7stpopsp.adb \
-    s-traceb.adb<7straceb.adb \
-    g-soccon.ads<3gsoccon.ads \
-    system.ads<5gsystem.ads
+    a-intnam.ads<a-intnam-irix.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-irix.adb \
+    s-mastop.adb<s-mastop-irix.adb \
+    s-osinte.adb<s-osinte-irix.adb \
+    s-osinte.ads<s-osinte-irix.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-proinf.adb<s-proinf-irix-athread.adb \
+    s-proinf.ads<s-proinf-irix-athread.ads \
+    s-taprop.adb<s-taprop-irix.adb \
+    s-tasinf.ads<s-tasinf-irix.ads \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-tpopsp.adb<s-tpopsp-posix.adb \
+    s-traceb.adb<s-traceb-mastop.adb \
+    g-soccon.ads<g-soccon-irix.ads \
+    system.ads<system-irix-n32.ads
 
     THREADSLIB = -lpthread
     GNATLIB_SHARED = gnatlib-shared-default
 
   else
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4gintnam.ads \
-    s-inmaop.adb<5ninmaop.adb \
-    s-interr.adb<5ginterr.adb \
-    s-intman.adb<5gintman.adb \
-    s-mastop.adb<5gmastop.adb \
-    s-osinte.adb<5fosinte.adb \
-    s-osinte.ads<5gosinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-proinf.adb<5gproinf.adb \
-    s-proinf.ads<5gproinf.ads \
-    s-taprop.adb<5gtaprop.adb \
-    s-tasinf.adb<5gtasinf.adb \
-    s-tasinf.ads<5gtasinf.ads \
-    s-taspri.ads<7staspri.ads \
-    s-traceb.adb<7straceb.adb \
-    g-soccon.ads<3gsoccon.ads \
-    system.ads<5fsystem.ads
+    a-intnam.ads<a-intnam-irix.ads \
+    s-inmaop.adb<s-inmaop-dummy.adb \
+    s-interr.adb<s-interr-sigaction.adb \
+    s-intman.adb<s-intman-irix-athread.adb \
+    s-mastop.adb<s-mastop-irix.adb \
+    s-osinte.adb<s-osinte-irix.adb \
+    s-osinte.ads<s-osinte-irix-athread.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-proinf.adb<s-proinf-irix-athread.adb \
+    s-proinf.ads<s-proinf-irix-athread.ads \
+    s-taprop.adb<s-taprop-irix-athread.adb \
+    s-tasinf.adb<s-tasinf-irix-athread.adb \
+    s-tasinf.ads<s-tasinf-irix-athread.ads \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-traceb.adb<s-traceb-mastop.adb \
+    g-soccon.ads<g-soccon-irix.ads \
+    system.ads<system-irix-o32.ads
   endif
 
-  TOOLS_TARGET_PAIRS = mlib-tgt.adb<5gml-tgt.adb
+  TOOLS_TARGET_PAIRS = mlib-tgt.adb<mlib-tgt-irix.adb
   TGT_LIB = -lexc
   MISCLIB = -lexc
   SO_OPTS = -Wl,-all,-set_version,sgi1.0,-update_registry,../so_locations,-soname,
@@ -930,41 +930,41 @@ endif
 
 ifeq ($(strip $(filter-out hppa% hp hpux10%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-excpol.adb<4wexcpol.adb \
-  a-intnam.ads<4hintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-interr.adb<5ginterr.adb \
-  s-intman.adb<7sintman.adb \
-  s-osinte.adb<5hosinte.adb \
-  s-osinte.ads<5hosinte.ads \
-  s-parame.ads<5hparame.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<5htaprop.adb \
-  s-taspri.ads<5htaspri.ads \
-  s-tpopsp.adb<7stpopsp.adb \
-  g-soccon.ads<3hsoccon.ads \
-  system.ads<5hsystem.ads
+  a-excpol.adb<a-excpol-abort.adb \
+  a-intnam.ads<a-intnam-hpux.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-interr.adb<s-interr-sigaction.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.adb<s-osinte-hpux-dce.adb \
+  s-osinte.ads<s-osinte-hpux-dce.ads \
+  s-parame.ads<s-parame-hpux.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-hpux-dce.adb \
+  s-taspri.ads<s-taspri-hpux-dce.ads \
+  s-tpopsp.adb<s-tpopsp-posix.adb \
+  g-soccon.ads<g-soccon-hpux.ads \
+  system.ads<system-hpux.ads
 
   PREFIX_OBJS = $(PREFIX_REAL_OBJS)
 endif
 
 ifeq ($(strip $(filter-out hppa% hp hpux11%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4hintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-osinte.adb<5iosinte.adb \
-  s-osinte.ads<53osinte.ads \
-  s-parame.ads<5hparame.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-traceb.adb<5htraceb.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<5atpopsp.adb \
-  g-soccon.ads<3hsoccon.ads \
-  system.ads<5hsystem.ads
-
-  TOOLS_TARGET_PAIRS = mlib-tgt.adb<5hml-tgt.adb
+  a-intnam.ads<a-intnam-hpux.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.adb<s-osinte-posix.adb \
+  s-osinte.ads<s-osinte-hpux.ads \
+  s-parame.ads<s-parame-hpux.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-traceb.adb<s-traceb-hpux.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  g-soccon.ads<g-soccon-hpux.ads \
+  system.ads<system-hpux.ads
+
+  TOOLS_TARGET_PAIRS = mlib-tgt.adb<mlib-tgt-hpux.adb
   TGT_LIB = /usr/lib/libcl.a
   THREADSLIB = -lpthread
   SYMLIB = $(ADDR2LINE_SYMLIB)
@@ -977,20 +977,20 @@ ifeq ($(strip $(filter-out hppa% hp hpux11%,$(targ))),)
 
   ifeq ($(strip $(filter-out dce DCE,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-excpol.adb<4wexcpol.adb \
-    a-intnam.ads<4hintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-interr.adb<5ginterr.adb \
-    s-intman.adb<7sintman.adb \
-    s-osinte.adb<5hosinte.adb \
-    s-osinte.ads<5hosinte.ads \
-    s-parame.ads<5hparame.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-taprop.adb<5htaprop.adb \
-    s-taspri.ads<5htaspri.ads \
-    s-tpopsp.adb<7stpopsp.adb \
-    g-soccon.ads<3hsoccon.ads \
-    system.ads<5hsystem.ads
+    a-excpol.adb<a-excpol-abort.adb \
+    a-intnam.ads<a-intnam-hpux.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-interr.adb<s-interr-sigaction.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-osinte.adb<s-osinte-hpux-dce.adb \
+    s-osinte.ads<s-osinte-hpux-dce.ads \
+    s-parame.ads<s-parame-hpux.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-taprop.adb<s-taprop-hpux-dce.adb \
+    s-taspri.ads<s-taspri-hpux-dce.ads \
+    s-tpopsp.adb<s-tpopsp-posix.adb \
+    g-soccon.ads<g-soccon-hpux.ads \
+    system.ads<system-hpux.ads
 
     TGT_LIB =
     THREADSLIB = -lcma
@@ -999,39 +999,39 @@ endif
 
 ifeq ($(strip $(filter-out ibm aix%,$(manu) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4cintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-osinte.adb<5bosinte.adb \
-  s-osinte.ads<5bosinte.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<7stpopsp.adb \
-  g-soccon.ads<3bsoccon.ads \
-  system.ads<5bsystem.ads
+  a-intnam.ads<a-intnam-aix.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.adb<s-osinte-aix.adb \
+  s-osinte.ads<s-osinte-aix.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-posix.adb \
+  g-soccon.ads<g-soccon-aix.ads \
+  system.ads<system-aix.ads
 
   THREADSLIB = -lpthreads
   PREFIX_OBJS=$(PREFIX_REAL_OBJS)
 
   ifeq ($(strip $(filter-out fsu FSU,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<4cintnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<7sintman.adb \
-    s-osinte.adb<7sosinte.adb \
-    s-osinte.ads<5cosinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-taprop.adb<7staprop.adb \
-    s-taspri.ads<7staspri.ads \
-    s-tpopsp.adb<7stpopsp.adb \
-    g-soccon.ads<3bsoccon.ads \
-    system.ads<5bsystem.ads
+    a-intnam.ads<a-intnam-aix.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-osinte.adb<s-osinte-fsu.adb \
+    s-osinte.ads<s-osinte-aix-fsu.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-taprop.adb<s-taprop-posix.adb \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-tpopsp.adb<s-tpopsp-posix.adb \
+    g-soccon.ads<g-soccon-aix.ads \
+    system.ads<system-aix.ads
 
     THREADSLIB = -lgthreads -lmalloc
   endif
 
-  TOOLS_TARGET_PAIRS = mlib-tgt.adb<5bml-tgt.adb
+  TOOLS_TARGET_PAIRS = mlib-tgt.adb<mlib-tgt-aix.adb
   GMEM_LIB = gmemlib
   SYMLIB = $(ADDR2LINE_SYMLIB)
 
@@ -1040,47 +1040,47 @@ endif
 ifeq ($(strip $(filter-out lynxos,$(osys))),)
   ifeq ($(strip $(filter-out %86 lynxos,$(arch) $(osys))),)
     LIBGNAT_TARGET_PAIRS = \
-    a-numaux.adb<86numaux.adb \
-    a-numaux.ads<86numaux.ads \
-    a-intnam.ads<42intnam.ads \
-    s-mastop.adb<5omastop.adb \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<7sintman.adb \
-    s-osinte.adb<56osinte.adb \
-    s-osinte.ads<56osinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-taprop.adb<56taprop.adb \
-    s-taspri.ads<56taspri.ads \
-    s-tpopsp.adb<56tpopsp.adb \
-    system.ads<58system.ads
+    a-numaux.adb<a-numaux-x86.adb \
+    a-numaux.ads<a-numaux-x86.ads \
+    a-intnam.ads<a-intnam-lynxos.ads \
+    s-mastop.adb<s-mastop-x86.adb \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-osinte.adb<s-osinte-lynxos.adb \
+    s-osinte.ads<s-osinte-lynxos.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-taprop.adb<s-taprop-lynxos.adb \
+    s-taspri.ads<s-taspri-lynxos.ads \
+    s-tpopsp.adb<s-tpopsp-lynxos.adb \
+    system.ads<system-lynxos-x86.ads
 
     PREFIX_OBJS=$(PREFIX_REAL_OBJS)
 
   else
     LIBGNAT_TARGET_PAIRS = \
-    a-intnam.ads<42intnam.ads \
-    s-inmaop.adb<7sinmaop.adb \
-    s-intman.adb<7sintman.adb \
-    s-osinte.adb<52osinte.adb \
-    s-osinte.ads<52osinte.ads \
-    s-osprim.adb<7sosprim.adb \
-    s-taprop.adb<7staprop.adb \
-    s-taspri.ads<7staspri.ads \
-    s-tpopsp.adb<7stpopsp.adb \
-    system.ads<57system.ads
+    a-intnam.ads<a-intnam-lynxos.ads \
+    s-inmaop.adb<s-inmaop-posix.adb \
+    s-intman.adb<s-intman-posix.adb \
+    s-osinte.adb<s-osinte-lynxos-3.adb \
+    s-osinte.ads<s-osinte-lynxos-3.ads \
+    s-osprim.adb<s-osprim-posix.adb \
+    s-taprop.adb<s-taprop-posix.adb \
+    s-taspri.ads<s-taspri-posix.ads \
+    s-tpopsp.adb<s-tpopsp-posix.adb \
+    system.ads<system-lynxos-ppc.ads
 
     ifeq ($(strip $(filter-out pthread PTHREAD,$(THREAD_KIND))),)
       LIBGNAT_TARGET_PAIRS = \
-      a-intnam.ads<42intnam.ads \
-      s-inmaop.adb<7sinmaop.adb \
-      s-intman.adb<7sintman.adb \
-      s-osinte.adb<56osinte.adb \
-      s-osinte.ads<56osinte.ads \
-      s-osprim.adb<7sosprim.adb \
-      s-taprop.adb<56taprop.adb \
-      s-taspri.ads<56taspri.ads \
-      s-tpopsp.adb<56tpopsp.adb \
-      system.ads<57system.ads
+      a-intnam.ads<a-intnam-lynxos.ads \
+      s-inmaop.adb<s-inmaop-posix.adb \
+      s-intman.adb<s-intman-posix.adb \
+      s-osinte.adb<s-osinte-lynxos.adb \
+      s-osinte.ads<s-osinte-lynxos.ads \
+      s-osprim.adb<s-osprim-posix.adb \
+      s-taprop.adb<s-taprop-lynxos.adb \
+      s-taspri.ads<s-taspri-lynxos.ads \
+      s-tpopsp.adb<s-tpopsp-lynxos.adb \
+      system.ads<system-lynxos-ppc.ads
     endif
 
   endif
@@ -1089,35 +1089,35 @@ endif
 ifeq ($(strip $(filter-out rtems%,$(osys))),)
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<4rintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
   s-osinte.adb<5rosinte.adb \
   s-osinte.ads<5rosinte.ads \
-  s-osprim.adb<7sosprim.adb \
+  s-osprim.adb<s-osprim-posix.adb \
   s-parame.adb<5rparame.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
   s-tpopsp.adb<5rtpopsp.adb
 endif
 
 ifeq ($(strip $(filter-out alpha% dec osf%,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4aintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-mastop.adb<5amastop.adb \
-  s-osinte.adb<5aosinte.adb \
-  s-osinte.ads<5aosinte.ads \
-  s-osprim.adb<5posprim.adb \
-  s-taprop.adb<5ataprop.adb \
-  s-tasinf.ads<5atasinf.ads \
-  s-taspri.ads<5ataspri.ads \
-  s-tpopsp.adb<5atpopsp.adb \
-  s-traceb.adb<7straceb.adb \
-  g-soccon.ads<3asoccon.ads \
-  system.ads<5asystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5aml-tgt.adb
+  a-intnam.ads<a-intnam-tru64.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-mastop.adb<s-mastop-tru64.adb \
+  s-osinte.adb<s-osinte-tru64.adb \
+  s-osinte.ads<s-osinte-tru64.ads \
+  s-osprim.adb<s-osprim-unix.adb \
+  s-taprop.adb<s-taprop-tru64.adb \
+  s-tasinf.ads<s-tasinf-tru64.ads \
+  s-taspri.ads<s-taspri-tru64.ads \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  s-traceb.adb<s-traceb-mastop.adb \
+  g-soccon.ads<g-soccon-tru64.ads \
+  system.ads<system-tru64.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-tru64.adb
 
   GMEM_LIB=gmemlib
   SYMLIB = $(ADDR2LINE_SYMLIB)
@@ -1146,62 +1146,62 @@ ifeq ($(strip $(filter-out alpha% ia64 dec hp vms% openvms% alphavms%,$(targ))),
 ifeq ($(strip $(filter-out ia64 hp vms% openvms%,$(targ))),)
   LIBGNAT_TARGET_PAIRS_AUX1 = \
   s-auxdec.ads<5qauxdec.ads \
-  s-crtl.ads<5xcrtl.ads \
-  s-osinte.adb<5xosinte.adb \
-  s-osinte.ads<5xosinte.ads \
+  s-crtl.ads<s-crtl-vms.ads \
+  s-osinte.adb<s-osinte-vms-ia64.adb \
+  s-osinte.ads<s-osinte-vms-ia64.ads \
   system.ads<5qsystem.ads
 else
 ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(targ))),)
   LIBGNAT_TARGET_PAIRS_AUX1 = \
-  s-crtl.ads<5vcrtl.ads \
-  s-osinte.adb<5vosinte.adb \
-  s-osinte.ads<5vosinte.ads \
-  system.ads<5xsystem.ads
+  s-crtl.ads<s-crtl-vms.ads \
+  s-osinte.adb<s-osinte-vms.adb \
+  s-osinte.ads<s-osinte-vms.ads \
+  system.ads<system-vms-zcx.ads
 endif
 endif
 ifeq ($(strip $(filter-out express EXPRESS,$(THREAD_KIND))),)
   LIBGNAT_TARGET_PAIRS_AUX2 = \
-  s-parame.ads<5xparame.ads
+  s-parame.ads<s-parame-vms-restrict.ads
 else
   LIBGNAT_TARGET_PAIRS_AUX2 = \
-  s-parame.ads<5vparame.ads
+  s-parame.ads<s-parame-vms.ads
 endif
 
   LIBGNAT_TARGET_PAIRS = \
-  a-caldel.adb<4vcaldel.adb \
-  a-calend.adb<4vcalend.adb \
-  a-calend.ads<4vcalend.ads \
-  a-dirval.adb<5vdirval.adb \
-  a-excpol.adb<4wexcpol.adb \
-  a-intnam.ads<4vintnam.ads \
-  a-numaux.ads<4vnumaux.ads \
-  g-expect.adb<3vexpect.adb \
-  g-soccon.ads<3vsoccon.ads \
-  g-socthi.ads<3vsocthi.ads \
-  g-socthi.adb<3vsocthi.adb \
-  g-trasym.adb<3vtrasym.adb \
-  i-cstrea.adb<6vcstrea.adb \
-  i-cpp.adb<6vcpp.adb \
-  interfac.ads<6vinterf.ads \
-  s-asthan.adb<5vasthan.adb \
-  s-inmaop.adb<5vinmaop.adb \
-  s-interr.adb<5vinterr.adb \
-  s-intman.adb<5vintman.adb \
-  s-intman.ads<5vintman.ads \
-  s-osprim.adb<5vosprim.adb \
-  s-osprim.ads<5vosprim.ads \
-  s-taprop.adb<5vtaprop.adb \
-  s-taspri.ads<5vtaspri.ads \
-  s-tpopsp.adb<7stpopsp.adb \
-  s-tpopde.adb<5vtpopde.adb \
-  s-tpopde.ads<5vtpopde.ads \
-  s-traent.adb<5vtraent.adb \
-  s-traent.ads<5vtraent.ads \
-  s-vaflop.adb<5vvaflop.adb \
+  a-caldel.adb<a-caldel-vms.adb \
+  a-calend.adb<a-calend-vms.adb \
+  a-calend.ads<a-calend-vms.ads \
+  a-dirval.adb<a-dirval-vms.adb \
+  a-excpol.adb<a-excpol-abort.adb \
+  a-intnam.ads<a-intnam-vms.ads \
+  a-numaux.ads<a-numaux-vms.ads \
+  g-expect.adb<g-expect-vms.adb \
+  g-soccon.ads<g-soccon-vms.adb \
+  g-socthi.ads<g-socthi-vms.ads \
+  g-socthi.adb<g-socthi-vms.adb \
+  g-trasym.adb<g-trasym-vms.adb \
+  i-cstrea.adb<i-cstrea-vms.adb \
+  i-cpp.adb<i-cpp-vms.adb \
+  interfac.ads<interfac-vms.ads \
+  s-asthan.adb<s-asthan-vms.adb \
+  s-inmaop.adb<s-inmaop-vms.adb \
+  s-interr.adb<s-interr-vms.adb \
+  s-intman.adb<s-intman-vms.adb \
+  s-intman.ads<s-intman-vms.ads \
+  s-osprim.adb<s-osprim-vms.adb \
+  s-osprim.ads<s-osprim-vms.ads \
+  s-taprop.adb<s-taprop-vms.adb \
+  s-taspri.ads<s-taspri-vms.ads \
+  s-tpopsp.adb<s-tpopsp-posix.adb \
+  s-tpopde.adb<s-tpopde-vms.adb \
+  s-tpopde.ads<s-tpopde-vms.ads \
+  s-traent.adb<s-traent-vms.adb \
+  s-traent.ads<s-traent-vms.ads \
+  s-vaflop.adb<s-vaflop-vms.adb \
   $(LIBGNAT_TARGET_PAIRS_AUX1) \
   $(LIBGNAT_TARGET_PAIRS_AUX2)
 
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5vml-tgt.adb
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vms.adb
 
   GNATLIB_SHARED=gnatlib-shared-vms
 ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(targ))),)
@@ -1220,29 +1220,29 @@ endif
 
 ifeq ($(strip $(filter-out cygwin32% mingw32% pe,$(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-calend.adb<4wcalend.adb \
-  a-dirval.adb<5wdirval.adb \
-  a-excpol.adb<4wexcpol.adb \
-  a-intnam.ads<4wintnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  s-gloloc.adb<5wgloloc.adb \
-  s-inmaop.adb<5ninmaop.adb \
-  s-interr.adb<5ginterr.adb \
-  s-intman.adb<5wintman.adb \
-  s-mastop.adb<5omastop.adb \
-  s-memory.adb<5wmemory.adb \
-  s-osinte.ads<5wosinte.ads \
-  s-osprim.adb<5wosprim.adb \
-  s-taprop.adb<5wtaprop.adb \
-  s-taspri.ads<5wtaspri.ads \
-  g-socthi.ads<3wsocthi.ads \
-  g-socthi.adb<3wsocthi.adb \
-  g-soccon.ads<3wsoccon.ads \
-  g-soliop.ads<3wsoliop.ads \
-  system.ads<5wsystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5wml-tgt.adb
+  a-calend.adb<a-calend-mingw.adb \
+  a-dirval.adb<a-dirval-mingw.adb \
+  a-excpol.adb<a-excpol-abort.adb \
+  a-intnam.ads<a-intnam-mingw.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  s-gloloc.adb<s-gloloc-mingw.adb \
+  s-inmaop.adb<s-inmaop-dummy.adb \
+  s-interr.adb<s-interr-sigaction.adb \
+  s-intman.adb<s-intman-mingw.adb \
+  s-mastop.adb<s-mastop-x86.adb \
+  s-memory.adb<s-memory-mingw.adb \
+  s-osinte.ads<s-osinte-mingw.ads \
+  s-osprim.adb<s-osprim-mingw.adb \
+  s-taprop.adb<s-taprop-mingw.adb \
+  s-taspri.ads<s-taspri-mingw.ads \
+  g-socthi.ads<g-socthi-mingw.ads \
+  g-socthi.adb<g-socthi-mingw.adb \
+  g-soccon.ads<g-soccon-mingw.ads \
+  g-soliop.ads<g-soliop-mingw.ads \
+  system.ads<system-mingw.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-mingw.adb
   MISCLIB = -lwsock32
   SYMLIB = $(ADDR2LINE_SYMLIB)
   GMEM_LIB = gmemlib
@@ -1259,18 +1259,18 @@ endif
 
 ifeq ($(strip $(filter-out %ia64 linux%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4lintnam.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-osinte.ads<5iosinte.ads \
-  s-osinte.adb<5iosinte.adb \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<5itaprop.adb \
-  s-tpopsp.adb<5atpopsp.adb \
-  s-taspri.ads<5itaspri.ads \
-  system.ads<55system.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
+  a-intnam.ads<a-intnam-linux.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.ads<s-osinte-linux.ads \
+  s-osinte.adb<s-osinte-posix.adb \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-linux.adb \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  s-taspri.ads<s-taspri-linux.ads \
+  system.ads<s-osinte-linux-ia64.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-linux.adb
   MISCLIB=
   THREADSLIB=-lpthread
   GNATLIB_SHARED=gnatlib-shared-dual
@@ -1280,20 +1280,20 @@ endif
 
 ifeq ($(strip $(filter-out %x86_64 linux%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
-  a-intnam.ads<4lintnam.ads \
-  a-numaux.adb<86numaux.adb \
-  a-numaux.ads<86numaux.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
-  s-osinte.ads<5iosinte.ads \
-  s-osinte.adb<5iosinte.adb \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<5itaprop.adb \
-  s-tpopsp.adb<5atpopsp.adb \
-  s-taspri.ads<5itaspri.ads \
-  system.ads<5nsystem.ads
-
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
+  a-intnam.ads<a-intnam-linux.ads \
+  a-numaux.adb<a-numaux-x86.adb \
+  a-numaux.ads<a-numaux-x86.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.ads<s-osinte-linux.ads \
+  s-osinte.adb<s-osinte-posix.adb \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-linux.adb \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  s-taspri.ads<s-taspri-linux.ads \
+  system.ads<system-linux-x86_64.ads
+
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-linux.adb
   SYMLIB = $(ADDR2LINE_SYMLIB)
   THREADSLIB=-lpthread
   GNATLIB_SHARED=gnatlib-shared-dual
@@ -1305,15 +1305,15 @@ endif
 ifeq ($(strip $(filter-out powerpc darwin%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<a-intnam-darwin.ads \
-  s-inmaop.adb<7sinmaop.adb \
-  s-intman.adb<7sintman.adb \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
   s-osinte.adb<s-osinte-darwin.adb \
   s-osinte.ads<s-osinte-darwin.ads \
-  s-osprim.adb<7sosprim.adb \
-  s-taprop.adb<7staprop.adb \
-  s-taspri.ads<7staspri.ads \
-  s-tpopsp.adb<5atpopsp.adb \
-  g-soccon.ads<3bsoccon.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-posix.adb \
+  s-taspri.ads<s-taspri-posix.ads \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  g-soccon.ads<g-soccon-aix.ads \
   system.ads<system-darwin-ppc.ads
 endif
 
diff --git a/gcc/ada/4vcaldel.adb b/gcc/ada/a-caldel-vms.adb
index a95eae6..a95eae6 100644
--- a/gcc/ada/4vcaldel.adb
+++ b/gcc/ada/a-caldel-vms.adb
diff --git a/gcc/ada/4wcalend.adb b/gcc/ada/a-calend-mingw.adb
index 25f8cc4..25f8cc4 100644
--- a/gcc/ada/4wcalend.adb
+++ b/gcc/ada/a-calend-mingw.adb
diff --git a/gcc/ada/4vcalend.adb b/gcc/ada/a-calend-vms.adb
index 74c2923..74c2923 100644
--- a/gcc/ada/4vcalend.adb
+++ b/gcc/ada/a-calend-vms.adb
diff --git a/gcc/ada/4vcalend.ads b/gcc/ada/a-calend-vms.ads
index 6704346..6704346 100644
--- a/gcc/ada/4vcalend.ads
+++ b/gcc/ada/a-calend-vms.ads
diff --git a/gcc/ada/5wdirval.adb b/gcc/ada/a-dirval-mingw.adb
index a20ff17..a20ff17 100644
--- a/gcc/ada/5wdirval.adb
+++ b/gcc/ada/a-dirval-mingw.adb
diff --git a/gcc/ada/5vdirval.adb b/gcc/ada/a-dirval-vms.adb
index 76cae74..76cae74 100644
--- a/gcc/ada/5vdirval.adb
+++ b/gcc/ada/a-dirval-vms.adb
diff --git a/gcc/ada/4wexcpol.adb b/gcc/ada/a-excpol-abort.adb
index afa93c1..afa93c1 100644
--- a/gcc/ada/4wexcpol.adb
+++ b/gcc/ada/a-excpol-abort.adb
diff --git a/gcc/ada/4hexcpol.adb b/gcc/ada/a-excpol-interix.adb
index 7deb26a..7deb26a 100644
--- a/gcc/ada/4hexcpol.adb
+++ b/gcc/ada/a-excpol-interix.adb
diff --git a/gcc/ada/4cintnam.ads b/gcc/ada/a-intnam-aix.ads
index fa56138..fa56138 100644
--- a/gcc/ada/4cintnam.ads
+++ b/gcc/ada/a-intnam-aix.ads
diff --git a/gcc/ada/4nintnam.ads b/gcc/ada/a-intnam-dummy.ads
index 427ba5c..427ba5c 100644
--- a/gcc/ada/4nintnam.ads
+++ b/gcc/ada/a-intnam-dummy.ads
diff --git a/gcc/ada/45intnam.ads b/gcc/ada/a-intnam-freebsd.ads
index eb05daa..eb05daa 100644
--- a/gcc/ada/45intnam.ads
+++ b/gcc/ada/a-intnam-freebsd.ads
diff --git a/gcc/ada/4hintnam.ads b/gcc/ada/a-intnam-hpux.ads
index 0e01a0f..0e01a0f 100644
--- a/gcc/ada/4hintnam.ads
+++ b/gcc/ada/a-intnam-hpux.ads
diff --git a/gcc/ada/4pintnam.ads b/gcc/ada/a-intnam-interix.ads
index f9cac69..f9cac69 100644
--- a/gcc/ada/4pintnam.ads
+++ b/gcc/ada/a-intnam-interix.ads
diff --git a/gcc/ada/4gintnam.ads b/gcc/ada/a-intnam-irix.ads
index afd82f2..afd82f2 100644
--- a/gcc/ada/4gintnam.ads
+++ b/gcc/ada/a-intnam-irix.ads
diff --git a/gcc/ada/4lintnam.ads b/gcc/ada/a-intnam-linux.ads
index ce9ccc7..ce9ccc7 100644
--- a/gcc/ada/4lintnam.ads
+++ b/gcc/ada/a-intnam-linux.ads
diff --git a/gcc/ada/42intnam.ads b/gcc/ada/a-intnam-lynxos.ads
index edc9115..edc9115 100644
--- a/gcc/ada/42intnam.ads
+++ b/gcc/ada/a-intnam-lynxos.ads
diff --git a/gcc/ada/4wintnam.ads b/gcc/ada/a-intnam-mingw.ads
index 4d02e17..4d02e17 100644
--- a/gcc/ada/4wintnam.ads
+++ b/gcc/ada/a-intnam-mingw.ads
diff --git a/gcc/ada/4ointnam.ads b/gcc/ada/a-intnam-os2.ads
index 6733730..6733730 100644
--- a/gcc/ada/4ointnam.ads
+++ b/gcc/ada/a-intnam-os2.ads
diff --git a/gcc/ada/4sintnam.ads b/gcc/ada/a-intnam-solaris.ads
index d6fc181..d6fc181 100644
--- a/gcc/ada/4sintnam.ads
+++ b/gcc/ada/a-intnam-solaris.ads
diff --git a/gcc/ada/4aintnam.ads b/gcc/ada/a-intnam-tru64.ads
index 95509a8..95509a8 100644
--- a/gcc/ada/4aintnam.ads
+++ b/gcc/ada/a-intnam-tru64.ads
diff --git a/gcc/ada/41intnam.ads b/gcc/ada/a-intnam-unixware.ads
index b7009ab..b7009ab 100644
--- a/gcc/ada/41intnam.ads
+++ b/gcc/ada/a-intnam-unixware.ads
diff --git a/gcc/ada/4vintnam.ads b/gcc/ada/a-intnam-vms.ads
index 7eec58f..7eec58f 100644
--- a/gcc/ada/4vintnam.ads
+++ b/gcc/ada/a-intnam-vms.ads
diff --git a/gcc/ada/4zintnam.ads b/gcc/ada/a-intnam-vxworks.ads
index 757b153..757b153 100644
--- a/gcc/ada/4zintnam.ads
+++ b/gcc/ada/a-intnam-vxworks.ads
diff --git a/gcc/ada/4onumaux.ads b/gcc/ada/a-numaux-libc-x86.ads
index 0f84a9f..0f84a9f 100644
--- a/gcc/ada/4onumaux.ads
+++ b/gcc/ada/a-numaux-libc-x86.ads
diff --git a/gcc/ada/4znumaux.ads b/gcc/ada/a-numaux-vxworks.ads
index 3a995a1..3a995a1 100644
--- a/gcc/ada/4znumaux.ads
+++ b/gcc/ada/a-numaux-vxworks.ads
diff --git a/gcc/ada/86numaux.adb b/gcc/ada/a-numaux-x86.adb
index a137333..a137333 100644
--- a/gcc/ada/86numaux.adb
+++ b/gcc/ada/a-numaux-x86.adb
diff --git a/gcc/ada/86numaux.ads b/gcc/ada/a-numaux-x86.ads
index 857499f..857499f 100644
--- a/gcc/ada/86numaux.ads
+++ b/gcc/ada/a-numaux-x86.ads
diff --git a/gcc/ada/4zsytaco.adb b/gcc/ada/a-sytaco-vxworks.adb
index fcb320a..fcb320a 100644
--- a/gcc/ada/4zsytaco.adb
+++ b/gcc/ada/a-sytaco-vxworks.adb
diff --git a/gcc/ada/4zsytaco.ads b/gcc/ada/a-sytaco-vxworks.ads
index c3c54be..c3c54be 100644
--- a/gcc/ada/4zsytaco.ads
+++ b/gcc/ada/a-sytaco-vxworks.ads
diff --git a/gcc/ada/3veacodu.adb b/gcc/ada/g-eacodu-vms.adb
index 2c31a28..2c31a28 100644
--- a/gcc/ada/3veacodu.adb
+++ b/gcc/ada/g-eacodu-vms.adb
diff --git a/gcc/ada/3vexpect.adb b/gcc/ada/g-expect-vms.adb
index 1f18885..1f18885 100644
--- a/gcc/ada/3vexpect.adb
+++ b/gcc/ada/g-expect-vms.adb
diff --git a/gcc/ada/3bsoccon.ads b/gcc/ada/g-soccon-aix.ads
index 0f5fe9d..0f5fe9d 100644
--- a/gcc/ada/3bsoccon.ads
+++ b/gcc/ada/g-soccon-aix.ads
diff --git a/gcc/ada/35soccon.ads b/gcc/ada/g-soccon-freebsd.ads
index cd19222..cd19222 100644
--- a/gcc/ada/35soccon.ads
+++ b/gcc/ada/g-soccon-freebsd.ads
diff --git a/gcc/ada/3hsoccon.ads b/gcc/ada/g-soccon-hpux.ads
index cbca2be..cbca2be 100644
--- a/gcc/ada/3hsoccon.ads
+++ b/gcc/ada/g-soccon-hpux.ads
diff --git a/gcc/ada/3psoccon.ads b/gcc/ada/g-soccon-interix.ads
index 6190307..6190307 100644
--- a/gcc/ada/3psoccon.ads
+++ b/gcc/ada/g-soccon-interix.ads
diff --git a/gcc/ada/3gsoccon.ads b/gcc/ada/g-soccon-irix.ads
index f19f3cd..f19f3cd 100644
--- a/gcc/ada/3gsoccon.ads
+++ b/gcc/ada/g-soccon-irix.ads
diff --git a/gcc/ada/3wsoccon.ads b/gcc/ada/g-soccon-mingw.ads
index b4bb315..b4bb315 100644
--- a/gcc/ada/3wsoccon.ads
+++ b/gcc/ada/g-soccon-mingw.ads
diff --git a/gcc/ada/3ssoccon.ads b/gcc/ada/g-soccon-solaris.ads
index 1ad5883..1ad5883 100644
--- a/gcc/ada/3ssoccon.ads
+++ b/gcc/ada/g-soccon-solaris.ads
diff --git a/gcc/ada/3asoccon.ads b/gcc/ada/g-soccon-tru64.ads
index ef3536e..ef3536e 100644
--- a/gcc/ada/3asoccon.ads
+++ b/gcc/ada/g-soccon-tru64.ads
diff --git a/gcc/ada/31soccon.ads b/gcc/ada/g-soccon-unixware.ads
index 9f7065f..9f7065f 100644
--- a/gcc/ada/31soccon.ads
+++ b/gcc/ada/g-soccon-unixware.ads
diff --git a/gcc/ada/3vsoccon.ads b/gcc/ada/g-soccon-vms.adb
index 76b2051..76b2051 100644
--- a/gcc/ada/3vsoccon.ads
+++ b/gcc/ada/g-soccon-vms.adb
diff --git a/gcc/ada/3zsoccon.ads b/gcc/ada/g-soccon-vxworks.ads
index 27dcb0c..27dcb0c 100644
--- a/gcc/ada/3zsoccon.ads
+++ b/gcc/ada/g-soccon-vxworks.ads
diff --git a/gcc/ada/3wsocthi.adb b/gcc/ada/g-socthi-mingw.adb
index a948bde..a948bde 100644
--- a/gcc/ada/3wsocthi.adb
+++ b/gcc/ada/g-socthi-mingw.adb
diff --git a/gcc/ada/3wsocthi.ads b/gcc/ada/g-socthi-mingw.ads
index 5ee990e..5ee990e 100644
--- a/gcc/ada/3wsocthi.ads
+++ b/gcc/ada/g-socthi-mingw.ads
diff --git a/gcc/ada/3vsocthi.adb b/gcc/ada/g-socthi-vms.adb
index 41b32d1..41b32d1 100644
--- a/gcc/ada/3vsocthi.adb
+++ b/gcc/ada/g-socthi-vms.adb
diff --git a/gcc/ada/3vsocthi.ads b/gcc/ada/g-socthi-vms.ads
index a398552..a398552 100644
--- a/gcc/ada/3vsocthi.ads
+++ b/gcc/ada/g-socthi-vms.ads
diff --git a/gcc/ada/3zsocthi.adb b/gcc/ada/g-socthi-vxworks.adb
index 28e2241..28e2241 100644
--- a/gcc/ada/3zsocthi.adb
+++ b/gcc/ada/g-socthi-vxworks.adb
diff --git a/gcc/ada/3zsocthi.ads b/gcc/ada/g-socthi-vxworks.ads
index 3642a03..3642a03 100644
--- a/gcc/ada/3zsocthi.ads
+++ b/gcc/ada/g-socthi-vxworks.ads
diff --git a/gcc/ada/3wsoliop.ads b/gcc/ada/g-soliop-mingw.ads
index e930da9..e930da9 100644
--- a/gcc/ada/3wsoliop.ads
+++ b/gcc/ada/g-soliop-mingw.ads
diff --git a/gcc/ada/3ssoliop.ads b/gcc/ada/g-soliop-solaris.ads
index 82ac94f..82ac94f 100644
--- a/gcc/ada/3ssoliop.ads
+++ b/gcc/ada/g-soliop-solaris.ads
diff --git a/gcc/ada/31soliop.ads b/gcc/ada/g-soliop-unixware.ads
index 754cafd..754cafd 100644
--- a/gcc/ada/31soliop.ads
+++ b/gcc/ada/g-soliop-unixware.ads
diff --git a/gcc/ada/3vtrasym.adb b/gcc/ada/g-trasym-vms.adb
index 85f541d..85f541d 100644
--- a/gcc/ada/3vtrasym.adb
+++ b/gcc/ada/g-trasym-vms.adb
diff --git a/gcc/ada/6vcpp.adb b/gcc/ada/i-cpp-vms.adb
index a0a8a49..a0a8a49 100644
--- a/gcc/ada/6vcpp.adb
+++ b/gcc/ada/i-cpp-vms.adb
diff --git a/gcc/ada/6vcstrea.adb b/gcc/ada/i-cstrea-vms.adb
index 75b3596..75b3596 100644
--- a/gcc/ada/6vcstrea.adb
+++ b/gcc/ada/i-cstrea-vms.adb
diff --git a/gcc/ada/6vinterf.ads b/gcc/ada/interfac-vms.ads
index e4c3910..e4c3910 100644
--- a/gcc/ada/6vinterf.ads
+++ b/gcc/ada/interfac-vms.ads
diff --git a/gcc/ada/5bml-tgt.adb b/gcc/ada/mlib-tgt-aix.adb
index c95d648..c95d648 100644
--- a/gcc/ada/5bml-tgt.adb
+++ b/gcc/ada/mlib-tgt-aix.adb
diff --git a/gcc/ada/5hml-tgt.adb b/gcc/ada/mlib-tgt-hpux.adb
index 4eb2934..4eb2934 100644
--- a/gcc/ada/5hml-tgt.adb
+++ b/gcc/ada/mlib-tgt-hpux.adb
diff --git a/gcc/ada/5gml-tgt.adb b/gcc/ada/mlib-tgt-irix.adb
index c188199..c188199 100644
--- a/gcc/ada/5gml-tgt.adb
+++ b/gcc/ada/mlib-tgt-irix.adb
diff --git a/gcc/ada/5lml-tgt.adb b/gcc/ada/mlib-tgt-linux.adb
index 00ab392..00ab392 100644
--- a/gcc/ada/5lml-tgt.adb
+++ b/gcc/ada/mlib-tgt-linux.adb
diff --git a/gcc/ada/5wml-tgt.adb b/gcc/ada/mlib-tgt-mingw.adb
index 485be34..485be34 100644
--- a/gcc/ada/5wml-tgt.adb
+++ b/gcc/ada/mlib-tgt-mingw.adb
diff --git a/gcc/ada/5sml-tgt.adb b/gcc/ada/mlib-tgt-solaris.adb
index ac5e4b9..ac5e4b9 100644
--- a/gcc/ada/5sml-tgt.adb
+++ b/gcc/ada/mlib-tgt-solaris.adb
diff --git a/gcc/ada/5aml-tgt.adb b/gcc/ada/mlib-tgt-tru64.adb
index 2474da3..2474da3 100644
--- a/gcc/ada/5aml-tgt.adb
+++ b/gcc/ada/mlib-tgt-tru64.adb
diff --git a/gcc/ada/5vml-tgt.adb b/gcc/ada/mlib-tgt-vms.adb
index 6db0dcc..6db0dcc 100644
--- a/gcc/ada/5vml-tgt.adb
+++ b/gcc/ada/mlib-tgt-vms.adb
diff --git a/gcc/ada/5zml-tgt.adb b/gcc/ada/mlib-tgt-vxworks.adb
index 9b3f575..9b3f575 100644
--- a/gcc/ada/5zml-tgt.adb
+++ b/gcc/ada/mlib-tgt-vxworks.adb
diff --git a/gcc/ada/5vasthan.adb b/gcc/ada/s-asthan-vms.adb
index 86d0402..86d0402 100644
--- a/gcc/ada/5vasthan.adb
+++ b/gcc/ada/s-asthan-vms.adb
diff --git a/gcc/ada/5wgloloc.adb b/gcc/ada/s-gloloc-mingw.adb
index 2b775b2..2b775b2 100644
--- a/gcc/ada/5wgloloc.adb
+++ b/gcc/ada/s-gloloc-mingw.adb
diff --git a/gcc/ada/5ninmaop.adb b/gcc/ada/s-inmaop-dummy.adb
index f99a104..f99a104 100644
--- a/gcc/ada/5ninmaop.adb
+++ b/gcc/ada/s-inmaop-dummy.adb
diff --git a/gcc/ada/7sinmaop.adb b/gcc/ada/s-inmaop-posix.adb
index 8fe6b3a..8fe6b3a 100644
--- a/gcc/ada/7sinmaop.adb
+++ b/gcc/ada/s-inmaop-posix.adb
diff --git a/gcc/ada/5vinmaop.adb b/gcc/ada/s-inmaop-vms.adb
index 2cbfd0e..2cbfd0e 100644
--- a/gcc/ada/5vinmaop.adb
+++ b/gcc/ada/s-inmaop-vms.adb
diff --git a/gcc/ada/5ointerr.adb b/gcc/ada/s-interr-dummy.adb
index 7dbe33f..7dbe33f 100644
--- a/gcc/ada/5ointerr.adb
+++ b/gcc/ada/s-interr-dummy.adb
diff --git a/gcc/ada/5ginterr.adb b/gcc/ada/s-interr-sigaction.adb
index 4ee53e0..4ee53e0 100644
--- a/gcc/ada/5ginterr.adb
+++ b/gcc/ada/s-interr-sigaction.adb
diff --git a/gcc/ada/5vinterr.adb b/gcc/ada/s-interr-vms.adb
index f302ead..f302ead 100644
--- a/gcc/ada/5vinterr.adb
+++ b/gcc/ada/s-interr-vms.adb
diff --git a/gcc/ada/5zinterr.adb b/gcc/ada/s-interr-vxworks.adb
index 5898e6d..5898e6d 100644
--- a/gcc/ada/5zinterr.adb
+++ b/gcc/ada/s-interr-vxworks.adb
diff --git a/gcc/ada/5nintman.adb b/gcc/ada/s-intman-dummy.adb
index 9ef33ab..9ef33ab 100644
--- a/gcc/ada/5nintman.adb
+++ b/gcc/ada/s-intman-dummy.adb
diff --git a/gcc/ada/5gintman.adb b/gcc/ada/s-intman-irix-athread.adb
index 5777130..5777130 100644
--- a/gcc/ada/5gintman.adb
+++ b/gcc/ada/s-intman-irix-athread.adb
diff --git a/gcc/ada/5fintman.adb b/gcc/ada/s-intman-irix.adb
index 2a290e1..2a290e1 100644
--- a/gcc/ada/5fintman.adb
+++ b/gcc/ada/s-intman-irix.adb
diff --git a/gcc/ada/5wintman.adb b/gcc/ada/s-intman-mingw.adb
index 362e501..362e501 100644
--- a/gcc/ada/5wintman.adb
+++ b/gcc/ada/s-intman-mingw.adb
diff --git a/gcc/ada/7sintman.adb b/gcc/ada/s-intman-posix.adb
index 801adac..801adac 100644
--- a/gcc/ada/7sintman.adb
+++ b/gcc/ada/s-intman-posix.adb
diff --git a/gcc/ada/5sintman.adb b/gcc/ada/s-intman-solaris.adb
index d8d5963..d8d5963 100644
--- a/gcc/ada/5sintman.adb
+++ b/gcc/ada/s-intman-solaris.adb
diff --git a/gcc/ada/5vintman.adb b/gcc/ada/s-intman-vms.adb
index 1190378..1190378 100644
--- a/gcc/ada/5vintman.adb
+++ b/gcc/ada/s-intman-vms.adb
diff --git a/gcc/ada/5vintman.ads b/gcc/ada/s-intman-vms.ads
index 60f410b..60f410b 100644
--- a/gcc/ada/5vintman.ads
+++ b/gcc/ada/s-intman-vms.ads
diff --git a/gcc/ada/5zintman.adb b/gcc/ada/s-intman-vxworks.adb
index 411d86d..411d86d 100644
--- a/gcc/ada/5zintman.adb
+++ b/gcc/ada/s-intman-vxworks.adb
diff --git a/gcc/ada/5zintman.ads b/gcc/ada/s-intman-vxworks.ads
index b0a4c3c..b0a4c3c 100644
--- a/gcc/ada/5zintman.ads
+++ b/gcc/ada/s-intman-vxworks.ads
diff --git a/gcc/ada/5gmastop.adb b/gcc/ada/s-mastop-irix.adb
index 6c85ce5..6c85ce5 100644
--- a/gcc/ada/5gmastop.adb
+++ b/gcc/ada/s-mastop-irix.adb
diff --git a/gcc/ada/5amastop.adb b/gcc/ada/s-mastop-tru64.adb
index 956efa4..956efa4 100644
--- a/gcc/ada/5amastop.adb
+++ b/gcc/ada/s-mastop-tru64.adb
diff --git a/gcc/ada/5vmastop.adb b/gcc/ada/s-mastop-vms.adb
index 5bb3f8a..5bb3f8a 100644
--- a/gcc/ada/5vmastop.adb
+++ b/gcc/ada/s-mastop-vms.adb
diff --git a/gcc/ada/5omastop.adb b/gcc/ada/s-mastop-x86.adb
index 96ac113..96ac113 100644
--- a/gcc/ada/5omastop.adb
+++ b/gcc/ada/s-mastop-x86.adb
diff --git a/gcc/ada/5wmemory.adb b/gcc/ada/s-memory-mingw.adb
index a81665a..a81665a 100644
--- a/gcc/ada/5wmemory.adb
+++ b/gcc/ada/s-memory-mingw.adb
diff --git a/gcc/ada/5cosinte.ads b/gcc/ada/s-osinte-aix-fsu.ads
index 7ea96a8..7ea96a8 100644
--- a/gcc/ada/5cosinte.ads
+++ b/gcc/ada/s-osinte-aix-fsu.ads
diff --git a/gcc/ada/5bosinte.adb b/gcc/ada/s-osinte-aix.adb
index 5fe86b1..5fe86b1 100644
--- a/gcc/ada/5bosinte.adb
+++ b/gcc/ada/s-osinte-aix.adb
diff --git a/gcc/ada/5bosinte.ads b/gcc/ada/s-osinte-aix.ads
index c761eb8..c761eb8 100644
--- a/gcc/ada/5bosinte.ads
+++ b/gcc/ada/s-osinte-aix.ads
diff --git a/gcc/ada/5nosinte.ads b/gcc/ada/s-osinte-dummy.ads
index f33370d..f33370d 100644
--- a/gcc/ada/5nosinte.ads
+++ b/gcc/ada/s-osinte-dummy.ads
diff --git a/gcc/ada/55osinte.adb b/gcc/ada/s-osinte-freebsd.adb
index 466a15d..466a15d 100644
--- a/gcc/ada/55osinte.adb
+++ b/gcc/ada/s-osinte-freebsd.adb
diff --git a/gcc/ada/55osinte.ads b/gcc/ada/s-osinte-freebsd.ads
index 13e5458..13e5458 100644
--- a/gcc/ada/55osinte.ads
+++ b/gcc/ada/s-osinte-freebsd.ads
diff --git a/gcc/ada/7sosinte.adb b/gcc/ada/s-osinte-fsu.adb
index b646a78..b646a78 100644
--- a/gcc/ada/7sosinte.adb
+++ b/gcc/ada/s-osinte-fsu.adb
diff --git a/gcc/ada/5hosinte.adb b/gcc/ada/s-osinte-hpux-dce.adb
index dcd169c..dcd169c 100644
--- a/gcc/ada/5hosinte.adb
+++ b/gcc/ada/s-osinte-hpux-dce.adb
diff --git a/gcc/ada/5hosinte.ads b/gcc/ada/s-osinte-hpux-dce.ads
index 18de527..18de527 100644
--- a/gcc/ada/5hosinte.ads
+++ b/gcc/ada/s-osinte-hpux-dce.ads
diff --git a/gcc/ada/53osinte.ads b/gcc/ada/s-osinte-hpux.ads
index 95b093a..95b093a 100644
--- a/gcc/ada/53osinte.ads
+++ b/gcc/ada/s-osinte-hpux.ads
diff --git a/gcc/ada/5posinte.ads b/gcc/ada/s-osinte-interix.ads
index 4e5d956..4e5d956 100644
--- a/gcc/ada/5posinte.ads
+++ b/gcc/ada/s-osinte-interix.ads
diff --git a/gcc/ada/5gosinte.ads b/gcc/ada/s-osinte-irix-athread.ads
index e6df068..e6df068 100644
--- a/gcc/ada/5gosinte.ads
+++ b/gcc/ada/s-osinte-irix-athread.ads
diff --git a/gcc/ada/5fosinte.adb b/gcc/ada/s-osinte-irix.adb
index 9c4c616..9c4c616 100644
--- a/gcc/ada/5fosinte.adb
+++ b/gcc/ada/s-osinte-irix.adb
diff --git a/gcc/ada/5fosinte.ads b/gcc/ada/s-osinte-irix.ads
index 92c1107..92c1107 100644
--- a/gcc/ada/5fosinte.ads
+++ b/gcc/ada/s-osinte-irix.ads
diff --git a/gcc/ada/5losinte.ads b/gcc/ada/s-osinte-linux-fsu.ads
index df7a432..df7a432 100644
--- a/gcc/ada/5losinte.ads
+++ b/gcc/ada/s-osinte-linux-fsu.ads
diff --git a/gcc/ada/55system.ads b/gcc/ada/s-osinte-linux-ia64.ads
index 72c51b0..72c51b0 100644
--- a/gcc/ada/55system.ads
+++ b/gcc/ada/s-osinte-linux-ia64.ads
diff --git a/gcc/ada/5iosinte.ads b/gcc/ada/s-osinte-linux.ads
index c8f0691..c8f0691 100644
--- a/gcc/ada/5iosinte.ads
+++ b/gcc/ada/s-osinte-linux.ads
diff --git a/gcc/ada/52osinte.adb b/gcc/ada/s-osinte-lynxos-3.adb
index 1566014..1566014 100644
--- a/gcc/ada/52osinte.adb
+++ b/gcc/ada/s-osinte-lynxos-3.adb
diff --git a/gcc/ada/52osinte.ads b/gcc/ada/s-osinte-lynxos-3.ads
index 71607a4..71607a4 100644
--- a/gcc/ada/52osinte.ads
+++ b/gcc/ada/s-osinte-lynxos-3.ads
diff --git a/gcc/ada/56osinte.adb b/gcc/ada/s-osinte-lynxos.adb
index 0cb0526..0cb0526 100644
--- a/gcc/ada/56osinte.adb
+++ b/gcc/ada/s-osinte-lynxos.adb
diff --git a/gcc/ada/56osinte.ads b/gcc/ada/s-osinte-lynxos.ads
index 8b6b338..8b6b338 100644
--- a/gcc/ada/56osinte.ads
+++ b/gcc/ada/s-osinte-lynxos.ads
diff --git a/gcc/ada/5wosinte.ads b/gcc/ada/s-osinte-mingw.ads
index eec2e6e..eec2e6e 100644
--- a/gcc/ada/5wosinte.ads
+++ b/gcc/ada/s-osinte-mingw.ads
diff --git a/gcc/ada/5oosinte.adb b/gcc/ada/s-osinte-os2.adb
index e2a2411..e2a2411 100644
--- a/gcc/ada/5oosinte.adb
+++ b/gcc/ada/s-osinte-os2.adb
diff --git a/gcc/ada/5oosinte.ads b/gcc/ada/s-osinte-os2.ads
index 4ddd2d0..4ddd2d0 100644
--- a/gcc/ada/5oosinte.ads
+++ b/gcc/ada/s-osinte-os2.ads
diff --git a/gcc/ada/5iosinte.adb b/gcc/ada/s-osinte-posix.adb
index 36c082c..36c082c 100644
--- a/gcc/ada/5iosinte.adb
+++ b/gcc/ada/s-osinte-posix.adb
diff --git a/gcc/ada/5tosinte.ads b/gcc/ada/s-osinte-solaris-fsu.ads
index 14caf4e..14caf4e 100644
--- a/gcc/ada/5tosinte.ads
+++ b/gcc/ada/s-osinte-solaris-fsu.ads
diff --git a/gcc/ada/54osinte.ads b/gcc/ada/s-osinte-solaris-posix.ads
index b5ad0af..b5ad0af 100644
--- a/gcc/ada/54osinte.ads
+++ b/gcc/ada/s-osinte-solaris-posix.ads
diff --git a/gcc/ada/5sosinte.adb b/gcc/ada/s-osinte-solaris.adb
index 299625d..299625d 100644
--- a/gcc/ada/5sosinte.adb
+++ b/gcc/ada/s-osinte-solaris.adb
diff --git a/gcc/ada/5sosinte.ads b/gcc/ada/s-osinte-solaris.ads
index b575463..b575463 100644
--- a/gcc/ada/5sosinte.ads
+++ b/gcc/ada/s-osinte-solaris.ads
diff --git a/gcc/ada/5aosinte.adb b/gcc/ada/s-osinte-tru64.adb
index e0b683e..e0b683e 100644
--- a/gcc/ada/5aosinte.adb
+++ b/gcc/ada/s-osinte-tru64.adb
diff --git a/gcc/ada/5aosinte.ads b/gcc/ada/s-osinte-tru64.ads
index dc01b05..dc01b05 100644
--- a/gcc/ada/5aosinte.ads
+++ b/gcc/ada/s-osinte-tru64.ads
diff --git a/gcc/ada/51osinte.adb b/gcc/ada/s-osinte-unixware.adb
index 9916e88..9916e88 100644
--- a/gcc/ada/51osinte.adb
+++ b/gcc/ada/s-osinte-unixware.adb
diff --git a/gcc/ada/51osinte.ads b/gcc/ada/s-osinte-unixware.ads
index efc55eb..efc55eb 100644
--- a/gcc/ada/51osinte.ads
+++ b/gcc/ada/s-osinte-unixware.ads
diff --git a/gcc/ada/5vosinte.adb b/gcc/ada/s-osinte-vms.adb
index 0b806da..0b806da 100644
--- a/gcc/ada/5vosinte.adb
+++ b/gcc/ada/s-osinte-vms.adb
diff --git a/gcc/ada/5vosinte.ads b/gcc/ada/s-osinte-vms.ads
index 333e02a..333e02a 100644
--- a/gcc/ada/5vosinte.ads
+++ b/gcc/ada/s-osinte-vms.ads
diff --git a/gcc/ada/5zosinte.adb b/gcc/ada/s-osinte-vxworks.adb
index 7c665e7..7c665e7 100644
--- a/gcc/ada/5zosinte.adb
+++ b/gcc/ada/s-osinte-vxworks.adb
diff --git a/gcc/ada/5zosinte.ads b/gcc/ada/s-osinte-vxworks.ads
index 7888cc1..7888cc1 100644
--- a/gcc/ada/5zosinte.ads
+++ b/gcc/ada/s-osinte-vxworks.ads
diff --git a/gcc/ada/5wosprim.adb b/gcc/ada/s-osprim-mingw.adb
index 07a8ca7..07a8ca7 100644
--- a/gcc/ada/5wosprim.adb
+++ b/gcc/ada/s-osprim-mingw.adb
diff --git a/gcc/ada/5oosprim.adb b/gcc/ada/s-osprim-os2.adb
index 42e414c..42e414c 100644
--- a/gcc/ada/5oosprim.adb
+++ b/gcc/ada/s-osprim-os2.adb
diff --git a/gcc/ada/7sosprim.adb b/gcc/ada/s-osprim-posix.adb
index c4a7a11..c4a7a11 100644
--- a/gcc/ada/7sosprim.adb
+++ b/gcc/ada/s-osprim-posix.adb
diff --git a/gcc/ada/5sosprim.adb b/gcc/ada/s-osprim-solaris.adb
index b6d529d..b6d529d 100644
--- a/gcc/ada/5sosprim.adb
+++ b/gcc/ada/s-osprim-solaris.adb
diff --git a/gcc/ada/5posprim.adb b/gcc/ada/s-osprim-unix.adb
index ed8a6f4..ed8a6f4 100644
--- a/gcc/ada/5posprim.adb
+++ b/gcc/ada/s-osprim-unix.adb
diff --git a/gcc/ada/5vosprim.adb b/gcc/ada/s-osprim-vms.adb
index c49c861..c49c861 100644
--- a/gcc/ada/5vosprim.adb
+++ b/gcc/ada/s-osprim-vms.adb
diff --git a/gcc/ada/5vosprim.ads b/gcc/ada/s-osprim-vms.ads
index a777bea..a777bea 100644
--- a/gcc/ada/5vosprim.ads
+++ b/gcc/ada/s-osprim-vms.ads
diff --git a/gcc/ada/5zosprim.adb b/gcc/ada/s-osprim-vxworks.adb
index 0f32bbe..0f32bbe 100644
--- a/gcc/ada/5zosprim.adb
+++ b/gcc/ada/s-osprim-vxworks.adb
diff --git a/gcc/ada/5yparame.ads b/gcc/ada/s-parame-ae653.ads
index af397c2..af397c2 100644
--- a/gcc/ada/5yparame.ads
+++ b/gcc/ada/s-parame-ae653.ads
diff --git a/gcc/ada/5hparame.ads b/gcc/ada/s-parame-hpux.ads
index 8be952a..8be952a 100644
--- a/gcc/ada/5hparame.ads
+++ b/gcc/ada/s-parame-hpux.ads
diff --git a/gcc/ada/5lparame.adb b/gcc/ada/s-parame-linux.adb
index 9b17c15..9b17c15 100644
--- a/gcc/ada/5lparame.adb
+++ b/gcc/ada/s-parame-linux.adb
diff --git a/gcc/ada/5oparame.adb b/gcc/ada/s-parame-os2.adb
index 1ae7463..1ae7463 100644
--- a/gcc/ada/5oparame.adb
+++ b/gcc/ada/s-parame-os2.adb
diff --git a/gcc/ada/5sparame.adb b/gcc/ada/s-parame-solaris.adb
index 847dda8..847dda8 100644
--- a/gcc/ada/5sparame.adb
+++ b/gcc/ada/s-parame-solaris.adb
diff --git a/gcc/ada/5xparame.ads b/gcc/ada/s-parame-vms-restrict.ads
index d1d4818..d1d4818 100644
--- a/gcc/ada/5xparame.ads
+++ b/gcc/ada/s-parame-vms-restrict.ads
diff --git a/gcc/ada/5vparame.ads b/gcc/ada/s-parame-vms.ads
index 5b41ab7..5b41ab7 100644
--- a/gcc/ada/5vparame.ads
+++ b/gcc/ada/s-parame-vms.ads
diff --git a/gcc/ada/5zparame.ads b/gcc/ada/s-parame-vxworks.ads
index 774280f..774280f 100644
--- a/gcc/ada/5zparame.ads
+++ b/gcc/ada/s-parame-vxworks.ads
diff --git a/gcc/ada/5gproinf.adb b/gcc/ada/s-proinf-irix-athread.adb
index 3e6bbc9..3e6bbc9 100644
--- a/gcc/ada/5gproinf.adb
+++ b/gcc/ada/s-proinf-irix-athread.adb
diff --git a/gcc/ada/5gproinf.ads b/gcc/ada/s-proinf-irix-athread.ads
index a4259c3..a4259c3 100644
--- a/gcc/ada/5gproinf.ads
+++ b/gcc/ada/s-proinf-irix-athread.ads
diff --git a/gcc/ada/5zstchop.adb b/gcc/ada/s-stchop-vxworks.adb
index b19bb56..b19bb56 100644
--- a/gcc/ada/5zstchop.adb
+++ b/gcc/ada/s-stchop-vxworks.adb
diff --git a/gcc/ada/5ntaprop.adb b/gcc/ada/s-taprop-dummy.adb
index 365b0d9..365b0d9 100644
--- a/gcc/ada/5ntaprop.adb
+++ b/gcc/ada/s-taprop-dummy.adb
diff --git a/gcc/ada/5htaprop.adb b/gcc/ada/s-taprop-hpux-dce.adb
index 1aaf3c2..1aaf3c2 100644
--- a/gcc/ada/5htaprop.adb
+++ b/gcc/ada/s-taprop-hpux-dce.adb
diff --git a/gcc/ada/5gtaprop.adb b/gcc/ada/s-taprop-irix-athread.adb
index 3c70a34..3c70a34 100644
--- a/gcc/ada/5gtaprop.adb
+++ b/gcc/ada/s-taprop-irix-athread.adb
diff --git a/gcc/ada/5ftaprop.adb b/gcc/ada/s-taprop-irix.adb
index 6eb6e2a..6eb6e2a 100644
--- a/gcc/ada/5ftaprop.adb
+++ b/gcc/ada/s-taprop-irix.adb
diff --git a/gcc/ada/5itaprop.adb b/gcc/ada/s-taprop-linux.adb
index 6ab670f..6ab670f 100644
--- a/gcc/ada/5itaprop.adb
+++ b/gcc/ada/s-taprop-linux.adb
diff --git a/gcc/ada/56taprop.adb b/gcc/ada/s-taprop-lynxos.adb
index 6276d7f..6276d7f 100644
--- a/gcc/ada/56taprop.adb
+++ b/gcc/ada/s-taprop-lynxos.adb
diff --git a/gcc/ada/5wtaprop.adb b/gcc/ada/s-taprop-mingw.adb
index 1e24de0..1e24de0 100644
--- a/gcc/ada/5wtaprop.adb
+++ b/gcc/ada/s-taprop-mingw.adb
diff --git a/gcc/ada/5otaprop.adb b/gcc/ada/s-taprop-os2.adb
index 924f477..924f477 100644
--- a/gcc/ada/5otaprop.adb
+++ b/gcc/ada/s-taprop-os2.adb
diff --git a/gcc/ada/7staprop.adb b/gcc/ada/s-taprop-posix.adb
index f5bc617..f5bc617 100644
--- a/gcc/ada/7staprop.adb
+++ b/gcc/ada/s-taprop-posix.adb
diff --git a/gcc/ada/5staprop.adb b/gcc/ada/s-taprop-solaris.adb
index a264b02..a264b02 100644
--- a/gcc/ada/5staprop.adb
+++ b/gcc/ada/s-taprop-solaris.adb
diff --git a/gcc/ada/5ataprop.adb b/gcc/ada/s-taprop-tru64.adb
index 1fa1c22..1fa1c22 100644
--- a/gcc/ada/5ataprop.adb
+++ b/gcc/ada/s-taprop-tru64.adb
diff --git a/gcc/ada/5vtaprop.adb b/gcc/ada/s-taprop-vms.adb
index 5a7739d..5a7739d 100644
--- a/gcc/ada/5vtaprop.adb
+++ b/gcc/ada/s-taprop-vms.adb
diff --git a/gcc/ada/5ztaprop.adb b/gcc/ada/s-taprop-vxworks.adb
index 8bbbf0e..8bbbf0e 100644
--- a/gcc/ada/5ztaprop.adb
+++ b/gcc/ada/s-taprop-vxworks.adb
diff --git a/gcc/ada/5gtasinf.adb b/gcc/ada/s-tasinf-irix-athread.adb
index 5413ebf..5413ebf 100644
--- a/gcc/ada/5gtasinf.adb
+++ b/gcc/ada/s-tasinf-irix-athread.adb
diff --git a/gcc/ada/5gtasinf.ads b/gcc/ada/s-tasinf-irix-athread.ads
index f986bf9..f986bf9 100644
--- a/gcc/ada/5gtasinf.ads
+++ b/gcc/ada/s-tasinf-irix-athread.ads
diff --git a/gcc/ada/5ftasinf.ads b/gcc/ada/s-tasinf-irix.ads
index 2954f8e..2954f8e 100644
--- a/gcc/ada/5ftasinf.ads
+++ b/gcc/ada/s-tasinf-irix.ads
diff --git a/gcc/ada/5stasinf.adb b/gcc/ada/s-tasinf-solaris.adb
index 859bcd0..859bcd0 100644
--- a/gcc/ada/5stasinf.adb
+++ b/gcc/ada/s-tasinf-solaris.adb
diff --git a/gcc/ada/5stasinf.ads b/gcc/ada/s-tasinf-solaris.ads
index ded456e..ded456e 100644
--- a/gcc/ada/5stasinf.ads
+++ b/gcc/ada/s-tasinf-solaris.ads
diff --git a/gcc/ada/5atasinf.ads b/gcc/ada/s-tasinf-tru64.ads
index 179f469..179f469 100644
--- a/gcc/ada/5atasinf.ads
+++ b/gcc/ada/s-tasinf-tru64.ads
diff --git a/gcc/ada/5ntaspri.ads b/gcc/ada/s-taspri-dummy.ads
index 6e6025c..6e6025c 100644
--- a/gcc/ada/5ntaspri.ads
+++ b/gcc/ada/s-taspri-dummy.ads
diff --git a/gcc/ada/5htaspri.ads b/gcc/ada/s-taspri-hpux-dce.ads
index 4f422c2..4f422c2 100644
--- a/gcc/ada/5htaspri.ads
+++ b/gcc/ada/s-taspri-hpux-dce.ads
diff --git a/gcc/ada/5itaspri.ads b/gcc/ada/s-taspri-linux.ads
index 078ef3e..078ef3e 100644
--- a/gcc/ada/5itaspri.ads
+++ b/gcc/ada/s-taspri-linux.ads
diff --git a/gcc/ada/56taspri.ads b/gcc/ada/s-taspri-lynxos.ads
index bf079fd..bf079fd 100644
--- a/gcc/ada/56taspri.ads
+++ b/gcc/ada/s-taspri-lynxos.ads
diff --git a/gcc/ada/5wtaspri.ads b/gcc/ada/s-taspri-mingw.ads
index 01cde2c..01cde2c 100644
--- a/gcc/ada/5wtaspri.ads
+++ b/gcc/ada/s-taspri-mingw.ads
diff --git a/gcc/ada/5otaspri.ads b/gcc/ada/s-taspri-os2.ads
index cb5b029..cb5b029 100644
--- a/gcc/ada/5otaspri.ads
+++ b/gcc/ada/s-taspri-os2.ads
diff --git a/gcc/ada/7staspri.ads b/gcc/ada/s-taspri-posix.ads
index 1717cce..1717cce 100644
--- a/gcc/ada/7staspri.ads
+++ b/gcc/ada/s-taspri-posix.ads
diff --git a/gcc/ada/5staspri.ads b/gcc/ada/s-taspri-solaris.ads
index 335079b..335079b 100644
--- a/gcc/ada/5staspri.ads
+++ b/gcc/ada/s-taspri-solaris.ads
diff --git a/gcc/ada/5ataspri.ads b/gcc/ada/s-taspri-tru64.ads
index 2caf54b..2caf54b 100644
--- a/gcc/ada/5ataspri.ads
+++ b/gcc/ada/s-taspri-tru64.ads
diff --git a/gcc/ada/5vtaspri.ads b/gcc/ada/s-taspri-vms.ads
index 0917932..0917932 100644
--- a/gcc/ada/5vtaspri.ads
+++ b/gcc/ada/s-taspri-vms.ads
diff --git a/gcc/ada/5ztaspri.ads b/gcc/ada/s-taspri-vxworks.ads
index efd41cc..efd41cc 100644
--- a/gcc/ada/5ztaspri.ads
+++ b/gcc/ada/s-taspri-vxworks.ads
diff --git a/gcc/ada/7stfsetr.adb b/gcc/ada/s-tfsetr-default.adb
index a8e166d..a8e166d 100644
--- a/gcc/ada/7stfsetr.adb
+++ b/gcc/ada/s-tfsetr-default.adb
diff --git a/gcc/ada/5ztfsetr.adb b/gcc/ada/s-tfsetr-vxworks.adb
index 0cd3d1b..0cd3d1b 100644
--- a/gcc/ada/5ztfsetr.adb
+++ b/gcc/ada/s-tfsetr-vxworks.adb
diff --git a/gcc/ada/5vtpopde.adb b/gcc/ada/s-tpopde-vms.adb
index 89db824..89db824 100644
--- a/gcc/ada/5vtpopde.adb
+++ b/gcc/ada/s-tpopde-vms.adb
diff --git a/gcc/ada/5vtpopde.ads b/gcc/ada/s-tpopde-vms.ads
index 46d9247..46d9247 100644
--- a/gcc/ada/5vtpopde.ads
+++ b/gcc/ada/s-tpopde-vms.ads
diff --git a/gcc/ada/56tpopsp.adb b/gcc/ada/s-tpopsp-lynxos.adb
index 2673d0e..2673d0e 100644
--- a/gcc/ada/56tpopsp.adb
+++ b/gcc/ada/s-tpopsp-lynxos.adb
diff --git a/gcc/ada/5atpopsp.adb b/gcc/ada/s-tpopsp-posix-foreign.adb
index c1c0815..c1c0815 100644
--- a/gcc/ada/5atpopsp.adb
+++ b/gcc/ada/s-tpopsp-posix-foreign.adb
diff --git a/gcc/ada/7stpopsp.adb b/gcc/ada/s-tpopsp-posix.adb
index f7a67a0..f7a67a0 100644
--- a/gcc/ada/7stpopsp.adb
+++ b/gcc/ada/s-tpopsp-posix.adb
diff --git a/gcc/ada/5stpopsp.adb b/gcc/ada/s-tpopsp-solaris.adb
index eb32dd2..eb32dd2 100644
--- a/gcc/ada/5stpopsp.adb
+++ b/gcc/ada/s-tpopsp-solaris.adb
diff --git a/gcc/ada/5ztpopsp.adb b/gcc/ada/s-tpopsp-vxworks.adb
index 0298328..0298328 100644
--- a/gcc/ada/5ztpopsp.adb
+++ b/gcc/ada/s-tpopsp-vxworks.adb
diff --git a/gcc/ada/5htraceb.adb b/gcc/ada/s-traceb-hpux.adb
index dce251a..dce251a 100644
--- a/gcc/ada/5htraceb.adb
+++ b/gcc/ada/s-traceb-hpux.adb
diff --git a/gcc/ada/7straceb.adb b/gcc/ada/s-traceb-mastop.adb
index 1811c5a..1811c5a 100644
--- a/gcc/ada/7straceb.adb
+++ b/gcc/ada/s-traceb-mastop.adb
diff --git a/gcc/ada/7straces.adb b/gcc/ada/s-traces-default.adb
index 4682224..4682224 100644
--- a/gcc/ada/7straces.adb
+++ b/gcc/ada/s-traces-default.adb
diff --git a/gcc/ada/5vtraent.adb b/gcc/ada/s-traent-vms.adb
index 532acad..532acad 100644
--- a/gcc/ada/5vtraent.adb
+++ b/gcc/ada/s-traent-vms.adb
diff --git a/gcc/ada/5vtraent.ads b/gcc/ada/s-traent-vms.ads
index 0d27c19..0d27c19 100644
--- a/gcc/ada/5vtraent.ads
+++ b/gcc/ada/s-traent-vms.ads
diff --git a/gcc/ada/7strafor.adb b/gcc/ada/s-trafor-default.adb
index 8aa5644..8aa5644 100644
--- a/gcc/ada/7strafor.adb
+++ b/gcc/ada/s-trafor-default.adb
diff --git a/gcc/ada/7strafor.ads b/gcc/ada/s-trafor-default.ads
index fe232be..fe232be 100644
--- a/gcc/ada/7strafor.ads
+++ b/gcc/ada/s-trafor-default.ads
diff --git a/gcc/ada/7stratas.adb b/gcc/ada/s-tratas-default.adb
index 0e18aed..0e18aed 100644
--- a/gcc/ada/7stratas.adb
+++ b/gcc/ada/s-tratas-default.adb
diff --git a/gcc/ada/5vvaflop.adb b/gcc/ada/s-vaflop-vms.adb
index 8b1bf03..8b1bf03 100644
--- a/gcc/ada/5vvaflop.adb
+++ b/gcc/ada/s-vaflop-vms.adb
diff --git a/gcc/ada/5avxwork.ads b/gcc/ada/s-vxwork-alpha.ads
index 6d5e424..6d5e424 100644
--- a/gcc/ada/5avxwork.ads
+++ b/gcc/ada/s-vxwork-alpha.ads
diff --git a/gcc/ada/5kvxwork.ads b/gcc/ada/s-vxwork-m68k.ads
index a0f10be..a0f10be 100644
--- a/gcc/ada/5kvxwork.ads
+++ b/gcc/ada/s-vxwork-m68k.ads
diff --git a/gcc/ada/5mvxwork.ads b/gcc/ada/s-vxwork-mips.ads
index 2e31d72..2e31d72 100644
--- a/gcc/ada/5mvxwork.ads
+++ b/gcc/ada/s-vxwork-mips.ads
diff --git a/gcc/ada/5pvxwork.ads b/gcc/ada/s-vxwork-ppc.ads
index 1711868..1711868 100644
--- a/gcc/ada/5pvxwork.ads
+++ b/gcc/ada/s-vxwork-ppc.ads
diff --git a/gcc/ada/5svxwork.ads b/gcc/ada/s-vxwork-sparcv9.ads
index 4fc9fd1..4fc9fd1 100644
--- a/gcc/ada/5svxwork.ads
+++ b/gcc/ada/s-vxwork-sparcv9.ads
diff --git a/gcc/ada/5xvxwork.ads b/gcc/ada/s-vxwork-xscale.ads
index 4183ee6..4183ee6 100644
--- a/gcc/ada/5xvxwork.ads
+++ b/gcc/ada/s-vxwork-xscale.ads
diff --git a/gcc/ada/5vsymbol.adb b/gcc/ada/symbols-vms.adb
index c623e42..c623e42 100644
--- a/gcc/ada/5vsymbol.adb
+++ b/gcc/ada/symbols-vms.adb
diff --git a/gcc/ada/5bsystem.ads b/gcc/ada/system-aix.ads
index fa28445..fa28445 100644
--- a/gcc/ada/5bsystem.ads
+++ b/gcc/ada/system-aix.ads
diff --git a/gcc/ada/56system.ads b/gcc/ada/system-freebsd-x86.ads
index a7371a2..a7371a2 100644
--- a/gcc/ada/56system.ads
+++ b/gcc/ada/system-freebsd-x86.ads
diff --git a/gcc/ada/5hsystem.ads b/gcc/ada/system-hpux.ads
index 43e22cb..3b971a5 100644
--- a/gcc/ada/5hsystem.ads
+++ b/gcc/ada/system-hpux.ads
@@ -138,7 +138,7 @@ private
    Support_Long_Shifts       : constant Boolean := True;
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
-   ZCX_By_Default            : constant Boolean := False;
+   ZCX_By_Default            : constant Boolean := True;
    GCC_ZCX_Support           : constant Boolean := True;
    Front_End_ZCX_Support     : constant Boolean := False;
 
diff --git a/gcc/ada/5psystem.ads b/gcc/ada/system-interix.ads
index 1105829..1105829 100644
--- a/gcc/ada/5psystem.ads
+++ b/gcc/ada/system-interix.ads
diff --git a/gcc/ada/5gsystem.ads b/gcc/ada/system-irix-n32.ads
index 2a2c5f4..398a355 100644
--- a/gcc/ada/5gsystem.ads
+++ b/gcc/ada/system-irix-n32.ads
@@ -7,7 +7,7 @@
 --                                 S p e c                                  --
 --                           (SGI Irix, n32 ABI)                            --
 --                                                                          --
---          Copyright (C) 1992-2003 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2004 Free Software Foundation, Inc.          --
 --                                                                          --
 -- This specification is derived from the Ada Reference Manual for use with --
 -- GNAT. The copyright notice above, and the license provisions that follow --
@@ -138,8 +138,8 @@ private
    Support_Long_Shifts       : constant Boolean := True;
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
-   ZCX_By_Default            : constant Boolean := False;
-   GCC_ZCX_Support           : constant Boolean := False;
+   ZCX_By_Default            : constant Boolean := True;
+   GCC_ZCX_Support           : constant Boolean := True;
    Front_End_ZCX_Support     : constant Boolean := False;
 
    --  Obsolete entries, to be removed eventually (bootstrap issues!)
diff --git a/gcc/ada/5fsystem.ads b/gcc/ada/system-irix-o32.ads
index 165a878..7ccbe6c 100644
--- a/gcc/ada/5fsystem.ads
+++ b/gcc/ada/system-irix-o32.ads
@@ -138,8 +138,8 @@ private
    Support_Long_Shifts       : constant Boolean := True;
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
-   ZCX_By_Default            : constant Boolean := False;
-   GCC_ZCX_Support           : constant Boolean := False;
+   ZCX_By_Default            : constant Boolean := True;
+   GCC_ZCX_Support           : constant Boolean := True;
    Front_End_ZCX_Support     : constant Boolean := False;
 
    --  Obsolete entries, to be removed eventually (bootstrap issues!)
diff --git a/gcc/ada/5lsystem.ads b/gcc/ada/system-linux-x86.ads
index 8bcf780..8bcf780 100644
--- a/gcc/ada/5lsystem.ads
+++ b/gcc/ada/system-linux-x86.ads
diff --git a/gcc/ada/5nsystem.ads b/gcc/ada/system-linux-x86_64.ads
index 37a495d..37a495d 100644
--- a/gcc/ada/5nsystem.ads
+++ b/gcc/ada/system-linux-x86_64.ads
diff --git a/gcc/ada/57system.ads b/gcc/ada/system-lynxos-ppc.ads
index caeae17..caeae17 100644
--- a/gcc/ada/57system.ads
+++ b/gcc/ada/system-lynxos-ppc.ads
diff --git a/gcc/ada/58system.ads b/gcc/ada/system-lynxos-x86.ads
index 130b5f0..130b5f0 100644
--- a/gcc/ada/58system.ads
+++ b/gcc/ada/system-lynxos-x86.ads
diff --git a/gcc/ada/5wsystem.ads b/gcc/ada/system-mingw.ads
index 2a7496a..9316644 100644
--- a/gcc/ada/5wsystem.ads
+++ b/gcc/ada/system-mingw.ads
@@ -139,7 +139,7 @@ private
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := False;
-   GCC_ZCX_Support           : constant Boolean := False;
+   GCC_ZCX_Support           : constant Boolean := True;
    Front_End_ZCX_Support     : constant Boolean := False;
 
    --  Obsolete entries, to be removed eventually (bootstrap issues!)
diff --git a/gcc/ada/5osystem.ads b/gcc/ada/system-os2.ads
index 17acb5b..17acb5b 100644
--- a/gcc/ada/5osystem.ads
+++ b/gcc/ada/system-os2.ads
diff --git a/gcc/ada/5ssystem.ads b/gcc/ada/system-solaris-sparc.ads
index 80621a7..80621a7 100644
--- a/gcc/ada/5ssystem.ads
+++ b/gcc/ada/system-solaris-sparc.ads
diff --git a/gcc/ada/5usystem.ads b/gcc/ada/system-solaris-sparcv9.ads
index dca552e..dca552e 100644
--- a/gcc/ada/5usystem.ads
+++ b/gcc/ada/system-solaris-sparcv9.ads
diff --git a/gcc/ada/5esystem.ads b/gcc/ada/system-solaris-x86.ads
index d48b684..d48b684 100644
--- a/gcc/ada/5esystem.ads
+++ b/gcc/ada/system-solaris-x86.ads
diff --git a/gcc/ada/5asystem.ads b/gcc/ada/system-tru64.ads
index f0067b3..f0067b3 100644
--- a/gcc/ada/5asystem.ads
+++ b/gcc/ada/system-tru64.ads
diff --git a/gcc/ada/51system.ads b/gcc/ada/system-unixware.ads
index 01404ee..01404ee 100644
--- a/gcc/ada/51system.ads
+++ b/gcc/ada/system-unixware.ads
diff --git a/gcc/ada/5xsystem.ads b/gcc/ada/system-vms-zcx.ads
index 3ba5e69..3ba5e69 100644
--- a/gcc/ada/5xsystem.ads
+++ b/gcc/ada/system-vms-zcx.ads
diff --git a/gcc/ada/5vsystem.ads b/gcc/ada/system-vms.ads
index fc4fb2e..fc4fb2e 100644
--- a/gcc/ada/5vsystem.ads
+++ b/gcc/ada/system-vms.ads
diff --git a/gcc/ada/5zsystem.ads b/gcc/ada/system-vxworks-alpha.ads
index 12bbec4..12bbec4 100644
--- a/gcc/ada/5zsystem.ads
+++ b/gcc/ada/system-vxworks-alpha.ads
diff --git a/gcc/ada/5ksystem.ads b/gcc/ada/system-vxworks-m68k.ads
index 3e1e3cf..3e1e3cf 100644
--- a/gcc/ada/5ksystem.ads
+++ b/gcc/ada/system-vxworks-m68k.ads
diff --git a/gcc/ada/5msystem.ads b/gcc/ada/system-vxworks-mips.ads
index 19c96d0..19c96d0 100644
--- a/gcc/ada/5msystem.ads
+++ b/gcc/ada/system-vxworks-mips.ads
diff --git a/gcc/ada/5ysystem.ads b/gcc/ada/system-vxworks-ppc.ads
index 69602c8..bcb415c 100644
--- a/gcc/ada/5ysystem.ads
+++ b/gcc/ada/system-vxworks-ppc.ads
@@ -7,7 +7,7 @@
 --                                 S p e c                                  --
 --                          (VxWorks Version PPC)                           --
 --                                                                          --
---          Copyright (C) 1992-2003 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2004 Free Software Foundation, Inc.          --
 --                                                                          --
 -- This specification is derived from the Ada Reference Manual for use with --
 -- GNAT. The copyright notice above, and the license provisions that follow --
@@ -147,7 +147,7 @@ private
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := True;
    ZCX_By_Default            : constant Boolean := False;
-   GCC_ZCX_Support           : constant Boolean := False;
+   GCC_ZCX_Support           : constant Boolean := True;
    Front_End_ZCX_Support     : constant Boolean := False;
 
    --  Obsolete entries, to be removed eventually (bootstrap issues!)
diff --git a/gcc/ada/5csystem.ads b/gcc/ada/system-vxworks-sparcv9.ads
index 8ddf3b0..8ddf3b0 100644
--- a/gcc/ada/5csystem.ads
+++ b/gcc/ada/system-vxworks-sparcv9.ads
diff --git a/gcc/ada/5dsystem.ads b/gcc/ada/system-vxworks-xscale.ads
index 1fa021d..1fa021d 100644
--- a/gcc/ada/5dsystem.ads
+++ b/gcc/ada/system-vxworks-xscale.ads