[nsan] Remove mallopt from nsan_interceptors #101055
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: Daniel Martinez (Calandracas606) ChangesFixes a build failure on 19.1.0-rc1 when building on linux with musl as the libc musl does not provide mallopt, whereas glibc does Full diff: https://github.com/llvm/llvm-project/pull/101055.diff 1 Files Affected:
diff --git a/compiler-rt/lib/nsan/nsan_interceptors.cpp b/compiler-rt/lib/nsan/nsan_interceptors.cpp
index 544b44f53cc42..baa8185994113 100644
--- a/compiler-rt/lib/nsan/nsan_interceptors.cpp
+++ b/compiler-rt/lib/nsan/nsan_interceptors.cpp
@@ -21,7 +21,7 @@
#include <wchar.h>
-#if SANITIZER_LINUX
+#if SANITIZER_LINUX && defined(__GLIBC__)
extern "C" int mallopt(int param, int value);
#endif
@@ -210,7 +210,7 @@ void __nsan::InitializeInterceptors() {
CHECK(!initialized);
// Instruct libc malloc to consume less memory.
-#if SANITIZER_LINUX
+#if SANITIZER_LINUX && defined(__GLIBC__)
mallopt(1, 0); // M_MXFAST
mallopt(-3, 32 * 1024); // M_MMAP_THRESHOLD
#endif
|
|
Perhaps we should just remove |
|
I could update the PR to remove mallopt if prefered |
|
Yeah, i think it should be easier to remove it |
Other sanitizers don't use mallopt, musl doesn't provide mallopt, and tcmalloc ignores mallopt. Its easiest jut to remove it
Calandracas606
force-pushed
the
mallopt-musl
branch
from
ab03fed to
c3a9242
Compare
Calandracas606
changed the title
MaskRay
approved these changes
Jul 29, 2024
MaskRay
changed the title
llvmbot
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Jul 29, 2024
Fixes a build failure on 19.1.0-rc1 when building on linux with musl as the libc musl does not provide mallopt, whereas glibc does. mallopt has portability issues with other libc implementations. Just remove the use. Co-authored-by: Daniel Martinez <danielmartinez@cock.li> (cherry picked from commit 2c3eb8d)
tru
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Jul 30, 2024
Fixes a build failure on 19.1.0-rc1 when building on linux with musl as the libc musl does not provide mallopt, whereas glibc does. mallopt has portability issues with other libc implementations. Just remove the use. Co-authored-by: Daniel Martinez <danielmartinez@cock.li> (cherry picked from commit 2c3eb8d)
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.
Fixes a build failure on 19.1.0-rc1 when building on linux with musl as the libc
musl does not provide mallopt, whereas glibc does. mallopt has portability issues with other libc implementations. Just remove the use.