Changeset 3e828ea in mainline for uspace/lib/c/arch/sparc64/src/rtld/reloc.c

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• uspace/lib/c/arch/sparc64/src/rtld/reloc.c (modified) (2 diffs)

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

@@ -206 +206 @@
                         }
 
-                        sym_size = sym->st_size;
-                        if (sym_size != sym_def->st_size) {
-                                printf("Warning: Mismatched symbol sizes.\n");
-                                /* Take the lower value. */
-                                if (sym_size > sym_def->st_size)
-                                        sym_size = sym_def->st_size;
-                        }
-
                         DPRINTF("sym_addr = 0x%zx\n", sym_addr);
                         DPRINTF("r_offset=0x%zx\n", r_offset);
@@ -307 +299 @@
 }
 
+/** Get the adress of a function.
+ *
+ * @param sym Symbol
+ * @param m Module in which the symbol is located
+ * @return Address of function
+ */
+void *func_get_addr(elf_symbol_t *sym, module_t *m)
+{
+        return symbol_get_addr(sym, m, __tcb_get());
+}
+
 /** @}
  */