diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2018-03-08 12:44:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-08 12:44:33 +0100 |
| commit | a8d2e3f06ce3c345ff79537e395c95e1e51fa9be (patch) | |
| tree | c650567f03322502d7e81f0edf6634338e56b09c /src/pal/src/init | |
| parent | 9925a52490d161e8eb9201953c68f8d9dd1850ce (diff) | |
| download | coreclr-a8d2e3f06ce3c345ff79537e395c95e1e51fa9be.tar.gz coreclr-a8d2e3f06ce3c345ff79537e395c95e1e51fa9be.tar.bz2 coreclr-a8d2e3f06ce3c345ff79537e395c95e1e51fa9be.zip | |
Fix ensuring primary stack size (#16698)
1. Make it happen for Alpine only (it was incorrectly being done for
OSX too.
2. Do it only when the Initialize is called for CLR initialization
Diffstat (limited to 'src/pal/src/init')
| -rw-r--r-- | src/pal/src/init/pal.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/pal/src/init/pal.cpp b/src/pal/src/init/pal.cpp index 996292e2c4..005fadaed4 100644 --- a/src/pal/src/init/pal.cpp +++ b/src/pal/src/init/pal.cpp @@ -174,7 +174,7 @@ PAL_InitializeDLL() return Initialize(0, NULL, PAL_INITIALIZE_DLL); } -#ifndef __GLIBC__ +#ifdef ENSURE_PRIMARY_STACK_SIZE /*++ Function: EnsureStackSize @@ -197,7 +197,7 @@ EnsureStackSize(SIZE_T stackSize) volatile uint8_t *s = (uint8_t *)_alloca(stackSize); *s = 0; } -#endif // __GLIBC__ +#endif // ENSURE_PRIMARY_STACK_SIZE /*++ Function: @@ -224,14 +224,14 @@ InitializeDefaultStackSize() } } -#ifndef __GLIBC__ +#ifdef ENSURE_PRIMARY_STACK_SIZE if (g_defaultStackSize == 0) { // Set the default minimum stack size for MUSL to the same value as we // use on Windows. g_defaultStackSize = 1536 * 1024; } -#endif // __GLIBC__ +#endif // ENSURE_PRIMARY_STACK_SIZE } /*++ @@ -312,9 +312,12 @@ Initialize( InitializeDefaultStackSize(); -#ifndef __GLIBC__ - EnsureStackSize(g_defaultStackSize); -#endif // __GLIBC__ +#ifdef ENSURE_PRIMARY_STACK_SIZE + if (flags & PAL_INITIALIZE_ENSURE_STACK_SIZE) + { + EnsureStackSize(g_defaultStackSize); + } +#endif // ENSURE_PRIMARY_STACK_SIZE // Initialize the TLS lookaside cache if (FALSE == TLSInitialize()) |