diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:40:50 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 14:38:19 +0000 |
| commit | 6cfec1a5b66fe113ffbe81c125ea700f21b30439 (patch) | |
| tree | a1753b317adea2c440b98cb8854a0ee152f8bcb0 /libc | |
| parent | e2f0539dee416d6770493a0d90e1bdffa874acf1 (diff) | |
| parent | 7ed993ad49ebcb0c702f000978f42f52e9f423ab (diff) | |
| download | bionic-6cfec1a5b66fe113ffbe81c125ea700f21b30439.zip bionic-6cfec1a5b66fe113ffbe81c125ea700f21b30439.tar.gz bionic-6cfec1a5b66fe113ffbe81c125ea700f21b30439.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into cm-13.0
Android 6.0.0 release 26
Change-Id: Ic73500c2330af39a735307c153fbe3e71b7f2040
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/bionic/pthread_internal.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libc/bionic/pthread_internal.h b/libc/bionic/pthread_internal.h index 3b91e6a..6a39a21 100644 --- a/libc/bionic/pthread_internal.h +++ b/libc/bionic/pthread_internal.h @@ -130,8 +130,13 @@ __LIBC_HIDDEN__ void pthread_key_clean_all(void); */ #define PTHREAD_STACK_SIZE_DEFAULT ((1 * 1024 * 1024) - SIGSTKSZ) -/* Leave room for a guard page in the internally created signal stacks. */ +// Leave room for a guard page in the internally created signal stacks. +#if defined(__LP64__) +// SIGSTKSZ is not big enough for 64-bit arch. See http://b/23041777. +#define SIGNAL_STACK_SIZE (16 * 1024 + PAGE_SIZE) +#else #define SIGNAL_STACK_SIZE (SIGSTKSZ + PAGE_SIZE) +#endif /* Needed by fork. */ __LIBC_HIDDEN__ extern void __bionic_atfork_run_prepare(); |