From 18e47db51898227c59a1f2baf046bfeac24c8144 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Sat, 11 Dec 2021 11:43:44 +0100
Subject: bsp/mrm332: Fix TLS support in linker command file

---
 bsps/m68k/mrm332/start/linkcmds           | 16 ++++++----------
 spec/build/bsps/m68k/mrm332/tstmrm332.yml |  2 --
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/bsps/m68k/mrm332/start/linkcmds b/bsps/m68k/mrm332/start/linkcmds
index 7c31b92dd1..3ae0d027bd 100644
--- a/bsps/m68k/mrm332/start/linkcmds
+++ b/bsps/m68k/mrm332/start/linkcmds
@@ -139,11 +139,6 @@ SECTIONS
     *(.rodata*)
     KEEP (*(SORT(.rtemsroset.*)))
     *(.gnu.linkonce.r*)
-
-    . = ALIGN (16);
-    PROVIDE (_etext = .);
-    _endtext = .;
-    __data_start_rom = .;
   } > rom
   .tdata : {
     _TLS_Data_begin = .;
@@ -154,6 +149,11 @@ SECTIONS
     _TLS_BSS_begin = .;
     *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon)
     _TLS_BSS_end = .;
+
+    . = ALIGN (16);
+    PROVIDE (_etext = .);
+    _endtext = .;
+    __data_start_rom = .;
   } > rom
   _TLS_Data_size = _TLS_Data_end - _TLS_Data_begin;
   _TLS_Data_begin = _TLS_Data_size != 0 ? _TLS_Data_begin : _TLS_BSS_begin;
@@ -161,17 +161,13 @@ SECTIONS
   _TLS_BSS_size = _TLS_BSS_end - _TLS_BSS_begin;
   _TLS_Size = _TLS_BSS_end - _TLS_Data_begin;
   _TLS_Alignment = MAX (ALIGNOF (.tdata), ALIGNOF (.tbss));
-  .gcc_exc :
-  AT ( ADDR(.tdata) + SIZEOF( .tdata ) )
-  {
-    *(.gcc_exc)
-  } > ram
   .data : AT(__data_start_rom) 
   {
 	PROVIDE (_copy_start = .);
     *(.data*)
         KEEP (*(SORT(.rtemsrwset.*)))
 	*(.gnu.linkonce.d*)
+        *(.gcc_exc)
 	*(.gcc_except_table*)
 	*(.jcr)
     . = ALIGN (16);
diff --git a/spec/build/bsps/m68k/mrm332/tstmrm332.yml b/spec/build/bsps/m68k/mrm332/tstmrm332.yml
index 5c045c1764..d7c2c3e452 100644
--- a/spec/build/bsps/m68k/mrm332/tstmrm332.yml
+++ b/spec/build/bsps/m68k/mrm332/tstmrm332.yml
@@ -9,8 +9,6 @@ actions:
     iostream: exclude
     linpack: exclude
     record02: exclude
-    sptls01: exclude
-    sptls02: exclude
     utf8proc01: exclude
 build-type: option
 copyrights:
-- 
cgit v1.2.3