Hello community, here is the log from the commit of package java-10-openjdk for openSUSE:Factory checked in at 2018-01-30 15:37:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-10-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-10-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-10-openjdk" Tue Jan 30 15:37:21 2018 rev:10 rq:569865 version:10.0.0.0~41 Changes: -------- --- /work/SRC/openSUSE:Factory/java-10-openjdk/java-10-openjdk.changes 2018-01-26 13:36:51.112714305 +0100 +++ /work/SRC/openSUSE:Factory/.java-10-openjdk.new/java-10-openjdk.changes 2018-01-30 15:37:31.381878893 +0100 @@ -1,0 +2,46 @@ +Fri Jan 26 06:48:11 UTC 2018 - [email protected] + +- Update to tag jdk-10+41 + * Fixes: + + S8189761: COMPANY_NAME, IMPLEMENTOR, BUNDLE_VENDOR, VENDOR, + but no configure flag + + S8191839: ModuleElement.DirectiveVisitor :: visit() method + behavior is deviating from the spec + + S8192004: InspectedFrame.materializeVirtualObjects only + updates locals with new objects + + S8194135: The content in textArea can not be pasted after + clicking "Copy" button. + + S8194229: tools/jmod/JmodTest.jtr fails when no privilege to + create sym link on windows + + S8194307: KeyStore#getInstance with custom LoadStoreParameter + succeeds with invalid password + + S8194869: [TESTBUG][aix, s390] Adapt tests to platforms. + + S8194982: 2 Null pointer dereference defect groups related to + ProjNode::is_uncommon_trap_if_pattern() + + S8194989: 2 Null pointer dereference defect groups caused by + Dependencies::DepValue::as_klass() + + S8194991: Null pointer dereference caused by + c2v_getNextStackFrame + + S8194992: Null pointer dereference in MultiNode::proj_out + related to loopexit() + + S8195478: sun/text/resources/LocaleDataTest.java fails with + java.lang.Exception + + S8195615: libsplashscreen linux ppc64le build error after + libpng update + + S8195685: AArch64: AArch64 cannot build with JDK-8174962 + + S8195823: Buffers given to response body subscribers should + not contain unprocessed HTTP data +- Modified patch: + * JDK-8194739-zero.patch + + Version that is commited to the jdk10 repository + * jdk10-gcc6.patch + + Rediff to changed context +- Removed patch: + * JDK-8195685-aarch64.patch + + Integrated upstream +- Added patch: + * JDK-8196136-aarch64.patch + + S8196136: AArch64: Correct register use in patch for + JDK-8195685 + +------------------------------------------------------------------- Old: ---- 860326263d1f.tar.bz2 JDK-8195685-aarch64.patch New: ---- 3eae36c6baa5.tar.bz2 JDK-8196136-aarch64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-10-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.7wzbJT/_old 2018-01-30 15:37:35.025708767 +0100 +++ /var/tmp/diff_new_pack.7wzbJT/_new 2018-01-30 15:37:35.029708581 +0100 @@ -33,10 +33,10 @@ %global updatever 0 %global patchver 0 %global datever 2018-03-20 -%global buildver 40 +%global buildver 41 %global hg_project jdk %global hg_repository jdk10 -%global hg_revision 860326263d1f +%global hg_revision 3eae36c6baa5 %global icedtea_sound_version 1.0.1 %global java_atk_wrapper_version 0.33.2 # priority must be 6 digits in total @@ -176,7 +176,7 @@ # Patch200: ppc_stack_overflow_fix.patch Patch201: JDK-8194739-zero.patch -Patch202: JDK-8195685-aarch64.patch +Patch202: JDK-8196136-aarch64.patch # Patch300: java-10-openjdk-linuxfilestore.patch Patch301: bootcycle_jobs.patch ++++++ 860326263d1f.tar.bz2 -> 3eae36c6baa5.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-10-openjdk/860326263d1f.tar.bz2 /work/SRC/openSUSE:Factory/.java-10-openjdk.new/3eae36c6baa5.tar.bz2 differ: char 11, line 1 ++++++ JDK-8194739-zero.patch ++++++ --- /var/tmp/diff_new_pack.7wzbJT/_old 2018-01-30 15:37:35.089705779 +0100 +++ /var/tmp/diff_new_pack.7wzbJT/_new 2018-01-30 15:37:35.089705779 +0100 @@ -1,5 +1,28 @@ ---- jdk10/src/hotspot/share/interpreter/bytecodeInterpreter.cpp 2018-01-18 00:25:18.000000000 +0100 -+++ jdk10/src/hotspot/share/interpreter/bytecodeInterpreter.cpp 2018-01-22 15:10:47.561677173 +0100 + +# HG changeset patch +# User aph +# Date 1516634342 0 +# Node ID 69d1a15904857fb6dc9c34fde48db62a82f1368a +# Parent d47392528c658d904ce76075130c75d64fda3ceb +8194739: Zero port of 8174962: Better interface invocations +Reviewed-by: adinn, coleenp + +diff -r d47392528c65 -r 69d1a1590485 src/hotspot/cpu/zero/methodHandles_zero.cpp +--- a/src/hotspot/cpu/zero/methodHandles_zero.cpp Tue Dec 19 17:31:53 2017 -0500 ++++ b/src/hotspot/cpu/zero/methodHandles_zero.cpp Mon Jan 22 15:19:02 2018 +0000 +@@ -183,3 +183,9 @@ + return NULL; + } + } ++ ++#ifndef PRODUCT ++void MethodHandles::trace_method_handle(MacroAssembler* _masm, const char* adaptername) { ++ // This is just a stub. ++} ++#endif //PRODUCT +diff -r d47392528c65 -r 69d1a1590485 src/hotspot/share/interpreter/bytecodeInterpreter.cpp +--- a/src/hotspot/share/interpreter/bytecodeInterpreter.cpp Tue Dec 19 17:31:53 2017 -0500 ++++ b/src/hotspot/share/interpreter/bytecodeInterpreter.cpp Mon Jan 22 15:19:02 2018 +0000 @@ -2535,13 +2535,35 @@ // this could definitely be cleaned up QQQ @@ -48,3 +71,4 @@ itableMethodEntry* im = ki->first_method_entry(rcvr->klass()); callee = im[mindex].method(); if (callee == NULL) { + ++++++ JDK-8195685-aarch64.patch -> JDK-8196136-aarch64.patch ++++++ --- /work/SRC/openSUSE:Factory/java-10-openjdk/JDK-8195685-aarch64.patch 2018-01-26 13:36:50.420746624 +0100 +++ /work/SRC/openSUSE:Factory/.java-10-openjdk.new/JDK-8196136-aarch64.patch 2018-01-30 15:37:31.361879826 +0100 @@ -1,297 +1,62 @@ + # HG changeset patch # User adinn -# Date 1516381076 0 -# Fri Jan 19 16:57:56 2018 +0000 -# Node ID 6a964aabc5ff60c1a51737466db5825d60740b60 -# Parent 01094f78d9907af535eb3dec4125955ce390a711 -8195685: AArch64: AArch64 cannot build with JDK-8174962 -Reviewed-by: duke +# Date 1516881392 0 +# Node ID a5736067e82a567a4fdd8ea7182d99514666e479 +# Parent 69d1a15904857fb6dc9c34fde48db62a82f1368a +8196136: AArch64: Correct register use in patch for JDK-8195685 +Summary: itable stubs must not use java argument registers as scratch registers +Reviewed-by: aph -diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp ---- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp -@@ -963,8 +963,12 @@ - RegisterOrConstant itable_index, - Register method_result, - Register scan_temp, -- Label& L_no_such_interface) { -- assert_different_registers(recv_klass, intf_klass, method_result, scan_temp); -+ Label& L_no_such_interface, -+ bool return_method) { -+ assert_different_registers(recv_klass, intf_klass, scan_temp); -+ assert_different_registers(method_result, intf_klass, scan_temp); -+ assert(recv_klass != method_result || !return_method, -+ "recv_klass can be destroyed when method isn't needed"); - assert(itable_index.is_constant() || itable_index.as_register() == method_result, - "caller must use same register for non-constant itable index as for method"); - -@@ -982,12 +986,14 @@ - lea(scan_temp, Address(recv_klass, scan_temp, Address::lsl(3))); - add(scan_temp, scan_temp, vtable_base); - -- // Adjust recv_klass by scaled itable_index, so we can free itable_index. -- assert(itableMethodEntry::size() * wordSize == wordSize, "adjust the scaling in the code below"); -- // lea(recv_klass, Address(recv_klass, itable_index, Address::times_ptr, itentry_off)); -- lea(recv_klass, Address(recv_klass, itable_index, Address::lsl(3))); -- if (itentry_off) -- add(recv_klass, recv_klass, itentry_off); -+ if (return_method) { -+ // Adjust recv_klass by scaled itable_index, so we can free itable_index. -+ assert(itableMethodEntry::size() * wordSize == wordSize, "adjust the scaling in the code below"); -+ // lea(recv_klass, Address(recv_klass, itable_index, Address::times_ptr, itentry_off)); -+ lea(recv_klass, Address(recv_klass, itable_index, Address::lsl(3))); -+ if (itentry_off) -+ add(recv_klass, recv_klass, itentry_off); -+ } - - // for (scan = klass->itable(); scan->interface() != NULL; scan += scan_step) { - // if (scan->interface() == intf) { -@@ -1021,8 +1027,10 @@ - bind(found_method); - - // Got a hit. -- ldr(scan_temp, Address(scan_temp, itableOffsetEntry::offset_offset_in_bytes())); -- ldr(method_result, Address(recv_klass, scan_temp)); -+ if (return_method) { -+ ldrw(scan_temp, Address(scan_temp, itableOffsetEntry::offset_offset_in_bytes())); -+ ldr(method_result, Address(recv_klass, scan_temp, Address::uxtw(0))); -+ } - } - - // virtual method calling -diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp ---- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp -+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp -@@ -875,7 +875,8 @@ - RegisterOrConstant itable_index, - Register method_result, - Register scan_temp, -- Label& no_such_interface); -+ Label& no_such_interface, -+ bool return_method = true); - - // virtual method calling - // n.b. x86 allows RegisterOrConstant for vtable_index -diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp ---- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp -@@ -3279,11 +3279,11 @@ - transition(vtos, vtos); - assert(byte_no == f1_byte, "use this argument"); - -- prepare_invoke(byte_no, r0, rmethod, // get f1 Klass*, f2 itable index -+ prepare_invoke(byte_no, r0, rmethod, // get f1 Klass*, f2 Method* - r2, r3); // recv, flags - - // r0: interface klass (from f1) -- // rmethod: itable index (from f2) -+ // rmethod: method (from f2) - // r2: receiver - // r3: flags - -@@ -3302,11 +3302,28 @@ - __ null_check(r2, oopDesc::klass_offset_in_bytes()); - __ load_klass(r3, r2); - -+ Label no_such_interface, no_such_method; -+ -+ // Receiver subtype check against REFC. -+ // Superklass in r0. Subklass in r3. Blows rscratch2, r13 -+ __ lookup_interface_method(// inputs: rec. class, interface, itable index -+ r3, r0, noreg, -+ // outputs: scan temp. reg, scan temp. reg -+ rscratch2, r13, -+ no_such_interface, -+ /*return_method=*/false); -+ - // profile this call - __ profile_virtual_call(r3, r13, r19); - -- Label no_such_interface, no_such_method; -- -+ // Get declaring interface class from method, and itable index -+ __ ldr(r0, Address(rmethod, Method::const_offset())); -+ __ ldr(r0, Address(r0, ConstMethod::constants_offset())); -+ __ ldr(r0, Address(r0, ConstantPool::pool_holder_offset_in_bytes())); -+ __ ldrw(rmethod, Address(rmethod, Method::itable_index_offset())); -+ __ subw(rmethod, rmethod, Method::itable_index_max); -+ __ negw(rmethod, rmethod); -+ - __ lookup_interface_method(// inputs: rec. class, interface, itable index - r3, r0, rmethod, - // outputs: method, scan temp. reg -diff --git a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp ---- a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp -@@ -29,6 +29,7 @@ - #include "code/vtableStubs.hpp" - #include "interp_masm_aarch64.hpp" - #include "memory/resourceArea.hpp" -+#include "oops/compiledICHolder.hpp" - #include "oops/instanceKlass.hpp" - #include "oops/klassVtable.hpp" - #include "runtime/sharedRuntime.hpp" -@@ -140,28 +141,44 @@ +diff -r 69d1a1590485 -r a5736067e82a src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp +--- a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp Mon Jan 22 15:19:02 2018 +0000 ++++ b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp Thu Jan 25 11:56:32 2018 +0000 +@@ -63,8 +63,8 @@ + + #ifndef PRODUCT + if (CountCompiledCalls) { +- __ lea(r19, ExternalAddress((address) SharedRuntime::nof_megamorphic_calls_addr())); +- __ incrementw(Address(r19)); ++ __ lea(r16, ExternalAddress((address) SharedRuntime::nof_megamorphic_calls_addr())); ++ __ incrementw(Address(r16)); + } #endif - // Entry arguments: -- // rscratch2: Interface -+ // rscratch2: CompiledICHolder - // j_rarg0: Receiver - -- // Free registers (non-args) are r0 (interface), rmethod +@@ -73,13 +73,13 @@ -+ // Most registers are in use; we'll use r19, rmethod, r10, r11 -+ const Register recv_klass_reg = r10; -+ const Register holder_klass_reg = r19; // declaring interface klass (DECC) -+ const Register resolved_klass_reg = rmethod; // resolved interface klass (REFC) -+ const Register temp_reg = r11; -+ const Register icholder_reg = rscratch2; -+ -+ Label L_no_such_interface; -+ -+ __ ldr(resolved_klass_reg, Address(icholder_reg, CompiledICHolder::holder_klass_offset())); -+ __ ldr(holder_klass_reg, Address(icholder_reg, CompiledICHolder::holder_metadata_offset())); -+ - // get receiver (need to skip return address on top of stack) -- - assert(VtableStub::receiver_location() == j_rarg0->as_VMReg(), "receiver expected in j_rarg0"); - // get receiver klass (also an implicit null-check) + // get receiver klass address npe_addr = __ pc(); -- -- // Most registers are in use; we'll use r0, rmethod, r10, r11 -- __ load_klass(r10, j_rarg0); -- -- Label throw_icce; -+ __ load_klass(recv_klass_reg, j_rarg0); - -- // Get Method* and entrypoint for compiler -+ // Receiver subtype check against REFC. -+ // Destroys recv_klass_reg value. -+ __ lookup_interface_method(// inputs: rec. class, interface -+ recv_klass_reg, resolved_klass_reg, noreg, -+ // outputs: scan temp. reg1, scan temp. reg2 -+ recv_klass_reg, temp_reg, -+ L_no_such_interface, -+ /*return_method=*/false); -+ -+ // Get selected method from declaring class and itable index -+ __ load_klass(recv_klass_reg, j_rarg0); // restore recv_klass_reg - __ lookup_interface_method(// inputs: rec. class, interface, itable index -- r10, rscratch2, itable_index, -- // outputs: method, scan temp. reg -- rmethod, r11, -- throw_icce); -+ recv_klass_reg, holder_klass_reg, itable_index, -+ // outputs: method, scan temp. reg -+ rmethod, temp_reg, -+ L_no_such_interface); - - // method (rmethod): Method* - // j_rarg0: receiver -@@ -183,7 +200,7 @@ - __ ldr(rscratch1, Address(rmethod, Method::from_compiled_offset())); - __ br(rscratch1); +- __ load_klass(r19, j_rarg0); ++ __ load_klass(r16, j_rarg0); -- __ bind(throw_icce); -+ __ bind(L_no_such_interface); - __ far_jump(RuntimeAddress(StubRoutines::throw_IncompatibleClassChangeError_entry())); - - __ flush(); -@@ -205,11 +222,11 @@ - int size = DebugVtables ? 216 : 0; - if (CountCompiledCalls) - size += 6 * 4; -- // FIXME -+ // FIXME: vtable stubs only need 36 bytes - if (is_vtable_stub) - size += 52; - else -- size += 104; -+ size += 176; - return size; - - // In order to tune these parameters, run the JVM with VM options -@@ -217,33 +234,58 @@ - // actual itable stubs. Run it with -Xmx31G -XX:+UseCompressedOops. - // - // If Universe::narrow_klass_base is nonzero, decoding a compressed -- // class can take zeveral instructions. Run it with -Xmx31G -- // -XX:+UseCompressedOops. -+ // class can take zeveral instructions. - // - // The JVM98 app. _202_jess has a megamorphic interface call. - // The itable code looks like this: -- // Decoding VtableStub itbl[1]@12 -- // ldr w10, [x1,#8] -- // lsl x10, x10, #3 -- // ldr w11, [x10,#280] -- // add x11, x10, x11, uxtx #3 -- // add x11, x11, #0x1b8 -- // ldr x12, [x11] -- // cmp x9, x12 -- // b.eq success -- // loop: -- // cbz x12, throw_icce -- // add x11, x11, #0x10 -- // ldr x12, [x11] -- // cmp x9, x12 -- // b.ne loop -- // success: -- // ldr x11, [x11,#8] -- // ldr x12, [x10,x11] -- // ldr x8, [x12,#72] -- // br x8 -- // throw_icce: -- // b throw_ICCE_entry -+ -+ // ldr xmethod, [xscratch2,#CompiledICHolder::holder_klass_offset] -+ // ldr x0, [xscratch2] -+ // ldr w10, [x1,#oopDesc::klass_offset_in_bytes] -+ // mov xheapbase, #0x3c000000 // #narrow_klass_base -+ // movk xheapbase, #0x3f7, lsl #32 -+ // add x10, xheapbase, x10 -+ // mov xheapbase, #0xe7ff0000 // #heapbase -+ // movk xheapbase, #0x3f7, lsl #32 -+ // ldr w11, [x10,#vtable_length_offset] -+ // add x11, x10, x11, uxtx #3 -+ // add x11, x11, #itableMethodEntry::method_offset_in_bytes -+ // ldr x10, [x11] -+ // cmp xmethod, x10 -+ // b.eq found_method -+ // search: -+ // cbz x10, no_such_interface -+ // add x11, x11, #0x10 -+ // ldr x10, [x11] -+ // cmp xmethod, x10 -+ // b.ne search -+ // found_method: -+ // ldr w10, [x1,#oopDesc::klass_offset_in_bytes] -+ // mov xheapbase, #0x3c000000 // #narrow_klass_base -+ // movk xheapbase, #0x3f7, lsl #32 -+ // add x10, xheapbase, x10 -+ // mov xheapbase, #0xe7ff0000 // #heapbase -+ // movk xheapbase, #0x3f7, lsl #32 -+ // ldr w11, [x10,#vtable_length_offset] -+ // add x11, x10, x11, uxtx #3 -+ // add x11, x11, #itableMethodEntry::method_offset_in_bytes -+ // add x10, x10, #itentry_off -+ // ldr xmethod, [x11] -+ // cmp x0, xmethod -+ // b.eq found_method2 -+ // search2: -+ // cbz xmethod, 0x000003ffa872e6cc -+ // add x11, x11, #0x10 -+ // ldr xmethod, [x11] -+ // cmp x0, xmethod -+ // b.ne search2 -+ // found_method2: -+ // ldr w11, [x11,#itableOffsetEntry::offset_offset_in_bytes] -+ // ldr xmethod, [x10,w11,uxtw] -+ // ldr xscratch1, [xmethod,#Method::from_compiled_offset] -+ // br xscratch1 -+ // no_such_interface: -+ // b throw_ICCE_entry + #ifndef PRODUCT + if (DebugVtables) { + Label L; + // check offset vs vtable length +- __ ldrw(rscratch1, Address(r19, Klass::vtable_length_offset())); ++ __ ldrw(rscratch1, Address(r16, Klass::vtable_length_offset())); + __ cmpw(rscratch1, vtable_index * vtableEntry::size()); + __ br(Assembler::GT, L); + __ enter(); +@@ -91,7 +91,7 @@ + } + #endif // PRODUCT + +- __ lookup_virtual_method(r19, vtable_index, rmethod); ++ __ lookup_virtual_method(r16, vtable_index, rmethod); + + if (DebugVtables) { + Label L; +@@ -145,9 +145,9 @@ + // j_rarg0: Receiver - } +- // Most registers are in use; we'll use r0, rmethod, r10, r11 ++ // Most registers are in use; we'll use r16, rmethod, r10, r11 + const Register recv_klass_reg = r10; +- const Register holder_klass_reg = r0; // declaring interface klass (DECC) ++ const Register holder_klass_reg = r16; // declaring interface klass (DECC) + const Register resolved_klass_reg = rmethod; // resolved interface klass (REFC) + const Register temp_reg = r11; + const Register icholder_reg = rscratch2; + ++++++ jdk10-gcc6.patch ++++++ --- /var/tmp/diff_new_pack.7wzbJT/_old 2018-01-30 15:37:35.225699430 +0100 +++ /var/tmp/diff_new_pack.7wzbJT/_new 2018-01-30 15:37:35.225699430 +0100 @@ -1,6 +1,6 @@ ---- jdk10/make/hotspot/lib/CompileJvm.gmk 2016-12-01 22:40:08.000000000 +0100 -+++ jdk10/make/hotspot/lib/CompileJvm.gmk 2016-12-09 09:09:29.230552379 +0100 -@@ -181,6 +181,11 @@ +--- jdk10/make/hotspot/lib/CompileJvm.gmk 2018-01-23 13:23:55.000000000 +0100 ++++ jdk10/make/hotspot/lib/CompileJvm.gmk 2018-01-26 08:12:27.089447548 +0100 +@@ -206,6 +206,11 @@ # default. JVM_STRIPFLAGS ?= $(STRIPFLAGS) @@ -12,16 +12,30 @@ ################################################################################ # Now set up the actual compilation of the main hotspot native library -@@ -196,6 +201,7 @@ +@@ -221,6 +226,7 @@ CFLAGS := $(JVM_CFLAGS), \ CFLAGS_DEBUG_SYMBOLS := $(JVM_CFLAGS_SYMBOLS), \ CXXFLAGS_DEBUG_SYMBOLS := $(JVM_CFLAGS_SYMBOLS), \ + CXXFLAGS := $(JVM_CXXFLAGS), \ vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \ + arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \ DISABLED_WARNINGS_clang := tautological-compare, \ - DISABLED_WARNINGS_xlc := 1540-0216 1540-0198 1540-1090 1540-1639 \ ---- jdk10/src/hotspot/cpu/x86/assembler_x86.cpp 2016-12-01 22:40:08.000000000 +0100 -+++ jdk10/src/hotspot/cpu/x86/assembler_x86.cpp 2016-12-09 09:09:29.230552379 +0100 +--- jdk10/make/lib/Awt2dLibraries.gmk 2018-01-23 13:23:55.000000000 +0100 ++++ jdk10/make/lib/Awt2dLibraries.gmk 2018-01-26 08:12:27.097447548 +0100 +@@ -394,6 +394,11 @@ + # The fast floor code loses precision. + LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR + ++# Avoid warning for GCC 6 ++ifeq ($(TOOLCHAIN_TYPE), gcc) ++ LCMS_CFLAGS += -Wno-misleading-indentation ++endif ++ + ifeq ($(USE_EXTERNAL_LCMS), true) + # If we're using an external library, we'll just need the wrapper part. + # By including it explicitly, all other files will be excluded. +--- jdk10/src/hotspot/cpu/x86/assembler_x86.cpp 2018-01-23 13:23:55.000000000 +0100 ++++ jdk10/src/hotspot/cpu/x86/assembler_x86.cpp 2018-01-26 08:12:27.089447548 +0100 @@ -188,10 +188,9 @@ // Address. An index of 4 (rsp) corresponds to having no index, so convert // that to noreg for the Address constructor. @@ -36,8 +50,8 @@ bool valid_index = index != rsp->encoding(); if (valid_index) { Address madr(as_Register(base), as_Register(index), (Address::ScaleFactor)scale, in_ByteSize(disp)); ---- jdk10/src/hotspot/share/c1/c1_Instruction.hpp 2016-12-01 22:40:08.000000000 +0100 -+++ jdk10/src/hotspot/share/c1/c1_Instruction.hpp 2016-12-09 09:09:29.230552379 +0100 +--- jdk10/src/hotspot/share/c1/c1_Instruction.hpp 2018-01-23 13:23:55.000000000 +0100 ++++ jdk10/src/hotspot/share/c1/c1_Instruction.hpp 2018-01-26 08:12:27.093447548 +0100 @@ -348,9 +348,7 @@ public: void* operator new(size_t size) throw() { @@ -49,7 +63,7 @@ } static const int no_bci = -99; -@@ -426,6 +424,7 @@ +@@ -427,6 +425,7 @@ check_state(state_before); assert(type != NULL && (!type->is_constant() || type_is_constant), "type must exist"); update_exception_state(_state_before); @@ -57,7 +71,7 @@ } // accessors -@@ -1681,6 +1680,9 @@ +@@ -1692,6 +1691,9 @@ #ifndef PRODUCT set_printable_bci(bci); #endif @@ -67,9 +81,9 @@ } // accessors ---- jdk10/src/hotspot/share/code/relocInfo.hpp 2016-12-01 22:40:08.000000000 +0100 -+++ jdk10/src/hotspot/share/code/relocInfo.hpp 2016-12-09 09:09:29.230552379 +0100 -@@ -839,7 +839,7 @@ +--- jdk10/src/hotspot/share/code/relocInfo.hpp 2018-01-23 13:23:55.000000000 +0100 ++++ jdk10/src/hotspot/share/code/relocInfo.hpp 2018-01-26 08:12:27.093447548 +0100 +@@ -832,7 +832,7 @@ } @@ -78,8 +92,8 @@ // wordwise copy from r (ok if it copies garbage after r) for (int i = 0; i < _relocbuf_size; i++) { _relocbuf[i] = ((void**)r)[i]; ---- jdk10/src/hotspot/share/opto/type.cpp 2016-12-01 22:40:08.000000000 +0100 -+++ jdk10/src/hotspot/share/opto/type.cpp 2016-12-09 09:09:29.230552379 +0100 +--- jdk10/src/hotspot/share/opto/type.cpp 2018-01-23 13:23:55.000000000 +0100 ++++ jdk10/src/hotspot/share/opto/type.cpp 2018-01-26 08:12:27.093447548 +0100 @@ -50,7 +50,7 @@ // Array which maps compiler types to Basic Types @@ -100,22 +114,8 @@ #ifdef SPARC { Bad, T_ILLEGAL, "vectors:", false, 0, relocInfo::none }, // VectorS ---- jdk10/make/lib/Awt2dLibraries.gmk 2016-11-30 06:58:29.000000000 +0100 -+++ jdk10/make/lib/Awt2dLibraries.gmk 2016-12-09 09:09:29.230552379 +0100 -@@ -393,6 +393,11 @@ - # The fast floor code loses precision. - LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR - -+# Avoid warning for GCC 6 -+ifeq ($(TOOLCHAIN_TYPE), gcc) -+ LCMS_CFLAGS += -Wno-misleading-indentation -+endif -+ - ifeq ($(USE_EXTERNAL_LCMS), true) - # If we're using an external library, we'll just need the wrapper part. - # By including it explicitly, all other files will be excluded. ---- jdk10/src/java.base/share/native/libfdlibm/e_asin.c 2016-11-30 06:58:29.000000000 +0100 -+++ jdk10/src/java.base/share/native/libfdlibm/e_asin.c 2016-12-09 09:09:29.234552289 +0100 +--- jdk10/src/java.base/share/native/libfdlibm/e_asin.c 2018-01-23 13:23:55.000000000 +0100 ++++ jdk10/src/java.base/share/native/libfdlibm/e_asin.c 2018-01-26 08:12:27.097447548 +0100 @@ -97,8 +97,9 @@ } else if (ix<0x3fe00000) { /* |x|<0.5 */ if(ix<0x3e400000) { /* if |x| < 2**-27 */ @@ -127,8 +127,8 @@ p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5))))); q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4))); w = p/q; ---- jdk10/src/java.base/share/native/libfdlibm/k_rem_pio2.c 2016-11-30 06:58:29.000000000 +0100 -+++ jdk10/src/java.base/share/native/libfdlibm/k_rem_pio2.c 2016-12-09 09:09:29.234552289 +0100 +--- jdk10/src/java.base/share/native/libfdlibm/k_rem_pio2.c 2018-01-23 13:23:55.000000000 +0100 ++++ jdk10/src/java.base/share/native/libfdlibm/k_rem_pio2.c 2018-01-26 08:12:27.097447548 +0100 @@ -197,7 +197,9 @@ /* compute q[0],q[1],...q[jk] */
