merging of Hotspot with MIPS support

[Xerxes Rånby]

On 2011-04-27 03:32, Yongqiang Yang wrote:
> On Tue, Apr 26, 2011 at 4:24 PM, Xerxes Rånby <xerxes at zafena.se> wrote:
>> Hi Yongqiang!
>>
>> On 2011-04-25 04:47, Yongqiang Yang wrote:
>>>
>>> Hi guys,
>>>
>>> We have ported Hotspot client to MIPS compatible processors, and code
>>> can be got from  http://icedtea.classpath.org/hg/openjdk6-mips/.
>>
>> The MIPS ports looks like it are based on OpenJDK6 and Hotspot hs14, the
>> same hotspot used in the IcedTea6-1.8 release.
>>
>>
>>> I want to know how to merge the code to Icedtea.  Is there a site
>>> which describes the steps we should take and what's the requirements?
>>
>> In order to merge the MIPS port with IcedTea6 you will have to update the
>> MIPS port to be compatible with the same hotspot used by IcedTea6 HEAD.
>>
>> The IcedTea6-1.8 release branch uses the same hotspot version hs14 as the
>> MIPS port so a merge at this point are easy but its too late to go in
>> because the release branches do not accept new features.
>>
>> The IcedTea6-1.9 release uses hotspot version hs17.
>> The IcedTea6-1.10 release uses hotspot version hs19.
>> The next IcedTea6-1.11 release are currently based on hs20, HEAD.
>>
>> For a merge to happen its required to update the MIPS port to hs20 and merge
>> it against the current development HEAD at:
>> http://icedtea.classpath.org/hg/icedtea6
>>
>> You can track when the release branches forked from the IcedTea6 tag list:
>> http://icedtea.classpath.org/hg/icedtea6/tags
>>
>> I suggest you start by first checkout the IcedTea6-1.8 branch-point
>> http://icedtea.classpath.org/hg/icedtea6/rev/9420faca6468
>> and merge at this point.
>>
>> Then pull in the IcedTea6-1.9 branch-point merge and fix any issues when
>> using hs17.
>> Then pull in the IcedTea6-1.10 branch-point merge and fix any issues when
>> using hs19.
>> Then pull in the IcedTea6 developement HEAD, merge and fix any issues when
>> using hs20.
>>
>> When this are done please send in a patch.
> Thank you very much.  I will do as you suggested.

The IcedTea6 tree are organized a bit differently compared to the upstream openjdk src trees.
As you probably have noticed the IcedTea6 tree mostly contain build scrips and patches against the upstream openjdk/hotspot trees.
Files that are not available upstream are maintained in the various icedtea6/subdirectorys.

I suggest you to create a icedtea6/mips_port subdirectory and inside put all new mips hotspot files in there.
Then add mips_port to EXTRA_DIST in the Makefile.am file.
This will make a copy of all files inside this mips_port dir to be placed on top of the downloaded openjdk tree during the build.

Any mips changes made to the existing upstream openjdk src tree needs to be turned into a patch and places at icedtea6/patches/mips.patch
Then add patches/mips.patch to ICEDTEA_PATCHES in the Makefile.am file.


To perform a build using icedtea then run:
./autogen.sh
mkdir build
cd build
../configure
make

> 
> Cheers,
> Yongqiang.
>>
>> Cheers
>> Xerxes