Changeset f570cdf in mainline for uspace/lib/c/arch/ia32/src/rtld/reloc.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/arch/ia32/src/rtld/reloc.c (modified) (4 diffs)

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

@@ -101 +101 @@
                         sym_def = symbol_def_find(str_tab + sym->st_name,
                             m, ssf_none, &dest);
-//                      DPRINTF("dest name: '%s'\n", dest->dyn.soname);
+                        DPRINTF("dest name: '%s'\n", dest->dyn.soname);
 //                      DPRINTF("dest bias: 0x%x\n", dest->bias);
                         if (sym_def) {
                                 sym_addr = (uint32_t)
-                                    symbol_get_addr(sym_def, dest);
+                                    symbol_get_addr(sym_def, dest, NULL);
 //                              DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
                         } else {
@@ -115 +115 @@
                         sym_addr = 0;
                         sym_def = NULL;
+
+                        /*
+                         * DTPMOD with null st_name should return the index
+                         * of the current module.
+                         */
+                        dest = m;
                 }
 
@@ -148 +154 @@
                         if (sym_def) {
                                 sym_addr = (uint32_t)
-                                    symbol_get_addr(sym_def, dest);
+                                    symbol_get_addr(sym_def, dest, NULL);
                         } else {
                                 printf("Source definition of '%s' not found.\n",
@@ -171 +177 @@
                         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:
-                        /*
-                         * We can ignore this as long as the only module
-                         * with TLS variables is libc.so.
-                         */
-                        DPRINTF("Ignoring R_386_TLS_DTPMOD32\n");
+                        DPRINTF("fixup R_386_TLS_DTPMOD32\n");
+                        *r_ptr = dest->id;
                         break;