Changeset 3f461ecf in mainline for uspace/srv/loader/elf_load.c

Timestamp:

2011-04-30T13:23:34Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a41577e, f798178

Parents:

afdcc60e (diff), 28c4ca7 (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 loader / linker script improvements.

File:

• uspace/srv/loader/elf_load.c (modified) (3 diffs)

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(...)
@@ -136 +136 @@
 void elf_run(elf_info_t *info, pcb_t *pcb)
 {
-        program_run(info->entry, pcb);
+        entry_point_jmp(info->entry, pcb);
 
         /* not reached */