diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-12-23 13:54:11 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-12-23 13:54:11 +0100 |
| commit | a7cfb4bda0a3f3cb2ccecbade43cd87d681dae4f (patch) | |
| tree | ce4b0da1ee14591560f4fa09c3c2ae5fd5a37756 | |
| parent | libio: Use CONSOLE_DEVICE_NAME (diff) | |
| download | rtems-a7cfb4bda0a3f3cb2ccecbade43cd87d681dae4f.tar.bz2 | |
score: Relax <sys/lock.h> static assertions
Only require that the Newlib defined structure is big enough.
| -rw-r--r-- | cpukit/score/src/condition.c | 2 | ||||
| -rw-r--r-- | cpukit/score/src/futex.c | 2 | ||||
| -rw-r--r-- | cpukit/score/src/mutex.c | 8 | ||||
| -rw-r--r-- | cpukit/score/src/semaphore.c | 4 | ||||
| -rw-r--r-- | cpukit/score/src/threadq.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/cpukit/score/src/condition.c b/cpukit/score/src/condition.c index ea363169fe..cf929144b3 100644 --- a/cpukit/score/src/condition.c +++ b/cpukit/score/src/condition.c @@ -41,7 +41,7 @@ RTEMS_STATIC_ASSERT( ); RTEMS_STATIC_ASSERT( - sizeof( Condition_Control ) == sizeof( struct _Condition_Control ), + sizeof( Condition_Control ) <= sizeof( struct _Condition_Control ), CONDITION_CONTROL_SIZE ); diff --git a/cpukit/score/src/futex.c b/cpukit/score/src/futex.c index f200895562..ea4cc89344 100644 --- a/cpukit/score/src/futex.c +++ b/cpukit/score/src/futex.c @@ -39,7 +39,7 @@ RTEMS_STATIC_ASSERT( ); RTEMS_STATIC_ASSERT( - sizeof( Futex_Control ) == sizeof( struct _Futex_Control ), + sizeof( Futex_Control ) <= sizeof( struct _Futex_Control ), FUTEX_CONTROL_SIZE ); diff --git a/cpukit/score/src/mutex.c b/cpukit/score/src/mutex.c index edd2e41dfd..30fba4e2fd 100644 --- a/cpukit/score/src/mutex.c +++ b/cpukit/score/src/mutex.c @@ -39,7 +39,7 @@ RTEMS_STATIC_ASSERT( ); RTEMS_STATIC_ASSERT( - sizeof( Mutex_Control ) == sizeof( struct _Mutex_Control ), + sizeof( Mutex_Control ) <= sizeof( struct _Mutex_Control ), MUTEX_CONTROL_SIZE ); @@ -50,19 +50,19 @@ typedef struct { RTEMS_STATIC_ASSERT( offsetof( Mutex_recursive_Control, Mutex ) - == offsetof( struct _Mutex_recursive_Control, _Mutex ), + <= offsetof( struct _Mutex_recursive_Control, _Mutex ), MUTEX_RECURSIVE_CONTROL_MUTEX ); RTEMS_STATIC_ASSERT( offsetof( Mutex_recursive_Control, nest_level ) - == offsetof( struct _Mutex_recursive_Control, _nest_level ), + <= offsetof( struct _Mutex_recursive_Control, _nest_level ), MUTEX_RECURSIVE_CONTROL_NEST_LEVEL ); RTEMS_STATIC_ASSERT( sizeof( Mutex_recursive_Control ) - == sizeof( struct _Mutex_recursive_Control ), + <= sizeof( struct _Mutex_recursive_Control ), MUTEX_RECURSIVE_CONTROL_SIZE ); diff --git a/cpukit/score/src/semaphore.c b/cpukit/score/src/semaphore.c index df33532108..7619147ece 100644 --- a/cpukit/score/src/semaphore.c +++ b/cpukit/score/src/semaphore.c @@ -39,12 +39,12 @@ RTEMS_STATIC_ASSERT( RTEMS_STATIC_ASSERT( offsetof( Semaphore_Control, count ) - == offsetof( struct _Semaphore_Control, _count ), + <= offsetof( struct _Semaphore_Control, _count ), SEMAPHORE_CONTROL_COUNT ); RTEMS_STATIC_ASSERT( - sizeof( Semaphore_Control ) == sizeof( struct _Semaphore_Control ), + sizeof( Semaphore_Control ) <= sizeof( struct _Semaphore_Control ), SEMAPHORE_CONTROL_SIZE ); diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c index c20007977b..d427431adb 100644 --- a/cpukit/score/src/threadq.c +++ b/cpukit/score/src/threadq.c @@ -58,7 +58,7 @@ RTEMS_STATIC_ASSERT( RTEMS_STATIC_ASSERT( sizeof( Thread_queue_Syslock_queue ) - == sizeof( struct _Thread_queue_Queue ), + <= sizeof( struct _Thread_queue_Queue ), THREAD_QUEUE_SYSLOCK_QUEUE_SIZE ); |