diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-06-24 13:35:48 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-06-24 15:12:10 +0200 |
| commit | 8189c4c8bd94394dd603c2eac1c85b6fd2d2259a (patch) | |
| tree | 48042984a529fec44eaa4ae7c84ed6cf99919f3b /jvmfwk | |
| parent | 588d6e326157ae314528048f7f8e695fdafee39b (diff) | |
jvmfwk: pass along -Xss to JVM on AMD64 too
The PythonTest_dbacces_python in a clang ASAN build on F21 started to
fail with StackOverflowError in JNI_CreateJavaVM on the main thread,
and this fixes the problem.
Seen with java-1.8.0-openjdk-1.8.0.45-39.b14.fc21.x86_64
Change-Id: I87dfb4b62d547b334c19261aad88b4856489776f
(cherry picked from commit bb6399937270fb149639248dd1a28775948f7285)
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 18c72806b55b..72e17d30822a 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -70,7 +70,7 @@ #endif #endif -#if defined LINUX && defined X86 +#if defined LINUX && (defined X86 || defined X86_64) #include <sys/resource.h> #endif @@ -758,7 +758,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( options.push_back(Option("-Xint", nullptr)); } if (!hasStackSize) { -#if defined LINUX && defined X86 +#if defined LINUX && (defined X86 || defined X86_64) // At least OpenJDK 1.8.0's os::workaround_expand_exec_shield_cs_limit // (hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp) can mmap an rwx // page into the area that the main stack can grow down to according to |