Changeset 1ea99cc in mainline for uspace/lib/libc/generic/libc.c

Timestamp:

2009-08-20T20:47:35Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b50b5af2

Parents:

24edc18

Message:

Merge changes from original Subversion dynload branch.

File:

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

uspace/lib/libc/generic/libc.c

@@ -53 +53 @@
 #include <loader/pcb.h>
 
+/* From librtld. */
+#include <rtld.h>
+#include <string.h>
+
 extern int main(int argc, char *argv[]);
 
@@ -75 +79 @@
         char **argv;
         
+#ifdef __IN_SHARED_LIBC__
+        if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
+                runtime_env = (runtime_env_t *) __pcb->rtld_runtime;
+        }
+#endif
+
         if (__pcb == NULL) {
                 argc = 0;