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

!4 I8TWUM: downgrade log2f and memcpy symbols

Browse Source 
From: @kuenking111 
Reviewed-by: @jvmboy 
Signed-off-by: @jvmboy
This commit is contained in:
openeuler-ci-bot 2024-01-10 06:41:57 +00:00 committed by Gitee
commit abcb6aecdc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
downgrade-the-glibc-symver-of-log2f-posix_spawn.patch → add-downgrade-the-glibc-symver-of-log2f-posix_spawn.patch
View File

@ -1,7 +1,5 @@
From f03f70daa59157adcab807b393db21d57da33e23 Mon Sep 17 00:00:00 2001
From: sunjianye <sunjianye@huawei.com>
Date: Tue, 26 Oct 2021 15:49:42 +0800
Subject: [PATCH] downgrade the glibc symver of log2f & posix_spawn
From 9b51dcde590d8e93dfcd92ee6e37d19f72ce9138 Mon Sep 17 00:00:00 2001
Subject: add downgrade-the-glibc-symver-of-log2f-posix_spawn
---
src/hotspot/share/opto/parse2.cpp | 8 ++++++++
@ -9,7 +7,7 @@ Subject: [PATCH] downgrade the glibc symver of log2f & posix_spawn
2 files changed, 12 insertions(+)
diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
index becd187..9bbcb0c 100644
index bb21f48f6..072e07706 100644
--- a/src/hotspot/share/opto/parse2.cpp
+++ b/src/hotspot/share/opto/parse2.cpp
@@ -45,6 +45,14 @@
@ -28,7 +26,7 @@ index becd187..9bbcb0c 100644
extern int explicit_null_checks_inserted,
explicit_null_checks_elided;
diff --git a/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c
index 3854f36..26cf41c 100644
index 9ed0ed309..64671d975 100644
--- a/src/java.base/unix/native/libjava/ProcessImpl_md.c
+++ b/src/java.base/unix/native/libjava/ProcessImpl_md.c
@@ -48,6 +48,10 @@
@ -43,5 +41,5 @@ index 3854f36..26cf41c 100644
*
* When starting a child on Unix, we need to do three things:
--
1.8.3.1
2.19.1

27
downgrade-the-glibc-symver-of-memcpy.patch → add-downgrade-the-glibc-symver-of-memcpy.patch
View File

@ -1,22 +1,19 @@
From 2e5e3cc58933e166cba5a3f0e3c59d0ca3849196 Mon Sep 17 00:00:00 2001
From: zhangyipeng <zhangyipeng7@huawei.com>
Date: Thu, 24 Mar 2022 11:12:46 +0800
Subject: [PATCH] [Huawei] downgrade the glibc symver of memcpy
From f277a3770d7f0785365bb6ab1c592e46c5100732 Mon Sep 17 00:00:00 2001
Subject: add downgrade-the-glibc-symver-of-memcpy
Signed-off-by: Sun Jianye <sunjianye@huawei.com>
---
make/common/NativeCompilation.gmk | 9 +++++++++
make/hotspot/lib/CompileJvm.gmk | 8 ++++++++
src/hotspot/share/runtime/memcpy.cpp | 20 ++++++++++++++++++++
src/hotspot/share/runtime/memcpy.cpp | 20 +++++++++++++++++++
.../linux/native/applauncher/LinuxPackage.c | 3 +++
4 files changed, 40 insertions(+)
create mode 100644 src/hotspot/share/runtime/memcpy.cpp
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index 1e2b170..4f22e2d 100644
index 0d7ab6a7e..6a8ec3f0b 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -1102,6 +1102,15 @@ define SetupNativeCompilationBody
@@ -1194,6 +1194,15 @@ define SetupNativeCompilationBody
endif
endif
@ -33,10 +30,10 @@ index 1e2b170..4f22e2d 100644
$$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_MT) \
$$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) \
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index 65edd04..d5b689e 100644
index adb964d05..3736ea201 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -167,6 +167,14 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
@@ -192,6 +192,14 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
))
@ -53,12 +50,12 @@ index 65edd04..d5b689e 100644
# macros.
diff --git a/src/hotspot/share/runtime/memcpy.cpp b/src/hotspot/share/runtime/memcpy.cpp
new file mode 100644
index 0000000..6ab4ddb
index 000000000..6ab4ddb64
--- /dev/null
+++ b/src/hotspot/share/runtime/memcpy.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2018-2021. All rights reserved.
+ * Copyright (c) Huawei Technologies Co., Ltd. 2018-2024. All rights reserved.
+ */
+
+#if defined( __GNUC__ ) && \
@ -78,10 +75,10 @@ index 0000000..6ab4ddb
+#endif
+#endif
diff --git a/src/jdk.jpackage/linux/native/applauncher/LinuxPackage.c b/src/jdk.jpackage/linux/native/applauncher/LinuxPackage.c
index 5e3ef36..55a7e9c 100644
index 26d65f806..b7b114ac3 100644
--- a/src/jdk.jpackage/linux/native/applauncher/LinuxPackage.c
+++ b/src/jdk.jpackage/linux/native/applauncher/LinuxPackage.c
@@ -33,6 +33,9 @@
@@ -34,6 +34,9 @@
#include "JvmLauncher.h"
#include "LinuxPackage.h"
@ -92,5 +89,5 @@ index 5e3ef36..55a7e9c 100644
static char* getModulePath(void) {
char modulePath[PATH_MAX] = { 0 };
--
1.8.3.1
2.19.1

12
openjdk-21.spec
View File

@ -894,7 +894,7 @@ Name: java-21-%{origin}
Version: %{newjavaver}.%{buildver}
# This package needs `.rolling` as part of Release so as to not conflict on install with
# java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
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
@ -973,9 +973,9 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
#
#############################################
# 17.0.2
Patch7: downgrade-the-glibc-symver-of-memcpy.patch
Patch8: downgrade-the-glibc-symver-of-log2f-posix_spawn.patch
# 21.0.1
Patch7: add-downgrade-the-glibc-symver-of-log2f-posix_spawn.patch
Patch8: add-downgrade-the-glibc-symver-of-memcpy.patch
BuildRequires: autoconf
BuildRequires: automake
@ -1772,5 +1772,9 @@ cjc.mainProgram(arg)
%changelog
* Fri Jan 5 2024 kuenking111 <wangkun49@huawei.com> - 1:21.0.0.35-2
- add add-downgrade-the-glibc-symver-of-log2f-posix_spawn.patch
- add add-downgrade-the-glibc-symver-of-memcpy.patch
* Mon Dec 25 2023 kuenking111 <wangkun49@huawei.com> - 1:21.0.0.35-1
- Initial load