Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ HelenOS.config	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -477,4 +477,11 @@
 ! [PLATFORM=sparc64] CONFIG_RD_EXTERNAL (y/n)
 
+% Build shared C library
+! CONFIG_BUILD_SHARED_LIBC (y/n)
+
+% Link against shared C library
+! [CONFIG_BUILD_SHARED_LIBC=y] CONFIG_USE_SHARED_LIBC (n/y)
+! [CONFIG_BUILD_SHARED_LIBC=n] CONFIG_USE_SHARED_LIBC (n)
+
 % Load disk drivers on startup
 ! CONFIG_START_BD (n/y)
Index: boot/arch/ia32/Makefile.inc
===================================================================
--- boot/arch/ia32/Makefile.inc	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ boot/arch/ia32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -58,11 +58,21 @@
 	$(USPACEDIR)/app/tetris/tetris \
 	$(USPACEDIR)/app/tester/tester \
+	$(USPACEDIR)/app/dltest2/dltest2 \
+	$(USPACEDIR)/app/dload/dload \
 	$(USPACEDIR)/app/trace/trace \
 	$(USPACEDIR)/app/klog/klog \
 	$(USPACEDIR)/app/bdsh/bdsh
 
+RD_LIBS = \
+	$(USPACEDIR)/lib/libtest/libtest.so.0
+
+ifeq ($(CONFIG_BUILD_SHARED_LIBC), y)
+	RD_LIBS += $(USPACEDIR)/lib/libc/shared/libc.so.0
+	RD_APPS += $(USPACEDIR)/app/dltest/dltest
+endif
+
 build: $(BASE)/image.iso
 
-$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
+$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_LIBS) $(RD_APPS)
 	mkdir -p $(TMP)/boot/grub
 	cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/
@@ -79,4 +89,7 @@
 	for file in $(RD_SRVS) ; do \
 		cp $$file $(USPACEDIR)/dist/srv/ ; \
+	done
+	for lib in $(RD_LIBS) ; do \
+		cp $$lib $(USPACEDIR)/dist/lib/ ; \
 	done
 	for file in $(RD_APPS) ; do \
@@ -97,4 +110,7 @@
 		rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
 	done
+	-for lib in $(RD_LIBS) ; do \
+		rm -f $(USPACEDIR)/dist/lib/`basename $$lib` ; \
+	done
 	-for file in $(RD_APPS) ; do \
 		rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
Index: boot/arch/mips32/loader/Makefile
===================================================================
--- boot/arch/mips32/loader/Makefile	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ boot/arch/mips32/loader/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -112,7 +112,14 @@
 	$(USPACEDIR)/app/tetris/tetris \
 	$(USPACEDIR)/app/tester/tester \
+	$(USPACEDIR)/app/dload/dload \
+	$(USPACEDIR)/app/dltest/dltest \
+	$(USPACEDIR)/app/dltest2/dltest2 \
 	$(USPACEDIR)/app/trace/trace \
 	$(USPACEDIR)/app/bdsh/bdsh \
 	$(USPACEDIR)/app/klog/klog
+
+RD_LIBS = \
+	$(USPACEDIR)/lib/libc/shared/libc.so.0 \
+	$(USPACEDIR)/lib/libtest/libtest.so.0
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
@@ -143,7 +150,10 @@
 	-rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.raw image.boot Makefile.depend
 
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_LIBS) $(RD_APPS) _link.ld.in
 	for file in $(RD_SRVS) ; do \
 		cp $$file $(USPACEDIR)/dist/srv/ ; \
+	done
+	for lib in $(RD_LIBS) ; do \
+		cp $$lib $(USPACEDIR)/dist/lib/ ; \
 	done
 	for file in $(RD_APPS) ; do \
Index: boot/arch/ppc32/loader/Makefile
===================================================================
--- boot/arch/ppc32/loader/Makefile	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ boot/arch/ppc32/loader/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -98,7 +98,14 @@
 	$(USPACEDIR)/app/tetris/tetris \
 	$(USPACEDIR)/app/tester/tester \
+	$(USPACEDIR)/app/dload/dload \
+	$(USPACEDIR)/app/dltest/dltest \
+	$(USPACEDIR)/app/dltest2/dltest2 \
 	$(USPACEDIR)/app/trace/trace \
 	$(USPACEDIR)/app/klog/klog \
 	$(USPACEDIR)/app/bdsh/bdsh
+
+RD_LIBS = \
+	$(USPACEDIR)/lib/libc/shared/libc.so.0 \
+	$(USPACEDIR)/lib/libtest/libtest.so.0
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
@@ -121,4 +128,7 @@
 		rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
 	done
+	-for lib in $(RD_LIBS) ; do \
+		rm -f $(USPACEDIR)/dist/lib/`basename $$lib` ; \
+	done
 	-for file in $(RD_APPS) ; do \
 		rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
@@ -126,7 +136,10 @@
 	-rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend
 
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_LIBS) $(RD_APPS) _link.ld.in
 	for file in $(RD_SRVS) ; do \
 		cp $$file $(USPACEDIR)/dist/srv/ ; \
+	done
+	for lib in $(RD_LIBS) ; do \
+		cp $$lib $(USPACEDIR)/dist/lib/ ; \
 	done
 	for file in $(RD_APPS) ; do \
Index: boot/arch/sparc64/loader/main.c
===================================================================
--- boot/arch/sparc64/loader/main.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ boot/arch/sparc64/loader/main.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -210,5 +210,10 @@
 		(void) ofw_map(bootinfo.physmem_start + base + top, base + top,
 		    silo_ramdisk_size, -1);
-		memmove(base + top, (void *)((uintptr_t)silo_ramdisk_image),
+		/*
+		 * FIXME If the source and destination overlap, it may be
+		 * desirable to copy in reverse order, depending on how the two
+		 * regions overlap.
+		 */
+		memcpy(base + top, (void *)((uintptr_t)silo_ramdisk_image),
 		    silo_ramdisk_size);
 		printf("done.\n");
Index: defaults/amd64/Makefile.config
===================================================================
--- defaults/amd64/Makefile.config	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ defaults/amd64/Makefile.config	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -3,5 +3,5 @@
 
 # Ramdisk format
-RDFMT = fat
+RDFMT = tmpfs
 
 # Compiler
@@ -56,4 +56,7 @@
 CONFIG_VESA_BPP = 16
 
+# Use shared C library
+CONFIG_SHARED_LIBC = n
+
 # Load disk drivers on startup
 CONFIG_START_BD = n
Index: defaults/arm32/Makefile.config
===================================================================
--- defaults/arm32/Makefile.config	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ defaults/arm32/Makefile.config	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -3,5 +3,5 @@
 
 # Ramdisk format
-RDFMT = fat
+RDFMT = tmpfs
 
 # Compiler
@@ -32,4 +32,7 @@
 CONFIG_HID_OUT = generic
 
+# Use shared C library
+CONFIG_SHARED_LIBC = n
+
 # Load disk drivers on startup
 CONFIG_START_BD = n
Index: defaults/ia32/Makefile.config
===================================================================
--- defaults/ia32/Makefile.config	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ defaults/ia32/Makefile.config	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -6,5 +6,5 @@
 
 # Ramdisk format
-RDFMT = fat
+RDFMT = tmpfs
 
 # Compiler
@@ -62,4 +62,7 @@
 CONFIG_VESA_BPP = 16
 
+# Use shared C library
+CONFIG_SHARED_LIBC = n
+
 # Load disk drivers on startup
 CONFIG_START_BD = n
Index: defaults/ia64/Makefile.config
===================================================================
--- defaults/ia64/Makefile.config	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ defaults/ia64/Makefile.config	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -3,5 +3,5 @@
 
 # Ramdisk format
-RDFMT = fat
+RDFMT = tmpfs
 
 # Compiler
@@ -44,4 +44,7 @@
 CONFIG_HID_OUT = generic
 
+# Use shared C library
+CONFIG_SHARED_LIBC = n
+
 # Load disk drivers on startup
 CONFIG_START_BD = n
Index: defaults/mips32/Makefile.config
===================================================================
--- defaults/mips32/Makefile.config	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ defaults/mips32/Makefile.config	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -3,5 +3,5 @@
 
 # Ramdisk format
-RDFMT = fat
+RDFMT = tmpfs
 
 # Compiler
@@ -38,4 +38,7 @@
 CONFIG_HID_OUT = generic
 
+# Use shared C library
+CONFIG_SHARED_LIBC = n
+
 # Load disk drivers on startup
 CONFIG_START_BD = n
Index: defaults/ppc32/Makefile.config
===================================================================
--- defaults/ppc32/Makefile.config	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ defaults/ppc32/Makefile.config	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -3,5 +3,5 @@
 
 # Ramdisk format
-RDFMT = fat
+RDFMT = tmpfs
 
 # Compiler
@@ -38,4 +38,7 @@
 CONFIG_BAT = y
 
+# Use shared C library
+CONFIG_SHARED_LIBC = n
+
 # Load disk drivers on startup
 CONFIG_START_BD = n
Index: defaults/sparc64/Makefile.config
===================================================================
--- defaults/sparc64/Makefile.config	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ defaults/sparc64/Makefile.config	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -3,5 +3,5 @@
 
 # Ramdisk format
-RDFMT = fat
+RDFMT = tmpfs
 
 # Compiler
@@ -56,4 +56,7 @@
 CONFIG_RD_EXTERNAL = y
 
+# Use shared C library
+CONFIG_SHARED_LIBC = n
+
 # Load disk drivers on startup
 CONFIG_START_BD = n
Index: kernel/arch/ia32/include/barrier.h
===================================================================
--- kernel/arch/ia32/include/barrier.h	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ kernel/arch/ia32/include/barrier.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -52,4 +52,5 @@
 static inline void cpuid_serialization(void)
 {
+#ifndef __IN_SHARED_LIBC__
 	asm volatile (
 		"xorl %%eax, %%eax\n"
@@ -57,4 +58,14 @@
 		::: "eax", "ebx", "ecx", "edx", "memory"
 	);
+#else
+	/* Must not clobber PIC register ebx */
+	asm volatile (
+		"movl %%ebx, %%esi\n"
+		"xorl %%eax, %%eax\n"
+		"cpuid\n"
+		"movl %%esi, %%ebx\n"
+		::: "eax", "ecx", "edx", "esi", "memory"
+	);
+#endif
 }
 
Index: kernel/generic/include/syscall/syscall.h
===================================================================
--- kernel/generic/include/syscall/syscall.h	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ kernel/generic/include/syscall/syscall.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -82,5 +82,6 @@
 	SYS_SYSINFO_VALID,
 	SYS_SYSINFO_VALUE,
-	
+
+	SYS_DEBUG_PUTINT,
 	SYS_DEBUG_ENABLE_CONSOLE,
 	SYS_DEBUG_DISABLE_CONSOLE,
Index: kernel/generic/src/lib/elf.c
===================================================================
--- kernel/generic/src/lib/elf.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ kernel/generic/src/lib/elf.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -167,5 +167,5 @@
 	case PT_INTERP:
 		interp = (char *)elf + entry->p_offset;
-		/* FIXME */
+		/* DO NOT COMMIT ME */
 		/*if (memcmp((uintptr_t)interp, (uintptr_t)ELF_INTERP_ZSTR,
 		    ELF_INTERP_ZLEN) != 0) {
Index: kernel/generic/src/proc/program.c
===================================================================
--- kernel/generic/src/proc/program.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ kernel/generic/src/proc/program.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -50,5 +50,4 @@
 #include <lib/elf.h>
 #include <errno.h>
-#include <print.h>
 #include <syscall/copy.h>
 #include <proc/program.h>
@@ -134,6 +133,4 @@
 		ASSERT(program_loader == NULL);
 		program_loader = image_addr;
-		LOG("Registered program loader at 0x%" PRIp "\n",
-		    image_addr);
 		return EOK;
 	}
@@ -161,8 +158,5 @@
 
 	loader = program_loader;
-	if (!loader) {
-		printf("Cannot spawn loader as none was registered\n");
-		return ENOENT;
-	}
+	if (!loader) return ENOENT;
 
 	rc = elf_load((elf_header_t *) program_loader, as, ELD_F_LOADER);
Index: kernel/generic/src/syscall/syscall.c
===================================================================
--- kernel/generic/src/syscall/syscall.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ kernel/generic/src/syscall/syscall.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -54,4 +54,11 @@
 #include <console/console.h>
 #include <udebug/udebug.h>
+
+/** Print a hex integer into klog */
+static unative_t sys_debug_putint(unative_t i)
+{
+	printf("[task:0x%x]", i);
+	return 0;
+}
 
 /** Dispatch system call */
@@ -159,4 +166,5 @@
 	
 	/* Debug calls */
+	(syshandler_t) sys_debug_putint,
 	(syshandler_t) sys_debug_enable_console,
 	(syshandler_t) sys_debug_disable_console,
Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -38,4 +38,5 @@
 	lib/softint \
 	lib/softfloat \
+	lib/libtest \
 	srv/bd/ata_bd \
 	srv/bd/file_bd \
@@ -54,4 +55,6 @@
 	app/tetris \
 	app/tester \
+	app/dltest2 \
+	app/dload \
 	app/trace \
 	app/klog \
@@ -74,8 +77,15 @@
 endif
 
+ifeq ($(CONFIG_BUILD_SHARED_LIBC), y)
+	DIRS += \
+		lib/libc/shared \
+		app/dltest
+endif
+
+
 BUILDS := $(addsuffix .build,$(DIRS))
 CLEANS := $(addsuffix .clean,$(DIRS))
 
-.PHONY: all $(BUILDS) $(CLEANS) clean
+.PHONY: all $(BUILDS) $(CLEANS) clean kerninc
 
 all: ../Makefile.config ../config.h ../config.defs $(BUILDS)
Index: uspace/app/bdsh/Makefile
===================================================================
--- uspace/app/bdsh/Makefile	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/app/bdsh/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -37,8 +37,9 @@
 
 include $(LIBC_PREFIX)/Makefile.toolchain
+include $(LIBC_PREFIX)/Makefile.app
 
 CFLAGS += -I../../srv/kbd/include -I$(LIBBLOCK_PREFIX)
 
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
+LIBS += $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
 DEFS += -DRELEASE=$(RELEASE)
 
@@ -114,5 +115,5 @@
 
 $(PROGRAM): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(PROGRAM).map
+	$(LD) -T $(LD_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(PROGRAM).map
 
 # Everything else is a phony target
Index: uspace/app/dload/Makefile
===================================================================
--- uspace/app/dload/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dload/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,91 @@
+#
+# Copyright (c) 2005 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../../../version
+
+## Setup toolchain
+#
+
+LIBC_PREFIX = ../../lib/libc
+SOFTINT_PREFIX = ../../lib/softint
+
+include $(LIBC_PREFIX)/Makefile.toolchain
+include arch/$(UARCH)/Makefile.inc
+
+CFLAGS += -Iinclude -I../../srv/loader/include -I../../lib/libc/rtld/include -O0 -ggdb
+LFLAGS +=
+
+LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a
+DEFS += -DRELEASE=\"$(RELEASE)\"
+
+## Sources
+#
+
+OUTPUT = dload
+GENERIC_SOURCES = \
+	dload.c
+
+GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
+ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
+
+.PHONY: all clean depend disasm sections inc
+
+all: inc $(OUTPUT) disasm sections
+
+inc:
+	ln -sfn ../arch/$(UARCH)/include include/arch
+
+-include Makefile.depend
+
+clean:
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(UARCH)/_link.ld include/arch
+	find arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
+
+depend:
+	$(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES)> Makefile.depend
+
+$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) arch/$(UARCH)/_link.ld
+	$(LD) -T arch/$(UARCH)/_link.ld $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+
+disasm:
+	$(OBJDUMP) -d -S -s $(OUTPUT) >$(OUTPUT).disasm
+
+sections:
+	$(OBJDUMP) -h $(OUTPUT) >$(OUTPUT).sections
+
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
+	$(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
+
+%.o: %.S
+	$(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+
+%.o: %.s
+	$(AS) $(AFLAGS) $< -o $@
+
+%.o: %.c
+	$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
Index: uspace/app/dload/arch/ia32/Makefile.inc
===================================================================
--- uspace/app/dload/arch/ia32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dload/arch/ia32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2008 Jiri Svoboda
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+CFLAGS += -D__32_BITS__
+
+ARCH_SOURCES := \
+	arch/$(UARCH)/start.c
Index: uspace/app/dload/arch/ia32/_link.ld.in
===================================================================
--- uspace/app/dload/arch/ia32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dload/arch/ia32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,84 @@
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+ENTRY(__entry)
+
+PHDRS {
+        text PT_LOAD FLAGS(5);
+	data PT_LOAD FLAGS(6);
+}
+
+SECTIONS {
+	. = 0x60001000 + SIZEOF_HEADERS;
+
+	.init : {
+		*(.init);
+	} :text
+	.text : {
+		*(.text);
+		*(.text.*);
+		*(.rodata*);
+	} :text
+
+	.rel.plt : {
+		*(.rel.plt);
+	}
+	/* 
+	 *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+	 * without alignment gap or DT_REL will be broken
+	 */
+	.rel.dyn : {
+		*(.rel.*);
+	} :text
+
+	.plt : {
+		*(.plt);
+	} :text
+
+	.dynamic : {
+		*(.dynamic);
+	} :text
+
+	.dynsym : {
+		*(.dynsym);
+	} :text
+
+	.dynstr : {
+		*(.dynstr);
+	} :text
+
+	. = . + 0x1000;
+
+	.data : {
+		*(.data);
+	} :data
+
+	.data.rel : {
+                *(.data.rel);
+	} :data
+
+	.got : {
+                *(.got);
+	} :data
+	.got.plt : {
+                *(.got.plt);
+	} :data
+
+	.bss : {
+                *(COMMON);
+                *(.bss);
+	} :data
+
+	.tdata : {
+		_tdata_start = .;
+		*(.tdata);
+		_tdata_end = .;
+	} :data
+	.tbss : {
+		_tbss_start = .;
+		*(.tbss);
+		_tbss_end = .;
+	} :data
+	_tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+	
+	. = ALIGN(0x1000);
+	_heap = .;
+}
Index: uspace/app/dload/arch/ia32/start.c
===================================================================
--- uspace/app/dload/arch/ia32/start.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dload/arch/ia32/start.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <loader/pcb.h>
+
+void program_run(void *entry, pcb_t *pcb)
+{
+	asm (
+		"mov %%eax, %%ebx\n"
+		"jmp *%0\n"
+		:: "m" (entry), "a" (pcb)
+	);
+}
+
+/** @}
+ */
Index: uspace/app/dload/arch/mips32/Makefile.inc
===================================================================
--- uspace/app/dload/arch/mips32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dload/arch/mips32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2008 Jiri Svoboda
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+CFLAGS += -D__32_BITS__
+
+ARCH_SOURCES := \
+	arch/$(UARCH)/mips32.s
Index: uspace/app/dload/arch/mips32/_link.ld.in
===================================================================
--- uspace/app/dload/arch/mips32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dload/arch/mips32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,59 @@
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+ENTRY(__entry)
+
+PHDRS {
+	text PT_LOAD FLAGS(5);
+	data PT_LOAD FLAGS(6);
+}
+
+SECTIONS {
+	. = 0x60004000 + SIZEOF_HEADERS;
+	
+	.init : {
+		*(.init);
+	} :text
+	.text : {
+	        *(.text);
+		*(.rodata*);
+	} :text
+
+	. = . + 0x4000;
+
+	.data : {
+		*(.data);
+		*(.data.rel*);
+	} :data
+
+	.got : {
+		_gp = .;
+		*(.got);
+	} :data
+
+	.tdata : {
+		_tdata_start = .;
+		*(.tdata);
+		_tdata_end = .;
+	} :data
+	.tbss : {
+		_tbss_start = .;
+		*(.tbss);
+		_tbss_end = .;
+	} :data
+	_tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+
+	.sbss : {
+		*(.scommon);
+		*(.sbss);
+	}	
+	.bss : {
+		*(.bss);
+		*(COMMON);
+	} :data
+
+	. = ALIGN(0x4000);
+	_heap = .;
+
+	/DISCARD/ : {
+		*(*);
+	}
+}
Index: uspace/app/dload/arch/mips32/mips32.s
===================================================================
--- uspace/app/dload/arch/mips32/mips32.s	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dload/arch/mips32/mips32.s	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,49 @@
+#
+# Copyright (c) 2008 Jiri Svoboda
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+.text
+.section .text
+.global program_run
+.set noreorder
+
+## void program_run(void *entry_point, void *pcb);
+#
+# $a0 (=$4)	contains entry_point
+# $a1 (=$5)	contains pcb
+#
+# Jump to a program entry point
+.ent program_run
+program_run:
+	# tmp := entry_point
+	move $25, $a0
+
+	# Pass pcb to the entry point in $a0
+	move $a0, $a1
+	jr $25
+	nop
+.end
Index: uspace/app/dload/arch/ppc32/Makefile.inc
===================================================================
--- uspace/app/dload/arch/ppc32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dload/arch/ppc32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2008 Jiri Svoboda
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+CFLAGS += -D__32_BITS__
+
+ARCH_SOURCES := \
+	arch/$(UARCH)/start.s
Index: uspace/app/dload/arch/ppc32/_link.ld.in
===================================================================
--- uspace/app/dload/arch/ppc32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dload/arch/ppc32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,87 @@
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+ENTRY(__entry)
+
+PHDRS {
+	text PT_LOAD FLAGS(5);
+	data PT_LOAD FLAGS(6);
+}
+
+SECTIONS {
+	. = 0x60001000;
+
+	.init : {
+		*(.init);
+	} :text
+	.text : {
+		*(.text);
+		*(.rodata*);
+	} :text
+	
+	.rel.plt : {
+		*(.rel.plt);
+	}
+	/* 
+	 *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+	 * without alignment gap or DT_REL will be broken
+	 */
+	.rel.dyn : {
+		*(.rel.*);
+	} :text
+
+	.dynamic : {
+		*(.dynamic);
+	} :text
+
+	.dynsym : {
+		*(.dynsym);
+	} :text
+
+	.dynstr : {
+		*(.dynstr);
+	} :text
+
+	/* data segment */
+	. = ALIGN(0x1000);
+
+	.data : {
+		*(.data);
+		*(.sdata);
+	} :data
+
+	.dynamic : {
+		*(.dynamic);
+	} :text
+
+	.dynsym : {
+		*(.dynsym);
+	} :text
+
+	.dynstr : {
+		*(.dynstr);
+	} :text
+
+	.tdata : {
+		_tdata_start = .;
+		*(.tdata);
+		_tdata_end = .;
+	} :data
+	.tbss : {
+		_tbss_start = .;
+		*(.tbss);
+		_tbss_end = .;
+	} :data
+	_tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+	.bss : {
+		*(.sbss);
+		*(COMMON);
+		*(.bss);
+	} :data
+
+	/* On ppc32 the plt section is uninitialized and must be here! */
+	.plt : {
+		*(.plt);
+	} :data
+
+	. = ALIGN(0x1000);
+	_heap = .;
+}
Index: uspace/app/dload/arch/ppc32/start.s
===================================================================
--- uspace/app/dload/arch/ppc32/start.s	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dload/arch/ppc32/start.s	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,40 @@
+#
+# Copyright (c) 2008 Jiri Svoboda
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+.globl program_run
+
+## void program_run(void *entry_point, void *pcb);
+#
+# %r3	contains entry_point
+# %r4	contains pcb
+#
+# Jump to a program entry point
+program_run:
+	mtctr %r3
+	mr %r6, %r4	# Pass pcb to the entry point in %r6
+	bctr
Index: uspace/app/dload/dload.c
===================================================================
--- uspace/app/dload/dload.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dload/dload.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <loader/pcb.h>
+#include <ipc/ipc.h>
+#include <vfs/vfs.h>
+
+/* from librtld */
+#include <rtld.h>
+#include <dynamic.h>
+#include <elf_load.h>
+#include <module.h>
+
+void program_run(void *entry, pcb_t *pcb);
+
+runtime_env_t dload_re;
+
+int main(int argc, char *argv[])
+{
+	static module_t prog;
+
+	runtime_env = &dload_re;
+
+	DPRINTF("Hello, world! (from dload)\n");
+	if (__pcb->dynamic == NULL) {
+		printf("This is the dynamic loader. It is not supposed "
+		    "to be executed directly.\n");
+		return -1;
+	}
+
+	/*
+	 * First we need to process dynamic sections of the executable
+	 * program and insert it into the module graph.
+	 */
+
+	DPRINTF("Parse program .dynamic section at 0x%x\n", __pcb->dynamic);
+	dynamic_parse(__pcb->dynamic, 0, &prog.dyn);
+	prog.bias = 0;
+	prog.dyn.soname = "[program]";
+
+	/* Initialize list of loaded modules */
+	list_initialize(&runtime_env->modules_head);
+	list_append(&prog.modules_link, &runtime_env->modules_head);
+
+	/* Pointer to program module. Used as root of the module graph. */
+	runtime_env->program = &prog;
+
+	/* Work around non-existent memory space allocation. */
+	runtime_env->next_bias = 0x1000000;
+
+	/*
+	 * Now we can continue with loading all other modules.
+	 */
+
+	DPRINTF("Load all program dependencies\n");
+	module_load_deps(&prog);
+
+	/*
+	 * Now relocate/link all modules together.
+	 */
+
+	/* Process relocations in all modules */
+	DPRINTF("Relocate all modules\n");
+	modules_process_relocs(&prog);
+
+	/* Pass runtime evironment pointer through PCB. */
+	__pcb->rtld_runtime = (void *) runtime_env;
+
+	/*
+	 * Finally, run the main program.
+	 */
+	DPRINTF("Run program.. (at 0x%lx)\n", (uintptr_t)__pcb->entry);
+
+#ifndef RTLD_DEBUG
+	ipc_hangup(fphone(stdout));
+#endif
+	program_run(__pcb->entry, __pcb);
+
+	/* not reached */
+	return 0;
+}
+
+/** @}
+ */
Index: uspace/app/dltest/Makefile
===================================================================
--- uspace/app/dltest/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dltest/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,78 @@
+#
+# Copyright (c) 2005 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../../../version
+
+## Setup toolchain
+#
+
+LIBC_PREFIX = ../../lib/libc
+SOFTINT_PREFIX = ../../lib/softint
+
+include $(LIBC_PREFIX)/Makefile.toolchain
+
+CFLAGS += -I../../lib/libc -O0
+LFLAGS := -Bdynamic -I/lib/rtld -rpath-link $(LIBC_PREFIX)/shared
+
+LIBS = $(LIBC_PREFIX)/shared/libc.so.0
+
+## Sources
+#
+
+OUTPUT = dltest
+SOURCES = \
+	dltest.c
+
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+
+.PHONY: all clean depend disasm
+
+all: $(OUTPUT) disasm
+
+-include Makefile.depend
+
+clean:
+	-rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend arch/$(UARCH)/_link.ld
+
+depend:
+	$(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+
+$(OUTPUT): $(OBJECTS) $(LIBS)
+	$(LD) -T $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+
+disasm:
+	$(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
+
+%.o: %.S
+	$(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+
+%.o: %.s
+	$(AS) $(AFLAGS) $< -o $@
+
+%.o: %.c
+	$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
Index: uspace/app/dltest/dltest.c
===================================================================
--- uspace/app/dltest/dltest.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dltest/dltest.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld
+ * @brief	Test dynamic linking capabilities.
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+
+static void kputint(unsigned i)
+{
+//	unsigned dummy;
+//	asm volatile (
+//		"movl $30, %%eax;"
+//		"int $0x30"
+//		: "=d" (dummy) /* output - %edx clobbered */
+//		: "d" (i) /* input */
+//		: "%eax","%ecx" /* all scratch registers clobbered */
+//	);
+/*
+	asm volatile (
+		"mr %%r3, %0\n"
+		"li %%r9, 32\n"
+		"sc\n"
+		:
+		: "r" (i)
+		: "%r3","%r9"
+	);
+*/
+}
+
+typedef int (*fptr_t)(void);
+
+int main(int argc, char *argv[])
+{
+	void *a;
+	void *s;
+	fptr_t fun;
+	int i;
+
+	char *lib_name;
+	char *sym_name;
+
+//	kputint(-1);
+	printf("Hello from dltest!\n");
+
+	lib_name = "libtest.so.0";
+	sym_name = "test_func";
+
+	a = dlopen(lib_name, 0);
+	if (a != NULL) {
+		s = dlsym(a, sym_name);
+		printf("symbol '%s' = 0x%lx\n", sym_name, (long) s);
+	} else {
+		printf("failed to dlopen() library '%s'\n", lib_name);
+	}
+
+	printf("Run dynamically-resolved function '%s'...\n", sym_name);
+	fun = (fptr_t) s;
+	i = (*fun)();
+	printf("Done. (returned 0x%x)\n", i);
+	
+	return 0;
+}
+
+/** @}
+ */
+
Index: uspace/app/dltest2/Makefile
===================================================================
--- uspace/app/dltest2/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dltest2/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,76 @@
+#
+# Copyright (c) 2005 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../../../version
+
+## Setup toolchain
+#
+
+LIBC_PREFIX = ../../lib/libc
+SOFTINT_PREFIX = ../../lib/softint
+
+include $(LIBC_PREFIX)/Makefile.toolchain
+
+CFLAGS += -D__32_BITS__ -I../../srv/loader/include -I../../lib/rtld/include -I../../lib/libc -O0
+LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a
+
+## Sources
+#
+
+OUTPUT = dltest2
+SOURCES = \
+	dltest2.c
+
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+
+.PHONY: all clean depend disasm
+
+all: $(OUTPUT) disasm
+
+-include Makefile.depend
+
+clean:
+	-rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend arch/$(UARCH)/_link.ld
+
+depend:
+	$(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+
+$(OUTPUT): $(OBJECTS) $(LIBS)
+	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
+
+disasm:
+	$(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
+
+%.o: %.S
+	$(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+
+%.o: %.s
+	$(AS) $(AFLAGS) $< -o $@
+
+%.o: %.c
+	$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
Index: uspace/app/dltest2/dltest2.c
===================================================================
--- uspace/app/dltest2/dltest2.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/app/dltest2/dltest2.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld
+ * @brief	Test dynamic linking capabilities.
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+
+static void kputint(unsigned i)
+{
+//	unsigned dummy;
+//	asm volatile (
+//		"movl $30, %%eax;"
+//		"int $0x30"
+//		: "=d" (dummy) /* output - %edx clobbered */
+//		: "d" (i) /* input */
+//		: "%eax","%ecx" /* all scratch registers clobbered */
+//	);
+/*
+	asm volatile (
+		"mr %%r3, %0\n"
+		"li %%r9, 32\n"
+		"sc\n"
+		:
+		: "r" (i)
+		: "%r3","%r9"
+	);
+*/
+}
+
+typedef int (*fptr_t)(void);
+
+int main(int argc, char *argv[])
+{
+	void *a;
+	void *s;
+	fptr_t fun;
+	int i;
+
+	char *lib_name;
+	char *sym_name;
+
+//	kputint(-1);
+	printf("Hello from dltest!\n");
+
+	lib_name = "libtest.so.0";
+	sym_name = "test_func";
+
+	a = dlopen(lib_name, 0);
+	if (a != NULL) {
+		s = dlsym(a, sym_name);
+		printf("symbol '%s' = 0x%lx\n", sym_name, (long) s);
+	} else {
+		printf("failed to dlopen() library '%s'\n", lib_name);
+	}
+
+	printf("Run dynamically-resolved function '%s'...\n", sym_name);
+	fun = (fptr_t) s;
+	i = (*fun)();
+	printf("Done. (returned 0x%x)\n", i);
+	
+	return 0;
+}
+
+/** @}
+ */
+
Index: uspace/app/klog/Makefile
===================================================================
--- uspace/app/klog/Makefile	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/app/klog/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -34,6 +34,5 @@
 
 include $(LIBC_PREFIX)/Makefile.toolchain
-
-LIBS = $(LIBC_PREFIX)/libc.a
+include $(LIBC_PREFIX)/Makefile.app
 
 ## Sources
@@ -60,5 +59,5 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LD_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm: $(OUTPUT).disasm
Index: uspace/app/klog/klog.c
===================================================================
--- uspace/app/klog/klog.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/app/klog/klog.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -73,4 +73,6 @@
 		return -1;
 	}
+
+	printf("got area at 0x%08lx, length %lx byes\n", klog, klog_size);
 	
 	int res = ipc_share_in_start_1_0(PHONE_NS, (void *) klog,
Index: uspace/app/tester/Makefile
===================================================================
--- uspace/app/tester/Makefile	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/app/tester/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -34,8 +34,7 @@
 
 include $(LIBC_PREFIX)/Makefile.toolchain
+include $(LIBC_PREFIX)/Makefile.app
 
 CFLAGS += -I../../srv/kbd/include
-
-LIBS = $(LIBC_PREFIX)/libc.a
 
 ## Sources
@@ -76,5 +75,5 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LD_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm: $(OUTPUT).disasm
Index: uspace/app/tetris/Makefile
===================================================================
--- uspace/app/tetris/Makefile	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/app/tetris/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -3,6 +3,5 @@
 
 include $(LIBC_PREFIX)/Makefile.toolchain
-
-LIBS = $(LIBC_PREFIX)/libc.a
+include $(LIBC_PREFIX)/Makefile.app
 
 OUTPUT = tetris
@@ -20,5 +19,5 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LD_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 clean:
Index: uspace/app/trace/Makefile
===================================================================
--- uspace/app/trace/Makefile	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/app/trace/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -34,8 +34,7 @@
 
 include $(LIBC_PREFIX)/Makefile.toolchain
+include $(LIBC_PREFIX)/Makefile.app
 
 CFLAGS += -I../../srv/kbd/include
-
-LIBS = $(LIBC_PREFIX)/libc.a
 
 ## Sources
@@ -65,5 +64,5 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LD_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm:
Index: uspace/lib/libc/Makefile
===================================================================
--- uspace/lib/libc/Makefile	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/lib/libc/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -1,4 +1,5 @@
 #
 # Copyright (c) 2005 Martin Decky
+# Copyright (c) 2008 Jiri Svoboda
 # All rights reserved.
 #
@@ -38,5 +39,8 @@
 
 include $(LIBC_PREFIX)/Makefile.toolchain
+-include rtld/arch/$(UARCH)/Makefile.inc
 
+CFLAGS += -Irtld/include -I../../srv/loader/include -D__32_BITS__
+PIC_CFLAGS := $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__
 
 ## Sources
@@ -74,4 +78,5 @@
 	generic/ipc.c \
 	generic/async.c \
+	generic/dlfcn.c \
 	generic/loader.c \
 	generic/getopt.c \
@@ -84,5 +89,11 @@
 	generic/udebug.c \
 	generic/vfs/vfs.c \
-	generic/vfs/canonify.c
+	generic/vfs/canonify.c \
+	rtld/rtld.c \
+	rtld/elf_load.c \
+	rtld/dynamic.c \
+	rtld/module.c \
+	rtld/symbol.c
+
 
 ARCH_SOURCES += \
@@ -93,8 +104,15 @@
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
 OBJECTS := $(GENERIC_OBJECTS) $(ARCH_OBJECTS)
+PIC_OBJECTS := $(addsuffix .pio,$(basename $(OBJECTS)))
+
+OUTPUT := libc.a
+
+ifeq ($(CONFIG_BUILD_SHARED_LIBC), y)
+	OUTPUT += libc.pic.a
+endif
 
 .PHONY: all clean depend kerninc
 
-all: kerninc libc.a arch/$(UARCH)/_link.ld
+all: kerninc $(OUTPUT) arch/$(UARCH)/_link.ld
 
 kerninc:
@@ -102,16 +120,21 @@
 	ln -sfn kernel/arch include/arch
 	ln -sfn ../arch/$(UARCH)/include include/libarch
+	ln -sfn ../arch/$(UARCH)/include rtld/include/arch
 
 -include Makefile.depend
 
 clean:
-	-rm -f include/kernel include/arch include/libarch libc.a arch/$(UARCH)/_link.ld Makefile.depend
-	find generic/ arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
+	-rm -f include/kernel include/arch include/libarch rtld/include/arch libc.a libc.pic.a arch/$(UARCH)/_link.ld Makefile.depend
+	find . \( -name '*.o' -o -name '*.pio' \) -follow -exec rm \{\} \;
 
 depend: kerninc
 	-makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+	-makedepend $(DEFS) $(PIC_CFLAGS) -o.pio -f - $(ARCH_SOURCES) $(GENERIC_SOURCES) >> Makefile.depend 2> /dev/null
 
-libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
-	$(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
+libc.a: depend $(OBJECTS)
+	$(AR) rc $@ $(LIBS) $(OBJECTS)
+
+libc.pic.a: depend $(PIC_OBJECTS)
+	$(AR) rc $@ $(LIBS) $(PIC_OBJECTS)
 
 arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
@@ -126,2 +149,11 @@
 %.o: %.c
 	$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+
+%.pio: %.S
+	$(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+
+%.pio: %.s
+	$(AS) $(AFLAGS) $< -o $@
+
+%.pio: %.c
+	$(CC) $(DEFS) $(PIC_CFLAGS) -c $< -o $@
Index: uspace/lib/libc/Makefile.app
===================================================================
--- uspace/lib/libc/Makefile.app	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/Makefile.app	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2008 Jiri Svoboda
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+## Common configuration for applications
+#
+
+ifeq ($(CONFIG_USE_SHARED_LIBC),y)
+	LFLAGS := -Bdynamic -I/app/dload -rpath-link $(RTLD_PREFIX)
+	LIBS = $(LIBC_PREFIX)/shared/libc.so.0
+	LD_SCRIPT = $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld
+else
+	LIBS = $(LIBC_PREFIX)/libc.a
+	LD_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+endif
Index: uspace/lib/libc/arch/ia32/src/syscall.S
===================================================================
--- uspace/lib/libc/arch/ia32/src/syscall.S	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/lib/libc/arch/ia32/src/syscall.S	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -65,4 +65,6 @@
  */
 .global __syscall_sysenter
+	.type __syscall_sysenter, @function
+
 __syscall_sysenter:
 	pushl %ebx
@@ -89,2 +91,4 @@
 	popl %ebx
 	ret
+
+	.size __syscall_sysenter, . - __syscall_sysenter
Index: uspace/lib/libc/arch/ia32/src/tls.c
===================================================================
--- uspace/lib/libc/arch/ia32/src/tls.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/lib/libc/arch/ia32/src/tls.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -37,4 +37,5 @@
 #include <tls.h>
 #include <sys/types.h>
+#include <align.h>
 
 tcb_t * __alloc_tls(void **data, size_t size)
@@ -48,4 +49,31 @@
 }
 
+//#ifdef __SHARED__
+
+typedef struct {
+	unsigned long int ti_module;
+	unsigned long int ti_offset;
+} tls_index;
+
+void __attribute__ ((__regparm__ (1)))
+    *___tls_get_addr(tls_index *ti);
+
+void __attribute__ ((__regparm__ (1)))
+    *___tls_get_addr(tls_index *ti)
+{
+	size_t tls_size;
+	uint8_t *tls;
+
+	/* Calculate size of TLS block */
+	tls_size = ALIGN_UP(&_tbss_end - &_tdata_start, &_tls_alignment);
+
+	/* The TLS block is just before TCB */
+	tls = (uint8_t *)__tcb_get() - tls_size;
+
+	return tls + ti->ti_offset;
+}
+
+//#endif
+
 /** @}
  */
Index: uspace/lib/libc/arch/mips32/src/tls.c
===================================================================
--- uspace/lib/libc/arch/mips32/src/tls.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/lib/libc/arch/mips32/src/tls.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -47,4 +47,24 @@
 }
 
+typedef struct {
+	unsigned long ti_module;
+	unsigned long ti_offset;
+} tls_index;
+
+void *__tls_get_addr(tls_index *ti);
+
+/* mips32 uses TLS variant 1 */
+void *__tls_get_addr(tls_index *ti)
+{
+	uint8_t *tls;
+	uint32_t v;
+
+	tls = (uint8_t *)__tcb_get() + sizeof(tcb_t);
+
+	/* Hopefully this is right. No docs found. */
+	v = (uint32_t) (tls + ti->ti_offset + 0x8000);
+	return (void *) v;
+}
+
 /** @}
  */
Index: uspace/lib/libc/arch/ppc32/src/tls.c
===================================================================
--- uspace/lib/libc/arch/ppc32/src/tls.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/lib/libc/arch/ppc32/src/tls.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -1,4 +1,5 @@
 /*
  * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
  *
@@ -34,4 +35,5 @@
 
 #include <tls.h>
+#include <align.h>
 #include <sys/types.h>
 
@@ -46,4 +48,35 @@
 }
 
+static void kputint(unsigned i)
+{
+	asm volatile (
+		"mr %%r3, %0\n"
+		"li %%r9, 32\n"
+		"sc\n"
+		:
+		: "r" (i)
+		: "%r3","%r9"
+	) ;
+}
+
+typedef struct {
+	unsigned long int ti_module;
+	unsigned long int ti_offset;
+} tls_index;
+
+void *__tls_get_addr(tls_index *ti);
+
+/* ppc32 uses TLS variant 1 */
+void *__tls_get_addr(tls_index *ti)
+{
+	uint8_t *tls;
+
+	/* The TLS section is just after TCB */
+	tls = (uint8_t *)__tcb_get() + sizeof(tcb_t);
+
+	/* Hopefully this is right. No docs found. */
+	return tls + ti->ti_offset + 32768;
+}
+
 /** @}
  */
Index: uspace/lib/libc/generic/async.c
===================================================================
--- uspace/lib/libc/generic/async.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/lib/libc/generic/async.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -175,5 +175,5 @@
 
 /** Identifier of the incoming connection handled by the current fibril. */
-fibril_local connection_t *FIBRIL_connection;
+static fibril_local connection_t *FIBRIL_connection;
 
 static void default_client_connection(ipc_callid_t callid, ipc_call_t *call);
Index: uspace/lib/libc/generic/dlfcn.c
===================================================================
--- uspace/lib/libc/generic/dlfcn.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/generic/dlfcn.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+
+/* From librtld. */
+#include <module.h>
+#include <symbol.h>
+
+void *dlopen(const char *path, int flag)
+{
+	module_t *m;
+
+	if (runtime_env == NULL) {
+		printf("Dynamic linker not set up -- initializing.\n");
+		rtld_init_static();
+	}
+
+	printf("dlopen(\"%s\", %d)\n", path, flag);
+
+	printf("module_find('%s')\n", path);
+	m = module_find(path);
+	if (m == NULL) {
+		printf("NULL. module_load('%s')\n", path);
+		m = module_load(path);
+		printf("module_load_deps(m)\n");
+		module_load_deps(m);
+		/* Now relocate. */
+		printf("module_process_relocs(m)\n");
+		module_process_relocs(m);
+	} else {
+		printf("not NULL\n");
+	}
+
+	return (void *) m;
+}
+
+/*
+ * @note Symbols with NULL values are not accounted for.
+ */
+void *dlsym(void *mod, const char *sym_name)
+{
+	elf_symbol_t *sd;
+	module_t *sm;
+
+	printf("dlsym(0x%lx, \"%s\")\n", (long)mod, sym_name);
+	sd = symbol_bfs_find(sym_name, (module_t *) mod, &sm);
+	if (sd != NULL) {
+		return symbol_get_addr(sd, sm);
+	}
+
+	return NULL;
+}
+
+/** @}
+ */
Index: uspace/lib/libc/generic/libc.c
===================================================================
--- uspace/lib/libc/generic/libc.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/lib/libc/generic/libc.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -53,4 +53,8 @@
 #include <loader/pcb.h>
 
+/* From librtld. */
+#include <rtld.h>
+#include <string.h>
+
 extern int main(int argc, char *argv[]);
 
@@ -75,4 +79,10 @@
 	char **argv;
 	
+#ifdef __IN_SHARED_LIBC__
+	if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
+		runtime_env = (runtime_env_t *) __pcb->rtld_runtime;
+	}
+#endif
+
 	if (__pcb == NULL) {
 		argc = 0;
Index: uspace/lib/libc/generic/time.c
===================================================================
--- uspace/lib/libc/generic/time.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/lib/libc/generic/time.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -148,4 +148,5 @@
 		if (res) {
 			printf("Failed to initialize timeofday memarea\n");
+			printf("Address was 0x%x\n", (unsigned)mapping);
 			_exit(1);
 		}
Index: uspace/lib/libc/include/as.h
===================================================================
--- uspace/lib/libc/include/as.h	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/lib/libc/include/as.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -43,5 +43,5 @@
 extern void *as_area_create(void *address, size_t size, int flags);
 extern int as_area_resize(void *address, size_t size, int flags);
-extern int as_area_change_flags(void *address, int flags);
+int as_area_change_flags(void *address, int flags);
 extern int as_area_destroy(void *address);
 extern void *set_maxheapsize(size_t mhs);
Index: uspace/lib/libc/include/dlfcn.h
===================================================================
--- uspace/lib/libc/include/dlfcn.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/include/dlfcn.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld
+ * @{
+ */
+/** @file
+ * @brief UNIX-like dynamic linker interface.
+ */
+
+#ifndef LIBC_DLFCN_H_
+#define LIBC_DLFCN_H_
+
+void *dlopen(const char *, int);
+void *dlsym(void *, const char *);
+
+#endif
+
+/**
+ * @}
+ */
Index: uspace/lib/libc/include/loader/pcb.h
===================================================================
--- uspace/lib/libc/include/loader/pcb.h	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/lib/libc/include/loader/pcb.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -69,4 +69,6 @@
 	/** Pointer to ELF dynamic section of the program. */
 	void *dynamic;
+	/** Pointer to dynamic linker state structure (runtime_env_t). */
+	void *rtld_runtime;
 } pcb_t;
 
Index: uspace/lib/libc/rtld/arch/ia32/Makefile.inc
===================================================================
--- uspace/lib/libc/rtld/arch/ia32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/ia32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2008 Jiri Svoboda
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+CFLAGS += -D__32_BITS__
+
+ARCH_SOURCES += \
+	rtld/arch/$(UARCH)/src/dynamic.c \
+	rtld/arch/$(UARCH)/src/reloc.c
Index: uspace/lib/libc/rtld/arch/ia32/include/dynamic.h
===================================================================
--- uspace/lib/libc/rtld/arch/ia32/include/dynamic.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/ia32/include/dynamic.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef ia32_DYNAMIC_H_
+#define ia32_DYNAMIC_H_
+
+#include <sys/types.h>
+
+typedef struct {
+	/* Empty. */
+} dyn_info_arch_t;
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/arch/ia32/include/elf_dyn.h
===================================================================
--- uspace/lib/libc/rtld/arch/ia32/include/elf_dyn.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/ia32/include/elf_dyn.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef ia32_ELF_DYN_H_
+#define ia32_ELF_DYN_H_
+
+/* 
+ * ia32 dynamic relocation types
+ */
+
+#define R_386_32	1
+#define R_386_PC32	2
+#define R_386_COPY	5
+#define R_386_GLOB_DAT	6
+#define R_386_JUMP_SLOT	7
+#define R_386_RELATIVE	8
+
+#define R_386_TLS_DTPMOD32 35
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/arch/ia32/src/dynamic.c
===================================================================
--- uspace/lib/libc/rtld/arch/ia32/src/dynamic.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/ia32/src/dynamic.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <elf_dyn.h>
+#include <dynamic.h>
+
+void dyn_parse_arch(elf_dyn_t *dp, size_t bias, dyn_info_t *info)
+{
+	(void) dp;
+	(void) bias;
+	(void) info;
+}
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/arch/ia32/src/reloc.c
===================================================================
--- uspace/lib/libc/rtld/arch/ia32/src/reloc.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/ia32/src/reloc.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <elf_dyn.h>
+#include <symbol.h>
+#include <rtld.h>
+
+#include <rtld_arch.h>
+
+void module_process_pre_arch(module_t *m)
+{
+	/* Unused */
+}
+
+
+/**
+ * Process (fixup) all relocations in a relocation table.
+ */
+void rel_table_process(module_t *m, elf_rel_t *rt, size_t rt_size)
+{
+	int i;
+
+	size_t rt_entries;
+	size_t r_offset;
+	elf_word r_info;
+	unsigned rel_type;
+	elf_word sym_idx;
+	uintptr_t sym_addr;
+	
+	elf_symbol_t *sym_table;
+	elf_symbol_t *sym;
+	uint32_t *r_ptr;
+	uint32_t sym_size;
+	char *str_tab;
+	
+	elf_symbol_t *sym_def;
+	module_t *dest;
+
+	DPRINTF("parse relocation table\n");
+
+	sym_table = m->dyn.sym_tab;
+	rt_entries = rt_size / sizeof(elf_rel_t);
+	str_tab = m->dyn.str_tab;
+
+	DPRINTF("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
+	
+	for (i = 0; i < rt_entries; ++i) {
+//		DPRINTF("symbol %d: ", i);
+		r_offset = rt[i].r_offset;
+		r_info = rt[i].r_info;
+
+		sym_idx = ELF32_R_SYM(r_info);
+		sym = &sym_table[sym_idx];
+
+/*		DPRINTF("name '%s', value 0x%x, size 0x%x\n",
+		    str_tab + sym->st_name,
+		    sym->st_value,
+		    sym->st_size);
+*/
+		rel_type = ELF32_R_TYPE(r_info);
+		r_ptr = (uint32_t *)(r_offset + m->bias);
+
+		if (sym->st_name != 0) {
+//			DPRINTF("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);
+			sym_def = symbol_def_find(str_tab + sym->st_name,
+			    m, &dest);
+//			DPRINTF("dest name: '%s'\n", dest->dyn.soname);
+//			DPRINTF("dest bias: 0x%x\n", dest->bias);
+			if (sym_def) {
+				sym_addr = symbol_get_addr(sym_def, dest);
+//				DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
+			} else {
+				printf("Definition of '%s' not found.\n",
+				    str_tab + sym->st_name);
+				continue;
+			}
+		}
+
+		switch (rel_type) {
+		case R_386_GLOB_DAT:
+		case R_386_JUMP_SLOT:
+			DPRINTF("fixup R_386_GLOB_DAT/JUMP_SLOT (b+v)\n");
+			*r_ptr = sym_addr;
+			break;
+
+		case R_386_32:
+			DPRINTF("fixup R_386_32 (b+v+a)\n");
+			*r_ptr += sym_addr;
+			break;
+
+		case R_386_PC32:
+			DPRINTF("fixup R_386_PC32 (b+v+a-p)\n");
+			*r_ptr += sym_addr - (uint32_t) r_ptr;
+			break;
+
+		case R_386_COPY:
+			/*
+			 * Copy symbol data from shared object to specified
+			 * location.
+			 */
+			DPRINTF("fixup R_386_COPY (s)\n");
+			sym_size = sym->st_size;
+			if (sym_size != sym_def->st_size) {
+				printf("Warning: Mismatched symbol sizes.\n");
+				/* Take the lower value. */
+				if (sym_size > sym_def->st_size)
+					sym_size = sym_def->st_size;
+			}
+			memcpy(r_ptr, (const void *)sym_addr, sym_size);
+			break;
+			
+		case R_386_RELATIVE:
+			DPRINTF("fixup R_386_RELATIVE (b+a)\n");
+			*r_ptr += m->bias;
+			break;
+
+		case R_386_TLS_DTPMOD32:
+			/*
+			 * We can ignore this as long as the only module
+			 * with TLS variables is libc.so.
+			 */
+			DPRINTF("Ignoring R_386_TLS_DTPMOD32\n");
+			break;
+
+		default:
+			printf("Error: Unknown relocation type %d\n",
+			    rel_type);
+			exit(1);
+		}
+
+	}
+
+}
+
+void rela_table_process(module_t *m, elf_rela_t *rt, size_t rt_size)
+{
+	/* Unused */
+	(void)m; (void)rt; (void)rt_size;
+}
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/arch/mips32/Makefile.inc
===================================================================
--- uspace/lib/libc/rtld/arch/mips32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/mips32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2008 Jiri Svoboda
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+CFLAGS += -D__32_BITS__
+
+ARCH_SOURCES += \
+	rtld/arch/$(UARCH)/src/dynamic.c \
+	rtld/arch/$(UARCH)/src/reloc.c
Index: uspace/lib/libc/rtld/arch/mips32/include/dynamic.h
===================================================================
--- uspace/lib/libc/rtld/arch/mips32/include/dynamic.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/mips32/include/dynamic.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef mips32_DYNAMIC_H_
+#define mips32_DYNAMIC_H_
+
+#include <sys/types.h>
+
+typedef struct {
+	/** Number of local entries in GOT. */
+	uint32_t lgotno;
+	/** Index of first GOT-mapped dynamic symbol. */
+	uint32_t gotsym;
+	/** Number of entries in dynamic symbol table. */
+	uint32_t sym_no;
+	/** ???. */
+	uint32_t base;
+} dyn_info_arch_t;
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/arch/mips32/include/elf_dyn.h
===================================================================
--- uspace/lib/libc/rtld/arch/mips32/include/elf_dyn.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/mips32/include/elf_dyn.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef mips32_ELF_DYN_H_
+#define mips32_ELF_DYN_H_
+
+/*
+ * mips32 program header types
+ */
+#define DT_MIPS_BASE_ADDRESS	0x70000006
+#define DT_MIPS_LOCAL_GOTNO	0x7000000a
+#define DT_MIPS_SYMTABNO	0x70000011
+#define DT_MIPS_GOTSYM		0x70000013
+
+/* 
+ * mips32 relocation types
+ */
+
+#define R_MIPS_NONE		0
+#define R_MIPS_REL32		3
+
+#define R_MIPS_TLS_DTPMOD32	333 /* fixme */
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/arch/mips32/src/dynamic.c
===================================================================
--- uspace/lib/libc/rtld/arch/mips32/src/dynamic.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/mips32/src/dynamic.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <elf_dyn.h>
+#include <dynamic.h>
+
+void dyn_parse_arch(elf_dyn_t *dp, size_t bias, dyn_info_t *info)
+{
+//	void *d_ptr;
+	elf_word d_val;
+
+//	d_ptr = (void *)((uint8_t *)dp->d_un.d_ptr + bias);
+	d_val = dp->d_un.d_val;
+
+	switch (dp->d_tag) {
+	case DT_MIPS_BASE_ADDRESS: info->arch.base = d_val; break;
+	case DT_MIPS_LOCAL_GOTNO: info->arch.lgotno = d_val; break;
+	case DT_MIPS_SYMTABNO:	info->arch.sym_no = d_val; break;
+	case DT_MIPS_GOTSYM:	info->arch.gotsym = d_val; break;
+	default: break;
+	}
+}
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/arch/mips32/src/reloc.c
===================================================================
--- uspace/lib/libc/rtld/arch/mips32/src/reloc.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/mips32/src/reloc.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <arch.h>
+#include <elf_dyn.h>
+#include <symbol.h>
+#include <rtld.h>
+
+void module_process_pre_arch(module_t *m)
+{
+	elf_symbol_t *sym_table;
+	elf_symbol_t *sym_def;
+	elf_symbol_t *sym;
+	uint32_t gotsym;
+	uint32_t lgotno;
+	uint32_t *got;
+	char *str_tab;
+	int i, j;
+
+	uint32_t sym_addr;
+	module_t *dest;
+
+	got = (uint32_t *) m->dyn.plt_got;
+	sym_table = m->dyn.sym_tab;
+	str_tab = m->dyn.str_tab;
+	gotsym = m->dyn.arch.gotsym;
+	lgotno = m->dyn.arch.lgotno;
+
+	DPRINTF("** Relocate GOT entries **\n");
+	DPRINTF("MIPS base = 0x%x\n", m->dyn.arch.base);
+
+	/*
+	 * Local entries.
+	 */
+	for (i = 0; i < gotsym; i++) {
+		/* FIXME: really subtract MIPS base? */
+		got[i] += m->bias - m->dyn.arch.base;
+	}
+
+	DPRINTF("sym_ent = %d, gotsym = %d\n", m->dyn.arch.sym_no, gotsym);
+	DPRINTF("lgotno = %d\n", lgotno);
+
+	/*
+	 * Iterate over GOT-mapped symbol entries.
+	 */
+	for (j = gotsym; j < m->dyn.arch.sym_no; j++) {
+		/* Corresponding (global) GOT entry. */
+		i = lgotno + j - gotsym;
+
+		DPRINTF("relocate GOT entry %d\n", i);
+//		getchar();
+//		getchar();
+
+		sym = &sym_table[j];
+		if (ELF32_R_TYPE(sym->st_info) == STT_FUNC) {
+			if (sym->st_shndx == SHN_UNDEF) {
+				if (sym->st_value == 0) {
+					/* 1 */
+				} else {
+					if (got[i] == sym->st_value) {
+						/* 2 */
+						DPRINTF("(2)\n");
+						got[i] += m->bias - m->dyn.arch.base;
+						continue;
+					} else {
+						/* 3 */
+						DPRINTF("(3)\n");
+						got[i] = sym->st_value + m->bias - m->dyn.arch.base;
+						continue;
+					}
+				}
+			} else {
+				/* 2 */
+				DPRINTF("(2)\n");
+				got[i] += m->bias - m->dyn.arch.base;
+				continue;
+			}
+		} else {
+			if (sym->st_shndx == SHN_UNDEF ||
+			    sym->st_shndx == SHN_COMMON) {
+				/* 1 */
+			} else {
+				/* 1 */
+			}
+		}
+		
+		DPRINTF("(1) symbol name='%s'\n", str_tab + sym->st_name);
+		sym_def = symbol_def_find(str_tab + sym->st_name, m, &dest);
+		if (sym_def) {
+			sym_addr = symbol_get_addr(sym_def, dest);
+			DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
+		} else {
+			DPRINTF("symbol definition not found\n");
+			continue;
+		}
+		DPRINTF("write 0x%x at 0x%x\n", sym_addr, (uint32_t) &got[i]);
+		got[i] = sym_addr;
+	}
+
+	DPRINTF("** Done **\n");
+}
+
+/**
+ * Process (fixup) all relocations in a relocation table.
+ */
+void rel_table_process(module_t *m, elf_rel_t *rt, size_t rt_size)
+{
+	int i;
+
+	size_t rt_entries;
+	size_t r_offset;
+	elf_word r_info;
+	unsigned rel_type;
+	elf_word sym_idx;
+	uintptr_t sym_addr;
+	
+	elf_symbol_t *sym_table;
+	elf_symbol_t *sym;
+	uint32_t *r_ptr;
+	uint16_t *r_ptr16;
+	char *str_tab;
+	
+	elf_symbol_t *sym_def;
+	module_t *dest;
+
+	uint32_t *got;
+	uint32_t gotsym;
+	uint32_t lgotno;
+	uint32_t ea;
+
+	DPRINTF("parse relocation table\n");
+
+	sym_table = m->dyn.sym_tab;
+	rt_entries = rt_size / sizeof(elf_rela_t);
+	str_tab = m->dyn.str_tab;
+	got = (uint32_t *) m->dyn.plt_got;
+	gotsym = m->dyn.arch.gotsym;
+	lgotno = m->dyn.arch.lgotno;
+
+	DPRINTF("got=0x%lx, gotsym=%d\n", (uintptr_t) got, gotsym);
+
+	DPRINTF("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
+	
+	for (i = 0; i < rt_entries; ++i) {
+		DPRINTF("symbol %d: ", i);
+		r_offset = rt[i].r_offset;
+		r_info = rt[i].r_info;
+
+		sym_idx = ELF32_R_SYM(r_info);
+		sym = &sym_table[sym_idx];
+
+		DPRINTF("name '%s', value 0x%x, size 0x%x\n",
+		    str_tab + sym->st_name,
+		    sym->st_value,
+		    sym->st_size);
+
+		rel_type = ELF32_R_TYPE(r_info);
+		r_ptr = (uint32_t *)(r_offset + m->bias);
+		r_ptr16 = (uint16_t *)(r_offset + m->bias);
+
+		if (sym->st_name != 0) {
+			DPRINTF("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);
+			DPRINTF("dest name: '%s'\n", dest->dyn.soname);
+			DPRINTF("dest bias: 0x%x\n", dest->bias);
+			if (sym_def) {
+				sym_addr = symbol_get_addr(sym_def, dest);
+				DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
+			} else {
+				DPRINTF("symbol definition not found\n");
+				continue;
+			}
+		}
+
+		DPRINTF("switch(%u)\n", rel_type);
+
+		switch (rel_type) {
+		case R_MIPS_NONE:
+			DPRINTF("Ignoring R_MIPS_NONE\n");
+			break;
+
+		case R_MIPS_REL32:
+			DPRINTF("fixup R_MIPS_REL32 (r - ea + s)\n");
+			if (sym_idx < gotsym)
+				ea = sym_addr;
+			else
+				ea = got[lgotno + sym_idx - gotsym];
+
+			*r_ptr += sym_addr - ea;
+			DPRINTF("p = 0x%x, val := 0x%x\n", (uint32_t) r_ptr,
+			    *r_ptr);
+//			getchar();
+			break;
+
+		/* No other non-TLS relocation types should appear. */
+
+		case R_MIPS_TLS_DTPMOD32:
+			/*
+			 * We can ignore this as long as the only module
+			 * with TLS variables is libc.so.
+			 */
+			DPRINTF("Ignoring R_MIPS_DTPMOD32\n");
+			break;
+
+		default:
+			printf("Error: Unknown relocation type %d.\n",
+			    rel_type);
+			exit(1);
+			break;
+		}
+	}
+
+
+	printf("relocation done\n");
+}
+
+void rela_table_process(module_t *m, elf_rela_t *rt, size_t rt_size)
+{
+	/* Unused */
+	(void)m; (void)rt; (void)rt_size;
+}
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/arch/ppc32/Makefile.inc
===================================================================
--- uspace/lib/libc/rtld/arch/ppc32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/ppc32/Makefile.inc	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2008 Jiri Svoboda
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+CFLAGS += -D__32_BITS__
+
+ARCH_SOURCES += \
+	rtld/arch/$(UARCH)/src/dynamic.c \
+	rtld/arch/$(UARCH)/src/reloc.c
Index: uspace/lib/libc/rtld/arch/ppc32/include/dynamic.h
===================================================================
--- uspace/lib/libc/rtld/arch/ppc32/include/dynamic.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/ppc32/include/dynamic.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef ppc32_DYNAMIC_H_
+#define ppc32_DYNAMIC_H_
+
+#include <sys/types.h>
+
+typedef struct {
+	/* Empty. */
+} dyn_info_arch_t;
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/arch/ppc32/include/elf_dyn.h
===================================================================
--- uspace/lib/libc/rtld/arch/ppc32/include/elf_dyn.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/ppc32/include/elf_dyn.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef ppc32_ELF_DYN_H_
+#define ppc32_ELF_DYN_H_
+
+/* 
+ * ppc32 dynamic relocation types
+ */
+
+#define R_PPC_ADDR32	1
+#define R_PPC_ADDR16_LO	4
+#define R_PPC_ADDR16_HI	5
+#define R_PPC_ADDR16_HA	6
+#define R_PPC_REL24	10
+#define R_PPC_COPY	19
+#define R_PPC_JMP_SLOT	21
+#define R_PPC_RELATIVE	22
+
+#define R_PPC_DTPMOD32	68
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/arch/ppc32/src/dynamic.c
===================================================================
--- uspace/lib/libc/rtld/arch/ppc32/src/dynamic.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/ppc32/src/dynamic.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <elf_dyn.h>
+#include <dynamic.h>
+
+void dyn_parse_arch(elf_dyn_t *dp, size_t bias, dyn_info_t *info)
+{
+	(void) dp;
+	(void) bias;
+	(void) info;
+}
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/arch/ppc32/src/reloc.c
===================================================================
--- uspace/lib/libc/rtld/arch/ppc32/src/reloc.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/arch/ppc32/src/reloc.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <arch.h>
+#include <elf_dyn.h>
+#include <symbol.h>
+#include <rtld.h>
+#include <smc.h>
+
+#define __L(ptr) ((uint32_t)(ptr) & 0x0000ffff)
+#define __HA(ptr) ((uint32_t)(ptr) >> 16)
+
+// ldis r11, .PLTtable@ha
+static inline uint32_t _ldis(unsigned rD, uint16_t imm16)
+{
+	/* Special case of addis: ldis rD,SIMM == addis rD,0,SIMM */
+	return 0x3C000000 | (rD << 21) | imm16;
+}
+
+static inline uint32_t _lwz(unsigned rD, uint16_t disp16, unsigned rA)
+{
+	return 0x80000000 | (rD << 21) | (rA << 16) | disp16;
+}
+
+static inline uint32_t _mtctr(unsigned rS)
+{
+	/* mtctr rD == mtspr 9, rD */
+	return 0x7c0003a6 | (rS << 21) | (9/*CTR*/ << 16);
+}
+
+static inline uint32_t _bctr()
+{
+	/* bcctr 0x1f, 0 */
+	return 0x4c000420 | (0x1f/*always*/ << 21);
+}
+
+/* branch */
+static inline uint32_t _b(uint32_t *addr, uint32_t *location)
+{
+	uint32_t raddr = ((uint32_t)addr - (uint32_t)location) & 0x03fffffc;
+	return 0x48000000 | raddr;
+}
+
+
+/*
+ * Fill in PLT
+ */
+void module_process_pre_arch(module_t *m)
+{
+	uint32_t *plt;
+	uint32_t *_plt_ent;
+	
+	/* No lazy linking -- no pre-processing yet. */
+	return;
+
+	plt = m->dyn.plt_got;
+	if (!plt) {
+		/* Module has no PLT */
+		return;
+	}
+
+	// PLT entries start here. However, each occupies 2 words
+	_plt_ent = plt + 18;
+
+	// By definition of the ppc ABI, there's 1:1 correspondence
+	// between JMPREL entries and PLT entries
+	unsigned plt_n = m->dyn.plt_rel_sz / sizeof(elf_rela_t);
+
+	uint32_t *_plt_table;
+	uint32_t *_plt_call;
+	uint32_t *_plt_resolve;
+
+	_plt_resolve = plt;
+	_plt_call = plt + 6;
+	_plt_table = plt + 18 + plt_n;
+
+/* .PLTcall: */
+	plt[6] = _ldis(11, __HA(_plt_table));	// ldis r11, .PLTtable@ha
+	plt[7] = _lwz(11, __L(_plt_table), 11);	// lwz r11, .PLTtable@l(r11)
+	plt[8] = _mtctr(11);			// mtctr r11
+	plt[9] = _bctr();
+
+/* .PLTi, i = 0..N-1 */
+//	kputint(-4);
+/*	for (i = 0; i < plt_n; ++i) {
+		//_plt_table[i] == function address;
+		plt[18+i] = _b(_plt_call, &plt[18+i]);	// b .PLTcall
+	}*/
+}
+
+void rel_table_process(module_t *m, elf_rel_t *rt, size_t rt_size)
+{
+	/* Unused */
+	(void)m; (void)rt; (void)rt_size;
+}
+
+/**
+ * Process (fixup) all relocations in a relocation table.
+ */
+void rela_table_process(module_t *m, elf_rela_t *rt, size_t rt_size)
+{
+	int i;
+
+	size_t rt_entries;
+	size_t r_offset;
+	elf_word r_info;
+	unsigned rel_type;
+	elf_word sym_idx;
+	uintptr_t sym_addr;
+	uintptr_t r_addend;
+	
+	elf_symbol_t *sym_table;
+	elf_symbol_t *sym;
+	uint32_t *r_ptr;
+	uint16_t *r_ptr16;
+	char *str_tab;
+	
+	elf_symbol_t *sym_def;
+	module_t *dest;
+
+	uint32_t *plt;
+	uint32_t *_plt_table;
+	uint32_t *_plt_ent;
+	uint32_t plt_n;
+	uint32_t pidx;
+	uint32_t t_addr;
+	uint32_t sym_size;
+
+	plt = m->dyn.plt_got;
+	plt_n = m->dyn.plt_rel_sz / sizeof(elf_rela_t);
+	_plt_ent = plt+ 18;
+	_plt_table = plt + 18 + plt_n;
+
+	DPRINTF("parse relocation table\n");
+
+	sym_table = m->dyn.sym_tab;
+	rt_entries = rt_size / sizeof(elf_rela_t);
+	str_tab = m->dyn.str_tab;
+
+	DPRINTF("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
+	
+	for (i = 0; i < rt_entries; ++i) {
+		DPRINTF("symbol %d: ", i);
+		r_offset = rt[i].r_offset;
+		r_info = rt[i].r_info;
+		r_addend = rt[i].r_addend;
+
+		sym_idx = ELF32_R_SYM(r_info);
+		sym = &sym_table[sym_idx];
+
+		DPRINTF("name '%s', value 0x%x, size 0x%x\n",
+		    str_tab + sym->st_name,
+		    sym->st_value,
+		    sym->st_size);
+
+		rel_type = ELF32_R_TYPE(r_info);
+		r_ptr = (uint32_t *)(r_offset + m->bias);
+		r_ptr16 = (uint16_t *)(r_offset + m->bias);
+
+		if (sym->st_name != 0) {
+			DPRINTF("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);
+			sym_def = symbol_def_find(str_tab + sym->st_name,
+			    m, &dest);
+			DPRINTF("dest name: '%s'\n", dest->dyn.soname);
+			DPRINTF("dest bias: 0x%x\n", dest->bias);
+			if (sym_def) {
+				sym_addr = symbol_get_addr(sym_def, dest);
+				DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
+			} else {
+				DPRINTF("symbol definition not found\n");
+				continue;
+			}
+		}
+
+		switch (rel_type) {
+		case R_PPC_ADDR16_LO:
+			DPRINTF("fixup R_PPC_ADDR16_LO (#lo(s+a))\n");
+			*r_ptr16 = (sym_addr + r_addend) & 0xffff;
+			break;
+
+		case R_PPC_ADDR16_HI:
+			DPRINTF("fixup R_PPC_ADDR16_HI (#hi(s+a))\n");
+			*r_ptr16 = (sym_addr + r_addend) >> 16;
+			break;
+
+		case R_PPC_ADDR16_HA:
+			DPRINTF("fixup R_PPC_ADDR16_HA (#ha(s+a))\n");
+			t_addr = sym_addr + r_addend;
+			*r_ptr16 = (t_addr >> 16) + ((t_addr & 0x8000) ? 1 : 0);
+			break;
+
+		case R_PPC_JMP_SLOT:
+			DPRINTF("fixup R_PPC_JMP_SLOT (b+v)\n");
+			pidx = (r_ptr - _plt_ent) / 2;
+			if (pidx >= plt_n) {
+				DPRINTF("error: proc index out of range\n");
+				exit(1);
+			}
+			plt[18+2*pidx] = _b((void *)sym_addr, &plt[18+2*pidx]);
+			break;
+
+		case R_PPC_ADDR32:
+			DPRINTF("fixup R_PPC_ADDR32 (b+v+a)\n");
+			*r_ptr = r_addend + sym_addr;
+			break;
+
+		case R_PPC_COPY:
+			/*
+			 * Copy symbol data from shared object to specified
+			 * location.
+			 */
+			DPRINTF("fixup R_PPC_COPY (s)\n");
+			sym_size = sym->st_size;
+			if (sym_size != sym_def->st_size) {
+				printf("warning: mismatched symbol sizes\n");
+				/* Take the lower value. */
+				if (sym_size > sym_def->st_size)
+					sym_size = sym_def->st_size;
+			}
+			memcpy(r_ptr, (const void *)sym_addr, sym_size);
+			break;
+			
+		case R_PPC_RELATIVE:
+			DPRINTF("fixup R_PPC_RELATIVE (b+a)\n");
+			*r_ptr = r_addend + m->bias;
+			break;
+
+		case R_PPC_REL24:
+			DPRINTF("fixup R_PPC_REL24 (s+a-p)>>2\n");
+			*r_ptr = (sym_addr + r_addend - (uint32_t)r_ptr) >> 2;
+			break;
+
+		case R_PPC_DTPMOD32:
+			/*
+			 * We can ignore this as long as the only module
+			 * with TLS variables is libc.so.
+			 */
+			DPRINTF("Ignoring R_PPC_DTPMOD32\n");
+			break;
+
+		default:
+			printf("Error: Unknown relocation type %d.\n",
+			    rel_type);
+			exit(1);
+			break;
+		}
+	}
+
+	/*
+	 * Synchronize the used portion of PLT. This is necessary since
+	 * we are writing instructions.
+	 */
+	smc_coherence(&plt[18], plt_n * 2 * sizeof(uint32_t));
+}
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/dynamic.c
===================================================================
--- uspace/lib/libc/rtld/dynamic.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/dynamic.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include <elf_dyn.h>
+#include <dynamic.h>
+#include <rtld.h>
+
+void dynamic_parse(elf_dyn_t *dyn_ptr, size_t bias, dyn_info_t *info)
+{
+	elf_dyn_t *dp = dyn_ptr;
+
+	void *d_ptr;
+	elf_word d_val;
+
+	elf_word soname_idx;
+	elf_word rpath_idx;
+
+	DPRINTF("memset\n");
+	memset(info, 0, sizeof(info));
+
+	soname_idx = 0;
+	rpath_idx = 0;
+
+	DPRINTF("pass 1\n");
+	while (dp->d_tag != DT_NULL) {
+		d_ptr = (void *)((uint8_t *)dp->d_un.d_ptr + bias);
+		d_val = dp->d_un.d_val;
+
+		switch (dp->d_tag) {
+
+		case DT_PLTRELSZ:	info->plt_rel_sz = d_val; break;
+		case DT_PLTGOT:		info->plt_got = d_ptr; break;
+		case DT_HASH:		info->hash = d_ptr; break;
+		case DT_STRTAB:		info->str_tab = d_ptr; break;
+		case DT_SYMTAB:		info->sym_tab = d_ptr; break;
+		case DT_RELA:		info->rela = d_ptr; break;
+		case DT_RELASZ:		info->rela_sz = d_val; break;
+		case DT_RELAENT:	info->rela_ent = d_val; break;
+		case DT_STRSZ:		info->str_sz = d_val; break;
+		case DT_SYMENT:		info->sym_ent = d_val; break;
+		case DT_INIT:		info->init = d_ptr; break;
+		case DT_FINI:		info->fini = d_ptr; break;
+		case DT_SONAME:		soname_idx = d_val; break;
+		case DT_RPATH:		rpath_idx = d_val; break;
+		case DT_SYMBOLIC:	info->symbolic = true; break;
+		case DT_REL:		info->rel = d_ptr; break;
+		case DT_RELSZ:		info->rel_sz = d_val; break;
+		case DT_RELENT:		info->rel_ent = d_val; break;
+		case DT_PLTREL:		info->plt_rel = d_val; break;
+		case DT_TEXTREL:	info->text_rel = true; break;
+		case DT_JMPREL:		info->jmp_rel = d_ptr; break;
+		case DT_BIND_NOW:	info->bind_now = true; break;
+
+		default:
+			if (dp->d_tag >= DT_LOPROC && dp->d_tag <= DT_HIPROC)
+				dyn_parse_arch(dp, bias, info);
+			break;
+		}
+
+		++dp;
+	}
+
+	info->soname = info->str_tab + soname_idx;
+	info->rpath = info->str_tab + rpath_idx;
+
+	/* This will be useful for parsing dependencies later */
+	info->dynamic = dyn_ptr;
+
+	DPRINTF("str_tab=0x%x, soname_idx=0x%x, soname=0x%x\n",
+		(uintptr_t)info->soname, soname_idx, (uintptr_t)info->soname);
+	DPRINTF("soname='%s'\n", info->soname);
+	DPRINTF("rpath='%s'\n", info->rpath);
+	DPRINTF("hash=0x%x\n", (uintptr_t)info->hash);
+
+	/*
+	 * Now that we have a pointer to the string table,
+	 * we can parse DT_NEEDED fields (which contain offsets into it).
+	 */
+
+	DPRINTF("pass 2\n");
+	dp = dyn_ptr;
+	while (dp->d_tag != DT_NULL) {
+		d_val = dp->d_un.d_val;
+
+		switch (dp->d_tag) {
+		case DT_NEEDED:
+			/* Assume just for now there's only one dependency */
+			info->needed = info->str_tab + d_val;
+			DPRINTF("needed:'%s'\n", info->needed);
+			break;
+
+		default: break;
+		}
+
+		++dp;
+	}
+}
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/elf_load.c
===================================================================
--- uspace/lib/libc/rtld/elf_load.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/elf_load.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,1 @@
+../../../srv/loader/elf_load.c
Index: uspace/lib/libc/rtld/include/dynamic.h
===================================================================
--- uspace/lib/libc/rtld/include/dynamic.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/include/dynamic.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef DYNAMIC_H_
+#define DYNAMIC_H_
+
+#include <bool.h>
+#include <elf_dyn.h>
+#include <arch/dynamic.h>
+
+/**
+ * Holds the data extracted from an ELF Dynamic section.
+ *
+ * The data is already pre-processed: Pointers are adjusted
+ * to their final run-time values by adding the load bias
+ * and indices into the symbol table are converted to pointers.
+ */
+typedef struct dyn_info {
+	/** Type of relocations used for the PLT, either DT_REL or DT_RELA */
+	int plt_rel;
+
+	/** Relocation table without explicit addends */
+	void *rel;
+	size_t rel_sz;
+	size_t rel_ent;
+
+	/** Relocation table with explicit addends */
+	void *rela;
+	size_t rela_sz;
+	size_t rela_ent;
+
+	/** PLT relocation table */
+	void *jmp_rel;
+	size_t plt_rel_sz;
+
+	/** Pointer to PLT/GOT (processor-specific) */
+	void *plt_got;
+
+	/** Hash table */
+	elf_word *hash;
+
+	/** String table */
+	char *str_tab;
+	size_t str_sz;
+
+	/** Symbol table */
+	void *sym_tab;
+	size_t sym_ent;
+
+	void *init;	/**< Module initialization code */
+	void *fini;	/**< Module cleanup code */
+
+	char *soname;	/**< Library identifier */
+	char *rpath;	/**< Library search path list */
+
+	bool symbolic;
+	bool text_rel;
+	bool bind_now;
+
+	/* Assume for now that there's at most one needed library */
+	char *needed;
+
+	/** Pointer to the module's dynamic section */
+	elf_dyn_t *dynamic;
+
+	/** Architecture-specific info. */
+	dyn_info_arch_t arch;
+} dyn_info_t;
+
+void dynamic_parse(elf_dyn_t *dyn_ptr, size_t bias, dyn_info_t *info);
+void dyn_parse_arch(elf_dyn_t *dp, size_t bias, dyn_info_t *info);
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/include/elf_dyn.h
===================================================================
--- uspace/lib/libc/rtld/include/elf_dyn.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/include/elf_dyn.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef ELF_DYN_H_
+#define ELF_DYN_H_
+
+#include <arch/elf.h>
+#include <sys/types.h>
+
+#include <elf.h>
+#include <arch/elf_dyn.h>
+
+#define ELF32_R_SYM(i) ((i)>>8)
+#define ELF32_R_TYPE(i) ((unsigned char)(i))
+
+struct elf32_dyn {
+	elf_sword d_tag;
+	union {
+		elf_word d_val;
+		elf32_addr d_ptr;
+	} d_un;
+};
+
+struct elf32_rel {
+	elf32_addr r_offset;
+	elf_word r_info;
+};
+
+struct elf32_rela {
+	elf32_addr r_offset;
+	elf_word r_info;
+	elf_sword r_addend;
+};
+
+#ifdef __32_BITS__
+typedef struct elf32_dyn elf_dyn_t;
+typedef struct elf32_rel elf_rel_t;
+typedef struct elf32_rela elf_rela_t;
+#endif
+
+/*
+ * Dynamic array tags
+ */
+#define DT_NULL		0
+#define DT_NEEDED	1
+#define DT_PLTRELSZ	2
+#define DT_PLTGOT	3
+#define DT_HASH		4
+#define DT_STRTAB	5
+#define DT_SYMTAB	6
+#define DT_RELA		7
+#define DT_RELASZ	8
+#define DT_RELAENT	9
+#define DT_STRSZ	10
+#define DT_SYMENT	11
+#define DT_INIT		12
+#define DT_FINI		13
+#define DT_SONAME	14
+#define DT_RPATH	15
+#define DT_SYMBOLIC	16
+#define DT_REL		17
+#define DT_RELSZ	18
+#define DT_RELENT	19
+#define DT_PLTREL	20
+#define DT_DEBUG	21
+#define DT_TEXTREL	22
+#define DT_JMPREL	23
+#define DT_BIND_NOW	24
+#define DT_LOPROC	0x70000000
+#define DT_HIPROC	0x7fffffff
+
+/*
+ * Special section indexes
+ */
+#define SHN_UNDEF	0
+#define SHN_LORESERVE	0xff00
+#define SHN_LOPROC	0xff00
+#define SHN_HIPROC	0xff1f
+#define SHN_ABS		0xfff1
+#define SHN_COMMON	0xfff2
+#define SHN_HIRESERVE	0xffff
+
+/*
+ * Special symbol table index
+ */
+#define STN_UNDEF	0
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/include/module.h
===================================================================
--- uspace/lib/libc/rtld/include/module.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/include/module.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef MODULE_H_
+#define MODULE_H_
+
+#include <sys/types.h>
+#include <dynamic.h>
+#include <adt/list.h>
+
+typedef struct module {
+	dyn_info_t dyn;
+	size_t bias;
+
+	/** Array of pointers to directly dependent modules */
+	struct module **deps;
+	/** Number of fields in deps */
+	size_t n_deps;
+
+	/** True iff relocations have already been processed in this module. */
+	bool relocated;
+
+	/** Link to list of all modules in runtime environment */
+	link_t modules_link;
+
+	/** Link to BFS queue. Only used when doing a BFS of the module graph */
+	link_t queue_link;
+	/** Tag for modules already processed during a BFS */
+	bool bfs_tag;
+} module_t;
+
+void module_process_relocs(module_t *m);
+module_t *module_find(char *name);
+module_t *module_load(char *name);
+void module_load_deps(module_t *m);
+
+void modules_process_relocs(module_t *start);
+void modules_untag(void);
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/include/rtld.h
===================================================================
--- uspace/lib/libc/rtld/include/rtld.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/include/rtld.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef RTLD_H_
+#define RTLD_H_
+
+#include <sys/types.h>
+#include <adt/list.h>
+
+#include <dynamic.h>
+#include <module.h>
+
+/* Define to enable debugging mode. */
+#undef RTLD_DEBUG
+
+#ifdef RTLD_DEBUG
+	#define DPRINTF(format, ...) printf(format, ##__VA_ARGS__);
+#else
+	#define DPRINTF(format, ...)
+#endif
+
+typedef struct {
+	elf_dyn_t *rtld_dynamic;
+	module_t rtld;
+
+	module_t *program;
+
+	/** List of all loaded modules including rtld and the program */
+	link_t modules_head;
+
+	/** Temporary hack to place each module at different address. */
+	uintptr_t next_bias;
+} runtime_env_t;
+
+extern runtime_env_t *runtime_env;
+
+extern void rtld_init_static(void);
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/include/rtld_arch.h
===================================================================
--- uspace/lib/libc/rtld/include/rtld_arch.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/include/rtld_arch.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef RTLD_ARCH_H_
+#define RTLD_ARCH_H_
+
+#include <rtld.h>
+#include <loader/pcb.h>
+
+void module_process_pre_arch(module_t *m);
+
+void rel_table_process(module_t *m, elf_rel_t *rt, size_t rt_size);
+void rela_table_process(module_t *m, elf_rela_t *rt, size_t rt_size);
+
+void program_run(void *entry, pcb_t *pcb);
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/include/symbol.h
===================================================================
--- uspace/lib/libc/rtld/include/symbol.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/include/symbol.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef SYMBOL_H_
+#define SYMBOL_H_
+
+#include <rtld.h>
+#include <elf.h>
+
+elf_symbol_t *symbol_bfs_find(char *name, module_t *start, module_t **mod);
+elf_symbol_t *symbol_def_find(char *name, module_t *origin, module_t **mod);
+uintptr_t symbol_get_addr(elf_symbol_t *sym, module_t *m);
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/module.c
===================================================================
--- uspace/lib/libc/rtld/module.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/module.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <adt/list.h>
+#include <loader/pcb.h>
+
+#include <rtld.h>
+#include <dynamic.h>
+#include <elf_load.h>
+#include <rtld_arch.h>
+#include <module.h>
+
+/** (Eagerly) process all relocation tables in a module.
+ *
+ * Currently works as if LD_BIND_NOW was specified.
+ */
+void module_process_relocs(module_t *m)
+{
+	DPRINTF("module_process_relocs('%s')\n", m->dyn.soname);
+
+	/* Do not relocate twice. */
+	if (m->relocated) return;
+
+	module_process_pre_arch(m);
+
+	if (m->dyn.plt_rel == DT_REL) {
+		DPRINTF("table type DT_REL\n");
+		if (m->dyn.rel != NULL) {
+			DPRINTF("non-empty\n");
+			rel_table_process(m, m->dyn.rel, m->dyn.rel_sz);
+		}
+		/* FIXME: this seems wrong */
+		if (m->dyn.jmp_rel != NULL) {
+		DPRINTF("table type jmp-rel\n");
+			DPRINTF("non-empty\n");
+			rel_table_process(m, m->dyn.jmp_rel, m->dyn.plt_rel_sz);
+		}
+	} else { /* (m->dyn.plt_rel == DT_RELA) */
+		DPRINTF("table type DT_RELA\n");
+		if (m->dyn.rela != NULL) {
+			DPRINTF("non-empty\n");
+			rela_table_process(m, m->dyn.rela, m->dyn.rela_sz);
+		}
+	}
+
+	m->relocated = true;
+}
+
+/** Find module structure by soname/pathname.
+ *
+ * Used primarily to see if a module has already been loaded.
+ * Modules are compared according to their soname, i.e. possible
+ * path components are ignored.
+ */
+module_t *module_find(char *name)
+{
+	link_t *head = &runtime_env->modules_head;
+
+	link_t *cur;
+	module_t *m;
+	char *p, *soname;
+
+	/*
+	 * If name contains slashes, treat it as a pathname and
+	 * construct soname by chopping off the path. Otherwise
+	 * treat it as soname.
+	 */
+	p = str_rchr(name, '/');
+	soname = p ? (p + 1) : name;
+
+	/* Traverse list of all modules. Not extremely fast, but simple */
+	for (cur = head->next; cur != head; cur = cur->next) {
+		m = list_get_instance(cur, module_t, modules_link);
+		if (str_cmp(m->dyn.soname, soname) == 0) {
+			return m; /* Found */
+		}
+	}
+	
+	return NULL; /* Not found */
+}
+
+#define NAME_BUF_SIZE 64
+
+/** Load a module.
+ *
+ * Currently this trivially tries to load '/<name>'.
+ */
+module_t *module_load(char *name)
+{
+	elf_info_t info;
+	char name_buf[NAME_BUF_SIZE];
+	module_t *m;
+	int rc;
+	
+	m = malloc(sizeof(module_t));
+	if (!m) {
+		printf("malloc failed\n");
+		exit(1);
+	}
+
+	if (str_size(name) > NAME_BUF_SIZE - 2) {
+		printf("soname too long. increase NAME_BUF_SIZE\n");
+		exit(1);
+	}
+
+	/* Prepend soname with '/lib/' */
+	str_cpy(name_buf, NAME_BUF_SIZE, "/lib/");
+	str_cpy(name_buf + 5, NAME_BUF_SIZE - 5, name);
+
+	/* FIXME: need to real allocation of address space */
+	m->bias = runtime_env->next_bias;
+	runtime_env->next_bias += 0x100000;
+
+	DPRINTF("filename:'%s'\n", name_buf);
+	printf("load '%s' at 0x%x\n", name_buf, m->bias);
+
+	rc = elf_load_file(name_buf, m->bias, ELDF_RW, &info);
+	if (rc != EE_OK) {
+		printf("Failed to load '%s'\n", name_buf);
+		exit(1);
+	}
+
+	if (info.dynamic == NULL) {
+		printf("Error: '%s' is not a dynamically-linked object.\n",
+		    name_buf);
+		exit(1);
+	}
+
+	/* Pending relocation. */
+	m->relocated = false;
+
+	DPRINTF("parse dynamic section\n");
+	/* Parse ELF .dynamic section. Store info to m->dyn. */
+	dynamic_parse(info.dynamic, m->bias, &m->dyn);
+
+	/* Insert into the list of loaded modules */
+	list_append(&m->modules_link, &runtime_env->modules_head);
+
+	return m;
+}
+
+/** Load all modules on which m (transitively) depends.
+ */
+void module_load_deps(module_t *m)
+{
+	elf_dyn_t *dp;
+	char *dep_name;
+	module_t *dm;
+	size_t n, i;
+
+	/* Count direct dependencies */
+	
+	dp = m->dyn.dynamic;
+	n = 0;
+
+	while (dp->d_tag != DT_NULL) {
+		if (dp->d_tag == DT_NEEDED) ++n;
+		++dp;
+	}
+
+	/* Create an array of pointers to direct dependencies */
+
+	m->n_deps = n;
+
+	if (n == 0) {
+		/* There are no dependencies, so we are done. */
+		m->deps = NULL;
+		return;
+	}
+
+	m->deps = malloc(n * sizeof(module_t *));
+	if (!m->deps) {
+		printf("malloc failed\n");
+		exit(1);
+	}
+
+	i = 0; /* Current dependency index */
+	dp = m->dyn.dynamic;
+
+	while (dp->d_tag != DT_NULL) {
+		if (dp->d_tag == DT_NEEDED) {
+			dep_name = m->dyn.str_tab + dp->d_un.d_val;
+
+			DPRINTF("%s needs %s\n", m->dyn.soname, dep_name);
+			dm = module_find(dep_name);
+			if (!dm) {
+				dm = module_load(dep_name);
+				module_load_deps(dm);
+			}
+
+			/* Save into deps table */
+			m->deps[i++] = dm;
+		}
+		++dp;
+	}
+}
+
+/** Process relocations in modules.
+ *
+ * Processes relocations in @a start and all its dependencies.
+ * Modules that have already been relocated are unaffected.
+ *
+ * @param	start	The module where to start from.
+ */
+void modules_process_relocs(module_t *start)
+{
+	link_t *head = &runtime_env->modules_head;
+
+	link_t *cur;
+	module_t *m;
+
+	for (cur = head->next; cur != head; cur = cur->next) {
+		m = list_get_instance(cur, module_t, modules_link);
+
+		/* Skip rtld, since it has already been processed */
+		if (m != &runtime_env->rtld) {
+			module_process_relocs(m);
+		}
+	}
+}
+
+/** Clear BFS tags of all modules.
+ */
+void modules_untag(void)
+{
+	link_t *head = &runtime_env->modules_head;
+
+	link_t *cur;
+	module_t *m;
+
+	for (cur = head->next; cur != head; cur = cur->next) {
+		m = list_get_instance(cur, module_t, modules_link);
+		m->bfs_tag = false;
+	}
+}
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/rtld.c
===================================================================
--- uspace/lib/libc/rtld/rtld.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/rtld.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <rtld.h>
+
+runtime_env_t *runtime_env;
+static runtime_env_t rt_env_static;
+
+/** Initialize the loder for use in a statically-linked binary. */
+void rtld_init_static(void)
+{
+	runtime_env = &rt_env_static;
+	list_initialize(&runtime_env->modules_head);
+	runtime_env->next_bias = 0x2000000;
+	runtime_env->program = NULL;
+}
+
+/** @}
+ */
Index: uspace/lib/libc/rtld/symbol.c
===================================================================
--- uspace/lib/libc/rtld/symbol.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/rtld/symbol.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <rtld.h>
+#include <symbol.h>
+#include <elf.h>
+
+/*
+ * Hash tables are 32-bit (elf_word) even for 64-bit ELF files.
+ */
+static elf_word elf_hash(const unsigned char *name)
+{
+	elf_word h = 0, g;
+
+	while (*name) {
+		h = (h << 4) + *name++;
+		g = h & 0xf0000000;
+		if (g != 0) h ^= g >> 24;
+		h &= ~g;
+	}
+
+	return h;
+}
+
+static elf_symbol_t *def_find_in_module(char *name, module_t *m)
+{
+	elf_symbol_t *sym_table;
+	elf_symbol_t *s, *sym;
+	elf_word nbucket;
+	elf_word nchain;
+	elf_word i;
+	char *s_name;
+	elf_word bucket;
+
+	DPRINTF("def_find_in_module('%s', %s)\n", name, m->dyn.soname);
+
+	sym_table = m->dyn.sym_tab;
+	nbucket = m->dyn.hash[0];
+	nchain = m->dyn.hash[1];
+
+	bucket = elf_hash((unsigned char *)name) % nbucket;
+	i = m->dyn.hash[2 + bucket];
+
+	sym = NULL;
+	while (i != STN_UNDEF) {
+		s = &sym_table[i];
+		s_name = m->dyn.str_tab + s->st_name;
+
+		if (str_cmp(name, s_name) == 0) {
+			sym = s;
+			break;
+		}
+
+		i = m->dyn.hash[2 + nbucket + i];
+	}
+
+	if (!sym)
+		return NULL;	/* Not found */
+
+	if (sym->st_shndx == SHN_UNDEF) {
+		/* Not a definition */
+		return NULL;
+	}
+
+	return sym; /* Found */
+}
+
+/** Find the definition of a symbol in a module and its deps.
+ *
+ * Search the module dependency graph is breadth-first, beginning
+ * from the module @a start. Thus, @start and all its dependencies
+ * get searched.
+ *
+ * @param name		Name of the symbol to search for.
+ * @param start		Module in which to start the search..
+ * @param mod		(output) Will be filled with a pointer to the module 
+ *			that contains the symbol.
+ */
+elf_symbol_t *symbol_bfs_find(char *name, module_t *start, module_t **mod)
+{
+	module_t *m, *dm;
+	elf_symbol_t *sym, *s;
+	link_t queue_head;
+	size_t i;
+
+	/*
+	 * Do a BFS using the queue_link and bfs_tag fields.
+	 * Vertices (modules) are tagged the moment they are inserted
+	 * into the queue. This prevents from visiting the same vertex
+	 * more times in case of circular dependencies.
+	 */
+
+	/* Mark all vertices (modules) as unvisited */	
+	modules_untag();
+
+	/* Insert root (the program) into the queue and tag it */
+	list_initialize(&queue_head);
+	start->bfs_tag = true;
+	list_append(&start->queue_link, &queue_head);
+
+	/* If the symbol is found, it will be stored in 'sym' */
+	sym = NULL;
+
+	/* While queue is not empty */
+	while (!list_empty(&queue_head)) {
+		/* Pop first element from the queue */
+		m = list_get_instance(queue_head.next, module_t, queue_link);
+		list_remove(&m->queue_link);
+
+		s = def_find_in_module(name, m);
+		if (s != NULL) {
+			/* Symbol found */
+			sym = s;
+			*mod = m;
+			break;
+		}
+
+		/*
+		 * Insert m's untagged dependencies into the queue
+		 * and tag them.
+		 */
+		for (i = 0; i < m->n_deps; ++i) {
+			dm = m->deps[i];
+
+			if (dm->bfs_tag == false) {
+				dm->bfs_tag = true;
+				list_append(&dm->queue_link, &queue_head);
+			}
+		}
+	}
+
+	/* Empty the queue so that we leave it in a clean state */
+	while (!list_empty(&queue_head))
+		list_remove(queue_head.next);
+
+	if (!sym) {
+		return NULL; /* Not found */
+	}
+
+	return sym; /* Symbol found */
+}
+
+
+/** Find the definition of a symbol..
+ *
+ * By definition in System V ABI, if module origin has the flag DT_SYMBOLIC,
+ * origin is searched first. Otherwise, or if the symbol hasn't been found,
+ * the module dependency graph is searched breadth-first, beginning
+ * from the executable program.
+ *
+ * @param name		Name of the symbol to search for.
+ * @param origin	Module in which the dependency originates.
+ * @param mod		(output) Will be filled with a pointer to the module 
+ *			that contains the symbol.
+ */
+elf_symbol_t *symbol_def_find(char *name, module_t *origin, module_t **mod)
+{
+	module_t *m, *dm;
+	elf_symbol_t *sym, *s;
+	link_t queue_head;
+	size_t i;
+
+	if (origin->dyn.symbolic) {
+		/* 
+		 * Origin module has a DT_SYMBOLIC flag.
+		 * Try this module first
+		 */
+		 s = def_find_in_module(name, origin);
+		 if (s != NULL) {
+			/* Found */
+			*mod = origin;
+			return s;
+		 }
+	}
+
+	/* Not DT_SYMBOLIC or no match. Now try other locations. */
+
+	if (runtime_env->program) {
+		/* Program is dynamic -- start with program as root. */
+		return symbol_bfs_find(name, runtime_env->program, mod);
+	} else {	
+		/* Program is static -- start with @a origin as root. */
+		return symbol_bfs_find(name, origin, mod);
+	}
+}
+
+uintptr_t symbol_get_addr(elf_symbol_t *sym, module_t *m)
+{
+	if (sym->st_shndx == SHN_ABS) {
+		/* Do not add bias to absolute symbols */
+		return sym->st_value;
+	} else {
+		return sym->st_value + m->bias;
+	}
+}
+
+/** @}
+ */
Index: uspace/lib/libc/shared/Makefile
===================================================================
--- uspace/lib/libc/shared/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/shared/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,75 @@
+#
+# Copyright (c) 2005 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../../../../version
+
+## Setup toolchain
+#
+
+LIBC_PREFIX = ../../../lib/libc
+APP_LIBC_PREFIX = ../../lib/libc
+SOFTINT_PREFIX = ../../../lib/softint
+
+include $(LIBC_PREFIX)/Makefile.toolchain
+#include arch/$(UARCH)/Makefile.inc
+ARCH_SOURCES :=
+
+LFLAGS = -shared -soname libc.so.0 --whole-archive 
+
+LIBS = \
+	$(LIBC_PREFIX)/libc.pic.a \
+	$(SOFTINT_PREFIX)/libsoftint.pic.a
+
+DEFS += -DRELEASE=\"$(RELEASE)\"
+
+## Sources
+#
+
+OUTPUT = libc.so.0
+
+.PHONY: all clean
+
+all: $(OUTPUT) arch/$(UARCH)/_link.ld
+
+inc:
+	ln -sfn ../arch/$(UARCH)/include include/arch
+
+-include Makefile.depend
+
+clean:
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(UARCH)/_link.ld  arch/$(UARCH)/_lib.ld include/arch
+	find arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
+
+$(OUTPUT): $(LIBS) arch/$(UARCH)/_lib.ld
+	$(LD) -T arch/$(UARCH)/_lib.ld $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
+
+arch/$(UARCH)/_lib.ld: arch/$(UARCH)/_lib.ld.in
+	$(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
+
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
+	$(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(APP_LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
Index: uspace/lib/libc/shared/arch/ia32/_lib.ld.in
===================================================================
--- uspace/lib/libc/shared/arch/ia32/_lib.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/shared/arch/ia32/_lib.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,84 @@
+ENTRY(__entry)
+
+PHDRS {
+        text PT_LOAD FLAGS(5);
+	data PT_LOAD FLAGS(6);
+	dynamic PT_DYNAMIC;
+}
+
+SECTIONS {
+	. = 0x1000 + SIZEOF_HEADERS;
+
+	.init : {
+		*(.init);
+	} :text
+	.text : {
+		*(.text);
+		*(.text.*);
+		*(.rodata*);
+	} :text
+
+	.rel.plt : {
+		*(.rel.plt);
+	}
+	/* 
+	 *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+	 * without alignment gap or DT_REL will be broken
+	 */
+	.rel.dyn : {
+		*(.rel.*);
+	} :text
+
+	.plt : {
+		*(.plt);
+	} :text
+
+	.dynsym : {
+		*(.dynsym);
+	} :text
+
+	.dynstr : {
+		*(.dynstr);
+	} :text
+
+	. = . + 0x1000;
+
+	.dynamic : {
+		*(.dynamic);
+	} :data :dynamic
+
+	.data : {
+		*(.data);
+	} :data
+
+	.data.rel : {
+                *(.data.rel);
+	} :data
+
+	.got : {
+                *(.got);
+	} :data
+	.got.plt : {
+                *(.got.plt);
+	} :data
+
+	.bss : {
+                *(COMMON);
+                *(.bss);
+	} :data
+
+	.tdata : {
+		_tdata_start = .;
+		*(.tdata);
+		_tdata_end = .;
+	} :data
+	.tbss : {
+		_tbss_start = .;
+		*(.tbss);
+		_tbss_end = .;
+	} :data
+	_tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+	
+	. = ALIGN(0x1000);
+	_heap = .;
+}
Index: uspace/lib/libc/shared/arch/ia32/_link.ld.in
===================================================================
--- uspace/lib/libc/shared/arch/ia32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/shared/arch/ia32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,94 @@
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+ENTRY(__entry)
+
+PHDRS {
+        text PT_LOAD FLAGS(5);
+	interp PT_INTERP;
+	data PT_LOAD FLAGS(6);
+	dynamic PT_DYNAMIC;
+}
+
+SECTIONS {
+	. = 0x1000 + SIZEOF_HEADERS;
+
+	.interp : {
+		*(.interp);
+	} :interp
+
+	.init : {
+		*(.init);
+	} :text
+	.text : {
+		*(.text);
+		*(.text.*);
+		*(.rodata*);
+	} :text
+
+	.rel.plt : {
+		*(.rel.plt);
+	}
+	/* 
+	 *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+	 * without alignment gap or DT_REL will be broken
+	 */
+	.rel.dyn : {
+		*(.rel.*);
+	} :text
+
+	.plt : {
+		*(.plt);
+	} :text
+
+	.dynsym : {
+		*(.dynsym);
+	} :text
+
+	.dynstr : {
+		*(.dynstr);
+	} :text
+
+	. = . + 0x1000;
+
+	.dynamic : {
+		*(.dynamic);
+	} :data :dynamic
+
+	.data : {
+		*(.data);
+	} :data
+
+	.data.rel : {
+                *(.data.rel);
+	} :data
+
+	.got : {
+                *(.got);
+	} :data
+	.got.plt : {
+                *(.got.plt);
+	} :data
+
+	.bss : {
+                *(COMMON);
+                *(.bss);
+	} :data
+
+/*	.tdata : {
+		_tdata_start = .;
+		*(.tdata);
+		_tdata_end = .;
+	} :data
+	.tbss : {
+		_tbss_start = .;
+		*(.tbss);
+		_tbss_end = .;
+	} :data
+	_tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+*/	
+	/DISCARD/ : {
+		*(.comment);
+	}
+
+	. = ALIGN(0x1000);
+	_heap = .;
+}
Index: uspace/lib/libc/shared/arch/mips32/_lib.ld.in
===================================================================
--- uspace/lib/libc/shared/arch/mips32/_lib.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/shared/arch/mips32/_lib.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,95 @@
+ENTRY(__entry)
+
+PHDRS {
+	text PT_LOAD FLAGS(5);
+	data PT_LOAD FLAGS(6);
+	dynamic PT_DYNAMIC;
+}
+
+SECTIONS {
+	. = 0x4000 + SIZEOF_HEADERS;
+	
+	.init : {
+		*(.init);
+	} :text
+	.text : {
+	        *(.text);
+		*(.rodata*);
+		*(.MIPS.stubs);
+	} :text
+
+	.hash : {
+		*(.hash);
+	} : text
+
+	.reginfo : {
+		*(.reginfo);
+	} : text
+
+	.rel.plt : {
+		*(.rel.plt);
+	} : text
+	/* 
+	 *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+	 * without alignment gap or DT_REL will be broken
+	 */
+	.rel.dyn : {
+		*(.rel.*);
+	} :text
+
+	.plt : {
+		*(.plt);
+	} : text
+
+	.dynsym : {
+		*(.dynsym);
+	} : text
+
+	.dynstr : {
+		*(.dynstr);
+	} : text
+
+	. = . + 0x4000;
+
+	.dynamic : {
+		*(.dynamic);
+	} :data :dynamic
+
+	.data : {
+		*(.data);
+		*(.data.rel*);
+	} :data
+
+	.got : {
+		_gp = .;
+		*(.got);
+	} :data
+
+	.tdata : {
+		_tdata_start = .;
+		*(.tdata);
+		_tdata_end = .;
+	} :data
+	.tbss : {
+		_tbss_start = .;
+		*(.tbss);
+		_tbss_end = .;
+	} :data
+	_tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+
+	.sbss : {
+		*(.scommon);
+		*(.sbss);
+	}	
+	.bss : {
+		*(.bss);
+		*(COMMON);
+	} :data
+
+	. = ALIGN(0x4000);
+	_heap = .;
+
+/*	/DISCARD/ : {
+		*(*);
+	}*/
+}
Index: uspace/lib/libc/shared/arch/mips32/_link.ld.in
===================================================================
--- uspace/lib/libc/shared/arch/mips32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/shared/arch/mips32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,104 @@
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+ENTRY(__entry)
+
+PHDRS {
+	interp PT_INTERP;
+	text PT_LOAD FLAGS(5);
+	data PT_LOAD FLAGS(6);
+	dynamic PT_DYNAMIC;
+}
+
+SECTIONS {
+	. = 0x4000 + SIZEOF_HEADERS;
+
+	.interp : {
+		*(.interp);
+	} :text :interp
+
+	/* Align on word boundary -- instructions will follow. */
+	. = ALIGN(4);
+	
+	.init : {
+		*(.init);
+	} :text
+	.text : {
+	        *(.text);
+		*(.rodata*);
+		*(.MIPS.stubs);
+	} :text
+
+	.hash : {
+		*(.hash);
+	} : text
+
+	.reginfo : {
+		*(.reginfo);
+	} : text
+
+	.rel.plt : {
+		*(.rel.plt);
+	} : text
+	/* 
+	 *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+	 * without alignment gap or DT_REL will be broken
+	 */
+	.rel.dyn : {
+		*(.rel.*);
+	} :text
+
+	.plt : {
+		*(.plt);
+	} : text
+
+	.dynsym : {
+		*(.dynsym);
+	} : text
+
+	.dynstr : {
+		*(.dynstr);
+	} : text
+
+	. = . + 0x4000;
+
+	.dynamic : {
+		*(.dynamic);
+	} :data :dynamic
+
+	.data : {
+		*(.data);
+		*(.data.rel*);
+	} :data
+
+	.got : {
+		_gp = .;
+		*(.got);
+	} :data
+/*
+	.tdata : {
+		_tdata_start = .;
+		*(.tdata);
+		_tdata_end = .;
+	} :data
+	.tbss : {
+		_tbss_start = .;
+		*(.tbss);
+		_tbss_end = .;
+	} :data
+	_tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+*/
+	.sbss : {
+		*(.scommon);
+		*(.sbss);
+	}	
+	.bss : {
+		*(.bss);
+		*(COMMON);
+	} :data
+
+	. = ALIGN(0x4000);
+	_heap = .;
+
+/*	/DISCARD/ : {
+		*(*);
+	}*/
+}
Index: uspace/lib/libc/shared/arch/ppc32/_lib.ld.in
===================================================================
--- uspace/lib/libc/shared/arch/ppc32/_lib.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/shared/arch/ppc32/_lib.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,85 @@
+ENTRY(__entry)
+
+PHDRS {
+	text PT_LOAD FLAGS(5);
+	data PT_LOAD FLAGS(6);
+	dynamic PT_DYNAMIC;
+}
+
+SECTIONS {
+	. = 0x1000 + SIZEOF_HEADERS;
+
+	.init : {
+		*(.init);
+	} :text
+	.text : {
+		*(.text);
+		*(.text.*);
+		*(.rodata*);
+	} :text
+
+	.rel.plt : {
+		*(.rel.plt);
+	}
+	/* 
+	 *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+	 * without alignment gap or DT_REL will be broken
+	 */
+	.rel.dyn : {
+		*(.rel.*);
+	} :text
+
+	.dynsym : {
+		*(.dynsym);
+	} :text
+
+	.dynstr : {
+		*(.dynstr);
+	} :text
+
+	. = . + 0x1000;
+
+	.dynamic : {
+		*(.dynamic);
+	} :data :dynamic
+
+	.data : {
+		*(.data);
+		*(.sdata);
+	} :data
+
+	.data.rel : {
+                *(.data.rel);
+	} :data
+
+	.got : {
+                *(.got);
+	} :data
+	.got.plt : {
+                *(.got.plt);
+	} :data
+
+	.tdata : {
+		_tdata_start = .;
+		*(.tdata);
+		_tdata_end = .;
+	} :data
+	.tbss : {
+		_tbss_start = .;
+		*(.tbss);
+		_tbss_end = .;
+	} :data
+	_tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+	.bss : {
+		*(.sbss);
+		*(COMMON);
+		*(.bss);
+	} :data
+
+	.plt : {
+		*(.plt);
+	} :data
+
+	. = ALIGN(0x1000);
+	_heap = .;
+}
Index: uspace/lib/libc/shared/arch/ppc32/_link.ld.in
===================================================================
--- uspace/lib/libc/shared/arch/ppc32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libc/shared/arch/ppc32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,100 @@
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
+ENTRY(__entry)
+
+PHDRS {
+	interp PT_INTERP;
+	text PT_LOAD FLAGS(5);
+	data PT_LOAD FLAGS(6);
+	dynamic PT_DYNAMIC;
+}
+
+SECTIONS {
+	. = 0x1000 + SIZEOF_HEADERS;
+
+	.interp : {
+		*(.interp);
+	} :text :interp
+
+	/* Align on word boundary -- instructions will follow. */
+	. = ALIGN(4);
+
+	.init : {
+		*(.init);
+	} :text
+	.text : {
+		*(.text);
+		*(.text.*);
+		*(.rodata*);
+	} :text
+
+	.rel.plt : {
+		*(.rel.plt);
+	} :text
+	/* 
+	 *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+	 * without alignment gap or DT_REL will be broken
+	 */
+	.rel.dyn : {
+		*(.rel.*);
+	} :text
+
+	.dynsym : {
+		*(.dynsym);
+	} :text
+
+	.dynstr : {
+		*(.dynstr);
+	} :text
+
+	. = . + 0x1000;
+
+	.dynamic : {
+		*(.dynamic);
+	} :data :dynamic
+
+	.data : {
+		*(.data);
+		*(.sdata);
+	} :data
+
+	.data.rel : {
+                *(.data.rel);
+	} :data
+
+	.got : {
+                *(.got);
+	} :data
+	.got.plt : {
+                *(.got.plt);
+	} :data
+
+/*	.tdata : {
+		_tdata_start = .;
+		*(.tdata);
+		_tdata_end = .;
+	} :data
+	.tbss : {
+		_tbss_start = .;
+		*(.tbss);
+		_tbss_end = .;
+	} :data
+	_tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+*/
+	.bss : {
+		*(.sbss);
+		*(COMMON);
+		*(.bss);
+	} :data
+
+	.plt : {
+		*(.plt);
+	} :data
+
+	/DISCARD/ : {
+		*(.comment);
+		*(.gnu.attributes);
+	}
+
+	. = ALIGN(0x1000);
+	_heap = .;
+}
Index: uspace/lib/libtest/Makefile
===================================================================
--- uspace/lib/libtest/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libtest/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,95 @@
+#
+# Copyright (c) 2005 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../../../version
+
+## Setup toolchain
+#
+
+LIBC_PREFIX = ../../lib/libc
+SOFTINT_PREFIX = ../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
+#include arch/$(ARCH)/Makefile.inc
+ARCH_SOURCES :=
+
+CFLAGS += -I../../srv/kbd/include -I../../srv/console -Iinclude -fPIC -O0
+LFLAGS = \
+	-shared --no-undefined -soname libtest.so.0 \
+	-Bdynamic -I/app/dload
+
+#LIBS = $(LIBC_PREFIX)/shared/libc.so.0
+LIBS =
+
+DEFS += -DRELEASE=\"$(RELEASE)\"
+
+## Sources
+#
+
+OUTPUT = libtest.so
+GENERIC_SOURCES = \
+	libtest.c
+
+GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
+ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
+
+.PHONY: all clean depend disasm sections inc
+
+all: $(OUTPUT) disasm sections
+
+inc:
+	ln -sfn ../arch/$(UARCH)/include include/arch
+
+-include Makefile.depend
+
+clean:
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(UARCH)/_link.ld
+	find arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
+
+depend:
+	$(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES)> Makefile.depend
+
+$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) arch/$(UARCH)/_link.ld
+	$(LD) -T arch/$(UARCH)/_link.ld $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+
+disasm:
+	$(OBJDUMP) -d -S -s $(OUTPUT) >$(OUTPUT).disasm
+
+sections:
+	$(OBJDUMP) -h $(OUTPUT) >$(OUTPUT).sections
+
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
+	$(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
+
+%.o: %.S
+	$(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+
+%.o: %.s
+	$(AS) $(AFLAGS) $< -o $@
+
+%.o: %.c
+	$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
Index: uspace/lib/libtest/arch/ia32/_link.ld.in
===================================================================
--- uspace/lib/libtest/arch/ia32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libtest/arch/ia32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,85 @@
+ENTRY(__entry)
+
+PHDRS {
+        text PT_LOAD FLAGS(5);
+	interp PT_INTERP;
+	data PT_LOAD FLAGS(6);
+	dynamic PT_DYNAMIC;
+}
+
+SECTIONS {
+	. = 0x1000 + SIZEOF_HEADERS;
+
+	.init : {
+		*(.init);
+	} :text
+	.text : {
+		*(.text);
+		*(.text.*);
+		*(.rodata*);
+	} :text
+
+	.rel.plt : {
+		*(.rel.plt);
+	}
+	/* 
+	 *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+	 * without alignment gap or DT_REL will be broken
+	 */
+	.rel.dyn : {
+		*(.rel.*);
+	} :text
+
+	.plt : {
+		*(.plt);
+	} :text
+
+	.dynamic : {
+		*(.dynamic);
+	} :text :dynamic
+
+	.dynsym : {
+		*(.dynsym);
+	} :text
+
+	.dynstr : {
+		*(.dynstr);
+	} :text
+
+	. = . + 0x1000;
+
+	.data : {
+		*(.data);
+	} :data
+
+	.data.rel : {
+                *(.data.rel);
+	} :data
+
+	.got : {
+                *(.got);
+	} :data
+	.got.plt : {
+                *(.got.plt);
+	} :data
+
+	.bss : {
+                *(COMMON);
+                *(.bss);
+	} :data
+/*
+	.tdata : {
+		_tdata_start = .;
+		*(.tdata);
+		_tdata_end = .;
+	} :data
+	.tbss : {
+		_tbss_start = .;
+		*(.tbss);
+		_tbss_end = .;
+	} :data
+	_tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+*/	
+	. = ALIGN(0x1000);
+	_heap = .;
+}
Index: uspace/lib/libtest/arch/mips32/_link.ld.in
===================================================================
--- uspace/lib/libtest/arch/mips32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libtest/arch/mips32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,91 @@
+ENTRY(__entry)
+
+PHDRS {
+	text PT_LOAD FLAGS(5);
+	data PT_LOAD FLAGS(6);
+	dynamic PT_DYNAMIC;
+}
+
+SECTIONS {
+	. = 0x4000 + SIZEOF_HEADERS;
+	
+	.init : {
+		*(.init);
+	} :text
+	.text : {
+	        *(.text);
+		*(.rodata*);
+		*(.MIPS.stubs);
+	} :text
+
+	.rel.plt : {
+		*(.rel.plt);
+	}
+	/* 
+	 *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+	 * without alignment gap or DT_REL will be broken
+	 */
+	.rel.dyn : {
+		*(.rel.*);
+	} :text
+
+	.plt : {
+		*(.plt);
+	} :text
+
+	.hash : {
+		*(.hash);
+	} :text
+
+	.dynsym : {
+		*(.dynsym);
+	} :text
+
+	.dynstr : {
+		*(.dynstr);
+	} :text
+
+	.dynamic : {
+		*(.dynamic);
+	} :text :dynamic
+
+	. = . + 0x4000;
+
+	.data : {
+		*(.data);
+		*(.data.rel*);
+	} :data
+
+	.got : {
+		_gp = .;
+		*(.got);
+	} :data
+/*
+	.tdata : {
+		_tdata_start = .;
+		*(.tdata);
+		_tdata_end = .;
+	} :data
+	.tbss : {
+		_tbss_start = .;
+		*(.tbss);
+		_tbss_end = .;
+	} :data
+	_tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+*/
+	.sbss : {
+		*(.scommon);
+		*(.sbss);
+	}
+	.bss : {
+		*(.bss);
+		*(COMMON);
+	} :data
+
+	. = ALIGN(0x4000);
+	_heap = .;
+
+	/DISCARD/ : {
+		*(*);
+	}
+}
Index: uspace/lib/libtest/arch/ppc32/_link.ld.in
===================================================================
--- uspace/lib/libtest/arch/ppc32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libtest/arch/ppc32/_link.ld.in	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,85 @@
+ENTRY(__entry)
+
+PHDRS {
+	text PT_LOAD FLAGS(5);
+	data PT_LOAD FLAGS(6);
+	dynamic PT_DYNAMIC;
+}
+
+SECTIONS {
+	. = 0x1000 + SIZEOF_HEADERS;
+
+	.init : {
+		*(.init);
+	} :text
+	.text : {
+		*(.text);
+		*(.text.*);
+		*(.rodata*);
+	} :text
+
+	.rel.plt : {
+		*(.rel.plt);
+	}
+	/* 
+	 *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+	 * without alignment gap or DT_REL will be broken
+	 */
+	.rel.dyn : {
+		*(.rel.*);
+	} :text
+
+	.dynsym : {
+		*(.dynsym);
+	} :text
+
+	.dynstr : {
+		*(.dynstr);
+	} :text
+
+	. = . + 0x1000;
+
+	.dynamic : {
+		*(.dynamic);
+	} :data :dynamic
+
+	.data : {
+		*(.data);
+		*(.sdata);
+	} :data
+
+	.data.rel : {
+                *(.data.rel);
+	} :data
+
+	.got : {
+                *(.got);
+	} :data
+	.got.plt : {
+                *(.got.plt);
+	} :data
+/*
+	.tdata : {
+		_tdata_start = .;
+		*(.tdata);
+		_tdata_end = .;
+	} :data
+	.tbss : {
+		_tbss_start = .;
+		*(.tbss);
+		_tbss_end = .;
+	} :data
+	_tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+	.bss : {
+		*(.sbss);
+		*(COMMON);
+		*(.bss);
+	} :data
+*/
+	.plt : {
+		*(.plt);
+	} :data
+
+	. = ALIGN(0x1000);
+	_heap = .;
+}
Index: uspace/lib/libtest/libtest.c
===================================================================
--- uspace/lib/libtest/libtest.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libtest/libtest.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup rtld
+ * @brief
+ * @{
+ */ 
+/**
+ * @file
+ */
+
+//#include <stdio.h>
+#include "libtest.h"
+
+static void kputint(unsigned i)
+{
+//	unsigned dummy;
+//	asm volatile (
+//		"movl $30, %%eax;"
+//		"int $0x30"
+//		: "=d" (dummy) /* output - %edx clobbered */
+//		: "d" (i) /* input */
+//		: "%eax","%ecx" /* all scratch registers clobbered */
+//	);
+}
+
+int number = 137;
+
+int test_fun2(void);
+
+int test_fun2(void)
+{
+	return number;
+}
+
+int test_func(void)
+{
+//	printf("Hello, this is 'test_func()' in libtest.so!\n");
+//	kputint(42);
+//	return 42;
+//	while(1);
+	return test_fun2();
+}
+
+/** @}
+ */
Index: uspace/lib/libtest/libtest.h
===================================================================
--- uspace/lib/libtest/libtest.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libtest/libtest.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup generic	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef LIBTEST_H_
+#define LIBTEST_H_
+
+int test_func(void);
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/libtest/libtest.so.0
===================================================================
--- uspace/lib/libtest/libtest.so.0	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
+++ uspace/lib/libtest/libtest.so.0	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -0,0 +1,1 @@
+libtest.so
Index: uspace/lib/softint/Makefile
===================================================================
--- uspace/lib/softint/Makefile	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/lib/softint/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -1,4 +1,5 @@
 #
 # Copyright (c) 2005 Martin Decky
+# Copyright (c) 2008 Jiri Svoboda
 # All rights reserved.
 #
@@ -38,4 +39,5 @@
 
 CFLAGS += -Iinclude
+PIC_CFLAGS := $(CFLAGS) -fPIC -D__PIC__
 
 ## Sources
@@ -49,19 +51,26 @@
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 
+OBJECTS := $(GENERIC_OBJECTS)
+PIC_OBJECTS := $(addsuffix .pio,$(basename $(OBJECTS)))
+
 .PHONY: all clean depend
 
-all: libsoftint.a
+all: libsoftint.a libsoftint.pic.a
 
 -include Makefile.depend
 
 clean:
-	-rm -f libsoftint.a Makefile.depend
-	find generic/ -name '*.o' -follow -exec rm \{\} \;
+	-rm -f libsoftint.a libsoftint.pic.a Makefile.depend
+	find generic/ \( -name '*.o' -o -name '*.pio' \) -follow -exec rm \{\} \;
 
 depend:
 	-makedepend -f - -- $(DEPEMD_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+	-makedepend $(DEFS) $(PIC_CFLAGS) -o.pio -f - $(GENERIC_SOURCES) >> Makefile.depend 2> /dev/null
 
-libsoftint.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
-	$(AR) rc libsoftint.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
+libsoftint.a: depend $(OBJECTS)
+	$(AR) rc $@ $(OBJECTS)
+
+libsoftint.pic.a: depend $(PIC_OBJECTS)
+	$(AR) rc $@ $(PIC_OBJECTS)
 
 %.o: %.S
@@ -73,2 +82,11 @@
 %.o: %.c
 	$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+
+%.pio: %.S
+	$(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+
+%.pio: %.s
+	$(AS) $(AFLAGS) $< -o $@
+
+%.pio: %.c
+	$(CC) $(DEFS) $(PIC_CFLAGS) -c $< -o $@
Index: uspace/srv/kbd/Makefile
===================================================================
--- uspace/srv/kbd/Makefile	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/srv/kbd/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -33,9 +33,8 @@
 SOFTINT_PREFIX = ../../lib/softint
 
-include $(LIBC_PREFIX)/Makefile.toolchain
+include $(LIBC_PREFIX)/Makefile.toolchain 
+include $(LIBC_PREFIX)/Makefile.app
 
 CFLAGS += -Iinclude
-
-LIBS = $(LIBC_PREFIX)/libc.a
 
 ## Sources
@@ -170,5 +169,5 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LD_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm: $(OUTPUT).disasm
Index: uspace/srv/loader/elf_load.c
===================================================================
--- uspace/srv/loader/elf_load.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/srv/loader/elf_load.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -102,5 +102,6 @@
  * @return EOK on success or negative error code.
  */
-int elf_load_file(char *file_name, size_t so_bias, elf_info_t *info)
+int elf_load_file(char *file_name, size_t so_bias, eld_flags_t flags,
+    elf_info_t *info)
 {
 	elf_ld_t elf;
@@ -117,4 +118,5 @@
 	elf.fd = fd;
 	elf.info = info;
+	elf.flags = flags;
 
 	rc = elf_load(&elf, so_bias);
@@ -123,18 +125,4 @@
 
 	return rc;
-}
-
-/** Run an ELF executable.
- *
- * Transfers control to the entry point of an ELF executable loaded
- * earlier with elf_load_file(). This function does not return.
- *
- * @param info	Info structure filled earlier by elf_load_file()
- */
-void elf_run(elf_info_t *info, pcb_t *pcb)
-{
-	program_run(info->entry, pcb);
-
-	/* not reached */
 }
 
@@ -151,4 +139,5 @@
 	pcb->entry = info->entry;
 	pcb->dynamic = info->dynamic;
+	pcb->rtld_runtime = NULL;
 }
 
@@ -303,12 +292,21 @@
 		break;
 	case PT_INTERP:
-		/* Assume silently interp == "/rtld.so" */
-		elf->info->interp = "/rtld.so";
+		/* Assume silently interp == "/app/dload" */
+		elf->info->interp = "/app/dload";
 		break;
 	case PT_DYNAMIC:
+		/* Record pointer to dynamic section into info structure */
+		elf->info->dynamic =
+		    (void *)((uint8_t *)entry->p_vaddr + elf->bias);
+		DPRINTF("dynamic section found at 0x%x\n",
+			(uintptr_t)elf->info->dynamic);
+		break;
+	case 0x70000000:
+		/* FIXME: MIPS reginfo */
+		break;
 	case PT_SHLIB:
 	case PT_NOTE:
-	case PT_LOPROC:
-	case PT_HIPROC:
+//	case PT_LOPROC:
+//	case PT_HIPROC:
 	default:
 		DPRINTF("Segment p_type %d unknown.\n", entry->p_type);
@@ -380,5 +378,6 @@
 	    AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
 	if (a == (void *)(-1)) {
-		DPRINTF("Memory mapping failed.\n");
+		DPRINTF("memory mapping failed (0x%x, %d)\n",
+			base+bias, mem_sz);
 		return EE_MEMORY;
 	}
@@ -422,4 +421,11 @@
 	}
 
+	/*
+	 * The caller wants to modify the segments first. He will then
+	 * need to set the right access mode and ensure SMC coherence.
+	 */
+	if ((elf->flags & ELDF_RW) != 0) return EE_OK;
+
+//	printf("set area flags to %d\n", flags);
 	rc = as_area_change_flags(seg_ptr, flags);
 	if (rc != 0) {
@@ -458,9 +464,4 @@
 		break;
 	case SHT_DYNAMIC:
-		/* Record pointer to dynamic section into info structure */
-		elf->info->dynamic =
-		    (void *)((uint8_t *)entry->sh_addr + elf->bias);
-		DPRINTF("Dynamic section found at 0x%x.\n",
-			(uintptr_t)elf->info->dynamic);
 		break;
 	default:
Index: uspace/srv/loader/include/elf_load.h
===================================================================
--- uspace/srv/loader/include/elf_load.h	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/srv/loader/include/elf_load.h	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -43,4 +43,9 @@
 #include "elf.h"
 
+typedef enum {
+	/** Leave all segments in RW access mode. */
+	ELDF_RW = 1
+} eld_flags_t;
+
 /**
  * Some data extracted from the headers are stored here
@@ -67,4 +72,7 @@
 	uintptr_t bias;
 
+	/** Flags passed to the ELF loader. */
+	eld_flags_t flags;
+
 	/** A copy of the ELF file header */
 	elf_header_t *header;
@@ -74,6 +82,6 @@
 } elf_ld_t;
 
-int elf_load_file(char *file_name, size_t so_bias, elf_info_t *info);
-void elf_run(elf_info_t *info, pcb_t *pcb);
+int elf_load_file(char *file_name, size_t so_bias, eld_flags_t flags,
+    elf_info_t *info);
 void elf_create_pcb(elf_info_t *info, pcb_t *pcb);
 
Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/srv/loader/main.c	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -66,4 +66,6 @@
 #define DPRINTF(...)
 
+void program_run(void *entry, pcb_t *pcb);
+
 /** Pathname of the file that will be loaded */
 static char *pathname = NULL;
@@ -304,5 +306,5 @@
 	int rc;
 	
-	rc = elf_load_file(pathname, 0, &prog_info);
+	rc = elf_load_file(pathname, 0, 0, &prog_info);
 	if (rc != EE_OK) {
 		DPRINTF("Failed to load executable '%s'.\n", pathname);
@@ -326,5 +328,6 @@
 	}
 	
-	rc = elf_load_file(prog_info.interp, 0, &interp_info);
+	printf("Load ELF interpreter '%s'\n", prog_info.interp);
+	rc = elf_load_file(prog_info.interp, 0, 0, &interp_info);
 	if (rc != EE_OK) {
 		DPRINTF("Failed to load interpreter '%s.'\n",
@@ -334,4 +337,9 @@
 	}
 	
+	printf("Run interpreter.\n");
+	printf("entry point: 0x%lx\n", interp_info.entry);
+	printf("pcb address: 0x%lx\n", &pcb);
+	printf("prog dynamic: 0x%lx\n", prog_info.dynamic);
+
 	is_dyn_linked = true;
 	ipc_answer_0(rid, EOK);
@@ -362,9 +370,9 @@
 		
 		ipc_answer_0(rid, EOK);
-		elf_run(&interp_info, &pcb);
+		program_run(interp_info.entry, &pcb);
 	} else {
 		/* Statically linked program */
 		ipc_answer_0(rid, EOK);
-		elf_run(&prog_info, &pcb);
+		program_run(prog_info.entry, &pcb);
 	}
 	
Index: uspace/srv/pci/Makefile
===================================================================
--- uspace/srv/pci/Makefile	(revision 24edc18b7b665e2445588b1a92e24bd8701d7174)
+++ uspace/srv/pci/Makefile	(revision 1ea99cc389007a4bfb62aa85efc9b56ab5aa5bdc)
@@ -34,7 +34,7 @@
 
 include $(LIBC_PREFIX)/Makefile.toolchain
+include $(LIBC_PREFIX)/Makefile.app
 
-
-LIBS = libpci/libpci.a $(LIBC_PREFIX)/libc.a
+LIBS := libpci/libpci.a $(LIBS)
 
 ## Sources
@@ -62,5 +62,5 @@
 $(OUTPUT): $(OBJECTS) $(LIBS)
 	$(MAKE) -C libpci
-	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LD_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm:
