From 04b2ab5bba9125e5d74b649c365173aa40e820fe Mon Sep 17 00:00:00 2001 From: Elly Fong-Jones Date: Wed, 15 Feb 2023 22:17:12 +0000 Subject: [PATCH] port: fix non-glibc desktop linux build This is the only change needed to build crashpad against musl, yay! The reason this change is needed is that user_vfp is bionic-specific, and does not exist in glibc, dietlibc, uclibc, or musl. I have not (yet) tried running the tests against another libc. Bug: chromium:1380656 Change-Id: I2247352e1611a300dff995156d393508c8257039 Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4255370 Reviewed-by: Mark Mentovai Commit-Queue: Elly Fong-Jones --- util/linux/thread_info.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/linux/thread_info.h b/util/linux/thread_info.h index 8b94effe..9f60bd3e 100644 --- a/util/linux/thread_info.h +++ b/util/linux/thread_info.h @@ -15,6 +15,7 @@ #ifndef CRASHPAD_UTIL_LINUX_THREAD_INFO_H_ #define CRASHPAD_UTIL_LINUX_THREAD_INFO_H_ +#include #include #include @@ -274,7 +275,7 @@ union FloatContext { "Size mismatch"); #elif defined(ARCH_CPU_ARMEL) static_assert(sizeof(f32_t::fpregs) == sizeof(user_fpregs), "Size mismatch"); -#if !defined(__GLIBC__) +#if defined(__BIONIC__) static_assert(sizeof(f32_t::vfp) == sizeof(user_vfp), "Size mismatch"); #endif #elif defined(ARCH_CPU_ARM64)