!273 downgrade the symver of fcntl64
Merge pull request !273 from kuen/I4N9PR
This commit is contained in:
commit
3b5b985134
26
downgrade-the-symver-of-fcntl64.patch
Executable file
26
downgrade-the-symver-of-fcntl64.patch
Executable file
@ -0,0 +1,26 @@
|
|||||||
|
From: zhangyipeng <zhangyipeng7@huawei.com>
|
||||||
|
Date: Thu, 4 Mar 2021 09:38:42 +0800
|
||||||
|
|
||||||
|
---
|
||||||
|
jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c b/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c
|
||||||
|
index 9b3ff8194..bb9be2ccb 100644
|
||||||
|
--- a/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c
|
||||||
|
+++ b/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c
|
||||||
|
@@ -63,6 +63,11 @@
|
||||||
|
#include "sun_nio_ch_FileDispatcherImpl.h"
|
||||||
|
#include "java_lang_Long.h"
|
||||||
|
|
||||||
|
+#if defined(aarch64)
|
||||||
|
+ __asm__(".symver fcntl64,fcntl@GLIBC_2.17");
|
||||||
|
+#elif defined(amd64)
|
||||||
|
+ __asm__(".symver fcntl64,fcntl@GLIBC_2.2.5");
|
||||||
|
+#endif
|
||||||
|
static int preCloseFD = -1; /* File descriptor to which we dup other fd's
|
||||||
|
before closing them for real */
|
||||||
|
|
||||||
|
--
|
||||||
|
2.19.0
|
||||||
|
|
||||||
@ -916,7 +916,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: 8
|
Release: 9
|
||||||
# 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
|
||||||
@ -1125,6 +1125,7 @@ Patch225: G1-Full-GC-parallel-mark.patch
|
|||||||
Patch226: G1Uncommit-add-G1UncommitLog-limit-before-G1Uncommit.patch
|
Patch226: G1Uncommit-add-G1UncommitLog-limit-before-G1Uncommit.patch
|
||||||
Patch227: Delete-expired-certificate-globalsignr2ca.patch
|
Patch227: Delete-expired-certificate-globalsignr2ca.patch
|
||||||
Patch228: add-wrap_memcpy-to-libsaproc.patch
|
Patch228: add-wrap_memcpy-to-libsaproc.patch
|
||||||
|
Patch229: downgrade-the-symver-of-fcntl64.patch
|
||||||
|
|
||||||
# 8u322
|
# 8u322
|
||||||
|
|
||||||
@ -1598,6 +1599,7 @@ pushd %{top_level_dir_name}
|
|||||||
%patch226 -p1
|
%patch226 -p1
|
||||||
%patch227 -p1
|
%patch227 -p1
|
||||||
%patch228 -p1
|
%patch228 -p1
|
||||||
|
%patch229 -p1
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# System library fixes
|
# System library fixes
|
||||||
@ -2215,6 +2217,9 @@ require "copy_jdk_configs.lua"
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 20 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.312-b07.9
|
||||||
|
- add downgrade-the-symver-of-fcntl64.patch
|
||||||
|
|
||||||
* Mon Dec 20 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.312-b07.8
|
* Mon Dec 20 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.312-b07.8
|
||||||
- add wrap_memcpy to libsaproc
|
- add wrap_memcpy to libsaproc
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user