!272 add wrap_memcpy to libsaproc

Merge pull request !272 from kuen/I4N9PE
This commit is contained in:
openeuler-ci-bot 2021-12-20 08:21:14 +00:00 committed by Gitee
commit 21d4492c5f
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From: zhangyipeng <zhangyipeng7@huawei.com>
Date: Thu, 4 Mar 2021 11:10:07 +0800
Subject: add wrap_memcpy to libsaproc
---
hotspot/make/linux/makefiles/saproc.make | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hotspot/make/linux/makefiles/saproc.make b/hotspot/make/linux/makefiles/saproc.make
index dfeb254da..258585366 100644
--- a/hotspot/make/linux/makefiles/saproc.make
+++ b/hotspot/make/linux/makefiles/saproc.make
@@ -46,6 +46,11 @@ SASRCFILES = $(SASRCDIR)/salibelf.c \
$(SASRCDIR)/LinuxDebuggerLocal.c \
$(AGENT_DIR)/src/share/native/sadis.c
+# wrap memcpy
+ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
+ SASRCFILES += $(HOTSPOT_TOPDIR)/src/os_cpu/linux_x86/vm/memcpy.cpp
+endif
+
-include $(HS_ALT_MAKE)/linux/makefiles/saproc.make
SAMAPFILE = $(SASRCDIR)/mapfile
--
2.19.0

View File

@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
Release: 7
Release: 8
# 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
@ -1124,6 +1124,7 @@ Patch224: G1Ucommit-Refactor-Trigger-mechanism.patch
Patch225: G1-Full-GC-parallel-mark.patch
Patch226: G1Uncommit-add-G1UncommitLog-limit-before-G1Uncommit.patch
Patch227: Delete-expired-certificate-globalsignr2ca.patch
Patch228: add-wrap_memcpy-to-libsaproc.patch
# 8u322
@ -1596,6 +1597,7 @@ pushd %{top_level_dir_name}
%patch225 -p1
%patch226 -p1
%patch227 -p1
%patch228 -p1
popd
# System library fixes
@ -2213,6 +2215,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
* Mon Dec 20 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.312-b07.8
- add wrap_memcpy to libsaproc
* Thu Dec 16 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.312-b07.7
- add Delete-expired-certificate-globalsignr2ca.patch