Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 1 | From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 31 Jul 2021 10:51:41 -0700 |
| 4 | Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc |
| 5 | |
| 6 | In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which |
| 7 | could mean different stack sizes at runtime on different architectures |
| 8 | and it also causes compile failure. Default glibc thread stack size |
| 9 | or 64Kb set by ntp should be good in glibc these days. |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Patrick Williams | b542dec | 2023-06-09 01:26:37 -0500 | [diff] [blame] | 13 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 14 | --- |
| 15 | libntp/work_thread.c | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | |
| 18 | diff --git a/libntp/work_thread.c b/libntp/work_thread.c |
Patrick Williams | b542dec | 2023-06-09 01:26:37 -0500 | [diff] [blame] | 19 | index c1fe5c2..21db4a0 100644 |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 20 | --- a/libntp/work_thread.c |
| 21 | +++ b/libntp/work_thread.c |
Patrick Williams | b542dec | 2023-06-09 01:26:37 -0500 | [diff] [blame] | 22 | @@ -598,7 +598,7 @@ start_blocking_thread_internal( |
| 23 | /* now clamp on lower stack limit. */ |
| 24 | if (nstacksize < THREAD_MINSTACKSIZE) |
| 25 | nstacksize = THREAD_MINSTACKSIZE; |
| 26 | -# ifdef PTHREAD_STACK_MIN |
| 27 | +# ifdef PTHREAD_STACK_MIN && !defined(__GLIBC__) |
| 28 | if (nstacksize < PTHREAD_STACK_MIN) |
| 29 | nstacksize = PTHREAD_STACK_MIN; |
| 30 | # endif |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 31 | -- |
Patrick Williams | b542dec | 2023-06-09 01:26:37 -0500 | [diff] [blame] | 32 | 2.34.1 |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 33 | |