Index: gnat1drv.adb
===================================================================
--- gnat1drv.adb	(revision 178181)
+++ gnat1drv.adb	(working copy)
@@ -324,11 +324,7 @@
       --  Set and check exception mechanism
 
       if Targparm.ZCX_By_Default_On_Target then
-         if Targparm.GCC_ZCX_Support_On_Target then
-            Exception_Mechanism := Back_End_Exceptions;
-         else
-            Osint.Fail ("Zero Cost Exceptions not supported on this target");
-         end if;
+         Exception_Mechanism := Back_End_Exceptions;
       end if;
 
       --  Set proper status for overflow checks. We turn on overflow checks if
Index: opt.ads
===================================================================
--- opt.ads	(revision 178163)
+++ opt.ads	(working copy)
@@ -537,8 +537,8 @@
                            Front_End_Setjmp_Longjmp_Exceptions;
    --  GNAT
    --  Set to the appropriate value depending on the default as given in
-   --  system.ads (ZCX_By_Default, GCC_ZCX_Support). The C convention is there
-   --  to make this variable accessible to gigi.
+   --  system.ads (ZCX_By_Default). The C convention is there to make this
+   --  variable accessible to gigi.
 
    Exception_Tracebacks : Boolean := False;
    --  GNATBIND
Index: s-taprop-irix.adb
===================================================================
--- s-taprop-irix.adb	(revision 178155)
+++ s-taprop-irix.adb	(working copy)
@@ -164,7 +164,7 @@
       --  cases (e.g. shutdown of the Server_Task in System.Interrupts) we
       --  need to send the Abort signal to a task.
 
-      if ZCX_By_Default and then GCC_ZCX_Support then
+      if ZCX_By_Default then
          return;
       end if;
 
Index: s-taprop-linux.adb
===================================================================
--- s-taprop-linux.adb	(revision 178155)
+++ s-taprop-linux.adb	(working copy)
@@ -178,7 +178,7 @@
       --  cases (e.g. shutdown of the Server_Task in System.Interrupts) we
       --  need to send the Abort signal to a task.
 
-      if ZCX_By_Default and then GCC_ZCX_Support then
+      if ZCX_By_Default then
          return;
       end if;
 
Index: s-taprop-posix.adb
===================================================================
--- s-taprop-posix.adb	(revision 178155)
+++ s-taprop-posix.adb	(working copy)
@@ -203,7 +203,7 @@
       --  cases (e.g. shutdown of the Server_Task in System.Interrupts) we
       --  need to send the Abort signal to a task.
 
-      if ZCX_By_Default and then GCC_ZCX_Support then
+      if ZCX_By_Default then
          return;
       end if;
 
Index: s-taprop-solaris.adb
===================================================================
--- s-taprop-solaris.adb	(revision 178155)
+++ s-taprop-solaris.adb	(working copy)
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                  B o d y                                 --
 --                                                                          --
---         Copyright (C) 1992-2010, Free Software Foundation, Inc.          --
+--         Copyright (C) 1992-2011, Free Software Foundation, Inc.          --
 --                                                                          --
 -- 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- --
@@ -265,7 +265,7 @@
       --  cases (e.g. shutdown of the Server_Task in System.Interrupts) we
       --  need to send the Abort signal to a task.
 
-      if ZCX_By_Default and then GCC_ZCX_Support then
+      if ZCX_By_Default then
          return;
       end if;
 
Index: s-taprop-tru64.adb
===================================================================
--- s-taprop-tru64.adb	(revision 178155)
+++ s-taprop-tru64.adb	(working copy)
@@ -167,7 +167,7 @@
       --  cases (e.g. shutdown of the Server_Task in System.Interrupts) we
       --  need to send the Abort signal to a task.
 
-      if ZCX_By_Default and then GCC_ZCX_Support then
+      if ZCX_By_Default then
          return;
       end if;
 
Index: s-taprop-vxworks.adb
===================================================================
--- s-taprop-vxworks.adb	(revision 178155)
+++ s-taprop-vxworks.adb	(working copy)
@@ -188,7 +188,7 @@
       --  It is not safe to raise an exception when using ZCX and the GCC
       --  exception handling mechanism.
 
-      if ZCX_By_Default and then GCC_ZCX_Support then
+      if ZCX_By_Default then
          return;
       end if;
 
Index: system.ads
===================================================================
--- system.ads	(revision 178165)
+++ system.ads	(working copy)
@@ -162,7 +162,6 @@
    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;
 
    --  Obsolete entries, to be removed eventually (bootstrap issues!)
 
@@ -171,5 +170,6 @@
    Long_Shifts_Inlined       : constant Boolean := True;
    Functions_Return_By_DSP   : constant Boolean := False;
    Support_64_Bit_Divides    : constant Boolean := True;
+   GCC_ZCX_Support           : constant Boolean := False;
 
 end System;
Index: system-aix64.ads
===================================================================
--- system-aix64.ads	(revision 178163)
+++ system-aix64.ads	(working copy)
@@ -149,6 +149,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-aix.ads
===================================================================
--- system-aix.ads	(revision 178163)
+++ system-aix.ads	(working copy)
@@ -149,6 +149,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-darwin-ppc.ads
===================================================================
--- system-darwin-ppc.ads	(revision 178163)
+++ system-darwin-ppc.ads	(working copy)
@@ -165,6 +165,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-darwin-x86_64.ads
===================================================================
--- system-darwin-x86_64.ads	(revision 178163)
+++ system-darwin-x86_64.ads	(working copy)
@@ -165,6 +165,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-darwin-x86.ads
===================================================================
--- system-darwin-x86.ads	(revision 178163)
+++ system-darwin-x86.ads	(working copy)
@@ -165,6 +165,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-freebsd-x86.ads
===================================================================
--- system-freebsd-x86.ads	(revision 178163)
+++ system-freebsd-x86.ads	(working copy)
@@ -139,6 +139,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-hpux.ads
===================================================================
--- system-hpux.ads	(revision 178163)
+++ system-hpux.ads	(working copy)
@@ -139,7 +139,6 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
    --------------------------
    -- Underlying Priorities --
Index: system-hpux-ia64.ads
===================================================================
--- system-hpux-ia64.ads	(revision 178163)
+++ system-hpux-ia64.ads	(working copy)
@@ -139,6 +139,5 @@
    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;
 
 end System;
Index: system-irix-n32.ads
===================================================================
--- system-irix-n32.ads	(revision 178163)
+++ system-irix-n32.ads	(working copy)
@@ -151,7 +151,6 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
    --  Note: Denorm is False because denormals are not supported on the
    --  R10000, and we want the code to be valid for this processor.
Index: system-irix-o32.ads
===================================================================
--- system-irix-o32.ads	(revision 178163)
+++ system-irix-o32.ads	(working copy)
@@ -139,7 +139,6 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
    --  Note: Denorm is False because denormals are not supported on the
    --  R10000, and we want the code to be valid for this processor.
Index: system-linux-alpha.ads
===================================================================
--- system-linux-alpha.ads	(revision 178163)
+++ system-linux-alpha.ads	(working copy)
@@ -137,6 +137,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-linux-hppa.ads
===================================================================
--- system-linux-hppa.ads	(revision 178163)
+++ system-linux-hppa.ads	(working copy)
@@ -139,6 +139,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-linux-ia64.ads
===================================================================
--- system-linux-ia64.ads	(revision 178163)
+++ system-linux-ia64.ads	(working copy)
@@ -147,6 +147,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-linux-ppc.ads
===================================================================
--- system-linux-ppc.ads	(revision 178163)
+++ system-linux-ppc.ads	(working copy)
@@ -147,6 +147,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-linux-s390.ads
===================================================================
--- system-linux-s390.ads	(revision 178163)
+++ system-linux-s390.ads	(working copy)
@@ -137,6 +137,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-linux-s390x.ads
===================================================================
--- system-linux-s390x.ads	(revision 178163)
+++ system-linux-s390x.ads	(working copy)
@@ -137,6 +137,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-linux-sh4.ads
===================================================================
--- system-linux-sh4.ads	(revision 178163)
+++ system-linux-sh4.ads	(working copy)
@@ -147,6 +147,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-linux-sparc.ads
===================================================================
--- system-linux-sparc.ads	(revision 178163)
+++ system-linux-sparc.ads	(working copy)
@@ -137,6 +137,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-linux-x86_64.ads
===================================================================
--- system-linux-x86_64.ads	(revision 178163)
+++ system-linux-x86_64.ads	(working copy)
@@ -147,6 +147,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-linux-x86.ads
===================================================================
--- system-linux-x86.ads	(revision 178163)
+++ system-linux-x86.ads	(working copy)
@@ -147,6 +147,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-lynxos-ppc.ads
===================================================================
--- system-lynxos-ppc.ads	(revision 178163)
+++ system-lynxos-ppc.ads	(working copy)
@@ -153,6 +153,5 @@
    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;
 
 end System;
Index: system-lynxos-x86.ads
===================================================================
--- system-lynxos-x86.ads	(revision 178163)
+++ system-lynxos-x86.ads	(working copy)
@@ -153,6 +153,5 @@
    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;
 
 end System;
Index: system-mingw.ads
===================================================================
--- system-mingw.ads	(revision 178163)
+++ system-mingw.ads	(working copy)
@@ -139,7 +139,6 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
    ---------------------------
    -- Underlying Priorities --
Index: system-mingw-x86_64.ads
===================================================================
--- system-mingw-x86_64.ads	(revision 178163)
+++ system-mingw-x86_64.ads	(working copy)
@@ -139,7 +139,6 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
    ---------------------------
    -- Underlying Priorities --
Index: system-solaris-sparc.ads
===================================================================
--- system-solaris-sparc.ads	(revision 178163)
+++ system-solaris-sparc.ads	(working copy)
@@ -139,6 +139,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-solaris-sparcv9.ads
===================================================================
--- system-solaris-sparcv9.ads	(revision 178163)
+++ system-solaris-sparcv9.ads	(working copy)
@@ -139,6 +139,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-solaris-x86_64.ads
===================================================================
--- system-solaris-x86_64.ads	(revision 178163)
+++ system-solaris-x86_64.ads	(working copy)
@@ -139,6 +139,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-solaris-x86.ads
===================================================================
--- system-solaris-x86.ads	(revision 178163)
+++ system-solaris-x86.ads	(working copy)
@@ -139,6 +139,5 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
 end System;
Index: system-tru64.ads
===================================================================
--- system-tru64.ads	(revision 178163)
+++ system-tru64.ads	(working copy)
@@ -139,7 +139,6 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
    --  Note: Denorm is False because denormals are only handled properly
    --  if the -mieee switch is set, and we do not require this usage.
Index: system-vms_64.ads
===================================================================
--- system-vms_64.ads	(revision 178163)
+++ system-vms_64.ads	(working copy)
@@ -157,7 +157,6 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
    --------------------------
    -- Underlying Priorities --
Index: system-vms-ia64.ads
===================================================================
--- system-vms-ia64.ads	(revision 178163)
+++ system-vms-ia64.ads	(working copy)
@@ -157,7 +157,6 @@
    Suppress_Standard_Library : constant Boolean := False;
    Use_Ada_Main_Program_Name : constant Boolean := False;
    ZCX_By_Default            : constant Boolean := True;
-   GCC_ZCX_Support           : constant Boolean := True;
 
    --------------------------
    -- Underlying Priorities --
Index: system-vxworks-arm.ads
===================================================================
--- system-vxworks-arm.ads	(revision 178163)
+++ system-vxworks-arm.ads	(working copy)
@@ -152,6 +152,5 @@
    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;
 
 end System;
Index: system-vxworks-m68k.ads
===================================================================
--- system-vxworks-m68k.ads	(revision 178163)
+++ system-vxworks-m68k.ads	(working copy)
@@ -152,6 +152,5 @@
    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;
 
 end System;
Index: system-vxworks-mips.ads
===================================================================
--- system-vxworks-mips.ads	(revision 178163)
+++ system-vxworks-mips.ads	(working copy)
@@ -152,6 +152,5 @@
    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;
 
 end System;
Index: system-vxworks-ppc.ads
===================================================================
--- system-vxworks-ppc.ads	(revision 178163)
+++ system-vxworks-ppc.ads	(working copy)
@@ -152,6 +152,5 @@
    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 := True;
 
 end System;
Index: system-vxworks-sparcv9.ads
===================================================================
--- system-vxworks-sparcv9.ads	(revision 178163)
+++ system-vxworks-sparcv9.ads	(working copy)
@@ -154,6 +154,5 @@
    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;
 
 end System;
Index: system-vxworks-x86.ads
===================================================================
--- system-vxworks-x86.ads	(revision 178163)
+++ system-vxworks-x86.ads	(working copy)
@@ -152,6 +152,5 @@
    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;
 
 end System;
Index: targparm.adb
===================================================================
--- targparm.adb	(revision 178163)
+++ targparm.adb	(working copy)
@@ -66,8 +66,7 @@
       SSL,  --   Suppress_Standard_Library
       UAM,  --   Use_Ada_Main_Program_Name
       VMS,  --   OpenVMS
-      ZCD,  --   ZCX_By_Default
-      ZCG); --   GCC_ZCX_Support
+      ZCD); --   ZCX_By_Default
 
    Targparm_Flags : array (Targparm_Tags) of Boolean := (others => False);
    --  Flag is set True if corresponding parameter is scanned
@@ -103,7 +102,6 @@
    UAM_Str : aliased constant Source_Buffer := "Use_Ada_Main_Program_Name";
    VMS_Str : aliased constant Source_Buffer := "OpenVMS";
    ZCD_Str : aliased constant Source_Buffer := "ZCX_By_Default";
-   ZCG_Str : aliased constant Source_Buffer := "GCC_ZCX_Support";
 
    --  The following defines a set of pointers to the above strings,
    --  indexed by the tag values.
@@ -138,8 +136,7 @@
       SSL_Str'Access,
       UAM_Str'Access,
       VMS_Str'Access,
-      ZCD_Str'Access,
-      ZCG_Str'Access);
+      ZCD_Str'Access);
 
    -----------------------
    -- Local Subprograms --
@@ -588,7 +585,6 @@
                      when UAM => Use_Ada_Main_Program_Name_On_Target := Result;
                      when VMS => OpenVMS_On_Target                   := Result;
                      when ZCD => ZCX_By_Default_On_Target            := Result;
-                     when ZCG => GCC_ZCX_Support_On_Target           := Result;
 
                      goto Line_Loop_Continue;
                   end case;
Index: targparm.ads
===================================================================
--- targparm.ads	(revision 178163)
+++ targparm.ads	(working copy)
@@ -308,9 +308,6 @@
    --  front-end setjmp/longjmp approach, and this is the default. If
    --  this variable is True, then GCC ZCX is used.
 
-   GCC_ZCX_Support_On_Target  : Boolean := False;
-   --  Indicates that the target supports GCC Exceptions
-
    ------------------------------------
    -- Run-Time Library Configuration --
    ------------------------------------
