This repository was archived by the owner on Jan 23, 2023. It is now read-only.
[release/3.1] Support glibc deprecation of sys/sysctl.h #28010
Closed
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
glibc has deprecated sys/sysctl.h:
In file included from /coreclr/src/pal/src/misc/sysinfo.cpp:32:
/usr/include/sys/sysctl.h:21:2: error: "The <sys/sysctl.h> header is deprecated and will be removed." [-Werror,-W#warnings]
#warning "The <sys/sysctl.h> header is deprecated and will be removed."
^
1 error generated.
Fix that by preferring sysconf and only including sys/sysctl.h if
HAVE_SYSCONF is not true. This mirrors the order of the implementation
code in this file (sysinfo.cpp) which checks for HAVE_SYSCONF
before HAVE_SYSCTL.
Fixes #27008
omajid
changed the title
omajid
force-pushed
the
3.1-glibc-sysctl-deprecation
branch
2 times, most recently
from
44645cc to
baf98d9
Compare
Guard it with HAVE_SYSCONF/HAVE_XSW_USAGE, just like it is done in master and dotnet/runtime.
omajid
force-pushed
the
3.1-glibc-sysctl-deprecation
branch
from
baf98d9 to
a9d2b4f
Compare
omajid
changed the title
omajid
commented
Feb 11, 2020
| #endif // HAVE_XSWDEV | ||
|
|
||
| #if HAVE_XSW_USAGE | ||
| #include <sys/sysctl.h> |
There was a problem hiding this comment.
sys/sysctl.h provides struct xsw_usage. I can either put that in #ifdef __APPLE__ or just under a check for HAVE_XSW_USAGE.
There was a problem hiding this comment.
HAVE_XSW_USAGE sounds good to me
|
For servicing, I think we should just disable the warnings that are causing problems to minimize the churn. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
I can't build
release/3.1out of the box on Fedora 31 with glibc 2.30. This fixes that.This contains 3 changes:
gcenv.unix.cpp