diff --git a/8210461-AArch64-Math.cos-intrinsic-gives-incorrect-results.patch b/8210461-AArch64-Math.cos-intrinsic-gives-incorrect-results.patch index 878b77f502637bc67d926f6f0f1dd575e67c1553..1d75f6cb55ac4c9662d813aa07d14b5e52dbd362 100644 --- a/8210461-AArch64-Math.cos-intrinsic-gives-incorrect-results.patch +++ b/8210461-AArch64-Math.cos-intrinsic-gives-incorrect-results.patch @@ -21,8 +21,8 @@ index 694c3b5eb..7e1a16635 100644 br(LT, Z_IS_LESS_THAN_TWO24B); fmuld(v1, v18, v17); // twon24*z frintzd(v1, v1); // v1 = (double)(int)(v1) -- fmaddd(v2, v10, v1, v18); -+ fmsubd(v2, v10, v1, v18); +- fmaddd(v2, v24, v1, v18); ++ fmsubd(v2, v24, v1, v18); fcvtzdw(tmp3, v1); // (int)fw fcvtzdw(tmp2, v2); // double to int strw(tmp2, Address(iqBase, jz, Address::lsl(2))); diff --git a/ZGC-Redesign-C2-load-barrier-to-expand-on-th.patch b/ZGC-Redesign-C2-load-barrier-to-expand-on-th.patch index ff51a89ff5b46486fa3b1faff864e9704340b59f..91d0b766ad26be9a6d7c279b3f2b61dbd01a3683 100644 --- a/ZGC-Redesign-C2-load-barrier-to-expand-on-th.patch +++ b/ZGC-Redesign-C2-load-barrier-to-expand-on-th.patch @@ -4471,7 +4471,7 @@ index 69f8a3c..5ee23f7 100644 macro(Loop) macro(LoopLimit) diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp -index 45e2d11..e5559a2 100644 +index 8c23b304d..3e45813d7 100644 --- a/src/hotspot/share/opto/compile.cpp +++ b/src/hotspot/share/opto/compile.cpp @@ -79,9 +79,6 @@ @@ -4484,16 +4484,17 @@ index 45e2d11..e5559a2 100644 #if INCLUDE_SHENANDOAHGC #include "gc/shenandoah/c2/shenandoahBarrierSetC2.hpp" #endif -@@ -639,16 +636,12 @@ debug_only( int Compile::_debug_idx = 100000; ) - Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr_bci, - bool subsume_loads, bool do_escape_analysis, bool eliminate_boxing, DirectiveSet* directive) +@@ -647,9 +644,6 @@ Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr + bool subsume_loads, bool do_escape_analysis, bool eliminate_boxing, + bool do_locks_coarsening, DirectiveSet* directive) : Phase(Compiler), - _env(ci_env), - _directive(directive), - _log(ci_env->log()), _compile_id(ci_env->compile_id()), _save_argument_registers(false), - _stub_name(NULL), + _do_locks_coarsening(do_locks_coarsening), +@@ -657,7 +651,6 @@ Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr _stub_function(NULL), _stub_entry_point(NULL), _method(target), @@ -4501,16 +4502,16 @@ index 45e2d11..e5559a2 100644 _entry_bci(osr_bci), _initial_gvn(NULL), _for_igvn(NULL), -@@ -668,8 +661,6 @@ Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr - _inner_loops(0), +@@ -678,8 +671,6 @@ Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr _scratch_const_size(-1), _in_scratch_emit_size(false), + _coarsened_locks (comp_arena(), 8, 0, NULL), - _dead_node_list(comp_arena()), - _dead_node_count(0), #ifndef PRODUCT _trace_opto_output(directive->TraceOptoOutputOption), _in_dump_cnt(0), -@@ -677,9 +668,15 @@ Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr +@@ -687,9 +678,15 @@ Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr #endif _congraph(NULL), _comp_arena(mtCompiler), @@ -4526,7 +4527,7 @@ index 45e2d11..e5559a2 100644 _replay_inline_data(NULL), _late_inlines(comp_arena(), 2, 0, NULL), _string_late_inlines(comp_arena(), 2, 0, NULL), -@@ -962,9 +959,6 @@ Compile::Compile( ciEnv* ci_env, +@@ -972,9 +969,6 @@ Compile::Compile( ciEnv* ci_env, bool return_pc, DirectiveSet* directive) : Phase(Compiler), @@ -4535,8 +4536,8 @@ index 45e2d11..e5559a2 100644 - _log(ci_env->log()), _compile_id(0), _save_argument_registers(save_arg_registers), - _method(NULL), -@@ -994,6 +988,10 @@ Compile::Compile( ciEnv* ci_env, + _do_locks_coarsening(false), +@@ -1005,6 +999,10 @@ Compile::Compile( ciEnv* ci_env, _printer(NULL), #endif _comp_arena(mtCompiler), @@ -4547,21 +4548,21 @@ index 45e2d11..e5559a2 100644 _node_arena(mtCompiler), _old_arena(mtCompiler), _Compile_types(mtCompiler), -@@ -2408,13 +2406,6 @@ void Compile::Optimize() { - bs->verify_gc_barriers(false); - #endif +@@ -2427,13 +2425,6 @@ void Compile::Optimize() { + igvn.optimize(); + } -- bs->barrier_insertion_phase(C, igvn); -- if (failing()) return; -- -#ifdef ASSERT - bs->verify_gc_barriers(false); -#endif - - { - TracePhase tp("macroExpand", &timers[_t_macroExpand]); - PhaseMacroExpand mex(igvn); -@@ -2996,29 +2987,6 @@ void Compile::final_graph_reshaping_impl( Node *n, Final_Reshape_Counts &frc) { +- bs->barrier_insertion_phase(C, igvn); +- if (failing()) return; +- + #ifdef ASSERT + bs->verify_gc_barriers(false); + #endif +@@ -3019,29 +3010,6 @@ void Compile::final_graph_reshaping_impl( Node *n, Final_Reshape_Counts &frc) { break; } diff --git a/add-SVE-backend-feature.patch b/add-SVE-backend-feature.patch index efd0689252765510589845cca0faa70beff722aa..04283774f163e36ac1a12a4e26d43477328c5828 100644 --- a/add-SVE-backend-feature.patch +++ b/add-SVE-backend-feature.patch @@ -92,43 +92,43 @@ index b64919a62..fa434df7d 100644 - reg_def V7_J ( SOC, SOC, Op_RegF, 7, v7->as_VMReg()->next(2) ); - reg_def V7_K ( SOC, SOC, Op_RegF, 7, v7->as_VMReg()->next(3) ); - -- reg_def V8 ( SOC, SOC, Op_RegF, 8, v8->as_VMReg() ); -- reg_def V8_H ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next() ); +- reg_def V8 ( SOC, SOE, Op_RegF, 8, v8->as_VMReg() ); +- reg_def V8_H ( SOC, SOE, Op_RegF, 8, v8->as_VMReg()->next() ); - reg_def V8_J ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(2) ); - reg_def V8_K ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(3) ); - -- reg_def V9 ( SOC, SOC, Op_RegF, 9, v9->as_VMReg() ); -- reg_def V9_H ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next() ); +- reg_def V9 ( SOC, SOE, Op_RegF, 9, v9->as_VMReg() ); +- reg_def V9_H ( SOC, SOE, Op_RegF, 9, v9->as_VMReg()->next() ); - reg_def V9_J ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(2) ); - reg_def V9_K ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(3) ); - -- reg_def V10 ( SOC, SOC, Op_RegF, 10, v10->as_VMReg() ); -- reg_def V10_H( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next() ); +- reg_def V10 ( SOC, SOE, Op_RegF, 10, v10->as_VMReg() ); +- reg_def V10_H( SOC, SOE, Op_RegF, 10, v10->as_VMReg()->next() ); - reg_def V10_J( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(2)); - reg_def V10_K( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(3)); - -- reg_def V11 ( SOC, SOC, Op_RegF, 11, v11->as_VMReg() ); -- reg_def V11_H( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next() ); +- reg_def V11 ( SOC, SOE, Op_RegF, 11, v11->as_VMReg() ); +- reg_def V11_H( SOC, SOE, Op_RegF, 11, v11->as_VMReg()->next() ); - reg_def V11_J( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(2)); - reg_def V11_K( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(3)); - -- reg_def V12 ( SOC, SOC, Op_RegF, 12, v12->as_VMReg() ); -- reg_def V12_H( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next() ); +- reg_def V12 ( SOC, SOE, Op_RegF, 12, v12->as_VMReg() ); +- reg_def V12_H( SOC, SOE, Op_RegF, 12, v12->as_VMReg()->next() ); - reg_def V12_J( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(2)); - reg_def V12_K( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(3)); - -- reg_def V13 ( SOC, SOC, Op_RegF, 13, v13->as_VMReg() ); -- reg_def V13_H( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next() ); +- reg_def V13 ( SOC, SOE, Op_RegF, 13, v13->as_VMReg() ); +- reg_def V13_H( SOC, SOE, Op_RegF, 13, v13->as_VMReg()->next() ); - reg_def V13_J( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(2)); - reg_def V13_K( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(3)); - -- reg_def V14 ( SOC, SOC, Op_RegF, 14, v14->as_VMReg() ); -- reg_def V14_H( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next() ); +- reg_def V14 ( SOC, SOE, Op_RegF, 14, v14->as_VMReg() ); +- reg_def V14_H( SOC, SOE, Op_RegF, 14, v14->as_VMReg()->next() ); - reg_def V14_J( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(2)); - reg_def V14_K( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(3)); - -- reg_def V15 ( SOC, SOC, Op_RegF, 15, v15->as_VMReg() ); -- reg_def V15_H( SOC, SOC, Op_RegF, 15, v15->as_VMReg()->next() ); +- reg_def V15 ( SOC, SOE, Op_RegF, 15, v15->as_VMReg() ); +- reg_def V15_H( SOC, SOE, Op_RegF, 15, v15->as_VMReg()->next() ); - reg_def V15_J( SOC, SOC, Op_RegF, 15, v15->as_VMReg()->next(2)); - reg_def V15_K( SOC, SOC, Op_RegF, 15, v15->as_VMReg()->next(3)); - @@ -293,8 +293,8 @@ index b64919a62..fa434df7d 100644 + reg_def V7_N ( SOC, SOC, Op_RegF, 7, v7->as_VMReg()->next(6) ); + reg_def V7_O ( SOC, SOC, Op_RegF, 7, v7->as_VMReg()->next(7) ); + -+ reg_def V8 ( SOC, SOC, Op_RegF, 8, v8->as_VMReg() ); -+ reg_def V8_H ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next() ); ++ reg_def V8 ( SOC, SOE, Op_RegF, 8, v8->as_VMReg() ); ++ reg_def V8_H ( SOC, SOE, Op_RegF, 8, v8->as_VMReg()->next() ); + reg_def V8_J ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(2) ); + reg_def V8_K ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(3) ); + reg_def V8_L ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(4) ); @@ -302,8 +302,8 @@ index b64919a62..fa434df7d 100644 + reg_def V8_N ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(6) ); + reg_def V8_O ( SOC, SOC, Op_RegF, 8, v8->as_VMReg()->next(7) ); + -+ reg_def V9 ( SOC, SOC, Op_RegF, 9, v9->as_VMReg() ); -+ reg_def V9_H ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next() ); ++ reg_def V9 ( SOC, SOE, Op_RegF, 9, v9->as_VMReg() ); ++ reg_def V9_H ( SOC, SOE, Op_RegF, 9, v9->as_VMReg()->next() ); + reg_def V9_J ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(2) ); + reg_def V9_K ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(3) ); + reg_def V9_L ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(4) ); @@ -311,8 +311,8 @@ index b64919a62..fa434df7d 100644 + reg_def V9_N ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(6) ); + reg_def V9_O ( SOC, SOC, Op_RegF, 9, v9->as_VMReg()->next(7) ); + -+ reg_def V10 ( SOC, SOC, Op_RegF, 10, v10->as_VMReg() ); -+ reg_def V10_H ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next() ); ++ reg_def V10 ( SOC, SOE, Op_RegF, 10, v10->as_VMReg() ); ++ reg_def V10_H ( SOC, SOE, Op_RegF, 10, v10->as_VMReg()->next() ); + reg_def V10_J ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(2) ); + reg_def V10_K ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(3) ); + reg_def V10_L ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(4) ); @@ -320,8 +320,8 @@ index b64919a62..fa434df7d 100644 + reg_def V10_N ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(6) ); + reg_def V10_O ( SOC, SOC, Op_RegF, 10, v10->as_VMReg()->next(7) ); + -+ reg_def V11 ( SOC, SOC, Op_RegF, 11, v11->as_VMReg() ); -+ reg_def V11_H ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next() ); ++ reg_def V11 ( SOC, SOE, Op_RegF, 11, v11->as_VMReg() ); ++ reg_def V11_H ( SOC, SOE, Op_RegF, 11, v11->as_VMReg()->next() ); + reg_def V11_J ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(2) ); + reg_def V11_K ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(3) ); + reg_def V11_L ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(4) ); @@ -329,8 +329,8 @@ index b64919a62..fa434df7d 100644 + reg_def V11_N ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(6) ); + reg_def V11_O ( SOC, SOC, Op_RegF, 11, v11->as_VMReg()->next(7) ); + -+ reg_def V12 ( SOC, SOC, Op_RegF, 12, v12->as_VMReg() ); -+ reg_def V12_H ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next() ); ++ reg_def V12 ( SOC, SOE, Op_RegF, 12, v12->as_VMReg() ); ++ reg_def V12_H ( SOC, SOE, Op_RegF, 12, v12->as_VMReg()->next() ); + reg_def V12_J ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(2) ); + reg_def V12_K ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(3) ); + reg_def V12_L ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(4) ); @@ -338,8 +338,8 @@ index b64919a62..fa434df7d 100644 + reg_def V12_N ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(6) ); + reg_def V12_O ( SOC, SOC, Op_RegF, 12, v12->as_VMReg()->next(7) ); + -+ reg_def V13 ( SOC, SOC, Op_RegF, 13, v13->as_VMReg() ); -+ reg_def V13_H ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next() ); ++ reg_def V13 ( SOC, SOE, Op_RegF, 13, v13->as_VMReg() ); ++ reg_def V13_H ( SOC, SOE, Op_RegF, 13, v13->as_VMReg()->next() ); + reg_def V13_J ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(2) ); + reg_def V13_K ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(3) ); + reg_def V13_L ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(4) ); @@ -347,8 +347,8 @@ index b64919a62..fa434df7d 100644 + reg_def V13_N ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(6) ); + reg_def V13_O ( SOC, SOC, Op_RegF, 13, v13->as_VMReg()->next(7) ); + -+ reg_def V14 ( SOC, SOC, Op_RegF, 14, v14->as_VMReg() ); -+ reg_def V14_H ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next() ); ++ reg_def V14 ( SOC, SOE, Op_RegF, 14, v14->as_VMReg() ); ++ reg_def V14_H ( SOC, SOE, Op_RegF, 14, v14->as_VMReg()->next() ); + reg_def V14_J ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(2) ); + reg_def V14_K ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(3) ); + reg_def V14_L ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(4) ); @@ -356,8 +356,8 @@ index b64919a62..fa434df7d 100644 + reg_def V14_N ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(6) ); + reg_def V14_O ( SOC, SOC, Op_RegF, 14, v14->as_VMReg()->next(7) ); + -+ reg_def V15 ( SOC, SOC, Op_RegF, 15, v15->as_VMReg() ); -+ reg_def V15_H ( SOC, SOC, Op_RegF, 15, v15->as_VMReg()->next() ); ++ reg_def V15 ( SOC, SOE, Op_RegF, 15, v15->as_VMReg() ); ++ reg_def V15_H ( SOC, SOE, Op_RegF, 15, v15->as_VMReg()->next() ); + reg_def V15_J ( SOC, SOC, Op_RegF, 15, v15->as_VMReg()->next(2) ); + reg_def V15_K ( SOC, SOC, Op_RegF, 15, v15->as_VMReg()->next(3) ); + reg_def V15_L ( SOC, SOC, Op_RegF, 15, v15->as_VMReg()->next(4) ); @@ -3321,22 +3321,22 @@ index 2a17d8e0f..943d2a615 100644 + __ subs(r24, r28, 947u); // subs x24, x28, #947 // LogicalImmOp -- __ andw(r28, r19, 4294709247ul); // and w28, w19, #0xfffc0fff -- __ orrw(r27, r5, 536870910ul); // orr w27, w5, #0x1ffffffe -- __ eorw(r30, r20, 4294840319ul); // eor w30, w20, #0xfffe0fff -- __ andsw(r22, r26, 4294959615ul); // ands w22, w26, #0xffffe1ff -- __ andr(r5, r7, 4194300ul); // and x5, x7, #0x3ffffc -- __ orr(r13, r7, 18014398509481728ul); // orr x13, x7, #0x3fffffffffff00 -- __ eor(r7, r9, 18442240474082197503ul); // eor x7, x9, #0xfff0000000003fff -- __ ands(r3, r0, 18374686479671656447ul); // ands x3, x0, #0xff00000000007fff -+ __ andw(r25, r25, 2139127680ul); // and w25, w25, #0x7f807f80 -+ __ orrw(r13, r26, 2097120ul); // orr w13, w26, #0x1fffe0 -+ __ eorw(r21, r13, 3758096384ul); // eor w21, w13, #0xe0000000 -+ __ andsw(r2, r3, 1073733632ul); // ands w2, w3, #0x3fffe000 -+ __ andr(r8, r10, 1125895612137471ul); // and x8, x10, #0x3ffff0003ffff -+ __ orr(r27, r16, 18444492273897963519ul); // orr x27, x16, #0xfff80000001fffff -+ __ eor(r27, r3, 4611685469745315712ul); // eor x27, x3, #0x3fffff803fffff80 -+ __ ands(r4, r23, 18446744056529698815ul); // ands x4, x23, #0xfffffffc00003fff +- __ andw(r28, r19, 4294709247ull); // and w28, w19, #0xfffc0fff +- __ orrw(r27, r5, 536870910ull); // orr w27, w5, #0x1ffffffe +- __ eorw(r30, r20, 4294840319ull); // eor w30, w20, #0xfffe0fff +- __ andsw(r22, r26, 4294959615ull); // ands w22, w26, #0xffffe1ff +- __ andr(r5, r7, 4194300ull); // and x5, x7, #0x3ffffc +- __ orr(r13, r7, 18014398509481728ull); // orr x13, x7, #0x3fffffffffff00 +- __ eor(r7, r9, 18442240474082197503ull); // eor x7, x9, #0xfff0000000003fff +- __ ands(r3, r0, 18374686479671656447ull); // ands x3, x0, #0xff00000000007fff ++ __ andw(r25, r25, 2139127680ull); // and w25, w25, #0x7f807f80 ++ __ orrw(r13, r26, 2097120ull); // orr w13, w26, #0x1fffe0 ++ __ eorw(r21, r13, 3758096384ull); // eor w21, w13, #0xe0000000 ++ __ andsw(r2, r3, 1073733632ull); // ands w2, w3, #0x3fffe000 ++ __ andr(r8, r10, 1125895612137471ull); // and x8, x10, #0x3ffff0003ffff ++ __ orr(r27, r16, 18444492273897963519ull); // orr x27, x16, #0xfff80000001fffff ++ __ eor(r27, r3, 4611685469745315712ull); // eor x27, x3, #0x3fffff803fffff80 ++ __ ands(r4, r23, 18446744056529698815ull); // ands x4, x23, #0xfffffffc00003fff // AbsOp - __ b(__ pc()); // b . @@ -6417,7 +6417,7 @@ index 85fdc0c88..dccd24911 100644 Address spill_address(int size, int offset, Register tmp=rscratch2); + Address sve_spill_address(int sve_reg_size_in_bytes, int offset, Register tmp=rscratch2); - bool merge_alignment_check(Register base, size_t size, long cur_offset, long prev_offset) const; + bool merge_alignment_check(Register base, size_t size, int64_t cur_offset, int64_t prev_offset) const; @@ -1342,6 +1350,9 @@ public: void spill(FloatRegister Vx, SIMD_RegVariant T, int offset) { @@ -6490,16 +6490,6 @@ index 36cbe3fee..3db8e8337 100644 + return is_valid() ? names[encoding()] : "noreg"; +} diff --git a/src/hotspot/cpu/aarch64/register_aarch64.hpp b/src/hotspot/cpu/aarch64/register_aarch64.hpp -index 75db19977..f6ab3b640 100644 ---- a/src/hotspot/cpu/aarch64/register_aarch64.hpp -+++ b/src/hotspot/cpu/aarch64/register_aarch64.hpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2020, 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. - * @@ -129,9 +129,10 @@ class FloatRegisterImpl: public AbstractRegisterImpl { public: enum { @@ -6865,8 +6855,8 @@ index e906454f1..7ae881b74 100644 @@ -164,6 +181,7 @@ void VM_Version::get_processor_features() { } - unsigned long auxv = getauxval(AT_HWCAP); -+ unsigned long auxv2 = getauxval(AT_HWCAP2); + uint64_t auxv = getauxval(AT_HWCAP); ++ uint64_t auxv2 = getauxval(AT_HWCAP2); char buf[512]; diff --git a/delete_expired_certificates.patch b/delete_expired_certificates.patch index 0ea4f54fac9b7fd88a47208b61b93f8fcbc732fe..16422d7185c14405f339aa7fd6132fd8c9f1fdb6 100644 --- a/delete_expired_certificates.patch +++ b/delete_expired_certificates.patch @@ -1,114 +1,156 @@ -diff --git a/make/data/cacerts/luxtrustglobalrootca b/make/data/cacerts/luxtrustglobalrootca +diff --git a/make/data/cacerts/addtrustexternalca b/make/data/cacerts/addtrustexternalca deleted file mode 100644 -index 7fb3d818f..000000000 ---- a/make/data/cacerts/luxtrustglobalrootca +index ad84cad96..000000000 +--- a/make/data/cacerts/addtrustexternalca +++ /dev/null -@@ -1,28 +0,0 @@ --Owner: CN=LuxTrust Global Root, O=LuxTrust s.a., C=LU --Issuer: CN=LuxTrust Global Root, O=LuxTrust s.a., C=LU --Serial number: bb8 --Valid from: Thu Mar 17 09:51:37 GMT 2011 until: Wed Mar 17 09:51:37 GMT 2021 --Signature algorithm name: SHA256withRSA +@@ -1,32 +0,0 @@ +-Owner: CN=AddTrust External CA Root, OU=AddTrust External TTP Network, O=AddTrust AB, C=SE +-Issuer: CN=AddTrust External CA Root, OU=AddTrust External TTP Network, O=AddTrust AB, C=SE +-Serial number: 1 +-Valid from: Tue May 30 10:48:38 GMT 2000 until: Sat May 30 10:48:38 GMT 2020 +-Signature algorithm name: SHA1withRSA -Subject Public Key Algorithm: 2048-bit RSA key -Version: 3 ------BEGIN CERTIFICATE----- --MIIDZDCCAkygAwIBAgICC7gwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCTFUx --FjAUBgNVBAoTDUx1eFRydXN0IHMuYS4xHTAbBgNVBAMTFEx1eFRydXN0IEdsb2Jh --bCBSb290MB4XDTExMDMxNzA5NTEzN1oXDTIxMDMxNzA5NTEzN1owRDELMAkGA1UE --BhMCTFUxFjAUBgNVBAoTDUx1eFRydXN0IHMuYS4xHTAbBgNVBAMTFEx1eFRydXN0 --IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsn+n --QPAiygz267Hxyw6VV0B1r6A/Ps7sqjJX5hmxZ0OYWmt8s7j6eJyqpoSyYBuAQc5j --zR8XCJmk9e8+EsdMsFeaXHhAePxFjdqRZ9w6Ubltc+a3OY52OrQfBfVpVfmTz3iI --Sr6qm9d7R1tGBEyCFqY19vx039a0r9jitScRdFmiwmYsaArhmIiIPIoFdRTjuK7z --CISbasE/MRivJ6VLm6T9eTHemD0OYcqHmMH4ijCc+j4z1aXEAwfh95Z0GAAnOCfR --K6qq4UFFi2/xJcLcopeVx0IUM115hCNq52XAV6DYXaljAeew5Ivo+MVjuOVsdJA9 --x3f8K7p56aTGEnin/wIDAQABo2AwXjAMBgNVHRMEBTADAQH/MA4GA1UdDwEB/wQE --AwIBBjAfBgNVHSMEGDAWgBQXFYWJCS8kh28/HRvk8pZ5g0gTzjAdBgNVHQ4EFgQU --FxWFiQkvJIdvPx0b5PKWeYNIE84wDQYJKoZIhvcNAQELBQADggEBAFrwHNDUUM9B --fua4nX3DcNBeNv9ujnov3kgR1TQuPLdFwlQlp+HBHjeDtpSutkVIA+qVvuucarQ3 --XB8u02uCgUNbCj8RVWOs+nwIAjegPDkEM/6XMshS5dklTbDG7mgfcKpzzlcD3H0K --DTPy0lrfCmw7zBFRlxqkIaKFNQLXgCLShLL4wKpov9XrqsMLq6F8K/f1O4fhVFfs --BSTveUJO84ton+Ruy4KZycwq3FPCH3CDqyEPVrRI/98HIrOM+R2mBN8tAza53W/+ --MYhm/2xtRDSvCHc+JtJy9LtHVpM8mGPhM7uZI5K1g3noHZ9nrWLWidb2/CfeMifL --hNp3hSGhEiE= +-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU +-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs +-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290 +-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux +-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h +-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v +-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt +-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9 +-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX +-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX +-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN +-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0 +-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD +-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0 +-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU +-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx +-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN +-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH +-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 +-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC +-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX +-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a +-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= ------END CERTIFICATE----- -diff --git a/make/data/cacerts/quovadisrootca b/make/data/cacerts/quovadisrootca +diff --git a/make/data/cacerts/addtrustqualifiedca b/make/data/cacerts/addtrustqualifiedca deleted file mode 100644 -index 0c195ff51..000000000 ---- a/make/data/cacerts/quovadisrootca +index 0c62d44c7..000000000 +--- a/make/data/cacerts/addtrustqualifiedca +++ /dev/null -@@ -1,41 +0,0 @@ --Owner: CN=QuoVadis Root Certification Authority, OU=Root Certification Authority, O=QuoVadis Limited, C=BM --Issuer: CN=QuoVadis Root Certification Authority, OU=Root Certification Authority, O=QuoVadis Limited, C=BM --Serial number: 3ab6508b --Valid from: Mon Mar 19 18:33:33 GMT 2001 until: Wed Mar 17 18:33:33 GMT 2021 +@@ -1,32 +0,0 @@ +-Owner: CN=AddTrust Qualified CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE +-Issuer: CN=AddTrust Qualified CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE +-Serial number: 1 +-Valid from: Tue May 30 10:44:50 GMT 2000 until: Sat May 30 10:44:50 GMT 2020 -Signature algorithm name: SHA1withRSA -Subject Public Key Algorithm: 2048-bit RSA key -Version: 3 ------BEGIN CERTIFICATE----- --MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC --TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0 --aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0 --aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz --MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw --IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR --dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG --9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp --li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D --rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ --WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug --F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU --xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC --Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv --dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw --ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl --IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh --c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy --ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh --Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI --KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T --KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq --y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p --dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD --VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL --MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk --fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8 --7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R --cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y --mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW --xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK --SnQ2+Q== +-MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU +-MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 +-b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1 +-MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK +-EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh +-BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B +-AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq +-xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G +-87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i +-2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U +-WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1 +-0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G +-A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T +-AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr +-pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL +-ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm +-aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv +-hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm +-hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X +-dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3 +-P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y +-iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no +-xqE= +------END CERTIFICATE----- +diff --git a/make/data/cacerts/utnuserfirstobjectca b/make/data/cacerts/utnuserfirstobjectca +deleted file mode 100644 +index 80a0b5c23..000000000 +--- a/make/data/cacerts/utnuserfirstobjectca ++++ /dev/null +@@ -1,33 +0,0 @@ +-Owner: CN=UTN-USERFirst-Object, OU=http://www.usertrust.com, O=The USERTRUST Network, L=Salt Lake City, ST=UT, C=US +-Issuer: CN=UTN-USERFirst-Object, OU=http://www.usertrust.com, O=The USERTRUST Network, L=Salt Lake City, ST=UT, C=US +-Serial number: 44be0c8b500024b411d3362de0b35f1b +-Valid from: Fri Jul 09 18:31:20 GMT 1999 until: Tue Jul 09 18:40:36 GMT 2019 +-Signature algorithm name: SHA1withRSA +-Subject Public Key Algorithm: 2048-bit RSA key +-Version: 3 +------BEGIN CERTIFICATE----- +-MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCB +-lTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAbBgNVBAMTFFVUTi1VU0VSRmlyc3Qt +-T2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAzNlowgZUxCzAJBgNV +-BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAc +-BgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3 +-dy51c2VydHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCC +-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicP +-HxzfOpuCaDDASmEd8S8O+r5596Uj71VRloTN2+O5bj4x2AogZ8f02b+U60cEPgLO +-KqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQw5ujm9M89RKZd7G3CeBo +-5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vulBe3/IW+ +-pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehb +-kkj7RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUC +-AwEAAaOBrzCBrDALBgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E +-FgQU2u1kdBScFDyr3ZmpvVsoTYs8ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov +-L2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtT2JqZWN0LmNybDApBgNV +-HSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQwDQYJKoZIhvcN +-AQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw +-NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXB +-mMiKVl0+7kNOPmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU +-4U3GDZlDAQ0Slox4nb9QorFEqmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK5 +-81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR +-Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g= ------END CERTIFICATE----- diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java -index b0e28f192..986f4a332 100644 +index a0e4cf294..8b8739d33 100644 --- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java +++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java @@ -53,12 +53,12 @@ public class VerifyCACerts { + File.separator + "security" + File.separator + "cacerts"; // The numbers of certs now. -- private static final int COUNT = 88; -+ private static final int COUNT = 86; +- private static final int COUNT = 90; ++ private static final int COUNT = 87; // SHA-256 of cacerts, can be generated with // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95 private static final String CHECKSUM -- = "9B:C3:0B:24:D4:26:E4:A9:4F:2C:96:25:06:9B:08:E5:13:5B:0B:33:74:5F:78:DB:BD:91:CD:31:D4:37:07:28"; -+ = "E3:B0:C4:42:98:FC:1C:14:9A:FB:F4:C8:99:6F:B9:24:27:AE:41:E4:64:9B:93:4C:A4:95:99:1B:78:52:B8:55"; +- = "A2:36:27:B7:F6:99:7A:C7:7E:2D:55:47:66:57:08:3F:F8:8C:F2:28:77:29:30:40:A2:D3:6D:1A:B6:C7:32:6F"; ++ = "EA:29:DE:36:FD:06:0A:A1:D9:46:0B:DF:E0:B8:E7:16:40:1B:52:3B:5F:0F:58:EE:E0:2A:A9:2A:D7:8D:34:68"; // map of cert alias to SHA-256 fingerprint @SuppressWarnings("serial") -@@ -146,10 +146,6 @@ public class VerifyCACerts { - "5D:56:49:9B:E4:D2:E0:8B:CF:CA:D0:8A:3E:38:72:3D:50:50:3B:DE:70:69:48:E4:2F:55:60:30:19:E5:28:AE"); - put("letsencryptisrgx1 [jdk]", - "96:BC:EC:06:26:49:76:F3:74:60:77:9A:CF:28:C5:A7:CF:E8:A3:C0:AA:E1:1A:8F:FC:EE:05:C0:BD:DF:08:C6"); -- put("luxtrustglobalrootca [jdk]", -- "A1:B2:DB:EB:64:E7:06:C6:16:9E:3C:41:18:B2:3B:AA:09:01:8A:84:27:66:6D:8B:F0:E2:88:91:EC:05:19:50"); -- put("quovadisrootca [jdk]", -- "A4:5E:DE:3B:BB:F0:9C:8A:E1:5C:72:EF:C0:72:68:D6:93:A2:1C:99:6F:D5:1E:67:CA:07:94:60:FD:6D:88:73"); - put("quovadisrootca1g3 [jdk]", - "8A:86:6F:D1:B2:76:B5:7E:57:8E:92:1C:65:82:8A:2B:ED:58:E9:F2:F2:88:05:41:34:B7:F1:F4:BF:C9:CC:74"); - put("quovadisrootca2 [jdk]", --- -2.19.0 - +@@ -92,12 +92,6 @@ public class VerifyCACerts { + "E7:93:C9:B0:2F:D8:AA:13:E2:1C:31:22:8A:CC:B0:81:19:64:3B:74:9C:89:89:64:B1:74:6D:46:C3:D4:CB:D2"); + put("usertrusteccca [jdk]", + "4F:F4:60:D5:4B:9C:86:DA:BF:BC:FC:57:12:E0:40:0D:2B:ED:3F:BC:4D:4F:BD:AA:86:E0:6A:DC:D2:A9:AD:7A"); +- put("utnuserfirstobjectca [jdk]", +- "6F:FF:78:E4:00:A7:0C:11:01:1C:D8:59:77:C4:59:FB:5A:F9:6A:3D:F0:54:08:20:D0:F4:B8:60:78:75:E5:8F"); +- put("addtrustexternalca [jdk]", +- "68:7F:A4:51:38:22:78:FF:F0:C8:B1:1F:8D:43:D5:76:67:1C:6E:B2:BC:EA:B4:13:FB:83:D9:65:D0:6D:2F:F2"); +- put("addtrustqualifiedca [jdk]", +- "80:95:21:08:05:DB:4B:BC:35:5E:44:28:D8:FD:6E:C2:CD:E3:AB:5F:B9:7A:99:42:98:8E:B8:F4:DC:D0:60:16"); + put("baltimorecybertrustca [jdk]", + "16:AF:57:A9:F6:76:B0:AB:12:60:95:AA:5E:BA:DE:F2:2A:B3:11:19:D6:44:AC:95:CD:4B:93:DB:F3:F2:6A:EB"); + put("digicertglobalrootca [jdk]", +@@ -262,6 +256,8 @@ public class VerifyCACerts { + add("luxtrustglobalrootca [jdk]"); + // Valid until: Wed Mar 17 11:33:33 PDT 2021 + add("quovadisrootca [jdk]"); ++ // Valid until: Wed Dec 15 08:00:00 UTC 2021 ++ add("globalsignr2ca [jdk]"); + } + }; + diff --git a/jdk-updates-jdk11u-jdk-11.0.12-ga.tar.xz b/jdk-updates-jdk11u-jdk-11.0.13-ga.tar.xz similarity index 84% rename from jdk-updates-jdk11u-jdk-11.0.12-ga.tar.xz rename to jdk-updates-jdk11u-jdk-11.0.13-ga.tar.xz index c9ba2753756a01fa82b22b7c9a9202502d0b3a07..e8ba78a3554395139e53bfa3b7ab156db9d720ab 100644 Binary files a/jdk-updates-jdk11u-jdk-11.0.12-ga.tar.xz and b/jdk-updates-jdk11u-jdk-11.0.13-ga.tar.xz differ diff --git a/openjdk-11.spec b/openjdk-11.spec index 6397af6fa76c9707f5619b950a852a29d25debe0..62af5b2522c9bba4dc8ca8710b69d8237c0d89d3 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -114,7 +114,7 @@ # New Version-String scheme-style defines %global majorver 11 -%global securityver 12 +%global securityver 13 # buildjdkver is usually same as %%{majorver}, # but in time of bootstrap of next jdk, it is majorver-1, # and this it is better to change it here, on single place @@ -135,7 +135,7 @@ %global project jdk-updates %global repo jdk11u -%global revision jdk-11.0.12-ga +%global revision jdk-11.0.13-ga %global full_revision %{project}-%{repo}-%{revision} # priority must be 7 digits in total # setting to 1, so debug ones can have 0 @@ -740,7 +740,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 3 +Release: 0 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -841,7 +841,6 @@ Patch59: add-SVE-backend-feature.patch # 11.0.10 Patch61: downgrade-the-symver-of-log2f-posix-spawn.patch Patch62: 8254078-DataOutputStream-is-very-slow-post-disabling.patch -Patch64: Fix-the-memcpy-symbol-issue-during-JDK11-x64-build.patch Patch65: add-LazyBox-feature.patch Patch66: add-G1-Full-GC-optimization.patch Patch67: 8214535-support-Jmap-parallel.patch @@ -861,9 +860,10 @@ Patch77: 8257145-Performance-regression-with-XX-ResizePLAB-af.patch Patch78: create-jfr-dump-file-with-pid-or-timestamp-if-specif.patch Patch79: enhance-the-TimeZone-s-path-solution-on-Euler.patch Patch80: Add-KAE-implementation.patch -Patch81: 8268427-Improve-AlgorithmConstraints-checkAlgorithm-.patch Patch82: PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch +# 11.0.13 + BuildRequires: autoconf BuildRequires: alsa-lib-devel BuildRequires: binutils @@ -1127,7 +1127,6 @@ pushd %{top_level_dir_name} %patch59 -p1 %patch61 -p1 %patch62 -p1 -%patch64 -p1 %patch65 -p1 %patch66 -p1 %patch67 -p1 @@ -1143,7 +1142,6 @@ pushd %{top_level_dir_name} %patch78 -p1 %patch79 -p1 %patch80 -p1 -%patch81 -p1 %patch82 -p1 popd # openjdk @@ -1647,6 +1645,9 @@ require "copy_jdk_configs.lua" %changelog +* Tue Oct 26 2021 kuenking111 - 1:11.0.13.7-0 +- Update to 11.0.13+7 (GA) + * Sat Sep 18 2021 kuenking111 - 1:11.0.12.7-3 - add PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch @@ -1656,7 +1657,6 @@ require "copy_jdk_configs.lua" - add create-jfr-dump-file-with-pid-or-timestamp-if-specif.patch - add enhance-the-TimeZone-s-path-solution-on-Euler.patch - add Add-KAE-implementation.patch -- add 8268427-Improve-AlgorithmConstraints-checkAlgorithm-.patch * Tue Aug 17 2021 eapen - 1:11.0.12.7-1 - add 8247691-Incorrect-handling-of-VM-exceptions-in-C1-deopt-stub.patch @@ -1712,7 +1712,6 @@ require "copy_jdk_configs.lua" - add downgrade-the-symver-of-log2f-posix-spawn.patch - add 8254078-DataOutputStream-is-very-slow-post-disabling.patch - add 8217918-C2-XX-AggressiveUnboxing-is-broken.patch -- add Fix-the-memcpy-symbol-issue-during-JDK11-x64-build.patch * Sun Feb 7 2021 jdkboy - 1:11.0.10.9-2 - remove redundant file info diff --git a/src-openeuler-openjdk-11-resolve-code-inconsistencies.patch b/src-openeuler-openjdk-11-resolve-code-inconsistencies.patch index 51df00cc4159edb9f0b5b8c55fb02fafba548d27..cbf0442c882c0a0ec790d68fa291fcb7f3bc6757 100644 --- a/src-openeuler-openjdk-11-resolve-code-inconsistencies.patch +++ b/src-openeuler-openjdk-11-resolve-code-inconsistencies.patch @@ -364,39 +364,6 @@ index 267610202..f2c1dc0b9 100644 CFLAGS := $(CFLAGS_JDKLIB), \ EXTRA_HEADER_DIRS := \ $(call GetJavaHeaderDir, java.base) \ -diff --git a/src/hotspot/os/linux/attachListener_linux.cpp b/src/hotspot/os/linux/attachListener_linux.cpp -index d79bd1bac..eafe26906 100644 ---- a/src/hotspot/os/linux/attachListener_linux.cpp -+++ b/src/hotspot/os/linux/attachListener_linux.cpp -@@ -498,12 +498,26 @@ bool AttachListener::init_at_startup() { - // If the file .attach_pid exists in the working directory - // or /tmp then this is the trigger to start the attach mechanism - bool AttachListener::is_init_trigger() { -- if (init_at_startup() || is_initialized()) { -- return false; // initialized at startup or already initialized -+ if (init_at_startup()) { -+ return false; // initialized at startup - } -+ - char fn[PATH_MAX + 1]; - int ret; - struct stat64 st; -+ -+ // check initialized -+ if (is_initialized()) { -+ // check .java_pid file exists -+ RESTARTABLE(::stat64(LinuxAttachListener::path(), &st), ret); -+ if (ret == -1) { -+ // shutdown attach listener thread whick is blocked in accept -+ // function;Then attach listener thread exits. -+ ::shutdown(LinuxAttachListener::listener(), SHUT_RDWR); -+ } -+ return false; -+ } -+ - sprintf(fn, ".attach_pid%d", os::current_process_id()); - RESTARTABLE(::stat64(fn, &st), ret); - if (ret == -1) { diff --git a/src/hotspot/share/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp index 211c2acda..86cc0108b 100644 --- a/src/hotspot/share/c1/c1_GraphBuilder.cpp @@ -734,31 +701,6 @@ index cab1de79a..6a67574ad 100644 } #endif -diff --git a/src/hotspot/share/services/attachListener.cpp b/src/hotspot/share/services/attachListener.cpp -index b0f3b2e87..dbe65922e 100644 ---- a/src/hotspot/share/services/attachListener.cpp -+++ b/src/hotspot/share/services/attachListener.cpp -@@ -368,6 +368,7 @@ static void attach_listener_thread_entry(JavaThread* thread, TRAPS) { - for (;;) { - AttachOperation* op = AttachListener::dequeue(); - if (op == NULL) { -+ AttachListener::set_initialized(false); - return; // dequeue failed or shutdown - } - -diff --git a/src/hotspot/share/services/attachListener.hpp b/src/hotspot/share/services/attachListener.hpp -index 4e13fe326..5f5ca3d0f 100644 ---- a/src/hotspot/share/services/attachListener.hpp -+++ b/src/hotspot/share/services/attachListener.hpp -@@ -72,7 +72,7 @@ class AttachListener: AllStatic { - - public: - static bool is_initialized() { return _initialized; } -- static void set_initialized() { _initialized = true; } -+ static void set_initialized(bool init = true) { _initialized = init; } - - // indicates if this VM supports attach-on-demand - static bool is_attach_supported() { return !DisableAttachMechanism; } diff --git a/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java b/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java index 1cbbf9cfc..ef384e609 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java @@ -988,32 +930,6 @@ index 000000000..66d5581f5 + } +} + -diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java -index 66ba75a10..b0e28f192 100644 ---- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java -+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java -@@ -53,7 +53,7 @@ public class VerifyCACerts { - + File.separator + "security" + File.separator + "cacerts"; - - // The numbers of certs now. -- private static final int COUNT = 91; -+ private static final int COUNT = 88; - - // SHA-256 of cacerts, can be generated with - // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95 -@@ -92,12 +92,6 @@ public class VerifyCACerts { - "E7:93:C9:B0:2F:D8:AA:13:E2:1C:31:22:8A:CC:B0:81:19:64:3B:74:9C:89:89:64:B1:74:6D:46:C3:D4:CB:D2"); - put("usertrusteccca [jdk]", - "4F:F4:60:D5:4B:9C:86:DA:BF:BC:FC:57:12:E0:40:0D:2B:ED:3F:BC:4D:4F:BD:AA:86:E0:6A:DC:D2:A9:AD:7A"); -- put("utnuserfirstobjectca [jdk]", -- "6F:FF:78:E4:00:A7:0C:11:01:1C:D8:59:77:C4:59:FB:5A:F9:6A:3D:F0:54:08:20:D0:F4:B8:60:78:75:E5:8F"); -- put("addtrustexternalca [jdk]", -- "68:7F:A4:51:38:22:78:FF:F0:C8:B1:1F:8D:43:D5:76:67:1C:6E:B2:BC:EA:B4:13:FB:83:D9:65:D0:6D:2F:F2"); -- put("addtrustqualifiedca [jdk]", -- "80:95:21:08:05:DB:4B:BC:35:5E:44:28:D8:FD:6E:C2:CD:E3:AB:5F:B9:7A:99:42:98:8E:B8:F4:DC:D0:60:16"); - put("baltimorecybertrustca [jdk]", - "16:AF:57:A9:F6:76:B0:AB:12:60:95:AA:5E:BA:DE:F2:2A:B3:11:19:D6:44:AC:95:CD:4B:93:DB:F3:F2:6A:EB"); - put("digicertglobalrootca [jdk]", diff --git a/test/jdk/sun/security/ssl/SSLContextImpl/CustomizedDTLSDefaultProtocols.java b/test/jdk/sun/security/ssl/SSLContextImpl/CustomizedDTLSDefaultProtocols.java index 0dc0ffac2..e4e9434f9 100644 --- a/test/jdk/sun/security/ssl/SSLContextImpl/CustomizedDTLSDefaultProtocols.java