Merge remote-tracking branch 'origin/main' into yuhao/prof

tikv · Feb 7, 2024 · 3e66fd8 · 3e66fd8
2 parents a091160 + b913c24
commit 3e66fd8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/jemalloc-sys/build.rs b/jemalloc-sys/build.rs
@@ -364,6 +364,7 @@ fn gnu_target(target: &str) -> String {
         "x86_64-pc-windows-gnu" => "x86_64-w64-mingw32".to_string(),
         "armv7-linux-androideabi" => "arm-linux-androideabi".to_string(),
         "riscv64gc-unknown-linux-gnu" => "riscv64-linux-gnu".to_string(),
+        "riscv64gc-unknown-linux-musl" => "riscv64-linux-musl".to_string(),
         s => s.to_string(),
     }
 }

diff --git a/jemalloc-sys/src/env.rs b/jemalloc-sys/src/env.rs
@@ -19,7 +19,6 @@ pub static NO_BG_THREAD_TARGETS: &[&str] = &["musl"];
 //  (not jemalloc malloc), and then the standard library would free with jemalloc free,
 //  causing a segfault.”
 // https://github.com/rust-lang/rust/commit/e3b414d8612314e74e2b0ebde1ed5c6997d28e8d
-// https://github.com/rust-lang/rust/commit/536011d929ecbd1170baf34e09580e567c971f95
 // https://github.com/rust-lang/rust/commit/9f3de647326fbe50e0e283b9018ab7c41abccde3
 // https://github.com/rust-lang/rust/commit/ed015456a114ae907a36af80c06f81ea93182a24
-pub static NO_UNPREFIXED_MALLOC_TARGETS: &[&str] = &["android", "dragonfly", "musl", "darwin"];
+pub static NO_UNPREFIXED_MALLOC_TARGETS: &[&str] = &["android", "dragonfly", "darwin"];
diff --git a/jemallocator/README.md b/jemallocator/README.md
@@ -36,7 +36,7 @@ tikv-jemallocator = "0.5"
 To set `tikv_jemallocator::Jemalloc` as the global allocator add this to your project:
 
 ```rust
-# main.rs
+// main.rs
 #[cfg(not(target_env = "msvc"))]
 use tikv_jemallocator::Jemalloc;