[8u] RFR: Revert differences against upstream 8u

[Andrew Hughes]

On 20:14 Wed 17 Feb     , Aleksey Shipilev wrote:
> Hi,
> 
> After Andrew's integration of 8u AArch64 port to
> aarch64-port/jdk8u-shenandoah, I took our autogenerated webrev [1] that is
> supposed to only include Shenandoah at this point, and eliminated obvious
> differences against t8u that we accrued over the years.
> 
> Here:
>  https://cr.openjdk.java.net/~shade/shenandoah/8u-post-aarch64-cleanup-1/webrev.01/
> 
> Testing: Linux x86_64 hotspot_gc_shenandoah; Linux aarch64 build
> 
> -- 
> Thanks,
> -Aleksey
> 
> [1] https://builds.shipilev.net/patch-openjdk-jdk8-aarch64/hotspot/
> 

Thanks for doing this. I'm surprised (and rather scared) by how many there
are. Most seem to be whitespace, thankfully. Do you have any idea how old
the differences are? I'm wondering if there are issues with our current merge
process, or whether these date back as long as the Windows one we spoke about
yesterday.

One change does stand out:

diff --git a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
--- a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
+++ b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
@@ -1720,7 +1720,7 @@
       __ biased_locking_enter(lock_reg, obj_reg, swap_reg, tmp, false, lock_done, &slow_path_lock);
     }
 
-    // Load (object->mark() | 1) into swap_reg r0
+    // Load (object->mark() | 1) into swap_reg %r0
     __ ldr(rscratch1, Address(obj_reg, 0));
     __ orr(swap_reg, rscratch1, 1);

The removal of the '%' is the more recent change, done by Andrew Haley
when adding AArch64 Shenandoah support.  Is it not upstream that is
behind here? That's why I left this when merging 8u292-b01.

Rest looks good.

Thanks,
-- 
Andrew :)

Senior Free Java Software Engineer
OpenJDK Package Owner
Red Hat, Inc. (http://www.redhat.com)

PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222