OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s-multip.ads: Fix header. 

2010-10-11  Robert Dewar  <dewar@adacore.com>

	* s-multip.ads: Fix header.
	* sem_ch3.adb, s-multip.adb, a-tigeli.adb: Minor reformatting.

From-SVN: r165275
This commit is contained in:
Robert Dewar 2010-10-11 07:30:09 +00:00 committed by Arnaud Charlet
parent 7a259f2ea7
commit 0144fd18d7
5 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ada/ChangeLog
View File

@ -1,3 +1,8 @@
2010-10-11 Robert Dewar <dewar@adacore.com>
* s-multip.ads: Fix header.
* sem_ch3.adb, s-multip.adb, a-tigeli.adb: Minor reformatting.
2010-10-11 Vincent Celier <celier@adacore.com>
* Makefile.rtl: Add s-multip.

7
gcc/ada/a-tigeli.adb
View File

@ -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;

1
gcc/ada/s-multip.adb
View File

@ -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");

24
gcc/ada/s-multip.ads
View File

@ -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 --
-- <http://www.gnu.org/licenses/>. --
-- 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);

9
gcc/ada/sem_ch3.adb
View File

@ -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;