From: Robert Dewar Date: Mon, 11 Oct 2010 07:30:09 +0000 (+0000) Subject: s-multip.ads: Fix header. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0144fd18d746179a058011b4339dd852a2805dda;p=gcc.git s-multip.ads: Fix header. 2010-10-11 Robert Dewar * s-multip.ads: Fix header. * sem_ch3.adb, s-multip.adb, a-tigeli.adb: Minor reformatting. From-SVN: r165275 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 862999534b7..b9614a6fc89 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2010-10-11 Robert Dewar + + * s-multip.ads: Fix header. + * sem_ch3.adb, s-multip.adb, a-tigeli.adb: Minor reformatting. + 2010-10-11 Vincent Celier * Makefile.rtl: Add s-multip. diff --git a/gcc/ada/a-tigeli.adb b/gcc/ada/a-tigeli.adb index 107316957a2..c23cd347869 100644 --- a/gcc/ada/a-tigeli.adb +++ b/gcc/ada/a-tigeli.adb @@ -2,7 +2,7 @@ -- -- -- GNAT RUN-TIME COMPONENTS -- -- -- --- A D A . T E X T _ I O -- +-- A D A . T E X T _ I O . G E T _ L I N E -- -- -- -- B o d y -- -- -- @@ -29,6 +29,11 @@ -- -- ------------------------------------------------------------------------------ +-- The implementation of Ada.Text_IO.Get_Line is split into a subunit so that +-- different implementations can be used on different systems. This is the +-- standard implementation (it uses low level features not suitable for use +-- in the JVM or .NET implementations). + with System; use System; with System.Storage_Elements; use System.Storage_Elements; diff --git a/gcc/ada/s-multip.adb b/gcc/ada/s-multip.adb index ce6c9dcfa77..ea1f15c06a9 100644 --- a/gcc/ada/s-multip.adb +++ b/gcc/ada/s-multip.adb @@ -29,6 +29,7 @@ with Interfaces.C; use Interfaces.C; package body System.Multiprocessors is + function Gnat_Number_Of_CPUs return int; pragma Import (C, Gnat_Number_Of_CPUs, "__gnat_number_of_cpus"); diff --git a/gcc/ada/s-multip.ads b/gcc/ada/s-multip.ads index 33cb01bc10b..7eb8dd6a3b1 100644 --- a/gcc/ada/s-multip.ads +++ b/gcc/ada/s-multip.ads @@ -6,29 +6,13 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2010, 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- -- --- ware Foundation; either version 3, or (at your option) any later ver- -- --- sion. GNAT is distributed in the hope that it will be useful, but WITH- -- --- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- --- or FITNESS FOR A PARTICULAR PURPOSE. -- --- -- --- As a special exception under Section 7 of GPL version 3, you are granted -- --- additional permissions described in the GCC Runtime Library Exception, -- --- version 3.1, as published by the Free Software Foundation. -- --- -- --- You should have received a copy of the GNU General Public License and -- --- a copy of the GCC Runtime Library Exception along with this program; -- --- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -- --- . -- +-- This specification is derived from the Ada Reference Manual for use with -- +-- GNAT. In accordance with the copyright of that document, you can freely -- +-- copy and modify this specification, provided that if you redistribute a -- +-- modified version, any changes that you have made are clearly indicated. -- -- -- ------------------------------------------------------------------------------ --- This unit may be used directly from an application program by providing --- an appropriate WITH, and the interface can be expected to remain stable. - package System.Multiprocessors is pragma Preelaborate (Multiprocessors); diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 145c7437246..5fb13e6c90a 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -8793,14 +8793,15 @@ package body Sem_Ch3 is -- A discriminant_specification for an access discriminant shall appear -- only in the declaration for a task or protected type, or for a type -- with the reserved word 'limited' in its definition or in one of its - -- ancestors. (RM 3.7(10)) - -- AI-0063 : the proper condition is that type must be immutably - -- limited, or else be a partial view. + -- ancestors (RM 3.7(10)). + + -- AI-0063: The proper condition is that type must be immutably limited, + -- or else be a partial view. if Nkind (Discriminant_Type (D)) = N_Access_Definition then if Is_Immutably_Limited_Type (Current_Scope) or else - (Nkind (Parent (Current_Scope)) = N_Private_Type_Declaration + (Nkind (Parent (Current_Scope)) = N_Private_Type_Declaration and then Limited_Present (Parent (Current_Scope))) then null;