Hi Andrew, On Mon, 2006-02-27 at 21:42 +0000, Andrew John Hughes wrote: > On Mon, 2006-02-27 at 17:54 +0100, Mark Wielaard wrote: > > - Remerge CVS trunk with the generics branch > > (I don't know whether Andrew has had time for that since his Math > > work. Please yell and scream if you need help with this Andrew.) > > It's mostly there. I expected to have it in during the weekend, but the > merge included a few classes that differ significantly between the > branches and had to be merged manually (e.g. the Character changes, > changes to the collection classes).
Thank you! There are also the two divergences that I introduced during the last release (EventSetDescriptor and Hashtable) http://lists.gnu.org/archive/html/classpath-patches/2006-01/msg00254.html And which I never cleaned up... Apologies. Again, please say if you need/want any help. > It then just needs to be brought up to date with the patches inbetween > Saturday and the point where the release is called. Roman wanted some more time to stabilize so lets just pick Saturday as the day we "freeze" (meaning, when the release branch is created). Then only patches going on this "release-branch" should also be added to the generics branch (I can take care of this). > > - Make builder produce a real classpath-generics dist again. > > (I'll try to take a look at that tonight.) > > Would be great to see that. Done. But in a bit hacky way. We have a regression in gcj-svn-trunk it seems. Running the build under gdb show our friend doubleParse() again: Program received signal SIGSEGV, Segmentation fault. [Switching to Thread -1236678656 (LWP 15045)] _Jv_lshift (ptr=0xbfffdb74, b=0xbfffde68, k=1073257029) at ../../../../../../trunk/libjava/classpath/native/fdlibm/mprec.c:469 469 *x1++ = 0; (gdb) bt #0 _Jv_lshift (ptr=0xbfffdb74, b=0xbfffde68, k=1073257029) at ../../../../../../trunk/libjava/classpath/native/fdlibm/mprec.c:469 #1 0xb789183a in _Jv_strtod_r (ptr=0xbfffdb74, s00=0xbfffdac0 "1.570796251296997", se=0xbfffe4cc) at ../../../../../../trunk/libjava/classpath/native/fdlibm/strtod.c:479 #2 0xb6efd82a in java::lang::VMDouble::parseDouble (str=0x0) at ../../../trunk/libjava/java/lang/natDouble.cc:209 #3 0x00000000 in ?? () For now I just installed a "fake" ecj under /usr/local that just uses the gij-4.0 as runtime. Unfortunately gcj-4.0 is unable to compile to native (either from source or from byte-code), both issues (accessing inner-class-super-fields and the gcj-byte-code-verifier) seem to be fixed in gcj-4.1, but that hasn't been released yet. I'll install 4.1 on builder when it is actually officially released and will then try to create a new native-ecj binary again. Cheers, Mark
signature.asc
Description: This is a digitally signed message part
