Changeset 0e9b512 in mainline for uspace/lib/c/rtld/arch/mips32/src/reloc.c

Timestamp:

2011-04-03T16:31:15Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cf44c14

Parents:

e2098dd7

Message:

Fix mips32 and ppc32 builds.

File:

• uspace/lib/c/rtld/arch/mips32/src/reloc.c (modified) (9 diffs)

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

@@ -38 +38 @@
 #include <stdlib.h>
 
-#include <arch.h>
 #include <elf_dyn.h>
 #include <symbol.h>
 #include <rtld.h>
+
+#include <rtld_arch.h>
 
 void module_process_pre_arch(module_t *m)
@@ -52 +53 @@
         uint32_t *got;
         char *str_tab;
-        int i, j;
+        unsigned i, j;
 
         uint32_t sym_addr;
@@ -124 +125 @@
                 sym_def = symbol_def_find(str_tab + sym->st_name, m, &dest);
                 if (sym_def) {
-                        sym_addr = symbol_get_addr(sym_def, dest);
+                        sym_addr = (uintptr_t) symbol_get_addr(sym_def, dest);
                         DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
                 } else {
@@ -142 +143 @@
 void rel_table_process(module_t *m, elf_rel_t *rt, size_t rt_size)
 {
-        int i;
+        unsigned i;
 
         size_t rt_entries;
@@ -154 +155 @@
         elf_symbol_t *sym;
         uint32_t *r_ptr;
-        uint16_t *r_ptr16;
+/*      uint16_t *r_ptr16;*/
         char *str_tab;
         
@@ -174 +175 @@
         lgotno = m->dyn.arch.lgotno;
 
-        DPRINTF("got=0x%lx, gotsym=%d\n", (uintptr_t) got, gotsym);
+        DPRINTF("got=0x%x, gotsym=%d\n", (uintptr_t) got, gotsym);
 
         DPRINTF("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
@@ -193 +194 @@
                 rel_type = ELF32_R_TYPE(r_info);
                 r_ptr = (uint32_t *)(r_offset + m->bias);
-                r_ptr16 = (uint16_t *)(r_offset + m->bias);
+                /*r_ptr16 = (uint16_t *)(r_offset + m->bias);*/
 
                 if (sym->st_name != 0) {
@@ -200 +201 @@
                         DPRINTF("dest bias: 0x%x\n", dest->bias);
                         if (sym_def) {
-                                sym_addr = symbol_get_addr(sym_def, dest);
+                                sym_addr = (uintptr_t) symbol_get_addr(sym_def,
+                                    dest);
                                 DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
                         } else {
@@ -206 +208 @@
                                 continue;
                         }
+                } else {
+                        sym_def = NULL;
+                        sym_addr = 0;
                 }