[7u60] RFR 8024648 : 8016131 breaks Zero port

[Alejandro E Murillo]

I just got the patch from Andrews
not sure what testing he did.
Andrew?

I'm in the process of  submitting a control job,
was planning to do the hotspot one during the submission
This is a backport from 8

Thanks
Alejandro


On 2/6/2014 4:04 PM, Vladimir Kozlov wrote:
> Did these changes pass all our builds on all platforms? I mean Hotspot 
> builds and Full forest control builds in JPRT.
>
> Thanks,
> Vladimir
>
> On 2/6/14 2:10 PM, Alejandro E Murillo wrote:
>> I  forgot to change the "subject".
>> The change is and has been approved for 7u60 (hs24.60)
>> Thanks
>>
>> Alejandro
>>
>> On 2/6/2014 3:03 PM, Alejandro E Murillo wrote:
>>>
>>> can we get 2  hotspot reviewers quickly  check this change ?
>>> thanks
>>> Alejandro
>>>
>>> -------- Original Message --------
>>> Subject:     Re: Question on 8024648 : 8016131 breaks Zero port
>>> Date:     Thu, 6 Feb 2014 16:21:29 -0500 (EST)
>>> From:     Andrew Hughes <gnu.andrew at redhat.com>
>>> To:     Alejandro E Murillo <alejandro.murillo at oracle.com>
>>> CC:     Seán Coffey <sean.coffey at oracle.com>, Omair Majid
>>> <omajid at redhat.com>, jdk7u-dev at openjdk.java.net
>>>
>>>
>>>
>>> ----- Original Message -----
>>>
>>>
>>> Here's the webrev:
>>>
>>> http://cr.openjdk.java.net/~andrew/jdk7u/8024648/
>>>
>>> My OpenJDK username is andrew (should already be included in the 
>>> commit)
>>>
>>> The changes are as follows:
>>>
>>> * Bring in defs.make to a number of makefiles which expect
>>> JVM_VARIANT_ZERO
>>> or JVM_VARIANT_ZEROSHARK to be set, but don't parse the makefile that
>>> sets
>>> it. This is a regression caused by the new build which instead sets 
>>> these
>>> via configure and $(SPEC). There is code for handling the old build
>>> (ZERO_BUILD=true) in defs.make but it isn't brought in. (see 7141246)
>>> * Update the call_wrapper function following 8024648.
>>>
>>> I've updated the bug summary to reflect that it fixes changes from both
>>> bugs, but we can split them into two separate bugs if you prefer. 
>>> Without
>>> the 7141246 fix, the build fails in seconds.
>>>
>>> With the webrev applied:
>>>
>>> $ /mnt/builder/hsx-jdk7u/j2sdk-image/bin/java -version
>>> openjdk version "1.7.0-internal"
>>> OpenJDK Runtime Environment (build
>>> 1.7.0-internal-andrew_2014_02_06_19_43-b00)
>>> OpenJDK 64-Bit Zero VM (build 24.80-b01, interpreted mode)
>>>
>>> $ /mnt/builder/hsx-jdk7u/j2sdk-image/bin/java HelloWorld
>>> Hello World
>>>
>>>
>>

-- 
Alejandro