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
This commit is contained in:
+1
-1
@@ -254,7 +254,7 @@ done
|
|||||||
|
|
||||||
cd $sourceDir/objects/${arch}.R1/kernel/
|
cd $sourceDir/objects/${arch}.R1/kernel/
|
||||||
$scd ${sPrefix}$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
|
# servers
|
||||||
|
|||||||
+1
-53
@@ -184,59 +184,6 @@ KernelLd init :
|
|||||||
: beos/bin/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 :
|
KernelLd kernel_false :
|
||||||
libglue2.o
|
libglue2.o
|
||||||
<$(SOURCE_GRIST)!apps>false_main.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 core ;
|
||||||
SubInclude OBOS_TOP src kernel glue ;
|
SubInclude OBOS_TOP src kernel glue ;
|
||||||
SubInclude OBOS_TOP src kernel libroot ;
|
SubInclude OBOS_TOP src kernel libroot ;
|
||||||
|
SubInclude OBOS_TOP src kernel runtime_loader ;
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ SubInclude OBOS_TOP src kernel apps hostname ;
|
|||||||
SubInclude OBOS_TOP src kernel apps ls ;
|
SubInclude OBOS_TOP src kernel apps ls ;
|
||||||
SubInclude OBOS_TOP src kernel apps symlink ;
|
SubInclude OBOS_TOP src kernel apps symlink ;
|
||||||
SubInclude OBOS_TOP src kernel apps ps ;
|
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 shell ;
|
||||||
SubInclude OBOS_TOP src kernel apps envtest ;
|
SubInclude OBOS_TOP src kernel apps envtest ;
|
||||||
#SubInclude OBOS_TOP src kernel apps sockettest ;
|
#SubInclude OBOS_TOP src kernel apps sockettest ;
|
||||||
|
|||||||
@@ -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 ;
|
|
||||||
@@ -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
|
||||||
|
<src!kernel!libroot!os>syscalls.o
|
||||||
|
<src!kernel!libroot!os>sem.o
|
||||||
|
<src!kernel!libroot!os!arch!$(OBOS_ARCH)>atomic.o
|
||||||
|
|
||||||
|
<src!kernel!libroot!posix>errno.o
|
||||||
|
|
||||||
|
<src!kernel!libroot!posix!glibc!ctype>ctype-info.o
|
||||||
|
<src!kernel!libroot!posix!glibc!locale>C-ctype.o
|
||||||
|
<src!kernel!libroot!posix!glibc!locale>C_name.o
|
||||||
|
<src!kernel!libroot>kernel_vsprintf.o
|
||||||
|
<src!kernel!libroot!posix!unistd>open.o
|
||||||
|
|
||||||
|
<src!kernel!libroot!posix!string>memchr.o
|
||||||
|
<src!kernel!libroot!posix!string>memcmp.o
|
||||||
|
<src!kernel!libroot!posix!string>memcpy.o
|
||||||
|
<src!kernel!libroot!posix!string>memmove.o
|
||||||
|
<src!kernel!libroot!posix!string>memset.o
|
||||||
|
<src!kernel!libroot!posix!string>strcasecmp.o
|
||||||
|
<src!kernel!libroot!posix!string>strcat.o
|
||||||
|
<src!kernel!libroot!posix!string>strchr.o
|
||||||
|
<src!kernel!libroot!posix!string>strcmp.o
|
||||||
|
<src!kernel!libroot!posix!string>strcpy.o
|
||||||
|
<src!kernel!libroot!posix!string>strcspn.o
|
||||||
|
<src!kernel!libroot!posix!string>strdup.o
|
||||||
|
<src!kernel!libroot!posix!string>strerror.o
|
||||||
|
<src!kernel!libroot!posix!string>strlcat.o
|
||||||
|
<src!kernel!libroot!posix!string>strlcpy.o
|
||||||
|
<src!kernel!libroot!posix!string>strlen.o
|
||||||
|
<src!kernel!libroot!posix!string>strncmp.o
|
||||||
|
<src!kernel!libroot!posix!string>strnlen.o
|
||||||
|
<src!kernel!libroot!posix!string>strpbrk.o
|
||||||
|
<src!kernel!libroot!posix!string>strrchr.o
|
||||||
|
<src!kernel!libroot!posix!string>strspn.o
|
||||||
|
<src!kernel!libroot!posix!string>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
|
||||||
|
;
|
||||||
Reference in New Issue
Block a user