Commit cf02459a by Arnaud Charlet

Update to GPLv3 run-time license.

From-SVN: r177042
parent bd15e32c
...@@ -14,21 +14,19 @@ ...@@ -14,21 +14,19 @@
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
-- ware Foundation; either version 2, or (at your option) any later ver- -- -- 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- -- -- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- -- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- -- or FITNESS FOR A PARTICULAR PURPOSE. --
-- for more details. You should have received a copy of the GNU General --
-- Public License distributed with GNAT; see file COPYING. If not, write --
-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
-- Boston, MA 02110-1301, USA. --
-- -- -- --
-- As a special exception, if other files instantiate generics from this -- -- As a special exception under Section 7 of GPL version 3, you are granted --
-- unit, or you link this unit with other files to produce an executable, -- -- additional permissions described in the GCC Runtime Library Exception, --
-- this unit does not by itself cause the resulting executable to be -- -- version 3.1, as published by the Free Software Foundation. --
-- covered by the GNU General Public License. This exception does not -- -- --
-- however invalidate any other reasons why the executable file might be -- -- You should have received a copy of the GNU General Public License and --
-- covered by the GNU Public License. -- -- 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/>. --
-- -- -- --
-- GNAT was originally developed by the GNAT team at New York University. -- -- GNAT was originally developed by the GNAT team at New York University. --
-- Extensive contributions were provided by Ada Core Technologies Inc. -- -- Extensive contributions were provided by Ada Core Technologies Inc. --
......
...@@ -14,21 +14,19 @@ ...@@ -14,21 +14,19 @@
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
-- ware Foundation; either version 2, or (at your option) any later ver- -- -- 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- -- -- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- -- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- -- or FITNESS FOR A PARTICULAR PURPOSE. --
-- for more details. You should have received a copy of the GNU General --
-- Public License distributed with GNAT; see file COPYING. If not, write --
-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
-- Boston, MA 02110-1301, USA. --
-- -- -- --
-- As a special exception, if other files instantiate generics from this -- -- As a special exception under Section 7 of GPL version 3, you are granted --
-- unit, or you link this unit with other files to produce an executable, -- -- additional permissions described in the GCC Runtime Library Exception, --
-- this unit does not by itself cause the resulting executable to be -- -- version 3.1, as published by the Free Software Foundation. --
-- covered by the GNU General Public License. This exception does not -- -- --
-- however invalidate any other reasons why the executable file might be -- -- You should have received a copy of the GNU General Public License and --
-- covered by the GNU Public License. -- -- 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/>. --
-- -- -- --
-- GNAT was originally developed by the GNAT team at New York University. -- -- GNAT was originally developed by the GNAT team at New York University. --
-- Extensive contributions were provided by Ada Core Technologies Inc. -- -- Extensive contributions were provided by Ada Core Technologies Inc. --
......
...@@ -6,25 +6,23 @@ ...@@ -6,25 +6,23 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1995-2006, AdaCore -- -- Copyright (C) 1995-2010, AdaCore --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
-- ware Foundation; either version 2, or (at your option) any later ver- -- -- 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- -- -- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- -- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- -- or FITNESS FOR A PARTICULAR PURPOSE. --
-- for more details. You should have received a copy of the GNU General -- -- --
-- Public License distributed with GNAT; see file COPYING. If not, write -- -- As a special exception under Section 7 of GPL version 3, you are granted --
-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, -- -- additional permissions described in the GCC Runtime Library Exception, --
-- Boston, MA 02110-1301, USA. -- -- version 3.1, as published by the Free Software Foundation. --
-- -- -- --
-- As a special exception, if other files instantiate generics from this -- -- You should have received a copy of the GNU General Public License and --
-- unit, or you link this unit with other files to produce an executable, -- -- a copy of the GCC Runtime Library Exception along with this program; --
-- this unit does not by itself cause the resulting executable to be -- -- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
-- covered by the GNU General Public License. This exception does not -- -- <http://www.gnu.org/licenses/>. --
-- however invalidate any other reasons why the executable file might be --
-- covered by the GNU Public License. --
-- -- -- --
-- GNAT was originally developed by the GNAT team at New York University. -- -- GNAT was originally developed by the GNAT team at New York University. --
-- Extensive contributions were provided by Ada Core Technologies Inc. -- -- Extensive contributions were provided by Ada Core Technologies Inc. --
......
...@@ -6,25 +6,23 @@ ...@@ -6,25 +6,23 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1995-2006, AdaCore -- -- Copyright (C) 1995-2010, AdaCore --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
-- ware Foundation; either version 2, or (at your option) any later ver- -- -- 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- -- -- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- -- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- -- or FITNESS FOR A PARTICULAR PURPOSE. --
-- for more details. You should have received a copy of the GNU General -- -- --
-- Public License distributed with GNAT; see file COPYING. If not, write -- -- As a special exception under Section 7 of GPL version 3, you are granted --
-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, -- -- additional permissions described in the GCC Runtime Library Exception, --
-- Boston, MA 02110-1301, USA. -- -- version 3.1, as published by the Free Software Foundation. --
-- -- -- --
-- As a special exception, if other files instantiate generics from this -- -- You should have received a copy of the GNU General Public License and --
-- unit, or you link this unit with other files to produce an executable, -- -- a copy of the GCC Runtime Library Exception along with this program; --
-- this unit does not by itself cause the resulting executable to be -- -- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
-- covered by the GNU General Public License. This exception does not -- -- <http://www.gnu.org/licenses/>. --
-- however invalidate any other reasons why the executable file might be --
-- covered by the GNU Public License. --
-- -- -- --
-- GNAT was originally developed by the GNAT team at New York University. -- -- GNAT was originally developed by the GNAT team at New York University. --
-- Extensive contributions were provided by Ada Core Technologies Inc. -- -- Extensive contributions were provided by Ada Core Technologies Inc. --
......
...@@ -6,25 +6,23 @@ ...@@ -6,25 +6,23 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2009, Free Software Foundation, Inc. -- -- Copyright (C) 2009-2010, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
-- ware Foundation; either version 2, or (at your option) any later ver- -- -- 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- -- -- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- -- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- -- or FITNESS FOR A PARTICULAR PURPOSE. --
-- for more details. You should have received a copy of the GNU General -- -- --
-- Public License distributed with GNAT; see file COPYING. If not, write -- -- As a special exception under Section 7 of GPL version 3, you are granted --
-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, -- -- additional permissions described in the GCC Runtime Library Exception, --
-- Boston, MA 02110-1301, USA. -- -- version 3.1, as published by the Free Software Foundation. --
-- -- -- --
-- As a special exception, if other files instantiate generics from this -- -- You should have received a copy of the GNU General Public License and --
-- unit, or you link this unit with other files to produce an executable, -- -- a copy of the GCC Runtime Library Exception along with this program; --
-- this unit does not by itself cause the resulting executable to be -- -- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
-- covered by the GNU General Public License. This exception does not -- -- <http://www.gnu.org/licenses/>. --
-- however invalidate any other reasons why the executable file might be --
-- covered by the GNU Public License. --
-- -- -- --
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
......
...@@ -243,10 +243,22 @@ package body System.OS_Interface is ...@@ -243,10 +243,22 @@ package body System.OS_Interface is
-------------------------------- --------------------------------
function Interrupt_Number_To_Vector function Interrupt_Number_To_Vector
(intNum : int) return Interrupt_Vector is (intNum : int) return Interrupt_Vector
is
begin begin
return Interrupt_Vector return Interrupt_Vector
(System.VxWorks.Ext.Interrupt_Number_To_Vector (intNum)); (System.VxWorks.Ext.Interrupt_Number_To_Vector (intNum));
end Interrupt_Number_To_Vector; end Interrupt_Number_To_Vector;
-----------------
-- Current_CPU --
-----------------
function Current_CPU return Multiprocessors.CPU is
begin
-- ??? Should use vxworks multiprocessor interface
return Multiprocessors.CPU'First;
end Current_CPU;
end System.OS_Interface; end System.OS_Interface;
...@@ -11,21 +11,19 @@ ...@@ -11,21 +11,19 @@
-- -- -- --
-- GNARL is free software; you can redistribute it and/or modify it under -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
-- ware Foundation; either version 2, or (at your option) any later ver- -- -- ware Foundation; either version 3, or (at your option) any later ver- --
-- sion. GNARL is distributed in the hope that it will be useful, but WITH- -- -- sion. GNARL is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- -- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- -- or FITNESS FOR A PARTICULAR PURPOSE. --
-- for more details. You should have received a copy of the GNU General --
-- Public License distributed with GNARL; see file COPYING. If not, write --
-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
-- Boston, MA 02110-1301, USA. --
-- -- -- --
-- As a special exception, if other files instantiate generics from this -- -- As a special exception under Section 7 of GPL version 3, you are granted --
-- unit, or you link this unit with other files to produce an executable, -- -- additional permissions described in the GCC Runtime Library Exception, --
-- this unit does not by itself cause the resulting executable to be -- -- version 3.1, as published by the Free Software Foundation. --
-- covered by the GNU General Public License. This exception does not -- -- --
-- however invalidate any other reasons why the executable file might be -- -- You should have received a copy of the GNU General Public License and --
-- covered by the GNU Public License. -- -- 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/>. --
-- -- -- --
-- GNARL was developed by the GNARL team at Florida State University. -- -- GNARL was developed by the GNARL team at Florida State University. --
-- Extensive contributions were provided by Ada Core Technologies, Inc. -- -- Extensive contributions were provided by Ada Core Technologies, Inc. --
...@@ -43,6 +41,7 @@ ...@@ -43,6 +41,7 @@
with Interfaces.C; with Interfaces.C;
with System.VxWorks; with System.VxWorks;
with System.VxWorks.Ext; with System.VxWorks.Ext;
with System.Multiprocessors;
package System.OS_Interface is package System.OS_Interface is
pragma Preelaborate; pragma Preelaborate;
...@@ -494,6 +493,13 @@ package System.OS_Interface is ...@@ -494,6 +493,13 @@ package System.OS_Interface is
-- For SMP run-times the affinity to CPU. -- For SMP run-times the affinity to CPU.
-- For uniprocessor systems return ERROR status. -- For uniprocessor systems return ERROR status.
---------------------
-- Multiprocessors --
---------------------
function Current_CPU return Multiprocessors.CPU;
-- Return the id of the current CPU
private private
type pid_t is new int; type pid_t is new int;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment