Changeset f570cdf in mainline for uspace/lib/c/arch/ia32/_link.ld.in

Timestamp:

2016-05-24T15:32:57Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c170438

Parents:

dcc150cb (diff), 0a981e3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• uspace/lib/c/arch/ia32/_link.ld.in (modified) (2 diffs)

uspace/lib/c/arch/ia32/_link.ld.in

@@ -12 +12 @@
 #endif
         data PT_LOAD FLAGS(6);
+        tls PT_TLS;
 #if defined(SHLIB) || defined(DLEXE)
         dynamic PT_DYNAMIC;
@@ -95 +96 @@
 #endif
         
+        .tdata : {
 #ifndef DLEXE
-        .tdata : {
                 _tdata_start = .;
+#endif
                 *(.tdata);
                 *(.gnu.linkonce.tb.*);
+#ifndef DLEXE
                 _tdata_end = .;
+#endif
+        } :data :tls
+        .tbss : {
+#ifndef DLEXE
                 _tbss_start = .;
+#endif
                 *(.tbss);
+#ifndef DLEXE
                 _tbss_end = .;
-        } :data
+#endif
+        } :data :tls
         
-        _tls_alignment = ALIGNOF(.tdata);
+#ifndef DLEXE
+        _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
 #endif