aboutsummaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorrobm <none@none>2015-10-17 21:55:25 +0100
committerrobm <none@none>2015-10-17 21:55:25 +0100
commit96422b1e774ad4b4797191285f95a2a3831a49bd (patch)
tree91a7566e6950118471890fc069baf7dbebe021be /make
parent0e90878e417520626efc75280aa3781dfd49ed05 (diff)
downloadjdk8u_jdk-96422b1e774ad4b4797191285f95a2a3831a49bd.tar.gz
8133249: Occasional SIGSEGV: non thread-safe use of strerr in get LastErrorString
Reviewed-by: coffeys, igerasim
Diffstat (limited to 'make')
-rw-r--r--make/lib/CoreLibraries.gmk1
-rw-r--r--make/mapfiles/libjava/mapfile-vers2
2 files changed, 3 insertions, 0 deletions
diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk
index 758fa8e59b..066a4bf092 100644
--- a/make/lib/CoreLibraries.gmk
+++ b/make/lib/CoreLibraries.gmk
@@ -205,6 +205,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
-framework Foundation \
-framework Security -framework SystemConfiguration, \
LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \
+ -export:getErrorString \
jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \
advapi32.lib version.lib, \
diff --git a/make/mapfiles/libjava/mapfile-vers b/make/mapfiles/libjava/mapfile-vers
index c4775ea05e..618d501117 100644
--- a/make/mapfiles/libjava/mapfile-vers
+++ b/make/mapfiles/libjava/mapfile-vers
@@ -284,6 +284,8 @@ SUNWprivate_1.1 {
# ZipFile.c needs this one
throwFileNotFoundException;
+ # zip_util.c needs this
+ getErrorString;
# Java_sun_misc_VM_getState; threads.c
# Java_sun_misc_VM_threadsSuspended; threads.c