Changeset 7fb3f1c in mainline for uspace/srv

Timestamp:

2011-04-30T20:22:35Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5b72635

Parents:

2ca5f632

Message:

Make all architectures buildable. Only allow enabling dynamic linking on ia32.

File:

• uspace/srv/loader/main.c (modified) (5 diffs)

uspace/srv/loader/main.c

@@ -65 +65 @@
 
 /* From librtld */
+#ifdef CONFIG_RTLD
 #include <rtld.h>
 #include <dynamic.h>
@@ -70 +71 @@
 #include <module.h>
 
+static int ldr_load_dyn_linked(elf_info_t *p_info);
+#endif
+
 #define DPRINTF(...)
-
-static int ldr_load_dyn_linked(elf_info_t *p_info);
 
 /** Pathname of the file that will be loaded */
@@ -102 +104 @@
 static bool connected = false;
 
+#ifdef CONFIG_RTLD
 /** State structure of the dynamic linker. */
 runtime_env_t dload_re;
 static module_t prog_mod;
+#endif
 
 static void ldr_get_taskid(ipc_callid_t rid, ipc_call_t *request)
@@ -317 +321 @@
         
         DPRINTF("Binary is dynamically linked.\n");
+#ifdef CONFIG_RTLD
         DPRINTF(" - pcb address: %p\n", &pcb);
         DPRINTF( "- prog dynamic: %p\n", prog_info.dynamic);
 
         rc = ldr_load_dyn_linked(&prog_info);
-
+#else
+        rc = ENOTSUP;
+#endif
         async_answer_0(rid, rc);
         return 0;
 }
+
+#ifdef CONFIG_RTLD
 
 static int ldr_load_dyn_linked(elf_info_t *p_info)
@@ -372 +381 @@
         return 0;
 }
+#endif
 
 /** Run the previously loaded program.