re PR ada/19488 (RTEMS Ada RTS doesn't compile)

2005-01-27  Joel Sherrill <joel.sherrill@oarcorp.com>
	    Laurent GUERBY <laurent@guerby.net>

	PR ada/19488
	* 5rosinte.ads: Add No_Key constant.
        * 5rtpopsp.adb: Initialize ATCB_Key with No_Key and fix style.
        * gsocket.h: Do not include <sys/socket.h> with RTEMS either.

Co-Authored-By: Laurent GUERBY <laurent@guerby.net>
From-SVN: r94318

diff --git a/gcc/ada/5rosinte.ads b/gcc/ada/5rosinte.ads
index c82ea1559ec1dd439f04c792743fb55c2610bbdd..c15362f70e0452457c49d35b0f85e8f55544731e 100644 (file)
--- a/gcc/ada/5rosinte.ads
+++ b/gcc/ada/5rosinte.ads
@@ -233,6 +233,8 @@ package System.OS_Interface is
    type pthread_condattr_t  is limited private;
    type pthread_key_t       is private;
 
+   No_Key : constant pthread_key_t;
+
    PTHREAD_CREATE_DETACHED : constant := 0;
 
    -----------
@@ -524,4 +526,6 @@ private
 
    type pthread_key_t is new rtems_id;
 
+   No_Key : constant pthread_key_t := 0;
+
 end System.OS_Interface;

diff --git a/gcc/ada/5rtpopsp.adb b/gcc/ada/5rtpopsp.adb
index c75356fdaebd3a60a4bb82a6d81a5fbdfd0fdcda..6c83352cd62a04f95178337577efc4d0fa2a2dfe 100644 (file)
--- a/gcc/ada/5rtpopsp.adb
+++ b/gcc/ada/5rtpopsp.adb
@@ -54,11 +54,11 @@ package body Specific is
    -- Initialize --
    ----------------
 
-   procedure Initialize (Environment_Task : Task_ID) is
+   procedure Initialize (Environment_Task : Task_Id) is
       pragma Warnings (Off, Environment_Task);
-      Result : Interfaces.C.int;
 
    begin
+      ATCB_Key := No_Key;
       RTEMS_Ada_Self := To_Address (Environment_Task);
    end Initialize;
 
@@ -75,8 +75,7 @@ package body Specific is
    -- Set --
    ---------
 
-   procedure Set (Self_Id : Task_ID) is
-      Result : Interfaces.C.int;
+   procedure Set (Self_Id : Task_Id) is
    begin
       RTEMS_Ada_Self := To_Address (Self_Id);
    end Set;
@@ -98,7 +97,7 @@ package body Specific is
    --  hierarchy, much like the existing implicitly created signal-server
    --  tasks.
 
-   function Self return Task_ID is
+   function Self return Task_Id is
       Result : System.Address;
 
    begin

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 1cf49090e3f2b383a5e1cf8e01b75eb5e94906db..0fa8b753c01299c79607a5207e2e75f595d2f4c0 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-27  Joel Sherrill <joel.sherrill@oarcorp.com>
+           Laurent GUERBY <laurent@guerby.net>
+
+       PR ada/19488
+       * 5rosinte.ads: Add No_Key constant.
+        * 5rtpopsp.adb: Initialize ATCB_Key with No_Key and fix style.
+        * gsocket.h: Do not include <sys/socket.h> with RTEMS either.
+
 2005-01-26  Laurent GUERBY <laurent@guerby.net>
 
        PR ada/19414

diff --git a/gcc/ada/gsocket.h b/gcc/ada/gsocket.h
index 134aa2620de4220f3eaae8d805f106f2818117ee..c500019b6174ff3d507e62c1877578888ee79ab3 100644 (file)
--- a/gcc/ada/gsocket.h
+++ b/gcc/ada/gsocket.h
@@ -62,6 +62,6 @@
 #include "system.h"
 #endif
 
-#if !(defined (VMS) || defined (__MINGW32__))
+#if !(defined (VMS) || defined (__MINGW32__) || defined(__rtems__))
 # include <sys/socket.h>
 #endif