Changeset f570cdf in mainline for uspace/lib/c/generic/elf/elf_mod.c

Timestamp:

2016-05-24T15:32:57Z (8 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/generic/elf/elf_mod.c (modified) (2 diffs)

uspace/lib/c/generic/elf/elf_mod.c

@@ -248 +248 @@
 }
 
+/** Process TLS program header.
+ *
+ * @param elf  Pointer to loader state buffer.
+ * @param hdr  TLS program header
+ * @param info Place to store TLS info
+ */
+static void tls_program_header(elf_ld_t *elf, elf_segment_header_t *hdr,
+    elf_tls_info_t *info)
+{
+        info->tdata = (void *)((uint8_t *)hdr->p_vaddr + elf->bias);
+        info->tdata_size = hdr->p_filesz;
+        info->tbss_size = hdr->p_memsz - hdr->p_filesz;
+        info->tls_align = hdr->p_align;
+}
+
 /** Process segment header.
  *
+ * @param elf   Pointer to loader state buffer.
  * @param entry Segment header.
  *
@@ -277 +293 @@
         case 0x70000000:
                 /* FIXME: MIPS reginfo */
+                break;
+        case PT_TLS:
+                /* Parse TLS program header */
+                tls_program_header(elf, entry, &elf->info->tls);
+                DPRINTF("TLS header found at %p\n",
+                    (void *)((uint8_t *)entry->p_vaddr + elf->bias));
                 break;
         case PT_SHLIB: