[sanitizer_common] Remove <procfs.h> workaround on Solaris #142758
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
`sanitizer_procmaps_solaris.cpp` currently uses `#undef _FILE_OFFSET_BITS`
to hack around the fact that old versions of Solaris `<procfs.h>` don't
work in a largefile environment:
```
/usr/include/sys/procfs.h:42:2: error: #error "Cannot use procfs in the large file compilation environment"
42 | #error "Cannot use procfs in the large file compilation environment"
| ^~~~~
```
However, this is no longer an issue on either Solaris 11.4 or Illumos. The
workaround only existed for the benefit of Solaris 11.3. While that had
never been supported by LLVM, the sanitizer runtime libs were imported into
GCC's `libsanitzer`. With the removal of Solaris 11.3 support in GCC 15,
this is no longer an issue and the workaround can be removed.
Tested on `amd64-pc-solaris2.11` and `sparcv9-sun-solaris2.11`.
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Rainer Orth (rorth) Changes
However, this is no longer an issue on either Solaris 11.4 or Illumos. The workaround only existed for the benefit of Solaris 11.3. While that had never been supported by LLVM, the sanitizer runtime libs were imported into GCC's Tested on Full diff: https://github.com/llvm/llvm-project/pull/142758.diff 1 Files Affected:
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp
index 80b8158f43db9..452b30308be91 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp
@@ -9,9 +9,6 @@
// Information about the process mappings (Solaris-specific parts).
//===----------------------------------------------------------------------===//
-// Before Solaris 11.4, <procfs.h> doesn't work in a largefile environment.
-#undef _FILE_OFFSET_BITS
-
// Avoid conflict between `_TIME_BITS` defined vs. `_FILE_OFFSET_BITS`
// undefined in some Linux configurations.
#undef _TIME_BITS
|
fmayer
approved these changes
Jun 4, 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.
sanitizer_procmaps_solaris.cppcurrently uses#undef _FILE_OFFSET_BITSto hack around the fact that old versions of Solaris<procfs.h>don't work in a largefile environment:However, this is no longer an issue on either Solaris 11.4 or Illumos. The workaround only existed for the benefit of Solaris 11.3. While that had never been supported by LLVM, the sanitizer runtime libs were imported into GCC's
libsanitzer. With the removal of Solaris 11.3 support in GCC 15, this is no longer an issue and the workaround can be removed.Tested on
amd64-pc-solaris2.11andsparcv9-sun-solaris2.11.