fix: SIGSEGV in getauxval — override broken CRT stub with dlsym wrapper
compiler-rt's init_have_lse_atomics calls getauxval(AT_HWCAP) at library load time. The static getauxval from the CRT reads from __libc_auxv which is NULL in shared libraries → SIGSEGV at 0x0. Fix: compile getauxval_fix.c that provides a getauxval() which uses dlsym(RTLD_DEFAULT) to find the real bionic getauxval at runtime. Also switch to libc++_shared.so (bundled in APK) to avoid pulling in static libc stubs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
[target.aarch64-linux-android]
|
||||
linker = "aarch64-linux-android26-clang"
|
||||
rustflags = [
|
||||
"-C", "target-feature=-outline-atomics",
|
||||
"-C", "link-arg=-Wl,-z,lazy",
|
||||
]
|
||||
|
||||
[target.armv7-linux-androideabi]
|
||||
linker = "armv7a-linux-androideabi21-clang"
|
||||
linker = "armv7a-linux-androideabi26-clang"
|
||||
|
||||
@@ -4,6 +4,12 @@ fn main() {
|
||||
let target = std::env::var("TARGET").unwrap_or_default();
|
||||
|
||||
if target.contains("android") {
|
||||
// Compile a getauxval override FIRST so it takes precedence over the
|
||||
// broken static stub from compiler-rt/CRT that crashes in shared libs.
|
||||
cc::Build::new()
|
||||
.file("cpp/getauxval_fix.c")
|
||||
.compile("getauxval_fix");
|
||||
|
||||
let oboe_dir = fetch_oboe();
|
||||
match oboe_dir {
|
||||
Some(oboe_path) => {
|
||||
@@ -13,7 +19,7 @@ fn main() {
|
||||
build
|
||||
.cpp(true)
|
||||
.std("c++17")
|
||||
.cpp_link_stdlib(None)
|
||||
.cpp_link_stdlib(Some("c++_shared"))
|
||||
.include("cpp")
|
||||
.include(oboe_path.join("include"))
|
||||
.include(oboe_path.join("src"))
|
||||
@@ -31,17 +37,22 @@ fn main() {
|
||||
cc::Build::new()
|
||||
.cpp(true)
|
||||
.std("c++17")
|
||||
.cpp_link_stdlib(None)
|
||||
.cpp_link_stdlib(Some("c++_shared"))
|
||||
.file("cpp/oboe_stub.cpp")
|
||||
.include("cpp")
|
||||
.compile("oboe_bridge");
|
||||
}
|
||||
}
|
||||
|
||||
// Android NDK splits the static C++ runtime into two archives:
|
||||
// libc++_static.a — STL (containers, strings, algorithms)
|
||||
// libc++abi.a — ABI (RTTI, exceptions, typeinfo vtables)
|
||||
// Both are required; cc crate's cpp_link_stdlib only handles the first.
|
||||
// Use libc++_shared.so (dynamic) instead of static linking.
|
||||
//
|
||||
// Static libc++ pulls in getauxval.o from libc.a, which has a
|
||||
// stub that reads from __libc_auxv (only initialized for executables,
|
||||
// not shared libs). This causes SIGSEGV when ring/cpufeatures calls
|
||||
// getauxval at load time. Using the shared library avoids this.
|
||||
//
|
||||
// libc++_shared.so must be bundled in the APK alongside libwzp_android.so.
|
||||
// build.rs copies it to jniLibs/ automatically.
|
||||
if let Ok(ndk) = std::env::var("ANDROID_NDK_HOME") {
|
||||
let arch = if target.contains("aarch64") {
|
||||
"aarch64-linux-android"
|
||||
@@ -54,9 +65,21 @@ fn main() {
|
||||
};
|
||||
let lib_dir = format!("{ndk}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/{arch}");
|
||||
println!("cargo:rustc-link-search=native={lib_dir}");
|
||||
|
||||
// Copy libc++_shared.so next to libwzp_android.so
|
||||
let shared_so = format!("{lib_dir}/libc++_shared.so");
|
||||
let shared_path = std::path::Path::new(&shared_so);
|
||||
if shared_path.exists() {
|
||||
// Output to the jniLibs directory (one level up from OUT_DIR)
|
||||
let out_dir = std::env::var("OUT_DIR").unwrap();
|
||||
// Also copy to a known location that Gradle cargoNdkBuild uses
|
||||
let jni_dir = format!("{}/../../../jniLibs/arm64-v8a", out_dir);
|
||||
let _ = std::fs::create_dir_all(&jni_dir);
|
||||
let _ = std::fs::copy(shared_path, format!("{jni_dir}/libc++_shared.so"));
|
||||
println!("cargo:warning=Copied libc++_shared.so to jniLibs");
|
||||
}
|
||||
println!("cargo:rustc-link-lib=static=c++_static");
|
||||
println!("cargo:rustc-link-lib=static=c++abi");
|
||||
}
|
||||
println!("cargo:rustc-link-lib=c++_shared");
|
||||
|
||||
// Oboe needs liblog and libOpenSLES from Android
|
||||
println!("cargo:rustc-link-lib=log");
|
||||
|
||||
21
crates/wzp-android/cpp/getauxval_fix.c
Normal file
21
crates/wzp-android/cpp/getauxval_fix.c
Normal file
@@ -0,0 +1,21 @@
|
||||
// Override the broken static getauxval from compiler-rt/CRT.
|
||||
// The static version reads from __libc_auxv which may be NULL in shared libs.
|
||||
// This version calls the real bionic getauxval via dlsym.
|
||||
#ifdef __ANDROID__
|
||||
#include <dlfcn.h>
|
||||
#include <stdint.h>
|
||||
|
||||
typedef unsigned long (*getauxval_fn)(unsigned long);
|
||||
|
||||
unsigned long getauxval(unsigned long type) {
|
||||
static getauxval_fn real_getauxval = (getauxval_fn)0;
|
||||
if (!real_getauxval) {
|
||||
real_getauxval = (getauxval_fn)dlsym((void*)-1 /* RTLD_DEFAULT */, "getauxval");
|
||||
if (!real_getauxval) {
|
||||
// Fallback: return 0 (no features detected)
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return real_getauxval(type);
|
||||
}
|
||||
#endif
|
||||
BIN
wzp-release.apk
BIN
wzp-release.apk
Binary file not shown.
Reference in New Issue
Block a user