From 072ea7eece8607efec8e2824307b0a6209e4d014 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 3 Apr 2019 12:30:04 +0200 Subject: [PATCH] Kernel: Move ELF-related files into Kernel/ELF/. --- Kernel/{ => ELF}/ELFImage.cpp | 0 Kernel/{ => ELF}/ELFImage.h | 2 +- Kernel/{ => ELF}/ELFLoader.cpp | 0 Kernel/{ => ELF}/ELFLoader.h | 0 Kernel/{ => ELF}/exec_elf.h | 0 Kernel/Makefile | 4 ++-- Kernel/Process.cpp | 4 ++-- 7 files changed, 5 insertions(+), 5 deletions(-) rename Kernel/{ => ELF}/ELFImage.cpp (100%) rename Kernel/{ => ELF}/ELFImage.h (99%) rename Kernel/{ => ELF}/ELFLoader.cpp (100%) rename Kernel/{ => ELF}/ELFLoader.h (100%) rename Kernel/{ => ELF}/exec_elf.h (100%) diff --git a/Kernel/ELFImage.cpp b/Kernel/ELF/ELFImage.cpp similarity index 100% rename from Kernel/ELFImage.cpp rename to Kernel/ELF/ELFImage.cpp diff --git a/Kernel/ELFImage.h b/Kernel/ELF/ELFImage.h similarity index 99% rename from Kernel/ELFImage.h rename to Kernel/ELF/ELFImage.h index 20480a72b7..74fe4d90b1 100644 --- a/Kernel/ELFImage.h +++ b/Kernel/ELF/ELFImage.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include class ELFImage { diff --git a/Kernel/ELFLoader.cpp b/Kernel/ELF/ELFLoader.cpp similarity index 100% rename from Kernel/ELFLoader.cpp rename to Kernel/ELF/ELFLoader.cpp diff --git a/Kernel/ELFLoader.h b/Kernel/ELF/ELFLoader.h similarity index 100% rename from Kernel/ELFLoader.h rename to Kernel/ELF/ELFLoader.h diff --git a/Kernel/exec_elf.h b/Kernel/ELF/exec_elf.h similarity index 100% rename from Kernel/exec_elf.h rename to Kernel/ELF/exec_elf.h diff --git a/Kernel/Makefile b/Kernel/Makefile index d64d65b097..f19d45cf6c 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -24,8 +24,8 @@ KERNEL_OBJS = \ FIFO.o \ Scheduler.o \ DoubleBuffer.o \ - ELFImage.o \ - ELFLoader.o \ + ELF/ELFImage.o \ + ELF/ELFLoader.o \ KSyms.o \ FileSystem/DevPtsFS.o \ BXVGADevice.o \ diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index 4dfa5ddf23..0ea53ec172 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -7,7 +7,7 @@ #include #include #include -#include "ELFLoader.h" +#include #include "MemoryManager.h" #include "i8253.h" #include "RTC.h" @@ -20,7 +20,7 @@ #include "KSyms.h" #include #include -#include +#include #include //#define DEBUG_IO