From fe2db057d02b5a96124a488c8e8bb4ad597c11fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 21 Mar 2005 16:15:33 +0000 Subject: [PATCH] Moved rld/ from apps/ into it's own directory, runtime_loader. Moved the rld.so creation from kernel/Jamfile to kernel/runtime_loader/Jamfile. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@11936 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- makehdimage | 2 +- src/kernel/Jamfile | 54 +--------------- src/kernel/apps/Jamfile | 1 - src/kernel/apps/rld/Jamfile | 9 --- src/kernel/runtime_loader/Jamfile | 62 +++++++++++++++++++ .../rld => runtime_loader}/arch/ppc/rld.ld | 0 .../arch/ppc/rldreloc.inc | 0 .../rld => runtime_loader}/arch/rldreloc.inc | 0 .../rld => runtime_loader}/arch/x86/rld.ld | 0 .../arch/x86/rldreloc.inc | 0 src/kernel/{apps/rld => runtime_loader}/rld.c | 0 .../{apps/rld => runtime_loader}/rld0.c | 0 .../{apps/rld => runtime_loader}/rld_priv.h | 0 .../{apps/rld => runtime_loader}/rldaux.c | 0 .../{apps/rld => runtime_loader}/rldelf.c | 0 .../{apps/rld => runtime_loader}/rldexport.c | 0 .../{apps/rld => runtime_loader}/rldheap.c | 0 17 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 src/kernel/apps/rld/Jamfile create mode 100644 src/kernel/runtime_loader/Jamfile rename src/kernel/{apps/rld => runtime_loader}/arch/ppc/rld.ld (100%) rename src/kernel/{apps/rld => runtime_loader}/arch/ppc/rldreloc.inc (100%) rename src/kernel/{apps/rld => runtime_loader}/arch/rldreloc.inc (100%) rename src/kernel/{apps/rld => runtime_loader}/arch/x86/rld.ld (100%) rename src/kernel/{apps/rld => runtime_loader}/arch/x86/rldreloc.inc (100%) rename src/kernel/{apps/rld => runtime_loader}/rld.c (100%) rename src/kernel/{apps/rld => runtime_loader}/rld0.c (100%) rename src/kernel/{apps/rld => runtime_loader}/rld_priv.h (100%) rename src/kernel/{apps/rld => runtime_loader}/rldaux.c (100%) rename src/kernel/{apps/rld => runtime_loader}/rldelf.c (100%) rename src/kernel/{apps/rld => runtime_loader}/rldexport.c (100%) rename src/kernel/{apps/rld => runtime_loader}/rldheap.c (100%) diff --git a/makehdimage b/makehdimage index 5bbff74551..234a4d632b 100755 --- a/makehdimage +++ b/makehdimage @@ -254,7 +254,7 @@ done cd $sourceDir/objects/${arch}.R1/kernel/ $scd ${sPrefix}$sourceDir/objects/${arch}.R1/kernel/ -$cp ${sPrefix}rld.so ${sPrefix}libroot.so $targetDir/beos/system/lib/ +$cp ${sPrefix}runtime_loader/rld.so ${sPrefix}libroot.so $targetDir/beos/system/lib/ # servers diff --git a/src/kernel/Jamfile b/src/kernel/Jamfile index 773ff42f9d..aaa8d9e828 100644 --- a/src/kernel/Jamfile +++ b/src/kernel/Jamfile @@ -184,59 +184,6 @@ KernelLd init : : beos/bin/init ; -KernelStaticLibraryObjects librld.a : - # needed for rld.so only - <$(SOURCE_GRIST)!libroot!os>syscalls.o - <$(SOURCE_GRIST)!libroot!os>sem.o - <$(SOURCE_GRIST)!libroot!os!arch!$(OBOS_ARCH)>atomic.o - - <$(SOURCE_GRIST)!libroot!posix>errno.o - - <$(SOURCE_GRIST)!libroot!posix!glibc!ctype>ctype-info.o - <$(SOURCE_GRIST)!libroot!posix!glibc!locale>C-ctype.o - <$(SOURCE_GRIST)!libroot!posix!glibc!locale>C_name.o - <$(SOURCE_GRIST)!libroot>kernel_vsprintf.o - <$(SOURCE_GRIST)!libroot!posix!unistd>open.o - - <$(SOURCE_GRIST)!libroot!posix!string>memchr.o - <$(SOURCE_GRIST)!libroot!posix!string>memcmp.o - <$(SOURCE_GRIST)!libroot!posix!string>memcpy.o - <$(SOURCE_GRIST)!libroot!posix!string>memmove.o - <$(SOURCE_GRIST)!libroot!posix!string>memset.o - <$(SOURCE_GRIST)!libroot!posix!string>strcasecmp.o - <$(SOURCE_GRIST)!libroot!posix!string>strcat.o - <$(SOURCE_GRIST)!libroot!posix!string>strchr.o - <$(SOURCE_GRIST)!libroot!posix!string>strcmp.o - <$(SOURCE_GRIST)!libroot!posix!string>strcpy.o - <$(SOURCE_GRIST)!libroot!posix!string>strcspn.o - <$(SOURCE_GRIST)!libroot!posix!string>strdup.o - <$(SOURCE_GRIST)!libroot!posix!string>strerror.o - <$(SOURCE_GRIST)!libroot!posix!string>strlcat.o - <$(SOURCE_GRIST)!libroot!posix!string>strlcpy.o - <$(SOURCE_GRIST)!libroot!posix!string>strlen.o - <$(SOURCE_GRIST)!libroot!posix!string>strncmp.o - <$(SOURCE_GRIST)!libroot!posix!string>strnlen.o - <$(SOURCE_GRIST)!libroot!posix!string>strpbrk.o - <$(SOURCE_GRIST)!libroot!posix!string>strrchr.o - <$(SOURCE_GRIST)!libroot!posix!string>strspn.o - <$(SOURCE_GRIST)!libroot!posix!string>strstr.o - <$(SOURCE_GRIST)!libroot!posix!string>strtok.o - ; - -KernelLd rld.so : - <$(SOURCE_GRIST)!apps!rld>rld0.o - <$(SOURCE_GRIST)!apps!rld>rld.o - <$(SOURCE_GRIST)!apps!rld>rldelf.o - <$(SOURCE_GRIST)!apps!rld>rldexport.o - <$(SOURCE_GRIST)!apps!rld>rldheap.o - <$(SOURCE_GRIST)!apps!rld>rldaux.o - librld.a - : $(SUBDIR)/apps/rld/arch/$(OBOS_ARCH)/rld.ld - : - : - : beos/system/lib/rld.so - ; - KernelLd kernel_false : libglue2.o <$(SOURCE_GRIST)!apps>false_main.o @@ -456,3 +403,4 @@ SubInclude OBOS_TOP src kernel boot ; SubInclude OBOS_TOP src kernel core ; SubInclude OBOS_TOP src kernel glue ; SubInclude OBOS_TOP src kernel libroot ; +SubInclude OBOS_TOP src kernel runtime_loader ; diff --git a/src/kernel/apps/Jamfile b/src/kernel/apps/Jamfile index 43b8aaa703..67d45d56b1 100644 --- a/src/kernel/apps/Jamfile +++ b/src/kernel/apps/Jamfile @@ -36,7 +36,6 @@ SubInclude OBOS_TOP src kernel apps hostname ; SubInclude OBOS_TOP src kernel apps ls ; SubInclude OBOS_TOP src kernel apps symlink ; SubInclude OBOS_TOP src kernel apps ps ; -SubInclude OBOS_TOP src kernel apps rld ; SubInclude OBOS_TOP src kernel apps shell ; SubInclude OBOS_TOP src kernel apps envtest ; #SubInclude OBOS_TOP src kernel apps sockettest ; diff --git a/src/kernel/apps/rld/Jamfile b/src/kernel/apps/rld/Jamfile deleted file mode 100644 index d83d0b56e7..0000000000 --- a/src/kernel/apps/rld/Jamfile +++ /dev/null @@ -1,9 +0,0 @@ -SubDir OBOS_TOP src kernel apps rld ; - -KernelObjects <$(SOURCE_GRIST)>rld.c - <$(SOURCE_GRIST)>rld0.c - <$(SOURCE_GRIST)>rldexport.c - <$(SOURCE_GRIST)>rldelf.c - <$(SOURCE_GRIST)>rldheap.c - <$(SOURCE_GRIST)>rldaux.c - : -fpic ; diff --git a/src/kernel/runtime_loader/Jamfile b/src/kernel/runtime_loader/Jamfile new file mode 100644 index 0000000000..a5849f369e --- /dev/null +++ b/src/kernel/runtime_loader/Jamfile @@ -0,0 +1,62 @@ +SubDir OBOS_TOP src kernel runtime_loader ; + +KernelObjects + rld.c + rld0.c + rldexport.c + rldelf.c + rldheap.c + rldaux.c + : -fpic ; + +KernelStaticLibraryObjects librld.a : + # needed for rld.so only + syscalls.o + sem.o + atomic.o + + errno.o + + ctype-info.o + C-ctype.o + C_name.o + kernel_vsprintf.o + open.o + + memchr.o + memcmp.o + memcpy.o + memmove.o + memset.o + strcasecmp.o + strcat.o + strchr.o + strcmp.o + strcpy.o + strcspn.o + strdup.o + strerror.o + strlcat.o + strlcpy.o + strlen.o + strncmp.o + strnlen.o + strpbrk.o + strrchr.o + strspn.o + strstr.o + ; + +KernelLd rld.so : + <$(SOURCE_GRIST)>rld0.o + <$(SOURCE_GRIST)>rld.o + <$(SOURCE_GRIST)>rldelf.o + <$(SOURCE_GRIST)>rldexport.o + <$(SOURCE_GRIST)>rldheap.o + <$(SOURCE_GRIST)>rldaux.o + librld.a + : $(SUBDIR)/arch/$(OBOS_ARCH)/rld.ld + : + : + : beos/system/lib/rld.so + ; diff --git a/src/kernel/apps/rld/arch/ppc/rld.ld b/src/kernel/runtime_loader/arch/ppc/rld.ld similarity index 100% rename from src/kernel/apps/rld/arch/ppc/rld.ld rename to src/kernel/runtime_loader/arch/ppc/rld.ld diff --git a/src/kernel/apps/rld/arch/ppc/rldreloc.inc b/src/kernel/runtime_loader/arch/ppc/rldreloc.inc similarity index 100% rename from src/kernel/apps/rld/arch/ppc/rldreloc.inc rename to src/kernel/runtime_loader/arch/ppc/rldreloc.inc diff --git a/src/kernel/apps/rld/arch/rldreloc.inc b/src/kernel/runtime_loader/arch/rldreloc.inc similarity index 100% rename from src/kernel/apps/rld/arch/rldreloc.inc rename to src/kernel/runtime_loader/arch/rldreloc.inc diff --git a/src/kernel/apps/rld/arch/x86/rld.ld b/src/kernel/runtime_loader/arch/x86/rld.ld similarity index 100% rename from src/kernel/apps/rld/arch/x86/rld.ld rename to src/kernel/runtime_loader/arch/x86/rld.ld diff --git a/src/kernel/apps/rld/arch/x86/rldreloc.inc b/src/kernel/runtime_loader/arch/x86/rldreloc.inc similarity index 100% rename from src/kernel/apps/rld/arch/x86/rldreloc.inc rename to src/kernel/runtime_loader/arch/x86/rldreloc.inc diff --git a/src/kernel/apps/rld/rld.c b/src/kernel/runtime_loader/rld.c similarity index 100% rename from src/kernel/apps/rld/rld.c rename to src/kernel/runtime_loader/rld.c diff --git a/src/kernel/apps/rld/rld0.c b/src/kernel/runtime_loader/rld0.c similarity index 100% rename from src/kernel/apps/rld/rld0.c rename to src/kernel/runtime_loader/rld0.c diff --git a/src/kernel/apps/rld/rld_priv.h b/src/kernel/runtime_loader/rld_priv.h similarity index 100% rename from src/kernel/apps/rld/rld_priv.h rename to src/kernel/runtime_loader/rld_priv.h diff --git a/src/kernel/apps/rld/rldaux.c b/src/kernel/runtime_loader/rldaux.c similarity index 100% rename from src/kernel/apps/rld/rldaux.c rename to src/kernel/runtime_loader/rldaux.c diff --git a/src/kernel/apps/rld/rldelf.c b/src/kernel/runtime_loader/rldelf.c similarity index 100% rename from src/kernel/apps/rld/rldelf.c rename to src/kernel/runtime_loader/rldelf.c diff --git a/src/kernel/apps/rld/rldexport.c b/src/kernel/runtime_loader/rldexport.c similarity index 100% rename from src/kernel/apps/rld/rldexport.c rename to src/kernel/runtime_loader/rldexport.c diff --git a/src/kernel/apps/rld/rldheap.c b/src/kernel/runtime_loader/rldheap.c similarity index 100% rename from src/kernel/apps/rld/rldheap.c rename to src/kernel/runtime_loader/rldheap.c