From 6bd4adf5bba9d692c4294dd6fc497967feacce1e Mon Sep 17 00:00:00 2001 From: Dmitriy Anisimkov Date: Mon, 28 Dec 2020 08:26:23 +0600 Subject: [PATCH] [Ada] Rename package instead of each routine gcc/ada/ * libgnat/g-casuti.adb: Replace with "pragma No_Body". * libgnat/g-casuti.ads: Replace with a package renaming. --- gcc/ada/libgnat/g-casuti.adb | 10 ++++------ gcc/ada/libgnat/g-casuti.ads | 36 +----------------------------------- 2 files changed, 5 insertions(+), 41 deletions(-) diff --git a/gcc/ada/libgnat/g-casuti.adb b/gcc/ada/libgnat/g-casuti.adb index 7baa43a..3d9939f 100644 --- a/gcc/ada/libgnat/g-casuti.adb +++ b/gcc/ada/libgnat/g-casuti.adb @@ -29,10 +29,8 @@ -- -- ------------------------------------------------------------------------------ --- This is a dummy body, required because if we remove the body we have --- bootstrap path problems (this unit used to have a body, and if we do not --- supply a dummy body, the old incorrect body is picked up during the --- bootstrap process. +-- 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. -package body GNAT.Case_Util is -end GNAT.Case_Util; +pragma No_Body; diff --git a/gcc/ada/libgnat/g-casuti.ads b/gcc/ada/libgnat/g-casuti.ads index 5468e25..80a9f92 100644 --- a/gcc/ada/libgnat/g-casuti.ads +++ b/gcc/ada/libgnat/g-casuti.ads @@ -40,38 +40,4 @@ with System.Case_Util; -package GNAT.Case_Util is - pragma Pure; - pragma Elaborate_Body; - -- The elaborate body is because we have a dummy body to deal with - -- bootstrap path problems (we used to have a real body, and now we don't - -- need it any more, but the bootstrap requires that we have a dummy body, - -- since otherwise the old body gets picked up. - - -- Note: all the following functions handle the full Latin-1 set - - function To_Upper (A : Character) return Character - renames System.Case_Util.To_Upper; - -- Converts A to upper case if it is a lower case letter, otherwise - -- returns the input argument unchanged. - - procedure To_Upper (A : in out String) - renames System.Case_Util.To_Upper; - -- Folds all characters of string A to upper case - - function To_Lower (A : Character) return Character - renames System.Case_Util.To_Lower; - -- Converts A to lower case if it is an upper case letter, otherwise - -- returns the input argument unchanged. - - procedure To_Lower (A : in out String) - renames System.Case_Util.To_Lower; - -- Folds all characters of string A to lower case - - procedure To_Mixed (A : in out String) - renames System.Case_Util.To_Mixed; - -- Converts A to mixed case (i.e. lower case, except for initial - -- character and any character after an underscore, which are - -- converted to upper case. - -end GNAT.Case_Util; +package GNAT.Case_Util renames System.Case_Util; -- 2.7.4