archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-24 04:54:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8150497: 32 jshell tests failed on Windows 32 bit

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

1
jdk/make/lib/Lib-jdk.jdi.gmk
View file

@ -47,6 +47,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \ CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
$(LIBDT_SHMEM_CPPFLAGS), \ $(LIBDT_SHMEM_CPPFLAGS), \
LDFLAGS := $(LDFLAGS_JDKLIB), \ LDFLAGS := $(LDFLAGS_JDKLIB), \
LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
LIBS := $(JDKLIB_LIBS), \ LIBS := $(JDKLIB_LIBS), \
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
RC_FLAGS := $(RC_FLAGS) \ RC_FLAGS := $(RC_FLAGS) \

1
jdk/make/lib/Lib-jdk.jdwp.agent.gmk
View file

@ -46,6 +46,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdt_socket/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdt_socket/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
LIBS_linux := -lpthread, \ LIBS_linux := -lpthread, \
LIBS_solaris := -lnsl -lsocket -lc, \ LIBS_solaris := -lnsl -lsocket -lc, \
LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \ LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \

2
jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c
View file

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

2
jdk/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c
View file

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