Changeset dc0d8b52 in mainline

Timestamp:

2016-04-21T14:01:12Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

054476d, 6adb775f

Parents:

17341d4

Message:

Fix build on arches not supporting dynamic linking.

Location:

uspace/lib/c

Files:

• generic/elf/elf_load.c (modified) (1 diff)
• include/elf/elf_load.h (modified) (1 diff)

uspace/lib/c/generic/elf/elf_load.c

@@ -36 +36 @@
  */
 
+#include <elf/elf_load.h>
+#include <elf/elf_mod.h>
 #include <errno.h>
 #include <stdio.h>
-#include <elf/elf_load.h>
-#include <elf/elf_mod.h>
+#include <stdlib.h>
+
+#ifdef CONFIG_RTLD
 #include <rtld/rtld.h>
-
+#endif
 
 #define DPRINTF(...)

uspace/lib/c/include/elf/elf_load.h

@@ -38 +38 @@
 
 #include <elf/elf_mod.h>
-#include <rtld/rtld.h>
 
 /** Information on loaded ELF program */
 typedef struct {
         elf_finfo_t finfo;
-        rtld_t *env;
+        struct rtld *env;
 } elf_info_t;