LibC+LibELF: Move ELF definitions from LibC to LibELF

This is needed to avoid including LibC headers in Lagom builds. Unfortunately, we cannot rely on the build machine to provide a fully POSIX-compatible ELF header for Lagom builds, so we have to use our own.
cubiclove · Jun 27, 2023 · 79adeb6 · 79adeb6
1 parent 7d19abd
commit 79adeb6
Show file tree

Hide file tree

Showing 16 changed files with 850 additions and 836 deletions.
diff --git a/Kernel/Prekernel/init.cpp b/Kernel/Prekernel/init.cpp
@@ -11,7 +11,7 @@
 #include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/VirtualAddress.h>
 #include <Kernel/Prekernel/Prekernel.h>
-#include <LibC/elf.h>
+#include <LibELF/ELFABI.h>
 #include <LibELF/Relocation.h>
 
 #if ARCH(X86_64)

diff --git a/Kernel/Tasks/Coredump.cpp b/Kernel/Tasks/Coredump.cpp
@@ -19,8 +19,8 @@
 #include <Kernel/Memory/ScopedAddressSpaceSwitcher.h>
 #include <Kernel/Tasks/Coredump.h>
 #include <Kernel/Tasks/Process.h>
-#include <LibC/elf.h>
 #include <LibELF/Core.h>
+#include <LibELF/ELFABI.h>
 
 #define INCLUDE_USERSPACE_HEAP_MEMORY_IN_COREDUMPS 0
 

diff --git a/Kernel/Tasks/Process.h b/Kernel/Tasks/Process.h
@@ -36,7 +36,7 @@
 #include <Kernel/Tasks/ProcessGroup.h>
 #include <Kernel/Tasks/Thread.h>
 #include <Kernel/UnixTypes.h>
-#include <LibC/elf.h>
+#include <LibELF/ELFABI.h>
 
 namespace Kernel {
 

diff --git a/Meta/check-style.py b/Meta/check-style.py
@@ -24,7 +24,7 @@
  'AK/Checked.h',
  'AK/Function.h',
  'Userland/Libraries/LibJS/SafeFunction.h',
- 'Userland/Libraries/LibC/elf.h',
+ 'Userland/Libraries/LibELF/ELFABI.h',
  'Userland/Libraries/LibCodeComprehension/Cpp/Tests/',
  'Userland/Libraries/LibCpp/Tests/parser/',
  'Userland/Libraries/LibCpp/Tests/preprocessor/'

diff --git a/Toolchain/BuildClang.sh b/Toolchain/BuildClang.sh
@@ -250,6 +250,7 @@ SRC_ROOT=$($REALPATH "$DIR"/..)
 FILES=$(find \
  "$SRC_ROOT"/Kernel/API \
  "$SRC_ROOT"/Userland/Libraries/LibC \
+ "$SRC_ROOT"/Userland/Libraries/LibELF/ELFABI.h \
  "$SRC_ROOT"/Userland/Libraries/LibRegex/RegexDefs.h \
  -name '*.h' -print)
 for arch in $ARCHS; do
@@ -260,6 +261,7 @@ for arch in $ARCHS; do
  target=$(echo "$header" | "$SED" \
  -e "s|$SRC_ROOT/Userland/Libraries/LibC||" \
  -e "s|$SRC_ROOT/Kernel/|Kernel/|" \
+ -e "s|$SRC_ROOT/Userland/Libraries/LibELF/|LibELF/|" \
  -e "s|$SRC_ROOT/Userland/Libraries/LibRegex/|LibRegex/|")
  buildstep "system_headers" "$INSTALL" -D "$header" "Root/usr/include/$target"
  done

diff --git a/Toolchain/BuildGNU.sh b/Toolchain/BuildGNU.sh
@@ -270,13 +270,15 @@ pushd "$DIR/Build/$ARCH"
  "$SRC_ROOT"/Kernel/API \
  "$SRC_ROOT"/Kernel/Arch \
  "$SRC_ROOT"/Userland/Libraries/LibC \
+ "$SRC_ROOT"/Userland/Libraries/LibELF/ELFABI.h \
  "$SRC_ROOT"/Userland/Libraries/LibRegex/RegexDefs.h \
  -name '*.h' -print)
  for header in $FILES; do
  target=$(echo "$header" | sed \
  -e "s|$SRC_ROOT/AK/|AK/|" \
  -e "s|$SRC_ROOT/Userland/Libraries/LibC||" \
  -e "s|$SRC_ROOT/Kernel/|Kernel/|" \
+ -e "s|$SRC_ROOT/Userland/Libraries/LibELF/|LibELF/|" \
  -e "s|$SRC_ROOT/Userland/Libraries/LibRegex/|LibRegex/|")
  buildstep "system_headers" mkdir -p "$(dirname "Root/usr/include/$target")"
  buildstep "system_headers" $INSTALL "$header" "Root/usr/include/$target"