aboutsummaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorasaha <none@none>2014-11-19 12:52:56 -0800
committerasaha <none@none>2014-11-19 12:52:56 -0800
commitffb82454c665dbf367dccfc34d672ea1aa49e832 (patch)
treefa28afc319a6c98e0a6d616803d0ef79f2d04528 /make
parent9110ae022a91755303c62d0c9b82b8a924b6102f (diff)
parentfd66a76f7f7372672e7df41db32f48651c1d356f (diff)
downloadjdk8u_hotspot-ffb82454c665dbf367dccfc34d672ea1aa49e832.tar.gz
Merge
Diffstat (limited to 'make')
-rw-r--r--make/bsd/makefiles/mapfile-vers-debug3
-rw-r--r--make/bsd/makefiles/mapfile-vers-product3
-rw-r--r--make/hotspot_version2
-rw-r--r--make/linux/makefiles/mapfile-vers-debug3
-rw-r--r--make/linux/makefiles/mapfile-vers-product3
-rw-r--r--make/solaris/makefiles/mapfile-vers3
6 files changed, 16 insertions, 1 deletions
diff --git a/make/bsd/makefiles/mapfile-vers-debug b/make/bsd/makefiles/mapfile-vers-debug
index 44991d202..a94bf88dd 100644
--- a/make/bsd/makefiles/mapfile-vers-debug
+++ b/make/bsd/makefiles/mapfile-vers-debug
@@ -187,6 +187,9 @@
_JVM_IsSupportedJNIVersion
_JVM_IsThreadAlive
_JVM_IsVMGeneratedMethodIx
+ _JVM_KnownToNotExist
+ _JVM_GetResourceLookupCacheURLs
+ _JVM_GetResourceLookupCache
_JVM_LatestUserDefinedLoader
_JVM_Listen
_JVM_LoadClass0
diff --git a/make/bsd/makefiles/mapfile-vers-product b/make/bsd/makefiles/mapfile-vers-product
index ed15428ab..6be804272 100644
--- a/make/bsd/makefiles/mapfile-vers-product
+++ b/make/bsd/makefiles/mapfile-vers-product
@@ -187,6 +187,9 @@
_JVM_IsSupportedJNIVersion
_JVM_IsThreadAlive
_JVM_IsVMGeneratedMethodIx
+ _JVM_KnownToNotExist
+ _JVM_GetResourceLookupCacheURLs
+ _JVM_GetResourceLookupCache
_JVM_LatestUserDefinedLoader
_JVM_Listen
_JVM_LoadClass0
diff --git a/make/hotspot_version b/make/hotspot_version
index 5a170873f..c5bb38a07 100644
--- a/make/hotspot_version
+++ b/make/hotspot_version
@@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2015
HS_MAJOR_VER=25
HS_MINOR_VER=40
-HS_BUILD_NUMBER=17
+HS_BUILD_NUMBER=18
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
diff --git a/make/linux/makefiles/mapfile-vers-debug b/make/linux/makefiles/mapfile-vers-debug
index d20eb1eec..2da4b7d9a 100644
--- a/make/linux/makefiles/mapfile-vers-debug
+++ b/make/linux/makefiles/mapfile-vers-debug
@@ -217,6 +217,9 @@ SUNWprivate_1.1 {
JVM_RegisterSignal;
JVM_ReleaseUTF;
JVM_ResolveClass;
+ JVM_KnownToNotExist;
+ JVM_GetResourceLookupCacheURLs;
+ JVM_GetResourceLookupCache;
JVM_ResumeThread;
JVM_Send;
JVM_SendTo;
diff --git a/make/linux/makefiles/mapfile-vers-product b/make/linux/makefiles/mapfile-vers-product
index 976ea1bd9..4ec3d5bf8 100644
--- a/make/linux/makefiles/mapfile-vers-product
+++ b/make/linux/makefiles/mapfile-vers-product
@@ -217,6 +217,9 @@ SUNWprivate_1.1 {
JVM_RegisterSignal;
JVM_ReleaseUTF;
JVM_ResolveClass;
+ JVM_KnownToNotExist;
+ JVM_GetResourceLookupCacheURLs;
+ JVM_GetResourceLookupCache;
JVM_ResumeThread;
JVM_Send;
JVM_SendTo;
diff --git a/make/solaris/makefiles/mapfile-vers b/make/solaris/makefiles/mapfile-vers
index f25b06119..7ebaaaad1 100644
--- a/make/solaris/makefiles/mapfile-vers
+++ b/make/solaris/makefiles/mapfile-vers
@@ -189,6 +189,9 @@ SUNWprivate_1.1 {
JVM_IsSupportedJNIVersion;
JVM_IsThreadAlive;
JVM_IsVMGeneratedMethodIx;
+ JVM_KnownToNotExist;
+ JVM_GetResourceLookupCacheURLs;
+ JVM_GetResourceLookupCache;
JVM_LatestUserDefinedLoader;
JVM_Listen;
JVM_LoadClass0;