The parfait project uses a slightly different variation of a gcc/g++ compiler and these two problems were found during the compile, both minor corrections to the source code. Fixing these in the mainline source would prevent the parfait project from modifying the hotspot source and enable them to continue to monitor or use hotspot source as a test of their parfait system.

A. File hotspot/src/os/solaris/vm/osThread_solaris.hpp @ line 126:
The following line

void OSThread::do_interrupt_callbacks_at_interrupt(InterruptArguments *args);

has a name confict with OSThread, therefore, it is removed:

void do_interrupt_callbacks_at_interrupt(InterruptArguments *args);

In file included from ../generated/incls/_osThread_pd.hpp.incl:1,
               from /export2/home/cristina/workspace/testing/openjdk7/hotspot/src/share/vm/runtime/osThread.hpp:94,
               from ../generated/incls/_abstractCompiler.cpp.incl:118,
               from /export2/home/cristina/workspace/testing/openjdk7/hotspot/src/share/vm/compiler/abstractCompiler.cpp:25:
/export2/home/cristina/workspace/testing/openjdk7/hotspot/src/os/solaris/vm/osThread_solaris.hpp: At global scope:
/export2/home/cristina/workspace/testing/openjdk7/hotspot/src/os/solaris/vm/osThread_solaris.hpp:126: error: extra qualification 'OSThread::' on member 'do_interrupt_callbacks_at_interrupt'


B. File hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp @ line 867:
The following code

extern "C" _solaris_raw_setup_fpu(address ptr);
void os::setup_fpu() {
address fpu_cntrl = StubRoutines::addr_fpu_cntrl_wrd_std();
_solaris_raw_setup_fpu(fpu_cntrl);
}

needs a return type for _solaris_raw_setup_fpu.  A void return type is added

extern "C" void _solaris_raw_setup_fpu(address ptr);
void os::setup_fpu() {
address fpu_cntrl = StubRoutines::addr_fpu_cntrl_wrd_std();
_solaris_raw_setup_fpu(fpu_cntrl);
}
I filled another CR for addressing JDK part (#4) of code adjustments (CR6962376), so this one will only address hotspot part of code adjustments.