packages/openjdk-1.8.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update LoongArch64 port to 8u422 and make KAE patch not use on loongarch64

Browse Source
This commit is contained in:
songliyang 2024-07-31 10:02:55 +08:00
parent 74f62516fe
commit 58798bc177
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
LoongArch64-support.patch
View File

@ -72,7 +72,7 @@ index 151e5a109f..5072409dd4 100644
# Configure flags for the tools # Configure flags for the tools
FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 85eb8a16a2..86a533fe1f 100644 index 6f17436eff..aedd82e614 100644
--- a/common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh
@@ -716,6 +716,9 @@ SET_EXECUTABLE_ORIGIN @@ -716,6 +716,9 @@ SET_EXECUTABLE_ORIGIN
@ -162,7 +162,7 @@ index 85eb8a16a2..86a533fe1f 100644
# Setup OPENJDK_TARGET_OS_API_DIR, used in source paths. # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
@@ -42436,6 +42467,47 @@ $as_echo "$ac_cv_c_bigendian" >&6; } @@ -42429,6 +42460,47 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
fi fi
@ -326,7 +326,7 @@ index f54942acf2..51cc28c312 100644
+AC_SUBST(HOST_NAME) +AC_SUBST(HOST_NAME)
+]) +])
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index 9573bb2cbd..57a903229a 100644 index 9573bb2cbd..ad85aa346f 100644
--- a/common/autoconf/spec.gmk.in --- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in
@@ -23,6 +23,12 @@ @@ -23,6 +23,12 @@
@ -352,7 +352,7 @@ index 9573bb2cbd..57a903229a 100644
+HOST_NAME:=@HOST_NAME@ +HOST_NAME:=@HOST_NAME@
+ +
+# Loongson OpenJDK Version info +# Loongson OpenJDK Version info
+VER=8.1.19 +VER=8.1.20
+ifeq ($(HOST_NAME), ) +ifeq ($(HOST_NAME), )
+ HOST_NAME=unknown + HOST_NAME=unknown
+endif +endif
@ -106551,7 +106551,7 @@ index 92b73e1c71..45da327efb 100644
bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) { 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) { 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 diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index 54cfcdd116..c3d22ba5d3 100644 index 5629a640f6..68d5f514c0 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp --- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp +++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -22,6 +22,12 @@ @@ -22,6 +22,12 @@
@ -106588,8 +106588,8 @@ index 54cfcdd116..c3d22ba5d3 100644
static Elf32_Half running_arch_code=EM_LOONGARCH; static Elf32_Half running_arch_code=EM_LOONGARCH;
#else #else
#error Method os::dll_load requires that one of following is defined:\ #error Method os::dll_load requires that one of following is defined:\
- IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, LOONGARCH - IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, LOONGARCH64
+ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, __mips64, PARISC, M68K, AARCH64, LOONGARCH + IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, __mips64, PARISC, M68K, AARCH64, LOONGARCH64
#endif #endif
// Identify compatability class for VM's architecture and library's architecture // Identify compatability class for VM's architecture and library's architecture
@ -112949,7 +112949,7 @@ index 7e22bbaa27..12aca7bf50 100644
# include "c1_MacroAssembler_aarch64.hpp" # include "c1_MacroAssembler_aarch64.hpp"
#endif #endif
diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.cpp b/hotspot/src/share/vm/c1/c1_Runtime1.cpp diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.cpp b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
index aebc377527..f1253506f6 100644 index b2bff3809d..cfcdb43ddc 100644
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp --- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp +++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
@@ -22,6 +22,12 @@ @@ -22,6 +22,12 @@
@ -112965,7 +112965,7 @@ index aebc377527..f1253506f6 100644
#include "precompiled.hpp" #include "precompiled.hpp"
#include "asm/codeBuffer.hpp" #include "asm/codeBuffer.hpp"
#include "c1/c1_CodeStubs.hpp" #include "c1/c1_CodeStubs.hpp"
@@ -710,6 +716,7 @@ JRT_ENTRY(void, Runtime1::deoptimize(JavaThread* thread)) @@ -712,6 +718,7 @@ JRT_ENTRY(void, Runtime1::deoptimize(JavaThread* thread))
// Return to the now deoptimized frame. // Return to the now deoptimized frame.
JRT_END JRT_END
@ -112973,7 +112973,7 @@ index aebc377527..f1253506f6 100644
static Klass* resolve_field_return_klass(methodHandle caller, int bci, TRAPS) { static Klass* resolve_field_return_klass(methodHandle caller, int bci, TRAPS) {
Bytecode_field field_access(caller, bci); Bytecode_field field_access(caller, bci);
@@ -1186,6 +1193,47 @@ JRT_ENTRY(void, Runtime1::patch_code(JavaThread* thread, Runtime1::StubID stub_i @@ -1188,6 +1195,47 @@ JRT_ENTRY(void, Runtime1::patch_code(JavaThread* thread, Runtime1::StubID stub_i
} }
JRT_END JRT_END
@ -113985,7 +113985,7 @@ index 1dc7cb2983..92bbe6b440 100644
# include "interpreterGenerator_aarch64.hpp" # include "interpreterGenerator_aarch64.hpp"
#endif #endif
diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
index cad9d29008..85303e4b73 100644 index 425ad7f463..c428b91f5d 100644
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp --- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp +++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
@@ -22,6 +22,12 @@ @@ -22,6 +22,12 @@
@ -114001,7 +114001,7 @@ index cad9d29008..85303e4b73 100644
#include "precompiled.hpp" #include "precompiled.hpp"
#include "classfile/systemDictionary.hpp" #include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp" #include "classfile/vmSymbols.hpp"
@@ -59,6 +65,12 @@ @@ -60,6 +66,12 @@
#ifdef TARGET_ARCH_x86 #ifdef TARGET_ARCH_x86
# include "vm_version_x86.hpp" # include "vm_version_x86.hpp"
#endif #endif
@ -114014,7 +114014,7 @@ index cad9d29008..85303e4b73 100644
#ifdef TARGET_ARCH_aarch64 #ifdef TARGET_ARCH_aarch64
# include "vm_version_aarch64.hpp" # include "vm_version_aarch64.hpp"
#endif #endif
@@ -1290,7 +1302,7 @@ IRT_ENTRY(void, InterpreterRuntime::prepare_native_call(JavaThread* thread, Meth @@ -1292,7 +1304,7 @@ IRT_ENTRY(void, InterpreterRuntime::prepare_native_call(JavaThread* thread, Meth
// preparing the same method will be sure to see non-null entry & mirror. // preparing the same method will be sure to see non-null entry & mirror.
IRT_END IRT_END
@ -116029,7 +116029,7 @@ index 66392b75f1..5ced38d838 100644
} else { } else {
base = os::reserve_memory(size, NULL, alignment); 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 diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp
index 32e3921b2b..c6cc4c4329 100644 index e0e9bcf7e9..3e4640e698 100644
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp --- a/hotspot/src/share/vm/runtime/vmStructs.cpp
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp +++ b/hotspot/src/share/vm/runtime/vmStructs.cpp
@@ -22,6 +22,12 @@ @@ -22,6 +22,12 @@

13
openjdk-1.8.0.spec
View File

@ -619,7 +619,9 @@ exit 0
%{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libunpack.so %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libunpack.so
%{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libverify.so %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libverify.so
%{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libzip.so %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libzip.so
%ifnarch loongarch64
%{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libz.so %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libz.so
%endif
%{_jvmdir}/%{jredir -- %{?1}}/lib/charsets.jar %{_jvmdir}/%{jredir -- %{?1}}/lib/charsets.jar
%{_jvmdir}/%{jredir -- %{?1}}/lib/classlist %{_jvmdir}/%{jredir -- %{?1}}/lib/classlist
%{_jvmdir}/%{jredir -- %{?1}}/lib/content-types.properties %{_jvmdir}/%{jredir -- %{?1}}/lib/content-types.properties
@ -943,7 +945,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver} Version: %{javaver}.%{updatever}.%{buildver}
Release: 5 Release: 6
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # 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 # 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 # also included the epoch in their virtual provides. This created a
@ -2668,6 +2670,11 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
%endif %endif
%changelog %changelog
* Wed Aug 7 2024 songliyang <songliyang@kylinos.cn> -1:1.8.0.422-b05.6
- let support-KAE-zip.patch not install libz.so on loongarch64
- update LoongArch64 port to 8u422
- fix changelog date error
* Tue Aug 6 2024 benshuai5D <zhangyunbo7@huawei.com> -1:1.8.0.422-b05.5 * Tue Aug 6 2024 benshuai5D <zhangyunbo7@huawei.com> -1:1.8.0.422-b05.5
- modified add-Fix-aarch64-runtime-thread-signal-transfer-bug.patch - modified add-Fix-aarch64-runtime-thread-signal-transfer-bug.patch
@ -2954,10 +2961,10 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
- 0054-Fix-jmap-heapdump-symbols-when-the-class-is-loaded-f.patch - 0054-Fix-jmap-heapdump-symbols-when-the-class-is-loaded-f.patch
- 0055-Fix-CodelistTest.java-Failed-to-Execute-CodelistTest.patch - 0055-Fix-CodelistTest.java-Failed-to-Execute-CodelistTest.patch
* Fri May 11 2023 crash888 <wangmengqi13@huawei.com> - 1:1.8.0.372-b07.1 * Thu May 11 2023 crash888 <wangmengqi13@huawei.com> - 1:1.8.0.372-b07.1
- modified Fix-the-crash-that-occurs-when-the-process-exits-due.patch - modified Fix-the-crash-that-occurs-when-the-process-exits-due.patch
* Fri May 6 2023 crash888 <wangmengqi13@huawei.com> - 1:1.8.0.372-b07.0 * Sat May 6 2023 crash888 <wangmengqi13@huawei.com> - 1:1.8.0.372-b07.0
- deleted Add-ability-to-configure-third-port-for-remote-JMX.patch - deleted Add-ability-to-configure-third-port-for-remote-JMX.patch
- deleted 8287109-Distrust-failed-with-CertificateExpired.patch - deleted 8287109-Distrust-failed-with-CertificateExpired.patch
- deleted Huawei-fix-windows-build-Dynamic-CDS-failure.patch - deleted Huawei-fix-windows-build-Dynamic-CDS-failure.patch