Changes in uspace/lib/c/generic/rtld/rtld.c [b83c5e4:f215c6ef] in mainline

File:

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

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

@@ -43 +43 @@
 
 rtld_t *runtime_env;
-static rtld_t rt_env_static;
 
 /** Initialize the runtime linker for use in a statically-linked executable. */
-errno_t rtld_init_static(void)
-{
+errno_t rtld_init_static(elf_finfo_t *finfo, rtld_t **rre)
+{
+        rtld_t *env;
         errno_t rc;
 
-        runtime_env = &rt_env_static;
-        list_initialize(&runtime_env->modules);
-        list_initialize(&runtime_env->imodules);
-        runtime_env->program = NULL;
-        runtime_env->next_id = 1;
-
-        rc = module_create_static_exec(runtime_env, NULL);
+        env = calloc(1, sizeof(rtld_t));
+        if (env == NULL)
+                return ENOMEM;
+
+        list_initialize(&env->modules);
+        list_initialize(&env->imodules);
+        env->program = NULL;
+        env->next_id = 1;
+
+        rc = module_create_static_exec(finfo->base, env);
         if (rc != EOK)
                 return rc;
 
-        modules_process_tls(runtime_env);
-
+        modules_process_tls(env);
+
+        *rre = env;
         return EOK;
 }
@@ -127 +131 @@
         errno_t rc = module_load_deps(prog, 0);
         if (rc != EOK) {
+                free(prog);
+                free(env);
                 return rc;
         }