diff options
| author | Andreas Kling <awesomekling@gmail.com> | 2018-12-02 20:27:08 +0100 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2018-12-02 20:27:08 +0100 |
| commit | 44036f32bc8146b566b793cdc6d58c3370a3ee0f (patch) | |
| tree | 6a17eaee0646d32d21c812fe1e682c05c244ccc3 | |
| parent | ac7a60225e9c2024a167d6f3f440780cf7af304a (diff) | |
| download | serenity-44036f32bc8146b566b793cdc6d58c3370a3ee0f.zip | |
Move ELFLoader code into Kernel/.
| -rw-r--r-- | Banner.txt | 17 | ||||
| -rw-r--r-- | ELFLoader/.gitignore | 3 | ||||
| -rw-r--r-- | Kernel/ELFImage.cpp (renamed from ELFLoader/ELFImage.cpp) | 0 | ||||
| -rw-r--r-- | Kernel/ELFImage.h (renamed from ELFLoader/ELFImage.h) | 0 | ||||
| -rw-r--r-- | Kernel/ELFLoader.cpp (renamed from ELFLoader/ELFLoader.cpp) | 0 | ||||
| -rw-r--r-- | Kernel/ELFLoader.h (renamed from ELFLoader/ELFLoader.h) | 0 | ||||
| -rw-r--r-- | Kernel/Makefile | 8 | ||||
| -rw-r--r-- | Kernel/Process.cpp | 2 | ||||
| -rw-r--r-- | Kernel/elf.h (renamed from ELFLoader/elf.h) | 0 | ||||
| -rw-r--r-- | Kernel/init.cpp | 2 |
10 files changed, 5 insertions, 27 deletions
diff --git a/Banner.txt b/Banner.txt deleted file mode 100644 index 02bb173b02..0000000000 --- a/Banner.txt +++ /dev/null @@ -1,17 +0,0 @@ - .oooooo..o o8o . -d8P' `Y8 `"' .o8 -Y88bo. .ooooo. oooo d8b .ooooo. ooo. .oo. oooo .o888oo oooo ooo - `"Y8888o. d88' `88b `888""8P d88' `88b `888P"Y88b `888 888 `88. .8' - `"Y88b 888ooo888 888 888ooo888 888 888 888 888 `88..8' -oo .d8P 888 .o 888 888 .o 888 888 888 888 . `888' -8""88888P' `Y8bod8P' d888b `Y8bod8P' o888o o888o o888o "888" .8' - .o..P' - `Y8P' - - God, grant me the SERENITY - to accept the things I cannot change - COURAGE to accept the things I can - and WISDOM to know the difference - -=============================================================================== - diff --git a/ELFLoader/.gitignore b/ELFLoader/.gitignore deleted file mode 100644 index 4484621603..0000000000 --- a/ELFLoader/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -run -*.o -AK diff --git a/ELFLoader/ELFImage.cpp b/Kernel/ELFImage.cpp index e7d7574066..e7d7574066 100644 --- a/ELFLoader/ELFImage.cpp +++ b/Kernel/ELFImage.cpp diff --git a/ELFLoader/ELFImage.h b/Kernel/ELFImage.h index 24bf890a3b..24bf890a3b 100644 --- a/ELFLoader/ELFImage.h +++ b/Kernel/ELFImage.h diff --git a/ELFLoader/ELFLoader.cpp b/Kernel/ELFLoader.cpp index 324e2dff4b..324e2dff4b 100644 --- a/ELFLoader/ELFLoader.cpp +++ b/Kernel/ELFLoader.cpp diff --git a/ELFLoader/ELFLoader.h b/Kernel/ELFLoader.h index b364ce7299..b364ce7299 100644 --- a/ELFLoader/ELFLoader.h +++ b/Kernel/ELFLoader.h diff --git a/Kernel/Makefile b/Kernel/Makefile index 47e3769bb8..6195ec00cb 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -20,7 +20,9 @@ KERNEL_OBJS = \ TTY.o \ VirtualConsole.o \ FIFO.o \ - Scheduler.o + Scheduler.o \ + ELFImage.o \ + ELFLoader.o VFS_OBJS = \ ../VirtualFileSystem/DiskDevice.o \ @@ -37,10 +39,6 @@ VFS_OBJS = \ ../VirtualFileSystem/FileDescriptor.o \ ../VirtualFileSystem/SyntheticFileSystem.o -ELFLOADER_OBJS = \ - ../ELFLoader/ELFImage.o \ - ../ELFLoader/ELFLoader.o - AK_OBJS = \ ../AK/String.o \ ../AK/StringImpl.o \ diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index addcb91efb..fc518c5bcf 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -6,7 +6,7 @@ #include "system.h" #include <VirtualFileSystem/FileDescriptor.h> #include <VirtualFileSystem/VirtualFileSystem.h> -#include <ELFLoader/ELFLoader.h> +#include "ELFLoader.h" #include "MemoryManager.h" #include "errno.h" #include "i8253.h" diff --git a/ELFLoader/elf.h b/Kernel/elf.h index c541774d98..c541774d98 100644 --- a/ELFLoader/elf.h +++ b/Kernel/elf.h diff --git a/Kernel/init.cpp b/Kernel/init.cpp index c5f3840163..5c6812349c 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -19,7 +19,7 @@ #include <VirtualFileSystem/FileDescriptor.h> #include <AK/OwnPtr.h> #include "MemoryManager.h" -#include <ELFLoader/ELFLoader.h> +#include "ELFLoader.h" #include "Console.h" #include "ProcFileSystem.h" #include "RTC.h" |