Changeset 0e9b512 in mainline for uspace/lib/c/rtld/arch/ppc32/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/ppc32/src/reloc.c (modified) (11 diffs)

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

@@ -38 +38 @@
 #include <stdlib.h>
 
-#include <arch.h>
 #include <elf_dyn.h>
 #include <symbol.h>
@@ -44 +43 @@
 #include <smc.h>
 
+#include <rtld_arch.h>
+
 #define __L(ptr) ((uint32_t)(ptr) & 0x0000ffff)
 #define __HA(ptr) ((uint32_t)(ptr) >> 16)
@@ -85 +86 @@
 {
         uint32_t *plt;
-        uint32_t *_plt_ent;
+//      uint32_t *_plt_ent;
         
         /* No lazy linking -- no pre-processing yet. */
@@ -97 +98 @@
 
         // PLT entries start here. However, each occupies 2 words
-        _plt_ent = plt + 18;
+//      _plt_ent = plt + 18;
 
         // By definition of the ppc ABI, there's 1:1 correspondence
@@ -104 +105 @@
 
         uint32_t *_plt_table;
-        uint32_t *_plt_call;
-        uint32_t *_plt_resolve;
-
-        _plt_resolve = plt;
-        _plt_call = plt + 6;
+//      uint32_t *_plt_call;
+//      uint32_t *_plt_resolve;
+
+//      _plt_resolve = plt;
+//      _plt_call = plt + 6;
         _plt_table = plt + 18 + plt_n;
 
@@ -136 +137 @@
 void rela_table_process(module_t *m, elf_rela_t *rt, size_t rt_size)
 {
-        int i;
+        unsigned i;
 
         size_t rt_entries;
@@ -156 +157 @@
 
         uint32_t *plt;
-        uint32_t *_plt_table;
+//      uint32_t *_plt_table;
         uint32_t *_plt_ent;
         uint32_t plt_n;
@@ -166 +167 @@
         plt_n = m->dyn.plt_rel_sz / sizeof(elf_rela_t);
         _plt_ent = plt+ 18;
-        _plt_table = plt + 18 + plt_n;
+//      _plt_table = plt + 18 + plt_n;
 
         DPRINTF("parse relocation table\n");
@@ -201 +202 @@
                         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 {
@@ -207 +209 @@
                                 continue;
                         }
+                } else {
+                        sym_def = NULL;
+                        sym_addr = 0;
                 }
 
@@ -247 +252 @@
                          */
                         DPRINTF("fixup R_PPC_COPY (s)\n");
+
                         sym_size = sym->st_size;
                         if (sym_size != sym_def->st_size) {