Update to aarch64-shenandoah-jdk8u252-b06.

Drop upstreamed AArch64 fix JDK-8224851

.gitignore

@@ -173,3 +173,4 @@
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b03-4curve.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b04-4curve.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b05-4curve.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b06-4curve.tar.xz

java-1.8.0-openjdk.spec

@@ -229,7 +229,7 @@
 # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
 %global shenandoah_project	aarch64-port
 %global shenandoah_repo		jdk8u-shenandoah
-%global shenandoah_revision    	aarch64-shenandoah-jdk8u252-b05
+%global shenandoah_revision    	aarch64-shenandoah-jdk8u252-b06
 # Define old aarch64/jdk8u tree variables for compatibility
 %global project         %{shenandoah_project}
 %global repo            %{shenandoah_repo}
@@ -1156,9 +1156,6 @@ Patch105: jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac
 Patch106: pr3519-fix_further_functions_with_a_missing_return_value.patch
 # S390 ambiguous log2_intptr calls
 Patch107: s390-8214206_fix.patch
-# JDK-8224851: AArch64: fix warnings and errors with Clang and GCC 8.3
-# GCC 10 fix for redeclaration
-Patch120: jdk8224851-aarch64_fix_warnings_and_errors_GCC_8_3.patch
 
 #############################################
 #
@@ -1550,7 +1547,6 @@ sh %{SOURCE12}
 
 # AArch64 fixes
 %patch106
-%patch120
 
 # x86 fixes
 %patch105
@@ -2236,6 +2232,10 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Thu Jun 11 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.252.b06-0.0.ea
+- Update to aarch64-shenandoah-jdk8u252-b06.
+- Drop upstreamed AArch64 fix JDK-8224851
+
 * Wed Jun 10 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.252.b05-0.0.ea
 - Update to aarch64-shenandoah-jdk8u252-b05.
 

jdk8224851-aarch64_fix_warnings_and_errors_GCC_8_3.patch

@@ -1,296 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1580791377 0
-#      Tue Feb 04 04:42:57 2020 +0000
-# Node ID d76a1de48f87fb7c08e401920dca0aac2e7567ea
-# Parent  6ead1e97a4ea437c51829394f76dc2de7b5ea033
-8224851: AArch64: fix warnings and errors with Clang and GCC 8.3
-Reviewed-by: shade, aph, sgehwolf
-
-diff --git openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
---- openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
-+++ openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
-@@ -12928,7 +12928,7 @@
-   format %{ "fcmps $src1, 0.0" %}
- 
-   ins_encode %{
--    __ fcmps(as_FloatRegister($src1$$reg), 0.0D);
-+    __ fcmps(as_FloatRegister($src1$$reg), 0.0);
-   %}
- 
-   ins_pipe(pipe_class_compare);
-@@ -12957,7 +12957,7 @@
-   format %{ "fcmpd $src1, 0.0" %}
- 
-   ins_encode %{
--    __ fcmpd(as_FloatRegister($src1$$reg), 0.0D);
-+    __ fcmpd(as_FloatRegister($src1$$reg), 0.0);
-   %}
- 
-   ins_pipe(pipe_class_compare);
-@@ -13033,7 +13033,7 @@
-     Label done;
-     FloatRegister s1 = as_FloatRegister($src1$$reg);
-     Register d = as_Register($dst$$reg);
--    __ fcmps(s1, 0.0D);
-+    __ fcmps(s1, 0.0);
-     // installs 0 if EQ else -1
-     __ csinvw(d, zr, zr, Assembler::EQ);
-     // keeps -1 if less or unordered else installs 1
-@@ -13060,7 +13060,7 @@
-     Label done;
-     FloatRegister s1 = as_FloatRegister($src1$$reg);
-     Register d = as_Register($dst$$reg);
--    __ fcmpd(s1, 0.0D);
-+    __ fcmpd(s1, 0.0);
-     // installs 0 if EQ else -1
-     __ csinvw(d, zr, zr, Assembler::EQ);
-     // keeps -1 if less or unordered else installs 1
-diff --git openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp
---- openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp
-@@ -281,7 +281,7 @@
-   unsigned get(int msb = 31, int lsb = 0) {
-     int nbits = msb - lsb + 1;
-     unsigned mask = ((1U << nbits) - 1) << lsb;
--    assert_cond(bits & mask == mask);
-+    assert_cond((bits & mask) == mask);
-     return (insn & mask) >> lsb;
-   }
- 
-diff --git openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
---- openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
-@@ -1,6 +1,6 @@
- /*
-  * Copyright (c) 2013, Red Hat Inc.
-- * Copyright (c) 2000, 2012, Oracle and/or its affiliates.
-+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates.
-  * All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-@@ -1129,8 +1129,8 @@
-       // Assembler::EQ does not permit unordered branches, so we add
-       // another branch here.  Likewise, Assembler::NE does not permit
-       // ordered branches.
--      if (is_unordered && op->cond() == lir_cond_equal 
--	  || !is_unordered && op->cond() == lir_cond_notEqual)
-+      if ((is_unordered && op->cond() == lir_cond_equal) 
-+	  || (!is_unordered && op->cond() == lir_cond_notEqual))
- 	__ br(Assembler::VS, *(op->ublock()->label()));
-       switch(op->cond()) {
-       case lir_cond_equal:        acond = Assembler::EQ; break;
-@@ -1850,18 +1850,22 @@
-     switch (code) {
-     case lir_add: __ fadds (dest->as_float_reg(), left->as_float_reg(), right->as_float_reg()); break;
-     case lir_sub: __ fsubs (dest->as_float_reg(), left->as_float_reg(), right->as_float_reg()); break;
-+    case lir_mul_strictfp: // fall through
-     case lir_mul: __ fmuls (dest->as_float_reg(), left->as_float_reg(), right->as_float_reg()); break;
-+    case lir_div_strictfp: // fall through
-     case lir_div: __ fdivs (dest->as_float_reg(), left->as_float_reg(), right->as_float_reg()); break;
-     default:
-       ShouldNotReachHere();
-     }
-   } else if (left->is_double_fpu()) {
-     if (right->is_double_fpu()) {
--      // cpu register - cpu register
-+      // fpu register - fpu register
-       switch (code) {
-       case lir_add: __ faddd (dest->as_double_reg(), left->as_double_reg(), right->as_double_reg()); break;
-       case lir_sub: __ fsubd (dest->as_double_reg(), left->as_double_reg(), right->as_double_reg()); break;
-+      case lir_mul_strictfp: // fall through
-       case lir_mul: __ fmuld (dest->as_double_reg(), left->as_double_reg(), right->as_double_reg()); break;
-+      case lir_div_strictfp: // fall through
-       case lir_div: __ fdivd (dest->as_double_reg(), left->as_double_reg(), right->as_double_reg()); break;
-       default:
- 	ShouldNotReachHere();
-diff --git openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp
---- openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp
-@@ -1,6 +1,6 @@
- /*
-  * Copyright (c) 2013, Red Hat Inc.
-- * Copyright (c) 2005, 2011, Oracle and/or its affiliates.
-+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates.
-  * All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-@@ -500,7 +500,7 @@
-     tmp = new_register(T_DOUBLE);
-   }
- 
--  arithmetic_op_fpu(x->op(), reg, left.result(), right.result(), NULL);
-+  arithmetic_op_fpu(x->op(), reg, left.result(), right.result(), x->is_strictfp());
- 
-   set_result(x, round_item(reg));
- }
-diff --git openjdk/hotspot/src/cpu/aarch64/vm/frame_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/frame_aarch64.cpp
---- openjdk/hotspot/src/cpu/aarch64/vm/frame_aarch64.cpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/frame_aarch64.cpp
-@@ -1,6 +1,6 @@
- /*
-  * Copyright (c) 2013, Red Hat Inc.
-- * Copyright (c) 1997, 2012, Oracle and/or its affiliates.
-+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates.
-  * All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-@@ -819,11 +819,13 @@
- 
- extern "C" void pf(unsigned long sp, unsigned long fp, unsigned long pc,
- 		   unsigned long bcx, unsigned long thread) {
--  RegisterMap map((JavaThread*)thread, false);
-   if (!reg_map) {
--    reg_map = (RegisterMap*)os::malloc(sizeof map, mtNone);
-+    reg_map = NEW_C_HEAP_OBJ(RegisterMap, mtNone);
-+    ::new (reg_map) RegisterMap((JavaThread*)thread, false);
-+  } else {
-+    *reg_map = RegisterMap((JavaThread*)thread, false);
-   }
--  memcpy(reg_map, &map, sizeof map);
-+
-   {
-     CodeBlob *cb = CodeCache::find_blob((address)pc);
-     if (cb && cb->frame_size())
-diff --git openjdk/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp openjdk/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp
---- openjdk/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp
-@@ -40,8 +40,6 @@
-  protected:
- 
-  protected:
--  using MacroAssembler::call_VM_leaf_base;
--
-   // Interpreter specific version of call_VM_base
-   using MacroAssembler::call_VM_leaf_base;
- 
-diff --git openjdk/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
---- openjdk/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
-@@ -2460,7 +2460,7 @@
-   if ((offset & (size-1)) && offset >= (1<<8)) {
-     add(tmp, base, offset & ((1<<12)-1));
-     base = tmp;
--    offset &= -1<<12;
-+    offset &= -1u<<12;
-   }
- 
-   if (offset >= (1<<12) * size) {
-diff --git openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
---- openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
-@@ -158,7 +158,7 @@
-   if (FILE *f = fopen("/proc/cpuinfo", "r")) {
-     char buf[128], *p;
-     while (fgets(buf, sizeof (buf), f) != NULL) {
--      if (p = strchr(buf, ':')) {
-+      if ((p = strchr(buf, ':')) != NULL) {
-         long v = strtol(p+1, NULL, 0);
-         if (strncmp(buf, "CPU implementer", sizeof "CPU implementer" - 1) == 0) {
-           _cpu = v;
-diff --git openjdk/hotspot/src/os_cpu/linux_aarch64/vm/copy_linux_aarch64.s openjdk/hotspot/src/os_cpu/linux_aarch64/vm/copy_linux_aarch64.s
---- openjdk/hotspot/src/os_cpu/linux_aarch64/vm/copy_linux_aarch64.s
-+++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/copy_linux_aarch64.s
-@@ -248,7 +248,7 @@
-         blo     bwd_copy_drain
- 
- bwd_copy_again:
--        prfm    pldl1keep, [s, #-256]
-+        prfum   pldl1keep, [s, #-256]
-         stp     t0, t1, [d, #-16]
-         ldp     t0, t1, [s, #-16]
-         stp     t2, t3, [d, #-32]
-diff --git openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
---- openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
-@@ -76,12 +76,10 @@
- 
- #define REG_FP 29
- 
--#define SPELL_REG_SP "sp"
--#define SPELL_REG_FP "x29"
-+#define NOINLINE __attribute__ ((noinline))
- 
--address os::current_stack_pointer() {
--  register void *esp __asm__ (SPELL_REG_SP);
--  return (address) esp;
-+NOINLINE address os::current_stack_pointer() {
-+  return (address)__builtin_frame_address(0);
- }
- 
- char* os::non_memory_address_word() {
-@@ -155,14 +153,8 @@
-   return frame(fr->link(), fr->link(), fr->sender_pc());
- }
- 
--intptr_t* _get_previous_fp() {
--  register intptr_t **ebp __asm__ (SPELL_REG_FP);
--  return (intptr_t*) *ebp;   // we want what it points to.
--}
--
--
--frame os::current_frame() {
--  intptr_t* fp = _get_previous_fp();
-+NOINLINE frame os::current_frame() {
-+  intptr_t *fp = *(intptr_t **)__builtin_frame_address(0);
-   frame myframe((intptr_t*)os::current_stack_pointer(),
-                 (intptr_t*)fp,
-                 CAST_FROM_FN_PTR(address, os::current_frame));
-@@ -176,12 +168,6 @@
- 
- // Utility functions
- 
--// From IA32 System Programming Guide
--enum {
--  trap_page_fault = 0xE
--};
--
--
- // An operation in Unsafe has faulted.  We're going to return to the
- // instruction after the faulting load or store.  We also set
- // pending_unsafe_access_error so that at some point in the future our
-@@ -607,12 +593,12 @@
- 
-   void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
-     if (from > to) {
--      jshort *end = from + count;
-+      const jshort *end = from + count;
-       while (from < end)
-         *(to++) = *(from++);
-     }
-     else if (from < to) {
--      jshort *end = from;
-+      const jshort *end = from;
-       from += count - 1;
-       to   += count - 1;
-       while (from >= end)
-@@ -621,12 +607,12 @@
-   }
-   void _Copy_conjoint_jints_atomic(jint* from, jint* to, size_t count) {
-     if (from > to) {
--      jint *end = from + count;
-+      const jint *end = from + count;
-       while (from < end)
-         *(to++) = *(from++);
-     }
-     else if (from < to) {
--      jint *end = from;
-+      const jint *end = from;
-       from += count - 1;
-       to   += count - 1;
-       while (from >= end)
-@@ -635,12 +621,12 @@
-   }
-   void _Copy_conjoint_jlongs_atomic(jlong* from, jlong* to, size_t count) {
-     if (from > to) {
--      jlong *end = from + count;
-+      const jlong *end = from + count;
-       while (from < end)
-         os::atomic_copy64(from++, to++);
-     }
-     else if (from < to) {
--      jlong *end = from;
-+      const jlong *end = from;
-       from += count - 1;
-       to   += count - 1;
-       while (from >= end)

sources

@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b05-4curve.tar.xz) = 5aa22289f50969617a26c9f50784c1c32a6579703414970a012b321fa587a996b133d4568d3d4b85ab081d33675754bdb4f70c04a82f9e792a061a58a38c0e88
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b06-4curve.tar.xz) = 8fa3dffea5fde48d2c2ef6de2ebdc7292a2439d5792c407e656a0755aebef0818c0626a841861c0dca34da2f2df34968fc6d187e0fc1e7b49ec5e5c2580e176e