Changeset 544a2e4 in mainline for uspace/lib/c/generic/libc.c

Timestamp:

2011-05-30T21:37:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (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 mainline changes.

File:

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

uspace/lib/c/generic/libc.c

@@ -53 +53 @@
 #include "private/io.h"
 
+#ifdef CONFIG_RTLD
+#include <rtld/rtld.h>
+#endif
+
 static bool env_setup = false;
 
@@ -77 +81 @@
         char **argv;
         
+#ifdef __IN_SHARED_LIBC__
+        if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
+                runtime_env = (runtime_env_t *) __pcb->rtld_runtime;
+        }
+#endif
         /*
          * Get command line arguments and initialize