File openjdk-6-src-b32-no-return-in-nonvoid-function-ppc.patch of Package java-1_6_0-openjdk
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp 2014-07-14 05:12:32.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp 2014-07-25 17:17:53.287332663 +0200
@@ -73,6 +73,7 @@
RegisterOrConstant MacroAssembler::delayed_value_impl(
intptr_t* delayed_value_addr, Register tmpl, int offset) {
ShouldNotCallThis();
+ return RegisterOrConstant(tmpl);
}
void MacroAssembler::store_oop(jobject obj) {
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2014-07-14 05:12:32.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2014-07-25 17:17:53.283332759 +0200
@@ -1533,6 +1533,7 @@
address CppInterpreter::return_entry(TosState state, int length) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address CppInterpreter::deopt_entry(TosState state, int length) {
@@ -1553,6 +1554,7 @@
#else
return false; // make frame::print_value_on work
#endif // !PRODUCT
+ return false; //make gcc happy
}
// Result handlers and convertors
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp 2014-07-14 05:12:32.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp 2014-07-25 17:17:53.283332759 +0200
@@ -106,6 +106,7 @@
bool frame::safe_for_sender(JavaThread *thread) {
ShouldNotCallThis();
+ return false; // make gcc happy
}
void frame::pd_gc_epilog() {
@@ -113,6 +114,7 @@
bool frame::is_interpreted_frame_valid(JavaThread *thread) const {
ShouldNotCallThis();
+ return false; // make gcc happy
}
BasicType frame::interpreter_frame_result(oop* oop_result,
@@ -177,6 +179,7 @@
#else
return 0; // make javaVFrame::print_value work
#endif // PRODUCT
+ return 0; // make gcc happy
}
intptr_t* frame::interpreter_frame_tos_at(jint offset) const {
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2014-07-14 05:12:32.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2014-07-25 17:17:53.283332759 +0200
@@ -78,6 +78,7 @@
inline intptr_t* frame::link() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
#ifdef CC_INTERP
@@ -140,14 +141,17 @@
inline oop frame::saved_oop_result(RegisterMap* map) const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
inline bool frame::is_older(intptr_t* id) const {
ShouldNotCallThis();
+ return false; // make gcc happy
}
inline intptr_t* frame::entry_frame_argument_at(int offset) const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
inline intptr_t* frame::unextended_sp() const {
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp 2014-07-14 05:12:32.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp 2014-07-25 17:17:53.284332735 +0200
@@ -49,9 +49,11 @@
address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) {
// NB ic_stub_code_size() must return the size of the code we generate
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) {
// NB ic_stub_code_size() must return the size of the code we generate
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp 2014-07-14 05:12:32.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp 2014-07-25 17:17:53.287332663 +0200
@@ -40,6 +40,7 @@
Register tmp,
int offset) {
ShouldNotCallThis();
+ return RegisterOrConstant(tmp);
}
};
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp 2014-07-14 05:12:32.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp 2014-07-25 17:20:38.177477386 +0200
@@ -64,6 +64,7 @@
return NULL;
Unimplemented();
+ return NULL;
}
address InterpreterGenerator::generate_abstract_entry() {
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp 2014-07-14 05:12:32.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp 2014-07-25 17:17:53.285332711 +0200
@@ -51,15 +51,18 @@
public:
bool is_jump() {
ShouldNotCallThis();
+ return false; // make gcc happy
}
bool is_safepoint_poll() {
ShouldNotCallThis();
+ return false; // make gcc happy
}
};
inline NativeInstruction* nativeInstruction_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeCall : public NativeInstruction {
@@ -70,18 +73,22 @@
address instruction_address() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address next_instruction_address() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address return_address() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address destination() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
void set_destination_mt_safe(address dest) {
@@ -98,25 +105,30 @@
static bool is_call_before(address return_address) {
ShouldNotCallThis();
+ return false; // make gcc happy
}
};
inline NativeCall* nativeCall_before(address return_address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
inline NativeCall* nativeCall_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeMovConstReg : public NativeInstruction {
public:
address next_instruction_address() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
intptr_t data() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
void set_data(intptr_t x) {
@@ -126,12 +138,14 @@
inline NativeMovConstReg* nativeMovConstReg_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeMovRegMem : public NativeInstruction {
public:
int offset() const {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
void set_offset(intptr_t x) {
@@ -145,6 +159,7 @@
inline NativeMovRegMem* nativeMovRegMem_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeJump : public NativeInstruction {
@@ -155,6 +170,7 @@
address jump_destination() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
void set_jump_destination(address dest) {
@@ -172,12 +188,14 @@
inline NativeJump* nativeJump_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeGeneralJump : public NativeInstruction {
public:
address jump_destination() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
static void insert_unconditional(address code_pos, address entry) {
@@ -191,6 +209,7 @@
inline NativeGeneralJump* nativeGeneralJump_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
#endif // CPU_ZERO_VM_NATIVEINST_ZERO_HPP
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp 2014-07-14 05:12:32.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp 2014-07-25 17:17:53.285332711 +0200
@@ -32,8 +32,10 @@
const char* RegisterImpl::name() const {
ShouldNotCallThis();
+ return ""; // make gcc happy
}
const char* FloatRegisterImpl::name() const {
ShouldNotCallThis();
+ return ""; // make gcc happy
}
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp 2014-07-14 05:12:32.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp 2014-07-25 17:17:53.285332711 +0200
@@ -37,6 +37,7 @@
address Relocation::pd_call_destination(address orig_addr) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
void Relocation::pd_set_call_destination(address x) {
@@ -45,6 +46,7 @@
address Relocation::pd_get_address_from_code() {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address* Relocation::pd_address_in_code() {
@@ -54,6 +56,7 @@
int Relocation::pd_breakpoint_size() {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
void Relocation::pd_swap_in_breakpoint(address x,
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp 2014-07-14 05:12:32.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp 2014-07-25 17:17:53.286332687 +0200
@@ -85,6 +85,7 @@
#else
ShouldNotCallThis();
#endif // SHARK
+ return NULL; // make gcc happy
}
int Deoptimization::last_frame_adjust(int callee_parameters,
@@ -94,6 +95,7 @@
uint SharedRuntime::out_preserve_stack_slots() {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
static RuntimeStub* generate_empty_runtime_stub(const char* name) {
@@ -128,4 +130,5 @@
VMRegPair *regs,
int total_args_passed) {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp 2014-07-14 05:12:32.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp 2014-07-25 17:17:53.286332687 +0200
@@ -39,16 +39,20 @@
VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
VtableStub* VtableStubs::create_itable_stub(int vtable_index) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
int VtableStub::pd_code_size_limit(bool is_vtable_stub) {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
int VtableStub::pd_code_alignment() {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
--- icedtea6-1.13.4/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2014-07-14 05:12:31.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2014-07-25 17:17:53.286332687 +0200
@@ -67,6 +67,7 @@
frame os::get_sender_for_C_frame(frame* fr) {
ShouldNotCallThis();
+ return *fr; // make gcc happy
}
frame os::current_frame() {
@@ -96,6 +97,7 @@
// This is the value for x86; works pretty well for PPC too.
return (char *) -1;
#endif // SPARC
+ return (char *) -1; // make gcc happy
}
void os::initialize_thread() {
@@ -104,16 +106,19 @@
address os::Linux::ucontext_get_pc(ucontext_t* uc) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
ExtendedPC os::fetch_frame_from_context(void* ucVoid,
intptr_t** ret_sp,
intptr_t** ret_fp) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
frame os::fetch_frame_from_context(void* ucVoid) {
ShouldNotCallThis();
+ return *(frame*)ucVoid; // make gcc happy
}
extern "C" JNIEXPORT int
@@ -266,6 +271,7 @@
int os::Linux::get_fpu_control_word() {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
void os::Linux::set_fpu_control_word(int fpu) {
@@ -288,6 +294,7 @@
return addr != NULL;
#endif // _LP64
+ return false; // make gcc happy
}
///////////////////////////////////////////////////////////////////////////////
@@ -414,6 +421,7 @@
extern "C" {
int SpinPause() {
+ return 0; // make gcc happy
}
int SafeFetch32(int *adr, int errValue) {
@@ -503,6 +511,7 @@
long long unsigned int oldval,
long long unsigned int newval) {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
};
#endif // !_LP64
--- icedtea6-1.13.4/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2014-07-14 05:12:31.000000000 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2014-07-25 17:17:53.286332687 +0200
@@ -110,6 +110,7 @@
void* ucontext,
bool isInJava) {
ShouldNotCallThis();
+ return false;
}
// These routines are only used on cpu architectures that
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2014-07-25 22:47:46.039844973 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2014-07-25 22:49:23.819571579 +0200
@@ -36,7 +36,7 @@
_deopt_state = unknown;
}
-inline address frame::sender_pc() const { ShouldNotCallThis(); }
+inline address frame::sender_pc() const { ShouldNotCallThis(); return NULL; }
inline frame::frame(ZeroFrame* zf, intptr_t* sp) {
_zeroframe = zf;
--- icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 2014-07-25 22:47:46.038844996 +0200
+++ icedtea6-1.13.4/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 2014-07-25 23:26:42.731546354 +0200
@@ -66,6 +66,7 @@
// intptr_t* sp = fr.sender_sp();
// return frame(sp, younger_sp, this_frame_adjusted_stack);
ShouldNotCallThis();
+ return fr;
}
void MethodHandles::ricochet_frame_oops_do(const frame& fr, OopClosure* blk, const RegisterMap* reg_map) {
