Changeset acb14ce in mainline for uspace/lib/c/generic/elf/elf_load.c

Timestamp:

2025-02-02T22:06:07Z (6 months ago)

Author:

Matěj Volf <git@…>

Children:

c095552c

Parents:

bdcf71e

git-author:

Matěj Volf <git@…> (2025-02-02 21:59:42)

git-committer:

Matěj Volf <git@…> (2025-02-02 22:06:07)

Message:

unify rtld loading implementation of static/dynamic executables

File:

• uspace/lib/c/generic/elf/elf_load.c (modified) (1 diff)

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

@@ -69 +69 @@
         }
 
+#ifdef CONFIG_RTLD
+        DPRINTF("- prog dynamic: %p\n", finfo->dynamic);
+        rc = rtld_prog_process(finfo, &env);
+        if (rc != EOK) {
+                DPRINTF("Failed to process executable '%s'.\n", file_name);
+                return rc;
+        }
+        info->env = env;
+        return EOK;
+#else
         if (info->finfo.dynamic == NULL) {
-                /* Statically linked program */
-                DPRINTF("Binary is statically linked.\n");
                 info->env = NULL;
-#ifdef CONFIG_RTLD
-                rc = rtld_init_static(finfo, &env);
-                info->env = env;
-#endif
                 return EOK;
         }
 
-        DPRINTF("Binary is dynamically linked.\n");
-#ifdef CONFIG_RTLD
-        DPRINTF("- prog dynamic: %p\n", finfo->dynamic);
-        rc = rtld_prog_process(finfo, &env);
-        info->env = env;
-#else
-        rc = ENOTSUP;
+        DPRINTF("Error: trying to run a dynamically-linked executable with CONFIG_RTLD disabled.\n");
+        return ENOTSUP;
 #endif
-        return rc;
 }