add fix for full tools and sanitizer

Author: LuuuXXX

Cargo.lock

@@ -1997,22 +1997,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "libffi"
-version = "3.2.0"
+name = "libffi-sys2"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2"
+checksum = "47aedd9774ffb3dcab5c96f593cb5a0caf421a5e38b16bab3b8cdef5facb6ea2"
 dependencies = [
- "libc",
- "libffi-sys",
+ "cc",
 ]
 
 [[package]]
-name = "libffi-sys"
-version = "2.3.0"
+name = "libffi2"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36115160c57e8529781b4183c2bb51fdc1f6d6d1ed345591d84be7703befb3c"
+checksum = "c88a3402cad8ff58216ec6d07e5ecfa9e15fc36613c0a832db541e4e1a718a7b"
 dependencies = [
- "cc",
+ "libc",
+ "libffi-sys2",
 ]
 
 [[package]]
@@ -2273,7 +2273,7 @@ dependencies = [
  "directories",
  "getrandom 0.3.1",
  "libc",
- "libffi",
+ "libffi2",
  "libloading",
  "measureme 11.0.1",
  "rand 0.9.0",

src/bootstrap/src/core/build_steps/llvm.rs

@@ -814,6 +814,10 @@ fn configure_cmake(
         cflags.push(s);
     }
 
+    if target.contains("ohos") {
+        cflags.push(" -D_LINUX_SYSINFO_H");
+    }
+
     if builder.config.llvm_clang_cl.is_some() {
         cflags.push(format!(" --target={target}"));
     }
@@ -834,6 +838,11 @@ fn configure_cmake(
         cxxflags.push(" ");
         cxxflags.push(s);
     }
+
+    if target.contains("ohos") {
+        cxxflags.push(" -D_LINUX_SYSINFO_H");
+    }
+
     if builder.config.llvm_clang_cl.is_some() {
         cxxflags.push(format!(" --target={target}"));
     }
@@ -1220,6 +1229,10 @@ impl Step for Sanitizers {
         cfg.define("COMPILER_RT_USE_LIBCXX", "OFF");
         cfg.define("LLVM_CONFIG_PATH", &llvm_config);
 
+        if self.target.contains("ohos") {
+            cfg.define("COMPILER_RT_USE_BUILTINS_LIBRARY", "ON");
+        }
+
         // On Darwin targets the sanitizer runtimes are build as universal binaries.
         // Unfortunately sccache currently lacks support to build them successfully.
         // Disable compiler launcher on Darwin targets to avoid potential issues.

src/ci/docker/host-x86_64/dist-ohos/Dockerfile

@@ -60,7 +60,10 @@ ENV \
 
 ENV RUST_CONFIGURE_ARGS \
     --enable-profiler \
-    --disable-docs
+    --disable-docs \
+    --tools=cargo,clippy,rustdocs,rustfmt,rust-analyzer,rust-analyzer-proc-macro-srv,analysis,src,wasm-component-ld \
+    --enable-extended \
+    --enable-sanitizers
 
 ENV SCRIPT python3 ../x.py dist --host=$TARGETS --target $TARGETS
 

src/doc/rustc/src/platform-support/openharmony.md

@@ -1,6 +1,6 @@
 # `*-unknown-linux-ohos`
 
-**Tier: 2**
+**Tier: 2（with Host Tools）**
 
 * aarch64-unknown-linux-ohos
 * armv7-unknown-linux-ohos
@@ -18,6 +18,17 @@ system.
 - Amanieu d'Antras ([@Amanieu](https://github.com/Amanieu))
 - Lu Binglun ([@lubinglun](https://github.com/lubinglun))
 
+## Requirements
+
+All the ohos targets of Tier 2 with host tools support all extended rust tools.
+(exclude `miri`, the support of `miri` will be added soon)
+
+### Host toolchain
+
+The targets require a reasonably up-to-date OpenHarmony SDK on the host.
+
+The targets support `cargo`, which require [ohos-openssl](https://github.com/ohos-rs/ohos-openssl).
+
 ## Setup
 
 The OpenHarmony SDK doesn't currently support Rust compilation directly, so

src/tools/miri/Cargo.toml

@@ -36,7 +36,7 @@ features = ['unprefixed_malloc_on_supported_platforms']
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
-libffi = "3.2.0"
+libffi = { version = "3.2.3", package = "libffi2" }
 libloading = "0.8"
 
 [target.'cfg(target_family = "windows")'.dependencies]