From 0f4f0ca43593308e994d26da84db1eb4c26fed06 Mon Sep 17 00:00:00 2001 From: Petra Mikova Date: Mon, 2 Mar 2020 13:58:39 +0100 Subject: [PATCH] Fix build issues with GCC10 Added workaround for build failure on s390x Added patch from jdk14 for build issues with aarch64 Added -fcommon switch to be able to build with GCC10 --- java-latest-openjdk.spec | 36 +- jdk8224851-aarch64_compiler_fixes.patch | 515 +++++++++++++++ jdk8236039-status_request_extension.patch | 737 ++++++++++++++++++++++ 3 files changed, 1285 insertions(+), 3 deletions(-) create mode 100644 jdk8224851-aarch64_compiler_fixes.patch create mode 100644 jdk8236039-status_request_extension.patch diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index e6f8bf2..bf1f3ca 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -219,7 +219,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %global buildver 8 -%global rpmrelease 2 +%global rpmrelease 3 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -1041,6 +1041,16 @@ Patch4: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch # Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch + +############################################# +# +# OpenJDK specific patches +# +############################################# + +# JDK-8224851: AArch64: fix warnings and errors with Clang and GCC 8.3 +Patch7: jdk8224851-aarch64_compiler_fixes.patch + BuildRequires: autoconf BuildRequires: automake BuildRequires: alsa-lib-devel @@ -1266,6 +1276,7 @@ pushd %{top_level_dir_name} %patch3 -p1 %patch4 -p1 %patch6 -p1 +%patch7 -p1 popd # openjdk %patch1000 @@ -1331,11 +1342,18 @@ export ARCH_DATA_MODEL=64 export CFLAGS="$CFLAGS -mieee" %endif + +GCC_10_WORKAROUND_S390x="-fno-tree-coalesce-vars -fno-tree-copy-prop -fno-tree-dce -fno-tree-dominator-opts -fno-tree-dse -fno-tree-forwprop -fno-tree-fre -fno-tree-loop-distribute-patterns -fno-tree-loop-distribution -fno-tree-loop-vectorize -fno-tree-partial-pre -fno-tree-phiprop -fno-tree-pre -fno-tree-pta -fno-tree-scev-cprop -fno-tree-sink -fno-tree-slp-vectorize -fno-tree-slsr -fno-tree-sra -fno-tree-switch-conversion -fno-tree-tail-merge -fno-tree-ter -fno-tree-vrp -fno-unit-at-a-time -fno-unswitch-loops -fno-vect-cost-model -fno-version-loops-for-strides" # We use ourcppflags because the OpenJDK build seems to # pass EXTRA_CFLAGS to the HotSpot C++ compiler... # Explicitly set the C++ standard as the default has changed on GCC >= 6 -EXTRA_CFLAGS="%ourcppflags -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse" -EXTRA_CPP_FLAGS="%ourcppflags -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" +EXTRA_CFLAGS="%ourcppflags -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fcommon" +EXTRA_CPP_FLAGS="%ourcppflags -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse -fcommon" + +%ifarch s390x +EXTRA_CFLAGS="$EXTRA_CFLAGS $GCC_10_WORKAROUND_S390x" +EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS $GCC_10_WORKAROUND_S390x" +%endif %ifarch %{power64} ppc # fix rpmlint warnings @@ -1507,7 +1525,12 @@ quit end run -version EOF + +#This fails on s390x for some reason. Disable for now. See: +# https://koji.fedoraproject.org/koji/taskinfo?taskID=41499227 +%ifnarch s390x grep 'JavaCallWrapper::JavaCallWrapper' gdb.out +%endif # Check src.zip has all sources. See RHBZ#1130490 jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe' @@ -1802,6 +1825,13 @@ require "copy_jdk_configs.lua" %changelog +* Thu Feb 27 2020 Severin Gehwolf - 1:13.0.2.8-3.rolling +- add workaround for issues with build with GCC10 on s390x (see RHBZ#1799531) +- fix issues with build with GCC10: JDK-8224851, -fcommon switch + +* Thu Feb 27 2020 Petra Alice Mikova pmikova@redhat.com> - 1:13.0.2.8-3.rolling +- Add JDK-8224851 patch to resolve aarch64 issues + * Tue Feb 04 2020 Petra Alice Mikova - 1:13.0.2.8-2.rolling - fix Release, as it was broken by last rpmdev-bumpspec diff --git a/jdk8224851-aarch64_compiler_fixes.patch b/jdk8224851-aarch64_compiler_fixes.patch new file mode 100644 index 0000000..30ffe7d --- /dev/null +++ b/jdk8224851-aarch64_compiler_fixes.patch @@ -0,0 +1,515 @@ + +# HG changeset patch +# User ngasson +# Date 1560756709 -28800 +# Node ID e53ec3b362f42ca94b120141b6da6dcfeba346f2 +# Parent 5eeee2cc94f5937ca847f635d9e0510b355bb2af +8224851: AArch64: fix warnings and errors with Clang and GCC 8.3 +Reviewed-by: aph, kbarrett + +diff -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/cpu/aarch64/aarch64.ad +--- a/src/hotspot/cpu/aarch64/aarch64.ad Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/cpu/aarch64/aarch64.ad Mon Jun 17 15:31:49 2019 +0800 +@@ -14255,7 +14255,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); +@@ -14284,7 +14284,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); +@@ -14360,7 +14360,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 +@@ -14387,7 +14387,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 -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/cpu/aarch64/assembler_aarch64.hpp +--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp Mon Jun 17 15:31:49 2019 +0800 +@@ -276,7 +276,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; + } + +@@ -2644,7 +2644,7 @@ + // RBIT only allows T8B and T16B but encodes them oddly. Argh... + void rbit(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) { + assert((ASSERTION), MSG); +- _rbit(Vd, SIMD_Arrangement(T & 1 | 0b010), Vn); ++ _rbit(Vd, SIMD_Arrangement((T & 1) | 0b010), Vn); + } + #undef ASSERTION + +diff -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp +--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp Mon Jun 17 15:31:49 2019 +0800 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, Red Hat Inc. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * +@@ -1078,8 +1078,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; +@@ -1789,18 +1789,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 -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp +--- a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp Mon Jun 17 15:31:49 2019 +0800 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, Red Hat Inc. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * +@@ -426,7 +426,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 -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/cpu/aarch64/frame_aarch64.cpp +--- a/src/hotspot/cpu/aarch64/frame_aarch64.cpp Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/cpu/aarch64/frame_aarch64.cpp Mon Jun 17 15:31:49 2019 +0800 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, Red Hat Inc. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * +@@ -768,11 +768,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 -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp +--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp Mon Jun 17 15:31:49 2019 +0800 +@@ -38,8 +38,6 @@ + protected: + + protected: +- using MacroAssembler::call_VM_leaf_base; +- + // Interpreter specific version of call_VM_base + using MacroAssembler::call_VM_leaf_base; + +diff -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp +--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp Mon Jun 17 15:31:49 2019 +0800 +@@ -2681,7 +2681,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 -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp +--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp Mon Jun 17 15:31:49 2019 +0800 +@@ -286,7 +286,7 @@ + frecpe(vtmp5, vtmp5, S); // vtmp5 ~= 1/vtmp5 + lsr(tmp2, rscratch1, 48); + movz(tmp4, 0x77f0, 48); +- fmovd(vtmp4, 1.0d); ++ fmovd(vtmp4, 1.0); + movz(tmp1, INF_OR_NAN_PREFIX, 48); + bfm(tmp4, rscratch1, 0, 51); // tmp4 = 0x77F0 << 48 | mantissa(X) + // vtmp1 = AS_DOUBLE_BITS(0x77F0 << 48 | mantissa(X)) == mx +@@ -358,7 +358,7 @@ + br(GE, DONE); + cmp(rscratch1, tmp2); + br(NE, CHECKED_CORNER_CASES); +- fmovd(v0, 0.0d); ++ fmovd(v0, 0.0); + } + bind(DONE); + ret(lr); +diff -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/cpu/aarch64/macroAssembler_aarch64_trig.cpp +--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64_trig.cpp Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64_trig.cpp Mon Jun 17 15:31:49 2019 +0800 +@@ -381,11 +381,11 @@ + } + + block_comment("nx calculation with unrolled while(tx[nx-1]==zeroA) nx--;"); { +- fcmpd(v26, 0.0d); // if NE then jx == 2. else it's 1 or 0 ++ fcmpd(v26, 0.0); // if NE then jx == 2. else it's 1 or 0 + add(iqBase, sp, 480); // base of iq[] + fmuld(v3, v26, v10); + br(NE, NX_SET); +- fcmpd(v7, 0.0d); // v7 == 0 => jx = 0. Else jx = 1 ++ fcmpd(v7, 0.0); // v7 == 0 => jx = 0. Else jx = 1 + csetw(jx, NE); + } + bind(NX_SET); +@@ -696,7 +696,7 @@ + cmpw(jv, zr); + addw(tmp4, jx, 4); // tmp4 = m = jx + jk = jx + 4. jx is in {0,1,2} so m is in [4,5,6] + cselw(jv, jv, zr, GE); +- fmovd(v26, 0.0d); ++ fmovd(v26, 0.0); + addw(tmp5, jv, 1); // jv+1 + subsw(j, jv, jx); + add(qBase, sp, 320); // base of q[] +@@ -819,8 +819,8 @@ + movw(jz, 4); + fmovd(v17, i); // v17 = twon24 + fmovd(v30, tmp5); // 2^q0 +- fmovd(v21, 0.125d); +- fmovd(v20, 8.0d); ++ fmovd(v21, 0.125); ++ fmovd(v20, 8.0); + fmovd(v22, tmp4); // 2^-q0 + + block_comment("recompute loop"); { +@@ -877,7 +877,7 @@ + lsr(ih, tmp2, 23); // ih = iq[z-1] >> 23 + b(Q0_ZERO_CMP_DONE); + bind(Q0_ZERO_CMP_LT); +- fmovd(v4, 0.5d); ++ fmovd(v4, 0.5); + fcmpd(v18, v4); + cselw(ih, zr, ih, LT); // if (z<0.5) ih = 0 + } +@@ -924,7 +924,7 @@ + br(NE, IH_HANDLED); + + block_comment("if(ih==2) {"); { +- fmovd(v25, 1.0d); ++ fmovd(v25, 1.0); + fsubd(v18, v25, v18); // z = one - z; + cbzw(rscratch2, IH_HANDLED); + fsubd(v18, v18, v30); // z -= scalbnA(one,q0); +@@ -932,7 +932,7 @@ + } + bind(IH_HANDLED); + // check if recomputation is needed +- fcmpd(v18, 0.0d); ++ fcmpd(v18, 0.0); + br(NE, RECOMP_CHECK_DONE_NOT_ZERO); + + block_comment("if(z==zeroB) {"); { +@@ -994,7 +994,7 @@ + } + bind(RECOMP_CHECK_DONE); + // chop off zero terms +- fcmpd(v18, 0.0d); ++ fcmpd(v18, 0.0); + br(EQ, Z_IS_ZERO); + + block_comment("else block of if(z==0.0) {"); { +@@ -1053,7 +1053,7 @@ + movw(tmp2, zr); // tmp2 will keep jz - i == 0 at start + bind(COMP_FOR); + // for(fw=0.0,k=0;k<=jp&&k<=jz-i;k++) fw += PIo2[k]*q[i+k]; +- fmovd(v30, 0.0d); ++ fmovd(v30, 0.0); + add(tmp5, qBase, i, LSL, 3); // address of q[i+k] for k==0 + movw(tmp3, 4); + movw(tmp4, zr); // used as k +@@ -1081,7 +1081,7 @@ + // remember prec == 2 + + block_comment("for (i=jz;i>=0;i--) fw += fq[i];"); { +- fmovd(v4, 0.0d); ++ fmovd(v4, 0.0); + mov(i, jz); + bind(FW_FOR1); + ldrd(v1, Address(rscratch2, i, Address::lsl(3))); +@@ -1319,7 +1319,7 @@ + ld1(C1, C2, C3, C4, T1D, Address(rscratch2)); // load C1..C3\4 + block_comment("calculate r = z*(C1+z*(C2+z*(C3+z*(C4+z*(C5+z*C6)))))"); { + fmaddd(r, z, C6, C5); +- fmovd(half, 0.5d); ++ fmovd(half, 0.5); + fmaddd(r, z, r, C4); + fmuld(y, x, y); + fmaddd(r, z, r, C3); +@@ -1329,7 +1329,7 @@ + fmaddd(r, z, r, C1); // r = C1+z(C2+z(C4+z(C5+z*C6))) + } + // need to multiply r by z to have "final" r value +- fmovd(one, 1.0d); ++ fmovd(one, 1.0); + cmp(ix, rscratch1); + br(GT, IX_IS_LARGE); + block_comment("if(ix < 0x3FD33333) return one - (0.5*z - (z*r - x*y))"); { +@@ -1352,7 +1352,7 @@ + b(QX_SET); + bind(SET_QX_CONST); + block_comment("if(ix > 0x3fe90000) qx = 0.28125;"); { +- fmovd(qx, 0.28125d); ++ fmovd(qx, 0.28125); + } + bind(QX_SET); + fnmsub(C6, x, r, y); // z*r - xy +@@ -1443,7 +1443,7 @@ + block_comment("kernel_sin/kernel_cos: if(ix<0x3e400000) {}"); { + bind(TINY_X); + if (isCos) { +- fmovd(v0, 1.0d); ++ fmovd(v0, 1.0); + } + ret(lr); + } +diff -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/cpu/aarch64/vm_version_aarch64.cpp +--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp Mon Jun 17 15:31:49 2019 +0800 +@@ -177,7 +177,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 -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp +--- a/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp Mon Jun 17 15:31:49 2019 +0800 +@@ -40,7 +40,9 @@ + { + template + D add_and_fetch(I add_value, D volatile* dest, atomic_memory_order order) const { +- return __sync_add_and_fetch(dest, add_value); ++ D res = __atomic_add_fetch(dest, add_value, __ATOMIC_RELEASE); ++ FULL_MEM_BARRIER; ++ return res; + } + }; + +diff -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.s +--- a/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.s Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.s Mon Jun 17 15:31:49 2019 +0800 +@@ -159,7 +159,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 -r 5eeee2cc94f5 -r e53ec3b362f4 src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp +--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp Fri Jun 14 20:30:10 2019 -0700 ++++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp Mon Jun 17 15:31:49 2019 +0800 +@@ -83,19 +83,13 @@ + #define REG_SP REG_RSP + #define REG_PC REG_RIP + #define REG_FP REG_RBP +-#define SPELL_REG_SP "rsp" +-#define SPELL_REG_FP "rbp" + #else + #define REG_FP 29 + #define REG_LR 30 +- +-#define SPELL_REG_SP "sp" +-#define SPELL_REG_FP "x29" + #endif + +-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() { +@@ -230,23 +224,8 @@ + #endif + } + +-intptr_t* _get_previous_fp() { +- register intptr_t **fp __asm__ (SPELL_REG_FP); +- +- // fp is for this frame (_get_previous_fp). We want the fp for the +- // caller of os::current_frame*(), so go up two frames. However, for +- // optimized builds, _get_previous_fp() will be inlined, so only go +- // up 1 frame in that case. +- #ifdef _NMT_NOINLINE_ +- return **(intptr_t***)fp; +- #else +- return *fp; +- #endif +-} +- +- +-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)); +@@ -259,12 +238,6 @@ + } + + // Utility functions +- +-// From IA32 System Programming Guide +-enum { +- trap_page_fault = 0xE +-}; +- + #ifdef BUILTIN_SIM + extern "C" void Fetch32PFI () ; + extern "C" void Fetch32Resume () ; +@@ -667,42 +640,42 @@ + return 0; + } + +- void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) { ++ void _Copy_conjoint_jshorts_atomic(const 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) + *(to--) = *(from--); + } + } +- void _Copy_conjoint_jints_atomic(jint* from, jint* to, size_t count) { ++ void _Copy_conjoint_jints_atomic(const 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) + *(to--) = *(from--); + } + } +- void _Copy_conjoint_jlongs_atomic(jlong* from, jlong* to, size_t count) { ++ void _Copy_conjoint_jlongs_atomic(const 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) +@@ -710,22 +683,22 @@ + } + } + +- void _Copy_arrayof_conjoint_bytes(HeapWord* from, ++ void _Copy_arrayof_conjoint_bytes(const HeapWord* from, + HeapWord* to, + size_t count) { + memmove(to, from, count); + } +- void _Copy_arrayof_conjoint_jshorts(HeapWord* from, ++ void _Copy_arrayof_conjoint_jshorts(const HeapWord* from, + HeapWord* to, + size_t count) { + memmove(to, from, count * 2); + } +- void _Copy_arrayof_conjoint_jints(HeapWord* from, ++ void _Copy_arrayof_conjoint_jints(const HeapWord* from, + HeapWord* to, + size_t count) { + memmove(to, from, count * 4); + } +- void _Copy_arrayof_conjoint_jlongs(HeapWord* from, ++ void _Copy_arrayof_conjoint_jlongs(const HeapWord* from, + HeapWord* to, + size_t count) { + memmove(to, from, count * 8); + + diff --git a/jdk8236039-status_request_extension.patch b/jdk8236039-status_request_extension.patch new file mode 100644 index 0000000..5f51db0 --- /dev/null +++ b/jdk8236039-status_request_extension.patch @@ -0,0 +1,737 @@ + + + + + + Tree - rpms/java-11-openjdk - src.fedoraproject.org + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
+
+
+

+

+
+
+

+rpms / java-11-openjdk +

+
+
+
+
+
+
+ + + Clone + +
+
+
+
Source Code
+ +
+
+
GIT
+ +
+
+
+
+
+ +
+
+
+
+ + +
+
+ +
+
+
+
+
+
+
+

+ Files +

+
+ +
+
+
+ +
+ + cups-libs + + + f27 + + + f28 + + + f29 + + + f30 + + + f31 + + + f32 + + + master + +
+
+
+
+
+
+
+
    +
  1. + + +   master + +
    2. +
  2. + +   jdk8236039-status_request_extension.patch +
    3. +
+
+ +
+
+
+ + +
+ + Blob + + Blame + + Raw +
+ + 
# HG changeset patch
+# User jnimeh
+# Date 1578287079 28800
+#      Sun Jan 05 21:04:39 2020 -0800
+# Node ID b9d1ce20dd4b2ce34e74c8fa2d784335231abcd1
+# Parent  3782f295811625b65d57f1aef15daa10d82a58a7
+8236039: JSSE Client does not accept status_request extension in CertificateRequest messages for TLS 1.3
+Reviewed-by: xuelei
+
+diff --git a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
+--- a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
++++ b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -39,11 +39,7 @@
+ import javax.net.ssl.SSLProtocolException;
+ import sun.security.provider.certpath.OCSPResponse;
+ import sun.security.provider.certpath.ResponderId;
+-import static sun.security.ssl.SSLExtension.CH_STATUS_REQUEST;
+-import static sun.security.ssl.SSLExtension.CH_STATUS_REQUEST_V2;
+ import sun.security.ssl.SSLExtension.ExtensionConsumer;
+-import static sun.security.ssl.SSLExtension.SH_STATUS_REQUEST;
+-import static sun.security.ssl.SSLExtension.SH_STATUS_REQUEST_V2;
+ import sun.security.ssl.SSLExtension.SSLExtensionSpec;
+ import sun.security.ssl.SSLHandshake.HandshakeMessage;
+ import sun.security.util.DerInputStream;
+@@ -434,8 +430,9 @@
+                     } else {
+                         extBuilder.append(",\n");
+                     }
+-                    extBuilder.append(
+-                            "{\n" + Utilities.indent(ext.toString()) + "}");
++                    extBuilder.append("{\n").
++                            append(Utilities.indent(ext.toString())).
++                            append("}");
+                 }
+ 
+                 extsStr = extBuilder.toString();
+@@ -552,11 +549,11 @@
+                 return null;
+             }
+ 
+-            if (!chc.sslConfig.isAvailable(CH_STATUS_REQUEST)) {
++            if (!chc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST)) {
+                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                     SSLLogger.fine(
+                         "Ignore unavailable extension: " +
+-                        CH_STATUS_REQUEST.name);
++                        SSLExtension.CH_STATUS_REQUEST.name);
+                 }
+                 return null;
+             }
+@@ -568,8 +565,8 @@
+             byte[] extData = new byte[] {0x01, 0x00, 0x00, 0x00, 0x00};
+ 
+             // Update the context.
+-            chc.handshakeExtensions.put(
+-                    CH_STATUS_REQUEST, CertStatusRequestSpec.DEFAULT);
++            chc.handshakeExtensions.put(SSLExtension.CH_STATUS_REQUEST,
++                    CertStatusRequestSpec.DEFAULT);
+ 
+             return extData;
+         }
+@@ -593,10 +590,10 @@
+             // The consuming happens in server side only.
+             ServerHandshakeContext shc = (ServerHandshakeContext)context;
+ 
+-            if (!shc.sslConfig.isAvailable(CH_STATUS_REQUEST)) {
++            if (!shc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST)) {
+                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                     SSLLogger.fine("Ignore unavailable extension: " +
+-                        CH_STATUS_REQUEST.name);
++                        SSLExtension.CH_STATUS_REQUEST.name);
+                 }
+                 return;     // ignore the extension
+             }
+@@ -610,7 +607,7 @@
+             }
+ 
+             // Update the context.
+-            shc.handshakeExtensions.put(CH_STATUS_REQUEST, spec);
++            shc.handshakeExtensions.put(SSLExtension.CH_STATUS_REQUEST, spec);
+             if (!shc.isResumption &&
+                     !shc.negotiatedProtocol.useTLS13PlusSpec()) {
+                 shc.handshakeProducers.put(SSLHandshake.CERTIFICATE_STATUS.id,
+@@ -654,13 +651,12 @@
+ 
+             // In response to "status_request" extension request only.
+             CertStatusRequestSpec spec = (CertStatusRequestSpec)
+-                    shc.handshakeExtensions.get(CH_STATUS_REQUEST);
++                    shc.handshakeExtensions.get(SSLExtension.CH_STATUS_REQUEST);
+             if (spec == null) {
+                 // Ignore, no status_request extension requested.
+                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+-                    SSLLogger.finest(
+-                        "Ignore unavailable extension: " +
+-                        CH_STATUS_REQUEST.name);
++                    SSLLogger.finest("Ignore unavailable extension: " +
++                        SSLExtension.CH_STATUS_REQUEST.name);
+                 }
+ 
+                 return null;        // ignore the extension
+@@ -681,8 +677,8 @@
+             byte[] extData = new byte[0];
+ 
+             // Update the context.
+-            shc.handshakeExtensions.put(
+-                    SH_STATUS_REQUEST, CertStatusRequestSpec.DEFAULT);
++            shc.handshakeExtensions.put(SSLExtension.SH_STATUS_REQUEST,
++                    CertStatusRequestSpec.DEFAULT);
+ 
+             return extData;
+         }
+@@ -708,7 +704,7 @@
+ 
+             // In response to "status_request" extension request only.
+             CertStatusRequestSpec requestedCsr = (CertStatusRequestSpec)
+-                    chc.handshakeExtensions.get(CH_STATUS_REQUEST);
++                    chc.handshakeExtensions.get(SSLExtension.CH_STATUS_REQUEST);
+             if (requestedCsr == null) {
+                 throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
+                     "Unexpected status_request extension in ServerHello");
+@@ -722,8 +718,8 @@
+             }
+ 
+             // Update the context.
+-            chc.handshakeExtensions.put(
+-                    SH_STATUS_REQUEST, CertStatusRequestSpec.DEFAULT);
++            chc.handshakeExtensions.put(SSLExtension.SH_STATUS_REQUEST,
++                    CertStatusRequestSpec.DEFAULT);
+ 
+             // Since we've received a legitimate status_request in the
+             // ServerHello, stapling is active if it's been enabled.
+@@ -909,7 +905,7 @@
+                 return null;
+             }
+ 
+-            if (!chc.sslConfig.isAvailable(CH_STATUS_REQUEST_V2)) {
++            if (!chc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST_V2)) {
+                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                     SSLLogger.finest(
+                         "Ignore unavailable status_request_v2 extension");
+@@ -926,8 +922,8 @@
+                 0x00, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00};
+ 
+             // Update the context.
+-            chc.handshakeExtensions.put(
+-                    CH_STATUS_REQUEST_V2, CertStatusRequestV2Spec.DEFAULT);
++            chc.handshakeExtensions.put(SSLExtension.CH_STATUS_REQUEST_V2,
++                    CertStatusRequestV2Spec.DEFAULT);
+ 
+             return extData;
+         }
+@@ -951,7 +947,7 @@
+             // The consuming happens in server side only.
+             ServerHandshakeContext shc = (ServerHandshakeContext)context;
+ 
+-            if (!shc.sslConfig.isAvailable(CH_STATUS_REQUEST_V2)) {
++            if (!shc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST_V2)) {
+                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                     SSLLogger.finest(
+                         "Ignore unavailable status_request_v2 extension");
+@@ -969,7 +965,8 @@
+             }
+ 
+             // Update the context.
+-            shc.handshakeExtensions.put(CH_STATUS_REQUEST_V2, spec);
++            shc.handshakeExtensions.put(SSLExtension.CH_STATUS_REQUEST_V2,
++                    spec);
+             if (!shc.isResumption) {
+                 shc.handshakeProducers.putIfAbsent(
+                         SSLHandshake.CERTIFICATE_STATUS.id,
+@@ -1013,7 +1010,7 @@
+ 
+             // In response to "status_request_v2" extension request only
+             CertStatusRequestV2Spec spec = (CertStatusRequestV2Spec)
+-                    shc.handshakeExtensions.get(CH_STATUS_REQUEST_V2);
++                shc.handshakeExtensions.get(SSLExtension.CH_STATUS_REQUEST_V2);
+             if (spec == null) {
+                 // Ignore, no status_request_v2 extension requested.
+                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+@@ -1038,8 +1035,8 @@
+             byte[] extData = new byte[0];
+ 
+             // Update the context.
+-            shc.handshakeExtensions.put(
+-                    SH_STATUS_REQUEST_V2, CertStatusRequestV2Spec.DEFAULT);
++            shc.handshakeExtensions.put(SSLExtension.SH_STATUS_REQUEST_V2,
++                    CertStatusRequestV2Spec.DEFAULT);
+ 
+             return extData;
+         }
+@@ -1065,7 +1062,7 @@
+ 
+             // In response to "status_request" extension request only
+             CertStatusRequestV2Spec requestedCsr = (CertStatusRequestV2Spec)
+-                    chc.handshakeExtensions.get(CH_STATUS_REQUEST_V2);
++                chc.handshakeExtensions.get(SSLExtension.CH_STATUS_REQUEST_V2);
+             if (requestedCsr == null) {
+                 throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
+                     "Unexpected status_request_v2 extension in ServerHello");
+@@ -1079,8 +1076,8 @@
+             }
+ 
+             // Update the context.
+-            chc.handshakeExtensions.put(
+-                    SH_STATUS_REQUEST_V2, CertStatusRequestV2Spec.DEFAULT);
++            chc.handshakeExtensions.put(SSLExtension.SH_STATUS_REQUEST_V2,
++                    CertStatusRequestV2Spec.DEFAULT);
+ 
+             // Since we've received a legitimate status_request in the
+             // ServerHello, stapling is active if it's been enabled.  If it
+diff --git a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
+--- a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
++++ b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -113,7 +113,6 @@
+                                 null,
+                                 null,
+                                 CertStatusExtension.certStatusReqStringizer),
+-
+     CR_STATUS_REQUEST       (0x0005, "status_request"),
+     CT_STATUS_REQUEST       (0x0005, "status_request",
+                                 SSLHandshake.CERTIFICATE,
+@@ -124,6 +123,7 @@
+                                 null,
+                                 null,
+                                 CertStatusExtension.certStatusRespStringizer),
++
+     // extensions defined in RFC 4681
+     USER_MAPPING            (0x0006, "user_mapping"),
+ 
+@@ -515,6 +515,16 @@
+         return null;
+     }
+ 
++    static String nameOf(int extensionType) {
++        for (SSLExtension ext : SSLExtension.values()) {
++            if (ext.id == extensionType) {
++                return ext.name;
++            }
++        }
++
++        return "unknown extension";
++    }
++
+     static boolean isConsumable(int extensionType) {
+         for (SSLExtension ext : SSLExtension.values()) {
+             if (ext.id == extensionType &&
+diff --git a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
+--- a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
++++ b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -86,11 +86,14 @@
+                                 "Received buggy supported_groups extension " +
+                                 "in the ServerHello handshake message");
+                     }
+-                } else {
++                } else if (handshakeType == SSLHandshake.SERVER_HELLO) {
+                     throw hm.handshakeContext.conContext.fatal(
+-                        Alert.UNSUPPORTED_EXTENSION,
+-                        "extension (" + extId +
+-                        ") should not be presented in " + handshakeType.name);
++                            Alert.UNSUPPORTED_EXTENSION, "extension (" +
++                                    extId + ") should not be presented in " +
++                                    handshakeType.name);
++                } else {
++                    isSupported = false;
++                    // debug log to ignore unknown extension for handshakeType
+                 }
+             }
+ 
+@@ -365,9 +368,10 @@
+     }
+ 
+     private static String toString(int extId, byte[] extData) {
++        String extName = SSLExtension.nameOf(extId);
+         MessageFormat messageFormat = new MessageFormat(
+-            "\"unknown extension ({0})\": '{'\n" +
+-            "{1}\n" +
++            "\"{0} ({1})\": '{'\n" +
++            "{2}\n" +
+             "'}'",
+             Locale.ENGLISH);
+ 
+@@ -375,6 +379,7 @@
+         String encoded = hexEncoder.encodeBuffer(extData);
+ 
+         Object[] messageFields = {
++            extName,
+             extId,
+             Utilities.indent(encoded)
+         };
+
+
+
+ +
+
+
+
+ +
+
+
+
+
Powered by Pagure 5.8.1
+ +
+
+
© 2014-2019 Red Hat, Inc. and others.
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file