Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUG: threads.h existence test requires GLIBC > 2.12. #18180

Merged
merged 5 commits into from Jan 19, 2021
Merged

BUG: threads.h existence test requires GLIBC > 2.12. #18180

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce91dcb
BUG: Require glibc 2.28+ for threads.h. Closes #18179
pearu Jan 17, 2021
e9eecc4
BUG: Require C11 for threads.h. Closes #18179
pearu Jan 18, 2021
072ed01
Check for glibc > 2.12 when __STDC_NO_THREADS__ is not defined.
pearu Jan 19, 2021
dae55c3
defined(__STDC_NO_THREADS__) can be trusted only when using glibc > 2.12
pearu Jan 19, 2021
5fe6159
Add __GLIBC__ defined check.
pearu Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion numpy/f2py/cfuncs.py
View file
Open in desktop
Expand Up @@ -549,7 +549,12 @@
#define F2PY_THREAD_LOCAL_DECL __declspec(thread)
#elif defined(__STDC_VERSION__) \\
&& (__STDC_VERSION__ >= 201112L) \\
&& !defined(__STDC_NO_THREADS__)
&& !defined(__STDC_NO_THREADS__) \\
&& (!defined(__GLIBC__) || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 12))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would fix the #include <threads.h> on Haiku too (ticket has been filed for this upstream: https://dev.haiku-os.org/ticket/16965 )

-       && (!defined(__GLIBC__) || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 12))
+       && (!defined(__GLIBC__) || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 12)) \\
+       && !defined(__HAIKU__)

/* __STDC_NO_THREADS__ was first defined in a maintenance release of glibc 2.12,
see https://lists.gnu.org/archive/html/commit-hurd/2012-07/msg00180.html,
so `!defined(__STDC_NO_THREADS__)` may give false positive for the existence
of `threads.h` when using an older release of glibc 2.12 */
#include <threads.h>
#define F2PY_THREAD_LOCAL_DECL thread_local
#elif defined(__GNUC__) \\
Expand Down