darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-11-27 14:20:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8221639: [i386] expand_exec_shield_cs_limit workaround is undefined code after JDK-8199717

Browse Source 
Only perform this optimization for x86_64

Reviewed-by: dholmes, andrew
This commit is contained in:
Severin Gehwolf 2019-04-18 13:58:31 +02:00
parent 048c3dc026
commit fb355041ea
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hotspot/os/linux/os_linux.cpp
View File

@ -5158,13 +5158,16 @@ jint os::init_2(void) {
return JNI_ERR;
}
#if defined(IA32)
// Need to ensure we've determined the process's initial stack to
// perform the workaround
Linux::capture_initial_stack(JavaThread::stack_size_at_create());
workaround_expand_exec_shield_cs_limit();
#else
suppress_primordial_thread_resolution = Arguments::created_by_java_launcher();
if (!suppress_primordial_thread_resolution) {
Linux::capture_initial_stack(JavaThread::stack_size_at_create());
}
#if defined(IA32)
workaround_expand_exec_shield_cs_limit();
#endif
Linux::libpthread_init();

1
src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
View File

@ -827,6 +827,7 @@ void os::verify_stack_alignment() {
*/
void os::workaround_expand_exec_shield_cs_limit() {
#if defined(IA32)
assert(Linux::initial_thread_stack_bottom() != NULL, "sanity");
size_t page_size = os::vm_page_size();
/*