Changeset f798178 in mainline for uspace/srv

Timestamp:

2011-04-30T13:44:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4ddbea7

Parents:

a71d2630 (diff), 3f461ecf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/srv/loader

Files:

• Makefile (modified) (2 diffs)
• arch/abs32le/Makefile.inc (deleted)
• arch/abs32le/_link.ld.in (deleted)
• arch/amd64/Makefile.inc (deleted)
• arch/amd64/_link.ld.in (deleted)
• arch/arm32/Makefile.inc (deleted)
• arch/arm32/_link.ld.in (deleted)
• arch/ia32/Makefile.inc (deleted)
• arch/ia32/_link.ld.in (deleted)
• arch/ia64/Makefile.inc (deleted)
• arch/ia64/_link.ld.in (deleted)
• arch/mips32/Makefile.inc (deleted)
• arch/mips32/_link.ld.in (deleted)
• arch/mips32eb (deleted)
• arch/ppc32/Makefile.inc (deleted)
• arch/ppc32/_link.ld.in (deleted)
• arch/sparc64/Makefile.inc (deleted)
• arch/sparc64/_link.ld.in (deleted)
• elf_load.c (modified) (2 diffs)
• main.c (modified) (3 diffs)

uspace/srv/loader/Makefile

@@ -36 +36 @@
 -include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
--include arch/$(UARCH)/Makefile.inc
 
-LINKER_SCRIPT = arch/$(UARCH)/_link.ld
-EXTRA_CLEAN = $(LINKER_SCRIPT)
+LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld
 
 EXTRA_CFLAGS = -Iinclude -I../../lib/c/rtld/include
@@ -55 +53 @@
 
 include $(USPACE_PREFIX)/Makefile.common
-
-$(LINKER_SCRIPT): $(LINKER_SCRIPT).in
-        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@

uspace/srv/loader/elf_load.c

@@ -2 +2 @@
  * Copyright (c) 2006 Sergey Bondari
  * Copyright (c) 2006 Jakub Jermar
- * Copyright (c) 2008 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -53 +53 @@
 #include <smc.h>
 #include <loader/pcb.h>
+#include <entry_point.h>
 
 #include "elf.h"
 #include "elf_load.h"
-#include "arch.h"
 
 #define DPRINTF(...)

uspace/srv/loader/main.c

@@ -55 +55 @@
 #include <macros.h>
 #include <loader/pcb.h>
+#include <entry_point.h>
 #include <errno.h>
 #include <async.h>
@@ -71 +72 @@
 #define DPRINTF(...)
 
-void program_run(void *entry, pcb_t *pcb);
 static int ldr_load_dyn_linked(elf_info_t *p_info);
 
@@ -394 +394 @@
         async_answer_0(rid, EOK);
         DPRINTF("Jump to entry point at %p\n", pcb.entry);
-        program_run(prog_info.entry, &pcb);
+        entry_point_jmp(prog_info.entry, &pcb);
         
         /* Not reached */