8150497: 32 jshell tests failed on Windows 32 bit

Reviewed-by: darcy, tbell
This commit is contained in:
Erik Joelsson 2016-02-26 06:03:12 +01:00
parent 39cfbc6593
commit 2435cd24ef
4 changed files with 4 additions and 2 deletions
jdk
make/lib
src
jdk.jdi/share/native/libdt_shmem
jdk.jdwp.agent/share/native/libdt_socket

@ -47,6 +47,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
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) \

@ -46,6 +46,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET, \
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, \

@ -338,7 +338,7 @@ shmemGetLastError(jdwpTransportEnv* env, char **msgP)
return JDWPTRANSPORT_ERROR_NONE;
}
JNIEXPORT jint JNICALL
jint JNICALL
jdwpTransport_OnLoad(JavaVM *vm, jdwpTransportCallback* cbTablePtr,
jint version, jdwpTransportEnv** result)
{

@ -784,7 +784,7 @@ socketTransport_getLastError(jdwpTransportEnv* env, char** msgP) {
return JDWPTRANSPORT_ERROR_NONE;
}
JNIEXPORT jint JNICALL
jint JNICALL
jdwpTransport_OnLoad(JavaVM *vm, jdwpTransportCallback* cbTablePtr,
jint version, jdwpTransportEnv** result)
{