[sanitizer_common] Fix building with NetBSD 10.99.12 or newer #134708
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
NetBSD/src@16543c4 __lwp_getprivate_fast() was moved to a new arch-specific header file. Closes: llvm#125566
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Brad Smith (brad0) Changes__lwp_getprivate_fast() was moved to a new arch-specific header file. Closes: #125566 Full diff: https://github.com/llvm/llvm-project/pull/134708.diff 1 Files Affected:
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
index e5e79d4e0521c..304d14b20c6d5 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
@@ -29,7 +29,13 @@
# include "sanitizer_solaris.h"
# if SANITIZER_NETBSD
-# define _RTLD_SOURCE // for __lwp_gettcb_fast() / __lwp_getprivate_fast()
+# // for __lwp_gettcb_fast() / __lwp_getprivate_fast()
+# include <sys/param.h>
+# if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 1099001200)
+# include <machine/lwp_private.h>
+# else
+# define _RTLD_SOURCE
+# endif
# endif
# include <dlfcn.h> // for dlsym()
|
thurstond
reviewed
Apr 7, 2025
| @@ -29,7 +29,13 @@ | |||
| # include "sanitizer_solaris.h" | |||
|
|
|||
| # if SANITIZER_NETBSD | |||
| # define _RTLD_SOURCE // for __lwp_gettcb_fast() / __lwp_getprivate_fast() | |||
| # // for __lwp_gettcb_fast() / __lwp_getprivate_fast() | |||
| # include <sys/param.h> | |||
There was a problem hiding this comment.
Can this be moved under the if condition, since it didn't seem to be needed for older NetBSD versions?
There was a problem hiding this comment.
No, that's required for the if condition.
There was a problem hiding this comment.
yes he s right we need this header prior
devnexen
approved these changes
Apr 7, 2025
thurstond
approved these changes
Apr 7, 2025
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.
NetBSD/src@16543c4
__lwp_getprivate_fast() was moved to a new arch-specific header file.
Closes: #125566