From 09078045894660694b50a34ad1cf55fb6286dd42 Mon Sep 17 00:00:00 2001 From: panxuefeng Date: Mon, 27 Feb 2023 11:43:32 +0800 Subject: [PATCH 1/2] Sync with Loongson jdk8u362-b09 --- LoongArch-uses-hwcap-detect-cpu-flags.patch | 6 +- LoongArch64-support-jdk8u362b09.patch | 611 ++++++++++++-------- openjdk-1.8.0.spec | 11 +- 3 files changed, 374 insertions(+), 254 deletions(-) diff --git a/LoongArch-uses-hwcap-detect-cpu-flags.patch b/LoongArch-uses-hwcap-detect-cpu-flags.patch index 406a342..3078972 100644 --- a/LoongArch-uses-hwcap-detect-cpu-flags.patch +++ b/LoongArch-uses-hwcap-detect-cpu-flags.patch @@ -1,5 +1,5 @@ diff --git a/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.cpp -index 38eafdce..91e14358 100644 +index 19e090e4..7cc07069 100644 --- a/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.cpp +++ b/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.cpp @@ -34,6 +34,9 @@ @@ -47,7 +47,7 @@ index 38eafdce..91e14358 100644 + + if (auxv & HWCAP_LOONGARCH_LSX) { if (FLAG_IS_DEFAULT(UseLSX)) { - FLAG_SET_DEFAULT(UseLSX, false); + FLAG_SET_DEFAULT(UseLSX, true); } @@ -204,7 +213,7 @@ void VM_Version::get_processor_features() { FLAG_SET_DEFAULT(UseLSX, false); @@ -56,7 +56,7 @@ index 38eafdce..91e14358 100644 - if (supports_lasx()) { + if (auxv & HWCAP_LOONGARCH_LASX) { if (FLAG_IS_DEFAULT(UseLASX)) { - FLAG_SET_DEFAULT(UseLASX, false); + FLAG_SET_DEFAULT(UseLASX, true); } @@ -289,10 +298,11 @@ void VM_Version::get_processor_features() { jio_snprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s, " diff --git a/LoongArch64-support-jdk8u362b09.patch b/LoongArch64-support-jdk8u362b09.patch index 8d783a3..ae28a93 100644 --- a/LoongArch64-support-jdk8u362b09.patch +++ b/LoongArch64-support-jdk8u362b09.patch @@ -342,7 +342,7 @@ index 51df988f..51cc28c3 100644 +AC_SUBST(HOST_NAME) +]) diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in -index 506cf617..40d0c152 100644 +index 506cf617..eef5939e 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -23,6 +23,12 @@ @@ -350,8 +350,8 @@ index 506cf617..40d0c152 100644 # +# -+# This file has been modified by Loongson Technology in 2022. These -+# modifications are Copyright (c) 2018, 2022, Loongson Technology, and are made ++# This file has been modified by Loongson Technology in 2023. These ++# modifications are Copyright (c) 2018, 2023, Loongson Technology, and are made +# available on the same license terms set forth above. +# + @@ -368,7 +368,7 @@ index 506cf617..40d0c152 100644 +HOST_NAME:=@HOST_NAME@ + +# Loongson OpenJDK Version info -+VER=8.1.12 ++VER=8.1.13 +ifeq ($(HOST_NAME), ) + HOST_NAME=unknown +endif @@ -4963,10 +4963,10 @@ index 120dd1a7..6a328902 100644 diff --git a/hotspot/src/cpu/loongarch/vm/assembler_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/assembler_loongarch.cpp new file mode 100644 -index 00000000..ab4ece6f +index 00000000..2996ef7a --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/assembler_loongarch.cpp -@@ -0,0 +1,856 @@ +@@ -0,0 +1,855 @@ +/* + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2021, Loongson Technology. All rights reserved. @@ -5384,7 +5384,6 @@ index 00000000..ab4ece6f + ldx_w(dst, base, AT); + } + } -+//Disassembler::decode(pc()-32, pc(), tty); +} + +void Assembler::ld_wu(Register rd, Address src){ @@ -5825,10 +5824,10 @@ index 00000000..ab4ece6f +} diff --git a/hotspot/src/cpu/loongarch/vm/assembler_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/assembler_loongarch.hpp new file mode 100644 -index 00000000..4255544e +index 00000000..922968a5 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/assembler_loongarch.hpp -@@ -0,0 +1,2797 @@ +@@ -0,0 +1,2804 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, Loongson Technology. All rights reserved. @@ -7388,8 +7387,15 @@ index 00000000..4255544e + } + + inline void emit_data(int x) { emit_int32(x); } -+ inline void emit_data(int, RelocationHolder const&); -+ inline void emit_data(int, relocInfo::relocType rtype); ++ inline void emit_data(int x, relocInfo::relocType rtype) { ++ relocate(rtype); ++ emit_int32(x); ++ } ++ ++ inline void emit_data(int x, RelocationHolder const& rspec) { ++ relocate(rspec); ++ emit_int32(x); ++ } + + // Generic instructions + // Does 32bit or 64bit as needed for the platform. In some sense these @@ -8628,10 +8634,10 @@ index 00000000..4255544e +#endif // CPU_LOONGARCH_VM_ASSEMBLER_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/assembler_loongarch.inline.hpp b/hotspot/src/cpu/loongarch/vm/assembler_loongarch.inline.hpp new file mode 100644 -index 00000000..acbe55c9 +index 00000000..601f4afe --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/assembler_loongarch.inline.hpp -@@ -0,0 +1,43 @@ +@@ -0,0 +1,33 @@ +/* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, Loongson Technology. All rights reserved. @@ -8664,16 +8670,6 @@ index 00000000..acbe55c9 +#include "asm/codeBuffer.hpp" +#include "code/codeCache.hpp" + -+inline void Assembler::emit_data(int x, relocInfo::relocType rtype) { -+ relocate(rtype); -+ emit_int32(x); -+} -+ -+inline void Assembler::emit_data(int x, RelocationHolder const& rspec) { -+ relocate(rspec); -+ emit_int32(x); -+} -+ +#endif // CPU_LOONGARCH_VM_ASSEMBLER_LOONGARCH_INLINE_HPP diff --git a/hotspot/src/cpu/loongarch/vm/bytecodeInterpreter_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/bytecodeInterpreter_loongarch.hpp new file mode 100644 @@ -22743,10 +22739,10 @@ index 00000000..de97de58 +#endif // CPU_LOONGARCH_VM_JAVAFRAMEANCHOR_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/jniFastGetField_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/jniFastGetField_loongarch_64.cpp new file mode 100644 -index 00000000..96b89a68 +index 00000000..5b52e54e --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/jniFastGetField_loongarch_64.cpp -@@ -0,0 +1,168 @@ +@@ -0,0 +1,169 @@ +/* + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2021, Loongson Technology. All rights reserved. @@ -22774,6 +22770,7 @@ index 00000000..96b89a68 + +#include "precompiled.hpp" +#include "asm/macroAssembler.hpp" ++#include "code/codeBlob.hpp" +#include "memory/resourceArea.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm_misc.hpp" @@ -41495,10 +41492,10 @@ index 00000000..f8433742 + } diff --git a/hotspot/src/cpu/loongarch/vm/nativeInst_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/nativeInst_loongarch.cpp new file mode 100644 -index 00000000..b6c01ae6 +index 00000000..639ac6cd --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/nativeInst_loongarch.cpp -@@ -0,0 +1,479 @@ +@@ -0,0 +1,485 @@ +/* + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, Loongson Technology. All rights reserved. @@ -41538,6 +41535,10 @@ index 00000000..b6c01ae6 +#include "c1/c1_Runtime1.hpp" +#endif + ++#ifndef PRODUCT ++#include "compiler/disassembler.hpp" ++#endif ++ +#include + +#define A0 RA0 @@ -41814,7 +41815,9 @@ index 00000000..b6c01ae6 + return Assembler::simm12((int_at(0) >> 10) & 0xfff); + } + ++#ifndef PRODUCT + Disassembler::decode(addr_at(0), addr_at(0) + 16, tty); ++#endif + fatal("not a mov reg, imm52"); + return 0; // unreachable +} @@ -43553,13 +43556,13 @@ index 00000000..e6ee65f3 +} diff --git a/hotspot/src/cpu/loongarch/vm/sharedRuntime_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/sharedRuntime_loongarch_64.cpp new file mode 100644 -index 00000000..94819100 +index 00000000..9efcd2ce --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/sharedRuntime_loongarch_64.cpp @@ -0,0 +1,3453 @@ +/* + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2015, 2021, Loongson Technology. All rights reserved. ++ * Copyright (c) 2015, 2023, Loongson Technology. 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 @@ -45174,7 +45177,7 @@ index 00000000..94819100 + + const Register oop_handle_reg = S4; + if (is_critical_native) { -+ __ stop("generate_native_wrapper in sharedRuntime <2>"); ++ Unimplemented(); + // check_needs_gc_for_critical_native(masm, stack_slots, total_c_args, total_in_args, + // oop_handle_offset, oop_maps, in_regs, in_sig_bt); + } @@ -45237,7 +45240,7 @@ index 00000000..94819100 + // critical natives they are offset down. + GrowableArray arg_order(2 * total_in_args); + VMRegPair tmp_vmreg; -+ tmp_vmreg.set1(T8->as_VMReg()); ++ tmp_vmreg.set2(T8->as_VMReg()); + + if (!is_critical_native) { + for (int i = total_in_args - 1, c_arg = total_c_args - 1; i >= 0; i--, c_arg--) { @@ -45246,7 +45249,7 @@ index 00000000..94819100 + } + } else { + // Compute a valid move order, using tmp_vmreg to break any cycles -+ __ stop("generate_native_wrapper in sharedRuntime <2>"); ++ Unimplemented(); + // ComputeMoveOrder cmo(total_in_args, in_regs, total_c_args, out_regs, in_sig_bt, arg_order, tmp_vmreg); + } + @@ -45284,7 +45287,7 @@ index 00000000..94819100 + switch (in_sig_bt[i]) { + case T_ARRAY: + if (is_critical_native) { -+ __ stop("generate_native_wrapper in sharedRuntime <2>"); ++ Unimplemented(); + // unpack_array_argument(masm, in_regs[i], in_elem_bt[i], out_regs[c_arg + 1], out_regs[c_arg]); + c_arg++; +#ifdef ASSERT @@ -45465,7 +45468,7 @@ index 00000000..94819100 + } + __ st_w(AT, thread, in_bytes(JavaThread::thread_state_offset())); + // do the call -+ __ call(method->native_function(), relocInfo::runtime_call_type); ++ __ call(native_func, relocInfo::runtime_call_type); + __ bind(native_return); + + oop_maps->add_gc_map(((intptr_t)__ pc()) - start, map); @@ -57564,13 +57567,13 @@ index 00000000..682dd9c7 +#endif // CPU_LOONGARCH_VM_VM_VERSION_EXT_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.cpp new file mode 100644 -index 00000000..19e090e4 +index 00000000..e1abacee --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.cpp -@@ -0,0 +1,434 @@ +@@ -0,0 +1,441 @@ +/* + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2015, 2020, Loongson Technology. All rights reserved. ++ * Copyright (c) 2015, 2023, Loongson Technology. 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 @@ -57985,6 +57988,13 @@ index 00000000..19e090e4 + if (FLAG_IS_DEFAULT(UseUnalignedAccesses)) { + FLAG_SET_DEFAULT(UseUnalignedAccesses, true); + } ++ ++ if (CriticalJNINatives) { ++ if (FLAG_IS_CMDLINE(CriticalJNINatives)) { ++ warning("CriticalJNINatives specified, but not supported in this VM"); ++ } ++ FLAG_SET_DEFAULT(CriticalJNINatives, false); ++ } +} + +void VM_Version::initialize() { @@ -58776,10 +58786,10 @@ index 00000000..df0d176b +} diff --git a/hotspot/src/cpu/mips/vm/assembler_mips.cpp b/hotspot/src/cpu/mips/vm/assembler_mips.cpp new file mode 100644 -index 00000000..51ef7f47 +index 00000000..6c720972 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/assembler_mips.cpp -@@ -0,0 +1,748 @@ +@@ -0,0 +1,774 @@ +/* + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, Loongson Technology. All rights reserved. @@ -58819,6 +58829,9 @@ index 00000000..51ef7f47 +#include "runtime/os.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" ++#ifndef PRODUCT ++#include "compiler/disassembler.hpp" ++#endif +#if INCLUDE_ALL_GCS +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" @@ -59528,9 +59541,32 @@ index 00000000..51ef7f47 + emit_long((jal_op<<26) | dest); + has_delay_slot(); +} ++ ++void Assembler::emit_long(int x) { // shadows AbstractAssembler::emit_long ++ check_delay(); ++ AbstractAssembler::emit_int32(x); ++} ++ ++inline void Assembler::emit_data(int x) { emit_long(x); } ++inline void Assembler::emit_data(int x, relocInfo::relocType rtype) { ++ relocate(rtype); ++ emit_long(x); ++} ++ ++inline void Assembler::emit_data(int x, RelocationHolder const& rspec) { ++ relocate(rspec); ++ emit_long(x); ++} ++ ++inline void Assembler::check_delay() { ++#ifdef CHECK_DELAY ++ guarantee(delay_state != at_delay_slot, "must say delayed() when filling delay slot"); ++ delay_state = no_delay; ++#endif ++} diff --git a/hotspot/src/cpu/mips/vm/assembler_mips.hpp b/hotspot/src/cpu/mips/vm/assembler_mips.hpp new file mode 100644 -index 00000000..e46d0a81 +index 00000000..e91b9db2 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/assembler_mips.hpp @@ -0,0 +1,1789 @@ @@ -60512,11 +60548,11 @@ index 00000000..e46d0a81 + AbstractAssembler::flush(); + } + -+ inline void emit_long(int); // shadows AbstractAssembler::emit_long -+ inline void emit_data(int x) { emit_long(x); } -+ inline void emit_data(int, RelocationHolder const&); -+ inline void emit_data(int, relocInfo::relocType rtype); -+ inline void check_delay(); ++ void emit_long(int); // shadows AbstractAssembler::emit_long ++ void emit_data(int); ++ void emit_data(int, RelocationHolder const&); ++ void emit_data(int, relocInfo::relocType rtype); ++ void check_delay(); + + + // Generic instructions @@ -61325,10 +61361,10 @@ index 00000000..e46d0a81 +#endif // CPU_MIPS_VM_ASSEMBLER_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/assembler_mips.inline.hpp b/hotspot/src/cpu/mips/vm/assembler_mips.inline.hpp new file mode 100644 -index 00000000..ece9183c +index 00000000..39aeb550 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/assembler_mips.inline.hpp -@@ -0,0 +1,57 @@ +@@ -0,0 +1,33 @@ +/* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2021, Loongson Technology. All rights reserved. @@ -61361,30 +61397,6 @@ index 00000000..ece9183c +#include "asm/codeBuffer.hpp" +#include "code/codeCache.hpp" + -+ -+ -+inline void Assembler::check_delay() { -+# ifdef CHECK_DELAY -+ guarantee(delay_state != at_delay_slot, "must say delayed() when filling delay slot"); -+ delay_state = no_delay; -+# endif -+} -+ -+inline void Assembler::emit_long(int x) { -+ check_delay(); -+ AbstractAssembler::emit_int32(x); -+} -+ -+inline void Assembler::emit_data(int x, relocInfo::relocType rtype) { -+ relocate(rtype); -+ emit_long(x); -+} -+ -+inline void Assembler::emit_data(int x, RelocationHolder const& rspec) { -+ relocate(rspec); -+ emit_long(x); -+} -+ +#endif // CPU_MIPS_VM_ASSEMBLER_MIPS_INLINE_HPP diff --git a/hotspot/src/cpu/mips/vm/bytecodeInterpreter_mips.cpp b/hotspot/src/cpu/mips/vm/bytecodeInterpreter_mips.cpp new file mode 100644 @@ -67915,10 +67927,10 @@ index 00000000..dccdf6a0 +#endif // CPU_MIPS_VM_JAVAFRAMEANCHOR_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/jniFastGetField_mips_64.cpp b/hotspot/src/cpu/mips/vm/jniFastGetField_mips_64.cpp new file mode 100644 -index 00000000..da94d031 +index 00000000..0f7dd942 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/jniFastGetField_mips_64.cpp -@@ -0,0 +1,171 @@ +@@ -0,0 +1,172 @@ +/* + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2021, Loongson Technology. All rights reserved. @@ -67946,6 +67958,7 @@ index 00000000..da94d031 + +#include "precompiled.hpp" +#include "asm/macroAssembler.hpp" ++#include "code/codeBlob.hpp" +#include "memory/resourceArea.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm_misc.hpp" @@ -88235,10 +88248,10 @@ index 00000000..2d714c8b + diff --git a/hotspot/src/cpu/mips/vm/nativeInst_mips.cpp b/hotspot/src/cpu/mips/vm/nativeInst_mips.cpp new file mode 100644 -index 00000000..c4ecaf10 +index 00000000..e1f7cd94 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/nativeInst_mips.cpp -@@ -0,0 +1,1828 @@ +@@ -0,0 +1,1829 @@ +/* + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, Loongson Technology. All rights reserved. @@ -88266,6 +88279,7 @@ index 00000000..c4ecaf10 + +#include "precompiled.hpp" +#include "asm/macroAssembler.hpp" ++#include "code/codeBlob.hpp" +#include "code/codeCache.hpp" +#include "compiler/disassembler.hpp" +#include "memory/resourceArea.hpp" @@ -91802,13 +91816,13 @@ index 00000000..bb9269b4 +} diff --git a/hotspot/src/cpu/mips/vm/sharedRuntime_mips_64.cpp b/hotspot/src/cpu/mips/vm/sharedRuntime_mips_64.cpp new file mode 100644 -index 00000000..35821c81 +index 00000000..daf04c44 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/sharedRuntime_mips_64.cpp @@ -0,0 +1,3816 @@ +/* + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2015, 2022, Loongson Technology. All rights reserved. ++ * Copyright (c) 2015, 2023, Loongson Technology. 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 @@ -93455,7 +93469,7 @@ index 00000000..35821c81 + + const Register oop_handle_reg = S4; + if (is_critical_native) { -+ __ stop("generate_native_wrapper in sharedRuntime <2>"); ++ Unimplemented(); + // check_needs_gc_for_critical_native(masm, stack_slots, total_c_args, total_in_args, + // oop_handle_offset, oop_maps, in_regs, in_sig_bt); + } @@ -93518,7 +93532,7 @@ index 00000000..35821c81 + // critical natives they are offset down. + GrowableArray arg_order(2 * total_in_args); + VMRegPair tmp_vmreg; -+ tmp_vmreg.set1(T8->as_VMReg()); ++ tmp_vmreg.set2(T8->as_VMReg()); + + if (!is_critical_native) { + for (int i = total_in_args - 1, c_arg = total_c_args - 1; i >= 0; i--, c_arg--) { @@ -93527,7 +93541,7 @@ index 00000000..35821c81 + } + } else { + // Compute a valid move order, using tmp_vmreg to break any cycles -+ __ stop("generate_native_wrapper in sharedRuntime <2>"); ++ Unimplemented(); + // ComputeMoveOrder cmo(total_in_args, in_regs, total_c_args, out_regs, in_sig_bt, arg_order, tmp_vmreg); + } + @@ -93565,7 +93579,7 @@ index 00000000..35821c81 + switch (in_sig_bt[i]) { + case T_ARRAY: + if (is_critical_native) { -+ __ stop("generate_native_wrapper in sharedRuntime <2>"); ++ Unimplemented(); + // unpack_array_argument(masm, in_regs[i], in_elem_bt[i], out_regs[c_arg + 1], out_regs[c_arg]); + c_arg++; +#ifdef ASSERT @@ -93758,7 +93772,7 @@ index 00000000..35821c81 + } + __ sw(AT, thread, in_bytes(JavaThread::thread_state_offset())); + // do the call -+ __ call(method->native_function(), relocInfo::runtime_call_type); ++ __ call(native_func, relocInfo::runtime_call_type); + __ delayed()->nop(); + // WARNING - on Windows Java Natives use pascal calling convention and pop the + // arguments off of the stack. We could just re-adjust the stack pointer here @@ -105231,13 +105245,13 @@ index 00000000..a240fcc2 +#endif // CPU_MIPS_VM_VM_VERSION_EXT_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/vm_version_mips.cpp b/hotspot/src/cpu/mips/vm/vm_version_mips.cpp new file mode 100644 -index 00000000..99e16dda +index 00000000..aef8f074 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/vm_version_mips.cpp -@@ -0,0 +1,504 @@ +@@ -0,0 +1,510 @@ +/* + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2015, 2021, Loongson Technology. All rights reserved. ++ * Copyright (c) 2015, 2023, Loongson Technology. 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 @@ -105722,6 +105736,12 @@ index 00000000..99e16dda + UseMontgomerySquareIntrinsic = true; + } + ++ if (CriticalJNINatives) { ++ if (FLAG_IS_CMDLINE(CriticalJNINatives)) { ++ warning("CriticalJNINatives specified, but not supported in this VM"); ++ } ++ FLAG_SET_DEFAULT(CriticalJNINatives, false); ++ } +} + +void VM_Version::initialize() { @@ -107280,7 +107300,7 @@ index 00000000..0e1331ac +#endif // OS_CPU_LINUX_LOONGARCH_VM_ORDERACCESS_LINUX_LOONGARCH_INLINE_HPP diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/os_linux_loongarch.cpp b/hotspot/src/os_cpu/linux_loongarch/vm/os_linux_loongarch.cpp new file mode 100644 -index 00000000..2f4a0898 +index 00000000..f2c3df84 --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/os_linux_loongarch.cpp @@ -0,0 +1,750 @@ @@ -107610,7 +107630,7 @@ index 00000000..2f4a0898 +#endif + + // Handle signal from NativeJump::patch_verified_entry(). -+ if (sig == SIGILL & nativeInstruction_at(pc)->is_sigill_zombie_not_entrant()) { ++ if (sig == SIGILL && nativeInstruction_at(pc)->is_sigill_zombie_not_entrant()) { +#ifdef PRINT_SIGNAL_HANDLE + tty->print_cr("verified entry = %lx, sig=%d", nativeInstruction_at(pc), sig); +#endif @@ -109526,13 +109546,13 @@ index 00000000..c9bc169a +#endif // OS_CPU_LINUX_MIPS_VM_ORDERACCESS_LINUX_MIPS_INLINE_HPP diff --git a/hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.cpp b/hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.cpp new file mode 100644 -index 00000000..a23c302c +index 00000000..43487dab --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.cpp @@ -0,0 +1,1015 @@ +/* + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2015, 2022, Loongson Technology. All rights reserved. ++ * Copyright (c) 2015, 2023, Loongson Technology. 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 @@ -109883,7 +109903,7 @@ index 00000000..a23c302c +#endif + + // Handle signal from NativeJump::patch_verified_entry(). -+ if (sig == SIGILL & nativeInstruction_at(pc)->is_sigill_zombie_not_entrant()) { ++ if (sig == SIGILL && nativeInstruction_at(pc)->is_sigill_zombie_not_entrant()) { +#ifdef PRINT_SIGNAL_HANDLE + tty->print_cr("verified entry = %lx, sig=%d", nativeInstruction_at(pc), sig); +#endif @@ -111251,7 +111271,7 @@ index 1a48cb31..8ac90e14 100644 # include "assembler_aarch64.inline.hpp" #endif diff --git a/hotspot/src/share/vm/asm/codeBuffer.cpp b/hotspot/src/share/vm/asm/codeBuffer.cpp -index d94ac406..6172d32a 100644 +index d94ac406..f6b57811 100644 --- a/hotspot/src/share/vm/asm/codeBuffer.cpp +++ b/hotspot/src/share/vm/asm/codeBuffer.cpp @@ -22,6 +22,12 @@ @@ -111259,21 +111279,19 @@ index d94ac406..6172d32a 100644 */ +/* -+ * This file has been modified by Loongson Technology in 2021. These -+ * modifications are Copyright (c) 2015, 2021, Loongson Technology, and are made ++ * This file has been modified by Loongson Technology in 2023. These ++ * modifications are Copyright (c) 2015, 2023, Loongson Technology, and are made + * available on the same license terms set forth above. + */ + #include "precompiled.hpp" #include "asm/codeBuffer.hpp" #include "compiler/disassembler.hpp" -@@ -323,6 +329,9 @@ void CodeSection::relocate(address at, RelocationHolder const& spec, int format) +@@ -323,6 +329,7 @@ void CodeSection::relocate(address at, RelocationHolder const& spec, int format) assert(rtype == relocInfo::none || rtype == relocInfo::runtime_call_type || rtype == relocInfo::internal_word_type|| -+#if defined MIPS && !defined ZERO -+ rtype == relocInfo::internal_pc_type || -+#endif ++ NOT_ZERO(MIPS64_ONLY(rtype == relocInfo::internal_pc_type ||)) rtype == relocInfo::section_word_type || rtype == relocInfo::external_word_type, "code needs relocation information"); @@ -114278,7 +114296,7 @@ index 25884fea..5d4e77f2 100644 void write_ref_field_gc_work(void* field, oop new_val) { inline_write_ref_field_gc(field, new_val); diff --git a/hotspot/src/share/vm/memory/metaspace.cpp b/hotspot/src/share/vm/memory/metaspace.cpp -index 600bcfd1..f326dad7 100644 +index 2912f41b..f326dad7 100644 --- a/hotspot/src/share/vm/memory/metaspace.cpp +++ b/hotspot/src/share/vm/memory/metaspace.cpp @@ -21,6 +21,13 @@ @@ -114319,23 +114337,6 @@ index 600bcfd1..f326dad7 100644 if (!metaspace_rs.is_reserved()) { #if INCLUDE_CDS -@@ -3937,11 +3944,13 @@ class TestVirtualSpaceNodeTest { - assert(cm.sum_free_chunks() == 2*MediumChunk, "sizes should add up"); - } - -- { // 4 pages of VSN is committed, some is used by chunks -+ const size_t page_chunks = 4 * (size_t)os::vm_page_size() / BytesPerWord; -+ // This doesn't work for systems with vm_page_size >= 16K. -+ if (page_chunks < MediumChunk) { -+ // 4 pages of VSN is committed, some is used by chunks - ChunkManager cm(SpecializedChunk, SmallChunk, MediumChunk); - VirtualSpaceNode vsn(vsn_test_size_bytes); -- const size_t page_chunks = 4 * (size_t)os::vm_page_size() / BytesPerWord; -- assert(page_chunks < MediumChunk, "Test expects medium chunks to be at least 4*page_size"); -+ - vsn.initialize(); - vsn.expand_by(page_chunks, page_chunks); - vsn.get_chunk_vs(SmallChunk); diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/hotspot/src/share/vm/oops/constantPool.hpp index ec111df0..6c060710 100644 --- a/hotspot/src/share/vm/oops/constantPool.hpp @@ -114633,7 +114634,7 @@ index de6d443c..0b27dc93 100644 void set_reg_pressure(int i) { _reg_pressure = i; } int reg_pressure() const { return _reg_pressure; } diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp -index 5bee20b5..c4d89342 100644 +index ae22ba84..9004dc0d 100644 --- a/hotspot/src/share/vm/opto/compile.cpp +++ b/hotspot/src/share/vm/opto/compile.cpp @@ -22,6 +22,12 @@ @@ -114661,10 +114662,10 @@ index 5bee20b5..c4d89342 100644 // -------------------- Compile::mach_constant_base_node ----------------------- diff --git a/hotspot/src/share/vm/opto/compile.hpp b/hotspot/src/share/vm/opto/compile.hpp -index c92e7d2d..777b5120 100644 +index b4f4cfef..d263ee2f 100644 --- a/hotspot/src/share/vm/opto/compile.hpp +++ b/hotspot/src/share/vm/opto/compile.hpp -@@ -1029,7 +1029,7 @@ class Compile : public Phase { +@@ -1025,7 +1025,7 @@ class Compile : public Phase { bool in_scratch_emit_size() const { return _in_scratch_emit_size; } enum ScratchBufferBlob { @@ -114758,7 +114759,7 @@ index b320f6bf..4bfb0ff0 100644 //------------------------------BoxLockNode------------------------------------ diff --git a/hotspot/src/share/vm/opto/matcher.cpp b/hotspot/src/share/vm/opto/matcher.cpp -index 0c9a8d43..f768524c 100644 +index 75f1fbee..994de073 100644 --- a/hotspot/src/share/vm/opto/matcher.cpp +++ b/hotspot/src/share/vm/opto/matcher.cpp @@ -22,6 +22,12 @@ @@ -115866,7 +115867,7 @@ index e18b9127..9bf93376 100644 static jint _verify_oop_count; diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp -index 3df082fd..ff726866 100644 +index e6586c40..3db678ff 100644 --- a/hotspot/src/share/vm/runtime/thread.cpp +++ b/hotspot/src/share/vm/runtime/thread.cpp @@ -22,6 +22,12 @@ @@ -115883,7 +115884,7 @@ index 3df082fd..ff726866 100644 #include "classfile/classLoader.hpp" #include "classfile/javaClasses.hpp" diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp -index fcd4814f..b49e03f6 100644 +index 7d80daba..98d195f7 100644 --- a/hotspot/src/share/vm/runtime/thread.hpp +++ b/hotspot/src/share/vm/runtime/thread.hpp @@ -22,6 +22,12 @@ @@ -116037,7 +116038,7 @@ index 32e3921b..c6cc4c43 100644 #endif // COMPILER2 diff --git a/hotspot/src/share/vm/runtime/vm_version.cpp b/hotspot/src/share/vm/runtime/vm_version.cpp -index 4c61570e..56613e76 100644 +index 66c383bf..9e643241 100644 --- a/hotspot/src/share/vm/runtime/vm_version.cpp +++ b/hotspot/src/share/vm/runtime/vm_version.cpp @@ -22,6 +22,12 @@ @@ -116183,7 +116184,7 @@ index 81866b84..61fc0c48 100644 /* * If a platform does not support native stack walking diff --git a/hotspot/src/share/vm/utilities/macros.hpp b/hotspot/src/share/vm/utilities/macros.hpp -index 53cc46be..d9d147c4 100644 +index 599e1074..41ef06e2 100644 --- a/hotspot/src/share/vm/utilities/macros.hpp +++ b/hotspot/src/share/vm/utilities/macros.hpp @@ -22,6 +22,12 @@ @@ -116199,7 +116200,7 @@ index 53cc46be..d9d147c4 100644 #ifndef SHARE_VM_UTILITIES_MACROS_HPP #define SHARE_VM_UTILITIES_MACROS_HPP -@@ -370,6 +376,30 @@ +@@ -373,6 +379,30 @@ #define NOT_SPARC(code) code #endif @@ -116446,45 +116447,99 @@ index fa7a3250..7098a98a 100644 st->print_cr("# Java VM: %s (%s %s %s %s)", Abstract_VM_Version::vm_name(), Abstract_VM_Version::vm_release(), -diff --git a/hotspot/test/compiler/6865265/StackOverflowBug.java b/hotspot/test/compiler/6865265/StackOverflowBug.java -index 295a6b41..b8fe082f 100644 ---- a/hotspot/test/compiler/6865265/StackOverflowBug.java -+++ b/hotspot/test/compiler/6865265/StackOverflowBug.java -@@ -28,7 +28,7 @@ - * @summary JVM crashes with "missing exception handler" error - * @author volker.simonis@sap.com - * -- * @run main/othervm -XX:CompileThreshold=100 -Xbatch -Xss248k StackOverflowBug -+ * @run main/othervm -XX:CompileThreshold=100 -Xbatch -Xss392k StackOverflowBug - */ +diff --git a/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh b/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh +index e2de2d3e..5b8e7dcc 100644 +--- a/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh ++++ b/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh +@@ -24,6 +24,12 @@ + # questions. + # + ++# ++# This file has been modified by Loongson Technology in 2023. These ++# modifications are Copyright (c) 2023, Loongson Technology, and are made ++# available on the same license terms set forth above. ++# ++ + ## @test Test8167409.sh + ## @bug 8167409 + ## @summary Invalid value passed to critical JNI function +@@ -44,14 +50,14 @@ echo "Testing on " $OS + case "$OS" in + Linux) + cc_cmd=`which gcc` +- if [ "x$cc_cmd" == "x" ]; then ++ if [ "x$cc_cmd" = "x" ]; then + echo "WARNING: gcc not found. Cannot execute test." 2>&1 + exit 0; + fi + ;; + Solaris) + cc_cmd=`which cc` +- if [ "x$cc_cmd" == "x" ]; then ++ if [ "x$cc_cmd" = "x" ]; then + echo "WARNING: cc not found. Cannot execute test." 2>&1 + exit 0; + fi +@@ -63,11 +69,23 @@ case "$OS" in + esac + # CriticalJNINatives is not supported for aarch64 +-if [ $VM_CPU == "aarch64" ]; then ++if [ $VM_CPU = "aarch64" ]; then + echo "Test Passed" + exit 0; + fi -diff --git a/hotspot/test/compiler/8009761/Test8009761.java b/hotspot/test/compiler/8009761/Test8009761.java -index 401458b6..03584789 100644 ---- a/hotspot/test/compiler/8009761/Test8009761.java -+++ b/hotspot/test/compiler/8009761/Test8009761.java -@@ -25,7 +25,7 @@ - * @test - * @bug 8009761 - * @summary Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates -- * @run main/othervm -XX:CompileCommand=exclude,Test8009761::m2 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -Xss256K Test8009761 -+ * @run main/othervm -XX:CompileCommand=exclude,Test8009761::m2 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -Xss392K Test8009761 - * - */ ++# CriticalJNINatives is not supported for loongarch64 ++if [ $VM_CPU = "loongarch64" ]; then ++ echo "Test Passed" ++ exit 0; ++fi ++ ++# CriticalJNINatives is not supported for mips64 ++if [ $VM_CPU = "mips64" -o $VM_CPU = "mips64el" ]; then ++ echo "Test Passed" ++ exit 0; ++fi ++ + THIS_DIR=. -diff --git a/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java b/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java -index 996d82a0..d3cace05 100644 ---- a/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java -+++ b/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java -@@ -25,7 +25,7 @@ - * @test - * @bug 8054224 - * @summary Recursive method compiled by C1 is unable to catch StackOverflowError -- * @run main/othervm -Xcomp -XX:CompileOnly=Test.run -XX:+TieredCompilation -XX:TieredStopAtLevel=2 -Xss256K TestRecursiveReplacedException -+ * @run main/othervm -Xcomp -XX:CompileOnly=Test.run -XX:+TieredCompilation -XX:TieredStopAtLevel=2 -Xss392K TestRecursiveReplacedException - * - */ + cp ${TESTSRC}${FS}*.java ${THIS_DIR} +diff --git a/hotspot/test/compiler/floatingpoint/8165673/TestFloatJNIArgs.sh b/hotspot/test/compiler/floatingpoint/8165673/TestFloatJNIArgs.sh +index 65c59f20..e229a047 100644 +--- a/hotspot/test/compiler/floatingpoint/8165673/TestFloatJNIArgs.sh ++++ b/hotspot/test/compiler/floatingpoint/8165673/TestFloatJNIArgs.sh +@@ -41,10 +41,10 @@ echo "TESTSRC=${TESTSRC}" + . ${TESTSRC}/../../../test_env.sh + # set platform-dependent variables +-if [ $VM_OS == "linux" -a $VM_CPU == "aarch64" ]; then ++if [ $VM_OS = "linux" -a $VM_CPU = "aarch64" ]; then + echo "Testing on linux-aarch64" + gcc_cmd=`which gcc` +- if [ "x$gcc_cmd" == "x" ]; then ++ if [ "x$gcc_cmd" = "x" ]; then + echo "WARNING: gcc not found. Cannot execute test." 2>&1 + exit 0; + fi +diff --git a/hotspot/test/compiler/floatingpoint/8207838/TestFloatSyncJNIArgs.sh b/hotspot/test/compiler/floatingpoint/8207838/TestFloatSyncJNIArgs.sh +index db2b5ef7..e5079fdb 100644 +--- a/hotspot/test/compiler/floatingpoint/8207838/TestFloatSyncJNIArgs.sh ++++ b/hotspot/test/compiler/floatingpoint/8207838/TestFloatSyncJNIArgs.sh +@@ -41,10 +41,10 @@ echo "TESTSRC=${TESTSRC}" + . ${TESTSRC}/../../../test_env.sh + + # set platform-dependent variables +-if [ $VM_OS == "linux" -a $VM_CPU == "aarch64" ]; then ++if [ $VM_OS = "linux" -a $VM_CPU = "aarch64" ]; then + echo "Testing on linux-aarch64" + gcc_cmd=`which gcc` +- if [ "x$gcc_cmd" == "x" ]; then ++ if [ "x$gcc_cmd" = "x" ]; then + echo "WARNING: gcc not found. Cannot execute test." 2>&1 + exit 0; + fi diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java index fa9a6f20..885957cf 100644 --- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java @@ -116535,73 +116590,6 @@ index dc8c3984..2427b2bf 100644 public static final BooleanSupplier SHA512_INSTRUCTION_AVAILABLE = new OrPredicate( -diff --git a/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java b/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java -index 4ad409bb..ba3b8795 100644 ---- a/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java -+++ b/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java -@@ -25,7 +25,7 @@ - * @test - * @bug 8029383 - * @summary stack overflow if callee is marked for deoptimization causes crash -- * @run main/othervm -XX:TieredStopAtLevel=1 -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,StackOverflowGuardPagesOff::m1 -XX:CompileCommand=exclude,StackOverflowGuardPagesOff::m2 -Xss256K -XX:-UseOnStackReplacement StackOverflowGuardPagesOff -+ * @run main/othervm -XX:TieredStopAtLevel=1 -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,StackOverflowGuardPagesOff::m1 -XX:CompileCommand=exclude,StackOverflowGuardPagesOff::m2 -Xss392K -XX:-UseOnStackReplacement StackOverflowGuardPagesOff - * - */ - -diff --git a/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java b/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java -index 3d93d7d5..83345642 100644 ---- a/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java -+++ b/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java -@@ -25,7 +25,7 @@ - * @test - * @bug 8032410 - * @summary Stack overflow at deoptimization doesn't release owned monitors -- * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestStackBangMonitorOwned::m1 -XX:CompileCommand=exclude,TestStackBangMonitorOwned::m2 -Xss256K -XX:-UseOnStackReplacement TestStackBangMonitorOwned -+ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestStackBangMonitorOwned::m1 -XX:CompileCommand=exclude,TestStackBangMonitorOwned::m2 -Xss392K -XX:-UseOnStackReplacement TestStackBangMonitorOwned - * - */ - public class TestStackBangMonitorOwned { -diff --git a/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java b/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java -index 38d4e206..f242e6ed 100644 ---- a/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java -+++ b/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java -@@ -25,7 +25,7 @@ - * @test - * @bug 8028308 - * @summary rbp not restored when stack overflow is thrown from deopt/uncommon trap blobs -- * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestStackBangRbp::m1 -XX:CompileCommand=exclude,TestStackBangRbp::m2 -Xss256K -XX:-UseOnStackReplacement TestStackBangRbp -+ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestStackBangRbp::m1 -XX:CompileCommand=exclude,TestStackBangRbp::m2 -Xss392K -XX:-UseOnStackReplacement TestStackBangRbp - * - */ - public class TestStackBangRbp { -diff --git a/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java b/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java -index b5859b5c..99ed508d 100644 ---- a/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java -+++ b/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java -@@ -112,7 +112,7 @@ class TestMaxHeapSizeTools { - } - - private static void checkInvalidMinInitialHeapCombinations(String gcflag) throws Exception { -- expectError(new String[] { gcflag, "-Xms8M", "-XX:InitialHeapSize=4M", "-version" }); -+ expectError(new String[] { gcflag, "-Xms64M", "-XX:InitialHeapSize=32M", "-version" }); - } - - private static void checkValidMinInitialHeapCombinations(String gcflag) throws Exception { -diff --git a/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java b/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java -index 473ce666..b6e5c3d6 100644 ---- a/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java -+++ b/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java -@@ -31,7 +31,9 @@ - import com.oracle.java.testlibrary.*; - - public class TestHumongousAllocInitialMark { -- private static final int heapSize = 200; // MB -+ // Heap sizes < 224 MB are increased to 224 MB if vm_page_size == 64K to -+ // fulfill alignment constraints. -+ private static final int heapSize = 224; // MB - private static final int heapRegionSize = 1; // MB - private static final int initiatingHeapOccupancyPercent = 50; // % - diff --git a/hotspot/test/runtime/6929067/Test6929067.sh b/hotspot/test/runtime/6929067/Test6929067.sh index 90b96d5e..7137237b 100644 --- a/hotspot/test/runtime/6929067/Test6929067.sh @@ -116617,35 +116605,93 @@ index 90b96d5e..7137237b 100644 # Assuming other ARCH values need no translation esac -diff --git a/hotspot/test/runtime/StackGap/testme.sh b/hotspot/test/runtime/StackGap/testme.sh -index 2471be4a..bcb4b035 100644 ---- a/hotspot/test/runtime/StackGap/testme.sh -+++ b/hotspot/test/runtime/StackGap/testme.sh -@@ -54,6 +54,19 @@ then - CFLAGS="-m${VM_BITS}" - fi +diff --git a/hotspot/test/runtime/7107135/Test7107135.sh b/hotspot/test/runtime/7107135/Test7107135.sh +index 2d1aa8f6..1b46fb2a 100644 +--- a/hotspot/test/runtime/7107135/Test7107135.sh ++++ b/hotspot/test/runtime/7107135/Test7107135.sh +@@ -47,7 +47,7 @@ case "$OS" in + Linux) + echo "Testing on Linux" + gcc_cmd=`which gcc` +- if [ "x$gcc_cmd" == "x" ]; then ++ if [ "x$gcc_cmd" = "x" ]; then + echo "WARNING: gcc not found. Cannot execute test." 2>&1 + exit 0; + fi +@@ -88,7 +88,7 @@ echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rwx + ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rwx + JAVA_RETVAL=$? -+PLATFORM=$(echo ${VM_CPU}) -+case "$PLATFORM" in -+ mips64el ) -+ CFLAGS="-mabi=${VM_BITS}" -+ ;; -+ loongarch64 ) -+ CFLAGS="-mabi=lp${VM_BITS}" -+ ;; -+ * ) -+ CFLAGS="-m${VM_BITS}" -+ ;; -+esac -+ - LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH +-if [ "$JAVA_RETVAL" == "0" ] ++if [ "$JAVA_RETVAL" = "0" ] + then + echo + echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} TestMT test-rwx +diff --git a/hotspot/test/runtime/jni/CallWithJNIWeak/test.sh b/hotspot/test/runtime/jni/CallWithJNIWeak/test.sh +index 0bac3f3c..b7a49997 100644 +--- a/hotspot/test/runtime/jni/CallWithJNIWeak/test.sh ++++ b/hotspot/test/runtime/jni/CallWithJNIWeak/test.sh +@@ -45,14 +45,14 @@ echo "Testing on " $OS + case "$OS" in + Linux) + cc_cmd=`which gcc` +- if [ "x$cc_cmd" == "x" ]; then ++ if [ "x$cc_cmd" = "x" ]; then + echo "WARNING: gcc not found. Cannot execute test." 2>&1 + exit 0; + fi + ;; + Solaris) + cc_cmd=`which cc` +- if [ "x$cc_cmd" == "x" ]; then ++ if [ "x$cc_cmd" = "x" ]; then + echo "WARNING: cc not found. Cannot execute test." 2>&1 + exit 0; + fi +@@ -81,7 +81,7 @@ echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} -Xint CallWithJNIWeak + ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} -Xint CallWithJNIWeak + JAVA_RETVAL=$? +-if [ "$JAVA_RETVAL" == "0" ] ++if [ "$JAVA_RETVAL" = "0" ] + then + echo + echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} -Xcomp CallWithJNIWeak +diff --git a/hotspot/test/runtime/jni/ReturnJNIWeak/test.sh b/hotspot/test/runtime/jni/ReturnJNIWeak/test.sh +index 211c0415..37e4027f 100644 +--- a/hotspot/test/runtime/jni/ReturnJNIWeak/test.sh ++++ b/hotspot/test/runtime/jni/ReturnJNIWeak/test.sh +@@ -45,14 +45,14 @@ echo "Testing on " $OS + case "$OS" in + Linux) + cc_cmd=`which gcc` +- if [ "x$cc_cmd" == "x" ]; then ++ if [ "x$cc_cmd" = "x" ]; then + echo "WARNING: gcc not found. Cannot execute test." 2>&1 + exit 0; + fi + ;; + Solaris) + cc_cmd=`which cc` +- if [ "x$cc_cmd" == "x" ]; then ++ if [ "x$cc_cmd" = "x" ]; then + echo "WARNING: cc not found. Cannot execute test." 2>&1 + exit 0; + fi +@@ -81,7 +81,7 @@ echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} -Xint ReturnJNIWeak + ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} -Xint ReturnJNIWeak + JAVA_RETVAL=$? + +-if [ "$JAVA_RETVAL" == "0" ] ++if [ "$JAVA_RETVAL" = "0" ] + then + echo + echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} -Xcomp ReturnJNIWeak diff --git a/hotspot/test/test_env.sh b/hotspot/test/test_env.sh -index e76796e7..75133e40 100644 +index 5ba4f28c..d9d8bb6b 100644 --- a/hotspot/test/test_env.sh +++ b/hotspot/test/test_env.sh -@@ -205,6 +205,29 @@ if [ $? = 0 ] +@@ -211,6 +211,29 @@ if [ $? = 0 ] then VM_CPU="aarch64" fi @@ -116948,6 +116994,71 @@ index 00000000..42a06755 +# +-server KNOWN +-client IGNORE +diff --git a/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java b/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java +index 6be55625..6c9ddb34 100644 +--- a/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java ++++ b/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2008, 2022, 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 +@@ -46,9 +46,11 @@ import java.security.cert.PKIXCertPathBuilderResult; + import java.security.cert.TrustAnchor; + import java.security.cert.X509Certificate; + import java.security.cert.X509CertSelector; ++import java.text.DateFormat; + import java.util.ArrayList; + import java.util.Collections; + import java.util.List; ++import java.util.Locale; + + public final class BuildEEBasicConstraints { + +@@ -65,6 +67,11 @@ public final class BuildEEBasicConstraints { + PKIXBuilderParameters params = new PKIXBuilderParameters + (Collections.singleton(anchor), sel); + params.setRevocationEnabled(false); ++ ++ // Certs expired on 7th Nov 2022 ++ params.setDate(DateFormat.getDateInstance(DateFormat.MEDIUM, ++ Locale.US).parse("June 01, 2022")); ++ + X509Certificate eeCert = CertUtils.getCertFromFile("ee.cer"); + X509Certificate caCert = CertUtils.getCertFromFile("ca.cer"); + ArrayList certs = new ArrayList(); +diff --git a/jdk/test/java/security/cert/pkix/policyChanges/TestPolicy.java b/jdk/test/java/security/cert/pkix/policyChanges/TestPolicy.java +index a92eee2c..de2f94d2 100644 +--- a/jdk/test/java/security/cert/pkix/policyChanges/TestPolicy.java ++++ b/jdk/test/java/security/cert/pkix/policyChanges/TestPolicy.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2022, 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 +@@ -34,6 +34,7 @@ + */ + + import java.io.*; ++import java.text.DateFormat; + import java.util.*; + + import java.security.Security; +@@ -97,6 +98,10 @@ public class TestPolicy { + params.setRevocationEnabled(false); + params.setInitialPolicies(testCase.initialPolicies); + ++ // Certs expired on 7th Nov 2022 ++ params.setDate(DateFormat.getDateInstance(DateFormat.MEDIUM, ++ Locale.US).parse("June 01, 2022")); ++ + CertPath path = factory.generateCertPath(Arrays.asList(new X509Certificate[] {ee, ca})); + + PKIXCertPathValidatorResult result = (PKIXCertPathValidatorResult)validator.validate(path, params); diff --git a/jdk/test/jdk/jfr/event/os/TestCPUInformation.java b/jdk/test/jdk/jfr/event/os/TestCPUInformation.java index d6a026b2..b6548602 100644 --- a/jdk/test/jdk/jfr/event/os/TestCPUInformation.java diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 61232d0..ad2887e 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -926,7 +926,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 2 +Release: 3 # 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 @@ -2359,6 +2359,15 @@ cjc.mainProgram(arg) %endif %changelog +* Mon Feb 27 2023 panxuefeng - 1:1.8.0.362-b09.3 +- Fixed - 'Disassembler' has not been declared +- compiler/criticalnatives/argumentcorruption/Test8167409.sh fail +- windows debug build failed +- 8299804: Fix non-portable code in hotspot shell tests in 8u +- [MIPS] Fix a typo in PosixSignals::pd_hotspot_signal_handler +- Fix a typo in PosixSignals::pd_hotspot_signal_handler +- LA/MIPS port of 8296959: Fix hotspot shell tests of 8u on multilib systems + * Wed Feb 15 2023 kuenking111 - 1:1.8.0.362-b09.2 - add Add-CMS-s-trim-test-cases-and-fix-failure.patch - add Disable-cds-on-x86-32.patch -- Gitee From 34d42d82328cbb6cf77c03c2808870bbd6c211f4 Mon Sep 17 00:00:00 2001 From: panxuefeng Date: Mon, 27 Feb 2023 16:37:46 +0800 Subject: [PATCH 2/2] update patch name --- ...u362b09.patch => LoongArch64-support.patch | 832 +++++++++--------- openjdk-1.8.0.spec | 21 +- 2 files changed, 427 insertions(+), 426 deletions(-) rename LoongArch64-support-jdk8u362b09.patch => LoongArch64-support.patch (99%) diff --git a/LoongArch64-support-jdk8u362b09.patch b/LoongArch64-support.patch similarity index 99% rename from LoongArch64-support-jdk8u362b09.patch rename to LoongArch64-support.patch index ae28a93..2b260ce 100644 --- a/LoongArch64-support-jdk8u362b09.patch +++ b/LoongArch64-support.patch @@ -1,5 +1,5 @@ diff --git a/common/autoconf/build-aux/autoconf-config.guess b/common/autoconf/build-aux/autoconf-config.guess -index 15ee4389..3d7555b5 100644 +index 15ee438926..3d7555b52d 100644 --- a/common/autoconf/build-aux/autoconf-config.guess +++ b/common/autoconf/build-aux/autoconf-config.guess @@ -977,6 +977,9 @@ EOF @@ -13,7 +13,7 @@ index 15ee4389..3d7555b5 100644 echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; diff --git a/common/autoconf/build-aux/autoconf-config.sub b/common/autoconf/build-aux/autoconf-config.sub -index 1aab2b30..bd910bdd 100644 +index 1aab2b303e..bd910bddbe 100644 --- a/common/autoconf/build-aux/autoconf-config.sub +++ b/common/autoconf/build-aux/autoconf-config.sub @@ -275,6 +275,7 @@ case $basic_machine in @@ -25,7 +25,7 @@ index 1aab2b30..bd910bdd 100644 | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ diff --git a/common/autoconf/build-aux/config.guess b/common/autoconf/build-aux/config.guess -index 355c91e4..d03d029c 100644 +index 355c91e4eb..d03d029ce3 100644 --- a/common/autoconf/build-aux/config.guess +++ b/common/autoconf/build-aux/config.guess @@ -86,4 +86,15 @@ if [ "x$OUT" = x ]; then @@ -45,7 +45,7 @@ index 355c91e4..d03d029c 100644 + echo $OUT diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac -index 151e5a10..5072409d 100644 +index 151e5a109f..5072409dd4 100644 --- a/common/autoconf/configure.ac +++ b/common/autoconf/configure.ac @@ -23,6 +23,12 @@ @@ -70,7 +70,7 @@ index 151e5a10..5072409d 100644 # Configure flags for the tools FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh -index 71fabf4d..62537ace 100644 +index 71fabf4dbb..62537aced2 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -715,6 +715,9 @@ SET_EXECUTABLE_ORIGIN @@ -221,7 +221,7 @@ index 71fabf4d..62537ace 100644 ############################################################################### diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4 -index 51df988f..51cc28c3 100644 +index 51df988f61..51cc28c312 100644 --- a/common/autoconf/platform.m4 +++ b/common/autoconf/platform.m4 @@ -23,6 +23,12 @@ @@ -342,7 +342,7 @@ index 51df988f..51cc28c3 100644 +AC_SUBST(HOST_NAME) +]) diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in -index 506cf617..eef5939e 100644 +index 506cf61708..eef5939e0b 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -23,6 +23,12 @@ @@ -383,7 +383,7 @@ index 506cf617..eef5939e 100644 DEBUG_LEVEL:=@DEBUG_LEVEL@ diff --git a/hotspot/agent/make/saenv.sh b/hotspot/agent/make/saenv.sh -index ab9a0a43..a2de3fc3 100644 +index ab9a0a431c..a2de3fc329 100644 --- a/hotspot/agent/make/saenv.sh +++ b/hotspot/agent/make/saenv.sh @@ -23,6 +23,12 @@ @@ -415,7 +415,7 @@ index ab9a0a43..a2de3fc3 100644 SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 OPTIONS="-Dsa.library.path=$SA_LIBPATH" diff --git a/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c b/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c -index d6a0c7d9..b3b1380b 100644 +index d6a0c7d9a9..b3b1380b29 100644 --- a/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c +++ b/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c @@ -22,6 +22,13 @@ @@ -530,7 +530,7 @@ index d6a0c7d9..b3b1380b 100644 (*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT); return array; diff --git a/hotspot/agent/src/os/linux/Makefile b/hotspot/agent/src/os/linux/Makefile -index c0b5c869..2cc50b6f 100644 +index c0b5c869c1..2cc50b6fab 100644 --- a/hotspot/agent/src/os/linux/Makefile +++ b/hotspot/agent/src/os/linux/Makefile @@ -22,7 +22,13 @@ @@ -558,7 +558,7 @@ index c0b5c869..2cc50b6f 100644 sun.jvm.hotspot.debugger.aarch64.AARCH64ThreadContext $(GCC) $(CFLAGS) $< -o $@ diff --git a/hotspot/agent/src/os/linux/libproc.h b/hotspot/agent/src/os/linux/libproc.h -index 6b6e41ca..5eb8211a 100644 +index 6b6e41cab4..5eb8211aa9 100644 --- a/hotspot/agent/src/os/linux/libproc.h +++ b/hotspot/agent/src/os/linux/libproc.h @@ -22,6 +22,12 @@ @@ -598,7 +598,7 @@ index 6b6e41ca..5eb8211a 100644 #endif diff --git a/hotspot/agent/src/os/linux/ps_proc.c b/hotspot/agent/src/os/linux/ps_proc.c -index c4d6a9ec..7000e927 100644 +index c4d6a9ecc5..7000e92723 100644 --- a/hotspot/agent/src/os/linux/ps_proc.c +++ b/hotspot/agent/src/os/linux/ps_proc.c @@ -22,6 +22,12 @@ @@ -624,7 +624,7 @@ index c4d6a9ec..7000e927 100644 print_debug("ptrace(PTRACE_GETREGS, ...) failed for lwp %d\n", pid); return false; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java -index c9633505..20e6f35b 100644 +index c963350591..20e6f35b9c 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java @@ -22,6 +22,12 @@ @@ -661,7 +661,7 @@ index c9633505..20e6f35b 100644 try { machDesc = (MachineDescription) diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java -index 993bf7bb..1e075aa5 100644 +index 993bf7bb47..1e075aa57e 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java @@ -94,6 +94,12 @@ public class Disassembler { @@ -679,7 +679,7 @@ index 993bf7bb..1e075aa5 100644 libname += "-" + arch + ".so"; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionLOONGARCH64.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionLOONGARCH64.java new file mode 100644 -index 00000000..0531427d +index 0000000000..0531427dab --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionLOONGARCH64.java @@ -0,0 +1,41 @@ @@ -726,7 +726,7 @@ index 00000000..0531427d +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionMIPS64.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionMIPS64.java new file mode 100644 -index 00000000..1b49efd2 +index 0000000000..1b49efd201 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionMIPS64.java @@ -0,0 +1,41 @@ @@ -772,7 +772,7 @@ index 00000000..1b49efd2 + } +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java -index f178d6a6..019e794b 100644 +index f178d6a6e7..019e794bbb 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java @@ -32,11 +32,15 @@ import sun.jvm.hotspot.debugger.cdbg.*; @@ -813,7 +813,7 @@ index f178d6a6..019e794b 100644 // Runtime exception thrown by LinuxThreadContextFactory if unknown cpu ThreadContext context = (ThreadContext) thread.getContext(); diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java -index 44c2265d..3b6747ac 100644 +index 44c2265d7a..3b6747ac0a 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java @@ -30,6 +30,8 @@ import sun.jvm.hotspot.debugger.linux.amd64.*; @@ -838,7 +838,7 @@ index 44c2265d..3b6747ac 100644 Class tcc = Class.forName("sun.jvm.hotspot.debugger.linux." + diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64CFrame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64CFrame.java new file mode 100644 -index 00000000..3b20dbbd +index 0000000000..3b20dbbd87 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64CFrame.java @@ -0,0 +1,80 @@ @@ -924,7 +924,7 @@ index 00000000..3b20dbbd +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64ThreadContext.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64ThreadContext.java new file mode 100644 -index 00000000..9f22133e +index 0000000000..9f22133eaf --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/loongarch64/LinuxLOONGARCH64ThreadContext.java @@ -0,0 +1,47 @@ @@ -977,7 +977,7 @@ index 00000000..9f22133e +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64CFrame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64CFrame.java new file mode 100644 -index 00000000..2e3eb564 +index 0000000000..2e3eb564da --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64CFrame.java @@ -0,0 +1,80 @@ @@ -1063,7 +1063,7 @@ index 00000000..2e3eb564 +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64ThreadContext.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64ThreadContext.java new file mode 100644 -index 00000000..98e0f3f0 +index 0000000000..98e0f3f0bc --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/mips64/LinuxMIPS64ThreadContext.java @@ -0,0 +1,47 @@ @@ -1116,7 +1116,7 @@ index 00000000..98e0f3f0 +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/loongarch64/LOONGARCH64ThreadContext.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/loongarch64/LOONGARCH64ThreadContext.java new file mode 100644 -index 00000000..90b0cf97 +index 0000000000..90b0cf97e3 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/loongarch64/LOONGARCH64ThreadContext.java @@ -0,0 +1,123 @@ @@ -1245,7 +1245,7 @@ index 00000000..90b0cf97 +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/mips64/MIPS64ThreadContext.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/mips64/MIPS64ThreadContext.java new file mode 100644 -index 00000000..c57ee9df +index 0000000000..c57ee9dfc9 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/mips64/MIPS64ThreadContext.java @@ -0,0 +1,123 @@ @@ -1373,7 +1373,7 @@ index 00000000..c57ee9df + public abstract Address getRegisterAsAddress(int index); +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java -index 7113a3a4..24273888 100644 +index 7113a3a497..24273888c2 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java @@ -63,6 +63,8 @@ public interface ELFHeader { @@ -1386,7 +1386,7 @@ index 7113a3a4..24273888 100644 /** Returns a file type which is defined by the file type constants. */ public short getFileType(); diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java -index ca1a2575..2afa6c55 100644 +index ca1a2575ff..2afa6c55f8 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java @@ -34,10 +34,14 @@ import sun.jvm.hotspot.debugger.proc.amd64.*; @@ -1421,7 +1421,7 @@ index ca1a2575..2afa6c55 100644 Class tfc = Class.forName("sun.jvm.hotspot.debugger.proc." + diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64Thread.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64Thread.java new file mode 100644 -index 00000000..42a31e34 +index 0000000000..42a31e3486 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64Thread.java @@ -0,0 +1,92 @@ @@ -1519,7 +1519,7 @@ index 00000000..42a31e34 +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadContext.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadContext.java new file mode 100644 -index 00000000..9054f165 +index 0000000000..9054f16506 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadContext.java @@ -0,0 +1,47 @@ @@ -1572,7 +1572,7 @@ index 00000000..9054f165 +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadFactory.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadFactory.java new file mode 100644 -index 00000000..bc643351 +index 0000000000..bc64335124 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/loongarch64/ProcLOONGARCH64ThreadFactory.java @@ -0,0 +1,45 @@ @@ -1623,7 +1623,7 @@ index 00000000..bc643351 +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64Thread.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64Thread.java new file mode 100644 -index 00000000..5c1e0be8 +index 0000000000..5c1e0be893 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64Thread.java @@ -0,0 +1,92 @@ @@ -1721,7 +1721,7 @@ index 00000000..5c1e0be8 +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadContext.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadContext.java new file mode 100644 -index 00000000..d44223d7 +index 0000000000..d44223d768 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadContext.java @@ -0,0 +1,47 @@ @@ -1774,7 +1774,7 @@ index 00000000..d44223d7 +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadFactory.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadFactory.java new file mode 100644 -index 00000000..bad478fc +index 0000000000..bad478fc5c --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/mips64/ProcMIPS64ThreadFactory.java @@ -0,0 +1,45 @@ @@ -1824,7 +1824,7 @@ index 00000000..bad478fc + } +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java -index ffa61b54..9cf3ee2d 100644 +index ffa61b548e..9cf3ee2da3 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java @@ -33,6 +33,8 @@ import sun.jvm.hotspot.debugger.cdbg.*; @@ -1855,7 +1855,7 @@ index ffa61b54..9cf3ee2d 100644 Class tf = Class.forName("sun.jvm.hotspot.debugger.remote." + diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64Thread.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64Thread.java new file mode 100644 -index 00000000..01e3f895 +index 0000000000..01e3f8954b --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64Thread.java @@ -0,0 +1,54 @@ @@ -1915,7 +1915,7 @@ index 00000000..01e3f895 +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadContext.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadContext.java new file mode 100644 -index 00000000..ad25bccc +index 0000000000..ad25bccc8d --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadContext.java @@ -0,0 +1,51 @@ @@ -1972,7 +1972,7 @@ index 00000000..ad25bccc +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadFactory.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadFactory.java new file mode 100644 -index 00000000..d8bf50ea +index 0000000000..d8bf50ea5b --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/loongarch64/RemoteLOONGARCH64ThreadFactory.java @@ -0,0 +1,45 @@ @@ -2023,7 +2023,7 @@ index 00000000..d8bf50ea +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64Thread.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64Thread.java new file mode 100644 -index 00000000..a9285a3b +index 0000000000..a9285a3b94 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64Thread.java @@ -0,0 +1,54 @@ @@ -2083,7 +2083,7 @@ index 00000000..a9285a3b +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadContext.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadContext.java new file mode 100644 -index 00000000..4d711f9b +index 0000000000..4d711f9ba7 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadContext.java @@ -0,0 +1,51 @@ @@ -2140,7 +2140,7 @@ index 00000000..4d711f9b +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadFactory.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadFactory.java new file mode 100644 -index 00000000..020a2f1f +index 0000000000..020a2f1ff9 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/mips64/RemoteMIPS64ThreadFactory.java @@ -0,0 +1,45 @@ @@ -2190,7 +2190,7 @@ index 00000000..020a2f1f + } +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java -index 842a3b35..81efdd02 100644 +index 842a3b357d..81efdd02f8 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java @@ -34,6 +34,8 @@ import sun.jvm.hotspot.runtime.win32_amd64.Win32AMD64JavaThreadPDAccess; @@ -2215,7 +2215,7 @@ index 842a3b35..81efdd02 100644 access = (JavaThreadPDAccess) diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_loongarch64/LinuxLOONGARCH64JavaThreadPDAccess.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_loongarch64/LinuxLOONGARCH64JavaThreadPDAccess.java new file mode 100644 -index 00000000..77c45c2e +index 0000000000..77c45c2e99 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_loongarch64/LinuxLOONGARCH64JavaThreadPDAccess.java @@ -0,0 +1,133 @@ @@ -2354,7 +2354,7 @@ index 00000000..77c45c2e +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_mips64/LinuxMIPS64JavaThreadPDAccess.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_mips64/LinuxMIPS64JavaThreadPDAccess.java new file mode 100644 -index 00000000..a0fd73fa +index 0000000000..a0fd73fa67 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_mips64/LinuxMIPS64JavaThreadPDAccess.java @@ -0,0 +1,132 @@ @@ -2492,7 +2492,7 @@ index 00000000..a0fd73fa +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64CurrentFrameGuess.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64CurrentFrameGuess.java new file mode 100644 -index 00000000..0208e6e2 +index 0000000000..0208e6e224 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64CurrentFrameGuess.java @@ -0,0 +1,217 @@ @@ -2715,7 +2715,7 @@ index 00000000..0208e6e2 +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64Frame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64Frame.java new file mode 100644 -index 00000000..fdf0c79c +index 0000000000..fdf0c79c1a --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64Frame.java @@ -0,0 +1,534 @@ @@ -3255,7 +3255,7 @@ index 00000000..fdf0c79c +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64JavaCallWrapper.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64JavaCallWrapper.java new file mode 100644 -index 00000000..f7dbbcaa +index 0000000000..f7dbbcaacd --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64JavaCallWrapper.java @@ -0,0 +1,57 @@ @@ -3318,7 +3318,7 @@ index 00000000..f7dbbcaa +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64RegisterMap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64RegisterMap.java new file mode 100644 -index 00000000..021ef523 +index 0000000000..021ef523e3 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/loongarch64/LOONGARCH64RegisterMap.java @@ -0,0 +1,52 @@ @@ -3376,7 +3376,7 @@ index 00000000..021ef523 +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64CurrentFrameGuess.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64CurrentFrameGuess.java new file mode 100644 -index 00000000..21259a4d +index 0000000000..21259a4d32 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64CurrentFrameGuess.java @@ -0,0 +1,217 @@ @@ -3599,7 +3599,7 @@ index 00000000..21259a4d +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64Frame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64Frame.java new file mode 100644 -index 00000000..0cc5cf4e +index 0000000000..0cc5cf4e7c --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64Frame.java @@ -0,0 +1,547 @@ @@ -4152,7 +4152,7 @@ index 00000000..0cc5cf4e +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64JavaCallWrapper.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64JavaCallWrapper.java new file mode 100644 -index 00000000..81fcb5b5 +index 0000000000..81fcb5b568 --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64JavaCallWrapper.java @@ -0,0 +1,57 @@ @@ -4215,7 +4215,7 @@ index 00000000..81fcb5b5 +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64RegisterMap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64RegisterMap.java new file mode 100644 -index 00000000..64850379 +index 0000000000..648503792d --- /dev/null +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/mips64/MIPS64RegisterMap.java @@ -0,0 +1,52 @@ @@ -4272,7 +4272,7 @@ index 00000000..64850379 + protected Address getLocationPD(VMReg reg) { return null; } +} diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java -index aa692578..9c97d09b 100644 +index aa69257866..9c97d09bc3 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java @@ -22,6 +22,13 @@ @@ -4301,7 +4301,7 @@ index aa692578..9c97d09b 100644 try { Class pic = Class.forName("sun.jvm.hotspot.utilities.PlatformInfoClosed"); diff --git a/hotspot/make/defs.make b/hotspot/make/defs.make -index a3573da5..6e93182c 100644 +index a3573da56f..6e93182c92 100644 --- a/hotspot/make/defs.make +++ b/hotspot/make/defs.make @@ -22,6 +22,12 @@ @@ -4379,7 +4379,7 @@ index a3573da5..6e93182c 100644 # Required make macro settings for all platforms diff --git a/hotspot/make/linux/Makefile b/hotspot/make/linux/Makefile -index e8f20104..5aff01e8 100644 +index e8f2010412..5aff01e87d 100644 --- a/hotspot/make/linux/Makefile +++ b/hotspot/make/linux/Makefile @@ -74,6 +74,10 @@ ifneq (,$(findstring $(ARCH), ppc ppc64)) @@ -4394,7 +4394,7 @@ index e8f20104..5aff01e8 100644 ifdef LP64 ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","") diff --git a/hotspot/make/linux/makefiles/defs.make b/hotspot/make/linux/makefiles/defs.make -index ec414639..9ade73ab 100644 +index ec414639d2..9ade73ab34 100644 --- a/hotspot/make/linux/makefiles/defs.make +++ b/hotspot/make/linux/makefiles/defs.make @@ -22,6 +22,12 @@ @@ -4492,7 +4492,7 @@ index ec414639..9ade73ab 100644 endif endif diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make -index 7dde7f09..94c6d1d0 100644 +index 7dde7f0963..94c6d1d015 100644 --- a/hotspot/make/linux/makefiles/gcc.make +++ b/hotspot/make/linux/makefiles/gcc.make @@ -22,6 +22,12 @@ @@ -4529,7 +4529,7 @@ index 7dde7f09..94c6d1d0 100644 # However we need to clean the code up before we can unrestrictedly enable this option with Clang diff --git a/hotspot/make/linux/makefiles/loongarch64.make b/hotspot/make/linux/makefiles/loongarch64.make new file mode 100644 -index 00000000..9e3cdb6f +index 0000000000..9e3cdb6f23 --- /dev/null +++ b/hotspot/make/linux/makefiles/loongarch64.make @@ -0,0 +1,43 @@ @@ -4578,7 +4578,7 @@ index 00000000..9e3cdb6f +OPT_CFLAGS/compactingPermGenGen.o = -O1 diff --git a/hotspot/make/linux/makefiles/mips64.make b/hotspot/make/linux/makefiles/mips64.make new file mode 100644 -index 00000000..d9af3b13 +index 0000000000..d9af3b13ab --- /dev/null +++ b/hotspot/make/linux/makefiles/mips64.make @@ -0,0 +1,43 @@ @@ -4626,7 +4626,7 @@ index 00000000..d9af3b13 + +OPT_CFLAGS/compactingPermGenGen.o = -O1 diff --git a/hotspot/make/linux/makefiles/sa.make b/hotspot/make/linux/makefiles/sa.make -index cdcb16a1..34c71bd6 100644 +index cdcb16a1a3..34c71bd666 100644 --- a/hotspot/make/linux/makefiles/sa.make +++ b/hotspot/make/linux/makefiles/sa.make @@ -22,6 +22,12 @@ @@ -4652,7 +4652,7 @@ index cdcb16a1..34c71bd6 100644 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.asm.Disassembler diff --git a/hotspot/make/linux/makefiles/saproc.make b/hotspot/make/linux/makefiles/saproc.make -index ffc0ec5c..c04a6765 100644 +index ffc0ec5ce5..c04a6765df 100644 --- a/hotspot/make/linux/makefiles/saproc.make +++ b/hotspot/make/linux/makefiles/saproc.make @@ -21,6 +21,13 @@ @@ -4683,7 +4683,7 @@ index ffc0ec5c..c04a6765 100644 $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE) $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ diff --git a/hotspot/make/linux/makefiles/sparcWorks.make b/hotspot/make/linux/makefiles/sparcWorks.make -index e3911602..dbc2ace8 100644 +index e39116023c..dbc2ace825 100644 --- a/hotspot/make/linux/makefiles/sparcWorks.make +++ b/hotspot/make/linux/makefiles/sparcWorks.make @@ -22,6 +22,12 @@ @@ -4708,7 +4708,7 @@ index e3911602..dbc2ace8 100644 CFLAGS += $(ARCHFLAG) AOUT_FLAGS += $(ARCHFLAG) diff --git a/hotspot/make/linux/makefiles/vm.make b/hotspot/make/linux/makefiles/vm.make -index 04b7c202..5e428538 100644 +index 04b7c20287..5e428538a0 100644 --- a/hotspot/make/linux/makefiles/vm.make +++ b/hotspot/make/linux/makefiles/vm.make @@ -22,6 +22,12 @@ @@ -4765,7 +4765,7 @@ index 04b7c202..5e428538 100644 # This has to be included here to allow changes to the source diff --git a/hotspot/make/linux/platform_loongarch64 b/hotspot/make/linux/platform_loongarch64 new file mode 100644 -index 00000000..d704cf38 +index 0000000000..d704cf389a --- /dev/null +++ b/hotspot/make/linux/platform_loongarch64 @@ -0,0 +1,17 @@ @@ -4788,7 +4788,7 @@ index 00000000..d704cf38 +sysdefs = -DLINUX -D_GNU_SOURCE -DLOONGARCH64 diff --git a/hotspot/make/linux/platform_mips64 b/hotspot/make/linux/platform_mips64 new file mode 100644 -index 00000000..c283671f +index 0000000000..c283671f82 --- /dev/null +++ b/hotspot/make/linux/platform_mips64 @@ -0,0 +1,17 @@ @@ -4810,7 +4810,7 @@ index 00000000..c283671f + +sysdefs = -DLINUX -D_GNU_SOURCE -DMIPS64 diff --git a/hotspot/make/sa.files b/hotspot/make/sa.files -index d6e728a9..43b08e3a 100644 +index d6e728a9a8..43b08e3ad1 100644 --- a/hotspot/make/sa.files +++ b/hotspot/make/sa.files @@ -22,6 +22,12 @@ @@ -4861,7 +4861,7 @@ index d6e728a9..43b08e3a 100644 $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/solaris_amd64/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/solaris_sparc/*.java \ diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp -index 35d34a08..3b8cf4a1 100644 +index 35d34a08ea..3b8cf4a11d 100644 --- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp @@ -1177,7 +1177,9 @@ void LIR_Assembler::emit_opBranch(LIR_OpBranch* op) { @@ -4924,7 +4924,7 @@ index 35d34a08..3b8cf4a1 100644 assert(info == NULL, "should never be used, idiv/irem and ldiv/lrem not handled by this method"); diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp -index 120dd1a7..6a328902 100644 +index 120dd1a7df..6a3289022d 100644 --- a/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp @@ -277,18 +277,29 @@ void LIRGenerator::increment_counter(LIR_Address* addr, int step) { @@ -4963,7 +4963,7 @@ index 120dd1a7..6a328902 100644 diff --git a/hotspot/src/cpu/loongarch/vm/assembler_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/assembler_loongarch.cpp new file mode 100644 -index 00000000..2996ef7a +index 0000000000..2996ef7aa7 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/assembler_loongarch.cpp @@ -0,0 +1,855 @@ @@ -5824,7 +5824,7 @@ index 00000000..2996ef7a +} diff --git a/hotspot/src/cpu/loongarch/vm/assembler_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/assembler_loongarch.hpp new file mode 100644 -index 00000000..922968a5 +index 0000000000..922968a554 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/assembler_loongarch.hpp @@ -0,0 +1,2804 @@ @@ -8634,7 +8634,7 @@ index 00000000..922968a5 +#endif // CPU_LOONGARCH_VM_ASSEMBLER_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/assembler_loongarch.inline.hpp b/hotspot/src/cpu/loongarch/vm/assembler_loongarch.inline.hpp new file mode 100644 -index 00000000..601f4afe +index 0000000000..601f4afe6f --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/assembler_loongarch.inline.hpp @@ -0,0 +1,33 @@ @@ -8673,7 +8673,7 @@ index 00000000..601f4afe +#endif // CPU_LOONGARCH_VM_ASSEMBLER_LOONGARCH_INLINE_HPP diff --git a/hotspot/src/cpu/loongarch/vm/bytecodeInterpreter_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/bytecodeInterpreter_loongarch.hpp new file mode 100644 -index 00000000..32775e9b +index 0000000000..32775e9bc3 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/bytecodeInterpreter_loongarch.hpp @@ -0,0 +1,110 @@ @@ -8789,7 +8789,7 @@ index 00000000..32775e9b +#endif // CPU_LOONGARCH_VM_BYTECODEINTERPRETER_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/bytecodeInterpreter_loongarch.inline.hpp b/hotspot/src/cpu/loongarch/vm/bytecodeInterpreter_loongarch.inline.hpp new file mode 100644 -index 00000000..07df527e +index 0000000000..07df527e94 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/bytecodeInterpreter_loongarch.inline.hpp @@ -0,0 +1,286 @@ @@ -9081,7 +9081,7 @@ index 00000000..07df527e +#endif // CPU_LOONGARCH_VM_BYTECODEINTERPRETER_LOONGARCH_INLINE_HPP diff --git a/hotspot/src/cpu/loongarch/vm/bytecodes_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/bytecodes_loongarch.cpp new file mode 100644 -index 00000000..86410905 +index 0000000000..8641090584 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/bytecodes_loongarch.cpp @@ -0,0 +1,38 @@ @@ -9125,7 +9125,7 @@ index 00000000..86410905 +} diff --git a/hotspot/src/cpu/loongarch/vm/bytecodes_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/bytecodes_loongarch.hpp new file mode 100644 -index 00000000..fbdf5319 +index 0000000000..fbdf531996 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/bytecodes_loongarch.hpp @@ -0,0 +1,31 @@ @@ -9162,7 +9162,7 @@ index 00000000..fbdf5319 +#endif // CPU_LOONGARCH_VM_BYTECODES_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/bytes_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/bytes_loongarch.hpp new file mode 100644 -index 00000000..8f766a61 +index 0000000000..8f766a617e --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/bytes_loongarch.hpp @@ -0,0 +1,75 @@ @@ -9243,7 +9243,7 @@ index 00000000..8f766a61 +#endif // CPU_LOONGARCH_VM_BYTES_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/c1_CodeStubs_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/c1_CodeStubs_loongarch_64.cpp new file mode 100644 -index 00000000..5166acfa +index 0000000000..5166acfa2b --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_CodeStubs_loongarch_64.cpp @@ -0,0 +1,387 @@ @@ -9636,7 +9636,7 @@ index 00000000..5166acfa +#undef __ diff --git a/hotspot/src/cpu/loongarch/vm/c1_Defs_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/c1_Defs_loongarch.hpp new file mode 100644 -index 00000000..1140e444 +index 0000000000..1140e44431 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_Defs_loongarch.hpp @@ -0,0 +1,79 @@ @@ -9721,7 +9721,7 @@ index 00000000..1140e444 +#endif // CPU_LOONGARCH_C1_DEFS_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/c1_FpuStackSim_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/c1_FpuStackSim_loongarch.hpp new file mode 100644 -index 00000000..bd8578c7 +index 0000000000..bd8578c72a --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_FpuStackSim_loongarch.hpp @@ -0,0 +1,32 @@ @@ -9759,7 +9759,7 @@ index 00000000..bd8578c7 +#endif // CPU_LOONGARCH_C1_FPUSTACKSIM_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/c1_FpuStackSim_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/c1_FpuStackSim_loongarch_64.cpp new file mode 100644 -index 00000000..1a89c437 +index 0000000000..1a89c437a8 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_FpuStackSim_loongarch_64.cpp @@ -0,0 +1,31 @@ @@ -9796,7 +9796,7 @@ index 00000000..1a89c437 +#include "precompiled.hpp" diff --git a/hotspot/src/cpu/loongarch/vm/c1_FrameMap_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/c1_FrameMap_loongarch.hpp new file mode 100644 -index 00000000..4f0cf053 +index 0000000000..4f0cf05361 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_FrameMap_loongarch.hpp @@ -0,0 +1,143 @@ @@ -9945,7 +9945,7 @@ index 00000000..4f0cf053 +#endif // CPU_LOONGARCH_C1_FRAMEMAP_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/c1_FrameMap_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/c1_FrameMap_loongarch_64.cpp new file mode 100644 -index 00000000..25c90bcf +index 0000000000..25c90bcf98 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_FrameMap_loongarch_64.cpp @@ -0,0 +1,362 @@ @@ -10313,7 +10313,7 @@ index 00000000..25c90bcf +} diff --git a/hotspot/src/cpu/loongarch/vm/c1_LIRAssembler_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/c1_LIRAssembler_loongarch.hpp new file mode 100644 -index 00000000..38b0daa0 +index 0000000000..38b0daa025 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_LIRAssembler_loongarch.hpp @@ -0,0 +1,83 @@ @@ -10402,7 +10402,7 @@ index 00000000..38b0daa0 +#endif // CPU_LOONGARCH_C1_LIRASSEMBLER_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/c1_LIRAssembler_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/c1_LIRAssembler_loongarch_64.cpp new file mode 100644 -index 00000000..ee48326b +index 0000000000..ee48326bec --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_LIRAssembler_loongarch_64.cpp @@ -0,0 +1,3377 @@ @@ -13785,7 +13785,7 @@ index 00000000..ee48326b +#undef __ diff --git a/hotspot/src/cpu/loongarch/vm/c1_LIRGenerator_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/c1_LIRGenerator_loongarch_64.cpp new file mode 100644 -index 00000000..7cb15f68 +index 0000000000..7cb15f689f --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_LIRGenerator_loongarch_64.cpp @@ -0,0 +1,1442 @@ @@ -15233,7 +15233,7 @@ index 00000000..7cb15f68 +} diff --git a/hotspot/src/cpu/loongarch/vm/c1_LinearScan_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/c1_LinearScan_loongarch.hpp new file mode 100644 -index 00000000..f15dacaf +index 0000000000..f15dacafeb --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_LinearScan_loongarch.hpp @@ -0,0 +1,70 @@ @@ -15309,7 +15309,7 @@ index 00000000..f15dacaf +#endif // CPU_LOONGARCH_C1_LINEARSCAN_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/c1_LinearScan_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/c1_LinearScan_loongarch_64.cpp new file mode 100644 -index 00000000..219b2e36 +index 0000000000..219b2e3671 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_LinearScan_loongarch_64.cpp @@ -0,0 +1,33 @@ @@ -15348,7 +15348,7 @@ index 00000000..219b2e36 +} diff --git a/hotspot/src/cpu/loongarch/vm/c1_MacroAssembler_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/c1_MacroAssembler_loongarch.hpp new file mode 100644 -index 00000000..38ff4c58 +index 0000000000..38ff4c5836 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_MacroAssembler_loongarch.hpp @@ -0,0 +1,112 @@ @@ -15466,7 +15466,7 @@ index 00000000..38ff4c58 +#endif // CPU_LOONGARCH_C1_MACROASSEMBLER_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/c1_MacroAssembler_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/c1_MacroAssembler_loongarch_64.cpp new file mode 100644 -index 00000000..51befaed +index 0000000000..51befaed6c --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_MacroAssembler_loongarch_64.cpp @@ -0,0 +1,346 @@ @@ -15818,7 +15818,7 @@ index 00000000..51befaed +#endif // ifndef PRODUCT diff --git a/hotspot/src/cpu/loongarch/vm/c1_Runtime1_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/c1_Runtime1_loongarch_64.cpp new file mode 100644 -index 00000000..a750dca3 +index 0000000000..a750dca323 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_Runtime1_loongarch_64.cpp @@ -0,0 +1,1252 @@ @@ -17076,7 +17076,7 @@ index 00000000..a750dca3 +} diff --git a/hotspot/src/cpu/loongarch/vm/c1_globals_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/c1_globals_loongarch.hpp new file mode 100644 -index 00000000..df052a05 +index 0000000000..df052a058c --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c1_globals_loongarch.hpp @@ -0,0 +1,69 @@ @@ -17151,7 +17151,7 @@ index 00000000..df052a05 +#endif // CPU_LOONGARCH_C1_GLOBALS_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/c2_globals_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/c2_globals_loongarch.hpp new file mode 100644 -index 00000000..044b0d25 +index 0000000000..044b0d2536 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c2_globals_loongarch.hpp @@ -0,0 +1,87 @@ @@ -17244,7 +17244,7 @@ index 00000000..044b0d25 +#endif // CPU_LOONGARCH_VM_C2_GLOBALS_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/c2_init_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/c2_init_loongarch.cpp new file mode 100644 -index 00000000..c7bf590b +index 0000000000..c7bf590b60 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/c2_init_loongarch.cpp @@ -0,0 +1,34 @@ @@ -17284,7 +17284,7 @@ index 00000000..c7bf590b +} diff --git a/hotspot/src/cpu/loongarch/vm/codeBuffer_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/codeBuffer_loongarch.hpp new file mode 100644 -index 00000000..652f6c10 +index 0000000000..652f6c1092 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/codeBuffer_loongarch.hpp @@ -0,0 +1,35 @@ @@ -17325,7 +17325,7 @@ index 00000000..652f6c10 +#endif // CPU_LOONGARCH_VM_CODEBUFFER_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/compiledIC_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/compiledIC_loongarch.cpp new file mode 100644 -index 00000000..70a47fc7 +index 0000000000..70a47fc772 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/compiledIC_loongarch.cpp @@ -0,0 +1,167 @@ @@ -17498,7 +17498,7 @@ index 00000000..70a47fc7 +#endif // !PRODUCT diff --git a/hotspot/src/cpu/loongarch/vm/copy_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/copy_loongarch.hpp new file mode 100644 -index 00000000..1b40eab9 +index 0000000000..1b40eab95b --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/copy_loongarch.hpp @@ -0,0 +1,72 @@ @@ -17576,7 +17576,7 @@ index 00000000..1b40eab9 +#endif //CPU_LOONGARCH_VM_COPY_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/cppInterpreterGenerator_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/cppInterpreterGenerator_loongarch.hpp new file mode 100644 -index 00000000..45d86f5b +index 0000000000..45d86f5bfe --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/cppInterpreterGenerator_loongarch.hpp @@ -0,0 +1,53 @@ @@ -17635,7 +17635,7 @@ index 00000000..45d86f5b +#endif // CPU_LOONGARCH_VM_CPPINTERPRETERGENERATOR_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/cppInterpreter_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/cppInterpreter_loongarch.cpp new file mode 100644 -index 00000000..d6c0df3b +index 0000000000..d6c0df3b77 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/cppInterpreter_loongarch.cpp @@ -0,0 +1,215 @@ @@ -17856,7 +17856,7 @@ index 00000000..d6c0df3b +#endif // CC_INTERP diff --git a/hotspot/src/cpu/loongarch/vm/debug_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/debug_loongarch.cpp new file mode 100644 -index 00000000..50de0365 +index 0000000000..50de03653b --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/debug_loongarch.cpp @@ -0,0 +1,51 @@ @@ -17913,7 +17913,7 @@ index 00000000..50de0365 +#endif // PRODUCT diff --git a/hotspot/src/cpu/loongarch/vm/depChecker_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/depChecker_loongarch.cpp new file mode 100644 -index 00000000..62478be3 +index 0000000000..62478be3dc --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/depChecker_loongarch.cpp @@ -0,0 +1,30 @@ @@ -17949,7 +17949,7 @@ index 00000000..62478be3 +// Nothing to do on LoongArch diff --git a/hotspot/src/cpu/loongarch/vm/depChecker_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/depChecker_loongarch.hpp new file mode 100644 -index 00000000..598be0ee +index 0000000000..598be0ee6f --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/depChecker_loongarch.hpp @@ -0,0 +1,31 @@ @@ -17986,7 +17986,7 @@ index 00000000..598be0ee +#endif // CPU_LOONGARCH_VM_DEPCHECKER_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/disassembler_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/disassembler_loongarch.hpp new file mode 100644 -index 00000000..ccd89e8d +index 0000000000..ccd89e8d6d --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/disassembler_loongarch.hpp @@ -0,0 +1,37 @@ @@ -18029,7 +18029,7 @@ index 00000000..ccd89e8d +#endif // CPU_LOONGARCH_VM_DISASSEMBLER_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/frame_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/frame_loongarch.cpp new file mode 100644 -index 00000000..0f50a571 +index 0000000000..0f50a5715d --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/frame_loongarch.cpp @@ -0,0 +1,711 @@ @@ -18746,7 +18746,7 @@ index 00000000..0f50a571 +#endif diff --git a/hotspot/src/cpu/loongarch/vm/frame_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/frame_loongarch.hpp new file mode 100644 -index 00000000..964026e6 +index 0000000000..964026e621 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/frame_loongarch.hpp @@ -0,0 +1,229 @@ @@ -18981,7 +18981,7 @@ index 00000000..964026e6 +#endif // CPU_LOONGARCH_VM_FRAME_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/frame_loongarch.inline.hpp b/hotspot/src/cpu/loongarch/vm/frame_loongarch.inline.hpp new file mode 100644 -index 00000000..3d22339a +index 0000000000..3d22339ad7 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/frame_loongarch.inline.hpp @@ -0,0 +1,312 @@ @@ -19299,7 +19299,7 @@ index 00000000..3d22339a +#endif // CPU_LOONGARCH_VM_FRAME_LOONGARCH_INLINE_HPP diff --git a/hotspot/src/cpu/loongarch/vm/globalDefinitions_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/globalDefinitions_loongarch.hpp new file mode 100644 -index 00000000..f9f93b9e +index 0000000000..f9f93b9e65 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/globalDefinitions_loongarch.hpp @@ -0,0 +1,41 @@ @@ -19346,7 +19346,7 @@ index 00000000..f9f93b9e +#endif // CPU_LOONGARCH_VM_GLOBALDEFINITIONS_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/globals_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/globals_loongarch.hpp new file mode 100644 -index 00000000..182be608 +index 0000000000..182be608a3 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/globals_loongarch.hpp @@ -0,0 +1,103 @@ @@ -19455,7 +19455,7 @@ index 00000000..182be608 +#endif // CPU_LOONGARCH_VM_GLOBALS_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/icBuffer_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/icBuffer_loongarch.cpp new file mode 100644 -index 00000000..8c782253 +index 0000000000..8c78225346 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/icBuffer_loongarch.cpp @@ -0,0 +1,101 @@ @@ -19562,7 +19562,7 @@ index 00000000..8c782253 +} diff --git a/hotspot/src/cpu/loongarch/vm/icache_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/icache_loongarch.cpp new file mode 100644 -index 00000000..d577e41f +index 0000000000..d577e41f59 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/icache_loongarch.cpp @@ -0,0 +1,42 @@ @@ -19610,7 +19610,7 @@ index 00000000..d577e41f +} diff --git a/hotspot/src/cpu/loongarch/vm/icache_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/icache_loongarch.hpp new file mode 100644 -index 00000000..15e45cb3 +index 0000000000..15e45cb350 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/icache_loongarch.hpp @@ -0,0 +1,41 @@ @@ -19657,7 +19657,7 @@ index 00000000..15e45cb3 +#endif // CPU_LOONGARCH_VM_ICACHE_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/interp_masm_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/interp_masm_loongarch_64.cpp new file mode 100644 -index 00000000..8c84f215 +index 0000000000..8c84f21511 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/interp_masm_loongarch_64.cpp @@ -0,0 +1,1960 @@ @@ -21623,7 +21623,7 @@ index 00000000..8c84f215 +} diff --git a/hotspot/src/cpu/loongarch/vm/interp_masm_loongarch_64.hpp b/hotspot/src/cpu/loongarch/vm/interp_masm_loongarch_64.hpp new file mode 100644 -index 00000000..9113da54 +index 0000000000..9113da54ff --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/interp_masm_loongarch_64.hpp @@ -0,0 +1,269 @@ @@ -21898,7 +21898,7 @@ index 00000000..9113da54 +#endif // CPU_LOONGARCH_VM_INTERP_MASM_LOONGARCH_64_HPP diff --git a/hotspot/src/cpu/loongarch/vm/interpreterGenerator_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/interpreterGenerator_loongarch.hpp new file mode 100644 -index 00000000..7f253b2d +index 0000000000..7f253b2d51 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/interpreterGenerator_loongarch.hpp @@ -0,0 +1,51 @@ @@ -21955,7 +21955,7 @@ index 00000000..7f253b2d +#endif // CPU_LOONGARCH_VM_INTERPRETERGENERATOR_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/interpreterRT_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/interpreterRT_loongarch.hpp new file mode 100644 -index 00000000..052eb997 +index 0000000000..052eb997e4 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/interpreterRT_loongarch.hpp @@ -0,0 +1,66 @@ @@ -22027,7 +22027,7 @@ index 00000000..052eb997 +#endif // CPU_LOONGARCH_VM_INTERPRETERRT_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/interpreterRT_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/interpreterRT_loongarch_64.cpp new file mode 100644 -index 00000000..0c9df4aa +index 0000000000..0c9df4aa71 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/interpreterRT_loongarch_64.cpp @@ -0,0 +1,274 @@ @@ -22307,7 +22307,7 @@ index 00000000..0c9df4aa +IRT_END diff --git a/hotspot/src/cpu/loongarch/vm/interpreter_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/interpreter_loongarch.hpp new file mode 100644 -index 00000000..c83afbda +index 0000000000..c83afbdaf0 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/interpreter_loongarch.hpp @@ -0,0 +1,50 @@ @@ -22363,7 +22363,7 @@ index 00000000..c83afbda +#endif // CPU_LOONGARCH_VM_INTERPRETER_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/interpreter_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/interpreter_loongarch_64.cpp new file mode 100644 -index 00000000..5a4f102c +index 0000000000..5a4f102cfd --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/interpreter_loongarch_64.cpp @@ -0,0 +1,277 @@ @@ -22646,7 +22646,7 @@ index 00000000..5a4f102c +} diff --git a/hotspot/src/cpu/loongarch/vm/javaFrameAnchor_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/javaFrameAnchor_loongarch.hpp new file mode 100644 -index 00000000..de97de58 +index 0000000000..de97de5804 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/javaFrameAnchor_loongarch.hpp @@ -0,0 +1,87 @@ @@ -22739,7 +22739,7 @@ index 00000000..de97de58 +#endif // CPU_LOONGARCH_VM_JAVAFRAMEANCHOR_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/jniFastGetField_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/jniFastGetField_loongarch_64.cpp new file mode 100644 -index 00000000..5b52e54e +index 0000000000..5b52e54e08 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/jniFastGetField_loongarch_64.cpp @@ -0,0 +1,169 @@ @@ -22914,7 +22914,7 @@ index 00000000..5b52e54e +} diff --git a/hotspot/src/cpu/loongarch/vm/jniTypes_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/jniTypes_loongarch.hpp new file mode 100644 -index 00000000..554ff216 +index 0000000000..554ff216ac --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/jniTypes_loongarch.hpp @@ -0,0 +1,144 @@ @@ -23064,7 +23064,7 @@ index 00000000..554ff216 +#endif // CPU_LOONGARCH_VM_JNITYPES_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/jni_loongarch.h b/hotspot/src/cpu/loongarch/vm/jni_loongarch.h new file mode 100644 -index 00000000..eb25cbc3 +index 0000000000..eb25cbc354 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/jni_loongarch.h @@ -0,0 +1,51 @@ @@ -23121,7 +23121,7 @@ index 00000000..eb25cbc3 +#endif diff --git a/hotspot/src/cpu/loongarch/vm/loongarch.ad b/hotspot/src/cpu/loongarch/vm/loongarch.ad new file mode 100644 -index 00000000..48c44779 +index 0000000000..48c44779e7 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/loongarch.ad @@ -0,0 +1,24 @@ @@ -23151,7 +23151,7 @@ index 00000000..48c44779 +// diff --git a/hotspot/src/cpu/loongarch/vm/loongarch_64.ad b/hotspot/src/cpu/loongarch/vm/loongarch_64.ad new file mode 100644 -index 00000000..c3514373 +index 0000000000..c3514373a6 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/loongarch_64.ad @@ -0,0 +1,12851 @@ @@ -36008,7 +36008,7 @@ index 00000000..c3514373 + diff --git a/hotspot/src/cpu/loongarch/vm/macroAssembler_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/macroAssembler_loongarch.cpp new file mode 100644 -index 00000000..3823c4e2 +index 0000000000..3823c4e204 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/macroAssembler_loongarch.cpp @@ -0,0 +1,3895 @@ @@ -39909,7 +39909,7 @@ index 00000000..3823c4e2 +} diff --git a/hotspot/src/cpu/loongarch/vm/macroAssembler_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/macroAssembler_loongarch.hpp new file mode 100644 -index 00000000..8b123c29 +index 0000000000..8b123c2906 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/macroAssembler_loongarch.hpp @@ -0,0 +1,771 @@ @@ -40686,7 +40686,7 @@ index 00000000..8b123c29 +#endif // CPU_LOONGARCH_VM_MACROASSEMBLER_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/macroAssembler_loongarch.inline.hpp b/hotspot/src/cpu/loongarch/vm/macroAssembler_loongarch.inline.hpp new file mode 100644 -index 00000000..0b265a4d +index 0000000000..0b265a4def --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/macroAssembler_loongarch.inline.hpp @@ -0,0 +1,34 @@ @@ -40726,7 +40726,7 @@ index 00000000..0b265a4d +#endif // CPU_LOONGARCH_VM_MACROASSEMBLER_LOONGARCH_INLINE_HPP diff --git a/hotspot/src/cpu/loongarch/vm/metaspaceShared_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/metaspaceShared_loongarch_64.cpp new file mode 100644 -index 00000000..b36216c5 +index 0000000000..b36216c533 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/metaspaceShared_loongarch_64.cpp @@ -0,0 +1,120 @@ @@ -40852,7 +40852,7 @@ index 00000000..b36216c5 +} diff --git a/hotspot/src/cpu/loongarch/vm/methodHandles_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/methodHandles_loongarch.cpp new file mode 100644 -index 00000000..cb31ca5a +index 0000000000..cb31ca5ad5 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/methodHandles_loongarch.cpp @@ -0,0 +1,566 @@ @@ -41424,7 +41424,7 @@ index 00000000..cb31ca5a +#endif //PRODUCT diff --git a/hotspot/src/cpu/loongarch/vm/methodHandles_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/methodHandles_loongarch.hpp new file mode 100644 -index 00000000..f8433742 +index 0000000000..f84337424b --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/methodHandles_loongarch.hpp @@ -0,0 +1,62 @@ @@ -41492,7 +41492,7 @@ index 00000000..f8433742 + } diff --git a/hotspot/src/cpu/loongarch/vm/nativeInst_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/nativeInst_loongarch.cpp new file mode 100644 -index 00000000..639ac6cd +index 0000000000..639ac6cd3e --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/nativeInst_loongarch.cpp @@ -0,0 +1,485 @@ @@ -41983,7 +41983,7 @@ index 00000000..639ac6cd +} diff --git a/hotspot/src/cpu/loongarch/vm/nativeInst_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/nativeInst_loongarch.hpp new file mode 100644 -index 00000000..49323992 +index 0000000000..493239923b --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/nativeInst_loongarch.hpp @@ -0,0 +1,513 @@ @@ -42502,7 +42502,7 @@ index 00000000..49323992 +#endif // CPU_LOONGARCH_VM_NATIVEINST_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/registerMap_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/registerMap_loongarch.hpp new file mode 100644 -index 00000000..5ff7555d +index 0000000000..5ff7555d2f --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/registerMap_loongarch.hpp @@ -0,0 +1,45 @@ @@ -42553,7 +42553,7 @@ index 00000000..5ff7555d +#endif // CPU_LOONGARCH_VM_REGISTERMAP_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/register_definitions_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/register_definitions_loongarch.cpp new file mode 100644 -index 00000000..c6424c32 +index 0000000000..c6424c321f --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/register_definitions_loongarch.cpp @@ -0,0 +1,103 @@ @@ -42662,7 +42662,7 @@ index 00000000..c6424c32 +REGISTER_DEFINITION(FloatRegister, f31); diff --git a/hotspot/src/cpu/loongarch/vm/register_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/register_loongarch.cpp new file mode 100644 -index 00000000..3104cd1c +index 0000000000..3104cd1cc5 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/register_loongarch.cpp @@ -0,0 +1,59 @@ @@ -42727,7 +42727,7 @@ index 00000000..3104cd1c +} diff --git a/hotspot/src/cpu/loongarch/vm/register_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/register_loongarch.hpp new file mode 100644 -index 00000000..37b39f91 +index 0000000000..37b39f9129 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/register_loongarch.hpp @@ -0,0 +1,436 @@ @@ -43169,7 +43169,7 @@ index 00000000..37b39f91 +#endif //CPU_LOONGARCH_VM_REGISTER_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/relocInfo_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/relocInfo_loongarch.cpp new file mode 100644 -index 00000000..bf4498dc +index 0000000000..bf4498dc62 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/relocInfo_loongarch.cpp @@ -0,0 +1,130 @@ @@ -43305,7 +43305,7 @@ index 00000000..bf4498dc +} diff --git a/hotspot/src/cpu/loongarch/vm/relocInfo_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/relocInfo_loongarch.hpp new file mode 100644 -index 00000000..211242f3 +index 0000000000..211242f3fb --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/relocInfo_loongarch.hpp @@ -0,0 +1,40 @@ @@ -43351,7 +43351,7 @@ index 00000000..211242f3 +#endif // CPU_LOONGARCH_VM_RELOCINFO_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/runtime_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/runtime_loongarch_64.cpp new file mode 100644 -index 00000000..e6ee65f3 +index 0000000000..e6ee65f367 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/runtime_loongarch_64.cpp @@ -0,0 +1,199 @@ @@ -43556,7 +43556,7 @@ index 00000000..e6ee65f3 +} diff --git a/hotspot/src/cpu/loongarch/vm/sharedRuntime_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/sharedRuntime_loongarch_64.cpp new file mode 100644 -index 00000000..9efcd2ce +index 0000000000..9efcd2ce52 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/sharedRuntime_loongarch_64.cpp @@ -0,0 +1,3453 @@ @@ -47015,7 +47015,7 @@ index 00000000..9efcd2ce +extern "C" int SpinPause() {return 0;} diff --git a/hotspot/src/cpu/loongarch/vm/stubGenerator_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/stubGenerator_loongarch_64.cpp new file mode 100644 -index 00000000..b54857d4 +index 0000000000..b54857d4e7 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/stubGenerator_loongarch_64.cpp @@ -0,0 +1,3445 @@ @@ -50466,7 +50466,7 @@ index 00000000..b54857d4 +} diff --git a/hotspot/src/cpu/loongarch/vm/stubRoutines_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/stubRoutines_loongarch_64.cpp new file mode 100644 -index 00000000..f0f3d55a +index 0000000000..f0f3d55a4e --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/stubRoutines_loongarch_64.cpp @@ -0,0 +1,264 @@ @@ -50736,7 +50736,7 @@ index 00000000..f0f3d55a +}; diff --git a/hotspot/src/cpu/loongarch/vm/stubRoutines_loongarch_64.hpp b/hotspot/src/cpu/loongarch/vm/stubRoutines_loongarch_64.hpp new file mode 100644 -index 00000000..d020a527 +index 0000000000..d020a527e4 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/stubRoutines_loongarch_64.hpp @@ -0,0 +1,60 @@ @@ -50802,7 +50802,7 @@ index 00000000..d020a527 +#endif // CPU_LOONGARCH_VM_STUBROUTINES_LOONGARCH_64_HPP diff --git a/hotspot/src/cpu/loongarch/vm/templateInterpreterGenerator_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/templateInterpreterGenerator_loongarch.hpp new file mode 100644 -index 00000000..213e69b0 +index 0000000000..213e69b0b2 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/templateInterpreterGenerator_loongarch.hpp @@ -0,0 +1,35 @@ @@ -50843,7 +50843,7 @@ index 00000000..213e69b0 +#endif // CPU_LOONGARCH_VM_TEMPLATEINTERPRETERGENERATOR_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/templateInterpreter_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/templateInterpreter_loongarch.hpp new file mode 100644 -index 00000000..39e3ad7b +index 0000000000..39e3ad7bb5 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/templateInterpreter_loongarch.hpp @@ -0,0 +1,41 @@ @@ -50890,7 +50890,7 @@ index 00000000..39e3ad7b +#endif // CPU_LOONGARCH_VM_TEMPLATEINTERPRETER_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/templateInterpreter_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/templateInterpreter_loongarch_64.cpp new file mode 100644 -index 00000000..b25086a3 +index 0000000000..b25086a399 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/templateInterpreter_loongarch_64.cpp @@ -0,0 +1,2335 @@ @@ -53231,7 +53231,7 @@ index 00000000..b25086a3 +#endif // ! CC_INTERP diff --git a/hotspot/src/cpu/loongarch/vm/templateTable_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/templateTable_loongarch_64.cpp new file mode 100644 -index 00000000..5f6b7062 +index 0000000000..5f6b706258 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/templateTable_loongarch_64.cpp @@ -0,0 +1,4056 @@ @@ -57293,7 +57293,7 @@ index 00000000..5f6b7062 +#endif // !CC_INTERP diff --git a/hotspot/src/cpu/loongarch/vm/templateTable_loongarch_64.hpp b/hotspot/src/cpu/loongarch/vm/templateTable_loongarch_64.hpp new file mode 100644 -index 00000000..c48d76e0 +index 0000000000..c48d76e0a2 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/templateTable_loongarch_64.hpp @@ -0,0 +1,44 @@ @@ -57343,7 +57343,7 @@ index 00000000..c48d76e0 +#endif // CPU_LOONGARCH_VM_TEMPLATETABLE_LOONGARCH_64_HPP diff --git a/hotspot/src/cpu/loongarch/vm/vmStructs_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/vmStructs_loongarch.hpp new file mode 100644 -index 00000000..7c3ce680 +index 0000000000..7c3ce68010 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/vmStructs_loongarch.hpp @@ -0,0 +1,68 @@ @@ -57417,7 +57417,7 @@ index 00000000..7c3ce680 +#endif // CPU_LOONGARCH_VM_VMSTRUCTS_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/vm_version_ext_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/vm_version_ext_loongarch.cpp new file mode 100644 -index 00000000..c71f64e1 +index 0000000000..c71f64e132 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/vm_version_ext_loongarch.cpp @@ -0,0 +1,84 @@ @@ -57507,7 +57507,7 @@ index 00000000..c71f64e1 +} diff --git a/hotspot/src/cpu/loongarch/vm/vm_version_ext_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/vm_version_ext_loongarch.hpp new file mode 100644 -index 00000000..682dd9c7 +index 0000000000..682dd9c78f --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/vm_version_ext_loongarch.hpp @@ -0,0 +1,54 @@ @@ -57567,7 +57567,7 @@ index 00000000..682dd9c7 +#endif // CPU_LOONGARCH_VM_VM_VERSION_EXT_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.cpp new file mode 100644 -index 00000000..e1abacee +index 0000000000..e1abacee7c --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.cpp @@ -0,0 +1,441 @@ @@ -58014,7 +58014,7 @@ index 00000000..e1abacee +} diff --git a/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.hpp new file mode 100644 -index 00000000..23c38fdb +index 0000000000..23c38fdbe7 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/vm_version_loongarch.hpp @@ -0,0 +1,290 @@ @@ -58310,7 +58310,7 @@ index 00000000..23c38fdb +#endif // CPU_LOONGARCH_VM_VM_VERSION_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/vmreg_loongarch.cpp b/hotspot/src/cpu/loongarch/vm/vmreg_loongarch.cpp new file mode 100644 -index 00000000..52bccfc1 +index 0000000000..52bccfc183 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/vmreg_loongarch.cpp @@ -0,0 +1,51 @@ @@ -58367,7 +58367,7 @@ index 00000000..52bccfc1 +} diff --git a/hotspot/src/cpu/loongarch/vm/vmreg_loongarch.hpp b/hotspot/src/cpu/loongarch/vm/vmreg_loongarch.hpp new file mode 100644 -index 00000000..80a1fc57 +index 0000000000..80a1fc57de --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/vmreg_loongarch.hpp @@ -0,0 +1,35 @@ @@ -58408,7 +58408,7 @@ index 00000000..80a1fc57 +#endif // CPU_LOONGARCH_VM_VMREG_LOONGARCH_HPP diff --git a/hotspot/src/cpu/loongarch/vm/vmreg_loongarch.inline.hpp b/hotspot/src/cpu/loongarch/vm/vmreg_loongarch.inline.hpp new file mode 100644 -index 00000000..f822d4c3 +index 0000000000..f822d4c355 --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/vmreg_loongarch.inline.hpp @@ -0,0 +1,66 @@ @@ -58480,7 +58480,7 @@ index 00000000..f822d4c3 +#endif // CPU_LOONGARCH_VM_VMREG_LOONGARCH_INLINE_HPP diff --git a/hotspot/src/cpu/loongarch/vm/vtableStubs_loongarch_64.cpp b/hotspot/src/cpu/loongarch/vm/vtableStubs_loongarch_64.cpp new file mode 100644 -index 00000000..df0d176b +index 0000000000..df0d176b8b --- /dev/null +++ b/hotspot/src/cpu/loongarch/vm/vtableStubs_loongarch_64.cpp @@ -0,0 +1,300 @@ @@ -58786,7 +58786,7 @@ index 00000000..df0d176b +} diff --git a/hotspot/src/cpu/mips/vm/assembler_mips.cpp b/hotspot/src/cpu/mips/vm/assembler_mips.cpp new file mode 100644 -index 00000000..6c720972 +index 0000000000..6c720972ad --- /dev/null +++ b/hotspot/src/cpu/mips/vm/assembler_mips.cpp @@ -0,0 +1,774 @@ @@ -59566,7 +59566,7 @@ index 00000000..6c720972 +} diff --git a/hotspot/src/cpu/mips/vm/assembler_mips.hpp b/hotspot/src/cpu/mips/vm/assembler_mips.hpp new file mode 100644 -index 00000000..e91b9db2 +index 0000000000..e91b9db222 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/assembler_mips.hpp @@ -0,0 +1,1789 @@ @@ -61361,7 +61361,7 @@ index 00000000..e91b9db2 +#endif // CPU_MIPS_VM_ASSEMBLER_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/assembler_mips.inline.hpp b/hotspot/src/cpu/mips/vm/assembler_mips.inline.hpp new file mode 100644 -index 00000000..39aeb550 +index 0000000000..39aeb5509a --- /dev/null +++ b/hotspot/src/cpu/mips/vm/assembler_mips.inline.hpp @@ -0,0 +1,33 @@ @@ -61400,7 +61400,7 @@ index 00000000..39aeb550 +#endif // CPU_MIPS_VM_ASSEMBLER_MIPS_INLINE_HPP diff --git a/hotspot/src/cpu/mips/vm/bytecodeInterpreter_mips.cpp b/hotspot/src/cpu/mips/vm/bytecodeInterpreter_mips.cpp new file mode 100644 -index 00000000..a4a1b28c +index 0000000000..a4a1b28c2d --- /dev/null +++ b/hotspot/src/cpu/mips/vm/bytecodeInterpreter_mips.cpp @@ -0,0 +1,53 @@ @@ -61459,7 +61459,7 @@ index 00000000..a4a1b28c +#endif // CC_INTERP (all) diff --git a/hotspot/src/cpu/mips/vm/bytecodeInterpreter_mips.hpp b/hotspot/src/cpu/mips/vm/bytecodeInterpreter_mips.hpp new file mode 100644 -index 00000000..aac8b7a2 +index 0000000000..aac8b7a2b7 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/bytecodeInterpreter_mips.hpp @@ -0,0 +1,110 @@ @@ -61575,7 +61575,7 @@ index 00000000..aac8b7a2 +#endif // CPU_MIPS_VM_BYTECODEINTERPRETER_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/bytecodeInterpreter_mips.inline.hpp b/hotspot/src/cpu/mips/vm/bytecodeInterpreter_mips.inline.hpp new file mode 100644 -index 00000000..8ce77ab9 +index 0000000000..8ce77ab92f --- /dev/null +++ b/hotspot/src/cpu/mips/vm/bytecodeInterpreter_mips.inline.hpp @@ -0,0 +1,286 @@ @@ -61867,7 +61867,7 @@ index 00000000..8ce77ab9 +#endif // CPU_MIPS_VM_BYTECODEINTERPRETER_MIPS_INLINE_HPP diff --git a/hotspot/src/cpu/mips/vm/bytecodes_mips.cpp b/hotspot/src/cpu/mips/vm/bytecodes_mips.cpp new file mode 100644 -index 00000000..61efd1f5 +index 0000000000..61efd1f561 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/bytecodes_mips.cpp @@ -0,0 +1,38 @@ @@ -61911,7 +61911,7 @@ index 00000000..61efd1f5 +} diff --git a/hotspot/src/cpu/mips/vm/bytecodes_mips.hpp b/hotspot/src/cpu/mips/vm/bytecodes_mips.hpp new file mode 100644 -index 00000000..25a9562a +index 0000000000..25a9562acd --- /dev/null +++ b/hotspot/src/cpu/mips/vm/bytecodes_mips.hpp @@ -0,0 +1,31 @@ @@ -61948,7 +61948,7 @@ index 00000000..25a9562a +#endif // CPU_MIPS_VM_BYTECODES_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/bytes_mips.hpp b/hotspot/src/cpu/mips/vm/bytes_mips.hpp new file mode 100644 -index 00000000..515ffad4 +index 0000000000..515ffad4b0 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/bytes_mips.hpp @@ -0,0 +1,193 @@ @@ -62147,7 +62147,7 @@ index 00000000..515ffad4 +#endif // CPU_MIPS_VM_BYTES_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/c2_globals_mips.hpp b/hotspot/src/cpu/mips/vm/c2_globals_mips.hpp new file mode 100644 -index 00000000..f254e07a +index 0000000000..f254e07abd --- /dev/null +++ b/hotspot/src/cpu/mips/vm/c2_globals_mips.hpp @@ -0,0 +1,100 @@ @@ -62253,7 +62253,7 @@ index 00000000..f254e07a +#endif // CPU_MIPS_VM_C2_GLOBALS_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/c2_init_mips.cpp b/hotspot/src/cpu/mips/vm/c2_init_mips.cpp new file mode 100644 -index 00000000..e6d5815f +index 0000000000..e6d5815f42 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/c2_init_mips.cpp @@ -0,0 +1,34 @@ @@ -62293,7 +62293,7 @@ index 00000000..e6d5815f +} diff --git a/hotspot/src/cpu/mips/vm/codeBuffer_mips.hpp b/hotspot/src/cpu/mips/vm/codeBuffer_mips.hpp new file mode 100644 -index 00000000..1836b7a9 +index 0000000000..1836b7a921 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/codeBuffer_mips.hpp @@ -0,0 +1,35 @@ @@ -62334,7 +62334,7 @@ index 00000000..1836b7a9 +#endif // CPU_MIPS_VM_CODEBUFFER_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/compiledIC_mips.cpp b/hotspot/src/cpu/mips/vm/compiledIC_mips.cpp new file mode 100644 -index 00000000..8ffaaaf8 +index 0000000000..8ffaaaf841 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/compiledIC_mips.cpp @@ -0,0 +1,173 @@ @@ -62513,7 +62513,7 @@ index 00000000..8ffaaaf8 +#endif // !PRODUCT diff --git a/hotspot/src/cpu/mips/vm/copy_mips.hpp b/hotspot/src/cpu/mips/vm/copy_mips.hpp new file mode 100644 -index 00000000..49fde179 +index 0000000000..49fde17923 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/copy_mips.hpp @@ -0,0 +1,72 @@ @@ -62591,7 +62591,7 @@ index 00000000..49fde179 +#endif //CPU_MIPS_VM_COPY_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/cppInterpreterGenerator_mips.hpp b/hotspot/src/cpu/mips/vm/cppInterpreterGenerator_mips.hpp new file mode 100644 -index 00000000..37bd03b0 +index 0000000000..37bd03b00b --- /dev/null +++ b/hotspot/src/cpu/mips/vm/cppInterpreterGenerator_mips.hpp @@ -0,0 +1,53 @@ @@ -62650,7 +62650,7 @@ index 00000000..37bd03b0 +#endif // CPU_MIPS_VM_CPPINTERPRETERGENERATOR_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/cppInterpreter_mips.cpp b/hotspot/src/cpu/mips/vm/cppInterpreter_mips.cpp new file mode 100644 -index 00000000..1f8d75d5 +index 0000000000..1f8d75d593 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/cppInterpreter_mips.cpp @@ -0,0 +1,215 @@ @@ -62871,7 +62871,7 @@ index 00000000..1f8d75d5 +#endif // CC_INTERP diff --git a/hotspot/src/cpu/mips/vm/cppInterpreter_mips.hpp b/hotspot/src/cpu/mips/vm/cppInterpreter_mips.hpp new file mode 100644 -index 00000000..49c47330 +index 0000000000..49c4733049 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/cppInterpreter_mips.hpp @@ -0,0 +1,40 @@ @@ -62917,7 +62917,7 @@ index 00000000..49c47330 +#endif // CPU_MIPS_VM_CPPINTERPRETER_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/debug_mips.cpp b/hotspot/src/cpu/mips/vm/debug_mips.cpp new file mode 100644 -index 00000000..50de0365 +index 0000000000..50de03653b --- /dev/null +++ b/hotspot/src/cpu/mips/vm/debug_mips.cpp @@ -0,0 +1,51 @@ @@ -62974,7 +62974,7 @@ index 00000000..50de0365 +#endif // PRODUCT diff --git a/hotspot/src/cpu/mips/vm/depChecker_mips.cpp b/hotspot/src/cpu/mips/vm/depChecker_mips.cpp new file mode 100644 -index 00000000..756ccb68 +index 0000000000..756ccb68f9 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/depChecker_mips.cpp @@ -0,0 +1,30 @@ @@ -63010,7 +63010,7 @@ index 00000000..756ccb68 +// Nothing to do on mips diff --git a/hotspot/src/cpu/mips/vm/depChecker_mips.hpp b/hotspot/src/cpu/mips/vm/depChecker_mips.hpp new file mode 100644 -index 00000000..11e52b4e +index 0000000000..11e52b4e8f --- /dev/null +++ b/hotspot/src/cpu/mips/vm/depChecker_mips.hpp @@ -0,0 +1,31 @@ @@ -63047,7 +63047,7 @@ index 00000000..11e52b4e +#endif // CPU_MIPS_VM_DEPCHECKER_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/disassembler_mips.hpp b/hotspot/src/cpu/mips/vm/disassembler_mips.hpp new file mode 100644 -index 00000000..c5f3a888 +index 0000000000..c5f3a8888d --- /dev/null +++ b/hotspot/src/cpu/mips/vm/disassembler_mips.hpp @@ -0,0 +1,37 @@ @@ -63090,7 +63090,7 @@ index 00000000..c5f3a888 +#endif // CPU_MIPS_VM_DISASSEMBLER_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/frame_mips.cpp b/hotspot/src/cpu/mips/vm/frame_mips.cpp new file mode 100644 -index 00000000..1c928976 +index 0000000000..1c928976fc --- /dev/null +++ b/hotspot/src/cpu/mips/vm/frame_mips.cpp @@ -0,0 +1,711 @@ @@ -63807,7 +63807,7 @@ index 00000000..1c928976 +#endif diff --git a/hotspot/src/cpu/mips/vm/frame_mips.hpp b/hotspot/src/cpu/mips/vm/frame_mips.hpp new file mode 100644 -index 00000000..9e684a8d +index 0000000000..9e684a8dc3 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/frame_mips.hpp @@ -0,0 +1,229 @@ @@ -64042,7 +64042,7 @@ index 00000000..9e684a8d +#endif // CPU_MIPS_VM_FRAME_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/frame_mips.inline.hpp b/hotspot/src/cpu/mips/vm/frame_mips.inline.hpp new file mode 100644 -index 00000000..60e56ac7 +index 0000000000..60e56ac7ab --- /dev/null +++ b/hotspot/src/cpu/mips/vm/frame_mips.inline.hpp @@ -0,0 +1,312 @@ @@ -64360,7 +64360,7 @@ index 00000000..60e56ac7 +#endif // CPU_MIPS_VM_FRAME_MIPS_INLINE_HPP diff --git a/hotspot/src/cpu/mips/vm/globalDefinitions_mips.hpp b/hotspot/src/cpu/mips/vm/globalDefinitions_mips.hpp new file mode 100644 -index 00000000..bd00a8d4 +index 0000000000..bd00a8d473 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/globalDefinitions_mips.hpp @@ -0,0 +1,41 @@ @@ -64407,7 +64407,7 @@ index 00000000..bd00a8d4 +#endif // CPU_MIPS_VM_GLOBALDEFINITIONS_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/globals_mips.hpp b/hotspot/src/cpu/mips/vm/globals_mips.hpp new file mode 100644 -index 00000000..988bc351 +index 0000000000..988bc35137 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/globals_mips.hpp @@ -0,0 +1,124 @@ @@ -64537,7 +64537,7 @@ index 00000000..988bc351 +#endif // CPU_MIPS_VM_GLOBALS_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/icBuffer_mips.cpp b/hotspot/src/cpu/mips/vm/icBuffer_mips.cpp new file mode 100644 -index 00000000..96ea3453 +index 0000000000..96ea345360 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/icBuffer_mips.cpp @@ -0,0 +1,97 @@ @@ -64640,7 +64640,7 @@ index 00000000..96ea3453 +} diff --git a/hotspot/src/cpu/mips/vm/icache_mips.cpp b/hotspot/src/cpu/mips/vm/icache_mips.cpp new file mode 100644 -index 00000000..848964b6 +index 0000000000..848964b63f --- /dev/null +++ b/hotspot/src/cpu/mips/vm/icache_mips.cpp @@ -0,0 +1,41 @@ @@ -64687,7 +64687,7 @@ index 00000000..848964b6 +} diff --git a/hotspot/src/cpu/mips/vm/icache_mips.hpp b/hotspot/src/cpu/mips/vm/icache_mips.hpp new file mode 100644 -index 00000000..78ee11cc +index 0000000000..78ee11cc73 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/icache_mips.hpp @@ -0,0 +1,41 @@ @@ -64734,7 +64734,7 @@ index 00000000..78ee11cc +#endif // CPU_MIPS_VM_ICACHE_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/interp_masm_mips_64.cpp b/hotspot/src/cpu/mips/vm/interp_masm_mips_64.cpp new file mode 100644 -index 00000000..ed2d931e +index 0000000000..ed2d931e94 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/interp_masm_mips_64.cpp @@ -0,0 +1,2084 @@ @@ -66824,7 +66824,7 @@ index 00000000..ed2d931e +} diff --git a/hotspot/src/cpu/mips/vm/interp_masm_mips_64.hpp b/hotspot/src/cpu/mips/vm/interp_masm_mips_64.hpp new file mode 100644 -index 00000000..a2ebdec3 +index 0000000000..a2ebdec3ad --- /dev/null +++ b/hotspot/src/cpu/mips/vm/interp_masm_mips_64.hpp @@ -0,0 +1,269 @@ @@ -67099,7 +67099,7 @@ index 00000000..a2ebdec3 +#endif // CPU_MIPS_VM_INTERP_MASM_MIPS_64_HPP diff --git a/hotspot/src/cpu/mips/vm/interpreterGenerator_mips.hpp b/hotspot/src/cpu/mips/vm/interpreterGenerator_mips.hpp new file mode 100644 -index 00000000..26fced49 +index 0000000000..26fced492a --- /dev/null +++ b/hotspot/src/cpu/mips/vm/interpreterGenerator_mips.hpp @@ -0,0 +1,49 @@ @@ -67154,7 +67154,7 @@ index 00000000..26fced49 +#endif // CPU_MIPS_VM_INTERPRETERGENERATOR_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/interpreterRT_mips.hpp b/hotspot/src/cpu/mips/vm/interpreterRT_mips.hpp new file mode 100644 -index 00000000..8dec2007 +index 0000000000..8dec2007c6 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/interpreterRT_mips.hpp @@ -0,0 +1,61 @@ @@ -67221,7 +67221,7 @@ index 00000000..8dec2007 +#endif // CPU_MIPS_VM_INTERPRETERRT_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/interpreterRT_mips_64.cpp b/hotspot/src/cpu/mips/vm/interpreterRT_mips_64.cpp new file mode 100644 -index 00000000..14b7e39a +index 0000000000..14b7e39af7 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/interpreterRT_mips_64.cpp @@ -0,0 +1,259 @@ @@ -67486,7 +67486,7 @@ index 00000000..14b7e39a +IRT_END diff --git a/hotspot/src/cpu/mips/vm/interpreter_mips.hpp b/hotspot/src/cpu/mips/vm/interpreter_mips.hpp new file mode 100644 -index 00000000..9a21d704 +index 0000000000..9a21d704fa --- /dev/null +++ b/hotspot/src/cpu/mips/vm/interpreter_mips.hpp @@ -0,0 +1,50 @@ @@ -67542,7 +67542,7 @@ index 00000000..9a21d704 +#endif // CPU_MIPS_VM_INTERPRETER_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/interpreter_mips_64.cpp b/hotspot/src/cpu/mips/vm/interpreter_mips_64.cpp new file mode 100644 -index 00000000..014c8127 +index 0000000000..014c812713 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/interpreter_mips_64.cpp @@ -0,0 +1,286 @@ @@ -67834,7 +67834,7 @@ index 00000000..014c8127 +} diff --git a/hotspot/src/cpu/mips/vm/javaFrameAnchor_mips.hpp b/hotspot/src/cpu/mips/vm/javaFrameAnchor_mips.hpp new file mode 100644 -index 00000000..dccdf6a0 +index 0000000000..dccdf6a019 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/javaFrameAnchor_mips.hpp @@ -0,0 +1,87 @@ @@ -67927,7 +67927,7 @@ index 00000000..dccdf6a0 +#endif // CPU_MIPS_VM_JAVAFRAMEANCHOR_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/jniFastGetField_mips_64.cpp b/hotspot/src/cpu/mips/vm/jniFastGetField_mips_64.cpp new file mode 100644 -index 00000000..0f7dd942 +index 0000000000..0f7dd9424a --- /dev/null +++ b/hotspot/src/cpu/mips/vm/jniFastGetField_mips_64.cpp @@ -0,0 +1,172 @@ @@ -68105,7 +68105,7 @@ index 00000000..0f7dd942 +} diff --git a/hotspot/src/cpu/mips/vm/jniTypes_mips.hpp b/hotspot/src/cpu/mips/vm/jniTypes_mips.hpp new file mode 100644 -index 00000000..dfcd47b4 +index 0000000000..dfcd47b478 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/jniTypes_mips.hpp @@ -0,0 +1,144 @@ @@ -68255,7 +68255,7 @@ index 00000000..dfcd47b4 +#endif // CPU_MIPS_VM_JNITYPES_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/jni_mips.h b/hotspot/src/cpu/mips/vm/jni_mips.h new file mode 100644 -index 00000000..6714f51d +index 0000000000..6714f51d5d --- /dev/null +++ b/hotspot/src/cpu/mips/vm/jni_mips.h @@ -0,0 +1,51 @@ @@ -68312,7 +68312,7 @@ index 00000000..6714f51d +#endif diff --git a/hotspot/src/cpu/mips/vm/macroAssembler_mips.cpp b/hotspot/src/cpu/mips/vm/macroAssembler_mips.cpp new file mode 100644 -index 00000000..2b8840ae +index 0000000000..2b8840ae10 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/macroAssembler_mips.cpp @@ -0,0 +1,4332 @@ @@ -72650,7 +72650,7 @@ index 00000000..2b8840ae +} diff --git a/hotspot/src/cpu/mips/vm/macroAssembler_mips.hpp b/hotspot/src/cpu/mips/vm/macroAssembler_mips.hpp new file mode 100644 -index 00000000..ab972779 +index 0000000000..ab9727793f --- /dev/null +++ b/hotspot/src/cpu/mips/vm/macroAssembler_mips.hpp @@ -0,0 +1,701 @@ @@ -73357,7 +73357,7 @@ index 00000000..ab972779 +#endif // CPU_MIPS_VM_MACROASSEMBLER_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/macroAssembler_mips.inline.hpp b/hotspot/src/cpu/mips/vm/macroAssembler_mips.inline.hpp new file mode 100644 -index 00000000..92c05fb7 +index 0000000000..92c05fb726 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/macroAssembler_mips.inline.hpp @@ -0,0 +1,34 @@ @@ -73397,7 +73397,7 @@ index 00000000..92c05fb7 +#endif // CPU_MIPS_VM_MACROASSEMBLER_MIPS_INLINE_HPP diff --git a/hotspot/src/cpu/mips/vm/metaspaceShared_mips_64.cpp b/hotspot/src/cpu/mips/vm/metaspaceShared_mips_64.cpp new file mode 100644 -index 00000000..0c467df2 +index 0000000000..0c467df2f3 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/metaspaceShared_mips_64.cpp @@ -0,0 +1,123 @@ @@ -73526,7 +73526,7 @@ index 00000000..0c467df2 +} diff --git a/hotspot/src/cpu/mips/vm/methodHandles_mips.cpp b/hotspot/src/cpu/mips/vm/methodHandles_mips.cpp new file mode 100644 -index 00000000..428c2713 +index 0000000000..428c271362 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/methodHandles_mips.cpp @@ -0,0 +1,576 @@ @@ -74108,7 +74108,7 @@ index 00000000..428c2713 +#endif //PRODUCT diff --git a/hotspot/src/cpu/mips/vm/methodHandles_mips.hpp b/hotspot/src/cpu/mips/vm/methodHandles_mips.hpp new file mode 100644 -index 00000000..03b65fc8 +index 0000000000..03b65fc8ef --- /dev/null +++ b/hotspot/src/cpu/mips/vm/methodHandles_mips.hpp @@ -0,0 +1,62 @@ @@ -74176,7 +74176,7 @@ index 00000000..03b65fc8 + } diff --git a/hotspot/src/cpu/mips/vm/mips.ad b/hotspot/src/cpu/mips/vm/mips.ad new file mode 100644 -index 00000000..3563bbe0 +index 0000000000..3563bbe0e5 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/mips.ad @@ -0,0 +1,25 @@ @@ -74207,7 +74207,7 @@ index 00000000..3563bbe0 + diff --git a/hotspot/src/cpu/mips/vm/mips_64.ad b/hotspot/src/cpu/mips/vm/mips_64.ad new file mode 100644 -index 00000000..2d714c8b +index 0000000000..2d714c8be1 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/mips_64.ad @@ -0,0 +1,14035 @@ @@ -88248,7 +88248,7 @@ index 00000000..2d714c8b + diff --git a/hotspot/src/cpu/mips/vm/nativeInst_mips.cpp b/hotspot/src/cpu/mips/vm/nativeInst_mips.cpp new file mode 100644 -index 00000000..e1f7cd94 +index 0000000000..e1f7cd944d --- /dev/null +++ b/hotspot/src/cpu/mips/vm/nativeInst_mips.cpp @@ -0,0 +1,1829 @@ @@ -90083,7 +90083,7 @@ index 00000000..e1f7cd94 +} diff --git a/hotspot/src/cpu/mips/vm/nativeInst_mips.hpp b/hotspot/src/cpu/mips/vm/nativeInst_mips.hpp new file mode 100644 -index 00000000..13a4cb4e +index 0000000000..13a4cb4ef1 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/nativeInst_mips.hpp @@ -0,0 +1,735 @@ @@ -90824,7 +90824,7 @@ index 00000000..13a4cb4e +#endif // CPU_MIPS_VM_NATIVEINST_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/registerMap_mips.hpp b/hotspot/src/cpu/mips/vm/registerMap_mips.hpp new file mode 100644 -index 00000000..7f800eb1 +index 0000000000..7f800eb107 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/registerMap_mips.hpp @@ -0,0 +1,47 @@ @@ -90877,7 +90877,7 @@ index 00000000..7f800eb1 +#endif // CPU_MIPS_VM_REGISTERMAP_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/register_definitions_mips.cpp b/hotspot/src/cpu/mips/vm/register_definitions_mips.cpp new file mode 100644 -index 00000000..4af25318 +index 0000000000..4af2531834 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/register_definitions_mips.cpp @@ -0,0 +1,103 @@ @@ -90986,7 +90986,7 @@ index 00000000..4af25318 +REGISTER_DEFINITION(FloatRegister, f31); diff --git a/hotspot/src/cpu/mips/vm/register_mips.cpp b/hotspot/src/cpu/mips/vm/register_mips.cpp new file mode 100644 -index 00000000..4a9b22bf +index 0000000000..4a9b22bfef --- /dev/null +++ b/hotspot/src/cpu/mips/vm/register_mips.cpp @@ -0,0 +1,52 @@ @@ -91044,7 +91044,7 @@ index 00000000..4a9b22bf + diff --git a/hotspot/src/cpu/mips/vm/register_mips.hpp b/hotspot/src/cpu/mips/vm/register_mips.hpp new file mode 100644 -index 00000000..88bf2d68 +index 0000000000..88bf2d68cc --- /dev/null +++ b/hotspot/src/cpu/mips/vm/register_mips.hpp @@ -0,0 +1,346 @@ @@ -91396,7 +91396,7 @@ index 00000000..88bf2d68 +#endif //CPU_MIPS_VM_REGISTER_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/relocInfo_mips.cpp b/hotspot/src/cpu/mips/vm/relocInfo_mips.cpp new file mode 100644 -index 00000000..cae43b2d +index 0000000000..cae43b2d96 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/relocInfo_mips.cpp @@ -0,0 +1,156 @@ @@ -91558,7 +91558,7 @@ index 00000000..cae43b2d +} diff --git a/hotspot/src/cpu/mips/vm/relocInfo_mips.hpp b/hotspot/src/cpu/mips/vm/relocInfo_mips.hpp new file mode 100644 -index 00000000..04ad5dac +index 0000000000..04ad5dac96 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/relocInfo_mips.hpp @@ -0,0 +1,40 @@ @@ -91604,7 +91604,7 @@ index 00000000..04ad5dac +#endif // CPU_MIPS_VM_RELOCINFO_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/runtime_mips_64.cpp b/hotspot/src/cpu/mips/vm/runtime_mips_64.cpp new file mode 100644 -index 00000000..bb9269b4 +index 0000000000..bb9269b423 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/runtime_mips_64.cpp @@ -0,0 +1,206 @@ @@ -91816,7 +91816,7 @@ index 00000000..bb9269b4 +} diff --git a/hotspot/src/cpu/mips/vm/sharedRuntime_mips_64.cpp b/hotspot/src/cpu/mips/vm/sharedRuntime_mips_64.cpp new file mode 100644 -index 00000000..daf04c44 +index 0000000000..daf04c4422 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/sharedRuntime_mips_64.cpp @@ -0,0 +1,3816 @@ @@ -95638,7 +95638,7 @@ index 00000000..daf04c44 +} diff --git a/hotspot/src/cpu/mips/vm/stubGenerator_mips_64.cpp b/hotspot/src/cpu/mips/vm/stubGenerator_mips_64.cpp new file mode 100644 -index 00000000..aeb797fa +index 0000000000..aeb797faf9 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/stubGenerator_mips_64.cpp @@ -0,0 +1,2147 @@ @@ -97791,7 +97791,7 @@ index 00000000..aeb797fa +} diff --git a/hotspot/src/cpu/mips/vm/stubRoutines_mips_64.cpp b/hotspot/src/cpu/mips/vm/stubRoutines_mips_64.cpp new file mode 100644 -index 00000000..733a48b8 +index 0000000000..733a48b889 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/stubRoutines_mips_64.cpp @@ -0,0 +1,35 @@ @@ -97832,7 +97832,7 @@ index 00000000..733a48b8 +address StubRoutines::gs2::_call_stub_compiled_return = NULL; diff --git a/hotspot/src/cpu/mips/vm/stubRoutines_mips_64.hpp b/hotspot/src/cpu/mips/vm/stubRoutines_mips_64.hpp new file mode 100644 -index 00000000..920c0884 +index 0000000000..920c08844e --- /dev/null +++ b/hotspot/src/cpu/mips/vm/stubRoutines_mips_64.hpp @@ -0,0 +1,59 @@ @@ -97897,7 +97897,7 @@ index 00000000..920c0884 +#endif // CPU_MIPS_VM_STUBROUTINES_MIPS_64_HPP diff --git a/hotspot/src/cpu/mips/vm/templateInterpreterGenerator_mips.hpp b/hotspot/src/cpu/mips/vm/templateInterpreterGenerator_mips.hpp new file mode 100644 -index 00000000..a83c3728 +index 0000000000..a83c3728f8 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/templateInterpreterGenerator_mips.hpp @@ -0,0 +1,35 @@ @@ -97938,7 +97938,7 @@ index 00000000..a83c3728 +#endif // CPU_MIPS_VM_TEMPLATEINTERPRETERGENERATOR_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/templateInterpreter_mips.hpp b/hotspot/src/cpu/mips/vm/templateInterpreter_mips.hpp new file mode 100644 -index 00000000..204f1b2f +index 0000000000..204f1b2f21 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/templateInterpreter_mips.hpp @@ -0,0 +1,41 @@ @@ -97985,7 +97985,7 @@ index 00000000..204f1b2f +#endif // CPU_MIPS_VM_TEMPLATEINTERPRETER_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/templateInterpreter_mips_64.cpp b/hotspot/src/cpu/mips/vm/templateInterpreter_mips_64.cpp new file mode 100644 -index 00000000..0cc5d330 +index 0000000000..0cc5d33070 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/templateInterpreter_mips_64.cpp @@ -0,0 +1,2306 @@ @@ -100297,7 +100297,7 @@ index 00000000..0cc5d330 +#endif // ! CC_INTERP diff --git a/hotspot/src/cpu/mips/vm/templateTable_mips.hpp b/hotspot/src/cpu/mips/vm/templateTable_mips.hpp new file mode 100644 -index 00000000..d879e6dc +index 0000000000..d879e6dc92 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/templateTable_mips.hpp @@ -0,0 +1,34 @@ @@ -100337,7 +100337,7 @@ index 00000000..d879e6dc + static void index_check_without_pop(Register array, Register index); diff --git a/hotspot/src/cpu/mips/vm/templateTable_mips_64.cpp b/hotspot/src/cpu/mips/vm/templateTable_mips_64.cpp new file mode 100644 -index 00000000..7415511b +index 0000000000..7415511b99 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/templateTable_mips_64.cpp @@ -0,0 +1,4623 @@ @@ -104966,7 +104966,7 @@ index 00000000..7415511b +#endif // !CC_INTERP diff --git a/hotspot/src/cpu/mips/vm/templateTable_mips_64.hpp b/hotspot/src/cpu/mips/vm/templateTable_mips_64.hpp new file mode 100644 -index 00000000..b63274a2 +index 0000000000..b63274a206 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/templateTable_mips_64.hpp @@ -0,0 +1,44 @@ @@ -105016,7 +105016,7 @@ index 00000000..b63274a2 +#endif // CPU_MIPS_VM_TEMPLATETABLE_MIPS_64_HPP diff --git a/hotspot/src/cpu/mips/vm/vmStructs_mips.hpp b/hotspot/src/cpu/mips/vm/vmStructs_mips.hpp new file mode 100644 -index 00000000..69399143 +index 0000000000..6939914356 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/vmStructs_mips.hpp @@ -0,0 +1,68 @@ @@ -105090,7 +105090,7 @@ index 00000000..69399143 +#endif // CPU_MIPS_VM_VMSTRUCTS_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/vm_version_ext_mips.cpp b/hotspot/src/cpu/mips/vm/vm_version_ext_mips.cpp new file mode 100644 -index 00000000..a98f70d9 +index 0000000000..a98f70d9ff --- /dev/null +++ b/hotspot/src/cpu/mips/vm/vm_version_ext_mips.cpp @@ -0,0 +1,89 @@ @@ -105185,7 +105185,7 @@ index 00000000..a98f70d9 +} diff --git a/hotspot/src/cpu/mips/vm/vm_version_ext_mips.hpp b/hotspot/src/cpu/mips/vm/vm_version_ext_mips.hpp new file mode 100644 -index 00000000..a240fcc2 +index 0000000000..a240fcc2e9 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/vm_version_ext_mips.hpp @@ -0,0 +1,54 @@ @@ -105245,7 +105245,7 @@ index 00000000..a240fcc2 +#endif // CPU_MIPS_VM_VM_VERSION_EXT_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/vm_version_mips.cpp b/hotspot/src/cpu/mips/vm/vm_version_mips.cpp new file mode 100644 -index 00000000..aef8f074 +index 0000000000..aef8f0746a --- /dev/null +++ b/hotspot/src/cpu/mips/vm/vm_version_mips.cpp @@ -0,0 +1,510 @@ @@ -105761,7 +105761,7 @@ index 00000000..aef8f074 +} diff --git a/hotspot/src/cpu/mips/vm/vm_version_mips.hpp b/hotspot/src/cpu/mips/vm/vm_version_mips.hpp new file mode 100644 -index 00000000..0de01e5f +index 0000000000..0de01e5f64 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/vm_version_mips.hpp @@ -0,0 +1,221 @@ @@ -105988,7 +105988,7 @@ index 00000000..0de01e5f +#endif // CPU_MIPS_VM_VM_VERSION_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/vmreg_mips.cpp b/hotspot/src/cpu/mips/vm/vmreg_mips.cpp new file mode 100644 -index 00000000..86bd74d4 +index 0000000000..86bd74d430 --- /dev/null +++ b/hotspot/src/cpu/mips/vm/vmreg_mips.cpp @@ -0,0 +1,51 @@ @@ -106045,7 +106045,7 @@ index 00000000..86bd74d4 +} diff --git a/hotspot/src/cpu/mips/vm/vmreg_mips.hpp b/hotspot/src/cpu/mips/vm/vmreg_mips.hpp new file mode 100644 -index 00000000..6a970ea9 +index 0000000000..6a970ea91a --- /dev/null +++ b/hotspot/src/cpu/mips/vm/vmreg_mips.hpp @@ -0,0 +1,35 @@ @@ -106086,7 +106086,7 @@ index 00000000..6a970ea9 +#endif // CPU_MIPS_VM_VMREG_MIPS_HPP diff --git a/hotspot/src/cpu/mips/vm/vmreg_mips.inline.hpp b/hotspot/src/cpu/mips/vm/vmreg_mips.inline.hpp new file mode 100644 -index 00000000..77e18ce5 +index 0000000000..77e18ce57d --- /dev/null +++ b/hotspot/src/cpu/mips/vm/vmreg_mips.inline.hpp @@ -0,0 +1,68 @@ @@ -106160,7 +106160,7 @@ index 00000000..77e18ce5 +#endif // CPU_MIPS_VM_VMREG_MIPS_INLINE_HPP diff --git a/hotspot/src/cpu/mips/vm/vtableStubs_mips_64.cpp b/hotspot/src/cpu/mips/vm/vtableStubs_mips_64.cpp new file mode 100644 -index 00000000..7779c58e +index 0000000000..7779c58e0a --- /dev/null +++ b/hotspot/src/cpu/mips/vm/vtableStubs_mips_64.cpp @@ -0,0 +1,301 @@ @@ -106466,7 +106466,7 @@ index 00000000..7779c58e + return wordSize; +} diff --git a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp -index c1c053e6..5c90df10 100644 +index c1c053e66c..5c90df1079 100644 --- a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp +++ b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp @@ -1513,6 +1513,10 @@ void LIR_Assembler::emit_opBranch(LIR_OpBranch* op) { @@ -106494,7 +106494,7 @@ index c1c053e6..5c90df10 100644 assert(info == NULL, "should never be used, idiv/irem and ldiv/lrem not handled by this method"); diff --git a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp b/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp -index 92b73e1c..45da327e 100644 +index 92b73e1c71..45da327efb 100644 --- a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp +++ b/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp @@ -242,20 +242,27 @@ void LIRGenerator::increment_counter(LIR_Address* addr, int step) { @@ -106533,7 +106533,7 @@ index 92b73e1c..45da327e 100644 bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) { if (tmp->is_valid() && c > 0 && c < max_jint) { diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp -index 2d3880b3..be40c439 100644 +index 2d3880b363..be40c43917 100644 --- a/hotspot/src/os/linux/vm/os_linux.cpp +++ b/hotspot/src/os/linux/vm/os_linux.cpp @@ -22,6 +22,12 @@ @@ -106628,7 +106628,7 @@ index 2d3880b3..be40c439 100644 "Specify at least %dk", os::Linux::min_stack_allowed/ K); diff --git a/hotspot/src/os/linux/vm/os_perf_linux.cpp b/hotspot/src/os/linux/vm/os_perf_linux.cpp -index 0d1f7581..cbc6c075 100644 +index 0d1f75810a..cbc6c0757c 100644 --- a/hotspot/src/os/linux/vm/os_perf_linux.cpp +++ b/hotspot/src/os/linux/vm/os_perf_linux.cpp @@ -50,6 +50,12 @@ @@ -106646,7 +106646,7 @@ index 0d1f7581..cbc6c075 100644 #include diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/assembler_linux_loongarch.cpp b/hotspot/src/os_cpu/linux_loongarch/vm/assembler_linux_loongarch.cpp new file mode 100644 -index 00000000..5ee0965f +index 0000000000..5ee0965f42 --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/assembler_linux_loongarch.cpp @@ -0,0 +1,92 @@ @@ -106744,7 +106744,7 @@ index 00000000..5ee0965f +} diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/atomic_linux_loongarch.inline.hpp b/hotspot/src/os_cpu/linux_loongarch/vm/atomic_linux_loongarch.inline.hpp new file mode 100644 -index 00000000..79446180 +index 0000000000..7944618037 --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/atomic_linux_loongarch.inline.hpp @@ -0,0 +1,206 @@ @@ -106956,7 +106956,7 @@ index 00000000..79446180 +#endif // OS_CPU_LINUX_LOONGARCH_VM_ATOMIC_LINUX_LOONGARCH_INLINE_HPP diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/bytes_linux_loongarch.inline.hpp b/hotspot/src/os_cpu/linux_loongarch/vm/bytes_linux_loongarch.inline.hpp new file mode 100644 -index 00000000..4e205c46 +index 0000000000..4e205c468e --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/bytes_linux_loongarch.inline.hpp @@ -0,0 +1,37 @@ @@ -106999,7 +106999,7 @@ index 00000000..4e205c46 +#endif // OS_CPU_LINUX_LOONGARCH_VM_BYTES_LINUX_LOONGARCH_INLINE_HPP diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/copy_linux_loongarch.inline.hpp b/hotspot/src/os_cpu/linux_loongarch/vm/copy_linux_loongarch.inline.hpp new file mode 100644 -index 00000000..7d6e11a9 +index 0000000000..7d6e11a935 --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/copy_linux_loongarch.inline.hpp @@ -0,0 +1,125 @@ @@ -107130,7 +107130,7 @@ index 00000000..7d6e11a9 +#endif // OS_CPU_LINUX_LOONGARCH_VM_COPY_LINUX_LOONGARCH_INLINE_HPP diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/globals_linux_loongarch.hpp b/hotspot/src/os_cpu/linux_loongarch/vm/globals_linux_loongarch.hpp new file mode 100644 -index 00000000..8ec3fa82 +index 0000000000..8ec3fa8239 --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/globals_linux_loongarch.hpp @@ -0,0 +1,43 @@ @@ -107179,7 +107179,7 @@ index 00000000..8ec3fa82 +#endif // OS_CPU_LINUX_LOONGARCH_VM_GLOBALS_LINUX_LOONGARCH_HPP diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/orderAccess_linux_loongarch.inline.hpp b/hotspot/src/os_cpu/linux_loongarch/vm/orderAccess_linux_loongarch.inline.hpp new file mode 100644 -index 00000000..0e1331ac +index 0000000000..0e1331ac90 --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/orderAccess_linux_loongarch.inline.hpp @@ -0,0 +1,115 @@ @@ -107300,7 +107300,7 @@ index 00000000..0e1331ac +#endif // OS_CPU_LINUX_LOONGARCH_VM_ORDERACCESS_LINUX_LOONGARCH_INLINE_HPP diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/os_linux_loongarch.cpp b/hotspot/src/os_cpu/linux_loongarch/vm/os_linux_loongarch.cpp new file mode 100644 -index 00000000..f2c3df84 +index 0000000000..f2c3df84a1 --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/os_linux_loongarch.cpp @@ -0,0 +1,750 @@ @@ -108056,7 +108056,7 @@ index 00000000..f2c3df84 +} diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/os_linux_loongarch.hpp b/hotspot/src/os_cpu/linux_loongarch/vm/os_linux_loongarch.hpp new file mode 100644 -index 00000000..a7321ae0 +index 0000000000..a7321ae025 --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/os_linux_loongarch.hpp @@ -0,0 +1,39 @@ @@ -108101,7 +108101,7 @@ index 00000000..a7321ae0 +#endif // OS_CPU_LINUX_LOONGARCH_VM_OS_LINUX_LOONGARCH_HPP diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/prefetch_linux_loongarch.inline.hpp b/hotspot/src/os_cpu/linux_loongarch/vm/prefetch_linux_loongarch.inline.hpp new file mode 100644 -index 00000000..a1cedcd8 +index 0000000000..a1cedcd8cf --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/prefetch_linux_loongarch.inline.hpp @@ -0,0 +1,56 @@ @@ -108163,7 +108163,7 @@ index 00000000..a1cedcd8 +#endif // OS_CPU_LINUX_LOONGARCH_VM_PREFETCH_LINUX_LOONGARCH_INLINE_HPP diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/threadLS_linux_loongarch.cpp b/hotspot/src/os_cpu/linux_loongarch/vm/threadLS_linux_loongarch.cpp new file mode 100644 -index 00000000..be28a562 +index 0000000000..be28a562a1 --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/threadLS_linux_loongarch.cpp @@ -0,0 +1,84 @@ @@ -108253,7 +108253,7 @@ index 00000000..be28a562 +} diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/threadLS_linux_loongarch.hpp b/hotspot/src/os_cpu/linux_loongarch/vm/threadLS_linux_loongarch.hpp new file mode 100644 -index 00000000..4fab788a +index 0000000000..4fab788a75 --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/threadLS_linux_loongarch.hpp @@ -0,0 +1,61 @@ @@ -108320,7 +108320,7 @@ index 00000000..4fab788a +#endif // OS_CPU_LINUX_LOONGARCH_VM_THREADLS_LINUX_LOONGARCH_HPP diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/thread_linux_loongarch.cpp b/hotspot/src/os_cpu/linux_loongarch/vm/thread_linux_loongarch.cpp new file mode 100644 -index 00000000..44f666d6 +index 0000000000..44f666d61f --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/thread_linux_loongarch.cpp @@ -0,0 +1,99 @@ @@ -108425,7 +108425,7 @@ index 00000000..44f666d6 + diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/thread_linux_loongarch.hpp b/hotspot/src/os_cpu/linux_loongarch/vm/thread_linux_loongarch.hpp new file mode 100644 -index 00000000..d6dd2521 +index 0000000000..d6dd2521f4 --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/thread_linux_loongarch.hpp @@ -0,0 +1,75 @@ @@ -108506,7 +108506,7 @@ index 00000000..d6dd2521 +#endif // OS_CPU_LINUX_LOONGARCH_VM_THREAD_LINUX_LOONGARCH_HPP diff --git a/hotspot/src/os_cpu/linux_loongarch/vm/vmStructs_linux_loongarch.hpp b/hotspot/src/os_cpu/linux_loongarch/vm/vmStructs_linux_loongarch.hpp new file mode 100644 -index 00000000..0097cadc +index 0000000000..0097cadcb7 --- /dev/null +++ b/hotspot/src/os_cpu/linux_loongarch/vm/vmStructs_linux_loongarch.hpp @@ -0,0 +1,55 @@ @@ -108567,7 +108567,7 @@ index 00000000..0097cadc +#endif // OS_CPU_LINUX_LOONGARCH_VM_VMSTRUCTS_LINUX_LOONGARCH_HPP diff --git a/hotspot/src/os_cpu/linux_mips/vm/assembler_linux_mips.cpp b/hotspot/src/os_cpu/linux_mips/vm/assembler_linux_mips.cpp new file mode 100644 -index 00000000..4ba53d93 +index 0000000000..4ba53d9341 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/assembler_linux_mips.cpp @@ -0,0 +1,111 @@ @@ -108684,7 +108684,7 @@ index 00000000..4ba53d93 +} diff --git a/hotspot/src/os_cpu/linux_mips/vm/atomic_linux_mips.inline.hpp b/hotspot/src/os_cpu/linux_mips/vm/atomic_linux_mips.inline.hpp new file mode 100644 -index 00000000..1c7ad605 +index 0000000000..1c7ad605e9 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/atomic_linux_mips.inline.hpp @@ -0,0 +1,258 @@ @@ -108948,7 +108948,7 @@ index 00000000..1c7ad605 +#endif // OS_CPU_LINUX_MIPS_VM_ATOMIC_LINUX_MIPS_INLINE_HPP diff --git a/hotspot/src/os_cpu/linux_mips/vm/bytes_linux_mips.inline.hpp b/hotspot/src/os_cpu/linux_mips/vm/bytes_linux_mips.inline.hpp new file mode 100644 -index 00000000..5b5cd10a +index 0000000000..5b5cd10aa5 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/bytes_linux_mips.inline.hpp @@ -0,0 +1,37 @@ @@ -108991,7 +108991,7 @@ index 00000000..5b5cd10a +#endif // OS_CPU_LINUX_MIPS_VM_BYTES_LINUX_MIPS_INLINE_HPP diff --git a/hotspot/src/os_cpu/linux_mips/vm/copy_linux_mips.inline.hpp b/hotspot/src/os_cpu/linux_mips/vm/copy_linux_mips.inline.hpp new file mode 100644 -index 00000000..73ac3450 +index 0000000000..73ac34501b --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/copy_linux_mips.inline.hpp @@ -0,0 +1,125 @@ @@ -109122,7 +109122,7 @@ index 00000000..73ac3450 +#endif // OS_CPU_LINUX_MIPS_VM_COPY_LINUX_MIPS_INLINE_HPP diff --git a/hotspot/src/os_cpu/linux_mips/vm/globals_linux_mips.hpp b/hotspot/src/os_cpu/linux_mips/vm/globals_linux_mips.hpp new file mode 100644 -index 00000000..f1599ac5 +index 0000000000..f1599ac5f1 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/globals_linux_mips.hpp @@ -0,0 +1,51 @@ @@ -109179,7 +109179,7 @@ index 00000000..f1599ac5 +#endif // OS_CPU_LINUX_MIPS_VM_GLOBALS_LINUX_MIPS_HPP diff --git a/hotspot/src/os_cpu/linux_mips/vm/linux_mips.ad b/hotspot/src/os_cpu/linux_mips/vm/linux_mips.ad new file mode 100644 -index 00000000..5e38996f +index 0000000000..5e38996ffa --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/linux_mips.ad @@ -0,0 +1,153 @@ @@ -109338,7 +109338,7 @@ index 00000000..5e38996f +%} diff --git a/hotspot/src/os_cpu/linux_mips/vm/linux_mips.s b/hotspot/src/os_cpu/linux_mips/vm/linux_mips.s new file mode 100644 -index 00000000..f87fbf26 +index 0000000000..f87fbf265d --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/linux_mips.s @@ -0,0 +1,25 @@ @@ -109369,7 +109369,7 @@ index 00000000..f87fbf26 + diff --git a/hotspot/src/os_cpu/linux_mips/vm/linux_mips_64.ad b/hotspot/src/os_cpu/linux_mips/vm/linux_mips_64.ad new file mode 100644 -index 00000000..ca4d0947 +index 0000000000..ca4d094738 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/linux_mips_64.ad @@ -0,0 +1,50 @@ @@ -109425,7 +109425,7 @@ index 00000000..ca4d0947 +// specified. diff --git a/hotspot/src/os_cpu/linux_mips/vm/orderAccess_linux_mips.inline.hpp b/hotspot/src/os_cpu/linux_mips/vm/orderAccess_linux_mips.inline.hpp new file mode 100644 -index 00000000..c9bc169a +index 0000000000..c9bc169aa5 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/orderAccess_linux_mips.inline.hpp @@ -0,0 +1,115 @@ @@ -109546,7 +109546,7 @@ index 00000000..c9bc169a +#endif // OS_CPU_LINUX_MIPS_VM_ORDERACCESS_LINUX_MIPS_INLINE_HPP diff --git a/hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.cpp b/hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.cpp new file mode 100644 -index 00000000..43487dab +index 0000000000..43487dab98 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.cpp @@ -0,0 +1,1015 @@ @@ -110567,7 +110567,7 @@ index 00000000..43487dab +} diff --git a/hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.hpp b/hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.hpp new file mode 100644 -index 00000000..c07d0815 +index 0000000000..c07d08156f --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/os_linux_mips.hpp @@ -0,0 +1,39 @@ @@ -110612,7 +110612,7 @@ index 00000000..c07d0815 +#endif // OS_CPU_LINUX_MIPS_VM_OS_LINUX_MIPS_HPP diff --git a/hotspot/src/os_cpu/linux_mips/vm/prefetch_linux_mips.inline.hpp b/hotspot/src/os_cpu/linux_mips/vm/prefetch_linux_mips.inline.hpp new file mode 100644 -index 00000000..93490345 +index 0000000000..93490345f0 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/prefetch_linux_mips.inline.hpp @@ -0,0 +1,58 @@ @@ -110676,7 +110676,7 @@ index 00000000..93490345 +#endif // OS_CPU_LINUX_MIPS_VM_PREFETCH_LINUX_MIPS_INLINE_HPP diff --git a/hotspot/src/os_cpu/linux_mips/vm/threadLS_linux_mips.cpp b/hotspot/src/os_cpu/linux_mips/vm/threadLS_linux_mips.cpp new file mode 100644 -index 00000000..be28a562 +index 0000000000..be28a562a1 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/threadLS_linux_mips.cpp @@ -0,0 +1,84 @@ @@ -110766,7 +110766,7 @@ index 00000000..be28a562 +} diff --git a/hotspot/src/os_cpu/linux_mips/vm/threadLS_linux_mips.hpp b/hotspot/src/os_cpu/linux_mips/vm/threadLS_linux_mips.hpp new file mode 100644 -index 00000000..e595195e +index 0000000000..e595195e21 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/threadLS_linux_mips.hpp @@ -0,0 +1,61 @@ @@ -110833,7 +110833,7 @@ index 00000000..e595195e +#endif // OS_CPU_LINUX_MIPS_VM_THREADLS_LINUX_MIPS_HPP diff --git a/hotspot/src/os_cpu/linux_mips/vm/thread_linux_mips.cpp b/hotspot/src/os_cpu/linux_mips/vm/thread_linux_mips.cpp new file mode 100644 -index 00000000..44f666d6 +index 0000000000..44f666d61f --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/thread_linux_mips.cpp @@ -0,0 +1,99 @@ @@ -110938,7 +110938,7 @@ index 00000000..44f666d6 + diff --git a/hotspot/src/os_cpu/linux_mips/vm/thread_linux_mips.hpp b/hotspot/src/os_cpu/linux_mips/vm/thread_linux_mips.hpp new file mode 100644 -index 00000000..cb11c36a +index 0000000000..cb11c36ae5 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/thread_linux_mips.hpp @@ -0,0 +1,75 @@ @@ -111019,7 +111019,7 @@ index 00000000..cb11c36a +#endif // OS_CPU_LINUX_MIPS_VM_THREAD_LINUX_MIPS_HPP diff --git a/hotspot/src/os_cpu/linux_mips/vm/vmStructs_linux_mips.hpp b/hotspot/src/os_cpu/linux_mips/vm/vmStructs_linux_mips.hpp new file mode 100644 -index 00000000..b7454bf0 +index 0000000000..b7454bf045 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/vmStructs_linux_mips.hpp @@ -0,0 +1,55 @@ @@ -111080,7 +111080,7 @@ index 00000000..b7454bf0 +#endif // OS_CPU_LINUX_MIPS_VM_VMSTRUCTS_LINUX_MIPS_HPP diff --git a/hotspot/src/os_cpu/linux_mips/vm/vm_version_linux_mips.cpp b/hotspot/src/os_cpu/linux_mips/vm/vm_version_linux_mips.cpp new file mode 100644 -index 00000000..ce697823 +index 0000000000..ce697823b9 --- /dev/null +++ b/hotspot/src/os_cpu/linux_mips/vm/vm_version_linux_mips.cpp @@ -0,0 +1,28 @@ @@ -111113,7 +111113,7 @@ index 00000000..ce697823 +#include "runtime/os.hpp" +#include "vm_version_mips.hpp" diff --git a/hotspot/src/share/tools/hsdis/Makefile b/hotspot/src/share/tools/hsdis/Makefile -index 0d1b6089..a9754ce2 100644 +index 0d1b608944..a9754ce2ac 100644 --- a/hotspot/src/share/tools/hsdis/Makefile +++ b/hotspot/src/share/tools/hsdis/Makefile @@ -105,12 +105,25 @@ CFLAGS/sparc += -m32 @@ -111143,7 +111143,7 @@ index 0d1b6089..a9754ce2 100644 OUTFLAGS += -o $@ else diff --git a/hotspot/src/share/tools/hsdis/hsdis.c b/hotspot/src/share/tools/hsdis/hsdis.c -index 4fb49648..f6ef5bea 100644 +index 4fb4964870..f6ef5bea15 100644 --- a/hotspot/src/share/tools/hsdis/hsdis.c +++ b/hotspot/src/share/tools/hsdis/hsdis.c @@ -493,6 +493,16 @@ static const char* native_arch_name() { @@ -111164,7 +111164,7 @@ index 4fb49648..f6ef5bea 100644 res = "aarch64"; #endif diff --git a/hotspot/src/share/vm/adlc/main.cpp b/hotspot/src/share/vm/adlc/main.cpp -index 52044f12..50c58587 100644 +index 52044f12d4..50c585872e 100644 --- a/hotspot/src/share/vm/adlc/main.cpp +++ b/hotspot/src/share/vm/adlc/main.cpp @@ -22,6 +22,12 @@ @@ -111196,7 +111196,7 @@ index 52044f12..50c58587 100644 AD.addInclude(AD._CPP_file, "assembler_aarch64.inline.hpp"); AD.addInclude(AD._CPP_file, "nativeInst_aarch64.hpp"); diff --git a/hotspot/src/share/vm/asm/assembler.hpp b/hotspot/src/share/vm/asm/assembler.hpp -index f7f1ae1d..572aa997 100644 +index f7f1ae1d36..572aa997ca 100644 --- a/hotspot/src/share/vm/asm/assembler.hpp +++ b/hotspot/src/share/vm/asm/assembler.hpp @@ -22,6 +22,12 @@ @@ -111241,7 +111241,7 @@ index f7f1ae1d..572aa997 100644 #endif // SHARE_VM_ASM_ASSEMBLER_HPP diff --git a/hotspot/src/share/vm/asm/assembler.inline.hpp b/hotspot/src/share/vm/asm/assembler.inline.hpp -index 1a48cb31..8ac90e14 100644 +index 1a48cb3171..8ac90e1474 100644 --- a/hotspot/src/share/vm/asm/assembler.inline.hpp +++ b/hotspot/src/share/vm/asm/assembler.inline.hpp @@ -22,6 +22,12 @@ @@ -111271,7 +111271,7 @@ index 1a48cb31..8ac90e14 100644 # include "assembler_aarch64.inline.hpp" #endif diff --git a/hotspot/src/share/vm/asm/codeBuffer.cpp b/hotspot/src/share/vm/asm/codeBuffer.cpp -index d94ac406..f6b57811 100644 +index d94ac40655..f6b578111f 100644 --- a/hotspot/src/share/vm/asm/codeBuffer.cpp +++ b/hotspot/src/share/vm/asm/codeBuffer.cpp @@ -22,6 +22,12 @@ @@ -111296,7 +111296,7 @@ index d94ac406..f6b57811 100644 rtype == relocInfo::external_word_type, "code needs relocation information"); diff --git a/hotspot/src/share/vm/asm/codeBuffer.hpp b/hotspot/src/share/vm/asm/codeBuffer.hpp -index 02b619ad..c04560a0 100644 +index 02b619ad77..c04560a0bc 100644 --- a/hotspot/src/share/vm/asm/codeBuffer.hpp +++ b/hotspot/src/share/vm/asm/codeBuffer.hpp @@ -22,6 +22,12 @@ @@ -111326,7 +111326,7 @@ index 02b619ad..c04560a0 100644 }; diff --git a/hotspot/src/share/vm/asm/macroAssembler.hpp b/hotspot/src/share/vm/asm/macroAssembler.hpp -index 1482eb63..0be415b6 100644 +index 1482eb630b..0be415b6c5 100644 --- a/hotspot/src/share/vm/asm/macroAssembler.hpp +++ b/hotspot/src/share/vm/asm/macroAssembler.hpp @@ -22,6 +22,12 @@ @@ -111355,7 +111355,7 @@ index 1482eb63..0be415b6 100644 +#endif #endif // SHARE_VM_ASM_MACROASSEMBLER_HPP diff --git a/hotspot/src/share/vm/asm/macroAssembler.inline.hpp b/hotspot/src/share/vm/asm/macroAssembler.inline.hpp -index db3daa52..6f4e523c 100644 +index db3daa52e9..6f4e523c59 100644 --- a/hotspot/src/share/vm/asm/macroAssembler.inline.hpp +++ b/hotspot/src/share/vm/asm/macroAssembler.inline.hpp @@ -22,6 +22,12 @@ @@ -111385,7 +111385,7 @@ index db3daa52..6f4e523c 100644 # include "macroAssembler_aarch64.inline.hpp" #endif diff --git a/hotspot/src/share/vm/asm/register.hpp b/hotspot/src/share/vm/asm/register.hpp -index c5008901..6a20929e 100644 +index c500890181..6a20929e59 100644 --- a/hotspot/src/share/vm/asm/register.hpp +++ b/hotspot/src/share/vm/asm/register.hpp @@ -22,6 +22,12 @@ @@ -111415,7 +111415,7 @@ index c5008901..6a20929e 100644 # include "register_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/c1/c1_Defs.hpp b/hotspot/src/share/vm/c1/c1_Defs.hpp -index b0cd7637..b42b9de1 100644 +index b0cd763739..b42b9de1b5 100644 --- a/hotspot/src/share/vm/c1/c1_Defs.hpp +++ b/hotspot/src/share/vm/c1/c1_Defs.hpp @@ -22,6 +22,12 @@ @@ -111452,7 +111452,7 @@ index b0cd7637..b42b9de1 100644 # include "c1_Defs_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp b/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp -index f07e97a4..6bc367a8 100644 +index f07e97a4d3..6bc367a897 100644 --- a/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp +++ b/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp @@ -22,6 +22,12 @@ @@ -111479,7 +111479,7 @@ index f07e97a4..6bc367a8 100644 # include "c1_FpuStackSim_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/c1/c1_FrameMap.cpp b/hotspot/src/share/vm/c1/c1_FrameMap.cpp -index 1dac94d5..b1e37ec4 100644 +index 1dac94d58c..b1e37ec41c 100644 --- a/hotspot/src/share/vm/c1/c1_FrameMap.cpp +++ b/hotspot/src/share/vm/c1/c1_FrameMap.cpp @@ -22,6 +22,12 @@ @@ -111506,7 +111506,7 @@ index 1dac94d5..b1e37ec4 100644 # include "vmreg_aarch64.inline.hpp" #endif diff --git a/hotspot/src/share/vm/c1/c1_FrameMap.hpp b/hotspot/src/share/vm/c1/c1_FrameMap.hpp -index 41571e3d..c0e7b28e 100644 +index 41571e3d16..c0e7b28ea4 100644 --- a/hotspot/src/share/vm/c1/c1_FrameMap.hpp +++ b/hotspot/src/share/vm/c1/c1_FrameMap.hpp @@ -22,6 +22,12 @@ @@ -111533,7 +111533,7 @@ index 41571e3d..c0e7b28e 100644 # include "c1_FrameMap_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/c1/c1_LIR.cpp b/hotspot/src/share/vm/c1/c1_LIR.cpp -index fa37e7a0..5d33d3f7 100644 +index fa37e7a046..5d33d3f7a0 100644 --- a/hotspot/src/share/vm/c1/c1_LIR.cpp +++ b/hotspot/src/share/vm/c1/c1_LIR.cpp @@ -22,6 +22,12 @@ @@ -111915,7 +111915,7 @@ index fa37e7a0..5d33d3f7 100644 #endif diff --git a/hotspot/src/share/vm/c1/c1_LIR.hpp b/hotspot/src/share/vm/c1/c1_LIR.hpp -index 24b86202..aec77afe 100644 +index 24b8620211..aec77afe1f 100644 --- a/hotspot/src/share/vm/c1/c1_LIR.hpp +++ b/hotspot/src/share/vm/c1/c1_LIR.hpp @@ -22,6 +22,11 @@ @@ -112264,7 +112264,7 @@ index 24b86202..aec77afe 100644 void shift_right(LIR_Opr value, LIR_Opr count, LIR_Opr dst, LIR_Opr tmp); void unsigned_shift_right(LIR_Opr value, LIR_Opr count, LIR_Opr dst, LIR_Opr tmp); diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp -index e5cd19f1..a18c5300 100644 +index e5cd19f17a..a18c53008b 100644 --- a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp +++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp @@ -22,6 +22,12 @@ @@ -112311,7 +112311,7 @@ index e5cd19f1..a18c5300 100644 _masm->build_frame(initial_frame_size_in_bytes(), bang_size_in_bytes()); } diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp b/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp -index 1a68d458..ac0f4e7a 100644 +index 1a68d458d2..ac0f4e7a46 100644 --- a/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp +++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp @@ -22,6 +22,12 @@ @@ -112356,7 +112356,7 @@ index 1a68d458..ac0f4e7a 100644 # include "c1_LIRAssembler_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp -index 837553dd..c66f3102 100644 +index 837553ddb6..c66f3102b9 100644 --- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp +++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp @@ -22,6 +22,12 @@ @@ -112653,7 +112653,7 @@ index 837553dd..c66f3102 100644 } return value; diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp -index 27be79fe..57c253db 100644 +index 27be79fee1..57c253db69 100644 --- a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp +++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp @@ -22,6 +22,12 @@ @@ -112702,7 +112702,7 @@ index 27be79fe..57c253db 100644 ciMethod *method, int frequency, int bci, bool backedge, bool notify); diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.cpp b/hotspot/src/share/vm/c1/c1_LinearScan.cpp -index 1f6281bf..4549ff09 100644 +index 1f6281bf25..4549ff0928 100644 --- a/hotspot/src/share/vm/c1/c1_LinearScan.cpp +++ b/hotspot/src/share/vm/c1/c1_LinearScan.cpp @@ -22,6 +22,12 @@ @@ -112850,7 +112850,7 @@ index 1f6281bf..4549ff09 100644 case lir_add: case lir_sub: diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.hpp b/hotspot/src/share/vm/c1/c1_LinearScan.hpp -index 96e6b3ba..576a07d7 100644 +index 96e6b3babf..576a07d73d 100644 --- a/hotspot/src/share/vm/c1/c1_LinearScan.hpp +++ b/hotspot/src/share/vm/c1/c1_LinearScan.hpp @@ -22,6 +22,12 @@ @@ -112877,7 +112877,7 @@ index 96e6b3ba..576a07d7 100644 # include "c1_LinearScan_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp b/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp -index 7e22bbaa..12aca7bf 100644 +index 7e22bbaa27..12aca7bf50 100644 --- a/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp +++ b/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp @@ -22,6 +22,12 @@ @@ -112904,7 +112904,7 @@ index 7e22bbaa..12aca7bf 100644 # include "c1_MacroAssembler_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.cpp b/hotspot/src/share/vm/c1/c1_Runtime1.cpp -index aebc3775..f1253506 100644 +index aebc377527..f1253506f6 100644 --- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp +++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp @@ -22,6 +22,12 @@ @@ -112977,7 +112977,7 @@ index aebc3775..f1253506 100644 // Entry point for compiled code. We want to patch a nmethod. // We don't do a normal VM transition here because we want to diff --git a/hotspot/src/share/vm/c1/c1_globals.hpp b/hotspot/src/share/vm/c1/c1_globals.hpp -index 8f7f9f61..0e2d926b 100644 +index 8f7f9f61c9..0e2d926bdf 100644 --- a/hotspot/src/share/vm/c1/c1_globals.hpp +++ b/hotspot/src/share/vm/c1/c1_globals.hpp @@ -22,6 +22,12 @@ @@ -113004,7 +113004,7 @@ index 8f7f9f61..0e2d926b 100644 # include "c1_globals_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/classfile/bytecodeAssembler.cpp b/hotspot/src/share/vm/classfile/bytecodeAssembler.cpp -index f067419f..5aa19dc8 100644 +index f067419ffc..5aa19dc84f 100644 --- a/hotspot/src/share/vm/classfile/bytecodeAssembler.cpp +++ b/hotspot/src/share/vm/classfile/bytecodeAssembler.cpp @@ -22,6 +22,12 @@ @@ -113034,7 +113034,7 @@ index f067419f..5aa19dc8 100644 # include "bytes_sparc.hpp" #endif diff --git a/hotspot/src/share/vm/classfile/classFileStream.hpp b/hotspot/src/share/vm/classfile/classFileStream.hpp -index 9632c8c8..fad25c44 100644 +index 9632c8c8c2..fad25c44fc 100644 --- a/hotspot/src/share/vm/classfile/classFileStream.hpp +++ b/hotspot/src/share/vm/classfile/classFileStream.hpp @@ -22,6 +22,12 @@ @@ -113064,7 +113064,7 @@ index 9632c8c8..fad25c44 100644 # include "bytes_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/classfile/stackMapTable.hpp b/hotspot/src/share/vm/classfile/stackMapTable.hpp -index a36a7ba3..d7c1f086 100644 +index a36a7ba3cf..d7c1f08644 100644 --- a/hotspot/src/share/vm/classfile/stackMapTable.hpp +++ b/hotspot/src/share/vm/classfile/stackMapTable.hpp @@ -22,6 +22,12 @@ @@ -113094,7 +113094,7 @@ index a36a7ba3..d7c1f086 100644 # include "bytes_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/classfile/verifier.cpp b/hotspot/src/share/vm/classfile/verifier.cpp -index c653e2b5..1a6b7e8b 100644 +index c653e2b5a9..1a6b7e8b1a 100644 --- a/hotspot/src/share/vm/classfile/verifier.cpp +++ b/hotspot/src/share/vm/classfile/verifier.cpp @@ -22,6 +22,12 @@ @@ -113124,7 +113124,7 @@ index c653e2b5..1a6b7e8b 100644 # include "bytes_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/code/codeBlob.cpp b/hotspot/src/share/vm/code/codeBlob.cpp -index aff2aaf0..9ba76007 100644 +index aff2aaf0ca..9ba76007cd 100644 --- a/hotspot/src/share/vm/code/codeBlob.cpp +++ b/hotspot/src/share/vm/code/codeBlob.cpp @@ -22,6 +22,12 @@ @@ -113154,7 +113154,7 @@ index aff2aaf0..9ba76007 100644 #include "c1/c1_Runtime1.hpp" #endif diff --git a/hotspot/src/share/vm/code/compiledIC.hpp b/hotspot/src/share/vm/code/compiledIC.hpp -index f910f118..e282a3f3 100644 +index f910f11886..e282a3f3af 100644 --- a/hotspot/src/share/vm/code/compiledIC.hpp +++ b/hotspot/src/share/vm/code/compiledIC.hpp @@ -22,6 +22,12 @@ @@ -113184,7 +113184,7 @@ index f910f118..e282a3f3 100644 //----------------------------------------------------------------------------- // The CompiledIC represents a compiled inline cache. diff --git a/hotspot/src/share/vm/code/relocInfo.hpp b/hotspot/src/share/vm/code/relocInfo.hpp -index ad55a2fd..81350482 100644 +index ad55a2fd93..813504821d 100644 --- a/hotspot/src/share/vm/code/relocInfo.hpp +++ b/hotspot/src/share/vm/code/relocInfo.hpp @@ -22,6 +22,12 @@ @@ -113278,7 +113278,7 @@ index ad55a2fd..81350482 100644 class virtual_call_Relocation : public CallRelocation { relocInfo::relocType type() { return relocInfo::virtual_call_type; } diff --git a/hotspot/src/share/vm/code/vmreg.hpp b/hotspot/src/share/vm/code/vmreg.hpp -index 07b595b6..5bc7131a 100644 +index 07b595b60a..5bc7131a8a 100644 --- a/hotspot/src/share/vm/code/vmreg.hpp +++ b/hotspot/src/share/vm/code/vmreg.hpp @@ -22,6 +22,12 @@ @@ -113321,7 +113321,7 @@ index 07b595b6..5bc7131a 100644 # include "vmreg_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/compiler/disassembler.cpp b/hotspot/src/share/vm/compiler/disassembler.cpp -index dfdd5f77..2dd0ff69 100644 +index dfdd5f77e7..2dd0ff69ac 100644 --- a/hotspot/src/share/vm/compiler/disassembler.cpp +++ b/hotspot/src/share/vm/compiler/disassembler.cpp @@ -22,6 +22,12 @@ @@ -113351,7 +113351,7 @@ index dfdd5f77..2dd0ff69 100644 #include "shark/sharkEntry.hpp" #endif diff --git a/hotspot/src/share/vm/compiler/disassembler.hpp b/hotspot/src/share/vm/compiler/disassembler.hpp -index 168851cc..8b632748 100644 +index 168851cc26..8b632748f2 100644 --- a/hotspot/src/share/vm/compiler/disassembler.hpp +++ b/hotspot/src/share/vm/compiler/disassembler.hpp @@ -22,6 +22,12 @@ @@ -113381,7 +113381,7 @@ index 168851cc..8b632748 100644 diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp -index 733b5c91..678a1ee8 100644 +index 733b5c91ad..678a1ee836 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp @@ -86,6 +86,9 @@ class CardTableExtension : public CardTableModRefBS { @@ -113395,7 +113395,7 @@ index 733b5c91..678a1ee8 100644 // Adaptive size policy support diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp -index 1dde1074..8b800b31 100644 +index 1dde10746d..8b800b31c5 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp @@ -105,6 +105,9 @@ ParMarkBitMap::mark_obj(HeapWord* addr, size_t size) @@ -113409,7 +113409,7 @@ index 1dde1074..8b800b31 100644 } return false; diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp -index 6cf76353..4d34bc20 100644 +index 6cf76353d9..4d34bc209b 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp @@ -33,6 +33,9 @@ void ParCompactionManager::push_objarray(oop obj, size_t index) @@ -113433,7 +113433,7 @@ index 6cf76353..4d34bc20 100644 #endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_INLINE_HPP diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp -index 0fa980ef..2f66493e 100644 +index 0fa980ef83..2f66493e0a 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp @@ -499,6 +499,9 @@ void ParallelCompactData::add_obj(HeapWord* addr, size_t len) @@ -113467,7 +113467,7 @@ index 0fa980ef..2f66493e 100644 const size_t end_bit = bitmap->find_obj_end(beg_bit, range_end); diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp -index 881f380c..461b8393 100644 +index 881f380cea..461b83930f 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp @@ -1329,6 +1329,9 @@ inline bool PSParallelCompact::mark_obj(oop obj) { @@ -113491,7 +113491,7 @@ index 881f380c..461b8393 100644 } } diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp -index a3313200..29101966 100644 +index a33132009c..291019660a 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp @@ -41,8 +41,9 @@ template @@ -113559,7 +113559,7 @@ index a3313200..29101966 100644 assert(o->is_forwarded(), "Sanity"); new_obj = o->forwardee(); diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp -index 1a722a7c..4980be39 100644 +index 1a722a7ca7..4980be3946 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp @@ -71,14 +71,22 @@ inline void PSScavenge::copy_and_push_safe_barrier(PSPromotionManager* pm, @@ -113602,7 +113602,7 @@ index 1a722a7c..4980be39 100644 new_obj = _pm->copy_to_survivor_space(o); } diff --git a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp b/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp -index e14c50bf..8b386007 100644 +index e14c50bf01..8b3860070c 100644 --- a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp +++ b/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp @@ -22,6 +22,12 @@ @@ -113630,7 +113630,7 @@ index e14c50bf..8b386007 100644 // This file contains the platform-independent parts diff --git a/hotspot/src/share/vm/interpreter/bytecode.hpp b/hotspot/src/share/vm/interpreter/bytecode.hpp -index 7e55fd00..a06dcd58 100644 +index 7e55fd009a..a06dcd58bc 100644 --- a/hotspot/src/share/vm/interpreter/bytecode.hpp +++ b/hotspot/src/share/vm/interpreter/bytecode.hpp @@ -22,6 +22,12 @@ @@ -113660,7 +113660,7 @@ index 7e55fd00..a06dcd58 100644 # include "bytes_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp -index 28843715..c17fe8d7 100644 +index 28843715c7..c17fe8d7e0 100644 --- a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp +++ b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp @@ -22,6 +22,12 @@ @@ -113700,7 +113700,7 @@ index 28843715..c17fe8d7 100644 # include "bytecodeInterpreter_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp -index f5db0b4d..8adbf95a 100644 +index f5db0b4d9d..8adbf95acb 100644 --- a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp +++ b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp @@ -22,6 +22,12 @@ @@ -113730,7 +113730,7 @@ index f5db0b4d..8adbf95a 100644 # include "bytecodeInterpreter_aarch64.inline.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/bytecodeStream.hpp b/hotspot/src/share/vm/interpreter/bytecodeStream.hpp -index b814b88d..e1f24216 100644 +index b814b88d5d..e1f2421600 100644 --- a/hotspot/src/share/vm/interpreter/bytecodeStream.hpp +++ b/hotspot/src/share/vm/interpreter/bytecodeStream.hpp @@ -22,6 +22,12 @@ @@ -113760,7 +113760,7 @@ index b814b88d..e1f24216 100644 # include "bytes_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/bytecodes.cpp b/hotspot/src/share/vm/interpreter/bytecodes.cpp -index fdb880a3..4f511107 100644 +index fdb880a3b3..4f5111074f 100644 --- a/hotspot/src/share/vm/interpreter/bytecodes.cpp +++ b/hotspot/src/share/vm/interpreter/bytecodes.cpp @@ -22,6 +22,12 @@ @@ -113790,7 +113790,7 @@ index fdb880a3..4f511107 100644 # include "bytes_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/bytecodes.hpp b/hotspot/src/share/vm/interpreter/bytecodes.hpp -index c3463cd7..bdf4c487 100644 +index c3463cd76d..bdf4c487f0 100644 --- a/hotspot/src/share/vm/interpreter/bytecodes.hpp +++ b/hotspot/src/share/vm/interpreter/bytecodes.hpp @@ -22,6 +22,12 @@ @@ -113820,7 +113820,7 @@ index c3463cd7..bdf4c487 100644 # include "bytecodes_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/cppInterpreter.hpp b/hotspot/src/share/vm/interpreter/cppInterpreter.hpp -index 6a644750..f9c540fb 100644 +index 6a6447503c..f9c540fb4a 100644 --- a/hotspot/src/share/vm/interpreter/cppInterpreter.hpp +++ b/hotspot/src/share/vm/interpreter/cppInterpreter.hpp @@ -22,6 +22,12 @@ @@ -113850,7 +113850,7 @@ index 6a644750..f9c540fb 100644 # include "cppInterpreter_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp b/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp -index 6a08a3f4..1fd19994 100644 +index 6a08a3f43f..1fd19994d7 100644 --- a/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp +++ b/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp @@ -22,6 +22,12 @@ @@ -113880,7 +113880,7 @@ index 6a08a3f4..1fd19994 100644 # include "cppInterpreterGenerator_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/interpreter.hpp b/hotspot/src/share/vm/interpreter/interpreter.hpp -index ebfb68d3..610949f3 100644 +index ebfb68d36b..610949f3f7 100644 --- a/hotspot/src/share/vm/interpreter/interpreter.hpp +++ b/hotspot/src/share/vm/interpreter/interpreter.hpp @@ -22,6 +22,12 @@ @@ -113910,7 +113910,7 @@ index ebfb68d3..610949f3 100644 # include "interpreter_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp b/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp -index 1dc7cb29..92bbe6b4 100644 +index 1dc7cb2983..92bbe6b440 100644 --- a/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp +++ b/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp @@ -22,6 +22,12 @@ @@ -113940,7 +113940,7 @@ index 1dc7cb29..92bbe6b4 100644 # include "interpreterGenerator_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp -index 5d284538..f48622f6 100644 +index 5d2845383c..f48622f67e 100644 --- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp +++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp @@ -22,6 +22,12 @@ @@ -113979,7 +113979,7 @@ index 5d284538..f48622f6 100644 if (src_address == dest_address) { return; diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp -index 472bf4d9..9a98d555 100644 +index 472bf4d94c..9a98d5559c 100644 --- a/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp +++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp @@ -22,6 +22,12 @@ @@ -114018,7 +114018,7 @@ index 472bf4d9..9a98d555 100644 # include "interpreterRT_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/templateInterpreter.hpp b/hotspot/src/share/vm/interpreter/templateInterpreter.hpp -index 5f76dca8..757860f4 100644 +index 5f76dca8a6..757860f43c 100644 --- a/hotspot/src/share/vm/interpreter/templateInterpreter.hpp +++ b/hotspot/src/share/vm/interpreter/templateInterpreter.hpp @@ -22,6 +22,12 @@ @@ -114048,7 +114048,7 @@ index 5f76dca8..757860f4 100644 # include "templateInterpreter_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp b/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp -index bd94bd02..28ca437e 100644 +index bd94bd02bc..28ca437eb2 100644 --- a/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp +++ b/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp @@ -22,6 +22,12 @@ @@ -114078,7 +114078,7 @@ index bd94bd02..28ca437e 100644 # include "templateInterpreterGenerator_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/interpreter/templateTable.hpp b/hotspot/src/share/vm/interpreter/templateTable.hpp -index 60d243c1..1b73822a 100644 +index 60d243c16a..1b73822abd 100644 --- a/hotspot/src/share/vm/interpreter/templateTable.hpp +++ b/hotspot/src/share/vm/interpreter/templateTable.hpp @@ -22,6 +22,12 @@ @@ -114117,7 +114117,7 @@ index 60d243c1..1b73822a 100644 }; diff --git a/hotspot/src/share/vm/jfr/utilities/jfrBigEndian.hpp b/hotspot/src/share/vm/jfr/utilities/jfrBigEndian.hpp -index 6d9ab39f..f4e9a4ca 100644 +index 6d9ab39fdd..f4e9a4ca69 100644 --- a/hotspot/src/share/vm/jfr/utilities/jfrBigEndian.hpp +++ b/hotspot/src/share/vm/jfr/utilities/jfrBigEndian.hpp @@ -116,7 +116,7 @@ inline T JfrBigEndian::read_unaligned(const address location) { @@ -114130,7 +114130,7 @@ index 6d9ab39f..f4e9a4ca 100644 #else #warning "Unconfigured platform" diff --git a/hotspot/src/share/vm/jfr/writers/jfrEncoders.hpp b/hotspot/src/share/vm/jfr/writers/jfrEncoders.hpp -index 42a8b719..f08f6ee1 100644 +index 42a8b719cd..f08f6ee13a 100644 --- a/hotspot/src/share/vm/jfr/writers/jfrEncoders.hpp +++ b/hotspot/src/share/vm/jfr/writers/jfrEncoders.hpp @@ -22,6 +22,12 @@ @@ -114160,7 +114160,7 @@ index 42a8b719..f08f6ee1 100644 // // The Encoding policy prescribes a template diff --git a/hotspot/src/share/vm/memory/barrierSet.hpp b/hotspot/src/share/vm/memory/barrierSet.hpp -index 13ff9b27..081b7074 100644 +index 13ff9b2738..081b70744d 100644 --- a/hotspot/src/share/vm/memory/barrierSet.hpp +++ b/hotspot/src/share/vm/memory/barrierSet.hpp @@ -27,6 +27,7 @@ @@ -114211,7 +114211,7 @@ index 13ff9b27..081b7074 100644 // at the address "start", which may not necessarily be HeapWord-aligned inline void write_ref_array(HeapWord* start, size_t count); diff --git a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp b/hotspot/src/share/vm/memory/cardTableModRefBS.hpp -index 01e46888..80bd1518 100644 +index 01e4688836..80bd151873 100644 --- a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp +++ b/hotspot/src/share/vm/memory/cardTableModRefBS.hpp @@ -316,6 +316,9 @@ public: @@ -114248,7 +114248,7 @@ index 01e46888..80bd1518 100644 // These are used by G1, when it uses the card table as a temporary data diff --git a/hotspot/src/share/vm/memory/cardTableRS.cpp b/hotspot/src/share/vm/memory/cardTableRS.cpp -index fb33a708..da22acba 100644 +index fb33a708ae..da22acba47 100644 --- a/hotspot/src/share/vm/memory/cardTableRS.cpp +++ b/hotspot/src/share/vm/memory/cardTableRS.cpp @@ -252,6 +252,9 @@ void ClearNoncleanCardWrapper::do_MemRegion(MemRegion mr) { @@ -114276,7 +114276,7 @@ index fb33a708..da22acba 100644 continue; } else { diff --git a/hotspot/src/share/vm/memory/cardTableRS.hpp b/hotspot/src/share/vm/memory/cardTableRS.hpp -index 25884fea..5d4e77f2 100644 +index 25884feac8..5d4e77f269 100644 --- a/hotspot/src/share/vm/memory/cardTableRS.hpp +++ b/hotspot/src/share/vm/memory/cardTableRS.hpp @@ -121,7 +121,14 @@ public: @@ -114296,7 +114296,7 @@ index 25884fea..5d4e77f2 100644 void write_ref_field_gc_work(void* field, oop new_val) { inline_write_ref_field_gc(field, new_val); diff --git a/hotspot/src/share/vm/memory/metaspace.cpp b/hotspot/src/share/vm/memory/metaspace.cpp -index 2912f41b..f326dad7 100644 +index 2912f41b6a..f326dad76a 100644 --- a/hotspot/src/share/vm/memory/metaspace.cpp +++ b/hotspot/src/share/vm/memory/metaspace.cpp @@ -21,6 +21,13 @@ @@ -114338,7 +114338,7 @@ index 2912f41b..f326dad7 100644 if (!metaspace_rs.is_reserved()) { #if INCLUDE_CDS diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/hotspot/src/share/vm/oops/constantPool.hpp -index ec111df0..6c060710 100644 +index ec111df04e..6c0607105c 100644 --- a/hotspot/src/share/vm/oops/constantPool.hpp +++ b/hotspot/src/share/vm/oops/constantPool.hpp @@ -22,6 +22,12 @@ @@ -114369,7 +114369,7 @@ index ec111df0..6c060710 100644 // A constantPool is an array containing class constants as described in the // class file. diff --git a/hotspot/src/share/vm/oops/klass.hpp b/hotspot/src/share/vm/oops/klass.hpp -index acef3348..23fc0b99 100644 +index acef334849..23fc0b9988 100644 --- a/hotspot/src/share/vm/oops/klass.hpp +++ b/hotspot/src/share/vm/oops/klass.hpp @@ -32,6 +32,9 @@ @@ -114404,7 +114404,7 @@ index acef3348..23fc0b99 100644 void accumulate_modified_oops() { if (has_modified_oops()) _accumulated_modified_oops = 1; } diff --git a/hotspot/src/share/vm/oops/oop.hpp b/hotspot/src/share/vm/oops/oop.hpp -index 0678c6b3..1cb20e35 100644 +index 0678c6b3fb..1cb20e351f 100644 --- a/hotspot/src/share/vm/oops/oop.hpp +++ b/hotspot/src/share/vm/oops/oop.hpp @@ -72,7 +72,13 @@ class oopDesc { @@ -114423,7 +114423,7 @@ index 0678c6b3..1cb20e35 100644 void release_set_mark(markOop m); markOop cas_set_mark(markOop new_mark, markOop old_mark); diff --git a/hotspot/src/share/vm/oops/oop.inline.hpp b/hotspot/src/share/vm/oops/oop.inline.hpp -index beec739d..8660c1e3 100644 +index beec739d38..8660c1e331 100644 --- a/hotspot/src/share/vm/oops/oop.inline.hpp +++ b/hotspot/src/share/vm/oops/oop.inline.hpp @@ -22,6 +22,12 @@ @@ -114453,7 +114453,7 @@ index beec739d..8660c1e3 100644 // Implementation of all inlined member functions defined in oop.hpp // We need a separate file to avoid circular references diff --git a/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp b/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp -index 8a460394..b28bb991 100644 +index 8a4603944e..b28bb99189 100644 --- a/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp +++ b/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp @@ -22,6 +22,12 @@ @@ -114479,7 +114479,7 @@ index 8a460394..b28bb991 100644 #endif // SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP diff --git a/hotspot/src/share/vm/opto/buildOopMap.cpp b/hotspot/src/share/vm/opto/buildOopMap.cpp -index 91642f1d..5df185df 100644 +index 91642f1d7d..5df185df04 100644 --- a/hotspot/src/share/vm/opto/buildOopMap.cpp +++ b/hotspot/src/share/vm/opto/buildOopMap.cpp @@ -22,6 +22,12 @@ @@ -114509,7 +114509,7 @@ index 91642f1d..5df185df 100644 // The functions in this file builds OopMaps after all scheduling is done. // diff --git a/hotspot/src/share/vm/opto/bytecodeInfo.cpp b/hotspot/src/share/vm/opto/bytecodeInfo.cpp -index 7fd615d3..ad472e87 100644 +index 7fd615d35f..ad472e8722 100644 --- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp +++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp @@ -361,9 +361,20 @@ bool InlineTree::try_to_inline(ciMethod* callee_method, ciMethod* caller_method, @@ -114534,7 +114534,7 @@ index 7fd615d3..ad472e87 100644 } diff --git a/hotspot/src/share/vm/opto/c2_globals.hpp b/hotspot/src/share/vm/opto/c2_globals.hpp -index 82d2efef..d373b204 100644 +index 82d2efef92..d373b20456 100644 --- a/hotspot/src/share/vm/opto/c2_globals.hpp +++ b/hotspot/src/share/vm/opto/c2_globals.hpp @@ -22,6 +22,12 @@ @@ -114564,7 +114564,7 @@ index 82d2efef..d373b204 100644 # include "c2_globals_arm.hpp" #endif diff --git a/hotspot/src/share/vm/opto/c2compiler.cpp b/hotspot/src/share/vm/opto/c2compiler.cpp -index 137f4960..f689d64a 100644 +index 137f49600d..f689d64a38 100644 --- a/hotspot/src/share/vm/opto/c2compiler.cpp +++ b/hotspot/src/share/vm/opto/c2compiler.cpp @@ -22,6 +22,12 @@ @@ -114592,7 +114592,7 @@ index 137f4960..f689d64a 100644 // register information defined by ADLC diff --git a/hotspot/src/share/vm/opto/chaitin.hpp b/hotspot/src/share/vm/opto/chaitin.hpp -index de6d443c..0b27dc93 100644 +index de6d443cd3..0b27dc9335 100644 --- a/hotspot/src/share/vm/opto/chaitin.hpp +++ b/hotspot/src/share/vm/opto/chaitin.hpp @@ -22,6 +22,12 @@ @@ -114634,7 +114634,7 @@ index de6d443c..0b27dc93 100644 void set_reg_pressure(int i) { _reg_pressure = i; } int reg_pressure() const { return _reg_pressure; } diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp -index ae22ba84..9004dc0d 100644 +index ae22ba84d9..9004dc0d72 100644 --- a/hotspot/src/share/vm/opto/compile.cpp +++ b/hotspot/src/share/vm/opto/compile.cpp @@ -22,6 +22,12 @@ @@ -114662,7 +114662,7 @@ index ae22ba84..9004dc0d 100644 // -------------------- Compile::mach_constant_base_node ----------------------- diff --git a/hotspot/src/share/vm/opto/compile.hpp b/hotspot/src/share/vm/opto/compile.hpp -index b4f4cfef..d263ee2f 100644 +index b4f4cfefed..d263ee2fc4 100644 --- a/hotspot/src/share/vm/opto/compile.hpp +++ b/hotspot/src/share/vm/opto/compile.hpp @@ -1025,7 +1025,7 @@ class Compile : public Phase { @@ -114675,7 +114675,7 @@ index b4f4cfef..d263ee2f 100644 MAX_const_size = 128, MAX_stubs_size = 128 diff --git a/hotspot/src/share/vm/opto/gcm.cpp b/hotspot/src/share/vm/opto/gcm.cpp -index f51484ef..12457b7c 100644 +index f51484efb0..12457b7c34 100644 --- a/hotspot/src/share/vm/opto/gcm.cpp +++ b/hotspot/src/share/vm/opto/gcm.cpp @@ -22,6 +22,12 @@ @@ -114703,7 +114703,7 @@ index f51484ef..12457b7c 100644 diff --git a/hotspot/src/share/vm/opto/lcm.cpp b/hotspot/src/share/vm/opto/lcm.cpp -index c6178a71..2d492568 100644 +index c6178a715b..2d492568d9 100644 --- a/hotspot/src/share/vm/opto/lcm.cpp +++ b/hotspot/src/share/vm/opto/lcm.cpp @@ -22,6 +22,12 @@ @@ -114731,7 +114731,7 @@ index c6178a71..2d492568 100644 // Optimization - Graph Style diff --git a/hotspot/src/share/vm/opto/locknode.hpp b/hotspot/src/share/vm/opto/locknode.hpp -index b320f6bf..4bfb0ff0 100644 +index b320f6bfb2..4bfb0ff072 100644 --- a/hotspot/src/share/vm/opto/locknode.hpp +++ b/hotspot/src/share/vm/opto/locknode.hpp @@ -22,6 +22,12 @@ @@ -114759,7 +114759,7 @@ index b320f6bf..4bfb0ff0 100644 //------------------------------BoxLockNode------------------------------------ diff --git a/hotspot/src/share/vm/opto/matcher.cpp b/hotspot/src/share/vm/opto/matcher.cpp -index 75f1fbee..994de073 100644 +index 75f1fbee58..994de0736a 100644 --- a/hotspot/src/share/vm/opto/matcher.cpp +++ b/hotspot/src/share/vm/opto/matcher.cpp @@ -22,6 +22,12 @@ @@ -114787,7 +114787,7 @@ index 75f1fbee..994de073 100644 OptoReg::Name OptoReg::c_frame_pointer; diff --git a/hotspot/src/share/vm/opto/output.cpp b/hotspot/src/share/vm/opto/output.cpp -index 5c9566e1..6579d81d 100644 +index 5c9566e1ea..6579d81d35 100644 --- a/hotspot/src/share/vm/opto/output.cpp +++ b/hotspot/src/share/vm/opto/output.cpp @@ -22,6 +22,12 @@ @@ -114855,7 +114855,7 @@ index 5c9566e1..6579d81d 100644 // Above we only verified that there is enough space in the instruction section. // However, the instruction may emit stubs that cause code buffer expansion. diff --git a/hotspot/src/share/vm/opto/output.hpp b/hotspot/src/share/vm/opto/output.hpp -index ba728413..37f954de 100644 +index ba72841363..37f954de9b 100644 --- a/hotspot/src/share/vm/opto/output.hpp +++ b/hotspot/src/share/vm/opto/output.hpp @@ -22,6 +22,12 @@ @@ -114883,7 +114883,7 @@ index ba728413..37f954de 100644 class Arena; diff --git a/hotspot/src/share/vm/opto/regmask.cpp b/hotspot/src/share/vm/opto/regmask.cpp -index 352ccfb9..9a656d03 100644 +index 352ccfb9d9..9a656d03ee 100644 --- a/hotspot/src/share/vm/opto/regmask.cpp +++ b/hotspot/src/share/vm/opto/regmask.cpp @@ -22,6 +22,12 @@ @@ -114911,7 +114911,7 @@ index 352ccfb9..9a656d03 100644 #define RM_SIZE _RM_SIZE /* a constant private to the class RegMask */ diff --git a/hotspot/src/share/vm/opto/regmask.hpp b/hotspot/src/share/vm/opto/regmask.hpp -index 5ceebb3f..6d08b687 100644 +index 5ceebb3fb8..6d08b68731 100644 --- a/hotspot/src/share/vm/opto/regmask.hpp +++ b/hotspot/src/share/vm/opto/regmask.hpp @@ -22,6 +22,12 @@ @@ -114939,7 +114939,7 @@ index 5ceebb3f..6d08b687 100644 // Some fun naming (textual) substitutions: diff --git a/hotspot/src/share/vm/opto/runtime.cpp b/hotspot/src/share/vm/opto/runtime.cpp -index a43b37f2..f2bcafa2 100644 +index a43b37f2c5..f2bcafa2c5 100644 --- a/hotspot/src/share/vm/opto/runtime.cpp +++ b/hotspot/src/share/vm/opto/runtime.cpp @@ -22,6 +22,12 @@ @@ -114967,7 +114967,7 @@ index a43b37f2..f2bcafa2 100644 diff --git a/hotspot/src/share/vm/opto/type.cpp b/hotspot/src/share/vm/opto/type.cpp -index 58572f13..299d48b1 100644 +index 58572f137d..299d48b12a 100644 --- a/hotspot/src/share/vm/opto/type.cpp +++ b/hotspot/src/share/vm/opto/type.cpp @@ -22,6 +22,12 @@ @@ -115001,7 +115001,7 @@ index 58572f13..299d48b1 100644 { Bad, T_ILLEGAL, "vectors:", false, 0, relocInfo::none }, // VectorS { Bad, T_ILLEGAL, "vectord:", false, Op_RegL, relocInfo::none }, // VectorD diff --git a/hotspot/src/share/vm/prims/jniCheck.cpp b/hotspot/src/share/vm/prims/jniCheck.cpp -index 593ca8a1..82813b71 100644 +index 593ca8a1e3..82813b71fe 100644 --- a/hotspot/src/share/vm/prims/jniCheck.cpp +++ b/hotspot/src/share/vm/prims/jniCheck.cpp @@ -22,6 +22,12 @@ @@ -115031,7 +115031,7 @@ index 593ca8a1..82813b71 100644 // Complain every extra number of unplanned local refs #define CHECK_JNI_LOCAL_REF_CAP_WARN_THRESHOLD 32 diff --git a/hotspot/src/share/vm/prims/jni_md.h b/hotspot/src/share/vm/prims/jni_md.h -index 6209a664..271715d4 100644 +index 6209a66449..271715d4a2 100644 --- a/hotspot/src/share/vm/prims/jni_md.h +++ b/hotspot/src/share/vm/prims/jni_md.h @@ -22,6 +22,12 @@ @@ -115061,7 +115061,7 @@ index 6209a664..271715d4 100644 /* diff --git a/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp b/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp -index ab31d0d9..0d8570b7 100644 +index ab31d0d91e..0d8570b764 100644 --- a/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp +++ b/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp @@ -22,6 +22,12 @@ @@ -115091,7 +115091,7 @@ index ab31d0d9..0d8570b7 100644 // FIXME: fix Synthetic attribute // FIXME: per Serguei, add error return handling for ConstantPool::copy_cpool_bytes() diff --git a/hotspot/src/share/vm/prims/methodHandles.hpp b/hotspot/src/share/vm/prims/methodHandles.hpp -index db6e0618..84108285 100644 +index db6e06180d..841082859a 100644 --- a/hotspot/src/share/vm/prims/methodHandles.hpp +++ b/hotspot/src/share/vm/prims/methodHandles.hpp @@ -22,6 +22,12 @@ @@ -115122,7 +115122,7 @@ index db6e0618..84108285 100644 // Tracing static void trace_method_handle(MacroAssembler* _masm, const char* adaptername) PRODUCT_RETURN; diff --git a/hotspot/src/share/vm/runtime/atomic.inline.hpp b/hotspot/src/share/vm/runtime/atomic.inline.hpp -index 222f29cb..7c7c6edb 100644 +index 222f29cbf4..7c7c6edb27 100644 --- a/hotspot/src/share/vm/runtime/atomic.inline.hpp +++ b/hotspot/src/share/vm/runtime/atomic.inline.hpp @@ -22,6 +22,12 @@ @@ -115152,7 +115152,7 @@ index 222f29cb..7c7c6edb 100644 # include "atomic_linux_sparc.inline.hpp" #endif diff --git a/hotspot/src/share/vm/runtime/deoptimization.cpp b/hotspot/src/share/vm/runtime/deoptimization.cpp -index f91afdc4..36a924fd 100644 +index f91afdc416..36a924fd4f 100644 --- a/hotspot/src/share/vm/runtime/deoptimization.cpp +++ b/hotspot/src/share/vm/runtime/deoptimization.cpp @@ -22,6 +22,12 @@ @@ -115195,7 +115195,7 @@ index f91afdc4..36a924fd 100644 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC diff --git a/hotspot/src/share/vm/runtime/dtraceJSDT.hpp b/hotspot/src/share/vm/runtime/dtraceJSDT.hpp -index db568def..490c5f5a 100644 +index db568def34..490c5f5a4e 100644 --- a/hotspot/src/share/vm/runtime/dtraceJSDT.hpp +++ b/hotspot/src/share/vm/runtime/dtraceJSDT.hpp @@ -22,6 +22,12 @@ @@ -115225,7 +115225,7 @@ index db568def..490c5f5a 100644 class RegisteredProbes; typedef jlong OpaqueProbes; diff --git a/hotspot/src/share/vm/runtime/frame.cpp b/hotspot/src/share/vm/runtime/frame.cpp -index 338b7ad3..5a161133 100644 +index 338b7ad3a7..5a161133ba 100644 --- a/hotspot/src/share/vm/runtime/frame.cpp +++ b/hotspot/src/share/vm/runtime/frame.cpp @@ -22,6 +22,12 @@ @@ -115256,7 +115256,7 @@ index 338b7ad3..5a161133 100644 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC diff --git a/hotspot/src/share/vm/runtime/frame.hpp b/hotspot/src/share/vm/runtime/frame.hpp -index 2d80ecc2..4a9e6edb 100644 +index 2d80ecc208..4a9e6edb54 100644 --- a/hotspot/src/share/vm/runtime/frame.hpp +++ b/hotspot/src/share/vm/runtime/frame.hpp @@ -22,6 +22,12 @@ @@ -115297,7 +115297,7 @@ index 2d80ecc2..4a9e6edb 100644 # include "frame_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/runtime/frame.inline.hpp b/hotspot/src/share/vm/runtime/frame.inline.hpp -index 710b8230..704cc8df 100644 +index 710b82306a..704cc8df8f 100644 --- a/hotspot/src/share/vm/runtime/frame.inline.hpp +++ b/hotspot/src/share/vm/runtime/frame.inline.hpp @@ -22,6 +22,12 @@ @@ -115340,7 +115340,7 @@ index 710b8230..704cc8df 100644 #endif // SHARE_VM_RUNTIME_FRAME_INLINE_HPP diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp -index 23ce8af5..f36137aa 100644 +index 23ce8af569..f36137aabf 100644 --- a/hotspot/src/share/vm/runtime/globals.hpp +++ b/hotspot/src/share/vm/runtime/globals.hpp @@ -55,6 +55,12 @@ @@ -115405,7 +115405,7 @@ index 23ce8af5..f36137aa 100644 \ product(uintx, OldSize, ScaleForWordSize(4*M), \ diff --git a/hotspot/src/share/vm/runtime/icache.hpp b/hotspot/src/share/vm/runtime/icache.hpp -index ba81a06f..9c0cfdb7 100644 +index ba81a06ff5..9c0cfdb7d7 100644 --- a/hotspot/src/share/vm/runtime/icache.hpp +++ b/hotspot/src/share/vm/runtime/icache.hpp @@ -22,6 +22,12 @@ @@ -115436,7 +115436,7 @@ index ba81a06f..9c0cfdb7 100644 class ICacheStubGenerator : public StubCodeGenerator { diff --git a/hotspot/src/share/vm/runtime/java.cpp b/hotspot/src/share/vm/runtime/java.cpp -index 0a263b01..9ba0deca 100644 +index 0a263b017c..9ba0decaae 100644 --- a/hotspot/src/share/vm/runtime/java.cpp +++ b/hotspot/src/share/vm/runtime/java.cpp @@ -22,6 +22,12 @@ @@ -115466,7 +115466,7 @@ index 0a263b01..9ba0deca 100644 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" #include "gc_implementation/parallelScavenge/psScavenge.hpp" diff --git a/hotspot/src/share/vm/runtime/javaCalls.hpp b/hotspot/src/share/vm/runtime/javaCalls.hpp -index 6126bbe7..1747e2b2 100644 +index 6126bbe75e..1747e2b2ee 100644 --- a/hotspot/src/share/vm/runtime/javaCalls.hpp +++ b/hotspot/src/share/vm/runtime/javaCalls.hpp @@ -22,6 +22,12 @@ @@ -115496,7 +115496,7 @@ index 6126bbe7..1747e2b2 100644 // A JavaCallWrapper is constructed before each JavaCall and destructed after the call. // Its purpose is to allocate/deallocate a new handle block and to save/restore the last diff --git a/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp b/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp -index 129a01e2..c2b1b2e6 100644 +index 129a01e293..c2b1b2e6c3 100644 --- a/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp +++ b/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp @@ -22,6 +22,12 @@ @@ -115526,7 +115526,7 @@ index 129a01e2..c2b1b2e6 100644 # include "javaFrameAnchor_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/runtime/os.cpp b/hotspot/src/share/vm/runtime/os.cpp -index 96eed036..28c78409 100644 +index 96eed03670..28c78409e7 100644 --- a/hotspot/src/share/vm/runtime/os.cpp +++ b/hotspot/src/share/vm/runtime/os.cpp @@ -1122,7 +1122,8 @@ bool os::is_first_C_frame(frame* fr) { @@ -115540,7 +115540,7 @@ index 96eed036..28c78409 100644 // stack grows downwards; if old_fp is below current fp or if the stack // frame is too large, either the stack is corrupted or fp is not saved diff --git a/hotspot/src/share/vm/runtime/os.hpp b/hotspot/src/share/vm/runtime/os.hpp -index 836c231b..0ca6e645 100644 +index 836c231b03..0ca6e64598 100644 --- a/hotspot/src/share/vm/runtime/os.hpp +++ b/hotspot/src/share/vm/runtime/os.hpp @@ -22,6 +22,12 @@ @@ -115570,7 +115570,7 @@ index 836c231b..0ca6e645 100644 # include "os_linux_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/runtime/prefetch.inline.hpp b/hotspot/src/share/vm/runtime/prefetch.inline.hpp -index f4e30de3..fec16f84 100644 +index f4e30de34d..fec16f842c 100644 --- a/hotspot/src/share/vm/runtime/prefetch.inline.hpp +++ b/hotspot/src/share/vm/runtime/prefetch.inline.hpp @@ -46,6 +46,12 @@ @@ -115587,7 +115587,7 @@ index f4e30de3..fec16f84 100644 // Solaris #ifdef TARGET_OS_ARCH_solaris_x86 diff --git a/hotspot/src/share/vm/runtime/registerMap.hpp b/hotspot/src/share/vm/runtime/registerMap.hpp -index 67ef212d..1e26dfcb 100644 +index 67ef212d65..1e26dfcba4 100644 --- a/hotspot/src/share/vm/runtime/registerMap.hpp +++ b/hotspot/src/share/vm/runtime/registerMap.hpp @@ -22,6 +22,12 @@ @@ -115630,7 +115630,7 @@ index 67ef212d..1e26dfcb 100644 }; diff --git a/hotspot/src/share/vm/runtime/relocator.hpp b/hotspot/src/share/vm/runtime/relocator.hpp -index bb19c75f..53f3c9f6 100644 +index bb19c75fe6..53f3c9f6bd 100644 --- a/hotspot/src/share/vm/runtime/relocator.hpp +++ b/hotspot/src/share/vm/runtime/relocator.hpp @@ -22,6 +22,12 @@ @@ -115660,7 +115660,7 @@ index bb19c75f..53f3c9f6 100644 // This code has been converted from the 1.1E java virtual machine // Thanks to the JavaTopics group for using the code diff --git a/hotspot/src/share/vm/runtime/safepoint.cpp b/hotspot/src/share/vm/runtime/safepoint.cpp -index 440617c8..be0e4dd1 100644 +index 440617c802..be0e4dd13c 100644 --- a/hotspot/src/share/vm/runtime/safepoint.cpp +++ b/hotspot/src/share/vm/runtime/safepoint.cpp @@ -22,6 +22,12 @@ @@ -115692,7 +115692,7 @@ index 440617c8..be0e4dd1 100644 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" #include "gc_implementation/shared/suspendibleThreadSet.hpp" diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp -index 5f540247..abcd6066 100644 +index 5f540247f9..abcd6066b9 100644 --- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp +++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp @@ -22,6 +22,12 @@ @@ -115733,7 +115733,7 @@ index 5f540247..abcd6066 100644 // G1 write-barrier pre: executed before a pointer store. diff --git a/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp b/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp -index 37880d8a..3987880b 100644 +index 37880d8a5c..3987880b16 100644 --- a/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp +++ b/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp @@ -22,6 +22,12 @@ @@ -115766,7 +115766,7 @@ index 37880d8a..3987880b 100644 static const double S1 = -1.66666666666666324348e-01, /* 0xBFC55555, 0x55555549 */ diff --git a/hotspot/src/share/vm/runtime/stackValueCollection.cpp b/hotspot/src/share/vm/runtime/stackValueCollection.cpp -index 87747683..fe81c1bf 100644 +index 8774768311..fe81c1bfd8 100644 --- a/hotspot/src/share/vm/runtime/stackValueCollection.cpp +++ b/hotspot/src/share/vm/runtime/stackValueCollection.cpp @@ -22,6 +22,12 @@ @@ -115796,7 +115796,7 @@ index 87747683..fe81c1bf 100644 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC diff --git a/hotspot/src/share/vm/runtime/statSampler.cpp b/hotspot/src/share/vm/runtime/statSampler.cpp -index 41f46962..3b430890 100644 +index 41f469622f..3b43089062 100644 --- a/hotspot/src/share/vm/runtime/statSampler.cpp +++ b/hotspot/src/share/vm/runtime/statSampler.cpp @@ -22,6 +22,12 @@ @@ -115826,7 +115826,7 @@ index 41f46962..3b430890 100644 // -------------------------------------------------------- // StatSamplerTask diff --git a/hotspot/src/share/vm/runtime/stubRoutines.hpp b/hotspot/src/share/vm/runtime/stubRoutines.hpp -index e18b9127..9bf93376 100644 +index e18b9127df..9bf933762a 100644 --- a/hotspot/src/share/vm/runtime/stubRoutines.hpp +++ b/hotspot/src/share/vm/runtime/stubRoutines.hpp @@ -22,6 +22,12 @@ @@ -115867,7 +115867,7 @@ index e18b9127..9bf93376 100644 static jint _verify_oop_count; diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp -index e6586c40..3db678ff 100644 +index e6586c40cb..3db678ff48 100644 --- a/hotspot/src/share/vm/runtime/thread.cpp +++ b/hotspot/src/share/vm/runtime/thread.cpp @@ -22,6 +22,12 @@ @@ -115884,7 +115884,7 @@ index e6586c40..3db678ff 100644 #include "classfile/classLoader.hpp" #include "classfile/javaClasses.hpp" diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp -index 7d80daba..98d195f7 100644 +index 7d80daba54..98d195f7c0 100644 --- a/hotspot/src/share/vm/runtime/thread.hpp +++ b/hotspot/src/share/vm/runtime/thread.hpp @@ -22,6 +22,12 @@ @@ -115914,7 +115914,7 @@ index 7d80daba..98d195f7 100644 # include "thread_linux_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/runtime/threadLocalStorage.hpp b/hotspot/src/share/vm/runtime/threadLocalStorage.hpp -index 58c1afc8..0938b2ed 100644 +index 58c1afc810..0938b2edda 100644 --- a/hotspot/src/share/vm/runtime/threadLocalStorage.hpp +++ b/hotspot/src/share/vm/runtime/threadLocalStorage.hpp @@ -22,6 +22,12 @@ @@ -115944,7 +115944,7 @@ index 58c1afc8..0938b2ed 100644 # include "threadLS_linux_aarch64.hpp" #endif diff --git a/hotspot/src/share/vm/runtime/virtualspace.cpp b/hotspot/src/share/vm/runtime/virtualspace.cpp -index 66392b75..5ced38d8 100644 +index 66392b75f1..5ced38d838 100644 --- a/hotspot/src/share/vm/runtime/virtualspace.cpp +++ b/hotspot/src/share/vm/runtime/virtualspace.cpp @@ -1,5 +1,6 @@ @@ -115984,7 +115984,7 @@ index 66392b75..5ced38d8 100644 } else { base = os::reserve_memory(size, NULL, alignment); diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp -index 32e3921b..c6cc4c43 100644 +index 32e3921b2b..c6cc4c4329 100644 --- a/hotspot/src/share/vm/runtime/vmStructs.cpp +++ b/hotspot/src/share/vm/runtime/vmStructs.cpp @@ -22,6 +22,12 @@ @@ -116038,7 +116038,7 @@ index 32e3921b..c6cc4c43 100644 #endif // COMPILER2 diff --git a/hotspot/src/share/vm/runtime/vm_version.cpp b/hotspot/src/share/vm/runtime/vm_version.cpp -index 66c383bf..9e643241 100644 +index 66c383bf69..9e6432416e 100644 --- a/hotspot/src/share/vm/runtime/vm_version.cpp +++ b/hotspot/src/share/vm/runtime/vm_version.cpp @@ -22,6 +22,12 @@ @@ -116083,7 +116083,7 @@ index 66c383bf..9e643241 100644 #define CPU IA32_ONLY("x86") \ IA64_ONLY("ia64") \ diff --git a/hotspot/src/share/vm/utilities/copy.hpp b/hotspot/src/share/vm/utilities/copy.hpp -index c1d82c70..1279319a 100644 +index c1d82c7083..1279319a17 100644 --- a/hotspot/src/share/vm/utilities/copy.hpp +++ b/hotspot/src/share/vm/utilities/copy.hpp @@ -22,6 +22,12 @@ @@ -116142,7 +116142,7 @@ index c1d82c70..1279319a 100644 }; diff --git a/hotspot/src/share/vm/utilities/debug.cpp b/hotspot/src/share/vm/utilities/debug.cpp -index 58a32a2b..1026585f 100644 +index 58a32a2b83..1026585f84 100644 --- a/hotspot/src/share/vm/utilities/debug.cpp +++ b/hotspot/src/share/vm/utilities/debug.cpp @@ -690,6 +690,7 @@ void help() { @@ -116154,7 +116154,7 @@ index 58a32a2b..1026585f 100644 tty->print_cr(" - in gdb do 'set overload-resolution off' before calling pns()"); tty->print_cr(" - in dbx do 'frame 1' before calling pns()"); diff --git a/hotspot/src/share/vm/utilities/globalDefinitions.hpp b/hotspot/src/share/vm/utilities/globalDefinitions.hpp -index 81866b84..61fc0c48 100644 +index 81866b8409..61fc0c48a2 100644 --- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp +++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp @@ -22,6 +22,12 @@ @@ -116184,7 +116184,7 @@ index 81866b84..61fc0c48 100644 /* * If a platform does not support native stack walking diff --git a/hotspot/src/share/vm/utilities/macros.hpp b/hotspot/src/share/vm/utilities/macros.hpp -index 599e1074..41ef06e2 100644 +index 599e1074de..41ef06e27f 100644 --- a/hotspot/src/share/vm/utilities/macros.hpp +++ b/hotspot/src/share/vm/utilities/macros.hpp @@ -22,6 +22,12 @@ @@ -116232,7 +116232,7 @@ index 599e1074..41ef06e2 100644 #ifndef PPC #define PPC diff --git a/hotspot/src/share/vm/utilities/taskqueue.hpp b/hotspot/src/share/vm/utilities/taskqueue.hpp -index bc06cacc..46be35a3 100644 +index bc06caccb4..46be35a325 100644 --- a/hotspot/src/share/vm/utilities/taskqueue.hpp +++ b/hotspot/src/share/vm/utilities/taskqueue.hpp @@ -121,11 +121,22 @@ protected: @@ -116416,7 +116416,7 @@ index bc06cacc..46be35a3 100644 // before the store just above. OrderAccess::fence(); diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp -index fa7a3250..7098a98a 100644 +index fa7a32508e..7098a98a9f 100644 --- a/hotspot/src/share/vm/utilities/vmError.cpp +++ b/hotspot/src/share/vm/utilities/vmError.cpp @@ -22,6 +22,13 @@ @@ -116448,7 +116448,7 @@ index fa7a3250..7098a98a 100644 Abstract_VM_Version::vm_name(), Abstract_VM_Version::vm_release(), diff --git a/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh b/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh -index e2de2d3e..5b8e7dcc 100644 +index e2de2d3e55..5b8e7dcce5 100644 --- a/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh +++ b/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh @@ -24,6 +24,12 @@ @@ -116507,7 +116507,7 @@ index e2de2d3e..5b8e7dcc 100644 cp ${TESTSRC}${FS}*.java ${THIS_DIR} diff --git a/hotspot/test/compiler/floatingpoint/8165673/TestFloatJNIArgs.sh b/hotspot/test/compiler/floatingpoint/8165673/TestFloatJNIArgs.sh -index 65c59f20..e229a047 100644 +index 65c59f20a8..e229a047c3 100644 --- a/hotspot/test/compiler/floatingpoint/8165673/TestFloatJNIArgs.sh +++ b/hotspot/test/compiler/floatingpoint/8165673/TestFloatJNIArgs.sh @@ -41,10 +41,10 @@ echo "TESTSRC=${TESTSRC}" @@ -116524,7 +116524,7 @@ index 65c59f20..e229a047 100644 exit 0; fi diff --git a/hotspot/test/compiler/floatingpoint/8207838/TestFloatSyncJNIArgs.sh b/hotspot/test/compiler/floatingpoint/8207838/TestFloatSyncJNIArgs.sh -index db2b5ef7..e5079fdb 100644 +index db2b5ef7e4..e5079fdb08 100644 --- a/hotspot/test/compiler/floatingpoint/8207838/TestFloatSyncJNIArgs.sh +++ b/hotspot/test/compiler/floatingpoint/8207838/TestFloatSyncJNIArgs.sh @@ -41,10 +41,10 @@ echo "TESTSRC=${TESTSRC}" @@ -116541,7 +116541,7 @@ index db2b5ef7..e5079fdb 100644 exit 0; fi diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java -index fa9a6f20..885957cf 100644 +index fa9a6f208b..885957cf1c 100644 --- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java +++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java @@ -34,11 +34,12 @@ import com.oracle.java.testlibrary.cli.predicate.OrPredicate; @@ -116560,7 +116560,7 @@ index fa9a6f20..885957cf 100644 @Override diff --git a/hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java b/hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java -index dc8c3984..2427b2bf 100644 +index dc8c398408..2427b2bf7b 100644 --- a/hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java +++ b/hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java @@ -62,18 +62,24 @@ public class IntrinsicPredicates { @@ -116591,7 +116591,7 @@ index dc8c3984..2427b2bf 100644 public static final BooleanSupplier SHA512_INSTRUCTION_AVAILABLE = new OrPredicate( diff --git a/hotspot/test/runtime/6929067/Test6929067.sh b/hotspot/test/runtime/6929067/Test6929067.sh -index 90b96d5e..7137237b 100644 +index 90b96d5e9d..7137237b71 100644 --- a/hotspot/test/runtime/6929067/Test6929067.sh +++ b/hotspot/test/runtime/6929067/Test6929067.sh @@ -97,6 +97,10 @@ case "$ARCH" in @@ -116606,7 +116606,7 @@ index 90b96d5e..7137237b 100644 esac diff --git a/hotspot/test/runtime/7107135/Test7107135.sh b/hotspot/test/runtime/7107135/Test7107135.sh -index 2d1aa8f6..1b46fb2a 100644 +index 2d1aa8f61b..1b46fb2a51 100644 --- a/hotspot/test/runtime/7107135/Test7107135.sh +++ b/hotspot/test/runtime/7107135/Test7107135.sh @@ -47,7 +47,7 @@ case "$OS" in @@ -116628,7 +116628,7 @@ index 2d1aa8f6..1b46fb2a 100644 echo echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} TestMT test-rwx diff --git a/hotspot/test/runtime/jni/CallWithJNIWeak/test.sh b/hotspot/test/runtime/jni/CallWithJNIWeak/test.sh -index 0bac3f3c..b7a49997 100644 +index 0bac3f3cf9..b7a4999721 100644 --- a/hotspot/test/runtime/jni/CallWithJNIWeak/test.sh +++ b/hotspot/test/runtime/jni/CallWithJNIWeak/test.sh @@ -45,14 +45,14 @@ echo "Testing on " $OS @@ -116658,7 +116658,7 @@ index 0bac3f3c..b7a49997 100644 echo echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} -Xcomp CallWithJNIWeak diff --git a/hotspot/test/runtime/jni/ReturnJNIWeak/test.sh b/hotspot/test/runtime/jni/ReturnJNIWeak/test.sh -index 211c0415..37e4027f 100644 +index 211c0415fa..37e4027f3e 100644 --- a/hotspot/test/runtime/jni/ReturnJNIWeak/test.sh +++ b/hotspot/test/runtime/jni/ReturnJNIWeak/test.sh @@ -45,14 +45,14 @@ echo "Testing on " $OS @@ -116688,7 +116688,7 @@ index 211c0415..37e4027f 100644 echo echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} -Xcomp ReturnJNIWeak diff --git a/hotspot/test/test_env.sh b/hotspot/test/test_env.sh -index 5ba4f28c..d9d8bb6b 100644 +index 5ba4f28c45..d9d8bb6b6b 100644 --- a/hotspot/test/test_env.sh +++ b/hotspot/test/test_env.sh @@ -211,6 +211,29 @@ if [ $? = 0 ] @@ -116722,7 +116722,7 @@ index 5ba4f28c..d9d8bb6b 100644 echo "VM_TYPE=${VM_TYPE}" echo "VM_BITS=${VM_BITS}" diff --git a/hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java b/hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java -index 6a140793..56a6375b 100644 +index 6a14079347..56a6375b5f 100644 --- a/hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java +++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java @@ -126,6 +126,10 @@ public class Platform { @@ -116748,7 +116748,7 @@ index 6a140793..56a6375b 100644 * Return a boolean for whether we expect to be able to attach * the SA to our own processes on this system. diff --git a/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java b/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java -index 7d56a4a3..41825e18 100644 +index 7d56a4a3bc..41825e18b3 100644 --- a/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java +++ b/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java @@ -43,7 +43,7 @@ import java.util.Set; @@ -116761,7 +116761,7 @@ index 7d56a4a3..41825e18 100644 OS("isAix", "isLinux", "isSolaris", "isWindows", "isOSX"), VM_TYPE("isClient", "isServer", "isGraal", "isMinimal"), diff --git a/jdk/make/Images.gmk b/jdk/make/Images.gmk -index ac39ad33..05a01340 100644 +index ac39ad3304..05a01340e1 100644 --- a/jdk/make/Images.gmk +++ b/jdk/make/Images.gmk @@ -23,6 +23,12 @@ @@ -116813,7 +116813,7 @@ index ac39ad33..05a01340 100644 jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \ diff --git a/jdk/make/gensrc/GensrcMisc.gmk b/jdk/make/gensrc/GensrcMisc.gmk -index 0e3dee5c..66f19f4d 100644 +index 0e3dee5ca3..66f19f4d25 100644 --- a/jdk/make/gensrc/GensrcMisc.gmk +++ b/jdk/make/gensrc/GensrcMisc.gmk @@ -23,6 +23,12 @@ @@ -116838,7 +116838,7 @@ index 0e3dee5c..66f19f4d 100644 -e 's/@@java_profile_name@@/$(call profile_version_name, $@)/g' \ $< > $@.tmp diff --git a/jdk/make/lib/SoundLibraries.gmk b/jdk/make/lib/SoundLibraries.gmk -index b59a9462..8ce97dc8 100644 +index b59a9462ec..8ce97dc854 100644 --- a/jdk/make/lib/SoundLibraries.gmk +++ b/jdk/make/lib/SoundLibraries.gmk @@ -23,6 +23,12 @@ @@ -116870,7 +116870,7 @@ index b59a9462..8ce97dc8 100644 LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64 endif diff --git a/jdk/src/share/classes/sun/misc/Version.java.template b/jdk/src/share/classes/sun/misc/Version.java.template -index 32e2586e..e38541a9 100644 +index 32e2586e79..e38541a9f7 100644 --- a/jdk/src/share/classes/sun/misc/Version.java.template +++ b/jdk/src/share/classes/sun/misc/Version.java.template @@ -23,6 +23,13 @@ @@ -116912,7 +116912,7 @@ index 32e2586e..e38541a9 100644 // profile name diff --git a/jdk/src/solaris/bin/loongarch64/jvm.cfg b/jdk/src/solaris/bin/loongarch64/jvm.cfg new file mode 100644 -index 00000000..42a06755 +index 0000000000..42a06755da --- /dev/null +++ b/jdk/src/solaris/bin/loongarch64/jvm.cfg @@ -0,0 +1,36 @@ @@ -116954,7 +116954,7 @@ index 00000000..42a06755 +-client IGNORE diff --git a/jdk/src/solaris/bin/mips64/jvm.cfg b/jdk/src/solaris/bin/mips64/jvm.cfg new file mode 100644 -index 00000000..42a06755 +index 0000000000..42a06755da --- /dev/null +++ b/jdk/src/solaris/bin/mips64/jvm.cfg @@ -0,0 +1,36 @@ @@ -116995,7 +116995,7 @@ index 00000000..42a06755 +-server KNOWN +-client IGNORE diff --git a/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java b/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java -index 6be55625..6c9ddb34 100644 +index 6be556254e..6c9ddb34f4 100644 --- a/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java +++ b/jdk/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java @@ -1,5 +1,5 @@ @@ -117030,7 +117030,7 @@ index 6be55625..6c9ddb34 100644 X509Certificate caCert = CertUtils.getCertFromFile("ca.cer"); ArrayList certs = new ArrayList(); diff --git a/jdk/test/java/security/cert/pkix/policyChanges/TestPolicy.java b/jdk/test/java/security/cert/pkix/policyChanges/TestPolicy.java -index a92eee2c..de2f94d2 100644 +index a92eee2c5e..de2f94d27b 100644 --- a/jdk/test/java/security/cert/pkix/policyChanges/TestPolicy.java +++ b/jdk/test/java/security/cert/pkix/policyChanges/TestPolicy.java @@ -1,5 +1,5 @@ @@ -117060,7 +117060,7 @@ index a92eee2c..de2f94d2 100644 PKIXCertPathValidatorResult result = (PKIXCertPathValidatorResult)validator.validate(path, params); diff --git a/jdk/test/jdk/jfr/event/os/TestCPUInformation.java b/jdk/test/jdk/jfr/event/os/TestCPUInformation.java -index d6a026b2..b6548602 100644 +index d6a026b2cc..b65486023f 100644 --- a/jdk/test/jdk/jfr/event/os/TestCPUInformation.java +++ b/jdk/test/jdk/jfr/event/os/TestCPUInformation.java @@ -54,8 +54,8 @@ public class TestCPUInformation { @@ -117075,15 +117075,15 @@ index d6a026b2..b6548602 100644 } } diff --git a/jdk/test/sun/management/jmxremote/bootstrap/linux-loongarch64/launcher b/jdk/test/sun/management/jmxremote/bootstrap/linux-loongarch64/launcher -new file mode 100644 -index 00000000..66291c75 +new file mode 100755 +index 0000000000..66291c7522 Binary files /dev/null and b/jdk/test/sun/management/jmxremote/bootstrap/linux-loongarch64/launcher differ diff --git a/jdk/test/sun/management/jmxremote/bootstrap/linux-mips64el/launcher b/jdk/test/sun/management/jmxremote/bootstrap/linux-mips64el/launcher new file mode 100644 -index 00000000..5c8385ca +index 0000000000..5c8385ca12 Binary files /dev/null and b/jdk/test/sun/management/jmxremote/bootstrap/linux-mips64el/launcher differ diff --git a/jdk/test/sun/security/pkcs11/PKCS11Test.java b/jdk/test/sun/security/pkcs11/PKCS11Test.java -index 5fc9c605..9db6a17d 100644 +index 5fc9c605de..9db6a17d66 100644 --- a/jdk/test/sun/security/pkcs11/PKCS11Test.java +++ b/jdk/test/sun/security/pkcs11/PKCS11Test.java @@ -21,6 +21,11 @@ diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index ad2887e..817a111 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -1241,10 +1241,16 @@ Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_jav ############################################# Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch -# LoongArch64 support -Patch2000: LoongArch64-support-jdk8u%{updatever}%{buildver}.patch +############################################ +# +# LoongArch64 specific patches +# +############################################ + +Patch2000: LoongArch64-support.patch Patch2001: LoongArch-uses-hwcap-detect-cpu-flags.patch + ############################################# # # Dependencies @@ -2360,13 +2366,8 @@ cjc.mainProgram(arg) %changelog * Mon Feb 27 2023 panxuefeng - 1:1.8.0.362-b09.3 -- Fixed - 'Disassembler' has not been declared -- compiler/criticalnatives/argumentcorruption/Test8167409.sh fail -- windows debug build failed -- 8299804: Fix non-portable code in hotspot shell tests in 8u -- [MIPS] Fix a typo in PosixSignals::pd_hotspot_signal_handler -- Fix a typo in PosixSignals::pd_hotspot_signal_handler -- LA/MIPS port of 8296959: Fix hotspot shell tests of 8u on multilib systems +- update LoongArch64 port to jdk8u362-b09-ls-1 +- fix typos error * Wed Feb 15 2023 kuenking111 - 1:1.8.0.362-b09.2 - add Add-CMS-s-trim-test-cases-and-fix-failure.patch @@ -2397,7 +2398,7 @@ cjc.mainProgram(arg) - modified g1gc-numa-aware-Implementation.patch - upgrade to jdk8u362-b09 -* Thu Feb 02 2023 panxuefeng - 1:1.8.0.352-b08.8 +* Fri Jan 20 2023 panxuefeng - 1:1.8.0.352-b08.8 - LoongArch uses hwcap detect cpu flags * Wed Jan 18 2023 panxuefeng - 1:1.8.0.352-b08.7 -- Gitee