--- a/hotspot/src/share/vm/runtime/os.hpp Thu Dec 10 14:22:00 2015 +0100
+++ b/hotspot/src/share/vm/runtime/os.hpp Mon Dec 14 02:29:11 2015 -0500
@@ -471,8 +471,8 @@
static int pd_self_suspend_thread(Thread* thread);
- static ExtendedPC fetch_frame_from_context(void* ucVoid, intptr_t** sp, intptr_t** fp);
- static frame fetch_frame_from_context(void* ucVoid);
+ static ExtendedPC fetch_frame_from_context(const void* ucVoid, intptr_t** sp, intptr_t** fp);
+ static frame fetch_frame_from_context(const void* ucVoid);
static frame fetch_frame_from_ucontext(Thread* thread, void* ucVoid);
static ExtendedPC get_thread_pc(Thread *thread);
@@ -499,7 +499,7 @@
// Terminate with an error. Default is to generate a core file on platforms
// that support such things. This calls shutdown() and then aborts.
- static void abort(bool dump_core, void *siginfo, void *context);
+ static void abort(bool dump_core, void *siginfo, const void *context);
static void abort(bool dump_core = true);
// Die immediately, no exit hook, no abort hook, no cleanup.
@@ -604,8 +604,8 @@
static void print_memory_info(outputStream* st);
static void print_dll_info(outputStream* st);
static void print_environment_variables(outputStream* st, const char** env_list);
- static void print_context(outputStream* st, void* context);
- static void print_register_info(outputStream* st, void* context);
+ static void print_context(outputStream* st, const void* context);
+ static void print_register_info(outputStream* st, const void* context);
static void print_siginfo(outputStream* st, void* siginfo);
static void print_signal_handlers(outputStream* st, char* buf, size_t buflen);
static void print_date_and_time(outputStream* st, char* buf, size_t buflen);
@@ -848,7 +848,7 @@
public:
#ifndef PLATFORM_PRINT_NATIVE_STACK
// No platform-specific code for printing the native stack.
- static bool platform_print_native_stack(outputStream* st, void* context,
+ static bool platform_print_native_stack(outputStream* st, const void* context,
char *buf, int buf_size) {
return false;
}