Sat, 02 Nov 2013 20:56:18 +0100
Merge
1.1 --- a/.hgtags Fri Nov 01 17:10:31 2013 +0000 1.2 +++ b/.hgtags Sat Nov 02 20:56:18 2013 +0100 1.3 @@ -389,3 +389,5 @@ 1.4 23b8db5ea31d3079f1326afde4cd5c67b1dac49c hs25-b55 1.5 4589b398ab03aba6a5da8c06ff53603488d1b8f4 jdk8-b113 1.6 82a9cdbf683e374a76f2009352de53e16bed5a91 hs25-b56 1.7 +7fd913010dbbf75260688fd2fa8964763fa49a09 jdk8-b114 1.8 +3b32d287da89a47a45d16f6d9ba5bd3cd9bf4b3e hs25-b57
2.1 --- a/make/hotspot_version Fri Nov 01 17:10:31 2013 +0000 2.2 +++ b/make/hotspot_version Sat Nov 02 20:56:18 2013 +0100 2.3 @@ -35,7 +35,7 @@ 2.4 2.5 HS_MAJOR_VER=25 2.6 HS_MINOR_VER=0 2.7 -HS_BUILD_NUMBER=57 2.8 +HS_BUILD_NUMBER=58 2.9 2.10 JDK_MAJOR_VER=1 2.11 JDK_MINOR_VER=8
3.1 --- a/src/os/bsd/vm/os_bsd.cpp Fri Nov 01 17:10:31 2013 +0000 3.2 +++ b/src/os/bsd/vm/os_bsd.cpp Sat Nov 02 20:56:18 2013 +0100 3.3 @@ -4744,6 +4744,10 @@ 3.4 // as libawt.so, and renamed libawt_xawt.so 3.5 // 3.6 bool os::is_headless_jre() { 3.7 +#ifdef __APPLE__ 3.8 + // We no longer build headless-only on Mac OS X 3.9 + return false; 3.10 +#else 3.11 struct stat statbuf; 3.12 char buf[MAXPATHLEN]; 3.13 char libmawtpath[MAXPATHLEN]; 3.14 @@ -4775,6 +4779,7 @@ 3.15 if (::stat(libmawtpath, &statbuf) == 0) return false; 3.16 3.17 return true; 3.18 +#endif 3.19 } 3.20 3.21 // Get the default path to the core file