Attachment 208392 Details for Bug 241317 – have BsdNativeDispatcher load it's library and make that library export it's symbols

[patch] have BsdNativeDispatcher load it's library and make that library export it's symbols

0001-make-BsdNativeDispatcher-actually-load-the-native-li.patch (text/plain), 3.08 KB, created by Christoph Moench-Tegeder on 2019-10-17 21:55:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Moench-Tegeder

Created: 2019-10-17 21:55:21 UTC

Size: 3.08 KB

patch

obsolete

>From 6dc0cdf13f5428e36a17c115a45f9c20c637419a Mon Sep 17 00:00:00 2001
>From: Christoph Moench-Tegeder <cmt@burggraben.net>
>Date: Thu, 17 Oct 2019 23:49:24 +0200
>Subject: [PATCH] make BsdNativeDispatcher actually load the native library to
> dispatch to
>
>and make sure that library exports all the required symbols
>---
> .../patch-jdk-make-mapfiles-libnio-mapfile-bsd | 18 +++++++++++++-----
> ...classes_sun_nio_fs_BsdNativeDispatcher.java | 14 ++++++++++++++
> 2 files changed, 27 insertions(+), 5 deletions(-)
> create mode 100644 java/openjdk8/files/patch-jdk_src_solaris_classes_sun_nio_fs_BsdNativeDispatcher.java
>
>diff --git a/java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd b/java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd
>index 33a4c0ae0acb..c53a57d2f94a 100644
>--- a/java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd
>+++ b/java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd
>@@ -1,14 +1,22 @@
>---- jdk/make/mapfiles/libnio/mapfile-bsd
>+--- jdk/make/mapfiles/libnio/mapfile-bsd.orig	2019-10-17 21:15:55 UTC
> +++ jdk/make/mapfiles/libnio/mapfile-bsd
>-@@ -42,6 +42,7 @@ SUNWprivate_1.1 {
>- 		Java_sun_nio_ch_FileChannelImpl_position0;
>+@@ -41,6 +41,7 @@ SUNWprivate_1.1 {
>+ 		Java_sun_nio_ch_FileChannelImpl_map0;
>  		Java_sun_nio_ch_FileChannelImpl_transferTo0;
>  		Java_sun_nio_ch_FileChannelImpl_unmap0;
> +		Java_sun_nio_ch_FileDispatcherImpl_allocate0;
>  		Java_sun_nio_ch_FileDispatcherImpl_close0;
>  		Java_sun_nio_ch_FileDispatcherImpl_closeIntFD;
>- 		Java_sun_nio_ch_FileDispatcherImpl_force0;
>-@@ -143,6 +144,14 @@ SUNWprivate_1.1 {
>+ 		Java_sun_nio_ch_FileDispatcherImpl_seek0;
>+@@ -135,6 +136,7 @@ SUNWprivate_1.1 {
>+ 		Java_sun_nio_fs_BsdNativeDispatcher_endfsstat;
>+ 		Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry;
>+ 		Java_sun_nio_fs_BsdNativeDispatcher_getfsstat;
>++		Java_sun_nio_fs_BsdNativeDispatcher_getmntonname0;
>+ 		Java_sun_nio_fs_BsdNativeDispatcher_initIDs;
>+ 		Java_sun_nio_fs_GnomeFileTypeDetector_initializeGio;
>+ 		Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;
>+@@ -143,6 +145,14 @@ SUNWprivate_1.1 {
>  		Java_sun_nio_fs_MagicFileTypeDetector_initialize0;
>  		Java_sun_nio_fs_MagicFileTypeDetector_probe0;
>  		Java_sun_nio_fs_UnixCopyFile_transfer;
>diff --git a/java/openjdk8/files/patch-jdk_src_solaris_classes_sun_nio_fs_BsdNativeDispatcher.java b/java/openjdk8/files/patch-jdk_src_solaris_classes_sun_nio_fs_BsdNativeDispatcher.java
>new file mode 100644
>index 000000000000..d8de6d6d6d1d
>--- /dev/null
>+++ b/java/openjdk8/files/patch-jdk_src_solaris_classes_sun_nio_fs_BsdNativeDispatcher.java
>@@ -0,0 +1,14 @@
>+--- jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java.orig	2019-10-17 19:49:41 UTC
>++++ jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java
>+@@ -69,6 +69,11 @@ class BsdNativeDispatcher extends UnixNativeDispatcher
>+     private static native void initIDs();
>+ 
>+     static {
>++         AccessController.doPrivileged(new PrivilegedAction<Void>() {
>++             public Void run() {
>++                 System.loadLibrary("nio");
>++                 return null;
>++         }});
>+          initIDs();
>+     }
>+ }
>-- 
>2.23.0
>

Actions: View | Diff

Attachments on bug 241317: 208391 | 208392