1 files changed, 37 insertions, 2 deletions

diff --git a/testsuites/sptests/sptls01/init.c b/testsuites/sptests/sptls01/init.c
index a1c55940d9..d6beeedf90 100644
--- a/testsuites/sptests/sptls01/init.c
+++ b/testsuites/sptests/sptls01/init.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-2-Clause */
 
 /*
- * Copyright (C) 2014, 2022 embedded brains GmbH
+ * Copyright (C) 2014, 2022 embedded brains GmbH & Co. KG
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,6 +32,8 @@
 #include <rtems/bspIo.h>
 #include <rtems/stackchk.h>
 #include <rtems/sysinit.h>
+#include <rtems/score/cpuimpl.h>
+#include <rtems/score/threadimpl.h>
 #include <rtems/score/tls.h>
 
 #include "tmacros.h"
@@ -57,6 +59,7 @@ static void task(rtems_task_argument arg)
   rtems_status_code sc;
 
   check_tls_item(123);
+  tls_item = 42;
 
   sc = rtems_event_transient_send(master_task);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
@@ -67,9 +70,11 @@ static void task(rtems_task_argument arg)
 
 static void check_tls_size(void)
 {
+  const volatile TLS_Configuration *config;
   uintptr_t tls_size;
 
-  tls_size = _TLS_Get_size();
+  config = &_TLS_Configuration;
+  tls_size = (uintptr_t) config->size;
 
   if (tls_size != 1) {
     printk(
@@ -83,10 +88,27 @@ static void check_tls_size(void)
   }
 }
 
+static Thread_Control *get_thread(rtems_id id)
+{
+  Thread_Control *the_thread;
+  ISR_lock_Context lock_context;
+
+  the_thread = _Thread_Get(id, &lock_context);
+  _ISR_lock_ISR_enable(&lock_context);
+  return the_thread;
+}
+
 static void test(void)
 {
   rtems_id id;
   rtems_status_code sc;
+  Thread_Control *self;
+  Thread_Control *other;
+  char *self_tp;
+  char *other_tp;
+  uintptr_t tls_item_offset;
+  char *self_tls_item;
+  char *other_tls_item;
 
   master_task = rtems_task_self();
 
@@ -109,9 +131,22 @@ static void test(void)
   sc = rtems_task_start(id, task, 0);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
+  self = get_thread(master_task);
+  other = get_thread(id);
+  self_tp = _CPU_Get_TLS_thread_pointer(&self->Registers);
+  other_tp = _CPU_Get_TLS_thread_pointer(&other->Registers);
+  tls_item_offset = (uintptr_t) (&tls_item - self_tp);
+  self_tls_item = self_tp + tls_item_offset;
+  other_tls_item = other_tp + tls_item_offset;
+  rtems_test_assert(*self_tls_item == 5);
+  rtems_test_assert(*other_tls_item == 123);
+
   sc = rtems_event_transient_receive(RTEMS_WAIT, RTEMS_NO_TIMEOUT);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
+  rtems_test_assert(*self_tls_item == 5);
+  rtems_test_assert(*other_tls_item == 42);
+
   sc = rtems_task_delete(id);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);