Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at Thu May 28 02:24:27 CEST 2009. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-05-15 14:37:31.000000000 +0200 +++ java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-05-25 17:00:44.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 25 15:33:03 CEST 2009 - mvyskocil@suse.cz + +- Enabled systemtap only for jit architectures only +- Refreshed non-return-in-non-void ppc patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- icedtea6-1.4.1.tar.bz2 openjdk-6-src-b14-25_nov_2008-fedora.tar.bz2 openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch New: ---- openjdk-6-src-b16-no-return-in-nonvoid-function-ppc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.I22971/_old 2009-05-28 02:21:35.000000000 +0200 +++ /var/tmp/diff_new_pack.I22971/_new 2009-05-28 02:21:35.000000000 +0200 @@ -55,10 +55,10 @@ %define runtests 0 %endif %define buildoutputdir openjdk/build/linux-%{archbuild} -%if %{gcjbootstrap} -%define icedteaopt --with-libgcj-jar=%_javadir/libgcj-4.3.jar --with-gcj-home=%_jvmdir/java-1.5.0-gcj +%ifarch %{jit_arches} +%define icedteaopt --enable-systemtap --with-abs-install-dir=%{_jvmdir}/%{sdkdir} %else -%define icedteaopt --with-openjdk --with-openjdk-home=/etc/alternatives/java_sdk +%define icedteaopt %{nil} %endif # Convert an absolute path to a relative path. Each symbolic link is # specified relative to the directory in which it is installed so that @@ -176,7 +176,7 @@ 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 +Patch110: openjdk-6-src-b16-no-return-in-nonvoid-function-ppc.patch # PATCH-FIX-UPSTREAM bnc#492555, icedtea#315 # confluence wiki crashes under tomcat6 and openjdk # http://hg.openjdk.java.net/jdk7/hotspot-comp/hotspot/rev/039a914095f4 @@ -232,8 +232,10 @@ # pulse audio requirements BuildRequires: libpulse-devel >= 0.9.11 BuildRequires: pulseaudio >= 0.9.11 +%ifarch %{jit_arches} #system tap BuildRequires: systemtap-sdt-devel +%endif # Zero-assembler build requirement. %ifnarch %{jit_arches} BuildRequires: libffi-devel @@ -449,11 +451,11 @@ unset JAVA_HOME ./autogen.sh %{configure} %{icedteaopt} \ + --with-openjdk --with-openjdk-home=%{_jvmdir}/%{sdkdir} \ --with-openjdk-src-zip=%{SOURCE1} \ --with-pkgversion=suse-%{release}-%{_arch} \ --enable-pulse-java \ - --with-hotspot-src-zip=hotspot.tar.gz \ - --enable-systemtap --with-abs-install-dir=%{_jvmdir}/%{sdkdir} + --with-hotspot-src-zip=hotspot.tar.gz patch_openjdk() { patch -l $* --input=%{PATCH104} %ifarch s390 s390x # contains a special makefile test which is only for s390(x) for now: @@ -601,9 +603,11 @@ mkdir sample/rmi mv bin/java-rmi.cgi sample/rmi cp -a sample $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} + %ifarch %{jit_arches} # systemtap support install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/systemtap/tapset/ install -m 0644 tapset/hotspot.stp $RPM_BUILD_ROOT/%{_datadir}/systemtap/tapset/ + %endif popd # Install Javadoc documentation. install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} @@ -897,8 +901,10 @@ %{_datadir}/icons/hicolor/48x48 %{_datadir}/pixmaps/javaws.png %{_datadir}/applications/*.desktop +%ifarch %{jit_arches} # systemtap support %{_datadir}/systemtap +%endif %files devel %defattr(-,root,root,-) @@ -957,6 +963,9 @@ %{_jvmdir}/%{sdkdir}/jre/lib/*/IcedTeaPlugin.so %changelog +* Mon May 25 2009 mvyskocil@suse.cz +- Enabled systemtap only for jit architectures only +- Refreshed non-return-in-non-void ppc patch * Fri May 15 2009 mvyskocil@suse.cz - 'used systemtap-sdt-devel (see bnc#503088)' * Thu May 14 2009 mvyskocil@suse.cz ++++++ openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch -> openjdk-6-src-b16-no-return-in-nonvoid-function-ppc.patch ++++++ --- java-1_6_0-openjdk/openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch 2009-03-03 22:23:47.000000000 +0100 +++ java-1_6_0-openjdk/openjdk-6-src-b16-no-return-in-nonvoid-function-ppc.patch 2009-05-25 17:00:50.000000000 +0200 @@ -1,6 +1,16 @@ ---- ./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, +--- ./ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp.orig 2009-05-25 16:30:12.778755323 +0200 ++++ ./ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2009-05-25 16:30:12.782755717 +0200 +@@ -109,6 +109,7 @@ + bool isInJava) + { + Unimplemented(); ++ return false; + } + + // These routines are only used on cpu architectures that +--- ./ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp.orig 2009-05-25 16:36:26.819254593 +0200 ++++ ./ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2009-05-25 16:36:26.823254902 +0200 +@@ -898,6 +898,7 @@ address CppInterpreter::return_entry(TosState state, int length) { Unimplemented(); @@ -8,15 +18,7 @@ } 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) +@@ -918,6 +919,7 @@ { #ifdef PRODUCT ShouldNotCallThis(); @@ -24,8 +26,8 @@ #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 +--- ./ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp.orig 2009-05-25 16:36:26.835254393 +0200 ++++ ./ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp 2009-05-25 16:36:26.839254802 +0200 @@ -28,8 +28,10 @@ static int pd_instruction_alignment() { @@ -37,9 +39,9 @@ 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 +--- ./ports/hotspot/src/cpu/zero/vm/frame_zero.cpp.orig 2009-05-25 16:36:26.851254533 +0200 ++++ ./ports/hotspot/src/cpu/zero/vm/frame_zero.cpp 2009-05-25 16:36:26.855254772 +0200 +@@ -90,6 +90,7 @@ return sender_for_deoptimizer_frame(map); Unimplemented(); @@ -47,7 +49,7 @@ } #ifdef CC_INTERP -@@ -119,6 +120,7 @@ void frame::patch_pc(Thread* thread, address pc) +@@ -115,6 +116,7 @@ bool frame::safe_for_sender(JavaThread *thread) { Unimplemented(); @@ -55,7 +57,7 @@ } void frame::pd_gc_epilog() -@@ -128,6 +130,7 @@ void frame::pd_gc_epilog() +@@ -124,6 +126,7 @@ bool frame::is_interpreted_frame_valid(JavaThread *thread) const { Unimplemented(); @@ -63,7 +65,7 @@ } BasicType frame::interpreter_frame_result(oop* oop_result, -@@ -191,6 +194,7 @@ int frame::frame_size() const +@@ -187,6 +190,7 @@ { #ifdef PRODUCT ShouldNotCallThis(); @@ -71,19 +73,9 @@ #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 +--- ./ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp.orig 2009-05-25 16:36:26.863255215 +0200 ++++ ./ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2009-05-25 16:36:26.867254363 +0200 +@@ -78,6 +78,7 @@ inline intptr_t* frame::link() const { Unimplemented(); @@ -91,7 +83,7 @@ } #ifdef CC_INTERP -@@ -154,6 +155,7 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) +@@ -154,11 +155,13 @@ inline oop frame::saved_oop_result(RegisterMap* map) const { Unimplemented(); @@ -99,17 +91,15 @@ } 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; ++ return false; } - 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) + inline intptr_t* frame::entry_frame_argument_at(int offset) const +--- ./ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp.orig 2009-05-25 16:36:26.879254795 +0200 ++++ ./ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp 2009-05-25 16:36:26.883255174 +0200 +@@ -43,10 +43,12 @@ { // NB ic_stub_code_size() must return the size of the code we generate Unimplemented(); @@ -122,9 +112,17 @@ 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 @@ +--- ./ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp.orig 2009-05-25 16:36:26.895255296 +0200 ++++ ./ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp 2009-05-25 16:36:26.899255329 +0200 +@@ -31,13 +31,14 @@ + + public: + static int expr_index_at(int i) +- { ++ + return stackElementWords() * i; + } + static int expr_tag_index_at(int i) { assert(TaggedStackInterpreter, "should not call this"); Unimplemented(); @@ -132,15 +130,44 @@ } static int expr_offset_in_bytes(int i) -@@ -59,4 +60,5 @@ +@@ -48,6 +49,7 @@ { 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 + + static int local_index_at(int i) +@@ -59,4 +61,5 @@ + { + assert(TaggedStackInterpreter, "should not call this"); + Unimplemented(); ++ return 0; + } +--- ./ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp.orig 2009-05-25 16:36:26.911255366 +0200 ++++ ./ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp 2009-05-25 16:36:26.915254489 +0200 +@@ -44,17 +44,20 @@ + bool is_jump() + { + Unimplemented(); ++ return false; + } + + bool is_safepoint_poll() + { + Unimplemented(); ++ return false; + } + }; + + inline NativeInstruction* nativeInstruction_at(address address) + { + Unimplemented(); ++ return NULL; + } + + class NativeCall : public NativeInstruction +@@ -67,21 +70,25 @@ address instruction_address() const { Unimplemented(); @@ -166,7 +193,7 @@ } void set_destination_mt_safe(address dest) -@@ -102,17 +106,20 @@ class NativeCall : public NativeInstruction +@@ -102,17 +109,20 @@ static bool is_call_before(address return_address) { Unimplemented(); @@ -187,7 +214,7 @@ } class NativeMovConstReg : public NativeInstruction -@@ -121,6 +128,7 @@ class NativeMovConstReg : public NativeInstruction +@@ -121,11 +131,13 @@ address next_instruction_address() const { Unimplemented(); @@ -195,7 +222,13 @@ } intptr_t data() const -@@ -137,6 +145,7 @@ class NativeMovConstReg : public NativeInstruction + { + Unimplemented(); ++ return NULL; + } + + void set_data(intptr_t x) +@@ -137,6 +149,7 @@ inline NativeMovConstReg* nativeMovConstReg_at(address address) { Unimplemented(); @@ -203,7 +236,31 @@ } class NativeMovRegMem : public NativeInstruction -@@ -195,6 +204,7 @@ class NativeJump : public NativeInstruction +@@ -145,6 +158,7 @@ + int offset() const + { + Unimplemented(); ++ return 0; + } + + void set_offset(intptr_t x) +@@ -161,6 +175,7 @@ + inline NativeMovRegMem* nativeMovRegMem_at(address address) + { + Unimplemented(); ++ return NULL; + } + + class NativeJump : public NativeInstruction +@@ -173,6 +188,7 @@ + address jump_destination() const + { + Unimplemented(); ++ return NULL; + } + + void set_jump_destination(address dest) +@@ -193,6 +209,7 @@ inline NativeJump* nativeJump_at(address address) { Unimplemented(); @@ -211,9 +268,23 @@ } 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 = +@@ -201,6 +218,7 @@ + address jump_destination() const + { + Unimplemented(); ++ return NULL; + } + + static void insert_unconditional(address code_pos, address entry) +@@ -217,4 +235,5 @@ + inline NativeGeneralJump* nativeGeneralJump_at(address address) + { + Unimplemented(); ++ return NULL; + } +--- ./ports/hotspot/src/cpu/zero/vm/register_zero.cpp.orig 2009-05-25 16:36:26.927255706 +0200 ++++ ./ports/hotspot/src/cpu/zero/vm/register_zero.cpp 2009-05-25 16:36:26.931254283 +0200 +@@ -32,8 +32,10 @@ const char* RegisterImpl::name() const { Unimplemented(); @@ -224,9 +295,9 @@ 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) +--- ./ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp.orig 2009-05-25 16:36:26.939254787 +0200 ++++ ./ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp 2009-05-25 16:36:26.943255361 +0200 +@@ -34,6 +34,7 @@ address Relocation::pd_call_destination(address orig_addr) { Unimplemented(); @@ -234,7 +305,7 @@ } void Relocation::pd_set_call_destination(address x) -@@ -44,16 +45,19 @@ void Relocation::pd_set_call_destination(address x) +@@ -44,16 +45,19 @@ address Relocation::pd_get_address_from_code() { Unimplemented(); @@ -254,9 +325,9 @@ } 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, +--- ./ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp.orig 2009-05-25 16:36:26.955255012 +0200 ++++ ./ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp 2009-05-25 16:36:26.959255651 +0200 +@@ -65,6 +65,7 @@ BasicType ret_type) { Unimplemented(); @@ -264,14 +335,7 @@ } 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 - } - +@@ -75,6 +76,7 @@ uint SharedRuntime::out_preserve_stack_slots() { Unimplemented(); @@ -279,14 +343,14 @@ } static RuntimeStub* generate_empty_runtime_stub(const char* name) -@@ -117,4 +120,5 @@ int SharedRuntime::c_calling_convention(const BasicType *sig_bt, +@@ -113,4 +115,5 @@ 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 +--- ./ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp.orig 2009-05-25 16:36:26.971254461 +0200 ++++ ./ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp 2009-05-25 16:36:26.971254461 +0200 @@ -29,19 +29,23 @@ VtableStub* VtableStubs::create_vtable_stub(int vtable_index) { @@ -311,9 +375,9 @@ 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() +--- ./ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.orig 2009-05-25 16:36:26.999254518 +0200 ++++ ./ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2009-05-25 16:36:27.003255177 +0200 +@@ -35,11 +35,13 @@ frame os::get_sender_for_C_frame(frame* fr) { Unimplemented(); @@ -327,7 +391,7 @@ } char* os::non_memory_address_word() -@@ -65,17 +67,20 @@ void os::initialize_thread() +@@ -65,17 +67,20 @@ address os::Linux::ucontext_get_pc(ucontext_t* uc) { Unimplemented(); @@ -338,7 +402,7 @@ intptr_t** ret_sp, intptr_t** ret_fp) { Unimplemented(); -+ return NULL; ++ ret_fp NULL; } frame os::fetch_frame_from_context(void* ucVoid) @@ -348,7 +412,7 @@ } extern "C" int -@@ -232,6 +237,7 @@ void os::Linux::init_thread_fpu_state(void) +@@ -231,6 +237,7 @@ int os::Linux::get_fpu_control_word() { Unimplemented(); @@ -356,7 +420,7 @@ } void os::Linux::set_fpu_control_word(int fpu) -@@ -242,6 +248,7 @@ void os::Linux::set_fpu_control_word(int fpu) +@@ -241,6 +248,7 @@ bool os::is_allocatable(size_t bytes) { Unimplemented(); @@ -364,15 +428,15 @@ } /////////////////////////////////////////////////////////////////////////////// -@@ -372,6 +379,7 @@ void os::print_context(outputStream* st, void* context) +@@ -371,6 +379,7 @@ extern "C" { int SpinPause() { -+ return 0; ++ return 0; } int SafeFetch32(int *adr, int errValue) -@@ -463,6 +471,7 @@ extern "C" { +@@ -462,6 +471,7 @@ long long unsigned int newval) { Unimplemented(); @@ -380,16 +444,3 @@ } }; #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