!370 update LoongArch64 port to 11.0.24
From: @panxuefeng-loongson Reviewed-by: @kuenking111 Signed-off-by: @kuenking111
This commit is contained in:
openeuler-ci-bot
Gitee
commit
08997d5293
@ -38046,13 +38046,13 @@ index 0000000000..49302590c3
|
||||
+#endif // CPU_LOONGARCH_MACROASSEMBLER_LOONGARCH_INLINE_HPP
|
||||
diff --git a/src/hotspot/cpu/loongarch/macroAssembler_loongarch_trig.cpp b/src/hotspot/cpu/loongarch/macroAssembler_loongarch_trig.cpp
|
||||
new file mode 100644
|
||||
index 0000000000..3ed4c36651
|
||||
index 0000000000..6e27a69747
|
||||
--- /dev/null
|
||||
+++ b/src/hotspot/cpu/loongarch/macroAssembler_loongarch_trig.cpp
|
||||
@@ -0,0 +1,1625 @@
|
||||
@@ -0,0 +1,1626 @@
|
||||
+/* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2018, Cavium. All rights reserved. (By BELLSOFT)
|
||||
+ * Copyright (c) 2022, Loongson Technology. All rights reserved.
|
||||
+ * Copyright (c) 2022, 2024, 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
|
||||
@ -38951,7 +38951,7 @@ index 0000000000..3ed4c36651
|
||||
+ b(Q_DONE);
|
||||
+ bind(JX_IS_0);
|
||||
+ if (UseLASX) {
|
||||
+ xvfmul_d(v28, v18, v6); // f[0,1] * x[0]
|
||||
+ xvfmul_d(v28, v18, v6); // f[0,3] * x[0]
|
||||
+ fmul_d(v30, v19, v6); // f[4] * x[0]
|
||||
+ } else {
|
||||
+ vfmul_d(v28, v18, v6); // f[0,1] * x[0]
|
||||
@ -39180,6 +39180,7 @@ index 0000000000..3ed4c36651
|
||||
+ st_w(tmp2, SCR2, 0);
|
||||
+ addi_w(SCR1, SCR1, 24);
|
||||
+ addi_w(jz, jz, 1);
|
||||
+ alsl_d(SCR2, jz, iqBase, 2 - 1);
|
||||
+ st_w(tmp3, SCR2, 0); // iq[jz] = (int) fw
|
||||
+ b(Z_ZERO_CHECK_DONE);
|
||||
+ bind(Z_IS_LESS_THAN_TWO24B);
|
||||
@ -104792,7 +104793,7 @@ index 3687754e71..791e4ed43f 100644
|
||||
void generate_c1_load_barrier_stub(LIR_Assembler* ce,
|
||||
ZLoadBarrierStubC1* stub) const;
|
||||
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
|
||||
index 0af357ea56..66a8006780 100644
|
||||
index 2842a11f92..4f58ec4be3 100644
|
||||
--- a/src/hotspot/os/linux/os_linux.cpp
|
||||
+++ b/src/hotspot/os/linux/os_linux.cpp
|
||||
@@ -23,6 +23,12 @@
|
||||
@ -104808,7 +104809,7 @@ index 0af357ea56..66a8006780 100644
|
||||
// no precompiled headers
|
||||
#include "jvm.h"
|
||||
#include "classfile/classLoader.hpp"
|
||||
@@ -4068,6 +4074,8 @@ size_t os::Linux::find_large_page_size() {
|
||||
@@ -4060,6 +4066,8 @@ size_t os::Linux::find_large_page_size() {
|
||||
IA64_ONLY(256 * M)
|
||||
PPC_ONLY(4 * M)
|
||||
S390_ONLY(1 * M)
|
||||
@ -110338,7 +110339,7 @@ index ce23aafa8f..d3dfb74d5b 100644
|
||||
assert(_owner != Self, "invariant");
|
||||
assert(_Responsible != Self, "invariant");
|
||||
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
|
||||
index e0f4a2af1f..09cc4b1ba5 100644
|
||||
index 1c540bb621..0e44240d40 100644
|
||||
--- a/src/hotspot/share/runtime/os.cpp
|
||||
+++ b/src/hotspot/share/runtime/os.cpp
|
||||
@@ -22,6 +22,12 @@
|
||||
@ -110672,7 +110673,7 @@ index 8318e8e021..07064e76ee 100644
|
||||
// This C bool type must be int for compatibility with Linux calls and
|
||||
// it would be a mistake to equivalence it to C++ bool on many platforms
|
||||
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c
|
||||
index de5254d859..eefe55959c 100644
|
||||
index c22b5d1cb3..36d6343960 100644
|
||||
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c
|
||||
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c
|
||||
@@ -22,6 +22,12 @@
|
||||
@ -110688,12 +110689,12 @@ index de5254d859..eefe55959c 100644
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -142,7 +148,7 @@ static bool process_get_lwp_regs(struct ps_prochandle* ph, pid_t pid, struct use
|
||||
#define PTRACE_GETREGS_REQ PT_GETREGS
|
||||
#endif
|
||||
|
||||
-#ifdef PTRACE_GETREGS_REQ
|
||||
+#if defined(PTRACE_GETREGS_REQ) && !defined(loongarch64)
|
||||
@@ -151,7 +157,7 @@ static bool process_get_lwp_regs(struct ps_prochandle* ph, pid_t pid, struct use
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
-#elif defined(PTRACE_GETREGS_REQ)
|
||||
+#elif defined(PTRACE_GETREGS_REQ) && !defined(loongarch64)
|
||||
if (ptrace_getregs(PTRACE_GETREGS_REQ, pid, user, NULL) < 0) {
|
||||
print_debug("ptrace(PTRACE_GETREGS, ...) failed for lwp %d\n", pid);
|
||||
return false;
|
||||
@ -116585,7 +116586,7 @@ index 127bb6abcd..c9277604ae 100644
|
||||
Platform.isSolaris();
|
||||
}
|
||||
diff --git a/test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java b/test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
|
||||
index 77458554b7..05aee6b84c 100644
|
||||
index 126a43a900..55bd135f6e 100644
|
||||
--- a/test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
|
||||
+++ b/test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
|
||||
@@ -45,7 +45,7 @@ import java.util.Set;
|
||||
@ -116625,35 +116626,8 @@ index 7990c49a1f..025048c6b0 100644
|
||||
}
|
||||
}
|
||||
}
|
||||
diff --git a/test/jdk/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java
|
||||
index b14daf6c6d..da33514c75 100644
|
||||
--- a/test/jdk/sun/security/pkcs11/PKCS11Test.java
|
||||
+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java
|
||||
@@ -21,6 +21,12 @@
|
||||
* questions.
|
||||
*/
|
||||
|
||||
+/*
|
||||
+ * This file has been modified by Loongson Technology in 2022, These
|
||||
+ * modifications are Copyright (c) 2021, 2022, Loongson Technology, and are made
|
||||
+ * available on the same license terms set forth above.
|
||||
+ */
|
||||
+
|
||||
// common infrastructure for SunPKCS11 tests
|
||||
|
||||
import java.io.BufferedReader;
|
||||
@@ -747,6 +753,9 @@ public abstract class PKCS11Test {
|
||||
"/usr/lib64/" });
|
||||
osMap.put("Linux-ppc64-64", new String[] { "/usr/lib64/" });
|
||||
osMap.put("Linux-ppc64le-64", new String[] { "/usr/lib64/" });
|
||||
+ osMap.put("Linux-mips64el-64", new String[]{"/usr/lib64/"});
|
||||
+ osMap.put("Linux-loongarch64-64", new String[]{"/usr/lib/loongarch64-linux-gnu/",
|
||||
+ "/usr/lib64/" });
|
||||
osMap.put("Linux-s390x-64", new String[] { "/usr/lib64/" });
|
||||
osMap.put("Windows-x86-32", new String[] {});
|
||||
osMap.put("Windows-amd64-64", new String[] {});
|
||||
diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
|
||||
index 5b3f1889cb..aaf8867a7c 100644
|
||||
index 6269373c2b..440ec4664f 100644
|
||||
--- a/test/lib/jdk/test/lib/Platform.java
|
||||
+++ b/test/lib/jdk/test/lib/Platform.java
|
||||
@@ -21,6 +21,12 @@
|
||||
@ -116668,8 +116642,8 @@ index 5b3f1889cb..aaf8867a7c 100644
|
||||
+
|
||||
package jdk.test.lib;
|
||||
|
||||
import java.io.FileNotFoundException;
|
||||
@@ -226,6 +232,14 @@ public class Platform {
|
||||
import java.io.BufferedReader;
|
||||
@@ -229,6 +235,14 @@ public class Platform {
|
||||
return isArch("(i386)|(x86(?!_64))");
|
||||
}
|
||||
|
||||
|
||||
@ -762,7 +762,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
Release: 1
|
||||
Release: 2
|
||||
# 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
|
||||
@ -1715,6 +1715,9 @@ cjc.mainProgram(arg)
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Oct 30 2024 Pan Xuefeng <panxuefeng@loongson.cn> - 1.11.0.24.8-2
|
||||
- update LoongArch64 port to 11.0.24
|
||||
|
||||
* Thu July 18 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1.11.0.24.8-1
|
||||
- update riscv64 port to 11.0.24
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user