From 7647cd4b726af7ef85cadb8f3329daa80bdc7fc6 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Mon, 23 Jan 2012 09:45:23 +0100 Subject: [PATCH] [multiple changes] 2012-01-23 Robert Dewar * s-utf_32.adb: Minor reformatting. 2012-01-23 Vincent Celier * snames.ads-tmpl: Minor comment addition Indicate that Name_Library_Encapsulated_Options is only used in gprbuild. From-SVN: r183411 --- gcc/ada/ChangeLog | 9 +++++++++ gcc/ada/s-utf_32.adb | 3 ++- gcc/ada/snames.ads-tmpl | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 1cca2ee..dd8d3dc 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,14 @@ 2012-01-23 Robert Dewar + * s-utf_32.adb: Minor reformatting. + +2012-01-23 Vincent Celier + + * snames.ads-tmpl: Minor comment addition Indicate that + Name_Library_Encapsulated_Options is only used in gprbuild. + +2012-01-23 Robert Dewar + * sem_ch10.adb (Analyze_Subunit): Properly save/restore cunit restrictions. diff --git a/gcc/ada/s-utf_32.adb b/gcc/ada/s-utf_32.adb index 676d0e3..4bf1055 100755 --- a/gcc/ada/s-utf_32.adb +++ b/gcc/ada/s-utf_32.adb @@ -32,7 +32,8 @@ pragma Compiler_Unit; pragma Style_Checks (Off); --- Allow long lines in this unit +-- Allow long lines in this unit. Note this could be more specific, but we +-- keep this simple form because of bootstrap constraints ??? -- pragma Warnings (Off, "non-static constant in preelaborated unit"); -- We need this to be pure, and the three constants in question are not a diff --git a/gcc/ada/snames.ads-tmpl b/gcc/ada/snames.ads-tmpl index f40d0f2..6afd6c3 100644 --- a/gcc/ada/snames.ads-tmpl +++ b/gcc/ada/snames.ads-tmpl @@ -145,6 +145,7 @@ package Snames is Name_Post : constant Name_Id := N + $; Name_Pre : constant Name_Id := N + $; Name_Static_Predicate : constant Name_Id := N + $; + Name_Synchronization : constant Name_Id := N + $; Name_Type_Invariant : constant Name_Id := N + $; -- Some special names used by the expander. Note that the lower case u's @@ -1161,7 +1162,7 @@ package Snames is Name_Library_Partial_Linker : constant Name_Id := N + $; Name_Library_Reference_Symbol_File : constant Name_Id := N + $; Name_Library_Standalone : constant Name_Id := N + $; - Name_Library_Encapsulated_Options : constant Name_Id := N + $; + Name_Library_Encapsulated_Options : constant Name_Id := N + $; -- GB Name_Library_Encapsulated_Supported : constant Name_Id := N + $; -- GB Name_Library_Src_Dir : constant Name_Id := N + $; Name_Library_Support : constant Name_Id := N + $; @@ -1227,7 +1228,6 @@ package Snames is Name_Switches : constant Name_Id := N + $; Name_Symbolic_Link_Supported : constant Name_Id := N + $; Name_Synchronize : constant Name_Id := N + $; - Name_Synchronization : constant Name_Id := N + $; Name_Toolchain_Description : constant Name_Id := N + $; Name_Toolchain_Version : constant Name_Id := N + $; Name_Trailing_Required_Switches : constant Name_Id := N + $; -- 2.7.4