Changeset 272a293 in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2019-01-09T15:11:17Z (6 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

a91b828

Parents:

60c96cf (diff), 1567471 (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 upstream changes

File:

• uspace/lib/c/generic/rtld/module.c (modified) (2 diffs)

uspace/lib/c/generic/rtld/module.c

@@ -50 +50 @@
 #include <rtld/rtld_arch.h>
 #include <rtld/module.h>
+#include <libarch/rtld/module.h>
 
 #include "../private/libc.h"
@@ -206 +207 @@
         DPRINTF("filename:'%s'\n", name_buf);
 
-        rc = elf_load_file_name(name_buf, ELDF_RW, &info);
+        rc = elf_load_file_name(name_buf, RTLD_MODULE_LDF, &info);
         if (rc != EE_OK) {
                 printf("Failed to load '%s'\n", name_buf);