Changes in / [afdcc60e:3f461ecf] in mainline

Location:

uspace

Files:

• lib/c/Makefile (modified) (2 diffs)
• lib/c/arch/abs32le/Makefile.inc (modified) (1 diff)
• lib/c/arch/abs32le/_link.ld.in (modified) (1 diff)
• lib/c/arch/abs32le/src/entryjmp.c (added)
• lib/c/arch/amd64/Makefile.inc (modified) (1 diff)
• lib/c/arch/amd64/_link.ld.in (modified) (2 diffs)
• lib/c/arch/amd64/src/entryjmp.s (added)
• lib/c/arch/arm32/Makefile.inc (modified) (1 diff)
• lib/c/arch/arm32/_link.ld.in (modified) (1 diff)
• lib/c/arch/arm32/src/entryjmp.s (added)
• lib/c/arch/ia32/Makefile.inc (modified) (1 diff)
• lib/c/arch/ia32/_link.ld.in (modified) (2 diffs)
• lib/c/arch/ia32/src/entryjmp.s (added)
• lib/c/arch/ia64/Makefile.inc (modified) (1 diff)
• lib/c/arch/ia64/_link.ld.in (modified) (1 diff)
• lib/c/arch/ia64/src/entryjmp.s (added)
• lib/c/arch/mips32/Makefile.inc (modified) (1 diff)
• lib/c/arch/mips32/_link.ld.in (modified) (1 diff)
• lib/c/arch/mips32/src/entryjmp.s (added)
• lib/c/arch/mips32eb/Makefile.inc (modified) (1 diff)
• lib/c/arch/ppc32/Makefile.inc (modified) (1 diff)
• lib/c/arch/ppc32/_link.ld.in (modified) (1 diff)
• lib/c/arch/ppc32/src/entryjmp.s (added)
• lib/c/arch/sparc64/Makefile.inc (modified) (1 diff)
• lib/c/arch/sparc64/_link.ld.in (modified) (1 diff)
• lib/c/arch/sparc64/src/entryjmp.s (added)
• lib/c/include/entry_point.h (added)
• srv/loader/Makefile (modified) (2 diffs)
• srv/loader/arch/abs32le/Makefile.inc (deleted)
• srv/loader/arch/abs32le/_link.ld.in (deleted)
• srv/loader/arch/abs32le/abs32le.c (deleted)
• srv/loader/arch/amd64/Makefile.inc (deleted)
• srv/loader/arch/amd64/_link.ld.in (deleted)
• srv/loader/arch/amd64/amd64.s (deleted)
• srv/loader/arch/arm32/Makefile.inc (deleted)
• srv/loader/arch/arm32/_link.ld.in (deleted)
• srv/loader/arch/arm32/arm32.s (deleted)
• srv/loader/arch/ia32/Makefile.inc (deleted)
• srv/loader/arch/ia32/_link.ld.in (deleted)
• srv/loader/arch/ia32/ia32.s (deleted)
• srv/loader/arch/ia64/Makefile.inc (deleted)
• srv/loader/arch/ia64/_link.ld.in (deleted)
• srv/loader/arch/ia64/ia64.s (deleted)
• srv/loader/arch/mips32/Makefile.inc (deleted)
• srv/loader/arch/mips32/_link.ld.in (deleted)
• srv/loader/arch/mips32/mips32.s (deleted)
• srv/loader/arch/mips32eb (deleted)
• srv/loader/arch/ppc32/Makefile.inc (deleted)
• srv/loader/arch/ppc32/_link.ld.in (deleted)
• srv/loader/arch/ppc32/ppc32.s (deleted)
• srv/loader/arch/sparc64/Makefile.inc (deleted)
• srv/loader/arch/sparc64/_link.ld.in (deleted)
• srv/loader/arch/sparc64/sparc64.s (deleted)
• srv/loader/elf_load.c (modified) (3 diffs)
• srv/loader/include/arch.h (deleted)

uspace/lib/c/Makefile

@@ -41 +41 @@
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
+LINKER_SCRIPTS = \
+        $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld \
+        $(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld
+
 PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
-EXTRA_OUTPUT = $(LINKER_SCRIPT)
-EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPT)
+EXTRA_OUTPUT = $(LINKER_SCRIPTS)
+EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
 LIBRARY = libc
 
@@ -133 +137 @@
         ln -sfn ../$< $@
 
-$(LINKER_SCRIPT): $(LINKER_SCRIPT).in
+$(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
+
+$(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
+        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
 
 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)

uspace/lib/c/arch/abs32le/Makefile.inc

@@ -29 +29 @@
 ARCH_SOURCES = \
         arch/$(UARCH)/src/entry.c \
+        arch/$(UARCH)/src/entryjmp.c \
         arch/$(UARCH)/src/thread_entry.c \
         arch/$(UARCH)/src/fibril.c \

uspace/lib/c/arch/abs32le/_link.ld.in

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+#else
         text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
 }
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+        
+        . = 0x70001000 + SIZEOF_HEADERS;
+#else
         . = 0x1000 + SIZEOF_HEADERS;
-        
+#endif
         .text : {
                 *(.text .text.*);

uspace/lib/c/arch/amd64/Makefile.inc

@@ -29 +29 @@
 ARCH_SOURCES = \
         arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/entryjmp.s \
         arch/$(UARCH)/src/thread_entry.s \
         arch/$(UARCH)/src/syscall.S \

uspace/lib/c/arch/amd64/_link.ld.in

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+#else
         text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
         debug PT_NOTE;
@@ -9 +14 @@
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+        
+        . = 0x70001000 + SIZEOF_HEADERS;
+#else
         . = 0x1000 + SIZEOF_HEADERS;
-        
+#endif
         .init : {
                 *(.init);

uspace/lib/c/arch/arm32/Makefile.inc

@@ -30 +30 @@
 ARCH_SOURCES = \
         arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/entryjmp.s \
         arch/$(UARCH)/src/thread_entry.s \
         arch/$(UARCH)/src/syscall.c \

uspace/lib/c/arch/arm32/_link.ld.in

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+#else
         text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
 }
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+        
+        . = 0x70001000 + SIZEOF_HEADERS;
+#else
         . = 0x1000 + SIZEOF_HEADERS;
-        
+#endif
         .init : {
                 *(.init);

uspace/lib/c/arch/ia32/Makefile.inc

@@ -29 +29 @@
 ARCH_SOURCES = \
         arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/entryjmp.s \
         arch/$(UARCH)/src/thread_entry.s \
         arch/$(UARCH)/src/syscall.S \

uspace/lib/c/arch/ia32/_link.ld.in

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+#else
         text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
         debug PT_NOTE;
@@ -9 +14 @@
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+
+        . = 0x70001000 + SIZEOF_HEADERS;
+#else
         . = 0x1000 + SIZEOF_HEADERS;
-        
+#endif
         .init : {
                 *(.init);

uspace/lib/c/arch/ia64/Makefile.inc

@@ -29 +29 @@
 ARCH_SOURCES = \
         arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/entryjmp.s \
         arch/$(UARCH)/src/thread_entry.s \
         arch/$(UARCH)/src/syscall.S \

uspace/lib/c/arch/ia64/_link.ld.in

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
         text PT_LOAD FLAGS(5);
+#else
+        text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
 }
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+        
+        . = 0x800000000 + SIZEOF_HEADERS;
+#else
         . = 0x4000 + SIZEOF_HEADERS;
-        
+#endif
+        /*
+         * XXX This is just a work around. Problem: .init section does not
+         * have the proper alignment.
+         */
+        . = ALIGN(., 16);
+
         .init : {
                 *(.init);

uspace/lib/c/arch/mips32/Makefile.inc

@@ -29 +29 @@
 ARCH_SOURCES = \
         arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/entryjmp.s \
         arch/$(UARCH)/src/thread_entry.s \
         arch/$(UARCH)/src/syscall.c \

uspace/lib/c/arch/mips32/_link.ld.in

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+#else
         text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
 }
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+        
+        . = 0x70004000 + SIZEOF_HEADERS;
+#else
         . = 0x4000 + SIZEOF_HEADERS;
-        
+#endif
         .init : {
                 *(.init);

uspace/lib/c/arch/mips32eb/Makefile.inc

@@ -29 +29 @@
 ARCH_SOURCES = \
         arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/entryjmp.s \
         arch/$(UARCH)/src/thread_entry.s \
         arch/$(UARCH)/src/syscall.c \

uspace/lib/c/arch/ppc32/Makefile.inc

@@ -29 +29 @@
 ARCH_SOURCES = \
         arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/entryjmp.s \
         arch/$(UARCH)/src/thread_entry.s \
         arch/$(UARCH)/src/syscall.c \

uspace/lib/c/arch/ppc32/_link.ld.in

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+#else
         text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
 }
 
 SECTIONS {
+#ifdef LOADER
+        .itnerp : {
+                *(.interp);
+        } :interp
+        
+        . = 0x70001000 + SIZEOF_HEADERS;
+#else
         . = 0x1000 + SIZEOF_HEADERS;
-        
+#endif
         .init : {
                 *(.init);

uspace/lib/c/arch/sparc64/Makefile.inc

@@ -29 +29 @@
 ARCH_SOURCES = \
         arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/entryjmp.s \
         arch/$(UARCH)/src/thread_entry.s \
         arch/$(UARCH)/src/fibril.S \

uspace/lib/c/arch/sparc64/_link.ld.in

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+#else
         text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
 }
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+        
+        . = 0x70004000 + SIZEOF_HEADERS;
+#else
         . = 0x4000 + SIZEOF_HEADERS;
-        
+#endif
         .init : {
                 *(.init);

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
@@ -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(...)
@@ -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 */