From: Arnaud Charlet Date: Wed, 11 Jun 2014 12:31:56 +0000 (+0200) Subject: [multiple changes] X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9926efec7818a3e17253ead7438df96685da07e9;p=gcc.git [multiple changes] 2014-06-11 Robert Dewar * make.adb, sem_res.adb: Minor reformatting. 2014-06-11 Thomas Quinot * a-astaco.ads, a-tags.ads, s-excdeb.ads, a-tgdico.ads, a-stmaco.ads, a-except-2005.ads, s-except.ads, a-taside.ads, a-dynpri.ads, a-chahan.ads, a-sytaco.ads, s-stalib.ads, a-strmap.ads: Change pragmas Preelaborate_05 to just Preelaborate in runtime units, and similarly change Pure_05 to just Pure. From-SVN: r211457 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 66663a84ee0..5131a6a242c 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,15 @@ +2014-06-11 Robert Dewar + + * make.adb, sem_res.adb: Minor reformatting. + +2014-06-11 Thomas Quinot + + * a-astaco.ads, a-tags.ads, s-excdeb.ads, a-tgdico.ads, a-stmaco.ads, + a-except-2005.ads, s-except.ads, a-taside.ads, a-dynpri.ads, + a-chahan.ads, a-sytaco.ads, s-stalib.ads, a-strmap.ads: Change pragmas + Preelaborate_05 to just Preelaborate in runtime units, and similarly + change Pure_05 to just Pure. + 2014-06-11 Ed Schonberg * sem_ch6.adb (Analyze_Subprogram_Body_Contract): Do not attempt diff --git a/gcc/ada/a-astaco.ads b/gcc/ada/a-astaco.ads index 3200c7ecdaf..1fa7c25697d 100644 --- a/gcc/ada/a-astaco.ads +++ b/gcc/ada/a-astaco.ads @@ -27,7 +27,7 @@ with Ada.Task_Identification; package Ada.Asynchronous_Task_Control is - pragma Preelaborate_05; + pragma Preelaborate; -- In accordance with Ada 2005 AI-362 pragma Unimplemented_Unit; diff --git a/gcc/ada/a-chahan.ads b/gcc/ada/a-chahan.ads index ca52f94730c..c34e5e2e450 100644 --- a/gcc/ada/a-chahan.ads +++ b/gcc/ada/a-chahan.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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 -- @@ -34,8 +34,7 @@ ------------------------------------------------------------------------------ package Ada.Characters.Handling is - pragma Preelaborate; - pragma Pure_05; + pragma Pure; -- In accordance with Ada 2005 AI-362 ---------------------------------------- diff --git a/gcc/ada/a-dynpri.ads b/gcc/ada/a-dynpri.ads index 03e02d63547..24fbbe48d8d 100644 --- a/gcc/ada/a-dynpri.ads +++ b/gcc/ada/a-dynpri.ads @@ -17,7 +17,7 @@ with System; with Ada.Task_Identification; package Ada.Dynamic_Priorities is - pragma Preelaborate_05; + pragma Preelaborate; -- In accordance with Ada 2005 AI-362 procedure Set_Priority diff --git a/gcc/ada/a-except-2005.ads b/gcc/ada/a-except-2005.ads index 71a3f198c14..90c952c3086 100644 --- a/gcc/ada/a-except-2005.ads +++ b/gcc/ada/a-except-2005.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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 -- @@ -51,7 +51,7 @@ with System.Standard_Library; with System.Traceback_Entries; package Ada.Exceptions is - pragma Preelaborate_05; + pragma Preelaborate; -- In accordance with Ada 2005 AI-362. type Exception_Id is private; diff --git a/gcc/ada/a-stmaco.ads b/gcc/ada/a-stmaco.ads index 733dfc66d70..92d70219602 100644 --- a/gcc/ada/a-stmaco.ads +++ b/gcc/ada/a-stmaco.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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 -- @@ -36,8 +36,7 @@ with Ada.Characters.Latin_1; package Ada.Strings.Maps.Constants is - pragma Preelaborate; - pragma Pure_05; + pragma Pure; -- In accordance with Ada 2005 AI-362 Control_Set : constant Character_Set; diff --git a/gcc/ada/a-strmap.ads b/gcc/ada/a-strmap.ads index 2a6908ff3ae..a882e9c4ed5 100644 --- a/gcc/ada/a-strmap.ads +++ b/gcc/ada/a-strmap.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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 -- @@ -36,8 +36,7 @@ with Ada.Characters.Latin_1; package Ada.Strings.Maps is - pragma Preelaborate; - pragma Pure_05; + pragma Pure; -- In accordance with Ada 2005 AI-362 -------------------------------- diff --git a/gcc/ada/a-sytaco.ads b/gcc/ada/a-sytaco.ads index 02ba6ae1a9f..a6bd84e1a2b 100644 --- a/gcc/ada/a-sytaco.ads +++ b/gcc/ada/a-sytaco.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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 -- @@ -38,7 +38,7 @@ with System.Task_Primitives; with Ada.Finalization; package Ada.Synchronous_Task_Control is - pragma Preelaborate_05; + pragma Preelaborate; -- In accordance with Ada 2005 AI-362 type Suspension_Object is limited private; diff --git a/gcc/ada/a-tags.ads b/gcc/ada/a-tags.ads index 6d94c3fa4d9..0a0a375c061 100644 --- a/gcc/ada/a-tags.ads +++ b/gcc/ada/a-tags.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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 -- @@ -37,7 +37,7 @@ with System; with System.Storage_Elements; package Ada.Tags is - pragma Preelaborate_05; + pragma Preelaborate; -- In accordance with Ada 2005 AI-362 type Tag is private; diff --git a/gcc/ada/a-taside.ads b/gcc/ada/a-taside.ads index e53ff04ac28..d736b0317d0 100644 --- a/gcc/ada/a-taside.ads +++ b/gcc/ada/a-taside.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, 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 -- @@ -37,7 +37,7 @@ with System; with System.Tasking; package Ada.Task_Identification is - pragma Preelaborate_05; + pragma Preelaborate; -- In accordance with Ada 2005 AI-362 type Task_Id is private; diff --git a/gcc/ada/a-tgdico.ads b/gcc/ada/a-tgdico.ads index d1150fd5991..a79c1aa522c 100644 --- a/gcc/ada/a-tgdico.ads +++ b/gcc/ada/a-tgdico.ads @@ -25,7 +25,7 @@ generic function Ada.Tags.Generic_Dispatching_Constructor (The_Tag : Tag; Params : not null access Parameters) return T'Class; -pragma Preelaborate_05 (Generic_Dispatching_Constructor); +pragma Preelaborate (Generic_Dispatching_Constructor); pragma Import (Intrinsic, Generic_Dispatching_Constructor); -- Note: the reason that we use Preelaborate_05 here is so that this will -- compile fine during the normal build procedures. In Ada 2005 mode (which diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index 6e07eb18425..c2524a13584 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -3730,7 +3730,7 @@ package body Make is "WARNING: ALI or object file not found after compile"); if not Is_Regular_File - (Get_Name_String (Name_Id (Data.Full_Lib_File))) + (Get_Name_String (Name_Id (Data.Full_Lib_File))) then Inform (Data.Full_Lib_File, "not found"); end if; diff --git a/gcc/ada/s-excdeb.ads b/gcc/ada/s-excdeb.ads index 4dd94c20583..9984d7b37a9 100644 --- a/gcc/ada/s-excdeb.ads +++ b/gcc/ada/s-excdeb.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2006-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 2006-2014, Free Software Foundation, Inc. -- -- -- -- GNAT 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- -- @@ -39,7 +39,7 @@ with System.Standard_Library; package System.Exceptions_Debug is - pragma Preelaborate_05; + pragma Preelaborate; -- To let Ada.Exceptions "with" us and let us "with" Standard_Library package SSL renames System.Standard_Library; diff --git a/gcc/ada/s-except.ads b/gcc/ada/s-except.ads index 8bf0284ab19..e88a1572b2d 100644 --- a/gcc/ada/s-except.ads +++ b/gcc/ada/s-except.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2006-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 2006-2014, Free Software Foundation, Inc. -- -- -- -- GNAT 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- -- @@ -33,7 +33,7 @@ pragma Compiler_Unit_Warning; package System.Exceptions is - pragma Preelaborate_05; + pragma Preelaborate; -- To let Ada.Exceptions "with" us and let us "with" Standard_Library ZCX_By_Default : constant Boolean; diff --git a/gcc/ada/s-stalib.ads b/gcc/ada/s-stalib.ads index e38f36e5567..520fb3c92d1 100644 --- a/gcc/ada/s-stalib.ads +++ b/gcc/ada/s-stalib.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- -- -- -- GNAT 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- -- @@ -54,7 +54,7 @@ with Ada.Unchecked_Conversion; package System.Standard_Library is pragma Warnings (Off); - pragma Preelaborate_05; + pragma Preelaborate; pragma Warnings (On); subtype Big_String is String (1 .. Positive'Last); diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 7659db7c812..e0002d328a4 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -9213,7 +9213,7 @@ package body Sem_Res is Get_Next_Interp (I, It); end loop Search; - -- There must be a legal interpreations at this point. + -- There must be a legal interpretation at this point pragma Assert (Found); Resolve (P, It1.Typ); @@ -9243,7 +9243,6 @@ package body Sem_Res is if Is_Access_Type (Etype (P)) then T := Designated_Type (Etype (P)); Check_Fully_Declared_Prefix (T, P); - else T := Etype (P); end if;