changeset 13795:4c8676710c25

8150497: 32 jshell tests failed on Windows 32 bit Reviewed-by: darcy, tbell
author erikj
date Fri, 26 Feb 2016 06:03:12 +0100
parents f0bd5f763f1e
children 41e3c10db27a
files make/lib/Lib-jdk.jdi.gmk make/lib/Lib-jdk.jdwp.agent.gmk src/jdk.jdi/share/native/libdt_shmem/shmemBack.c src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c
diffstat 4 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/lib/Lib-jdk.jdi.gmk	Fri Feb 26 09:55:14 2016 +0800
+++ b/make/lib/Lib-jdk.jdi.gmk	Fri Feb 26 06:03:12 2016 +0100
@@ -47,6 +47,7 @@
       CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
           $(LIBDT_SHMEM_CPPFLAGS), \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
+      LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
       LIBS := $(JDKLIB_LIBS), \
       VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
       RC_FLAGS := $(RC_FLAGS) \
--- a/make/lib/Lib-jdk.jdwp.agent.gmk	Fri Feb 26 09:55:14 2016 +0800
+++ b/make/lib/Lib-jdk.jdwp.agent.gmk	Fri Feb 26 06:03:12 2016 +0100
@@ -46,6 +46,7 @@
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdt_socket/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
+    LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
     LIBS_linux := -lpthread, \
     LIBS_solaris := -lnsl -lsocket -lc, \
     LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \
--- a/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c	Fri Feb 26 09:55:14 2016 +0800
+++ b/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c	Fri Feb 26 06:03:12 2016 +0100
@@ -338,7 +338,7 @@
     return JDWPTRANSPORT_ERROR_NONE;
 }
 
-JNIEXPORT jint JNICALL
+jint JNICALL
 jdwpTransport_OnLoad(JavaVM *vm, jdwpTransportCallback* cbTablePtr,
                      jint version, jdwpTransportEnv** result)
 {
--- a/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c	Fri Feb 26 09:55:14 2016 +0800
+++ b/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c	Fri Feb 26 06:03:12 2016 +0100
@@ -784,7 +784,7 @@
     return JDWPTRANSPORT_ERROR_NONE;
 }
 
-JNIEXPORT jint JNICALL
+jint JNICALL
 jdwpTransport_OnLoad(JavaVM *vm, jdwpTransportCallback* cbTablePtr,
                      jint version, jdwpTransportEnv** result)
 {