Fix adding manual ubsan runtime to static glibc binaries
Sanitized glibc binaries get their runtime added by clang, not by
Soong, but unsanitized glibc binaries with sanitized dependencies
need their runtime added manually by Soong. Fix adding a static
runtime dependency to static glibc binaries.
Fixes: 297250415
Test: TestUbsan
Change-Id: I4913326604f9efebd8ecd4aad2f109fad8b6a80c
diff --git a/cc/sanitize.go b/cc/sanitize.go
index 30bce9b..8eea7db 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -1650,12 +1650,12 @@
Bool(sanProps.Fuzzer) ||
Bool(sanProps.Undefined) ||
Bool(sanProps.All_undefined) {
- if toolchain.Musl() || (c.staticBinary() && toolchain.Bionic()) {
- // Use a static runtime for static binaries.
- // Also use a static runtime for musl to match
- // what clang does for glibc. Otherwise dlopening
- // libraries that depend on libclang_rt.ubsan_standalone.so
- // fails with:
+ if toolchain.Musl() || c.staticBinary() {
+ // Use a static runtime for static binaries. For sanitized glibc binaries the runtime is
+ // added automatically by clang, but for static glibc binaries that are not sanitized but
+ // have a sanitized dependency the runtime needs to be added manually.
+ // Also manually add a static runtime for musl to match what clang does for glibc.
+ // Otherwise dlopening libraries that depend on libclang_rt.ubsan_standalone.so fails with:
// Error relocating ...: initial-exec TLS resolves to dynamic definition
addStaticDeps(config.UndefinedBehaviorSanitizerRuntimeLibrary(toolchain)+".static", true)
} else {