diff --git a/src/system/runtime_loader/Jamfile b/src/system/runtime_loader/Jamfile index 846524a22a..1a72a5c968 100644 --- a/src/system/runtime_loader/Jamfile +++ b/src/system/runtime_loader/Jamfile @@ -9,7 +9,7 @@ SubDirCcFlags -fno-builtin ; SubDirC++Flags -fno-builtin ; # needed for rld.so only -StaticLibrary librld.a : +StaticLibrary libruntime_loader.a : kernel_vsprintf.c : syscalls.o @@ -56,18 +56,18 @@ SEARCH on [ FGristFiles kernel_vsprintf.c ] SEARCH_SOURCE += [ FDirName $(SUBDIR) arch $(TARGET_ARCH) ] ; Objects - rld.c - rldexport.c - rldelf.c - rldheap.c - rldaux.c + runtime_loader.c + elf.c + export.c + heap.c + utility.c arch_relocate.c arch_call_init_term.c ; Ld rld.so : - [ FGristFiles rld.o rldelf.o rldexport.o rldheap.o rldaux.o arch_relocate.o arch_call_init_term.o ] - librld.a + [ FGristFiles runtime_loader.o elf.o export.o heap.o utility.o arch_relocate.o arch_call_init_term.o ] + libruntime_loader.a $(TARGET_GCC_LIBGCC) : $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/rld.ld ; diff --git a/src/system/runtime_loader/arch/ppc/arch_call_init_term.c b/src/system/runtime_loader/arch/ppc/arch_call_init_term.c index ec40d5ad74..f05ca91af2 100644 --- a/src/system/runtime_loader/arch/ppc/arch_call_init_term.c +++ b/src/system/runtime_loader/arch/ppc/arch_call_init_term.c @@ -8,7 +8,7 @@ */ -#include "rld_priv.h" +#include "runtime_loader_private.h" typedef void (*init_term_function)(image_id); diff --git a/src/system/runtime_loader/arch/ppc/arch_relocate.c b/src/system/runtime_loader/arch/ppc/arch_relocate.c index 69e99c9a47..8a19a74b37 100644 --- a/src/system/runtime_loader/arch/ppc/arch_relocate.c +++ b/src/system/runtime_loader/arch/ppc/arch_relocate.c @@ -1,16 +1,16 @@ /* - * Copyright 2003-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Copyright 2003-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved. * Distributed under the terms of the MIT License. */ +#include "runtime_loader_private.h" + #include #include #include #include -#include "rld_priv.h" - //#define TRACE_RLD #ifdef TRACE_RLD diff --git a/src/system/runtime_loader/arch/x86/arch_call_init_term.c b/src/system/runtime_loader/arch/x86/arch_call_init_term.c index e92fcf6a08..8d04bd6dcd 100644 --- a/src/system/runtime_loader/arch/x86/arch_call_init_term.c +++ b/src/system/runtime_loader/arch/x86/arch_call_init_term.c @@ -8,7 +8,7 @@ */ -#include "rld_priv.h" +#include "runtime_loader_private.h" void diff --git a/src/system/runtime_loader/arch/x86/arch_relocate.c b/src/system/runtime_loader/arch/x86/arch_relocate.c index edb97c1387..0b40b3f655 100644 --- a/src/system/runtime_loader/arch/x86/arch_relocate.c +++ b/src/system/runtime_loader/arch/x86/arch_relocate.c @@ -8,14 +8,14 @@ */ +#include "runtime_loader_private.h" + #include #include #include #include -#include "rld_priv.h" - //#define TRACE_RLD #ifdef TRACE_RLD diff --git a/src/system/runtime_loader/rldelf.c b/src/system/runtime_loader/elf.c similarity index 99% rename from src/system/runtime_loader/rldelf.c rename to src/system/runtime_loader/elf.c index dce3c24aaf..56cc87e3e4 100644 --- a/src/system/runtime_loader/rldelf.c +++ b/src/system/runtime_loader/elf.c @@ -8,6 +8,8 @@ */ +#include "runtime_loader_private.h" + #include #include @@ -22,8 +24,6 @@ #include #include -#include "rld_priv.h" - //#define TRACE_RLD #ifdef TRACE_RLD diff --git a/src/system/runtime_loader/rldexport.c b/src/system/runtime_loader/export.c similarity index 92% rename from src/system/runtime_loader/rldexport.c rename to src/system/runtime_loader/export.c index ced8326906..754c2234dc 100644 --- a/src/system/runtime_loader/rldexport.c +++ b/src/system/runtime_loader/export.c @@ -1,5 +1,5 @@ /* - * Copyright 2003-2005, Axel Dörfler, axeld@pinc-software.de. + * Copyright 2003-2006, Axel Dörfler, axeld@pinc-software.de. * Distributed under the terms of the MIT License. * * Copyright 2002, Manuel J. Petit. All rights reserved. @@ -7,7 +7,7 @@ */ -#include "rld_priv.h" +#include "runtime_loader_private.h" // exported via the rld_export structure in user space program arguments diff --git a/src/system/runtime_loader/rldheap.c b/src/system/runtime_loader/heap.c similarity index 78% rename from src/system/runtime_loader/rldheap.c rename to src/system/runtime_loader/heap.c index 8b066ddaa6..10b9877f90 100644 --- a/src/system/runtime_loader/rldheap.c +++ b/src/system/runtime_loader/heap.c @@ -1,12 +1,13 @@ /* -** Copyright 2002, Manuel J. Petit. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ + * Copyright 2002, Manuel J. Petit. All rights reserved. + * Distributed under the terms of the NewOS License. + */ +#include "runtime_loader_private.h" + #include #include -#include "rld_priv.h" #define RLD_SCRATCH_SIZE 65536 diff --git a/src/system/runtime_loader/rld.c b/src/system/runtime_loader/runtime_loader.c similarity index 98% rename from src/system/runtime_loader/rld.c rename to src/system/runtime_loader/runtime_loader.c index 8f0317e54d..1ccb40c38f 100644 --- a/src/system/runtime_loader/rld.c +++ b/src/system/runtime_loader/runtime_loader.c @@ -1,5 +1,5 @@ /* - * Copyright 2005, Axel Dörfler, axeld@pinc-software.de. + * Copyright 2005-2006, Axel Dörfler, axeld@pinc-software.de. * Distributed under the terms of the MIT License. * * Copyright 2002, Manuel J. Petit. All rights reserved. @@ -7,9 +7,10 @@ */ +#include "runtime_loader_private.h" + #include #include -#include "rld_priv.h" #include #include diff --git a/src/system/runtime_loader/rld_priv.h b/src/system/runtime_loader/runtime_loader_private.h similarity index 94% rename from src/system/runtime_loader/rld_priv.h rename to src/system/runtime_loader/runtime_loader_private.h index 34e7967084..1e2ceb7171 100644 --- a/src/system/runtime_loader/rld_priv.h +++ b/src/system/runtime_loader/runtime_loader_private.h @@ -5,13 +5,14 @@ * Copyright 2002, Manuel J. Petit. All rights reserved. * Distributed under the terms of the NewOS License. */ -#ifndef RUN_TIME_LINKER_H -#define RUN_TIME_LINKER_H +#ifndef RUNTIME_LOADER_H +#define RUNTIME_LOADER_H #include #include + int runtime_loader(void *arg); int open_executable(char *name, image_type type, const char *rpath); status_t test_executable(const char *path, uid_t user, gid_t group, char *starter); @@ -44,4 +45,4 @@ void arch_call_term(image_t *image); extern struct uspace_program_args *gProgramArgs; extern struct rld_export gRuntimeLoader; -#endif /* RUN_TIME_LINKER_H */ +#endif /* RUNTIME_LOADER_H */ diff --git a/src/system/runtime_loader/rldaux.c b/src/system/runtime_loader/utility.c similarity index 89% rename from src/system/runtime_loader/rldaux.c rename to src/system/runtime_loader/utility.c index c055b0027a..fcb81861cb 100644 --- a/src/system/runtime_loader/rldaux.c +++ b/src/system/runtime_loader/utility.c @@ -1,5 +1,5 @@ /* - * Copyright 2005, Axel Dörfler, axeld@pinc-software.de. + * Copyright 2005-2006, Axel Dörfler, axeld@pinc-software.de. * Distributed under the terms of the MIT License. * * Copyright 2001, Travis Geiselbrecht. All rights reserved. @@ -7,13 +7,13 @@ */ +#include "runtime_loader_private.h" + #include #include #include #include -#include "rld_priv.h" - char * getenv(const char *name)