Merge

Tue, 22 Jun 2010 10:03:12 -0400

author
zgu
date
Tue, 22 Jun 2010 10:03:12 -0400
changeset 1980
3e351982aac7
parent 1949
b9bc732be7c0
parent 1979
726b40449bd2
child 1981
1a11430e0326

Merge

     1.1 --- a/src/os/solaris/vm/osThread_solaris.hpp	Thu Jun 10 08:27:35 2010 -0700
     1.2 +++ b/src/os/solaris/vm/osThread_solaris.hpp	Tue Jun 22 10:03:12 2010 -0400
     1.3 @@ -123,7 +123,7 @@
     1.4  
     1.5    int set_interrupt_callback    (Sync_Interrupt_Callback * cb);
     1.6    void remove_interrupt_callback(Sync_Interrupt_Callback * cb);
     1.7 -  void OSThread::do_interrupt_callbacks_at_interrupt(InterruptArguments *args);
     1.8 +  void do_interrupt_callbacks_at_interrupt(InterruptArguments *args);
     1.9  
    1.10   // ***************************************************************
    1.11   // java.lang.Thread.interrupt state.
     2.1 --- a/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	Thu Jun 10 08:27:35 2010 -0700
     2.2 +++ b/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	Tue Jun 22 10:03:12 2010 -0400
     2.3 @@ -861,7 +861,7 @@
     2.4  cmpxchg_long_func_t* os::atomic_cmpxchg_long_func = os::atomic_cmpxchg_long_bootstrap;
     2.5  add_func_t*          os::atomic_add_func          = os::atomic_add_bootstrap;
     2.6  
     2.7 -extern "C" _solaris_raw_setup_fpu(address ptr);
     2.8 +extern "C" void _solaris_raw_setup_fpu(address ptr);
     2.9  void os::setup_fpu() {
    2.10    address fpu_cntrl = StubRoutines::addr_fpu_cntrl_wrd_std();
    2.11    _solaris_raw_setup_fpu(fpu_cntrl);

mercurial