fix x86 build config

Author: mackz-maxw

.gitignore

@@ -3,3 +3,4 @@
 **/*.log
 .vscode/
 .idea/
+/build

README.md

@@ -109,7 +109,7 @@
 先决条件（WSL2 Ubuntu 22）
 ```bash
 sudo apt-get update
-sudo apt-get install -y build-essential qemu-system-x86 xorriso make nasm gcc
+sudo apt-get install -y build-essential qemu-system-x86 xorriso nasm mtools git curl unzip
 ```
 下载配置的nightly工具链 `rustup toolchain install`
 

kernel/Cargo.toml

@@ -25,4 +25,4 @@ codegen-units = 1
 
 [lib]
 name = "rint_kernel"
-crate-type = ["staticlib"]
+crate-type = ["rlib", "staticlib"]

kernel/src/lib.rs

@@ -3,6 +3,7 @@
 // #![feature(asm_const)] 
 
 use core::fmt::Write;
+use core::ptr;
 use spin::Mutex;
 use uart_16550::SerialPort;
 use x86_64::instructions::{hlt, interrupts};
@@ -19,7 +20,7 @@ fn panic(info: &core::panic::PanicInfo) -> ! {
 }
 
 #[unsafe(no_mangle)] // 禁止编译器对该函数进行名称改编，确保最终 ELF 里的符号名就是 kstart
-extern "C" fn kstart() -> ! {
+pub extern "C" fn kstart() -> ! {
     init_serial();
     banner();
 
@@ -61,6 +62,38 @@ pub fn kprint(args: core::fmt::Arguments) { // 生成一个封装好的格式化
     }
 }
 
+// --- Minimal C ABI shims ---
+// These satisfy symbols the core/alloc runtime expects when no libc is present.
+#[unsafe(no_mangle)]
+pub extern "C" fn memcpy(dest: *mut u8, src: *const u8, n: usize) -> *mut u8 {
+    unsafe{ptr::copy_nonoverlapping(src, dest, n);}
+    dest
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn memmove(dest: *mut u8, src: *const u8, n: usize) -> *mut u8 {
+    unsafe { ptr::copy(src, dest, n); }
+    dest
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn memset(dest: *mut u8, value: i32, n: usize) -> *mut u8 {
+    unsafe { ptr::write_bytes(dest, value as u8, n); }
+    dest
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn memcmp(a: *const u8, b: *const u8, n: usize) -> i32 {
+    for i in 0..n {
+        let va = unsafe { *a.add(i) };
+        let vb = unsafe { *b.add(i) };
+        if va != vb {
+            return va as i32 - vb as i32;
+        }
+    }
+    0
+}
+
 #[macro_export]
 macro_rules! kprintln {
     // 接受任意格式化参数列表，等同 println! 的可变参数匹配方式

kernel/src/main.rs

@@ -1,5 +1,8 @@
 #![no_std]
 #![no_main]
+#![allow(unused_extern_crates)]
+
+extern crate rint_kernel;
 
 use core::arch::global_asm;
 
@@ -10,20 +13,19 @@ r#"
     .section .text._start
     .global _start
 _start:
-    leaq stack_top(%rip), %rsp
+    lea rsp, [rip + stack_top]
     call kstart
 
 1:  hlt
     jmp 1b
 
-    .section .bss
+    .section .bss.stack, "aw", @nobits
     .align 16
     .global __bootstrap_stack
 __bootstrap_stack:
     .space 0x8000
 
     .global stack_top
 stack_top:
-    .quad __bootstrap_stack + 0x8000
 "#
 );

kernel/x86_64-rint.json

@@ -1,11 +1,16 @@
 {
   "llvm-target": "x86_64-unknown-none",
+  "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
+  "target-endian": "little",
   "arch": "x86_64",
   "os": "none",
   "vendor": "unknown",
   "linker-flavor": "ld.lld",
+  "linker": "rust-lld",
   "disable-redzone": true,
   "features": "+sse,+sse2",
   "panic-strategy": "abort",
-  "executables": true
+  "executables": true,
+  "target-pointer-width": 64,
+  "target-c-int-width": 32
 }

scripts/make_iso.sh

@@ -20,10 +20,14 @@ if ! command -v qemu-system-x86_64 >/dev/null; then
   echo "Warning: QEMU not found (sudo apt-get install qemu-system-x86). ISO build will continue without QEMU." >&2
 fi
 
-# 获取 Limine binary release 并运行 configure
+# 获取 Limine binary release；若 CLI 不存在则执行 make（binary 分支不提供 ./configure）
 if [ ! -d "${LIMINE_DIR}/.git" ]; then
   git clone https://codeberg.org/Limine/Limine.git --branch=v10.6.2-binary --depth=1 "${LIMINE_DIR}"
-  (cd "${LIMINE_DIR}" && ./configure)
+fi
+
+# 构建 CLI：优先检查根目录 limine，其次 bin/limine
+if [ ! -x "${LIMINE_DIR}/limine" ] && [ ! -x "${LIMINE_DIR}/bin/limine" ]; then
+  (cd "${LIMINE_DIR}" && make)
 fi
 
 # 解析 Limine 产物路径（bin 或 share）
@@ -90,10 +94,12 @@ xorriso -as mkisofs -R -r -J \
 LIMINE_CLI=""
 if [ -x "${LIMINE_DIR}/bin/limine" ]; then
   LIMINE_CLI="${LIMINE_DIR}/bin/limine"
+elif [ -x "${LIMINE_DIR}/limine" ]; then
+  LIMINE_CLI="${LIMINE_DIR}/limine"
 elif command -v limine >/dev/null; then
   LIMINE_CLI="$(command -v limine)"
 else
-  echo "Limine CLI not found. Ensure ./configure produced bin/limine or install Limine to PATH." >&2
+  echo "Limine CLI not found. Run 'make' in build/limine or install Limine to PATH." >&2
   exit 1
 fi