Differences between OpenJDK 6 hotspot tip and hsx14/master tip (Was: hg: jdk6/jdk6/hotspot: 557 new changesets)

[Dalibor Topic]

Andrew John Hughes wrote:
> I guess it was inevitable a change of this size wouldn't go through
> without problems, even though both myself and Joe have been through
> it. 

Stuff happens. ;)

> I verified the GNU/Linux build but, being unable to do either a
> Solaris or Windows build with Free tools, I haven't been able to
> verify those.

>From what I could see in the history, the reason why your 
build worked on Linux is this 'Merge' changeset:

http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/327aeae2236a

It's hard to say where it was merged from, though the 'minimal
tweak to makefile' idea was something I tried with OpenSolaris
first, too, before I wrote to the list. In the proposed patch,
I picked the 'just drop unused lines' approach Erik suggested,
though, which removes the differences between the merged and
original makefiles in this case.

There is a bunch of other small differences between the original hsx 14
code and the merged code beside the whitespace changes. I'd prefer to 
see a whitespace cleanup patch first, before we go into the remaining 
deltas - like Martin, I'd like to see the OpenJDK 6 hotspot code as
close as possible to the 'upstream' repository, so that any additional 
deltas stand out easily.

cheers,
dalibor topic
--  
*******************************************************************
Dalibor Topic                   Tel: (+49 40) 23 646 738
Java F/OSS Ambassador           AIM: robiladonaim
Sun Microsystems GmbH           Mobile: (+49 177) 2664 192
Nagelsweg 55                    http://openjdk.java.net
D-20097 Hamburg                 mailto:Dalibor.Topic at sun.com
Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten
Amtsgericht München: HRB 161028
Geschäftsführer: Thomas Schröder, Wolfgang Engels, Wolf Frenkel
Vorsitzender des Aufsichtsrates: Martin Häring