/branches/dynload/uspace/lib/rtld/include/rtld.h |
---|
66,8 → 66,6 |
extern runtime_env_t *runtime_env; |
extern void rtld_init_static(void); |
#endif |
/** @} |
/branches/dynload/uspace/lib/rtld/module.c |
---|
58,20 → 58,12 |
/* 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"); |
if (m->dyn.rel != NULL) |
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"); |
if (m->dyn.jmp_rel != NULL) |
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) { |
150,7 → 142,6 |
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) { |
/branches/dynload/uspace/lib/rtld/rtld.c |
---|
37,16 → 37,6 |
#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; |
} |
/** @} |
*/ |
/branches/dynload/uspace/lib/libtest/Makefile |
---|
43,8 → 43,7 |
-shared --no-undefined -soname libtest.so.0 \ |
-Bdynamic -I/app/dload |
#LIBS = $(LIBC_PREFIX)/shared/libc.so.0 |
LIBS = |
LIBS = $(LIBC_PREFIX)/shared/libc.so.0 |
DEFS += -DRELEASE=\"$(RELEASE)\" |
/branches/dynload/uspace/lib/libtest/libtest.c |
---|
34,7 → 34,7 |
* @file |
*/ |
//#include <stdio.h> |
#include <stdio.h> |
#include "libtest.h" |
static void kputint(unsigned i) |
49,22 → 49,11 |
// ); |
} |
int number = 137; |
int test_fun2(void); |
int test_fun2(void) |
void test_func(void) |
{ |
return number; |
} |
int test_func(void) |
{ |
// printf("Hello, this is 'test_func()' in libtest.so!\n"); |
printf("Hello, this is 'test_func()' in libtest.so!\n"); |
// kputint(42); |
// return 42; |
// while(1); |
return test_fun2(); |
} |
/** @} |
/branches/dynload/uspace/lib/libtest/libtest.h |
---|
35,7 → 35,7 |
#ifndef LIBTEST_H_ |
#define LIBTEST_H_ |
int test_func(void); |
void test_func(void); |
#endif |
/branches/dynload/uspace/lib/libc/generic/dlfcn.c |
---|
46,11 → 46,6 |
{ |
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); |