diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2005-01-27 11:52:46 +0000 |
|---|---|---|
| committer | Laurent Guerby <guerby@gcc.gnu.org> | 2005-01-27 11:52:46 +0000 |
| commit | 9011d4bba2ab7372d8511a13b6c5ed4dbab69ed2 (patch) | |
| tree | 045b52c35ee7c8f3d6b20f0fafe565d5dd35c779 | |
| parent | dad2a933ba0fe99918377dc328ce87325365fb91 (diff) | |
| download | gcc-9011d4bba2ab7372d8511a13b6c5ed4dbab69ed2.zip gcc-9011d4bba2ab7372d8511a13b6c5ed4dbab69ed2.tar.gz gcc-9011d4bba2ab7372d8511a13b6c5ed4dbab69ed2.tar.bz2 | |
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
| -rw-r--r-- | gcc/ada/5rosinte.ads | 4 | ||||
| -rw-r--r-- | gcc/ada/5rtpopsp.adb | 9 | ||||
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/gsocket.h | 2 |
4 files changed, 17 insertions, 6 deletions
diff --git a/gcc/ada/5rosinte.ads b/gcc/ada/5rosinte.ads index c82ea15..c15362f 100644 --- 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 c75356f..6c83352 100644 --- 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 1cf4909..0fa8b75 100644 --- 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 134aa26..c500019 100644 --- 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 |