[PATCH] Fix declaration of pthread-structs in s-osinte-rtems.ads (ada/68169)
PR ada/68169 * s-oscons-tmplt.c: Generate pthread constants for RTEMS * s-osinte-rtems.ads: Declare pthread structs as opaque types in Ada From-SVN: r231145
This commit is contained in:
parent
1ac22e762e
commit
df096e508e
|
@ -1,3 +1,9 @@
|
||||||
|
2015-12-01 Jan Sommer <soja-lists@aries.uberspace.de>
|
||||||
|
|
||||||
|
PR ada/68169
|
||||||
|
* s-oscons-tmplt.c: Generate pthread constants for RTEMS
|
||||||
|
* s-osinte-rtems.ads: Declare pthread structs as opaque types in Ada
|
||||||
|
|
||||||
2015-12-01 Eric Botcazou <ebotcazou@adacore.com>
|
2015-12-01 Eric Botcazou <ebotcazou@adacore.com>
|
||||||
|
|
||||||
* gcc-interface/Makefile.in (ADA_EXCLUDE_SRCS): Reorder.
|
* gcc-interface/Makefile.in (ADA_EXCLUDE_SRCS): Reorder.
|
||||||
|
|
|
@ -157,7 +157,7 @@ pragma Style_Checks ("M32766");
|
||||||
# include <_types.h>
|
# include <_types.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined (__linux__) || defined (__ANDROID__)
|
#if defined (__linux__) || defined (__ANDROID__) || defined (__rtems__)
|
||||||
# include <pthread.h>
|
# include <pthread.h>
|
||||||
# include <signal.h>
|
# include <signal.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -1458,7 +1458,7 @@ CNS(CLOCK_RT_Ada, "")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined (__APPLE__) || defined (__linux__) || defined (__ANDROID__) \
|
#if defined (__APPLE__) || defined (__linux__) || defined (__ANDROID__) \
|
||||||
|| defined (DUMMY)
|
|| defined (__rtems__) || defined (DUMMY)
|
||||||
/*
|
/*
|
||||||
|
|
||||||
-- Sizes of pthread data types
|
-- Sizes of pthread data types
|
||||||
|
@ -1501,7 +1501,7 @@ CND(PTHREAD_RWLOCKATTR_SIZE, "pthread_rwlockattr_t")
|
||||||
CND(PTHREAD_RWLOCK_SIZE, "pthread_rwlock_t")
|
CND(PTHREAD_RWLOCK_SIZE, "pthread_rwlock_t")
|
||||||
CND(PTHREAD_ONCE_SIZE, "pthread_once_t")
|
CND(PTHREAD_ONCE_SIZE, "pthread_once_t")
|
||||||
|
|
||||||
#endif /* __APPLE__ || __linux__ || __ANDROID__ */
|
#endif /* __APPLE__ || __linux__ || __ANDROID__ || __rtems__ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
||||||
|
|
|
@ -51,6 +51,8 @@
|
||||||
-- It is designed to be a bottom-level (leaf) package.
|
-- It is designed to be a bottom-level (leaf) package.
|
||||||
|
|
||||||
with Interfaces.C;
|
with Interfaces.C;
|
||||||
|
with System.OS_Constants;
|
||||||
|
|
||||||
package System.OS_Interface is
|
package System.OS_Interface is
|
||||||
pragma Preelaborate;
|
pragma Preelaborate;
|
||||||
|
|
||||||
|
@ -60,6 +62,7 @@ package System.OS_Interface is
|
||||||
subtype rtems_id is Interfaces.C.unsigned;
|
subtype rtems_id is Interfaces.C.unsigned;
|
||||||
|
|
||||||
subtype int is Interfaces.C.int;
|
subtype int is Interfaces.C.int;
|
||||||
|
subtype char is Interfaces.C.char;
|
||||||
subtype short is Interfaces.C.short;
|
subtype short is Interfaces.C.short;
|
||||||
subtype long is Interfaces.C.long;
|
subtype long is Interfaces.C.long;
|
||||||
subtype unsigned is Interfaces.C.unsigned;
|
subtype unsigned is Interfaces.C.unsigned;
|
||||||
|
@ -68,7 +71,6 @@ package System.OS_Interface is
|
||||||
subtype unsigned_char is Interfaces.C.unsigned_char;
|
subtype unsigned_char is Interfaces.C.unsigned_char;
|
||||||
subtype plain_char is Interfaces.C.plain_char;
|
subtype plain_char is Interfaces.C.plain_char;
|
||||||
subtype size_t is Interfaces.C.size_t;
|
subtype size_t is Interfaces.C.size_t;
|
||||||
|
|
||||||
-----------
|
-----------
|
||||||
-- Errno --
|
-- Errno --
|
||||||
-----------
|
-----------
|
||||||
|
@ -76,11 +78,11 @@ package System.OS_Interface is
|
||||||
function errno return int;
|
function errno return int;
|
||||||
pragma Import (C, errno, "__get_errno");
|
pragma Import (C, errno, "__get_errno");
|
||||||
|
|
||||||
EAGAIN : constant := 11;
|
EAGAIN : constant := System.OS_Constants.EAGAIN;
|
||||||
EINTR : constant := 4;
|
EINTR : constant := System.OS_Constants.EINTR;
|
||||||
EINVAL : constant := 22;
|
EINVAL : constant := System.OS_Constants.EINVAL;
|
||||||
ENOMEM : constant := 12;
|
ENOMEM : constant := System.OS_Constants.ENOMEM;
|
||||||
ETIMEDOUT : constant := 116;
|
ETIMEDOUT : constant := System.OS_Constants.ETIMEDOUT;
|
||||||
|
|
||||||
-------------
|
-------------
|
||||||
-- Signals --
|
-- Signals --
|
||||||
|
@ -448,6 +450,7 @@ package System.OS_Interface is
|
||||||
ss_low_priority : int;
|
ss_low_priority : int;
|
||||||
ss_replenish_period : timespec;
|
ss_replenish_period : timespec;
|
||||||
ss_initial_budget : timespec;
|
ss_initial_budget : timespec;
|
||||||
|
sched_ss_max_repl : int;
|
||||||
end record;
|
end record;
|
||||||
pragma Convention (C, struct_sched_param);
|
pragma Convention (C, struct_sched_param);
|
||||||
|
|
||||||
|
@ -621,43 +624,34 @@ private
|
||||||
end record;
|
end record;
|
||||||
pragma Convention (C, timespec);
|
pragma Convention (C, timespec);
|
||||||
|
|
||||||
CLOCK_REALTIME : constant clockid_t := 1;
|
CLOCK_REALTIME : constant clockid_t := System.OS_Constants.CLOCK_REALTIME;
|
||||||
CLOCK_MONOTONIC : constant clockid_t := 4;
|
CLOCK_MONOTONIC : constant clockid_t := System.OS_Constants.CLOCK_MONOTONIC;
|
||||||
|
|
||||||
|
subtype char_array is Interfaces.C.char_array;
|
||||||
|
|
||||||
type pthread_attr_t is record
|
type pthread_attr_t is record
|
||||||
is_initialized : int;
|
Data : char_array (1 .. OS_Constants.PTHREAD_ATTR_SIZE);
|
||||||
stackaddr : System.Address;
|
|
||||||
stacksize : int;
|
|
||||||
contentionscope : int;
|
|
||||||
inheritsched : int;
|
|
||||||
schedpolicy : int;
|
|
||||||
schedparam : struct_sched_param;
|
|
||||||
cputime_clocked_allowed : int;
|
|
||||||
detatchstate : int;
|
|
||||||
end record;
|
end record;
|
||||||
pragma Convention (C, pthread_attr_t);
|
pragma Convention (C, pthread_attr_t);
|
||||||
|
for pthread_attr_t'Alignment use Interfaces.C.double'Alignment;
|
||||||
|
|
||||||
type pthread_condattr_t is record
|
type pthread_condattr_t is record
|
||||||
flags : int;
|
Data : char_array (1 .. OS_Constants.PTHREAD_CONDATTR_SIZE);
|
||||||
process_shared : int;
|
|
||||||
end record;
|
end record;
|
||||||
pragma Convention (C, pthread_condattr_t);
|
pragma Convention (C, pthread_condattr_t);
|
||||||
|
for pthread_condattr_t'Alignment use Interfaces.C.double'Alignment;
|
||||||
|
|
||||||
type pthread_mutexattr_t is record
|
type pthread_mutexattr_t is record
|
||||||
is_initialized : int;
|
Data : char_array (1 .. OS_Constants.PTHREAD_MUTEXATTR_SIZE);
|
||||||
process_shared : int;
|
end record;
|
||||||
prio_ceiling : int;
|
|
||||||
protocol : int;
|
|
||||||
mutex_type : int;
|
|
||||||
recursive : int;
|
|
||||||
end record;
|
|
||||||
pragma Convention (C, pthread_mutexattr_t);
|
pragma Convention (C, pthread_mutexattr_t);
|
||||||
|
for pthread_mutexattr_t'Alignment use Interfaces.C.double'Alignment;
|
||||||
|
|
||||||
type pthread_rwlockattr_t is record
|
type pthread_rwlockattr_t is record
|
||||||
is_initialized : int;
|
Data : char_array (1 .. OS_Constants.PTHREAD_RWLOCKATTR_SIZE);
|
||||||
process_shared : int;
|
|
||||||
end record;
|
end record;
|
||||||
pragma Convention (C, pthread_rwlockattr_t);
|
pragma Convention (C, pthread_rwlockattr_t);
|
||||||
|
for pthread_rwlockattr_t'Alignment use Interfaces.C.double'Alignment;
|
||||||
|
|
||||||
type pthread_t is new rtems_id;
|
type pthread_t is new rtems_id;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue