From aaacde11f2e814814fdd19dfb683e76f1dede4d5 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 12 Jul 2021 18:43:32 +0200 Subject: Reduce pollution due to dynamic PTHREAD_STACK_MIN used to be a header file with no declarations. GCC's libgomp includes it in a #pragma GCC visibility hidden block. Including from (indirectly) declares everything in with hidden visibility, resulting in linker failures. This commit avoids C declarations in assembler mode and only declares __sysconf in (and not the entire contents of ). The __sysconf symbol is already part of the ABI. PTHREAD_STACK_MIN is no longer defined for __USE_DYNAMIC_STACK_SIZE && __ASSEMBLER__ because there is no possible definition. Additionally, PTHREAD_STACK_MIN is now defined by for __USE_MISC because this is what developers expect based on the macro name. It also helps to avoid libgomp linker failures in GCC because libgomp includes before its visibility hacks. Reviewed-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/bits/local_lim.h | 10 ++----- .../sysv/linux/bits/pthread_stack_min-dynamic.h | 31 ++++++++++++++++++++++ .../linux/include/bits/pthread_stack_min-dynamic.h | 7 +++++ 4 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/bits/pthread_stack_min-dynamic.h create mode 100644 sysdeps/unix/sysv/linux/include/bits/pthread_stack_min-dynamic.h (limited to 'sysdeps/unix') diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 7d43dc9..8257e5b 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -109,7 +109,7 @@ sysdep_headers += sys/mount.h sys/acct.h \ bits/types/struct_semid64_ds_helper.h \ bits/types/struct_shmid64_ds.h \ bits/types/struct_shmid64_ds_helper.h \ - bits/pthread_stack_min.h + bits/pthread_stack_min.h bits/pthread_stack_min-dynamic.h tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \ diff --git a/sysdeps/unix/sysv/linux/bits/local_lim.h b/sysdeps/unix/sysv/linux/bits/local_lim.h index 0b1c7f4..b8f8923 100644 --- a/sysdeps/unix/sysv/linux/bits/local_lim.h +++ b/sysdeps/unix/sysv/linux/bits/local_lim.h @@ -77,14 +77,8 @@ priority level. */ #define AIO_PRIO_DELTA_MAX 20 -/* Minimum size for a thread. We are free to choose a reasonable value. */ -#undef PTHREAD_STACK_MIN -#if defined __USE_DYNAMIC_STACK_SIZE && __USE_DYNAMIC_STACK_SIZE -# include -# define PTHREAD_STACK_MIN sysconf (_SC_THREAD_STACK_MIN) -#else -# include -#endif +/* Arrange for the definition of PTHREAD_STACK_MIN. */ +#include /* Maximum number of timer expiration overruns. */ #define DELAYTIMER_MAX 2147483647 diff --git a/sysdeps/unix/sysv/linux/bits/pthread_stack_min-dynamic.h b/sysdeps/unix/sysv/linux/bits/pthread_stack_min-dynamic.h new file mode 100644 index 0000000..5f5fc5f --- /dev/null +++ b/sysdeps/unix/sysv/linux/bits/pthread_stack_min-dynamic.h @@ -0,0 +1,31 @@ +/* Definition of PTHREAD_STACK_MIN, possibly dynamic. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef PTHREAD_STACK_MIN +# if defined __USE_DYNAMIC_STACK_SIZE && __USE_DYNAMIC_STACK_SIZE +# ifndef __ASSEMBLER__ +# define __SC_THREAD_STACK_MIN_VALUE 75 +__BEGIN_DECLS +extern long int __sysconf (int __name) __THROW; +__END_DECLS +# define PTHREAD_STACK_MIN __sysconf (__SC_THREAD_STACK_MIN_VALUE) +# endif +# else +# include +# endif +#endif diff --git a/sysdeps/unix/sysv/linux/include/bits/pthread_stack_min-dynamic.h b/sysdeps/unix/sysv/linux/include/bits/pthread_stack_min-dynamic.h new file mode 100644 index 0000000..d66f584 --- /dev/null +++ b/sysdeps/unix/sysv/linux/include/bits/pthread_stack_min-dynamic.h @@ -0,0 +1,7 @@ +/* Don't define PTHREAD_STACK_MIN to __sysconf (_SC_THREAD_STACK_MIN) + for glibc build. */ +#ifdef _ISOMAC +# include +#else +# include +#endif -- cgit v1.1