Changeset 04803bf in mainline for uspace/lib/c/rtld/arch/ia32/src/reloc.c

Timestamp:

2011-03-21T22:00:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 mainline changes (needs fixes).

File:

• uspace/lib/c/rtld/arch/ia32/src/reloc.c (moved) (moved from uspace/lib/libc/rtld/arch/ia32/src/reloc.c ) (4 diffs)

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

@@ -55 +55 @@
 void rel_table_process(module_t *m, elf_rel_t *rt, size_t rt_size)
 {
-        int i;
+        unsigned i;
 
         size_t rt_entries;
@@ -62 +62 @@
         unsigned rel_type;
         elf_word sym_idx;
-        uintptr_t sym_addr;
+        uint32_t sym_addr;
         
         elf_symbol_t *sym_table;
@@ -104 +104 @@
 //                      DPRINTF("dest bias: 0x%x\n", dest->bias);
                         if (sym_def) {
-                                sym_addr = symbol_get_addr(sym_def, dest);
+                                sym_addr = (uint32_t)
+                                    symbol_get_addr(sym_def, dest);
 //                              DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
                         } else {
@@ -111 +112 @@
                                 continue;
                         }
+                } else {
+                        sym_addr = 0;
+                        sym_def = NULL;
                 }