On Feb 21, 4:06am, gle...@eyesbeyond.com (gle...@eyesbeyond.com) wrote:
-- Subject: hg: bsd-port/jdk9/jdk: 30 new changesets
Hi Greg,
Can you please apply the following for me?
(I can't commit anymore it says readonly).
Thanks,
christos
MSG: Print the lwp id for NetBSD
diff -r 3dba26b942d3 -r 06bb9536d081 src/os/bsd/vm/os_bsd.cpp
--- a/src/os/bsd/vm/os_bsd.cpp Sun Jan 25 08:30:35 2015 -0800
+++ b/src/os/bsd/vm/os_bsd.cpp Mon Mar 02 11:58:50 2015 -0500
@@ -1856,9 +1856,15 @@
return n;
}
+#ifdef __NetBSD__
+#include <lwp.h>
+#endif
+
intx os::current_thread_id() {
#ifdef __APPLE__
return (intx)::pthread_mach_thread_np(::pthread_self());
+#elif defined(__NetBSD__)
+ return (intx)_lwp_self();
#else
return (intx)::pthread_self();
#endif
MSG: NetBSD does not yet have SCTP...
diff -r 64f2a04d0c49 make/com/sun/nio/sctp/FILES_c.gmk
--- a/make/com/sun/nio/sctp/FILES_c.gmk Sun Jan 25 08:34:16 2015 -0800
+++ b/make/com/sun/nio/sctp/FILES_c.gmk Mon Mar 02 12:30:31 2015 -0500
@@ -25,9 +25,11 @@
ifneq ($(PLATFORM),windows)
ifneq ($(PLATFORM),macosx)
+ifneq ($(OS_VENDOR),NetBSD)
FILES_c = \
SctpNet.c \
SctpChannelImpl.c \
SctpServerChannelImpl.c
endif
endif
+endif
diff -r 64f2a04d0c49 make/com/sun/nio/sctp/FILES_java.gmk
--- a/make/com/sun/nio/sctp/FILES_java.gmk Sun Jan 25 08:34:16 2015 -0800
+++ b/make/com/sun/nio/sctp/FILES_java.gmk Mon Mar 02 12:30:31 2015 -0500
@@ -50,6 +50,7 @@
ifneq ($(PLATFORM), windows)
ifneq ($(PLATFORM), macosx)
+ifneq ($(OS_VENDOR), NetBSD)
FILES_java += \
sun/nio/ch/SctpAssocChange.java \
sun/nio/ch/SctpAssociationImpl.java \
@@ -64,3 +65,4 @@
sun/nio/ch/SctpShutdown.java
endif
endif
+endif
