--- a/hotspot/src/os/solaris/vm/os_solaris.cpp Sat Nov 14 18:26:35 2015 +0000
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp Mon Nov 16 14:47:21 2015 -0500
@@ -997,9 +997,8 @@
}
// defined for >= Solaris 10. This allows builds on earlier versions
-// of Solaris to take advantage of the newly reserved Solaris JVM signals
-// With SIGJVM1, SIGJVM2, ASYNC_SIGNAL is SIGJVM2 and -XX:+UseAltSigs does
-// nothing since these should have no conflict. Previously INTERRUPT_SIGNAL
+// of Solaris to take advantage of the newly reserved Solaris JVM signals.
+// With SIGJVM1, SIGJVM2, ASYNC_SIGNAL is SIGJVM2. Previously INTERRUPT_SIGNAL
// was SIGJVM1.
//
#if !defined(SIGJVM1)
@@ -1053,13 +1052,9 @@
sigaddset(&unblocked_sigs, SIGBUS);
sigaddset(&unblocked_sigs, SIGFPE);
- if (isJVM1available) {
- os::Solaris::set_SIGasync(SIGJVM2);
- } else if (UseAltSigs) {
- os::Solaris::set_SIGasync(ALT_ASYNC_SIGNAL);
- } else {
- os::Solaris::set_SIGasync(ASYNC_SIGNAL);
- }
+ // Always true on Solaris 10+
+ guarantee(isJVM1available(), "SIGJVM1/2 missing!");
+ os::Solaris::set_SIGasync(SIGJVM2);
sigaddset(&unblocked_sigs, os::Solaris::SIGasync());
@@ -3922,7 +3917,7 @@
// save the old handler in jvm
save_preinstalled_handler(sig, oldAct);
} else {
- vm_exit_during_initialization("Signal chaining not allowed for VM interrupt signal, try -XX:+UseAltSigs.");
+ vm_exit_during_initialization("Signal chaining not allowed for VM interrupt signal.");
}
// libjsig also interposes the sigaction() call below and saves the
// old sigaction on it own.
@@ -3991,7 +3986,7 @@
DO_SIGNAL_CHECK(BREAK_SIGNAL);
}
- // See comments above for using JVM1/JVM2 and UseAltSigs
+ // See comments above for using JVM1/JVM2
DO_SIGNAL_CHECK(os::Solaris::SIGasync());
}