Changeset 29405ac in mainline for uspace/lib/c/arch/ia32/src/rtld/reloc.c

Timestamp:

2016-05-16T18:10:00Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bab0f42

Parents:

0dc9a474

Message:

DTPMOD relocations with null symbol name should return the current module index. Implement TPOFF relocations. dltest -n to not run dlfcn tests. Now dltest -n works like a charm. Place TLS images in descending order for variant II just to be safe. Propagate TLS alignment info.

File:

• uspace/lib/c/arch/ia32/src/rtld/reloc.c (modified) (2 diffs)

uspace/lib/c/arch/ia32/src/rtld/reloc.c

@@ -115 +115 @@
                         sym_addr = 0;
                         sym_def = NULL;
+
+                        /*
+                         * DTPMOD with null st_name should return the index
+                         * of the current module.
+                         */
+                        dest = m;
                 }
 
@@ -171 +177 @@
                         break;
 
-//              case R_386_TLS_DTPOFF32:
-//                      *r_ptr = sym_def->st_value;
-//                      break; 
+                case R_386_TLS_TPOFF:
+                        DPRINTF("fixup R_386_TLS_TPOFF\n");
+                        *r_ptr = (dest->ioffs + sym_def->st_value) - dest->rtld->tls_size;
+                        break;
+
+                case R_386_TLS_DTPOFF32:
+                        DPRINTF("fixup R_386_TLS_DTPOFF32\n");
+                        *r_ptr = sym_def->st_value;
+                        break;
 
                 case R_386_TLS_DTPMOD32:
+                        DPRINTF("fixup R_386_TLS_DTPMOD32\n");
                         *r_ptr = dest->id;
                         break;