Changeset 49093a4 in mainline

Timestamp:

2008-12-05T22:44:24Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

2b1f860

Parents:

965dc18

Message:

Remove obsolete dld-related loader fragments.

Location:

uspace

Files:

• lib/libc/include/loader/pcb.h (modified) (1 diff)
• srv/loader/main.c (modified) (4 diffs)

uspace/lib/libc/include/loader/pcb.h

@@ -48 +48 @@
  */
 typedef struct {
-        /** Program entry point */
+        /** Program entry point. */
         entry_point_t entry;
 
-        /** Number of command-line arguments */
+        /** Number of command-line arguments. */
         int argc;
-        /** Command-line arguments */
+        /** Command-line arguments. */
         char **argv;
 
         /*
-         * ELF-specific data
+         * ELF-specific data.
          */
-        /** Pointer to ELF dynamic section of the program */
+        /** Pointer to ELF dynamic section of the program. */
         void *dynamic;
-        /** Pointer to dynamic section of the runtime linker */
-        void *rtld_dynamic;
-        /** Runtime-linker load bias */
-        uintptr_t rtld_bias;
 } pcb_t;
 
+/**
+ * A pointer to the program control block. Having received the PCB pointer,
+ * the C library startup code stores it here for later use.
+ */
 extern pcb_t *__pcb;
 

uspace/srv/loader/main.c

@@ -60 +60 @@
 #include <elf_load.h>
 
-/** 
- * Bias used for loading the dynamic linker. This will be soon replaced
- * by automatic placement.
- */
-#define RTLD_BIAS 0x80000
-
 /** Pathname of the file that will be loaded */
 static char *pathname = NULL;
@@ -230 +224 @@
         int rc;
 
-//      printf("Load program '%s'\n", pathname);
-
         rc = elf_load_file(pathname, 0, &prog_info);
         if (rc < 0) {
-                printf("failed to load program\n");
+                printf("Failed to load executable '%s'.\n", pathname);
                 ipc_answer_0(rid, EINVAL);
                 return 1;
         }
 
-//      printf("Create PCB\n");
         elf_create_pcb(&prog_info, &pcb);
 
@@ -247 +238 @@
         if (prog_info.interp == NULL) {
                 /* Statically linked program */
-//              printf("Run statically linked program\n");
-//              printf("entry point: 0x%lx\n", prog_info.entry);
                 is_dyn_linked = false;
                 ipc_answer_0(rid, EOK);
@@ -254 +243 @@
         }
 
-        printf("Load dynamic linker '%s'\n", prog_info.interp);
-        rc = elf_load_file("/rtld.so", RTLD_BIAS, &interp_info);
+        rc = elf_load_file(prog_info.interp, 0, &interp_info);
         if (rc < 0) {
-                printf("failed to load dynamic linker\n");
+                printf("Failed to load interpreter '%s.'\n", prog_info.interp);
                 ipc_answer_0(rid, EINVAL);
                 return 1;
         }
-
-        /*
-         * Provide dynamic linker with some useful data
-         */
-        pcb.rtld_dynamic = interp_info.dynamic;
-        pcb.rtld_bias = RTLD_BIAS;
 
         is_dyn_linked = true;