[PATCH] RTEMS: Make pthread_mutex_t self-contained

[Sebastian Huber]

Signed-off-by: Sebastian Huber <sebastian.huber at embedded-brains.de>
---
 newlib/libc/sys/rtems/include/sys/_pthreadtypes.h | 30 +++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/newlib/libc/sys/rtems/include/sys/_pthreadtypes.h b/newlib/libc/sys/rtems/include/sys/_pthreadtypes.h
index 70477a2a6..52cc6e649 100644
--- a/newlib/libc/sys/rtems/include/sys/_pthreadtypes.h
+++ b/newlib/libc/sys/rtems/include/sys/_pthreadtypes.h
@@ -131,9 +131,35 @@ typedef struct {
 
 #endif /* !defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES) */
 
-typedef __uint32_t pthread_mutex_t;      /* identify a mutex */
+struct _Chain_Node {
+  struct _Chain_Node *_next;
+  struct _Chain_Node *_previous;
+};
+
+struct _RBTree_Node {
+  struct _RBTree_Node *_left;
+  struct _RBTree_Node *_right;
+  struct _RBTree_Node *_parent;
+  int _color;
+};
+
+struct _Priority_Node {
+  union {
+    struct _RBTree_Node _RBTree;
+    struct _Chain_Node _Chain;
+  } _Node;
+  __uint64_t _priority;
+};
 
-#define _PTHREAD_MUTEX_INITIALIZER ((pthread_mutex_t) 0xFFFFFFFF)
+typedef struct {
+  unsigned long _flags;
+  struct _Mutex_recursive_Control _Recursive;
+  struct _Priority_Node _Priority_ceiling;
+  const struct _Scheduler_Control *_scheduler;
+} pthread_mutex_t;
+
+#define _PTHREAD_MUTEX_INITIALIZER \
+  { 0, _MUTEX_RECURSIVE_INITIALIZER, { { 0, 0, 0, 0 }, 0 }, 0 }
 
 typedef struct {
   int   is_initialized;
-- 
2.12.3