Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/arguments.cpp @ 11006:b88209cf98c0
Merge
author | kvn |
---|---|
date | Thu, 20 Jun 2013 16:08:11 -0700 |
parents | 0abfeed51c9e 46c544b8fbfc |
children | c92b74c62d97 738e04fb1232 71180a6e5080 |
comparison
equal
deleted
inserted
replaced
10994:9f9c0a163cc5 | 11006:b88209cf98c0 |
---|---|
1891 // Method for adding checks for flag consistency. | 1891 // Method for adding checks for flag consistency. |
1892 // The intent is to warn the user of all possible conflicts, | 1892 // The intent is to warn the user of all possible conflicts, |
1893 // before returning an error. | 1893 // before returning an error. |
1894 // Note: Needs platform-dependent factoring. | 1894 // Note: Needs platform-dependent factoring. |
1895 bool status = true; | 1895 bool status = true; |
1896 | |
1897 #if ( (defined(COMPILER2) && defined(SPARC))) | |
1898 // NOTE: The call to VM_Version_init depends on the fact that VM_Version_init | |
1899 // on sparc doesn't require generation of a stub as is the case on, e.g., | |
1900 // x86. Normally, VM_Version_init must be called from init_globals in | |
1901 // init.cpp, which is called by the initial java thread *after* arguments | |
1902 // have been parsed. VM_Version_init gets called twice on sparc. | |
1903 extern void VM_Version_init(); | |
1904 VM_Version_init(); | |
1905 if (!VM_Version::has_v9()) { | |
1906 jio_fprintf(defaultStream::error_stream(), | |
1907 "V8 Machine detected, Server requires V9\n"); | |
1908 status = false; | |
1909 } | |
1910 #endif /* COMPILER2 && SPARC */ | |
1911 | 1896 |
1912 // Allow both -XX:-UseStackBanging and -XX:-UseBoundThreads in non-product | 1897 // Allow both -XX:-UseStackBanging and -XX:-UseBoundThreads in non-product |
1913 // builds so the cost of stack banging can be measured. | 1898 // builds so the cost of stack banging can be measured. |
1914 #if (defined(PRODUCT) && defined(SOLARIS)) | 1899 #if (defined(PRODUCT) && defined(SOLARIS)) |
1915 if (!UseBoundThreads && !UseStackBanging) { | 1900 if (!UseBoundThreads && !UseStackBanging) { |