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

[Erik Trimble]

Dalibor Topic wrote:
> Congrats, Andrew, and thanks for pushing this.
>
> I've tried to build OpenJDK 6 with the updated hotspot code, and
> noticed immediate build breakage on OpenSolaris 2009.06, due to the 
> line 361 in hotspot/make/solaris/makefiles/buildtree.make :
>
>     360 
>     361 include $(GAMMADIR)/build/solaris/makefiles/rules.make
>     362 
>
> Of course, since there is no hostpot/build directory, the build 
> fails. Curiously enough, the hsx 14 / master repository does not 
> have those lines in that makefile, so I'm puzzled how or why they
> are in the OpenJDK 6 hsx 14.
>
> Running a diff on the hotspot repo in OpenJDK 6 vs the master of
> hsx14 shows a lot of differences, mostly whitespace, but also in
> several makefiles and the THIRD_PARTY_README file, curiously enough.
>
> Are we missing some changesets in the hotspot repo?
>
> cheers,
> dalibor topic
>   

the top-level "build" directory is no longer used in hs14 and later. So, 
there looks to be an issue with the merge in the update.


I too looked at the diff between jdk6/hotspot and hsx14/master, and I 
didn't get through everything. Lots and lots of whitespace difference 
(which is annoying, but not critical). 


It looks like these lines need to be removed in the jdk6/hotspot repo:

make/linux/makefiles/buildtree.make

      349 include $(GAMMADIR)/make/linux/makefiles/rules.make

      350 

      351 Queens.class: $(GAMMADIR)/build/test/Queens.java

      352 	$(RM) -f $@

      353 	$(REMOTE) $(COMPILE.JAVAC) -d . $<


make/solaris/makefiles/buildtree.make

      361 include $(GAMMADIR)/build/solaris/makefiles/rules.make

      362 

      363 Queens.class: $(GAMMADIR)/build/test/Queens.java

      364 	$(RM) -f $@

      365 	$(REMOTE) $(COMPILE.JAVAC) -d . $<



-- 
Erik Trimble
Java System Support
Mailstop:  usca22-123
Phone:  x17195
Santa Clara, CA