Merge

.hgtags

@@ -989,6 +989,52 @@ eea89df81a8e414813d921eeeeef9b6795f56698 jdk8u144-b00
 db36f4d498b1bde975700a800b5ce732941c04b7 jdk8u144-b01
 9ffa0d7ed932045a0b4ceb095fb52444eed39c1b jdk8u141-b31
 ae8cae699f62b845703c891e0e7633e2089a3ec4 jdk8u141-b32
+eea89df81a8e414813d921eeeeef9b6795f56698 jdk8u144-b00
+db36f4d498b1bde975700a800b5ce732941c04b7 jdk8u144-b01
+f5ded236c4130415259efc3234a92cc69fd7d2c5 jdk8u144-b31
+d89d36d67c9417151b470eb8254504bd2a90cc1e jdk8u144-b32
+3d505f6c7af1c522d03644eda168d77732a5e7e5 jdk8u144-b33
+0becf604dfcc98fb13a17121a43bef7fc77a9ed7 jdk8u144-b34
+2d5100bddeb80cf767485b787fc3051311e3d7b9 jdk8u151-b00
+596b584c68b73ec635347807571463580deb955f jdk8u151-b01
+1f6f436360d5cd375b806aec1c78abb8fcb4e5f6 jdk8u151-b02
+0aaeb48ae39e4fc558caf1b0c7ee504a49fec441 jdk8u151-b03
+e48302d521d59c2fe62f874f1f5d34bc46517da7 jdk8u151-b04
+507af6ef977a5d0306a8723dec66e34befc1ae81 jdk8u151-b05
+e1dc36cddcbc36b78e3d0558f87bbf459191e479 jdk8u151-b06
+e2a930243efa63b0a789e85a523e69574d53ac92 jdk8u151-b07
+158904fa31b28f1e027dc5b5a833ee673e89a84b jdk8u151-b08
+8b0169692abbf8fb7972920cd79cee7dcab959c3 jdk8u151-b09
+e352e54382928eb8d5ec70455ef251973c332ccb jdk8u151-b10
+0f06584f52ffc8627b78f4d461a3eba2b703a8f7 jdk8u151-b11
+856e341587d52114a753e48674517e7e307fceff jdk8u151-b12
+5aa8c4ca51f0e666d368a4f119ed734d3ac59d7c jdk8u122-b00
+2198ef7e1c1702b3506b95b5d8c886ad5a12bbe5 jdk8u122-b01
+58d961f47dd4ee1d516512b7744e0f1fc83d8f52 jdk8u122-b02
+b0f2296a0bc85e400e4389306219fcfd2076c9b5 jdk8u122-b03
+b0f2296a0bc85e400e4389306219fcfd2076c9b5 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+65601f3eae818a49a5246c73fb4872f5467a230c jdk8u122-b03
+fb8ea28efb05cd89e5416665232165ef0d2eef29 jdk8u122-b04
+92aff007ba7fd9b69adcf212c5280b9152f3d667 jdk8u132-b00
+8cc092b845ce5dae4fa450d23d8bb9abf509e1a0 jdk8u152-b00
+77d9c9da7188ef4d5fe9c409362d63911c4794e8 jdk8u152-b01
+60d621df6c586e325c0a2cf045c8fc68b7f979fe jdk8u152-b02
+d63e731a896c711b8e0c30ac9ae2d900d4e024f6 jdk8u152-b03
+0bd600d6d77b5b41780074bcbfa133032dadf657 jdk8u152-b04
+68758c5ab0c1ef01e89bea8a9b799714831a177f jdk8u152-b05
+98fb3d75fe567bda30a3667c58a9f83ad2acbdf3 jdk8u152-b06
+4af38194b12580bdc885ab3873d7efefa990f543 jdk8u152-b07
+285fcd09ae9994ac836a2759f6615520b2568432 jdk8u152-b08
+70f18ab733f55856cbd880fe8ba3034ff4d7265d jdk8u152-b09
+39967c81d3f3b8d20584d1400e6f4b2490f0c822 jdk8u152-b10
+cbb6bc4b8c867ea69962fd5b6c79ffe3aa9fd77d jdk8u152-b11
+cdfe7ec6f29293d7c2f64239518e8947733ad85c jdk8u152-b12
+3dd92151df1b3b7c21756f241b49607024b6fe5a jdk8u152-b13
+0a9d8db98fc5f0302da6520ba329f41baa092ae0 jdk8u152-b14
+c1bf165d3b27e864a9f8eec5bb0c1e746a972ad5 jdk8u152-b15
+98b4b0661837817cc39047000e1a7efa6015af7c jdk8u152-b16
 2d5100bddeb80cf767485b787fc3051311e3d7b9 jdk8u151-b00
 596b584c68b73ec635347807571463580deb955f jdk8u151-b01
 1f6f436360d5cd375b806aec1c78abb8fcb4e5f6 jdk8u151-b02

src/share/vm/runtime/arguments.cpp

@@ -4056,6 +4056,16 @@ jint Arguments::apply_ergo() {
 
   set_shared_spaces_flags();
 
+#if defined(SPARC)
+  // BIS instructions require 'membar' instruction regardless of the number
+  // of CPUs because in virtualized/container environments which might use only 1
+  // CPU, BIS instructions may produce incorrect results.
+
+  if (FLAG_IS_DEFAULT(AssumeMP)) {
+    FLAG_SET_DEFAULT(AssumeMP, true);
+  }
+#endif
+
   // Check the GC selections again.
   if (!check_gc_consistency()) {
     return JNI_EINVAL;