[compiler-rt][Mips] Fix stat size check on mips64 musl #143301
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Jens Reidel (Gelbpunkt) ChangesThe sizes of the struct stat on MIPS64 differ in musl vs glibc. See https://godbolt.org/z/qf9bcq8Y8 for the proof. Prior to this change, compilation for MIPS64 musl would fail. Full diff: https://github.com/llvm/llvm-project/pull/143301.diff 1 Files Affected:
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
index fdc52aa56c493..134081ac97931 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -102,8 +102,10 @@ const unsigned struct_kernel_stat_sz = SANITIZER_ANDROID
? FIRST_32_SECOND_64(104, 128)
# if defined(_ABIN32) && _MIPS_SIM == _ABIN32
: FIRST_32_SECOND_64(176, 216);
-# else
+# elif !SANITIZER_MUSL
: FIRST_32_SECOND_64(160, 216);
+# else
+ : FIRST_32_SECOND_64(160, 208);
# endif
const unsigned struct_kernel_stat64_sz = 104;
#elif defined(__s390__) && !defined(__s390x__)
|
Gelbpunkt
force-pushed
the
struct-stat-size-fix-mips64-musl
branch
from
9fdb7f6 to
4b9c1d6
Compare
Gelbpunkt
changed the title
brad0
reviewed
Jun 17, 2025
compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
Outdated
Show resolved
Hide resolved
The sizes of the struct stat on MIPS64 differ in musl vs glibc. See https://godbolt.org/z/qf9bcq8Y8 for the proof. Prior to this change, compilation for MIPS64 musl would fail. Signed-off-by: Jens Reidel <[email protected]>
Gelbpunkt
force-pushed
the
struct-stat-size-fix-mips64-musl
branch
from
4b9c1d6 to
1edfdda
Compare
|
FYI I figured out why this is the case: musl's nlink_t is a u32 instead of a u64, which changes the size from 216 bytes to 208: https://git.musl-libc.org/cgit/musl/tree/arch/mips64/bits/alltypes.h.in#n22 So this is definitely correct :) |
vitalybuka
approved these changes
Jul 16, 2025
|
cc @MaskRay |
tru
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Jul 24, 2025
The sizes of the struct stat on MIPS64 differ in musl vs glibc. See https://godbolt.org/z/qf9bcq8Y8 for the proof. Prior to this change, compilation for MIPS64 musl would fail. Signed-off-by: Jens Reidel <[email protected]> (cherry picked from commit a5d6fa6)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The sizes of the struct stat on MIPS64 differ in musl vs glibc.
See https://godbolt.org/z/qf9bcq8Y8 for the proof. Prior to this change, compilation for MIPS64 musl would fail.