Mercurial > hg > truffle
changeset 13041:04df110c8655
Merge
author | mgronlun |
---|---|
date | Sat, 02 Nov 2013 20:56:18 +0100 |
parents | f8b56489e455 (current diff) 5b84039ca739 (diff) |
children | 53662b2f1d68 9d8b29a0548c |
files | |
diffstat | 3 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Nov 01 17:10:31 2013 +0000 +++ b/.hgtags Sat Nov 02 20:56:18 2013 +0100 @@ -389,3 +389,5 @@ 23b8db5ea31d3079f1326afde4cd5c67b1dac49c hs25-b55 4589b398ab03aba6a5da8c06ff53603488d1b8f4 jdk8-b113 82a9cdbf683e374a76f2009352de53e16bed5a91 hs25-b56 +7fd913010dbbf75260688fd2fa8964763fa49a09 jdk8-b114 +3b32d287da89a47a45d16f6d9ba5bd3cd9bf4b3e hs25-b57
--- a/make/hotspot_version Fri Nov 01 17:10:31 2013 +0000 +++ b/make/hotspot_version Sat Nov 02 20:56:18 2013 +0100 @@ -35,7 +35,7 @@ HS_MAJOR_VER=25 HS_MINOR_VER=0 -HS_BUILD_NUMBER=57 +HS_BUILD_NUMBER=58 JDK_MAJOR_VER=1 JDK_MINOR_VER=8
--- a/src/os/bsd/vm/os_bsd.cpp Fri Nov 01 17:10:31 2013 +0000 +++ b/src/os/bsd/vm/os_bsd.cpp Sat Nov 02 20:56:18 2013 +0100 @@ -4744,6 +4744,10 @@ // as libawt.so, and renamed libawt_xawt.so // bool os::is_headless_jre() { +#ifdef __APPLE__ + // We no longer build headless-only on Mac OS X + return false; +#else struct stat statbuf; char buf[MAXPATHLEN]; char libmawtpath[MAXPATHLEN]; @@ -4775,6 +4779,7 @@ if (::stat(libmawtpath, &statbuf) == 0) return false; return true; +#endif } // Get the default path to the core file