From 2a218ebb9dabfc6053f8de6457642fb57570f70c Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Thu, 13 Oct 2022 14:04:35 -0600 Subject: [PATCH] DynamicLoader: Use fewer GLOB patterns for arch-specific files There's still a GLOB pattern for the LibC assembly files, but orgaizing the patterns to use ${SERENITY_ARCH} instead of a big if-else chain makes the patterns easier to understand. --- Userland/DynamicLoader/CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Userland/DynamicLoader/CMakeLists.txt b/Userland/DynamicLoader/CMakeLists.txt index 7369f035410..71f91e9008b 100644 --- a/Userland/DynamicLoader/CMakeLists.txt +++ b/Userland/DynamicLoader/CMakeLists.txt @@ -7,15 +7,15 @@ file(GLOB ELF_SOURCES "../Libraries/LibELF/*.cpp") file(GLOB LIBC_SOURCES1 "../Libraries/LibC/*.cpp") file(GLOB LIBC_SOURCES2 "../Libraries/LibC/*/*.cpp") -if ("${SERENITY_ARCH}" STREQUAL "aarch64") - file(GLOB LIBC_SOURCES3 "../Libraries/LibC/arch/aarch64/*.S") - set(ELF_SOURCES ${ELF_SOURCES} ../Libraries/LibELF/Arch/aarch64/entry.S ../Libraries/LibELF/Arch/aarch64/plt_trampoline.S) -elseif ("${SERENITY_ARCH}" STREQUAL "i686") - file(GLOB LIBC_SOURCES3 "../Libraries/LibC/arch/i386/*.S") - set(ELF_SOURCES ${ELF_SOURCES} ../Libraries/LibELF/Arch/i386/entry.S ../Libraries/LibELF/Arch/i386/plt_trampoline.S) -elseif ("${SERENITY_ARCH}" STREQUAL "x86_64") - file(GLOB LIBC_SOURCES3 "../Libraries/LibC/arch/x86_64/*.S" "../Libraries/LibC/arch/x86_64/*.cpp") - set(ELF_SOURCES ${ELF_SOURCES} ../Libraries/LibELF/Arch/x86_64/entry.S ../Libraries/LibELF/Arch/x86_64/plt_trampoline.S) +set(ARCH_FOLDER "${SERENITY_ARCH}") +if (SERENITY_ARCH STREQUAL "i686") + set(ARCH_FOLDER "i386") +endif() + +file(GLOB LIBC_SOURCES3 "../Libraries/LibC/arch/${ARCH_FOLDER}/*.S") +set(ELF_SOURCES ${ELF_SOURCES} "../Libraries/LibELF/Arch/${ARCH_FOLDER}/entry.S" "../Libraries/LibELF/Arch/${ARCH_FOLDER}/plt_trampoline.S") +if ("${SERENITY_ARCH}" STREQUAL "x86_64") + set(LIBC_SOURCES3 ${LIBC_SOURCES3} "../Libraries/LibC/arch/x86_64/memset.cpp") endif() file(GLOB LIBSYSTEM_SOURCES "../Libraries/LibSystem/*.cpp")