Missing aarch64 changes in hs due to mismerge from hs-comp to hs

Andrew Haley aph at redhat.com
Fri Apr 22 17:02:10 UTC 2016

On 04/22/2016 05:56 PM, S. Bharadwaj Yadavalli wrote:
> As part of the hs-comp to hs push I did yesterday, it appears that I 
> have mismerged the following  conflicting pushes to
> src/cpu/aarch64/vm/macroAssembler_aarch64.hpp done on hs tree and 
> hs-comp tree.
> Fix for 8153310 
> (http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/a07a10329f31) pushed to hs
> Fix for 8153713 
> (http://hg.openjdk.java.net/jdk9/hs-comp/hotspot/rev/f9545cf437eb) 
> pushed to hs-comp
> Fix for 8153797 
> (http://hg.openjdk.java.net/jdk9/hs-comp/hotspot/rev/d4636cc092db) 
> pushed to hs-comp
> I picked the version in hs repo and overrode the changes from hs-comp.
> I think the next push up to hs should consider merging both the changes 
> in hs as well as in hs-comp.

OK.  I think that the bustage is relatively minor.  The AArch64 port
is broken anyway at the moment because of one of the security patches.
I'll fix it.


More information about the hotspot-compiler-dev mailing list