feat(std): unify std-aware ArceOS builds

Cargo.toml

@@ -117,7 +117,6 @@ members = [
     "os/arceos/tools/deptool",
     "os/arceos/tools/raspi4/chainloader",
     "os/arceos/ulib/*",
-    "os/arceos/ulib/arceos-rust/lib",
     "os/axvisor",
     "scripts/axbuild",
     "test-suit/arceos/rust",
@@ -133,7 +132,6 @@ members = [
 aarch64_sysreg = { version = "0.3.8", path = "virtualization/aarch64_sysreg" }
 arm-scmi-rs = { version = "0.1.3", path = "drivers/firmware/arm-scmi-rs" }
 arceos-test-suit = { version = "0.3.1", path = "test-suit/arceos/rust" }
-arceos-rust = { version = "0.1.2", path = "os/arceos/ulib/arceos-rust", default-features = false }
 arm_vcpu = { version = "0.5.10", path = "virtualization/arm_vcpu" }
 arm_vgic = { version = "0.4.11", path = "virtualization/arm_vgic" }
 ax-alloc = { version = "0.8.0", path = "os/arceos/modules/axalloc", default-features = false }
@@ -177,6 +175,7 @@ ax-lockdep = { version = "0.1.2", path = "components/lockdep" }
 ax-kspin = { version = "0.3.10", path = "components/kspin" }
 ax-lazyinit = { version = "0.4.8", path = "components/ax-lazyinit" }
 ax-libc = { version = "0.5.16", path = "os/arceos/ulib/axlibc" }
+libc = { version = "0.2", default-features = false }
 ax-linked-list-r4l = { version = "0.5.5", path = "components/linked_list_r4l" }
 ax-log = { version = "0.5.13", path = "os/arceos/modules/axlog" }
 ax-memory-addr = { version = "0.6.9", path = "memory/memory_addr" }

apps/arceos/std/qemu-smp1/arce_agent/Cargo.toml

@@ -4,7 +4,13 @@ version = "0.2.0"
 edition.workspace = true
 publish = false
 
+[features]
+default = []
+arceos = ["dep:ax-std"]
+
 [dependencies]
+ax-std = { workspace = true, optional = true }
+
 # minreq: minimal HTTP client, no TLS (we use a local HTTP proxy for HTTPS APIs)
 minreq = { version = "2", default-features = false }
 
@@ -15,5 +21,5 @@ serde_json = "1"
 log = "0.4"
 env_logger = "0.11"
 
-[target.'cfg(target_os = "hermit")'.dependencies]
-arceos-rust = { workspace = true, default-features = true, features = ["log-level-warn"] }
+[package.metadata.axstd]
+features = ["log-level-warn"]

apps/arceos/std/qemu-smp1/arce_agent/src/main.rs

@@ -1,3 +1,6 @@
+#[cfg(feature = "arceos")]
+use ax_std as _;
+
 // ArceAgent v0.2: Interactive AI Agent on ArceOS Unikernel
 //
 // Architecture:
@@ -9,54 +12,51 @@
 // Uses minreq for HTTP (no TLS — requires a local HTTP proxy).
 // Compiles identically on Linux (for development) and ArceOS (for deployment).
 
-#[cfg(target_os = "hermit")]
-use arceos_rust as _;
-
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 mod base64;
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 mod context;
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 mod hal;
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 mod lineedit;
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 mod llm;
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 mod memory;
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 mod tools;
 
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 use context::ContextManager;
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 use hal::HalInterface;
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 use lineedit::LineEditor;
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 use llm::{ChatMessage, LlmClient};
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 use log::{debug, error, info};
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 use memory::Memory;
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 use tools::{dispatch, tool_catalog};
 
 // ---------------------------------------------------------------------------
 // Configuration
 // ---------------------------------------------------------------------------
 
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 const API_BASE: &str = "http://localhost:8080/v1";
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 const MODEL: &str = "qwen3.5-plus-thinking";
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 const MAX_CONTEXT_MESSAGES: usize = 40;
 /// Max tool-call rounds per user turn (prevents infinite loops).
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 const MAX_TOOL_ROUNDS: usize = 10;
 
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 const SYSTEM_PROMPT: &str = r#"你是 ArceAgent，一个运行在 ArceOS Unikernel 上的智能机器人助手。
 
 ## 你的身体
@@ -86,7 +86,7 @@ const SYSTEM_PROMPT: &str = r#"你是 ArceAgent，一个运行在 ArceOS Unikern
 - 这体现了"云端大脑 + 裸机身体"的架构：你的推理能力来自云端 LLM，执行能力来自本地硬件
 - 请记住你是一个有物理实体的机器人，不是纯软件助手"#;
 
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 const STARTUP_PROMPT: &str = "你刚刚启动。请先用 read_memory \
                               工具检查持久记忆中是否有需要注意的内容，然后根据记忆内容和当前状态，\
                               向用户输出一句简短的欢迎/问候信息。如果记忆中有用户的名字或偏好，\
@@ -97,7 +97,7 @@ const STARTUP_PROMPT: &str = "你刚刚启动。请先用 read_memory \
 // Sends context to LLM, executes any tool calls, prints final text response.
 // ---------------------------------------------------------------------------
 
-#[cfg(not(target_os = "hermit"))]
+#[cfg(not(feature = "arceos"))]
 fn run_llm_turn(
     llm: &LlmClient,
     ctx: &mut ContextManager,
@@ -202,10 +202,10 @@ fn main() {
     println!("========================================");
     println!();
 
-    #[cfg(target_os = "hermit")]
+    #[cfg(feature = "arceos")]
     println!("ArceAgent smoke test ready");
 
-    #[cfg(not(target_os = "hermit"))]
+    #[cfg(not(feature = "arceos"))]
     {
         // init logging (colors, log level)
         let mut builder = env_logger::Builder::new();

apps/arceos/std/qemu-smp1/build-aarch64-unknown-none-softfloat.toml

@@ -1,4 +1,3 @@
-std = true
 features = []
 log = "Info"
 max_cpu_num = 1

apps/arceos/std/qemu-smp1/build-loongarch64-unknown-none-softfloat.toml

@@ -1,4 +1,3 @@
-std = true
 features = [
   "ax-hal/loongarch64-qemu-virt",
 ]

apps/arceos/std/qemu-smp1/build-riscv64gc-unknown-none-elf.toml

@@ -1,4 +1,3 @@
-std = true
 features = []
 log = "Info"
 max_cpu_num = 1

apps/arceos/std/qemu-smp1/build-x86_64-unknown-none.toml

@@ -1,4 +1,3 @@
-std = true
 features = [
 ]
 log = "Info"

apps/arceos/std/qemu-smp1/helloworld/Cargo.toml

@@ -5,7 +5,12 @@ edition.workspace = true
 authors = ["eternalcomet <mydragonos@outlook.com>"]
 publish = false
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[features]
+default = []
+arceos = ["dep:ax-std"]
 
-[target.'cfg(target_os = "hermit")'.dependencies]
-arceos-rust = { workspace = true, default-features = true, features = ["log-level-debug"] }
+[dependencies]
+ax-std = { workspace = true, optional = true }
+
+[package.metadata.axstd]
+features = ["log-level-debug"]

apps/arceos/std/qemu-smp1/helloworld/src/main.rs

@@ -1,5 +1,5 @@
-#[cfg(target_os = "hermit")]
-use arceos_rust as _;
+#[cfg(feature = "arceos")]
+use ax_std as _;
 
 fn main() {
     println!("Hello, world!");

apps/arceos/std/qemu-smp1/httpclient/Cargo.toml

@@ -9,7 +9,11 @@ publish = false
 
 [features]
 default = []
-dns = ["arceos-rust/dns"]
+arceos = ["dep:ax-std", "ax-std/net"]
+dns = []
 
-[target.'cfg(target_os = "hermit")'.dependencies]
-arceos-rust = { workspace = true, default-features = true, features = ["log-level-debug"] }
+[dependencies]
+ax-std = { workspace = true, optional = true }
+
+[package.metadata.axstd]
+features = ["log-level-debug"]

apps/arceos/std/qemu-smp1/httpclient/src/main.rs

@@ -3,8 +3,8 @@ use std::{
     net::{TcpStream, ToSocketAddrs},
 };
 
-#[cfg(target_os = "hermit")]
-use arceos_rust as _;
+#[cfg(feature = "arceos")]
+use ax_std as _;
 
 #[cfg(feature = "dns")]
 const DEST: &str = "ident.me:80";