2009-06-19 Ed Falis <falis@adacore.com>

	* a-einuoc.ads, s-osinte-vxworks.ads, s-vxwext.ads, s-vxwext-kernel.adb,
	s-vxwext-kernel.ads, s-vxwext-rtp.ads: Code clean up.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148698 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 40 insertions, 9 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 8781413a305..131904c1fc8 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-19  Ed Falis  <falis@adacore.com>
+
+	* a-einuoc.ads, s-osinte-vxworks.ads, s-vxwext.ads, s-vxwext-kernel.adb,
+	s-vxwext-kernel.ads, s-vxwext-rtp.ads: Code clean up.
+
 2009-06-19  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* einfo.ads (Handling of Type'Size Values): Fix Object_Size values.
diff --git a/gcc/ada/a-einuoc.ads b/gcc/ada/a-einuoc.ads
index dfc6b3f39fb..e075df95122 100644
--- a/gcc/ada/a-einuoc.ads
+++ b/gcc/ada/a-einuoc.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2000-2009  Free Software Foundation, Inc.         --
+--            Copyright (C) 2000-2009, 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- --
@@ -36,5 +36,6 @@
 
 function Ada.Exceptions.Is_Null_Occurrence
   (X    : Exception_Occurrence)
-   return Boolean;
+  return Boolean;
+pragma Preelaborate (Ada.Exceptions.Is_Null_Occurrence);
 --  This function yields True if X is Null_Occurrence, and False otherwise
diff --git a/gcc/ada/s-osinte-vxworks.ads b/gcc/ada/s-osinte-vxworks.ads
index c295b19b0b4..81fc71f1cab 100644
--- a/gcc/ada/s-osinte-vxworks.ads
+++ b/gcc/ada/s-osinte-vxworks.ads
@@ -7,7 +7,7 @@
 --                                   S p e c                                --
 --                                                                          --
 --            Copyright (C) 1991-1994, Florida State University             --
---          Copyright (C) 1995-2008, Free Software Foundation, Inc.         --
+--          Copyright (C) 1995-2009, 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- --
@@ -406,7 +406,7 @@ package System.OS_Interface is
    --  semTake() timeout with ticks > NO_WAIT
    S_objLib_OBJ_TIMEOUT     : constant := M_objLib + 4;
 
-   type SEM_ID is new System.Address;
+   subtype SEM_ID is System.VxWorks.Ext.SEM_ID;
    --  typedef struct semaphore *SEM_ID;
 
    --  We use two different kinds of VxWorks semaphores: mutex and binary
@@ -420,8 +420,8 @@ package System.OS_Interface is
    function semMCreate (options : int) return SEM_ID;
    pragma Import (C, semMCreate, "semMCreate");
 
-   function semDelete (Sem : SEM_ID) return int;
-   pragma Import (C, semDelete, "semDelete");
+   function semDelete (Sem : SEM_ID) return int
+     renames System.VxWorks.Ext.semDelete;
    --  Delete a semaphore
 
    function semGive (Sem : SEM_ID) return int;
diff --git a/gcc/ada/s-vxwext-kernel.adb b/gcc/ada/s-vxwext-kernel.adb
index 733772bdf8a..0c5fea59565 100644
--- a/gcc/ada/s-vxwext-kernel.adb
+++ b/gcc/ada/s-vxwext-kernel.adb
@@ -52,4 +52,11 @@ package body System.VxWorks.Ext is
 
    function Int_Unlock return int renames intUnlock;
 
+   ---------------
+   -- semDelete --
+   ---------------
+
+   function semDelete (Sem : SEM_ID) return int;
+   pragma Import (C, semDelete, "semDelete");
+
 end System.VxWorks.Ext;
diff --git a/gcc/ada/s-vxwext-kernel.ads b/gcc/ada/s-vxwext-kernel.ads
index c1883abdff6..c7fd7fec392 100644
--- a/gcc/ada/s-vxwext-kernel.ads
+++ b/gcc/ada/s-vxwext-kernel.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                   S p e c                                --
 --                                                                          --
---            Copyright (C) 2009, Free Software Foundation, Inc.            --
+--            Copyright (C) 2008-2009, 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- --
@@ -36,6 +36,9 @@ with Interfaces.C;
 package System.VxWorks.Ext is
    pragma Preelaborate;
 
+   subtype SEM_ID is Long_Integer;
+   --  typedef struct semaphore *SEM_ID;
+
    type t_id is new Long_Integer;
    subtype int is Interfaces.C.int;
 
@@ -60,6 +63,9 @@ package System.VxWorks.Ext is
      (intNum : int) return Interrupt_Vector;
    pragma Import (C, Interrupt_Number_To_Vector, "__gnat_inum_to_ivec");
 
+   function semDelete (Sem : SEM_ID) return int;
+   pragma Convention (C, semDelete);
+
    function Task_Cont (tid : t_id) return int;
    pragma Import (C, Task_Cont, "taskCont");
 
diff --git a/gcc/ada/s-vxwext-rtp.ads b/gcc/ada/s-vxwext-rtp.ads
index 8d094412c6d..9dc0fd40eea 100644
--- a/gcc/ada/s-vxwext-rtp.ads
+++ b/gcc/ada/s-vxwext-rtp.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                   S p e c                                --
 --                                                                          --
---            Copyright (C) 2009, Free Software Foundation, Inc.            --
+--            Copyright (C) 2008-2009, 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- --
@@ -36,6 +36,9 @@ with Interfaces.C;
 package System.VxWorks.Ext is
    pragma Preelaborate;
 
+   subtype SEM_ID is Long_Integer;
+   --  typedef struct semaphore *SEM_ID;
+
    type t_id is new Long_Integer;
    subtype int is Interfaces.C.int;
 
@@ -60,6 +63,9 @@ package System.VxWorks.Ext is
      (intNum : int) return Interrupt_Vector;
    pragma Convention (C, Interrupt_Number_To_Vector);
 
+   function semDelete (Sem : SEM_ID) return int;
+   pragma Import (C, semDelete, "semDelete");
+
    function Task_Cont (tid : t_id) return int;
    pragma Import (C, Task_Cont, "taskResume");
 
diff --git a/gcc/ada/s-vxwext.ads b/gcc/ada/s-vxwext.ads
index dc23cd26d07..6f17b41f8da 100644
--- a/gcc/ada/s-vxwext.ads
+++ b/gcc/ada/s-vxwext.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                   S p e c                                --
 --                                                                          --
---            Copyright (C) 2009, Free Software Foundation, Inc.            --
+--            Copyright (C) 2008-2009, 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- --
@@ -36,6 +36,9 @@ with Interfaces.C;
 package System.VxWorks.Ext is
    pragma Preelaborate;
 
+   type SEM_ID is new Long_Integer;
+   --  typedef struct semaphore *SEM_ID;
+
    type t_id is new Long_Integer;
    subtype int is Interfaces.C.int;
 
@@ -60,6 +63,9 @@ package System.VxWorks.Ext is
      (intNum : int) return Interrupt_Vector;
    pragma Import (C, Interrupt_Number_To_Vector, "__gnat_inum_to_ivec");
 
+   function semDelete (Sem : SEM_ID) return int;
+   pragma Import (C, semDelete, "semDelete");
+
    function Task_Cont (tid : t_id) return int;
    pragma Import (C, Task_Cont, "taskResume");