diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2021-02-17 08:55:15 +0100 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-06-16 04:42:57 -0400 |
| commit | 6e96a5a503d7d927e4147bea873ac43d2f184b6f (patch) | |
| tree | e1b6232d7e0fcb14473eae440ae092bc0cec42fc /gcc | |
| parent | 4e56b1347687a33efa47d13d357ae3b7ab759c99 (diff) | |
| download | gcc-6e96a5a503d7d927e4147bea873ac43d2f184b6f.zip gcc-6e96a5a503d7d927e4147bea873ac43d2f184b6f.tar.gz gcc-6e96a5a503d7d927e4147bea873ac43d2f184b6f.tar.bz2 | |
[Ada] Small cleanup in System.Exceptions
gcc/ada/
* libgnat/s-except.ads (ZCX_By_Default): Delete.
(Require_Body): Likewise.
* libgnat/s-except.adb: Replace body with pragma No_Body.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/libgnat/s-except.adb | 15 | ||||
| -rw-r--r-- | gcc/ada/libgnat/s-except.ads | 22 |
2 files changed, 2 insertions, 35 deletions
diff --git a/gcc/ada/libgnat/s-except.adb b/gcc/ada/libgnat/s-except.adb index 4b874ca..fa220b3 100644 --- a/gcc/ada/libgnat/s-except.adb +++ b/gcc/ada/libgnat/s-except.adb @@ -29,17 +29,4 @@ -- -- ------------------------------------------------------------------------------ --- This package does not require a body, since it is a package renaming. We --- provide a dummy file containing a No_Body pragma so that previous versions --- of the body (which did exist) will not interfere. - --- pragma No_Body; - --- The above pragma is commented out, since for now we can't use No_Body in --- a unit marked as a Compiler_Unit, since this requires GNAT 6.1, and we --- do not yet require this for bootstrapping. So instead we use a dummy Taft --- amendment type to require the body: - -package body System.Exceptions is - type Require_Body is new Integer; -end System.Exceptions; +pragma No_Body; diff --git a/gcc/ada/libgnat/s-except.ads b/gcc/ada/libgnat/s-except.ads index ae037ba..10448bc 100644 --- a/gcc/ada/libgnat/s-except.ads +++ b/gcc/ada/libgnat/s-except.ads @@ -34,30 +34,10 @@ pragma Compiler_Unit_Warning; package System.Exceptions is pragma Preelaborate; - -- To let Ada.Exceptions "with" us and let us "with" Standard_Library - - ZCX_By_Default : constant Boolean; - -- Visible copy to allow Ada.Exceptions to know the exception model + -- To let Ada.Exceptions "with" us private - type Require_Body; - -- Dummy Taft-amendment type to make it legal (and required) to provide - -- a body for this package. - -- - -- We do this because this unit used to have a body in earlier versions - -- of GNAT, and it causes various bootstrap path problems etc if we remove - -- a body, since we may pick up old unwanted bodies. - -- - -- Note: we use this standard Ada method of requiring a body rather - -- than the cleaner pragma No_Body because System.Exceptions is a compiler - -- unit, and older bootstrap compilers do not support pragma No_Body. This - -- type can be removed, and s-except.adb can be replaced by a source - -- containing just that pragma, when we decide to move to a 2008 compiler - -- as the minimal bootstrap compiler version. ??? - - ZCX_By_Default : constant Boolean := System.ZCX_By_Default; - Foreign_Exception : exception; pragma Unreferenced (Foreign_Exception); -- This hidden exception is used to represent non-Ada exception to |