Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at Tue Mar 3 22:23:45 CET 2009. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-02-09 11:29:32.000000000 +0100 +++ java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-03-02 09:56:13.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 2 09:55:53 CET 2009 - mvyskocil@suse.cz + +- fixed ppc/ppc64 build bnc#471829 comment#28 + - added openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.wIh986/_old 2009-03-03 22:19:50.000000000 +0100 +++ /var/tmp/diff_new_pack.wIh986/_new 2009-03-03 22:19:50.000000000 +0100 @@ -107,7 +107,7 @@ Obsoletes: %obsoletes %endif Version: %{icedteaver}_%{openjdkver} -Release: 23 +Release: 25 Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6 Group: Development/Languages/Java License: GPL v2 only; - with the OpenJDK Assembly Exception and the GNU Classpath Exception @@ -172,6 +172,9 @@ Patch107: openjdk-6-src-b14-no-return-in-nonvoid-function.patch Patch108: openjdk-6-src-b14-undefined-operation.patch Patch109: openjdk-6-src-b14-no-return-in-nonvoid-function-ix86.patch +# PATCH-FIX-OPENSUSE bnc#471829 comment#28 +# will be sent to upstream after sign of SCA (http://openjdk.java.net/contribute/) +Patch110: openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-lib-devel @@ -448,6 +451,9 @@ patch -l $* --input=%PATCH108 patch -l $* --input=%PATCH109 %endif +%ifarch ppc ppc64 + patch -l $* --input=%PATCH110 +%endif } %if %{gcjbootstrap} make stamps/patch-ecj.stamp @@ -895,6 +901,9 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so %changelog +* Mon Mar 02 2009 mvyskocil@suse.cz +- fixed ppc/ppc64 build bnc#471829 comment#28 + - added openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch * Mon Feb 09 2009 mvyskocil@suse.cz - updates: * openjdk b14 (25_nov_2008) ++++++ openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch ++++++ --- ./ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp @@ -874,6 +874,7 @@ void BytecodeInterpreter::layout_interpreterState(interpreterState istate, address CppInterpreter::return_entry(TosState state, int length) { Unimplemented(); + return NULL; } address CppInterpreter::deopt_entry(TosState state, int length) @@ -882,6 +883,7 @@ address CppInterpreter::deopt_entry(TosState state, int length) return NULL; #else Unimplemented(); + return NULL; #endif // SHARK } @@ -898,6 +900,7 @@ bool CppInterpreter::contains(address pc) { #ifdef PRODUCT ShouldNotCallThis(); + return false; #else return false; // make frame::print_value_on work #endif // !PRODUCT --- ./ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp +++ ./ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp @@ -28,8 +28,10 @@ static int pd_instruction_alignment() { Unimplemented(); + return 0; } static const char* pd_cpu_opts() { Unimplemented(); + return ""; } --- ./ports/hotspot/src/cpu/zero/vm/frame_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/frame_zero.cpp @@ -90,6 +90,7 @@ frame frame::sender(RegisterMap* map) const return sender_for_deoptimizer_frame(map); Unimplemented(); + return NULL; } #ifdef CC_INTERP @@ -119,6 +120,7 @@ void frame::patch_pc(Thread* thread, address pc) bool frame::safe_for_sender(JavaThread *thread) { Unimplemented(); + return false; } void frame::pd_gc_epilog() @@ -128,6 +130,7 @@ void frame::pd_gc_epilog() bool frame::is_interpreted_frame_valid(JavaThread *thread) const { Unimplemented(); + return false; } BasicType frame::interpreter_frame_result(oop* oop_result, @@ -191,6 +194,7 @@ int frame::frame_size() const { #ifdef PRODUCT ShouldNotCallThis(); + return 0; #else return 0; // make javaVFrame::print_value work #endif // PRODUCT --- ./ports/hotspot/src/cpu/zero/vm/frame_zero.hpp +++ ./ports/hotspot/src/cpu/zero/vm/frame_zero.hpp @@ -43,6 +43,7 @@ { #ifdef PRODUCT ShouldNotCallThis(); + return NULL; #else return (intptr_t *) -1; // make frame::print_value_on work #endif // !PRODUCT --- ./ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp +++ ./ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp @@ -78,6 +78,7 @@ inline intptr_t* frame::sender_sp() const inline intptr_t* frame::link() const { Unimplemented(); + return NULL; } #ifdef CC_INTERP @@ -154,6 +155,7 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) inline oop frame::saved_oop_result(RegisterMap* map) const { Unimplemented(); + return NULL; } inline bool frame::is_older(intptr_t* id) const @@ -164,6 +166,7 @@ inline bool frame::is_older(intptr_t* id) const inline intptr_t* frame::entry_frame_argument_at(int offset) const { Unimplemented(); + return NULL; } inline intptr_t* frame::unextended_sp() const --- ./ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp @@ -43,10 +43,12 @@ address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) { // NB ic_stub_code_size() must return the size of the code we generate Unimplemented(); + return NULL; } oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) { // NB ic_stub_code_size() must return the size of the code we generate Unimplemented(); + return NULL; } --- ./ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp +++ ./ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp @@ -38,6 +38,7 @@ { assert(TaggedStackInterpreter, "should not call this"); Unimplemented(); + return 0; } static int expr_offset_in_bytes(int i) @@ -59,4 +60,5 @@ { assert(TaggedStackInterpreter, "should not call this"); Unimplemented(); + return 0; } --- ./ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp +++ ./ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp @@ -67,21 +67,25 @@ class NativeCall : public NativeInstruction address instruction_address() const { Unimplemented(); + return NULL; } address next_instruction_address() const { Unimplemented(); + return NULL; } address return_address() const { Unimplemented(); + return NULL; } address destination() const { Unimplemented(); + return NULL; } void set_destination_mt_safe(address dest) @@ -102,17 +106,20 @@ class NativeCall : public NativeInstruction static bool is_call_before(address return_address) { Unimplemented(); + return false; } }; inline NativeCall* nativeCall_before(address return_address) { Unimplemented(); + return NULL; } inline NativeCall* nativeCall_at(address address) { Unimplemented(); + return NULL; } class NativeMovConstReg : public NativeInstruction @@ -121,6 +128,7 @@ class NativeMovConstReg : public NativeInstruction address next_instruction_address() const { Unimplemented(); + return NULL; } intptr_t data() const @@ -137,6 +145,7 @@ class NativeMovConstReg : public NativeInstruction inline NativeMovConstReg* nativeMovConstReg_at(address address) { Unimplemented(); + return NULL; } class NativeMovRegMem : public NativeInstruction @@ -195,6 +204,7 @@ class NativeJump : public NativeInstruction inline NativeJump* nativeJump_at(address address) { Unimplemented(); + return NULL; } class NativeGeneralJump : public NativeInstruction --- ./ports/hotspot/src/cpu/zero/vm/register_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/register_zero.cpp @@ -32,8 +32,10 @@ const int ConcreteRegisterImpl::max_fpr = const char* RegisterImpl::name() const { Unimplemented(); + return ""; } const char* FloatRegisterImpl::name() const { Unimplemented(); + return ""; } --- ./ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp @@ -34,6 +34,7 @@ void Relocation::pd_set_data_value(address x, intptr_t o) address Relocation::pd_call_destination(address orig_addr) { Unimplemented(); + return NULL; } void Relocation::pd_set_call_destination(address x) @@ -44,16 +45,19 @@ void Relocation::pd_set_call_destination(address x) address Relocation::pd_get_address_from_code() { Unimplemented(); + return NULL; } address* Relocation::pd_address_in_code() { Unimplemented(); + return NULL; } int Relocation::pd_breakpoint_size() { Unimplemented(); + return 0; } void Relocation::pd_swap_in_breakpoint(address x, short* instrs, --- ./ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp @@ -65,6 +65,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm, BasicType ret_type) { Unimplemented(); + return NULL; } int Deoptimization::last_frame_adjust(int callee_parameters, int callee_locals) @@ -73,12 +74,14 @@ int Deoptimization::last_frame_adjust(int callee_parameters, int callee_locals) return 0; #else Unimplemented(); + return 0; #endif // SHARK } uint SharedRuntime::out_preserve_stack_slots() { Unimplemented(); + return 0; } static RuntimeStub* generate_empty_runtime_stub(const char* name) @@ -117,4 +120,5 @@ int SharedRuntime::c_calling_convention(const BasicType *sig_bt, int total_args_passed) { Unimplemented(); + return 0; } --- ./ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp @@ -29,19 +29,23 @@ VtableStub* VtableStubs::create_vtable_stub(int vtable_index) { Unimplemented(); + return NULL; } VtableStub* VtableStubs::create_itable_stub(int vtable_index) { Unimplemented(); + return NULL; } int VtableStub::pd_code_size_limit(bool is_vtable_stub) { Unimplemented(); + return 0; } int VtableStub::pd_code_alignment() { Unimplemented(); + return 0; } --- ./ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +++ ./ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp @@ -35,11 +35,13 @@ address os::current_stack_pointer() frame os::get_sender_for_C_frame(frame* fr) { Unimplemented(); + return NULL; } frame os::current_frame() { Unimplemented(); + return NULL; } char* os::non_memory_address_word() @@ -65,17 +67,20 @@ void os::initialize_thread() address os::Linux::ucontext_get_pc(ucontext_t* uc) { Unimplemented(); + return NULL; } ExtendedPC os::fetch_frame_from_context(void* ucVoid, intptr_t** ret_sp, intptr_t** ret_fp) { Unimplemented(); + return NULL; } frame os::fetch_frame_from_context(void* ucVoid) { Unimplemented(); + return NULL; } extern "C" int @@ -232,6 +237,7 @@ void os::Linux::init_thread_fpu_state(void) int os::Linux::get_fpu_control_word() { Unimplemented(); + return 0; } void os::Linux::set_fpu_control_word(int fpu) @@ -242,6 +248,7 @@ void os::Linux::set_fpu_control_word(int fpu) bool os::is_allocatable(size_t bytes) { Unimplemented(); + return false; } /////////////////////////////////////////////////////////////////////////////// @@ -372,6 +379,7 @@ void os::print_context(outputStream* st, void* context) extern "C" { int SpinPause() { + return 0; } int SafeFetch32(int *adr, int errValue) @@ -463,6 +471,7 @@ extern "C" { long long unsigned int newval) { Unimplemented(); + return 0; } }; #endif // !_LP64 --- ./ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp +++ ./ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp @@ -100,6 +100,7 @@ bool isInJava) { Unimplemented(); + return false; } // These routines are only used on cpu architectures that -- 1.6.1.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org