From 49635e62fa1464eaa528129c94923991147e33b1 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Wed, 6 Nov 2019 13:42:38 +0100
Subject: [PATCH] LibELF: Move AK/ELF/ into Libraries/LibELF/

Let's arrange things like this instead. It didn't feel right for all of
the ELF handling code to live in AK.
---
 Kernel/KSyms.cpp                           | 8 ++++----
 Kernel/Makefile                            | 4 ++--
 Kernel/Process.cpp                         | 4 ++--
 Kernel/Thread.cpp                          | 2 +-
 {AK/ELF => Libraries/LibELF}/ELFImage.cpp  | 0
 {AK/ELF => Libraries/LibELF}/ELFImage.h    | 2 +-
 {AK/ELF => Libraries/LibELF}/ELFLoader.cpp | 0
 {AK/ELF => Libraries/LibELF}/ELFLoader.h   | 2 +-
 {AK/ELF => Libraries/LibELF}/exec_elf.h    | 0
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename {AK/ELF => Libraries/LibELF}/ELFImage.cpp (100%)
 rename {AK/ELF => Libraries/LibELF}/ELFImage.h (99%)
 rename {AK/ELF => Libraries/LibELF}/ELFLoader.cpp (100%)
 rename {AK/ELF => Libraries/LibELF}/ELFLoader.h (98%)
 rename {AK/ELF => Libraries/LibELF}/exec_elf.h (100%)

diff --git a/Kernel/KSyms.cpp b/Kernel/KSyms.cpp
index 871cea0f2a..9611aa096f 100644
--- a/Kernel/KSyms.cpp
+++ b/Kernel/KSyms.cpp
@@ -1,9 +1,9 @@
-#include "KSyms.h"
-#include "Process.h"
-#include "Scheduler.h"
-#include <AK/ELF/ELFLoader.h>
 #include <AK/TemporaryChange.h>
 #include <Kernel/FileSystem/FileDescription.h>
+#include <Kernel/KSyms.h>
+#include <Kernel/Process.h>
+#include <Kernel/Scheduler.h>
+#include <LibELF/ELFLoader.h>
 
 static KSym* s_ksyms;
 u32 ksym_lowest_address = 0xffffffff;
diff --git a/Kernel/Makefile b/Kernel/Makefile
index c237acf423..04039322af 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -100,8 +100,8 @@ AK_OBJS = \
     ../AK/JsonValue.o \
     ../AK/JsonParser.o \
     ../AK/LogStream.o \
-    ../AK/ELF/ELFImage.o \
-    ../AK/ELF/ELFLoader.o
+    ../Libraries/LibELF/ELFImage.o \
+    ../Libraries/LibELF/ELFLoader.o
 
 CXX_OBJS = $(KERNEL_OBJS) $(VFS_OBJS) $(AK_OBJS)
 OBJS = $(CXX_OBJS) Arch/i386/Boot/boot.ao
diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index 1ff6fd8586..f964e91031 100644
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@@ -1,5 +1,3 @@
-#include <AK/ELF/ELFLoader.h>
-#include <AK/ELF/exec_elf.h>
 #include <AK/FileSystemPath.h>
 #include <AK/StdLibExtras.h>
 #include <AK/StringBuilder.h>
@@ -37,6 +35,8 @@
 #include <Kernel/VM/InodeVMObject.h>
 #include <LibC/errno_numbers.h>
 #include <LibC/signal_numbers.h>
+#include <LibELF/ELFLoader.h>
+#include <LibELF/exec_elf.h>
 
 //#define DEBUG_POLL_SELECT
 //#define DEBUG_IO
diff --git a/Kernel/Thread.cpp b/Kernel/Thread.cpp
index 59aaf8c07b..410eeca2e0 100644
--- a/Kernel/Thread.cpp
+++ b/Kernel/Thread.cpp
@@ -1,4 +1,3 @@
-#include <AK/ELF/ELFLoader.h>
 #include <AK/StringBuilder.h>
 #include <Kernel/FileSystem/FileDescription.h>
 #include <Kernel/Process.h>
@@ -6,6 +5,7 @@
 #include <Kernel/Thread.h>
 #include <Kernel/VM/MemoryManager.h>
 #include <LibC/signal_numbers.h>
+#include <LibELF/ELFLoader.h>
 
 //#define SIGNAL_DEBUG
 
diff --git a/AK/ELF/ELFImage.cpp b/Libraries/LibELF/ELFImage.cpp
similarity index 100%
rename from AK/ELF/ELFImage.cpp
rename to Libraries/LibELF/ELFImage.cpp
diff --git a/AK/ELF/ELFImage.h b/Libraries/LibELF/ELFImage.h
similarity index 99%
rename from AK/ELF/ELFImage.h
rename to Libraries/LibELF/ELFImage.h
index a402c1b9ea..143b4005e7 100644
--- a/AK/ELF/ELFImage.h
+++ b/Libraries/LibELF/ELFImage.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <AK/String.h>
-#include <AK/ELF/exec_elf.h>
 #include <AK/HashMap.h>
 #include <AK/OwnPtr.h>
 #include <Kernel/VM/VirtualAddress.h>
+#include <LibELF/exec_elf.h>
 
 class ELFImage {
 public:
diff --git a/AK/ELF/ELFLoader.cpp b/Libraries/LibELF/ELFLoader.cpp
similarity index 100%
rename from AK/ELF/ELFLoader.cpp
rename to Libraries/LibELF/ELFLoader.cpp
diff --git a/AK/ELF/ELFLoader.h b/Libraries/LibELF/ELFLoader.h
similarity index 98%
rename from AK/ELF/ELFLoader.h
rename to Libraries/LibELF/ELFLoader.h
index 5f3e0100f9..ab607c10ad 100644
--- a/AK/ELF/ELFLoader.h
+++ b/Libraries/LibELF/ELFLoader.h
@@ -4,7 +4,7 @@
 #include <AK/HashMap.h>
 #include <AK/OwnPtr.h>
 #include <AK/Vector.h>
-#include <AK/ELF/ELFImage.h>
+#include <LibELF/ELFImage.h>
 
 #ifdef KERNEL
 #include <Kernel/VM/VirtualAddress.h>
diff --git a/AK/ELF/exec_elf.h b/Libraries/LibELF/exec_elf.h
similarity index 100%
rename from AK/ELF/exec_elf.h
rename to Libraries/LibELF/exec_elf.h