Move ELFLoader code into Kernel/.

AmusedNetwork · Dec 2, 2018 · 44036f3 · 44036f3
1 parent ac7a602
commit 44036f3
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 27 deletions.
diff --git a/Banner.txt b/Banner.txt
diff --git a/ELFLoader/.gitignore b/ELFLoader/.gitignore
diff --git a/ELFLoader/ELFImage.cpp → Kernel/ELFImage.cpp b/ELFLoader/ELFImage.cpp → Kernel/ELFImage.cpp
diff --git a/ELFLoader/ELFImage.h → Kernel/ELFImage.h b/ELFLoader/ELFImage.h → Kernel/ELFImage.h
diff --git a/ELFLoader/ELFLoader.cpp → Kernel/ELFLoader.cpp b/ELFLoader/ELFLoader.cpp → Kernel/ELFLoader.cpp
diff --git a/ELFLoader/ELFLoader.h → Kernel/ELFLoader.h b/ELFLoader/ELFLoader.h → Kernel/ELFLoader.h
diff --git 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
@@ -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 → Kernel/elf.h b/ELFLoader/elf.h → Kernel/elf.h
diff --git 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"