Changeset bfdb5af1 in mainline for uspace/srv

Timestamp:

2011-07-23T13:25:56Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

aa8053f1

Parents:

90b8d58

Message:

Fix build with dynamic linking enabled.
Eliminate surplus copy of elf_load.c, elf_load.h.

Location:

uspace/srv/loader

Files:

• Makefile (modified) (2 diffs)
• main.c (modified) (2 diffs)

uspace/srv/loader/Makefile

@@ -39 +39 @@
 LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld
 
-EXTRA_CFLAGS = -Iinclude
-
 BINARY = loader
 STATIC_ONLY = y
@@ -46 +44 @@
 GENERIC_SOURCES = \
         main.c \
-        elf_load.c \
         interp.s
 

uspace/srv/loader/main.c

@@ -60 +60 @@
 #include <as.h>
 #include <elf/elf.h>
-
-#include "elf_load.h"
+#include <elf/elf_load.h>
 
 #ifdef CONFIG_RTLD
@@ -349 +348 @@
 
         /* Initialize list of loaded modules */
-        list_initialize(&runtime_env->modules_head);
-        list_append(&prog_mod.modules_link, &runtime_env->modules_head);
+        list_initialize(&runtime_env->modules);
+        list_append(&prog_mod.modules_link, &runtime_env->modules);
 
         /* Pointer to program module. Used as root of the module graph. */