|
Lines 2218-2223
Link Here
|
| 2218 |
#define JNIEXPORT __attribute__((visibility("default"))) |
2218 |
#define JNIEXPORT __attribute__((visibility("default"))) |
| 2219 |
#define JNIIMPORT __attribute__((visibility("default"))) |
2219 |
#define JNIIMPORT __attribute__((visibility("default"))) |
| 2220 |
#else |
2220 |
#else |
|
|
2221 |
--- ./hotspot/src/cpu/x86/vm/x86_32.ad 2014-11-11 15:50:09.000000000 -0500 |
| 2222 |
+++ ./hotspot/src/cpu/x86/vm/x86_32.ad 2014-11-11 16:05:43.000000000 -0500 |
| 2223 |
@@ -1210,6 +1210,7 @@ |
| 2224 |
|
| 2225 |
|
| 2226 |
Unimplemented(); |
| 2227 |
+ return 0; |
| 2228 |
} |
| 2229 |
|
| 2230 |
#ifndef PRODUCT |
| 2221 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2231 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 2222 |
+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Wed Nov 05 15:01:44 2014 -0800 |
2232 |
+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Wed Nov 05 15:01:44 2014 -0800 |
| 2223 |
@@ -0,0 +1,47 @@ |
2233 |
@@ -0,0 +1,47 @@ |
|
Lines 6189-6200
Link Here
|
| 6189 |
-DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \ |
6199 |
-DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \ |
| 6190 |
--- ./jdk/make/lib/NioLibraries.gmk Tue Sep 09 12:00:58 2014 -0700 |
6200 |
--- ./jdk/make/lib/NioLibraries.gmk Tue Sep 09 12:00:58 2014 -0700 |
| 6191 |
+++ ./jdk/make/lib/NioLibraries.gmk Wed Nov 05 12:14:24 2014 -0800 |
6201 |
+++ ./jdk/make/lib/NioLibraries.gmk Wed Nov 05 12:14:24 2014 -0800 |
| 6192 |
@@ -77,9 +77,27 @@ |
6202 |
@@ -77,9 +77,28 @@ |
| 6193 |
UnixNativeDispatcher.c |
6203 |
UnixNativeDispatcher.c |
| 6194 |
endif |
6204 |
endif |
| 6195 |
|
6205 |
|
| 6196 |
+ifeq ($(OPENJDK_TARGET_OS), bsd) |
6206 |
+ifeq ($(OPENJDK_TARGET_OS), bsd) |
| 6197 |
+ BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) |
6207 |
+ BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) |
|
|
6208 |
+ BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/bsd/native/sun/nio/ch |
| 6198 |
+ BUILD_LIBNIO_FILES += \ |
6209 |
+ BUILD_LIBNIO_FILES += \ |
| 6199 |
+ BsdNativeDispatcher.c \ |
6210 |
+ BsdNativeDispatcher.c \ |
| 6200 |
+ GnomeFileTypeDetector.c \ |
6211 |
+ GnomeFileTypeDetector.c \ |
|
Lines 6218-6224
Link Here
|
| 6218 |
BUILD_LIBNIO_FILES += \ |
6229 |
BUILD_LIBNIO_FILES += \ |
| 6219 |
InheritedChannel.c \ |
6230 |
InheritedChannel.c \ |
| 6220 |
NativeThread.c \ |
6231 |
NativeThread.c \ |
| 6221 |
@@ -149,6 +167,7 @@ |
6232 |
@@ -149,6 +168,7 @@ |
| 6222 |
LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \ |
6233 |
LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \ |
| 6223 |
$(JDK_OUTPUTDIR)/objs/libnet/net.lib \ |
6234 |
$(JDK_OUTPUTDIR)/objs/libnet/net.lib \ |
| 6224 |
advapi32.lib, \ |
6235 |
advapi32.lib, \ |
|
Lines 6226-6232
Link Here
|
| 6226 |
LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread -framework CoreFoundation, \ |
6237 |
LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread -framework CoreFoundation, \ |
| 6227 |
LDFLAGS_SUFFIX :=, \ |
6238 |
LDFLAGS_SUFFIX :=, \ |
| 6228 |
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
6239 |
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
| 6229 |
@@ -194,6 +213,7 @@ |
6240 |
@@ -194,6 +214,7 @@ |
| 6230 |
LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \ |
6241 |
LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \ |
| 6231 |
LDFLAGS_SUFFIX_posix := -lnio -lnet, \ |
6242 |
LDFLAGS_SUFFIX_posix := -lnio -lnet, \ |
| 6232 |
LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \ |
6243 |
LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \ |
|
Lines 6411-6417
Link Here
|
| 6411 |
+}; |
6422 |
+}; |
| 6412 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
6423 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 6413 |
+++ ./jdk/make/mapfiles/libnio/mapfile-bsd Wed Nov 05 12:14:24 2014 -0800 |
6424 |
+++ ./jdk/make/mapfiles/libnio/mapfile-bsd Wed Nov 05 12:14:24 2014 -0800 |
| 6414 |
@@ -0,0 +1,189 @@ |
6425 |
@@ -0,0 +1,195 @@ |
| 6415 |
+# |
6426 |
+# |
| 6416 |
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. |
6427 |
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. |
| 6417 |
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
6428 |
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
|
Lines 6526-6531
Link Here
|
| 6526 |
+ Java_sun_nio_ch_Net_localInetAddress; |
6537 |
+ Java_sun_nio_ch_Net_localInetAddress; |
| 6527 |
+ Java_sun_nio_ch_Net_localPort; |
6538 |
+ Java_sun_nio_ch_Net_localPort; |
| 6528 |
+ Java_sun_nio_ch_Net_poll; |
6539 |
+ Java_sun_nio_ch_Net_poll; |
|
|
6540 |
+ Java_sun_nio_ch_Net_pollconnValue; |
| 6541 |
+ Java_sun_nio_ch_Net_pollerrValue; |
| 6542 |
+ Java_sun_nio_ch_Net_pollhupValue; |
| 6543 |
+ Java_sun_nio_ch_Net_pollinValue; |
| 6544 |
+ Java_sun_nio_ch_Net_pollnvalValue; |
| 6545 |
+ Java_sun_nio_ch_Net_polloutValue; |
| 6529 |
+ Java_sun_nio_ch_Net_setIntOption0; |
6546 |
+ Java_sun_nio_ch_Net_setIntOption0; |
| 6530 |
+ Java_sun_nio_ch_Net_setInterface4; |
6547 |
+ Java_sun_nio_ch_Net_setInterface4; |
| 6531 |
+ Java_sun_nio_ch_Net_setInterface6; |
6548 |
+ Java_sun_nio_ch_Net_setInterface6; |