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

Timestamp:

2016-09-01T16:46:27Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

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

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

@@ -69 +69 @@
         uint32_t sym_size;
         char *str_tab;
-
+        
         elf_symbol_t *sym_def;
         module_t *dest;
@@ -80 +80 @@
 
         DPRINTF("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
-
+        
         for (i = 0; i < rt_entries; ++i) {
 //              DPRINTF("symbol %d: ", i);
@@ -171 +171 @@
                         memcpy(r_ptr, (const void *)sym_addr, sym_size);
                         break;
-
+                        
                 case R_386_RELATIVE:
                         DPRINTF("fixup R_386_RELATIVE (b+a)\n");