[ros-diffs] [reactos] 02/02: [FREELDR] Move platform-specific build targets into dedicated .cmake files. (#5141)

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=728694f60fa7209f4c1c6…

commit 728694f60fa7209f4c1c676b571ba58ee4aa4c8a
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Thu Mar 9 17:30:34 2023 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sat Mar 18 22:40:10 2023 +0100

    [FREELDR] Move platform-specific build targets into dedicated .cmake files. (#5141)
    
    - Keep the common definitions and file lists in CMakeLists.txt
    - Move PC-AT & compatibles (PC-98, XBOX) definitions in pcat.cmake
    - Future UEFI-specific definitions will be in an uefi.cmake
---
 boot/freeldr/freeldr/CMakeLists.txt                | 312 ++++-----------------
 .../freeldr/freeldr/{CMakeLists.txt => pcat.cmake} | 186 ++++--------
 2 files changed, 112 insertions(+), 386 deletions(-)

diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt
index ad37aa7d200..2297a4b5c7c 100644
--- a/boot/freeldr/freeldr/CMakeLists.txt
+++ b/boot/freeldr/freeldr/CMakeLists.txt
@@ -1,31 +1,40 @@
+##
+## PROJECT:     FreeLoader
+## LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+## PURPOSE:     Common build definitions
+## COPYRIGHT:   Copyright 2003 Brian Palmer <brianp(a)sginet.com>
+##              Copyright 2011-2014 Amine Khaldi <amine.khaldi(a)reactos.org>
+##              Copyright 2011-2014 Timo Kreuzer <timo.kreuzer(a)reactos.org>
+##              Copyright 2014 Hervé Poussineau <hpoussin(a)reactos.org>
+##              Copyright 2023 Hermès Bélusca-Maïto
<hermes.belusca-maito(a)reactos.org>
+##
 
 if(MSVC)
     # Explicitly use string pooling
     add_compile_options("/GF")
 endif()
 
-spec2def(freeldr_pe.exe freeldr.spec)
-
-if(ARCH STREQUAL "i386")
-    CreateBootSectorTarget(frldr16
-        ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S
-        ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
-        F800)
-elseif(ARCH STREQUAL "amd64")
-    CreateBootSectorTarget(frldr16
-        ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/amd64.S
-        ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
-        F800)
-endif()
+#spec2def(freeldr_pe.exe freeldr.spec)
 
 include_directories(BEFORE include)
-include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cmlib)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/elf)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/include
+    ${REACTOS_SOURCE_DIR}/sdk/lib/cmlib
+    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs
+    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/elf)
 
 add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_)
 
+list(APPEND FREELDR_ARC_SOURCE
+    arcname.c
+    arch/arcemul.c
+    arch/archwsup.c
+    disk/disk.c
+    disk/partition.c
+    disk/ramdisk.c)
+    # disk/scsiport.c
+    # lib/fs/pxe.c
+
 list(APPEND FREELDR_BOOTLIB_SOURCE
     lib/arcsupp.c
     lib/debug.c
@@ -47,29 +56,11 @@ list(APPEND FREELDR_BOOTLIB_SOURCE
     lib/mm/mm.c
     lib/mm/heap.c)
 
-list(APPEND FREELDR_NTLDR_SOURCE
-    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmboot.c
-    ntldr/conversion.c
-    ntldr/registry.c
-    ntldr/winldr.c
-    ntldr/wlmemory.c
-    ntldr/wlregistry.c)
-
-list(APPEND FREELDR_ARC_SOURCE
-    arcname.c
-    arch/drivers/hwide.c
-    arch/arcemul.c
-    arch/archwsup.c
-    disk/disk.c
-    disk/partition.c
-    disk/ramdisk.c)
-    #disk/scsiport.c
-
 list(APPEND FREELDR_BOOTMGR_SOURCE
     include/freeldr.h
     cmdline.c
     custom.c
-    linuxboot.c
+    # linuxboot.c
     miscboot.c
     options.c
     oslist.c
@@ -82,167 +73,51 @@ list(APPEND FREELDR_BOOTMGR_SOURCE
     ui/ui.c
     ui/video.c)
 
-list(APPEND FREELDR_BASE_ASM_SOURCE)
+list(APPEND FREELDR_NTLDR_SOURCE
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmboot.c
+    ntldr/conversion.c
+    ntldr/registry.c
+    ntldr/winldr.c
+    ntldr/wlmemory.c
+    ntldr/wlregistry.c)
 
 if(ARCH STREQUAL "i386")
-    list(APPEND FREELDR_BASE_ASM_SOURCE
-        arch/i386/multiboot.S)
 
     list(APPEND FREELDR_COMMON_ASM_SOURCE
-        arch/i386/drvmap.S
-        arch/i386/entry.S
-        arch/i386/int386.S
-        arch/i386/pnpbios.S
-        arch/i386/i386trap.S
-        arch/i386/linux.S)
-
-    list(APPEND FREELDR_NTLDR_SOURCE
-        ntldr/arch/i386/winldr.c
-        ntldr/headless.c)
+        arch/i386/i386trap.S)
+        # arch/i386/linux.S
 
     list(APPEND FREELDR_ARC_SOURCE
-        lib/fs/pxe.c
+        arch/i386/i386bug.c
         arch/i386/halstub.c
         arch/i386/ntoskrnl.c
-        arch/i386/drivemap.c
-        arch/i386/hwacpi.c
-        arch/i386/hwapm.c
-        arch/i386/hwdisk.c
-        arch/i386/hwpci.c
-        arch/i386/i386bug.c
-        arch/i386/i386idt.c
         disk/scsiport.c)
 
-    if(SARCH STREQUAL "pc98" OR SARCH STREQUAL "xbox")
-        # These machine types require built-in bitmap font
-        list(APPEND FREELDR_ARC_SOURCE
-            arch/vgafont.c)
-    endif()
-
-    if(SARCH STREQUAL "xbox")
-        list(APPEND FREELDR_ARC_SOURCE
-            # FIXME: Abstract things better so we don't need to include /pc/* here
-            arch/i386/pc/machpc.c       # machxbox.c depends on it
-            arch/i386/pc/pcbeep.c       # machxbox.c depends on it
-            arch/i386/pc/pcdisk.c       # hwdisk.c depends on it
-            arch/i386/pc/pchw.c         # Many files depends on it
-            arch/i386/pc/pcmem.c        # hwacpi.c/xboxmem.c depends on it
-            arch/i386/pc/pcvesa.c       # machpc.c depends on it
-            arch/i386/xbox/machxbox.c
-            arch/i386/xbox/xboxcons.c
-            arch/i386/xbox/xboxdisk.c
-            arch/i386/xbox/xboxi2c.c
-            arch/i386/xbox/xboxmem.c
-            arch/i386/xbox/xboxrtc.c
-            arch/i386/xbox/xboxvideo.c)
-    elseif(SARCH STREQUAL "pc98")
-        list(APPEND FREELDR_ARC_SOURCE
-            arch/i386/pc/pcmem.c
-            arch/i386/pc98/machpc98.c
-            arch/i386/pc98/pc98beep.c
-            arch/i386/pc98/pc98cons.c
-            arch/i386/pc98/pc98disk.c
-            arch/i386/pc98/pc98hw.c
-            arch/i386/pc98/pc98mem.c
-            arch/i386/pc98/pc98rtc.c
-            arch/i386/pc98/pc98video.c)
-    else()
-        list(APPEND FREELDR_ARC_SOURCE
-            arch/i386/pc/machpc.c
-            arch/i386/pc/pcbeep.c
-            arch/i386/pc/pccons.c
-            arch/i386/pc/pcdisk.c
-            arch/i386/pc/pchw.c
-            arch/i386/pc/pcmem.c
-            arch/i386/pc/pcrtc.c
-            arch/i386/pc/pcvesa.c
-            arch/i386/pc/pcvideo.c)
-    endif()
+    list(APPEND FREELDR_NTLDR_SOURCE
+        ntldr/arch/i386/winldr.c
+        ntldr/headless.c)
 
 elseif(ARCH STREQUAL "amd64")
     list(APPEND FREELDR_COMMON_ASM_SOURCE
-        arch/amd64/entry.S
-        arch/amd64/int386.S
-        arch/amd64/misc.S
-        arch/amd64/pnpbios.S
-        arch/amd64/linux.S)
-
-    list(APPEND FREELDR_NTLDR_SOURCE
-        ntldr/arch/amd64/winldr.c)
+        arch/amd64/misc.S)
+        # arch/amd64/linux.S
 
     list(APPEND FREELDR_ARC_SOURCE
-        lib/fs/pxe.c
-        arch/i386/ntoskrnl.c
-        arch/i386/drivemap.c
-        arch/i386/hwacpi.c
-        arch/i386/hwapm.c
-        arch/i386/hwdisk.c
-        arch/i386/hwpci.c
         arch/i386/i386bug.c
-        arch/i386/pc/machpc.c
-        arch/i386/pc/pcbeep.c
-        arch/i386/pc/pccons.c
-        arch/i386/pc/pcdisk.c
-        arch/i386/pc/pchw.c
-        arch/i386/pc/pcmem.c
-        arch/i386/pc/pcrtc.c
-        arch/i386/pc/pcvesa.c
-        arch/i386/pc/pcvideo.c)
+        arch/i386/ntoskrnl.c)
 
-elseif(ARCH STREQUAL "arm")
-    list(APPEND FREELDR_COMMON_ASM_SOURCE
-        arch/arm/boot.S)
+    list(APPEND FREELDR_NTLDR_SOURCE
+        ntldr/arch/amd64/winldr.c)
 
+elseif(ARCH STREQUAL "arm")
     list(APPEND FREELDR_NTLDR_SOURCE
         ntldr/arch/arm/winldr.c)
 
-    list(APPEND FREELDR_ARC_SOURCE
-        arch/arm/entry.c
-        arch/arm/macharm.c)
 else()
-#TBD
+    #TBD
 endif()
 
-add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE})
-
-add_library(freeldr_common
-    ${freeldr_common_asm}
-    ${FREELDR_BOOTLIB_SOURCE}
-    ${FREELDR_ARC_SOURCE}
-    ${FREELDR_NTLDR_SOURCE}
-    ${FREELDR_BOOTMGR_SOURCE})
-
-if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    # We need to reduce the binary size
-    target_compile_options(freeldr_common PRIVATE "/Os")
-endif()
-if(NOT MSVC AND ARCH STREQUAL "i386" AND SARCH STREQUAL "xbox")
-  # Prevent a warning when doing a memcmp with address 0
-  set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_FLAGS
"-Wno-nonnull")
-endif()
-if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL
"Clang")
-    # Prevent using SSE (not support in freeldr)
-    target_compile_options(freeldr_common PUBLIC -mno-sse)
-endif()
-
-set(PCH_SOURCE
-    ${FREELDR_BOOTLIB_SOURCE}
-    ${FREELDR_ARC_SOURCE}
-    ${FREELDR_NTLDR_SOURCE}
-    ${FREELDR_BOOTMGR_SOURCE})
-
-add_pch(freeldr_common include/freeldr.h PCH_SOURCE)
-add_dependencies(freeldr_common bugcodes asm xdk)
-
-## GCC builds need this extra thing for some reason...
-if(ARCH STREQUAL "i386" AND NOT MSVC)
-    target_link_libraries(freeldr_common mini_hal)
-endif()
-
-add_asm_files(freeldr_base_asm ${FREELDR_BASE_ASM_SOURCE})
-
 list(APPEND FREELDR_BASE_SOURCE
-    ${freeldr_base_asm}
     bootmgr.c # This file is compiled with custom definitions
     freeldr.c
     ntldr/setupldr.c ## Strangely enough this file is needed in GCC builds
@@ -253,91 +128,10 @@ list(APPEND FREELDR_BASE_SOURCE
     ntldr/ntldropts.c
     lib/rtl/libsupp.c)
 
-if(ARCH STREQUAL "i386")
-    # Must be included together with disk/scsiport.c
-    list(APPEND FREELDR_BASE_SOURCE
-        ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.def)
-endif()
-
-add_executable(freeldr_pe ${FREELDR_BASE_SOURCE})
-
-set_target_properties(freeldr_pe
-    PROPERTIES
-    ENABLE_EXPORTS TRUE
-    DEFINE_SYMBOL "")
-
-if(MSVC)
-    if(ARCH STREQUAL "arm")
-        target_link_options(freeldr_pe PRIVATE /ignore:4078 /ignore:4254 /DRIVER)
-    else()
-        target_link_options(freeldr_pe PRIVATE /ignore:4078 /ignore:4254 /DYNAMICBASE:NO
/FIXED /FILEALIGN:512 /ALIGN:512)
-        add_linker_script(freeldr_pe freeldr_i386.msvc.lds)
-    endif()
-    # We don't need hotpatching
-    remove_target_compile_option(freeldr_pe "/hotpatch")
-    remove_target_compile_option(freeldr_common "/hotpatch")
-else()
-    target_link_options(freeldr_pe PRIVATE
-Wl,--exclude-all-symbols,--file-alignment,0x200,--section-alignment,0x200)
-    add_linker_script(freeldr_pe freeldr_gcc.lds)
-    # Strip everything, including rossym data
-    add_custom_command(TARGET freeldr_pe
-                    POST_BUILD
-                    COMMAND ${CMAKE_STRIP} --remove-section=.rossym
$<TARGET_FILE:freeldr_pe>
-                    COMMAND ${CMAKE_STRIP} --strip-all $<TARGET_FILE:freeldr_pe>)
-endif()
-
-set_image_base(freeldr_pe 0x10000)
-set_subsystem(freeldr_pe native)
-set_entrypoint(freeldr_pe RealEntryPoint)
-
-if(ARCH STREQUAL "i386")
-    target_link_libraries(freeldr_pe mini_hal)
-endif()
-
-target_link_libraries(freeldr_pe freeldr_common cportlib blcmlib blrtl libcntpr)
-
-# dynamic analysis switches
-if(STACK_PROTECTOR)
-    target_sources(freeldr_pe PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
-endif()
-
-if(RUNTIME_CHECKS)
-    target_link_libraries(freeldr_pe runtmchk)
-    target_link_options(freeldr_pe PRIVATE "/MERGE:.rtc=.text")
-endif()
-
-add_dependencies(freeldr_pe asm)
-
-if(SARCH STREQUAL "pc98")
-    file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/PC98)
-    add_custom_target(pc98bootfdd
-        COMMAND native-fatten ${REACTOS_BINARY_DIR}/PC98/ReactOS-98.IMG -format 2880
ROS98BOOT -boot ${CMAKE_BINARY_DIR}/boot/freeldr/bootsect/pc98/fat12fdd.bin -add
${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys FREELDR.SYS -add
${CMAKE_SOURCE_DIR}/boot/bootdata/floppy_pc98.ini FREELDR.INI
-        DEPENDS native-fatten fat12pc98 freeldr
-        VERBATIM)
-endif()
-
-if(NOT ARCH STREQUAL "arm")
-    concatenate_files(
-        ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys
-        ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
-        ${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_NAME:freeldr_pe>)
-    add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
-else()
-    add_custom_target(freeldr ALL DEPENDS freeldr_pe)
-endif()
-
-# Rename freeldr on livecd to setupldr.sys because isoboot.bin looks for setupldr.sys
-add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION
loader NO_CAB FOR bootcd regtest)
-add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION
loader NO_CAB NOT_IN_HYBRIDCD FOR livecd hybridcd NAME_ON_CD setupldr.sys)
-
-if(NOT ARCH STREQUAL "arm")
-    concatenate_files(
-        ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys
-        ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
-        ${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_NAME:freeldr_pe>)
-    add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys)
-else()
-    add_custom_target(setupldr ALL DEPENDS freeldr_pe)
-endif()
+# if(ARCH STREQUAL "i386")
+#     # Must be included together with disk/scsiport.c
+#     list(APPEND FREELDR_BASE_SOURCE
+#         ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.def)
+# endif()
 
-add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION
loader NO_CAB FOR bootcd regtest)
+include(pcat.cmake)
diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/pcat.cmake
similarity index 67%
copy from boot/freeldr/freeldr/CMakeLists.txt
copy to boot/freeldr/freeldr/pcat.cmake
index ad37aa7d200..a800323c539 100644
--- a/boot/freeldr/freeldr/CMakeLists.txt
+++ b/boot/freeldr/freeldr/pcat.cmake
@@ -1,10 +1,13 @@
-
-if(MSVC)
-    # Explicitly use string pooling
-    add_compile_options("/GF")
-endif()
-
-spec2def(freeldr_pe.exe freeldr.spec)
+##
+## PROJECT:     FreeLoader
+## LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+## PURPOSE:     Build definitions for PC-AT and "compatibles" (NEC PC-98,
XBOX)
+## COPYRIGHT:   Copyright 2003 Brian Palmer &lt;brianp(a)sginet.com&gt;
+##              Copyright 2011-2014 Amine Khaldi &lt;amine.khaldi(a)reactos.org&gt;
+##              Copyright 2011-2014 Timo Kreuzer &lt;timo.kreuzer(a)reactos.org&gt;
+##              Copyright 2014 Hervé Poussineau &lt;hpoussin(a)reactos.org&gt;
+##              Copyright 2023 Hermès Bélusca-Maïto
&lt;hermes.belusca-maito(a)reactos.org&gt;
+##
 
 if(ARCH STREQUAL "i386")
     CreateBootSectorTarget(frldr16
@@ -18,109 +21,52 @@ elseif(ARCH STREQUAL "amd64")
         F800)
 endif()
 
-include_directories(BEFORE include)
-include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cmlib)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/elf)
-
-add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_)
-
-list(APPEND FREELDR_BOOTLIB_SOURCE
-    lib/arcsupp.c
-    lib/debug.c
-    lib/peloader.c
-    lib/cache/blocklist.c
-    lib/cache/cache.c
-    lib/comm/rs232.c
-    ## add KD support
-    lib/fs/btrfs.c
-    lib/fs/ext2.c
-    lib/fs/fat.c
-    lib/fs/fs.c
-    lib/fs/iso.c
-    lib/fs/ntfs.c
-    lib/inifile/ini_init.c
-    lib/inifile/inifile.c
-    lib/inifile/parse.c
-    lib/mm/meminit.c
-    lib/mm/mm.c
-    lib/mm/heap.c)
-
-list(APPEND FREELDR_NTLDR_SOURCE
-    ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmboot.c
-    ntldr/conversion.c
-    ntldr/registry.c
-    ntldr/winldr.c
-    ntldr/wlmemory.c
-    ntldr/wlregistry.c)
-
-list(APPEND FREELDR_ARC_SOURCE
-    arcname.c
-    arch/drivers/hwide.c
-    arch/arcemul.c
-    arch/archwsup.c
-    disk/disk.c
-    disk/partition.c
-    disk/ramdisk.c)
-    #disk/scsiport.c
-
-list(APPEND FREELDR_BOOTMGR_SOURCE
-    include/freeldr.h
-    cmdline.c
-    custom.c
-    linuxboot.c
-    miscboot.c
-    options.c
-    oslist.c
-    ui/directui.c
-    # ui/gui.c
-    ui/minitui.c
-    ui/noui.c
-    ui/tui.c
-    ui/tuimenu.c
-    ui/ui.c
-    ui/video.c)
-
-list(APPEND FREELDR_BASE_ASM_SOURCE)
+
+spec2def(freeldr_pe.exe freeldr.spec)
+
+list(APPEND PCATLDR_ARC_SOURCE
+    ${FREELDR_ARC_SOURCE}
+    arch/drivers/hwide.c)
+
+list(APPEND PCATLDR_BOOTMGR_SOURCE
+    ${FREELDR_BOOTMGR_SOURCE}
+    linuxboot.c)
+
+list(APPEND PCATLDR_BASE_ASM_SOURCE)
 
 if(ARCH STREQUAL "i386")
-    list(APPEND FREELDR_BASE_ASM_SOURCE
+    list(APPEND PCATLDR_BASE_ASM_SOURCE
         arch/i386/multiboot.S)
 
-    list(APPEND FREELDR_COMMON_ASM_SOURCE
+    list(APPEND PCATLDR_COMMON_ASM_SOURCE
         arch/i386/drvmap.S
         arch/i386/entry.S
         arch/i386/int386.S
         arch/i386/pnpbios.S
-        arch/i386/i386trap.S
+        # arch/i386/i386trap.S
         arch/i386/linux.S)
 
-    list(APPEND FREELDR_NTLDR_SOURCE
-        ntldr/arch/i386/winldr.c
-        ntldr/headless.c)
-
-    list(APPEND FREELDR_ARC_SOURCE
+    list(APPEND PCATLDR_ARC_SOURCE
+        # disk/scsiport.c
         lib/fs/pxe.c
-        arch/i386/halstub.c
-        arch/i386/ntoskrnl.c
+        # arch/i386/halstub.c
+        # arch/i386/ntoskrnl.c
         arch/i386/drivemap.c
         arch/i386/hwacpi.c
         arch/i386/hwapm.c
         arch/i386/hwdisk.c
         arch/i386/hwpci.c
-        arch/i386/i386bug.c
-        arch/i386/i386idt.c
-        disk/scsiport.c)
+        # arch/i386/i386bug.c
+        arch/i386/i386idt.c)
 
     if(SARCH STREQUAL "pc98" OR SARCH STREQUAL "xbox")
         # These machine types require built-in bitmap font
-        list(APPEND FREELDR_ARC_SOURCE
+        list(APPEND PCATLDR_ARC_SOURCE
             arch/vgafont.c)
     endif()
 
     if(SARCH STREQUAL "xbox")
-        list(APPEND FREELDR_ARC_SOURCE
+        list(APPEND PCATLDR_ARC_SOURCE
             # FIXME: Abstract things better so we don't need to include /pc/* here
             arch/i386/pc/machpc.c       # machxbox.c depends on it
             arch/i386/pc/pcbeep.c       # machxbox.c depends on it
@@ -135,8 +81,13 @@ if(ARCH STREQUAL "i386")
             arch/i386/xbox/xboxmem.c
             arch/i386/xbox/xboxrtc.c
             arch/i386/xbox/xboxvideo.c)
+        if(NOT MSVC)
+            # Prevent a warning when doing a memcmp with address 0
+            set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_FLAGS
"-Wno-nonnull")
+        endif()
+
     elseif(SARCH STREQUAL "pc98")
-        list(APPEND FREELDR_ARC_SOURCE
+        list(APPEND PCATLDR_ARC_SOURCE
             arch/i386/pc/pcmem.c
             arch/i386/pc98/machpc98.c
             arch/i386/pc98/pc98beep.c
@@ -147,7 +98,7 @@ if(ARCH STREQUAL "i386")
             arch/i386/pc98/pc98rtc.c
             arch/i386/pc98/pc98video.c)
     else()
-        list(APPEND FREELDR_ARC_SOURCE
+        list(APPEND PCATLDR_ARC_SOURCE
             arch/i386/pc/machpc.c
             arch/i386/pc/pcbeep.c
             arch/i386/pc/pccons.c
@@ -160,25 +111,21 @@ if(ARCH STREQUAL "i386")
     endif()
 
 elseif(ARCH STREQUAL "amd64")
-    list(APPEND FREELDR_COMMON_ASM_SOURCE
+    list(APPEND PCATLDR_COMMON_ASM_SOURCE
         arch/amd64/entry.S
         arch/amd64/int386.S
-        arch/amd64/misc.S
         arch/amd64/pnpbios.S
         arch/amd64/linux.S)
 
-    list(APPEND FREELDR_NTLDR_SOURCE
-        ntldr/arch/amd64/winldr.c)
-
-    list(APPEND FREELDR_ARC_SOURCE
+    list(APPEND PCATLDR_ARC_SOURCE
         lib/fs/pxe.c
-        arch/i386/ntoskrnl.c
+        # arch/i386/ntoskrnl.c
         arch/i386/drivemap.c
         arch/i386/hwacpi.c
         arch/i386/hwapm.c
         arch/i386/hwdisk.c
         arch/i386/hwpci.c
-        arch/i386/i386bug.c
+        # arch/i386/i386bug.c
         arch/i386/pc/machpc.c
         arch/i386/pc/pcbeep.c
         arch/i386/pc/pccons.c
@@ -190,46 +137,39 @@ elseif(ARCH STREQUAL "amd64")
         arch/i386/pc/pcvideo.c)
 
 elseif(ARCH STREQUAL "arm")
-    list(APPEND FREELDR_COMMON_ASM_SOURCE
+    list(APPEND PCATLDR_COMMON_ASM_SOURCE
         arch/arm/boot.S)
 
-    list(APPEND FREELDR_NTLDR_SOURCE
-        ntldr/arch/arm/winldr.c)
-
-    list(APPEND FREELDR_ARC_SOURCE
+    list(APPEND PCATLDR_ARC_SOURCE
         arch/arm/entry.c
         arch/arm/macharm.c)
 else()
-#TBD
+    #TBD
 endif()
 
-add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE})
+add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE}
${PCATLDR_COMMON_ASM_SOURCE})
 
 add_library(freeldr_common
     ${freeldr_common_asm}
+    ${PCATLDR_ARC_SOURCE}
     ${FREELDR_BOOTLIB_SOURCE}
-    ${FREELDR_ARC_SOURCE}
-    ${FREELDR_NTLDR_SOURCE}
-    ${FREELDR_BOOTMGR_SOURCE})
+    ${PCATLDR_BOOTMGR_SOURCE}
+    ${FREELDR_NTLDR_SOURCE})
 
 if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang")
     # We need to reduce the binary size
     target_compile_options(freeldr_common PRIVATE "/Os")
 endif()
-if(NOT MSVC AND ARCH STREQUAL "i386" AND SARCH STREQUAL "xbox")
-  # Prevent a warning when doing a memcmp with address 0
-  set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_FLAGS
"-Wno-nonnull")
-endif()
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL
"Clang")
-    # Prevent using SSE (not support in freeldr)
+    # Prevent using SSE (no support in freeldr)
     target_compile_options(freeldr_common PUBLIC -mno-sse)
 endif()
 
 set(PCH_SOURCE
+    ${PCATLDR_ARC_SOURCE}
     ${FREELDR_BOOTLIB_SOURCE}
-    ${FREELDR_ARC_SOURCE}
-    ${FREELDR_NTLDR_SOURCE}
-    ${FREELDR_BOOTMGR_SOURCE})
+    ${PCATLDR_BOOTMGR_SOURCE}
+    ${FREELDR_NTLDR_SOURCE})
 
 add_pch(freeldr_common include/freeldr.h PCH_SOURCE)
 add_dependencies(freeldr_common bugcodes asm xdk)
@@ -239,19 +179,11 @@ if(ARCH STREQUAL "i386" AND NOT MSVC)
     target_link_libraries(freeldr_common mini_hal)
 endif()
 
-add_asm_files(freeldr_base_asm ${FREELDR_BASE_ASM_SOURCE})
+add_asm_files(freeldr_base_asm ${PCATLDR_BASE_ASM_SOURCE})
 
-list(APPEND FREELDR_BASE_SOURCE
+list(APPEND PCATLDR_BASE_SOURCE
     ${freeldr_base_asm}
-    bootmgr.c # This file is compiled with custom definitions
-    freeldr.c
-    ntldr/setupldr.c ## Strangely enough this file is needed in GCC builds
-                     ## even if ${FREELDR_NTLDR_SOURCE} is not added,
-                     ## otherwise we get linking errors with Rtl**Bitmap** APIs.
-                     ## Do not happen on MSVC builds however...
-    ntldr/inffile.c
-    ntldr/ntldropts.c
-    lib/rtl/libsupp.c)
+    ${FREELDR_BASE_SOURCE})
 
 if(ARCH STREQUAL "i386")
     # Must be included together with disk/scsiport.c
@@ -259,7 +191,7 @@ if(ARCH STREQUAL "i386")
         ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.def)
 endif()
 
-add_executable(freeldr_pe ${FREELDR_BASE_SOURCE})
+add_executable(freeldr_pe ${PCATLDR_BASE_SOURCE})
 
 set_target_properties(freeldr_pe
     PROPERTIES