Changeset c6f1eb05 in mainline

Timestamp:

2012-10-20T20:13:10Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

849bebe4

Parents:

7d248e3

Message:

Make dlfcn functions available even when dynamic linking is not supported/enabled.

Location:

uspace/lib/c

Files:

• Makefile (modified) (2 diffs)
• generic/dlfcn.c (modified) (2 diffs)

uspace/lib/c/Makefile ¶

@@ -77 +77 @@
         generic/device/pci.c \
         generic/device/ahci.c \
+        generic/dlfcn.c \
         generic/elf/elf_load.c \
         generic/event.c \
@@ -144 +145 @@
 ifeq ($(CONFIG_RTLD),y)
         GENERIC_SOURCES += \
-                generic/dlfcn.c \
                 generic/rtld/rtld.c \
                 generic/rtld/dynamic.c \

uspace/lib/c/generic/dlfcn.c ¶

@@ -38 +38 @@
 #include <stdlib.h>
 #include <dlfcn.h>
+
+#ifdef CONFIG_RTLD
 
 #include <rtld/module.h>
@@ -87 +89 @@
 }
 
+#else /* CONFIG_RTLD not defined */
+
+void *dlopen(const char *path, int flag)
+{
+        return NULL;
+}
+
+void *dlsym(void *mod, const char *sym_name)
+{
+        return NULL;
+}
+
+#endif
+
 /** @}
  */