diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-04-22 09:45:39 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-04-22 09:51:17 +0200 |
| commit | d60e760e8096feac0fff494f9bb1a0538115a905 (patch) | |
| tree | b8cba4a1a5e2ad9f5004eb5779c9d512884420f2 /c/src/lib/libbsp/sh/gensh4 | |
| parent | bsp/mbx8xx: Fix Makefile.am and bsp_specs (diff) | |
| download | rtems-d60e760e8096feac0fff494f9bb1a0538115a905.tar.bz2 | |
bsps: Fix TLS support in linker command files
The TLS section symbols had wrong values in case of an empty TLS data
section and a nonempty TLS BSS section.
Diffstat (limited to 'c/src/lib/libbsp/sh/gensh4')
| -rw-r--r-- | c/src/lib/libbsp/sh/gensh4/startup/linkcmds | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds index 23e62b9e4e..e2e3a993a2 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds +++ b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds @@ -104,9 +104,11 @@ SECTIONS __TLS_BSS_end = .; } > ram __TLS_Data_size = __TLS_Data_end - __TLS_Data_begin; + __TLS_Data_begin = __TLS_Data_size != 0 ? __TLS_Data_begin : __TLS_BSS_begin; + __TLS_Data_end = __TLS_Data_size != 0 ? __TLS_Data_end : __TLS_BSS_begin; __TLS_BSS_size = __TLS_BSS_end - __TLS_BSS_begin; __TLS_Size = __TLS_BSS_end - __TLS_Data_begin; - __TLS_Alignment = ALIGNOF (.tdata); + __TLS_Alignment = MAX (ALIGNOF (.tdata), ALIGNOF (.tbss)); .ctors : { ___ctors = .; diff --git a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom index ab156f0164..a84b502717 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom +++ b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom @@ -116,9 +116,11 @@ SECTIONS __TLS_BSS_end = .; } > rom __TLS_Data_size = __TLS_Data_end - __TLS_Data_begin; + __TLS_Data_begin = __TLS_Data_size != 0 ? __TLS_Data_begin : __TLS_BSS_begin; + __TLS_Data_end = __TLS_Data_size != 0 ? __TLS_Data_end : __TLS_BSS_begin; __TLS_BSS_size = __TLS_BSS_end - __TLS_BSS_begin; __TLS_Size = __TLS_BSS_end - __TLS_Data_begin; - __TLS_Alignment = ALIGNOF (.tdata); + __TLS_Alignment = MAX (ALIGNOF (.tdata), ALIGNOF (.tbss)); .ctors : { ___ctors = .; diff --git a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram index 1cdc32bd81..30c315e0d4 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram +++ b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram @@ -103,9 +103,11 @@ SECTIONS __TLS_BSS_end = .; } > ram __TLS_Data_size = __TLS_Data_end - __TLS_Data_begin; + __TLS_Data_begin = __TLS_Data_size != 0 ? __TLS_Data_begin : __TLS_BSS_begin; + __TLS_Data_end = __TLS_Data_size != 0 ? __TLS_Data_end : __TLS_BSS_begin; __TLS_BSS_size = __TLS_BSS_end - __TLS_BSS_begin; __TLS_Size = __TLS_BSS_end - __TLS_Data_begin; - __TLS_Alignment = ALIGNOF (.tdata); + __TLS_Alignment = MAX (ALIGNOF (.tdata), ALIGNOF (.tbss)); .ctors : AT(LOADADDR(.rodata) + SIZEOF(.rodata)) { ___ctors = .; |