Index: kernel/generic/src/lib/elf.c
===================================================================
--- kernel/generic/src/lib/elf.c	(revision db25906ae389cbb1daa0388e689042597fb88e4e)
+++ kernel/generic/src/lib/elf.c	(revision a052d7f7c18ae8e4dee091ee1633b74379103039)
@@ -57,7 +57,10 @@
 };
 
-static int segment_header(elf_segment_header_t *entry, elf_header_t *elf, as_t *as);
-static int section_header(elf_section_header_t *entry, elf_header_t *elf, as_t *as);
-static int load_segment(elf_segment_header_t *entry, elf_header_t *elf, as_t *as);
+static int segment_header(elf_segment_header_t *entry, elf_header_t *elf,
+    as_t *as);
+static int section_header(elf_section_header_t *entry, elf_header_t *elf,
+    as_t *as);
+static int load_segment(elf_segment_header_t *entry, elf_header_t *elf,
+    as_t *as);
 
 /** ELF loader
@@ -72,12 +75,16 @@
 
 	/* Identify ELF */
-	if (header->e_ident[EI_MAG0] != ELFMAG0 || header->e_ident[EI_MAG1] != ELFMAG1 || 
-	    header->e_ident[EI_MAG2] != ELFMAG2 || header->e_ident[EI_MAG3] != ELFMAG3) {
+	if (header->e_ident[EI_MAG0] != ELFMAG0 ||
+	    header->e_ident[EI_MAG1] != ELFMAG1 || 
+	    header->e_ident[EI_MAG2] != ELFMAG2 ||
+	    header->e_ident[EI_MAG3] != ELFMAG3) {
 		return EE_INVALID;
 	}
 	
 	/* Identify ELF compatibility */
-	if (header->e_ident[EI_DATA] != ELF_DATA_ENCODING || header->e_machine != ELF_MACHINE || 
-	    header->e_ident[EI_VERSION] != EV_CURRENT || header->e_version != EV_CURRENT ||
+	if (header->e_ident[EI_DATA] != ELF_DATA_ENCODING ||
+	    header->e_machine != ELF_MACHINE || 
+	    header->e_ident[EI_VERSION] != EV_CURRENT ||
+	    header->e_version != EV_CURRENT ||
 	    header->e_ident[EI_CLASS] != ELF_CLASS) {
 		return EE_INCOMPATIBLE;
@@ -96,5 +103,9 @@
 	/* Walk through all segment headers and process them. */
 	for (i = 0; i < header->e_phnum; i++) {
-		rc = segment_header(&((elf_segment_header_t *)(((uint8_t *) header) + header->e_phoff))[i], header, as);
+		elf_segment_header_t *seghdr;
+
+		seghdr = &((elf_segment_header_t *)(((uint8_t *) header) +
+		    header->e_phoff))[i];
+		rc = segment_header(seghdr, header, as);
 		if (rc != EE_OK)
 			return rc;
@@ -103,5 +114,9 @@
 	/* Inspect all section headers and proccess them. */
 	for (i = 0; i < header->e_shnum; i++) {
-		rc = section_header(&((elf_section_header_t *)(((uint8_t *) header) + header->e_shoff))[i], header, as);
+		elf_section_header_t *sechdr;
+
+		sechdr = &((elf_section_header_t *)(((uint8_t *) header) +
+		    header->e_shoff))[i];
+		rc = section_header(sechdr, header, as);
 		if (rc != EE_OK)
 			return rc;
@@ -119,5 +134,5 @@
 char *elf_error(int rc)
 {
-	ASSERT(rc < sizeof(error_codes)/sizeof(char *));
+	ASSERT(rc < sizeof(error_codes) / sizeof(char *));
 
 	return error_codes[rc];
@@ -132,5 +147,6 @@
  * @return EE_OK on success, error code otherwise.
  */
-static int segment_header(elf_segment_header_t *entry, elf_header_t *elf, as_t *as)
+static int segment_header(elf_segment_header_t *entry, elf_header_t *elf,
+    as_t *as)
 {
 	switch (entry->p_type) {
@@ -172,5 +188,6 @@
 
 	if (entry->p_align > 1) {
-		if ((entry->p_offset % entry->p_align) != (entry->p_vaddr % entry->p_align)) {
+		if ((entry->p_offset % entry->p_align) !=
+		    (entry->p_vaddr % entry->p_align)) {
 			return EE_INVALID;
 		}
@@ -191,6 +208,6 @@
 		return EE_UNSUPPORTED;
 
-	a = as_area_create(as, flags, entry->p_memsz, entry->p_vaddr, AS_AREA_ATTR_NONE,
-		&elf_backend, &backend_data);
+	a = as_area_create(as, flags, entry->p_memsz, entry->p_vaddr,
+	    AS_AREA_ATTR_NONE, &elf_backend, &backend_data);
 	if (!a)
 		return EE_MEMORY;
@@ -211,7 +228,18 @@
  * @return EE_OK on success, error code otherwise.
  */
-static int section_header(elf_section_header_t *entry, elf_header_t *elf, as_t *as)
+static int section_header(elf_section_header_t *entry, elf_header_t *elf,
+    as_t *as)
 {
 	switch (entry->sh_type) {
+	case SHT_PROGBITS:
+		if (entry->sh_flags & SHF_TLS) {
+			/* .tdata */
+		}
+		break;
+	case SHT_NOBITS:
+		if (entry->sh_flags & SHF_TLS) {
+			/* .tbss */
+		}
+		break;
 	default:
 		break;