aboutsummaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorasaha <none@none>2015-10-18 23:05:57 -0700
committerasaha <none@none>2015-10-18 23:05:57 -0700
commit8f93890cae246fc09dd9d349be6a5fb89ede31e6 (patch)
tree2795fa226c8bbffad9f2cace9819e1bf4ee5878a /make
parentc1ce1742bb0d76fec06fda2196a1beb4ed55285d (diff)
parentf760378179fda3e731041ae08e1124a07adf5fb5 (diff)
downloadjdk8u_jdk-8f93890cae246fc09dd9d349be6a5fb89ede31e6.tar.gz
Merge
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