Fix

Author: PythonPlumber

CMakeLists.txt

@@ -36,60 +36,57 @@ include_directories(include)
 file(GLOB_RECURSE ASM_SOURCES "src/*.asm")
 file(GLOB_RECURSE C_SOURCES "src/*.c")
 
-# Ensure boot.asm is ALWAYS FIRST in the link order to keep Multiboot header at the top
-set(BOOT_ASM "${CMAKE_CURRENT_SOURCE_DIR}/src/boot.asm")
-list(REMOVE_ITEM ASM_SOURCES "${BOOT_ASM}")
-set(ASM_SOURCES "${BOOT_ASM}" ${ASM_SOURCES})
-
-# Exclude specific files if needed
-list(FILTER C_SOURCES EXCLUDE REGEX "src/drivers/vga.c")
-
-# Handle AI Model Blob
-set(ASSETS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
-set(MODEL_BLOB "")
-
-# Check for model candidates
-set(CANDIDATES
-    "${ASSETS_DIR}/smollm2.gguf"
-    "${ASSETS_DIR}/smollm-135m.gguf"
-    "${ASSETS_DIR}/SmolLM2-135M-Instruct-Q4_K_M.gguf"
-)
-
-foreach(CANDIDATE ${CANDIDATES})
-    if(EXISTS "${CANDIDATE}")
-        set(MODEL_BLOB "${CANDIDATE}")
-        message(STATUS "Found AI model blob: ${MODEL_BLOB}")
-        break()
-    endif()
-endforeach()
-
-if(MODEL_BLOB)
-    set(MODEL_OBJ "${CMAKE_CURRENT_BINARY_DIR}/model.o")
+# AI model blob handling
+set(MODEL_BLOB "${CMAKE_CURRENT_SOURCE_DIR}/model.bin")
+if(EXISTS "${MODEL_BLOB}")
+    set(MODEL_OBJ "model.o")
     add_custom_command(
         OUTPUT ${MODEL_OBJ}
         COMMAND i686-linux-gnu-objcopy -I binary -O elf32-i386 -B i386 
                 --rename-section .data=.ai_model,alloc,load,readonly,data,contents 
                 "${MODEL_BLOB}" "${MODEL_OBJ}"
         DEPENDS "${MODEL_BLOB}"
         COMMENT "Converting AI model blob to object file"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
     )
-    # Add the object file to the sources
-    list(APPEND ASM_SOURCES ${MODEL_OBJ})
+    # Use the generated object file in the link step
+    set(MODEL_OBJ_PATH "${CMAKE_CURRENT_BINARY_DIR}/${MODEL_OBJ}")
 else()
     message(WARNING "AI model blob not found. Kernel will be built without AI support.")
+    set(MODEL_OBJ_PATH "")
 endif()
 
+# Ensure boot.asm is ALWAYS FIRST in the link order to keep Multiboot header at the top
+set(BOOT_ASM "${CMAKE_CURRENT_SOURCE_DIR}/src/boot.asm")
+list(REMOVE_ITEM ASM_SOURCES "${BOOT_ASM}")
+set(ASM_SOURCES "${BOOT_ASM}" ${ASM_SOURCES})
+
+# Exclude specific files if needed
+list(FILTER C_SOURCES EXCLUDE REGEX "src/drivers/vga.c")
+
 # Build Kernel Binary
 set(LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/linker.ld")
 
-# We use add_executable but we need to control the linking process
-add_executable(kernel.bin ${ASM_SOURCES} ${C_SOURCES})
+add_executable(kernel.bin ${ASM_SOURCES} ${C_SOURCES} ${MODEL_OBJ_PATH})
+
+target_link_options(kernel.bin PRIVATE
+    "-T${LINKER_SCRIPT}"
+    "-nostdlib"
+    "-m32"
+    "-no-pie"
+    "-Wl,-z,noexecstack"
+)
+
+# Find libgcc
+execute_process(
+    COMMAND ${CMAKE_C_COMPILER} -m32 -print-libgcc-file-name
+    OUTPUT_VARIABLE LIBGCC_PATH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+target_link_libraries(kernel.bin PRIVATE "${LIBGCC_PATH}")
 
 set_target_properties(kernel.bin PROPERTIES
-    LINK_FLAGS "-T \"${LINKER_SCRIPT}\" -nostdlib -m32 -no-pie -Wl,-z,noexecstack"
     SUFFIX ""
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
-
-# Link with libgcc for arithmetic operations
-target_link_libraries(kernel.bin gcc)

linker.ld

@@ -1,42 +1,59 @@
 ENTRY(_start)
 
+PHDRS
+{
+    multiboot PT_LOAD FLAGS(5); /* Read + Execute */
+    text PT_LOAD FLAGS(5);      /* Read + Execute */
+    data PT_LOAD FLAGS(6);      /* Read + Write */
+}
+
 SECTIONS
 {
     /* The kernel starts at 1MB */
     . = 1M;
 
-    .multiboot BLOCK(4K) : ALIGN(4K)
+    .multiboot : AT(ADDR(.multiboot))
     {
         KEEP(*(.multiboot))
-    }
+    } : multiboot
 
-    .text BLOCK(4K) : ALIGN(4K)
+    .text : AT(ADDR(.text))
     {
         *(.text)
-    }
+        *(.text.*)
+    } : text
 
-    .rodata BLOCK(4K) : ALIGN(4K)
+    .rodata : AT(ADDR(.rodata))
     {
-        *(.rodata*)
-    }
+        *(.rodata)
+        *(.rodata.*)
+    } : data
 
-    .ai_model BLOCK(4K) : ALIGN(4K)
+    .ai_model : AT(ADDR(.ai_model))
     {
         _ai_model_start = .;
         KEEP(*(.ai_model*))
         _ai_model_end = .;
-    }
+    } : data
 
-    .data BLOCK(4K) : ALIGN(4K)
+    .data : AT(ADDR(.data))
     {
-        *(.data*)
-    }
+        *(.data)
+        *(.data.*)
+    } : data
 
-    .bss BLOCK(4K) : ALIGN(4K)
+    .bss : AT(ADDR(.bss))
     {
+        *(.bss)
+        *(.bss.*)
         *(COMMON)
-        *(.bss*)
-    }
+    } : data
 
     kernel_end = .;
+
+    /DISCARD/ :
+    {
+        *(.comment)
+        *(.note*)
+    }
 }