Changeset ab936440 in mainline for uspace/lib/c/generic/rtld/dynamic.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/lib/c/generic/rtld/dynamic.c (modified) (1 diff)

uspace/lib/c/generic/rtld/dynamic.c

@@ -64 +64 @@
                 d_ptr = (void *)((uint8_t *)dp->d_un.d_ptr + bias);
                 d_val = dp->d_un.d_val;
-                DPRINTF("tag=%u ptr=0x%x val=%u\n", (unsigned)dp->d_tag,
-                    (unsigned)d_ptr, (unsigned)d_val);
+                DPRINTF("tag=%u ptr=0x%zx val=%zu\n", (unsigned)dp->d_tag,
+                    (uintptr_t)d_ptr, (uintptr_t)d_val);
 
                 switch (dp->d_tag) {