From 2b72162b81b33a9f5983feccadd8426a1ab6f950 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 12 Jan 2017 10:15:56 +0100
Subject: score: Add Thread_queue_Queue::name

Update #2858.
---
 cpukit/score/src/condition.c | 2 +-
 cpukit/score/src/futex.c     | 2 +-
 cpukit/score/src/mutex.c     | 8 ++++----
 cpukit/score/src/semaphore.c | 4 ++--
 cpukit/score/src/threadq.c   | 8 +++++++-
 5 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'cpukit/score/src')

diff --git a/cpukit/score/src/condition.c b/cpukit/score/src/condition.c
index 3c3a01141c..7c370acba3 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 d09b00b1c9..1a19f32ca7 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 ebdedf773d..96834bfb36 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 5e64583803..78fec377fe 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 b12e3deb49..4885326e52 100644
--- a/cpukit/score/src/threadq.c
+++ b/cpukit/score/src/threadq.c
@@ -56,9 +56,15 @@ RTEMS_STATIC_ASSERT(
   THREAD_QUEUE_SYSLOCK_QUEUE_OWNER
 );
 
+RTEMS_STATIC_ASSERT(
+  offsetof( Thread_queue_Syslock_queue, Queue.name )
+    == offsetof( struct _Thread_queue_Queue, _name ),
+  THREAD_QUEUE_SYSLOCK_QUEUE_NAME
+);
+
 RTEMS_STATIC_ASSERT(
   sizeof( Thread_queue_Syslock_queue )
-    <= sizeof( struct _Thread_queue_Queue ),
+    == sizeof( struct _Thread_queue_Queue ),
   THREAD_QUEUE_SYSLOCK_QUEUE_SIZE
 );
 
-- 
cgit v1.2.3