From af3e5cd9478e88536bcb35371ea6e2e45fd07946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 30 Mar 2006 18:08:51 +0000 Subject: [PATCH] Renamed our runtime loader from rld.so to runtime_loader, and moved it into beos/system/. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16936 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 4 ++-- src/system/kernel/team.c | 2 +- src/system/runtime_loader/Jamfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 5805a593ba..f6f24544da 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -111,13 +111,13 @@ AddDriversToHaikuImage power : $(BEOS_ADD_ONS_DRIVERS_ACPI) ; AddFilesToHaikuImage beos system : kernel_$(TARGET_ARCH) ; # libs -AddFilesToHaikuImage beos system lib : $(BEOS_SYSTEM_LIB) rld.so ; +AddFilesToHaikuImage beos system lib : $(BEOS_SYSTEM_LIB) ; # servers AddFilesToHaikuImage beos system servers : $(BEOS_SYSTEM_SERVERS) ; # apps -AddFilesToHaikuImage beos system : Deskbar Tracker ; +AddFilesToHaikuImage beos system : runtime_loader Deskbar Tracker ; AddFilesToHaikuImage beos bin : $(BEOS_BIN) consoled route ; AddFilesToHaikuImage beos apps : $(BEOS_APPS) ; AddFilesToHaikuImage beos preferences : $(BEOS_PREFERENCES) ; diff --git a/src/system/kernel/team.c b/src/system/kernel/team.c index cf6f916105..87712ef54e 100644 --- a/src/system/kernel/team.c +++ b/src/system/kernel/team.c @@ -1067,7 +1067,7 @@ team_create_thread_start(void *args) // the arguments are already on the user stack, we no longer need them in this form // ToDo: don't use fixed paths! - err = elf_load_user_image("/boot/beos/system/lib/rld.so", team, 0, &entry); + err = elf_load_user_image("/boot/beos/system/runtime_loader", team, 0, &entry); if (err < B_OK) { // Luckily, we don't have to clean up the mess we created - that's // done for us by the normal team deletion process diff --git a/src/system/runtime_loader/Jamfile b/src/system/runtime_loader/Jamfile index 1a72a5c968..d03141428e 100644 --- a/src/system/runtime_loader/Jamfile +++ b/src/system/runtime_loader/Jamfile @@ -65,7 +65,7 @@ Objects arch_call_init_term.c ; -Ld rld.so : +Ld runtime_loader : [ 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)