Updated Supporting Build Scripts

Author: PythonPlumber

.github/workflows/cmake.yml

@@ -39,16 +39,18 @@ jobs:
           mkdir -p assets
           wget -O assets/smollm2.gguf https://huggingface.co/bartowski/SmolLM2-135M-Instruct-GGUF/resolve/main/SmolLM2-135M-Instruct-Q4_K_M.gguf
 
-      - name: Configure CMake
+      - name: Build BasicallyLinux
         run: |
-          cmake -B build \
-            -DCMAKE_C_COMPILER=i686-linux-gnu-gcc \
-            -DCMAKE_ASM_NASM_COMPILER=nasm \
-            -DCMAKE_BUILD_TYPE=Release
+          mkdir -p build
+          cd build
+          # Force the assembler and compiler to 32-bit mode
+          cmake .. -DCMAKE_ASM_NASM_FLAGS="-f elf32" -DCMAKE_C_FLAGS="-m32"
+          make
 
-      - name: Build BasicallyLinux
+      - name: Verify Kernel Architecture
         run: |
-          cmake --build build
+          file build/kernel.bin
+          i686-linux-gnu-objdump -f build/kernel.bin | grep "architecture: i386"
 
       - name: Archive Artifacts
         if: success()

CMakeLists.txt

@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.16)
 
-# Set NASM flags BEFORE the project() call to ensure they are used during initialization
-set(CMAKE_ASM_NASM_FLAGS "-f elf32" CACHE STRING "NASM flags" FORCE)
+# Force the NASM object format to 32-bit ELF
+set(CMAKE_ASM_NASM_OBJECT_FORMAT elf32)
+set(CMAKE_ASM_NASM_FLAGS "-f elf32")
 
 project(BasicallyLinux C ASM_NASM)
 
@@ -31,11 +32,6 @@ include_directories(include)
 file(GLOB_RECURSE ASM_SOURCES "src/*.asm")
 file(GLOB_RECURSE C_SOURCES "src/*.c")
 
-# Force -f elf32 on all assembly files explicitly as well
-foreach(asm_file ${ASM_SOURCES})
-    set_source_files_properties(${asm_file} PROPERTIES COMPILE_FLAGS "-f elf32")
-endforeach()
-
 # Exclude specific files if needed
 list(FILTER C_SOURCES EXCLUDE REGEX "src/drivers/vga.c")
 

Makefile

@@ -12,13 +12,13 @@ BUILD_DIR := build
 MODEL_BLOB := $(firstword $(wildcard assets/smollm2.gguf) $(wildcard assets/smollm-135m.gguf) $(wildcard assets/SmolLM2-135M-Instruct-Q4_K_M.gguf))
 MODEL_OBJ := $(BUILD_DIR)/model.o
 
-ASM_SRCS := $(shell find $(SRC_DIR) -name "*.s")
+ASM_SRCS := $(shell find $(SRC_DIR) -name "*.asm")
 C_SRCS := $(filter-out $(SRC_DIR)/drivers/vga.c, $(shell find $(SRC_DIR) -name "*.c"))
 
-ASM_OBJS := $(patsubst $(SRC_DIR)/%.s,$(BUILD_DIR)/%.s.o,$(ASM_SRCS))
+ASM_OBJS := $(patsubst $(SRC_DIR)/%.asm,$(BUILD_DIR)/%.asm.o,$(ASM_SRCS))
 C_OBJS := $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.c.o,$(C_SRCS))
 
-BOOT_OBJ := $(BUILD_DIR)/boot.s.o
+BOOT_OBJ := $(BUILD_DIR)/boot.asm.o
 OTHER_OBJS := $(sort $(filter-out $(BOOT_OBJ),$(ASM_OBJS) $(C_OBJS)))
 OBJS := $(BOOT_OBJ) $(OTHER_OBJS)
 
@@ -31,7 +31,7 @@ all: $(BUILD_DIR) kernel.bin
 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)
 
-$(BUILD_DIR)/%.s.o: $(SRC_DIR)/%.s
+$(BUILD_DIR)/%.asm.o: $(SRC_DIR)/%.asm
 	mkdir -p $(dir $@)
 	$(AS) $(ASFLAGS) $< -o $@
 

build.ps1

@@ -63,7 +63,7 @@ if (-not (Test-Path $buildDir)) {
     New-Item -ItemType Directory -Force -Path $buildDir | Out-Null
 }
 
-$asmSrcs = Get-ChildItem -Path $srcDir -Recurse -Filter "*.s"
+$asmSrcs = Get-ChildItem -Path $srcDir -Recurse -Filter "*.asm"
 $cSrcs = Get-ChildItem -Path $srcDir -Recurse -Filter "*.c"
 
 $objPaths = @()