--- a/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp Tue Dec 10 14:29:43 2013 +0100
+++ b/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp Wed Dec 11 00:06:11 2013 +0100
@@ -132,7 +132,7 @@
class NativeCall: public NativeInstruction {
public:
- enum specific_constants {
+ enum ppc_specific_constants {
load_const_instruction_size = 28,
load_const_from_method_toc_instruction_size = 16,
instruction_size = 16 // Used in shared code for calls with reloc_info.
@@ -240,7 +240,7 @@
class NativeMovConstReg: public NativeInstruction {
public:
- enum specific_constants {
+ enum ppc_specific_constants {
load_const_instruction_size = 20,
load_const_from_method_toc_instruction_size = 8,
instruction_size = 8 // Used in shared code for calls with reloc_info.
@@ -279,7 +279,7 @@
// We use MacroAssembler::b64_patchable() for implementing a
// jump-anywhere instruction.
- enum specific_constants {
+ enum ppc_specific_constants {
instruction_size = MacroAssembler::b64_patchable_size
};
@@ -384,7 +384,6 @@
void set_destination(address new_destination);
};
-
inline bool is_NativeCallTrampolineStub_at(address address) {
int first_instr = *(int*)address;
return Assembler::is_addis(first_instr) &&