[MERGE FOR REVIEW] HotSpot 23.25-b01 Merge

[Andrew Haley]

On 09/12/2013 10:15 PM, Alex Kasko wrote:
> On 09/12/2013 09:20 PM, Andrew Hughes wrote:
>>
>>
>> ----- Original Message -----
>>> On 09/12/2013 10:06 AM, Andrew Hughes wrote:
>>>> Enjoy:
>>>>
>>>> http://cr.openjdk.java.net/~andrew/jdk6-hs23-merge/
>>>
>>> I tried to apply the patch linked in the webrev, but it fails to apply.
>>> The patch contains changes like [1] part of which are already present in
>>> jdk6/hotspot [2]. I am not sure if this is a bug in webrev, but it's
>>> rather difficult for me to examine the changes without applying the patch.
>>>
>>> Thanks,
>>> Omair
>>>
>>>
>>> [1] http://cr.openjdk.java.net/~andrew/jdk6-hs23-merge/.hgignore.patch
>>> [2] http://hg.openjdk.java.net/jdk6/jdk6/hotspot/file/f5eac6fae49e/.hgignore
>>>
>>> --
>>> PGP Key: 66484681 (http://pgp.mit.edu/)
>>> Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681
>>>
>>
>> Try this.  It's a direct export of the merge changeset instead.  I don't know what
>> webrev used but the differences are huge.
>>
>> http://cr.openjdk.java.net/~andrew/jdk6-hs23-merge/real_thing.patch
>>
> Tried it on windows-i586 - I propose this patch [1] (alt link [2], 
> description [3]) to be included.
> 
> I'm not sure whether it will be enough (patched build is in progress 
> now), but windows build will definitely fail without this patch due to 
> VS2003 limitations.

OK, thanks.  We'll put it in as long as it doesn't break anything else,
but we'd be grateful if you could check out the resulting build.

Andrew.