8247593: Shenandoah: should not block pacing reporters

Reviewed-by: rkennke

.gitattributes

@@ -1 +0,0 @@
-*	-text

.gitignore

@@ -2,7 +2,6 @@
 /dist/
 /.idea/
 /.vscode/
-/nbproject/
 nbproject/private/
 /webrev
 /.src-rev
@@ -15,6 +14,3 @@ test/nashorn/lib
 NashornProfile.txt
 **/JTreport/**
 **/JTwork/**
-/src/utils/LogCompilation/target/
-/.project/
-/.settings/

.hgignore

@@ -0,0 +1,18 @@
+^build/
+^dist/
+^.idea/
+^.vscode/
+nbproject/private/
+^webrev
+^.src-rev$
+^.jib/
+(^|/)\.DS_Store
+(^|/)\.metadata/
+(^|/)\.recommenders/
+test/nashorn/script/external
+test/nashorn/lib
+NashornProfile.txt
+(^|/)JTreport/
+(^|/)JTwork/
+(^|/)\.git/
+^src/utils/hsdis/build/

.hgtags

@@ -0,0 +1,642 @@
+3cc80be736f24704e505ad8ddaa598dec3fa2ed3 jdk-9+181
+e2b70be325bd10dae4c06f74c46d70d480854916 jdk-9+179
+5b16a1c3ccffff2a82c88bb7ea894c4ff1c9ebde jdk-9+180
+43bf6f30fcba031ecf0cc7e511efe3a8179d0f77 jdk-9+176
+d9f6bc6ba599d0487dc18b2fbdb6c34eedf6f958 jdk-9+177
+bc9df7dd63ec76f50fafeb4acc44465044662f0a jdk-9+178
+994036e74ab805bcc09afa0646be17a725bec42f jdk-9+175
+94680c6d60ecd9ed3ffd1847706efde7eb947afc jdk-9+174
+6dd7fda42bab7ecf648cafb0a4e9b4ca11b3094f jdk-9+173
+dad6746278facbbea57dd462cb56fb743dc0a5f0 jdk-9+172
+643b5f18c2656fe91b69fea85b07b98d5fad394d jdk-9+171
+898cbe31fbdae2d25d141384fac746cc244a730c jdk-9+170
+c7efde2b60fc1ec04630be769d9ad60efb39c39c jdk-9+169
+8fd0a4569191f33c98ee90c2709174a342fefb0d jdk-9+167
+fcabc74bd44e56c7419d111d59b95669ecb33c55 jdk-9+168
+d3e973f1809606c67412361041ad197e50fe8cec jdk-9+166
+3965b747cfe1e6cbd66b8739da5a1ea6ec6985e9 jdk-9+165
+d16aebbb56d37f12e0c0b0a4fb427db65e1fb1a8 jdk-9+162
+18c41483a082e097ac2f5f983c1226ed94aa4215 jdk-9+163
+32db52c675e7d5bc413605d2e89b68b608b19be0 jdk-9+164
+fd1497902bbe3aa24b21f270ecdcb8de5f7aa9ac jdk-9+159
+6aa8be0c4e054fe8b3ab016ae00d16d680f92145 jdk-9+160
+f6883b1a5a6478437cd4181c4bd45328ab24feaf jdk-9+161
+fa3e76b477829afc4476f0b725cfaa440a6fd917 jdk-9+157
+b5015f742ba648184bb7fc547197bd33ebfde30d jdk-9+158
+1cc8dd79fd1cd13d36b385196271a29632c67c3b jdk7-b24
+bf2517e15f0c0f950e5b3143c4ca11e2df73dcc1 jdk7-b25
+5ae7db536e3fcf6be78e45b240a9058095e0ed38 jdk7-b26
+67052ac87fc927d048e62ec54ff42adb230d3f7c jdk7-b27
+18dc4ba4739a537fd146f77da51db16efce28da2 jdk7-b28
+bfe4572fd301a6fcd120373cdb2eff5d2da0c72c jdk7-b29
+bee4731164a06ddece1297ae58db24aca6a1c626 jdk7-b30
+cd8b8f500face60d1566d850857a7fccadbd383a jdk7-b31
+a9f1805e3ba9ca520cad199d522c84af5433e85a jdk7-b32
+6838c1a3296aaa3572364d2ce7d70826cee96286 jdk7-b33
+90cf935adb353bb0af4b46fb0677e841fd24c000 jdk7-b34
+6d909d5803e3a22850e6c4e5a75b888742ee7e20 jdk7-b35
+d718a441936196b93d8bc9f084933af9a4c2a350 jdk7-b36
+c2036bf76829c03b99108fffab52e20910a9be4f jdk7-b37
+a2879b2837f5a4c87e9542efe69ef138194af8ff jdk7-b38
+126f365cec6c3c2c72de934fa1c64b5f082b55b5 jdk7-b39
+3c53424bbe3bb77e01b468b4b0140deec33e11fc jdk7-b40
+3cb2a607c347934f8e7e86f840a094c28b08d9ea jdk7-b41
+caf58ffa084568990cbb3441f9ae188e36b31770 jdk7-b42
+41bd0a702bc8ec6feebd725a63e7c3227f82ab11 jdk7-b43
+5843778bda89b1d5ac8e1aa05e26930ac90b3145 jdk7-b44
+54dffad0bf066791a2793305875250c395011d5f jdk7-b45
+04b2620edc72de93671646e4720c5992c74ac8b5 jdk7-b46
+0c4657194eec95c08ba478aee9cfc3c295e41657 jdk7-b47
+1bf51a4c2627c2f0e0cbcc2cf0421bdb37f1f2b2 jdk7-b48
+6b84b04a80afe23262377c60913eebfc898f14c4 jdk7-b49
+5da0e6b9f4f18ef483c977337214b12ee0e1fc8f jdk7-b50
+a25c5ec5e40e07733d1ff9898a0abe36159288ff jdk7-b51
+7a90e89e36d103038f8667f6a7daae34ecfa1ad8 jdk7-b52
+d52186ee770dac57950536cd00ccbfdef360b04c jdk7-b53
+15096652c4d48dfb9fc0b2cb135304db94c65ba0 jdk7-b54
+c8b275d62d6b0a980c510e839b70292245863e85 jdk7-b55
+a8134c4ee2cf451cf9b5e1609f39d83ecd53acc5 jdk7-b56
+b44f05654c26fcd1f995e712992f9b07ffd7c0c6 jdk7-b57
+d60a9ce3c3eabf28f5d50ae839d18be04a551bc2 jdk7-b58
+c33e7d38c9210741dbc285507403a4b20bd802a0 jdk7-b59
+5a10e4d0b14d7beac53a7b2213ae6864afe1fd3e jdk7-b60
+dbb955b1ee59b876dd1f133952b557b48b1d7732 jdk7-b61
+6107cbff3130c747d243c25a7874cd59db5744a8 jdk7-b62
+dfd8506f74c3731bb169ce93c72612d78ee0413b jdk7-b63
+d22867c5f1b295a0a2b3b4bc8999a2676f6e20c3 jdk7-b64
+7d3bf00f3cc4f8125de1842521e7567f37dc84b8 jdk7-b65
+62109d1b9e7310f29ab51ca6f1d71b899c0ce6b0 jdk7-b66
+eb24af1404aec8aa140c4cd4d13d2839b150dd41 jdk7-b67
+bca2225b66d78c4bf4d9801f54cac7715a598650 jdk7-b68
+1b662b1ed14eb4ae31d5138a36c433b13d941dc5 jdk7-b69
+207f694795c448c17753eff1a2f50363106960c2 jdk7-b70
+c5d39b6be65cba0effb5f466ea48fe43764d0e0c jdk7-b71
+df4bcd06e1d0ab306efa5a44f24a409dc0c0c742 jdk7-b72
+ce74bd35ce948d629a356e168797f44b593b1578 jdk7-b73
+4e7661eaa211e186674f6cbefec4aef1144ac2a0 jdk7-b74
+946518568340c4e511549318f19f47f06b7f5f9b jdk7-b75
+09e0b33177af2b98a03c9ca19eedf61440bd1cf6 jdk7-b76
+1d0121b741f029dc4b828e4b36ba6fda92907dd7 jdk7-b77
+4061c66ba1af1a2e27c2c839ba887407dd3ce050 jdk7-b78
+e9c98378f6b9256c0595ef2985ca5899f0c0e274 jdk7-b79
+e6abd38682d237306d6c147c17538ec9e7f8e3a7 jdk7-b80
+dcc938ac40cc45f1ef454d76020b5db5d943001c jdk7-b81
+a30062be6d9ca1d48579826f870f85974300004e jdk7-b82
+34c8199936a1682aa8587857f44cfaf37c2b6381 jdk7-b83
+b1e55627a6980b9508854ed0c0f21d4f981b4494 jdk7-b84
+b6f633a93ae0ec4555ff4bf756f5e2150c9bdede jdk7-b85
+c94d9cc81f495d97817eba9d71b84fc45f7661a5 jdk7-b86
+b7456c473862048fa70ed8092313a4ef0a55d403 jdk7-b87
+7077b95d42f6b3942a8751bba033801ff50e5889 jdk7-b88
+44158f6d3b94c0fa020e33632532473d92d1ea96 jdk7-b89
+1d1927f9ec097b62c913921e2dfa5dbaf5dc325b jdk7-b90
+308ad8f68b8dd68e22d73dd490e110059b732422 jdk7-b91
+ff9031a745d9cc52318f2148e43ca3b07ee08098 jdk7-b92
+b5dab6a313fdff4c043250e4d9c8f66fd624d27e jdk7-b93
+8bb281f0f91582104d65d032be22522bfd2d8110 jdk7-b94
+654298d26561b76dfe3cfcffbbd7078080837300 jdk7-b95
+d260f892491e040ae385a8e6df59557a7d721abf jdk7-b96
+7e406ebed9a5968b584f3c3e6b60893b5d6d9741 jdk7-b97
+db6e660120446c407e2d908d52ec046592b21726 jdk7-b98
+c4c8a5bc54f66abc68cd185d9294042121922154 jdk7-b99
+2d6ba7a221915bdf0311acc5641c7f3875cb793e jdk7-b100
+2548ac036b8fca3326d058d758e6df8355a42469 jdk7-b101
+88db80c8e49cea352c2900f689600dc410761c1f jdk7-b102
+64770970865839b0443066370e7d476ef47e90cd jdk7-b103
+10bc903a228d3a8efdf46fb8c3fcf82a59b88bc5 jdk7-b104
+1ce7938efb03224ccc8b3cdd7803eb39e889539c jdk7-b105
+6bdae472f77205046703b685eff2ac4f7a0ecf4e jdk7-b106
+439de530aac531a360beedba6e2fe51e17292cc0 jdk7-b107
+044d31b99ef5609389fc771c422e722e5e224228 jdk7-b108
+e02b4d709e177d08d56130a4bc68061e4bbacc7d jdk7-b109
+a6442d6bc38a44152e0662688213ce4d2701f42a jdk7-b110
+69f3edf083477955b5bd2f754252c7504167d8e1 jdk7-b111
+f960f117f1623629f64203e2b09a92a8f6f14ff5 jdk7-b112
+1fee41c7ed2b3388970a756a85aa693c0de8407a jdk7-b113
+750c1ccb2f2d1ddfa95ab6c7f897fdab2f87f7e9 jdk7-b114
+9cb24917216bc68997154f6e9566c3de62acb2f4 jdk7-b115
+a4e6aa1f45ad23a6f083ed98d970b5006ea4d292 jdk7-b116
+228e73f288c543a8c34e2a54227103ae5649e6af jdk7-b117
+2e876e59938a853934aa738c811b26c452bd9fe8 jdk7-b118
+4951967a61b4dbbf514828879f57bd1a0d4b420b jdk7-b119
+8c840d3ab24f8d0f422b991638acb44b6ab1d98c jdk7-b120
+0ce0a2c3a6926677dc507839a820ab6625541e5a jdk7-b121
+6f09ea1c034f087916d2a8cf0d22be768400118f jdk7-b122
+142129d8599d1f56b29387e7f9a5fad53b6d61df jdk7-b123
+aa894c225b1a517b665ac2a58295217ea2245134 jdk7-b124
+f658ec2730fa29323c36d23c27e54c7219ef5e16 jdk7-b125
+f1df068076986679ea1105532a65529d63a89060 jdk7-b126
+f83cd8bd35c678f94e526990e03dc838d0ec2717 jdk7-b127
+7da3f5f30855dec6bf3a86529e87dee883b90c72 jdk7-b128
+6823ea7eb8eb6fab405d7edb7a5c2f690887a2fa jdk7-b129
+a36beda9b9de91231d92a2c529f21cc218fcf8d5 jdk7-b130
+d8af56da89bc0fc02a6b6ad78f51157a46d665ab jdk7-b131
+d61280d36755d1941fb487f554e8b7a6d0bca6a1 jdk7-b132
+fd444c61e7ed3d92b2a730da7c737b02191b682f jdk7-b133
+def8e16dd237a47fc067d66d4c616d7baaec6001 jdk7-b134
+f75a1efb141210901aabe00a834e0fc32bb8b337 jdk7-b135
+46acf76a533954cfd594bb88fdea79938abfbe20 jdk7-b136
+d1cf7d4ee16c341f5b8c7e7f1d68a8c412b6c693 jdk7-b137
+62b8e328f8c8c66c14b0713222116f2add473f3f jdk7-b138
+955488f34ca418f6cdab843d61c20d2c615637d9 jdk7-b139
+f4298bc3f4b6baa315643be06966f09684290068 jdk7-b140
+5d86d0c7692e8f4a58d430d68c03594e2d3403b3 jdk7-b141
+92bf0655022d4187e9b49c1400f98fb3392a4630 jdk7-b142
+4a05062d8c4dfa3edec3faf1052af28baba5adff jdk7-b143
+07a8728ad49ef6dfa469c3a8bf5ab1e9c80bed5c jdk7-b144
+8294c99e685a1f6d1d37c45cd97854cf74be771e jdk7-b145
+dca1e8a87e8f756f95b99bac8fe795750d42e1b0 jdk7-b146
+a2a589fc29543ed32919c78a1810ad93a6fcf5bc jdk7-b147
+de9223c94f9c710b3eebb599cd3586f36c8b94a9 jdk8-b01
+1b9d19620eb4606a25b1e28f86d66c8bfa867e06 jdk8-b02
+6815e85bf96d6d3875954f9777660372cd70d065 jdk8-b03
+31f5c34d78081572ad9a2401c0bb0c6b9711dd65 jdk8-b04
+c4f9ea1ecb55ff44e0dd21d2888ead308c86a3aa jdk8-b05
+429da7734bf491bccde2a752fae97e9f225896dc jdk8-b06
+bc5710332b294676661103bb20d47d2ea3ba8def jdk8-b07
+24ee504f80412770c6874836cd9e55b536427b1d jdk8-b08
+fbf3cabc9e3bb1fcf710941d777cb0400505fbe6 jdk8-b09
+f651ce87127980c58e3599daba964eba2f3b4026 jdk8-b10
+cc1f5ce8e504d350e0b0c28c5f84333f8d540132 jdk8-b11
+86db042b3385c338e17f7664447fdc7d406dd19e jdk8-b12
+4cc0ef72c812943743ef4765f1100e2fbe2b1a08 jdk8-b13
+9ffaa48dbfb0f5936c2b789867d0785faec7071d jdk8-b14
+b5060eae3b32fd9f884a09774338cd8186d7fafa jdk8-b15
+736a63b854f321c7824b7e47890135f80aee05e3 jdk8-b16
+f0eccb2946986fb9626efde7d8ed9c8192623f5c jdk8-b17
+885050364691ac1ac978305c63f3368a197fb04d jdk8-b18
+0ff7113a0882ec82d642cb9f0297b4e497807ced jdk8-b19
+6561530ea757c3f3a6fb171c9cc7b3885cdeca85 jdk8-b20
+b3a426170188f52981cf4573a2f14d487fddab0d jdk8-b21
+e8f03541af27e38aafb619b96863e17f65ffe53b jdk8-b22
+498124337041ad53cbaa7eb110f3d7acd6d4eac4 jdk8-b23
+7d3720d8c595d1519c31e9ff7366203fc2c61350 jdk8-b24
+0071a6d64113a35ba345bb1580c256de5ce17d3e jdk8-b25
+6c805d8ed4e5449ea5e4d158c7bdbd7b0b70efd1 jdk8-b26
+c51754cddc037b9609e202b9ed38363d8683e7a8 jdk8-b27
+16ba58282d117247f480aae7a79b88141ade52a3 jdk8-b28
+e070119aa56ee4dc5506c19d2c4d2eecab8ad429 jdk8-b29
+23da7804aca0c9c4e6e86532a1453125a76d95ee jdk8-b30
+bac81e9f7d57b75fba5ab31b571f3fe0dc08af69 jdk8-b31
+2c5208ccb863db936eab523f49450b3fcd230348 jdk8-b32
+a6e6d42203e6d35f9e8b31eac25b0021b4dd58ad jdk8-b33
+0ae89825c75c9492e44efb3aca3d9ee3d8a209df jdk8-b34
+f151d5833912a82cd4f203944da0305c3be83ecc jdk8-b35
+98ce9816ae089c959ba1e70fba98423a31c4e9fa jdk8-b36
+b3a91113026c99b0da010d41055719ab0d8938f0 jdk8-b37
+4cc5610a6dd6227da766ebf9742eb11ff5ded6c0 jdk8-b38
+35a5397278779a2f8f3013f81586dc8f30cb149d jdk8-b39
+6e4e654931b976304bf6e7b4d0d6db8f75bac5d9 jdk8-b40
+c029c972396cea042a0dc67c0f7ccf2fe68007d4 jdk8-b41
+5c5a64ec0839df5affe9394b99ff338c363acbca jdk8-b42
+69d8a827cdf9236be9694a46d75c710d71dac7d7 jdk8-b43
+7e981cb0ad6a194f1fa859f9ad47586db461f269 jdk8-b44
+9b19b2302c28f4da6d4078f66234abecfed5688a jdk8-b45
+600c9a1feb01633cbcf2341a43d1d21e6497ecd0 jdk8-b46
+b820143a6f1ce993c6e6f31db4d64de990f42654 jdk8-b47
+086271e35b0a419b38e8bda9bebd70693811df0a jdk8-b48
+cecd7026f30cbd83b0601925a7a5e059aec98138 jdk8-b49
+38fe5ab028908cf64dd73a43336ba3211577bfc3 jdk8-b50
+382651d28f2502d371eca751962232c0e535e57a jdk8-b51
+b67041a6cb508da18d2f5c7687e6a31e08bea4fc jdk8-b52
+c7aa5cca1c01689a7b1a92411daf83684af05a33 jdk8-b53
+7c6aa31ff1b2ae48c1c686ebe1aadf0c3da5be15 jdk8-b54
+319f583f66db47395fa86127dd3ddb729eb7c64f jdk8-b55
+ffe6bce5a521be40146af2ac03c509b7bac30595 jdk8-b56
+2c21c080b11b93efb3851e39e1363e45da805943 jdk8-b57
+479d3302a26d7607ba271d66973e59ebf58825b6 jdk8-b58
+3bd874584fc01aae92fbc8827e2bd04d8b6ace04 jdk8-b59
+5e3adc681779037a2d33b7be6f75680619085492 jdk8-b60
+cdaa6122185f9bf512dcd6600f56bfccc4824e8c jdk8-b61
+8d9d430b4244b95f5cf1ebe719f834a1ac5d6cd5 jdk8-b62
+21ee1dd7b809639284900a128b9b656a592ebc7a jdk8-b63
+70fa4b11f26522e69b51fd652215f60ce350bac3 jdk8-b64
+a2cf4d4a484378caea2e827ed604b2bbae58bdba jdk8-b65
+17820b958ae84f7c1cc6719319c8e2232f7a4f1d jdk8-b66
+76cc9bd3ece407d3a15d3bea537b57927973c5e7 jdk8-b67
+cb33628d4e8f11e879c371959e5948b66a53376f jdk8-b68
+adb5171c554e14cd86f618b5584f6e3d693d5889 jdk8-b69
+0d625373c69e2ad6f546fd88ab50c6c9aad01271 jdk8-b70
+a41ada2ed4ef735449531c6ebe6cec593d890a1c jdk8-b71
+6725b3961f987cf40f446d1c11cd324a3bec545f jdk8-b72
+fe94b40ffd9390f6cffcdf51c0389b0e6dde0c13 jdk8-b73
+f627eff819628822a0777af8062244352f2a29cf jdk8-b74
+f1478a6d25fddd311a84dcbfac50824cc1858bdd jdk8-b75
+f407160c280d1c5b00d314c535441ac26f195fee jdk8-b76
+d17eb2e13e362085e866d46235314c50cc4661cc jdk8-b77
+6d3dcd34b5b962ea1ef9eed0dafdee9e812401bc jdk8-b78
+a1313a8d90d17d363a3b2a645dc4030ec204b168 jdk8-b79
+3fa21fbf9be7e6b482af43aacb6a09acfa30bdb6 jdk8-b80
+e41d716405b209d3eddef8bd4240cec2bd34dcca jdk8-b81
+5e8c55025644730385a6f8fa029ecdb2d2c98a07 jdk8-b82
+bcebd3fdefc91abb9d7fa0c5af6211b3f8720da6 jdk8-b83
+d7ad0dfaa41151bd3a9ae46725b0aec3730a9cd0 jdk8-b84
+1872c12529090e1c1dbf567f02ad7ae6231b8f0c jdk8-b85
+da9a4c9312816451884aa6db6f18be51a07bff13 jdk8-b86
+5ebf6c63714de2c9dcf831074086d31daec819df jdk8-b87
+e517701a4d0e25ae9c7945bca6e1762a8c5d8aa6 jdk8-b88
+4dec41b3c5e3bb616f0c6f15830d940905aa5d16 jdk8-b89
+f09ab0c416185e3cba371e81bcb6a16060c90f44 jdk8-b90
+80b6c3172dc2cfceb022411292d290a967f9c728 jdk8-b91
+2fd6acba737b01e705e1f7c33588c922a3787f13 jdk8-b92
+b72ae39e1329fefae50d4690db4fde43f3841a95 jdk8-b93
+0d804e3b955dce406af6a79ac1cc35c696aff7fb jdk8-b94
+49fe9c8049132647ad38837a877dd473e6c9b0e5 jdk8-b95
+ea73f01b9053e7165e7ba80f242bafecbc6af712 jdk8-b96
+0a85476a0b9cb876d5666d45097dac68bef3fce1 jdk8-b97
+711eb4aa87de68de78250e0549980936bab53d54 jdk8-b98
+2d3875b0d18b3ad1c2bebf385a697e309e4005a4 jdk8-b99
+3d34036aae4ea90b2ca59712d5a69db3221f0875 jdk8-b100
+edb01c460d4cab21ff0ff13512df7b746efaa0e7 jdk8-b101
+bbe43d712fe08e650808d774861b256ccb34e500 jdk8-b102
+30a1d677a20c6a95f98043d8f20ce570304e3818 jdk8-b103
+b5ed503c26ad38869c247c5e32debec217fd056b jdk8-b104
+589f4fdc584e373a47cde0162e9eceec9165c381 jdk8-b105
+514b0b69fb9683ef52062fd962a3e0644431f64d jdk8-b106
+892889f445755790ae90e61775bfb59ddc6182b5 jdk8-b107
+74049f7a28b48c14910106a75d9f2504169c352e jdk8-b108
+af9a674e12a16da1a4bd53e4990ddb1121a21ef1 jdk8-b109
+b5d2bf482a3ea1cca08c994512804ffbc73de0a1 jdk8-b110
+b9a0f6c693f347a6f4b9bb994957f4eaa05bdedd jdk8-b111
+ad67c34f79c28a8e755f4a49f313868619d6702c jdk8-b112
+4a4dbcf7cb7d3e1a81beaa3b11cd909f69ebc79a jdk8-b113
+dfa34ab293faad9b543a24646dbb381bc3ab5586 jdk8-b114
+3dd9732b17034f45d111996d1d50287b05a3998c jdk8-b115
+aaf663f591aba43ec942263b15ba62759ce26a1e jdk8-b116
+31b0e03fcad73d7886b306b4c2e57ad270780d0d jdk8-b117
+f5b521ade7a35cea18df78ee86322207729f5611 jdk8-b118
+87b743b2263cc53955266411b7797b365a0fb050 jdk8-b119
+a1ee9743f4ee165eae59389a020f2552f895dac8 jdk8-b120
+13b877757b0b1c0d5813298df85364f41d7ba6fe jdk9-b00
+f130ca87de6637acae7d99fcd7a8573eea1cbaed jdk9-b01
+b32e2219736e42baaf45daf0ad67ed34f6033799 jdk9-b02
+7f655f31f9bcee618cf832f08176ad8c1ed3fdd3 jdk9-b03
+099891b1d86f3719e116ac717ffdafc90d037fb7 jdk9-b04
+dd311791ad6895a3989020dd6c6c46db87972ab8 jdk9-b05
+85dbdc227c5e11429b4fc4a8ba763f50107edd6e jdk9-b06
+c826d05f1fb0773f6a28caa763307dd30d90d36e jdk9-b07
+b47e021195757f8f45582124ea7cad48ccf5f872 jdk9-b08
+efe7dbc6088691757404e0c8745f894e3ca9c022 jdk9-b09
+8c0bdeecd7c0f9ce3f3762a51991f755cb3a972c jdk9-b10
+0809c9a4d36e6291f1c4384604c4bbf29e975722 jdk9-b11
+0d1f816217dce5e72187f167cc1816080cbeb453 jdk9-b12
+1a30593dcb9802faec3b6edb24d86ca088594e4e jdk9-b13
+97932f6ad950ae5a73a9da5c96e6e58503ff646b jdk9-b14
+74eb0778e4f2dbff6628e718378449fba27c4265 jdk9-b15
+4a09f5d30be844ac6f714bdb0f63d8c3c08b9a98 jdk9-b16
+410bccbded9e9cce80f1e13ad221e37ae97a3986 jdk9-b17
+c5495e25c7258ab5f96a1ae14610887d76d2be63 jdk9-b18
+2dcf544eb7ed5ac6a3f7813a32e33acea7442405 jdk9-b19
+89731ae72a761afdf4262e8b9513f302f6563f89 jdk9-b20
+28dd0c7beb3cad9cf95f17b4b5ad87eb447a4084 jdk9-b21
+9678e0db8ff6ed845d4c2ee4a3baf7f386a777e5 jdk9-b22
+39cfdc2dcaf3f195c55398e4e677ab053b07e3d2 jdk9-b23
+d9ce05f36ffec3e5e8af62a92455c1c66a63c320 jdk9-b24
+13a5c76976fe48e55c9727c25fae2d2ce7c05da0 jdk9-b25
+cd6f4557e7fea5799ff3762ed7a80a743e75d5fd jdk9-b26
+d06a6d3c66c08293b2a9650f3cc01fd55c620e65 jdk9-b27
+f4269e8f454eb77763ecee228a88ae102a9aef6e jdk9-b28
+c36c0092693707a8255561433647e8c3cd724ccd jdk9-b29
+b2287cac7813c70ed7f679d9a46fe774bd4005f8 jdk9-b30
+9d0e6639a4d71b63507dd94b1a028e963b27e798 jdk9-b31
+1b1ec4291abc0ba6da7bf79b754f08dd759a4a0c jdk9-b32
+f0c5e4b732da823bdaa4184133675f384e7cd68d jdk9-b33
+9618201c5df28a460631577fad1f61e96f775c34 jdk9-b34
+a137992d750c72f6f944f341aa19b0d0d96afe0c jdk9-b35
+41df50e7303daf73c0d661ef601c4fe250915de5 jdk9-b36
+b409bc51bc23cfd51f2bd04ea919ec83535af9d0 jdk9-b37
+948cceef81ba4cb34bc233e7cc5952951ff04e88 jdk9-b38
+4e7c4d692e934cb9023af8201e7c2b510e9c4ee1 jdk9-b39
+82f4cb44b2d7af2352f48568a64b7b6a5ae960cd jdk9-b40
+9fffb959eb4197ff806e4ac12244761815b4deee jdk9-b41
+3107be2ba9c6e208a0b86bc7100a141abbc5b5fb jdk9-b42
+6494b13f88a867026ee316b444d9a4fa589dd6bd jdk9-b43
+abbfccd659b91a7bb815d5e36fed635dcdd40f31 jdk9-b44
+bfc24ae2b900187585079bb11e66e459d1e525fe jdk9-b45
+722378bc599e38d9a1dd484de30f10dfd7b21438 jdk9-b46
+8327024a99559982b848e9c2191da9c0bf8838fd jdk9-b47
+b2f9702efbe95527ea3a991474fda23987ff1c5c jdk9-b48
+5b8db585a33c3cc48e70e688ceee57dd9271dc5d jdk9-b49
+1550b2f6b63d1411fa84dc7bbc6f04809aedb43f jdk9-b50
+6efe265424e3f1ea596408a1f71baf2de316c772 jdk9-b51
+d6224d6021459ac8b3832e822f5acc849fa944af jdk9-b52
+874d76e4699dfcd61ae1826c9fe0ddc1610ad598 jdk9-b53
+82cd31c5d6ca8d4c1653f4eb1c09eb2d9a3b2813 jdk9-b54
+c97e2d1bad9708d379793ba2a4c848eda14c741e jdk9-b55
+47544495db2d3d2edf0f85862d8715592fdb919f jdk9-b56
+ddb95d8f169b09544cc17e72a6baaff2400092f5 jdk9-b57
+f40752db7773ca0c737f2ad88371e35c57fdfed7 jdk9-b58
+da950f343762a856d69751570a4c07cfa68a415b jdk9-b59
+38f98cb6b33562a926ec3b79c7b34128be37647d jdk9-b60
+ac3f5a39d4ff14d70c365e12cf5ec8f2abd52a04 jdk9-b61
+e7dbbef69d12b6a74dfad331b7188e7f893e8d29 jdk9-b62
+989253a902c34dcb7564695161c9200a5fbb7412 jdk9-b63
+8ffdeabc7c2b9a8280bf46cae026ac46b4d31c26 jdk9-b64
+4915246064b2f89d5f00c96e758686b7fdad36a6 jdk9-b65
+ff3fc75f3214ad7e03595be1b0d0f38d887b6f0e jdk9-b66
+56166ce66037952fa21e9f680b31bf8eb47312c0 jdk9-b67
+5b500c93ce4822d47061cd518ff3f72d9d8cb5b5 jdk9-b68
+d69c968463f0ae5d0b45de3fc14fe65171b23948 jdk9-b69
+43d0179ee9de3bfffae3417f09e07eb6d8efc963 jdk9-b70
+f66c185284727f6e6ffd27e9c45ed2dd9da0a691 jdk9-b71
+61d2d0629b6dbf4c091dc86151ade1b3ef34fffe jdk9-b72
+9b3a9d72f07b40c648de79961679f42283af1bb5 jdk9-b73
+7c577fda1855d03c04546694d514678f596508c9 jdk9-b74
+f55df5cfe11c97e4b58998b76f5bd00a73cde12d jdk9-b75
+eeea9adfd1e3d075ef82148c00a4847a1aab4d26 jdk9-b76
+c25e882cee9622ec75c4e9d60633539a2f0a8809 jdk9-b77
+c8753d0be1778944dc512ec86a459941ea1ad2c3 jdk9-b78
+3966bd3b8167419aa05c6718a4af1cf54b1e3c58 jdk9-b79
+3c9f5bd909ae7187f24622ee4b69f8a5756a9271 jdk9-b80
+2050b3a0aadcb0e024bf798197421d58e54ec8bf jdk9-b81
+6521875cb63e1d0121b30af56ebbc36db078c4c6 jdk9-b82
+f61a63b7d1e52e307abc0bfc751203155d362ec4 jdk9-b83
+51b2db2fa04c16d767b66113dbf08c5349ce382a jdk9-b84
+8392405ab038b22e69a3728e17dbdd9e3d3a22ed jdk9-b85
+7db0663a5e968059fa7c772172187ebd60b6492d jdk9-b86
+1a52a30674cd28c24d4d388150336121f2e9ddf9 jdk9-b87
+16b4968f9bb8f34371b42c0ba483d76e91ba84d8 jdk9-b88
+4a0312f2894bcbe1fd20266c8fda8d983bd2fcf6 jdk9-b89
+d131f4b8433a79408f935eff9bf92a0664229b60 jdk9-b90
+8077fd2f055d31e50b46fcf62d9c035bc385a215 jdk9-b91
+f242d4332f563648426a1b0fa02d8741beba19ef jdk9-b92
+09206c6513b300e1ac8541f3be012e1a49312104 jdk9-b93
+25a2cab05cfbe6034b71d9e72d64c65b0572ce63 jdk9-b94
+5ac6287ec71aafe021cc839d8bc828108d23aaba jdk-9+95
+139f19d70350238e15e107945cea75082b6380b3 jdk-9+96
+4edcff1b9a8875eb6380a2165dfec599e8e3f7c0 jdk-9+97
+d00ad2d9049ac60815f70bff445e95df85648bd2 jdk-9+98
+f9bcdce2df26678c3fe468130b535c0342c69b89 jdk-9+99
+4379223f8806626852c46c52d4e7a27a584b406e jdk-9+100
+80f67512daa15cf37b4825c1c62a675d524d7c49 jdk-9+101
+2dc4c11fe48831854916d53c3913bdb7d49023ea jdk-9+102
+4a652e4ca9523422149958673033e0ac740d5e1e jdk-9+103
+086c682bd8c5f195c324f61e2c61fbcd0226d63b jdk-9+104
+db483b34fa7148d257a429acddbde9c13687dcae jdk-9+105
+6c644cca3f3fc2763e2ff7d669849a75d34543ba jdk-9+106
+1c076468bf7dad5b8f2ee5dcf66e2279caa3e208 jdk-9+107
+257b579d813201682931d6b42f0445ffe5b4210d jdk-9+108
+c870cb782aca71093d2584376f27f0cfbfec0e3a jdk-9+109
+4a95f4b1bd8bfce85dc02a593896749feab96c34 jdk-9+110
+a6614ff7bf09da74be1d0ef3d9755090d244697a jdk-9+111
+7359994942f8d8e723b584d66a3a92c2e9e95e5c jdk-9+112
+6072af7a98be3922f26bdce71b53bb3646cb2ac9 jdk-9+113
+c84d0cce090e161d736de69e941830adf8c2f87a jdk-9+114
+8d78fb40648dd221ce4ef19f9d5aa41ee1a3a884 jdk-9+115
+84aba7335005a3a47751dcf1f37935f97df9f99a jdk-9+116
+82b8d12a553f5617737c238cec060281d52e351c jdk-9+117
+7c04fcb12bd4a31570a238e663fa846dfa5ec3b8 jdk-9+118
+caf97b37ebec84288c112d21d3a60cb628cba1e8 jdk-9+119
+9330543436402b8f3bd070524846a464d8143557 jdk-9+120
+18e5cdecb37a2f03ba74f6c8f022858bcbaacf56 jdk-9+121
+7693aa00e131493ceb42b93305e2f014c9922a3b jdk-9+122
+d53037a90c441cb528dc41c30827985de0e67c62 jdk-9+123
+2a5697a98620c4f40e4a1a71478464399b8878de jdk-9+124
+3aa52182b3ad7c5b3a61cf05a59dd07e4c5884e5 jdk-9+125
+03e7b2c5ae345be3caf981d76ceb3efe5ff447f8 jdk-9+126
+8e45018bde9de4ad15b972ae62874bba52dba2d5 jdk-9+127
+5bf88dce615f6804f9e101a96ffa7c9dfb4fbbbe jdk-9+128
+e8373543a3f0f60589b7d72b1f9b172721124caf jdk-9+129
+e613affb88d178dc7c589f1679db113d589bddb4 jdk-9+130
+4d2a15091124488080d65848b704e25599b2aaeb jdk-9+131
+2e83d21d78cd9c1d52e6cd2599e9c8aa36ea1f52 jdk-9+132
+e17429a7e843c4a4ed3651458d0f950970edcbcc jdk-9+133
+a71210c0d9800eb6925b61ecd6198abd554f90ee jdk-9+134
+e384420383a5b79fa0012ebcb25d8f83cff7f777 jdk-9+135
+1b4b5d01aa11edf24b6fadbe3d2f3e411e3b02cd jdk-9+136
+9cb87c88ed851c0575b8ead753ea238ed5b544e9 jdk-9+137
+d273dfe9a126d3bffe92072547fef2cd1361b0eb jdk-9+138
+65477538bec32963dc41153d89c4417eb46c45fc jdk-9+139
+0875007901f7d364a08220b052f0c81003e9c8c5 jdk-9+140
+9aadd2163b568d76f8969ad2fb404a63733da359 jdk-9+141
+df0e03e3ca0ed1307793017dfc1a054c8726131c jdk-9+142
+d62173b931bf5b6bffc6e80a9060bb2e8b8efc75 jdk-9+143
+31f5023200d42185b70c4c00ba5672391e4642d0 jdk-9+144
+3ee4e7827413fa5c5c4fca58597b0ad89e921bfb jdk-9+145
+581331db696a62dd411926ba7fd437252252a71d jdk-9+146
+f4e854a77aa38749bd90f722b06974a56e7233d5 jdk-9+147
+5c71ea43933b6c7e8a85eb1a4eb2213011b95d82 jdk-9+148
+cf139f925da04c8bd7efd33270a0315d72b338d3 jdk-9+149
+17469f16fbb406ec9f0dd262ce776ab6efbc38f1 jdk-9+150
+37b95df0042ae0687324e1f7dc4a2519e230e704 jdk-9+151
+ab2c8b03c3284fcbdd157551a66f807e3a182d9b jdk-9+152
+d7034ff7f8e257e81c9f95c7785dd4eaaa3c2afc jdk-9+153
+8c70d170e62c0c58b5bc3ba666bd140399b98c9c jdk-10+0
+45b751afd11e6c05991cf4913c5a0ac3304fcc4e jdk-9+154
+f4aff695ffe05cfdb69d8af25a4ddc6a029754ea jdk-9+155
+06bce0388880b5ff8e040e4a9d72a3ea11dac321 jdk-9+156
+74116beae88a8f17a80301aa6c83865c82f10ece jdk-10+1
+4a79ad46e578112fce68f1af9dd931025cc235cb jdk-10+2
+d1cab6c7e608479be4ebfad48a25b0ed48600f62 jdk-10+3
+02253db2ace1422f576f58502fc7831ead77424b jdk-10+4
+f113ce12fe24fbd24acf02711372d9f1e1c12426 jdk-10+5
+1407b19a2ddf6baae162f5a1a5b96af473f4d7d1 jdk-10+6
+30e75693ae99fd8e47fd2f5116527aff1b59aff9 jdk-10+7
+c42dc7b58b4d4301ea676a76326fd9bbd403d595 jdk-10+8
+aa5b01f5e5620438fd39efdb2e2f6365a2c7d898 jdk-10+9
+b0f2b8ff25a2209b2c807785d75f20e5086bbfc2 jdk-10+10
+036dbf8b381798e5d31065109714d04d97bf98a4 jdk-10+11
+e6d70017f5b9adbb2ec82d826973d0251800a3c3 jdk-10+12
+9927a9f16738e240ab7014f0118f41e314ef8f99 jdk-10+13
+9ef5029b247b4d940080417a287440bbdbab995b jdk-10+14
+878e216039322cb3f0ecbd0944642a2b4e2593f3 jdk-10+15
+4bbea012e5676e8025ade2bcfab4d6581e6e9f4b jdk-10+16
+7db699468b4f84abbcc01647e5a964409737411a jdk-10+17
+3739654290616e533fc6f51bf9ad69ed47a6abba jdk-10+18
+14df107500cc3b8ab238c3e4ad2c74e12bfe6067 jdk-10+19
+4586bc5d28d13d3147b993e6237eaf29a7073bbb jdk-10+20
+a85884d55ce32799f5c7382b7ea4839052b362a2 jdk-10+21
+e5357aa85dadacc6562175ff74714fecfb4470cf jdk-10+22
+22850b3a55240253841b9a425ad60a7fcdb22d47 jdk-10+23
+3b201865d5c1f244f555cad58da599c9261286d8 jdk-10+24
+8eb5e3ccee560c28ac9b1df2670adac2b3d36fad jdk-10+25
+1129253d3bc728a2963ba411ab9dd1adf358fb6b jdk-10+26
+b87d7b5d5dedc1185e5929470f945b7378cdb3ad jdk-10+27
+92f08900cb3c0d694e5c529a676c1c9e5909193f jdk-10+28
+a6e591e12f122768f675428e1e5a838fd0e9c7ec jdk-10+29
+8fee80b92e65149f7414250fd5e34b6f35d417b4 jdk-10+30
+e6278add9ff28fab70fe1cc4c1d65f7363dc9445 jdk-10+31
+a2008587c13fa05fa2dbfcb09fe987576fbedfd1 jdk-10+32
+bbd692ad4fa300ecca7939ffbe3b1d5e52a28cc6 jdk-10+33
+89deac44e51517841491ba86ff44aa82a5ca96b3 jdk-10+34
+d8c634b016c628622c9abbdc6bf50509e5dedbec jdk-10+35
+0ee20aad71c4f33c426372b4c8bcc1235ce2ec08 jdk-11+0
+959f2f7cbaa6d2ee45d50029744efb219721576c jdk-10+36
+4f830b447edf04fb4a52151a5ad44d9bb60723cd jdk-10+37
+e569e83139fdfbecfeb3cd9014d560917787f158 jdk-10+38
+5b834ec962366e00d4445352a999a3ac14e26f64 jdk-10+39
+860326263d1f6a83996d7da0f4c66806ae4aa1eb jdk-10+40
+3eae36c6baa5f916a3024cf1513e22357e00185d jdk-10+41
+4b62b815b4f49970b91a952929cf50115c263cb3 jdk-10+42
+107413b070b92c88bde6230ceb4a19b579781068 jdk-10+43
+dfa46cfe56346884a61efdc30dc50f7505d66761 jdk-11+1
+03ae177c26b016353e5ea1cab6ffd051dfa086ca jdk-11+2
+663f20fc51091bd7f95d18448850ba091207b7bd jdk-10+44
+4f96cf952e71cb8a127334494faf28880c26181b jdk-10+45
+1fd4d6068f54561cfc67d54fc9ca84af7212c4f8 jdk-11+3
+e59941f7247d451fa7df9eaef3fce0f492f8420c jdk-11+4
+d5c43e9f08fb9a7c74aae0d48daf17f2ad2afaef jdk-11+5
+3acb379b86725c47e7f33358cb22efa8752ae532 jdk-11+6
+f7363de371c9a1f668bd0a01b7df3d1ddb9cc58b jdk-11+7
+755e1b55a4dff510f9639cdb5c5e82549a7e09b3 jdk-11+8
+0c3e252cea44f06aef570ef464950ab97c669970 jdk-11+9
+6fa770f9f8ab296e1ce255ec17ccf6d4e1051886 jdk-10+46
+69d7398038c54774d9395b6810e0cca335edc02c jdk-11+10
+e1e60f75cd39312a7f59d2a4f91d624e5aecc95e jdk-11+11
+3ab6ba9f94a9045a526d645af26c933235371d6f jdk-11+12
+758deedaae8406ae60147486107a54e9864aa7b0 jdk-11+13
+3595bd343b65f8c37818ebe6a4c343ddeb1a5f88 jdk-11+14
+a11c1cb542bbd1671d25b85efe7d09b983c48525 jdk-11+15
+02934b0d661b82b7fe1052a04998d2091352e08d jdk-11+16
+64e4b1686141e57a681936a8283983341484676e jdk-11+17
+e1b3def126240d5433902f3cb0e91a4c27f6db50 jdk-11+18
+36ca515343e00b021dcfc902e986d26ec994a2e5 jdk-11+19
+95aad0c785e497f1bade3955c4e4a677b629fa9d jdk-12+0
+9816d7cc655e53ba081f938b656e31971b8f097a jdk-11+20
+14708e1acdc3974f4539027cbbcfa6d69f83cf51 jdk-11+21
+00b16d0457e43d23f6ca5ade6b243edce62750a0 jdk-12+1
+9937ef7499dcd7673714517fd5e450410c14ba4e jdk-11+22
+69b438908512d3dfef5852c6a843a5778333a309 jdk-12+2
+1edcf36fe15f79d6228d1a63eb680878e2386480 jdk-11+23
+990db216e7199b2ba9989d8fa20b657e0ca7d969 jdk-12+3
+ea900a7dc7d77dee30865c60eabd87fc24b1037c jdk-11+24
+499b873761d8e8a1cc4aa649daf04cbe98cbce77 jdk-12+4
+331888ea4a788df801b1edf8836646cd25fc758b jdk-11+25
+f8696e0ab9b795030429fc3374ec03e378fd9ed7 jdk-12+5
+945ba9278a272a5477ffb1b3ea1b04174fed8036 jdk-11+26
+7939b3c4e4088bf4f70ec5bbd8030393b653372f jdk-12+6
+9d7d74c6f2cbe522e39fa22dc557fdd3f79b32ad jdk-11+27
+ef57958c7c511162da8d9a75f0b977f0f7ac464e jdk-12+7
+76072a077ee1d815152d45d1692c4b36c53c5c49 jdk-11+28
+492b366f8e5784cc4927c2c98f9b8a3f16c067eb jdk-12+8
+31b159f30fb281016c5f0c103552809aeda84063 jdk-12+9
+8f594f75e0547d4ca16649cb3501659e3155e81b jdk-12+10
+f0f5d23449d31f1b3580c8a73313918cafeaefd7 jdk-12+11
+15094d12a632f452a2064318a4e416d0c7a9ce0c jdk-12+12
+511a9946f83e3e3c7b9dbe1840367063fb39b4e1 jdk-12+13
+8897e41b327c0a5601c6ba2bba5d07f15a3ffc91 jdk-12+14
+8897e41b327c0a5601c6ba2bba5d07f15a3ffc91 jdk-12+14
+6f04692c7d5137ee34a6bd94c0c8a6c9219cb127 jdk-12+14
+f8626bcc169813a4b2a15880386b952719d1d6d1 jdk-12+15
+199658d1ef860cdc17055b4fd3e94b057f292fe9 jdk-12+16
+eefa65e142af305923d2adcd596fab9c639723a1 jdk-12+17
+e38473506688e0995e701fc7f77d5a91b438ef93 jdk-12+18
+dc1f9dec2018a37fedba47d8a2aedef99faaec64 jdk-12+19
+40098289d5804c3b5e7074bc75501a81e70d9b0d jdk-12+20
+f8fb0c86f2b3d24294d39c5685a628e1beb14ba7 jdk-12+21
+732bec44c89e8b93a38296bf690f97b7230c5b6d jdk-12+22
+eef755718cb24813031a842bbfc716a6cea18e9a jdk-12+23
+cc4098b3bc10d1c390384289025fea7b0d4b9e93 jdk-13+0
+7d4397b43fa305806160785a4c7210600d59581a jdk-12+24
+11033c4ada542f9c9a873314b6ecf60af19e8256 jdk-13+1
+7496df94b3b79f3da53925d2d137317715f11d97 jdk-12+25
+50677f43ac3df9a8684222b8893543c60f3aa0bd jdk-13+2
+de9fd809bb475401aad188eab2264226788aad81 jdk-12+26
+642346a11059b9f283110dc301a24ed43b76a94e jdk-13+3
+f15d443f97318e9b40e6f451e327ff69ed4ec361 jdk-12+27
+a47b8125b7cc9ef59619745c163975fe935b57ed jdk-13+4
+659b004b6a1bd8c31e766cbdf328d8f8473fd4d7 jdk-12+28
+e3ed960609927b5fdfd0a797159835cd83a81a31 jdk-13+5
+44f41693631f9b5ac78ff4d2bfabd6734fe46df2 jdk-12+29
+b5f05fe4a6f8b3996a000c20078b356d991ca8ec jdk-13+6
+6c377af36a5c4203f16aed8a5e4c2ecc08fcd8bd jdk-12+30
+021917019cda1c0c5853255322274f37693a2431 jdk-13+7
+b5f7bb57de2f797be34f6c75d45c3245ad37ab97 jdk-12+31
+a535ba736cabc6886acdff36de3a096c46e5ddc5 jdk-13+8
+4ce47bc1fb92cf94c6e3d1f49d582f02dcb851ab jdk-12+32
+c081f3ea6b9300265a4a34e38f970b1e3ddaae9f jdk-13+9
+b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1 jdk-12+33
+8e069f7b4fabfe05d9f500783e6d56cb0196d25c jdk-13+10
+21ea4076a275a0f498afa517e9ee1b94a9cf0255 jdk-13+11
+1d7aec80147a6d92b101a76aef92f3ddc88bedf4 jdk-13+12
+b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1 jdk-12-ga
+83cace4142c8563b6a921787db02388e1bc48d01 jdk-13+13
+46cf212cdccaf4fb064d913b12004007d3322b67 jdk-13+14
+f855ec13aa2501ae184c8b3e0626a8cec9966116 jdk-13+15
+9d0ae9508d5337b0dc7cc4684be42888c4023755 jdk-13+16
+93b702d2a0cb9e32160208f6700aede1f8492773 jdk-13+17
+bebb82ef3434a25f8142edafec20165f07ac562d jdk-13+18
+a43d6467317d8f1e160f67aadec37919c9d64443 jdk-13+19
+6ccc7cd7931e34129f6b7e04988fc9a63958dde0 jdk-13+20
+f2f11d7f7f4e7128f8aba6ffa576cfa76fbf7d1a jdk-13+21
+181986c5476468bc2dd4532af49599003ee8af37 jdk-13+22
+b034d2dee5fc93d42a81b65e58ce3f91e42586ff jdk-13+23
+7e2238451585029680f126ccbb46d01f2ff5607f jdk-13+24
+22b3b7983adab54e318f75aeb94471f7a4429c1e jdk-14+0
+22b3b7983adab54e318f75aeb94471f7a4429c1e jdk-13+25
+2f4e214781a1d597ed36bf5a36f20928c6c82996 jdk-14+1
+0692b67f54621991ba7afbf23e55b788f3555e69 jdk-13+26
+43627549a488b7d0b4df8fad436e36233df89877 jdk-14+2
+b7f68ddec66f996ae3aad03291d129ca9f02482d jdk-13+27
+e64383344f144217c36196c3c8a2df8f588a2af3 jdk-14+3
+1e95931e7d8fa7e3899340a9c7cb28dbea50c10c jdk-13+28
+19d0b382f0869f72d4381b54fa129f1c74b6e766 jdk-14+4
+3081f39a3d30d63b112098386ac2bb027c2b7223 jdk-13+29
+0f1e29c77e50c7da11d83df410026392c4d1a28c jdk-14+5
+2e63fb0a885fa908a97bbb0da8d7c3de11536aca jdk-13+30
+443f7359b34d60e7821216ffc60f88b6ffe0ccdd jdk-14+6
+6a159c6c23ccd0029140ab91653442e412305ce5 jdk-13+31
+28ab01c067551ef158abaef08e154e1051ca0893 jdk-14+7
+929f37a9c35d530d4e866f6e832001aeb4cfb371 jdk-13+32
+c0023e364b6f130cb1e93747b796d8718d544db1 jdk-14+8
+9c250a7600e12bdb1e611835250af3204d4aa152 jdk-13+33
+18f189e69b29f8215a3500b875127ed4fb2d977a jdk-14+9
+ececb6dae777e622abda42c705fd984a42f46b5a jdk-14+10
+bf4c808a4488025a415f867e54c8b088417e08a0 jdk-14+11
+8570f22b9b6ac6bec673899b582150865696e425 jdk-14+12
+fbbe6672ae15deaf350a9e935290a36f57ba9c25 jdk-14+13
+cddef3bde924f3ff4f17f3d369280cf69d0450e5 jdk-14+14
+9c250a7600e12bdb1e611835250af3204d4aa152 jdk-13-ga
+778fc2dcbdaa8981e07e929a2cacef979c72261e jdk-14+15
+d29f0181ba424a95d881aba5eabf2e393abcc70f jdk-14+16
+5c83830390baafb76a1fbe33443c57620bd45fb9 jdk-14+17
+e84d8379815ba0d3e50fb096d28c25894cb50b8c jdk-14+18
+9b67dd88a9313e982ec5f710a7747161bc8f0c23 jdk-14+19
+54ffb15c48399dd59922ee22bb592d815307e77c jdk-14+20
+c16ac7a2eba4e73cb4f7ee9294dd647860eebff0 jdk-14+21
+83810b7d12e7ff761ad3dd91f323a22dad96f108 jdk-14+22
+15936b142f86731afa4b1a2c0fe4a01e806c4944 jdk-14+23
+438337c846fb071900ddb6922bddf8b3e895a514 jdk-14+24
+17d242844fc9e7d18b3eac97426490a9c246119e jdk-14+25
+288777cf0702914e5266bc1e5d380eed9032ca41 jdk-14+26
+2c724dba4c3cf9516b2152e151c9aea66b21b30b jdk-15+0
+91a3f092682fc715d991a87eb6ec6f28886d2035 jdk-14+27
+63e17cf29bed191ea21020b4648c9cdf893f80f5 jdk-15+1
+2069b4bfd23b56b6fc659fba8b75aaaa23debbe0 jdk-14+28
+f33197adda9ad82fdef46ac0f7dc0126204f35b2 jdk-15+2
+563fa900fa17c290ae516c7a3a69e8c069dde304 jdk-14+29
+d05fcdf25717d85e80a3a39a6b719458b22be5fe jdk-15+3
+d54ce919da90dab361995bb4d87be9851f00537a jdk-14+30
+bb0a7975b31ded63d594ee8dbfc4d4ead587f79b jdk-15+4
+decd3d2953b640f1043ee76953ff89238bff92e8 jdk-14+31
+b97c1773ccafae4a8c16cc6aedb10b2a4f9a07ed jdk-15+5
+2776da28515e087cc8849acf1e131a65ea7e77b6 jdk-14+32
+ef7d53b4fccd4a0501b17d974e84f37aa99fa813 jdk-15+6
+f728b6c7f4910d6bd6070cb4dde8393f4ba95113 jdk-14+33
+e2bc57500c1b785837982f7ce8af6751387ed73b jdk-15+7
+a96bc204e3b31ddbf909b20088964112f052927e jdk-14+34
+c7d4f2849dbfb755fc5860b362a4044ea0c9e082 jdk-15+8
+4a87bb7ebfd7f6a25ec59a5982fe3607242777f8 jdk-14+35
+62b5bfef8d618e08e6f3a56cf1fb0e67e89e9cc2 jdk-15+9
+bc54620a3848c26cff9766e5e2a6e5ddab98ed18 jdk-14+36
+1bee69801aeea1a34261c93f35bc9de072a98704 jdk-15+10
+b2dd4028a6de4e40dda8b76109e4b5c6b294f980 jdk-15+11
+2ec0ff3042630ddbd3587e340fe0dd40391cb6c4 jdk-15+12
+1c06a8ee8acad4d93c782626a233693a73de0add jdk-15+13
+1d6ceb13e142665ea833fca01c8c8598e0ddd211 jdk-15+14
+bc54620a3848c26cff9766e5e2a6e5ddab98ed18 jdk-14-ga
+82b7c62cf4cc56828a8fb724f57087967232a2a7 jdk-15+15
+5c7ec21f5d13f6eb5cd32288c69b8be2f9cac256 jdk-15+16
+dd5198db2e5b1ebcafe065d987c03ba9fcb50fc3 jdk-15+17
+44aef192b488a48cce12422394691a6b1d16b98e jdk-15+18
+7cc27caabe6e342151e8baf549beb07a9c755ec2 jdk-15+19
+46bca5e5e6fb26efd07245d26fe96a9c3260f51e jdk-15+20
+12b55fad80f30d24b1f8fdb3b947ea6465ef9518 jdk-15+21
+7223c6d610343fd8323af9d07d501e01fa1a7696 jdk-15+22
+f143729ca00ec14a98ea5c7f73acba88da97746e jdk-15+23
+497fd9f9129c4928fd5a876dd55e0daf6298b511 jdk-15+24
+90b266a84c06f1b3dc0ed8767856793e8c1c357e jdk-15+25
+0a32396f7a690015d22ca3328ac441a358295d90 jdk-15+26
+93813843680bbe1b7efbca56c03fd137f20a2c31 jdk-16+0
+93813843680bbe1b7efbca56c03fd137f20a2c31 jdk-15+27
+4a485c89d5a08b495961835f5308a96038678aeb jdk-16+1

.jcheck/conf

@@ -1,35 +1,2 @@
-[general]
-project=jdk-updates
-jbs=JDK
-version=18.0.2
-
-[checks]
-error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
-
-[repository]
-tags=(?:jdk-(?:[1-9]([0-9]*)(?:\.(?:0|[1-9][0-9]*)){0,4})(?:\+(?:(?:[0-9]+))|(?:-ga)))|(?:jdk[4-9](?:u\d{1,3})?-(?:(?:b\d{2,3})|(?:ga)))|(?:hs\d\d(?:\.\d{1,2})?-b\d\d)
-branches=
-
-[census]
-version=0
-domain=openjdk.org
-
-[checks "whitespace"]
-files=.*\.cpp|.*\.hpp|.*\.c|.*\.h|.*\.java|.*\.cc|.*\.hh|.*\.m|.*\.mm|.*\.gmk|.*\.m4|.*\.ac|Makefile
-ignore-tabs=.*\.gmk|Makefile
-
-[checks "merge"]
-message=Merge
-
-[checks "reviewers"]
-reviewers=1
-ignore=duke
-
-[checks "committer"]
-role=committer
-
-[checks "issues"]
-pattern=^([124-8][0-9]{6}): (\S.*)$
-
-[checks "problemlists"]
-dirs=test/jdk|test/langtools|test/lib-test|test/hotspot/jtreg|test/jaxp
+project=jdk
+bugids=dup

CONTRIBUTING.md

@@ -1,3 +0,0 @@
-# Contributing to the JDK
-
-Please see <https://openjdk.java.net/contribute/> for how to contribute.

README

@@ -0,0 +1,12 @@
+
+Welcome to the JDK!
+===================
+
+For information about building the JDK, including how to retrieve all
+of the source code, please see either of these files:
+
+  * doc/building.html   (html version)
+  * doc/building.md     (markdown version)
+
+See http://openjdk.java.net/ for more information about the OpenJDK
+Community and the JDK.

README.md

@@ -1,11 +0,0 @@
-# Welcome to the JDK!
-
-For build instructions please see the
-[online documentation](https://openjdk.java.net/groups/build/doc/building.html),
-or either of these files:
-
-- [doc/building.html](doc/building.html) (html version)
-- [doc/building.md](doc/building.md) (markdown version)
-
-See <https://openjdk.java.net/> for more information about
-the OpenJDK Community and the JDK.

bin/idea.sh

@@ -25,7 +25,7 @@
 # Shell script for generating an IDEA project from a given list of modules
 
 usage() {
-      echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [-c|--conf <conf_name>] [modules]+"
+      echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [modules]+"
       exit 1
 }
 
@@ -37,7 +37,6 @@ cd $TOP;
 
 IDEA_OUTPUT=$TOP/.idea
 VERBOSE="false"
-CONF_ARG=
 while [ $# -gt 0 ]
 do
   case $1 in
@@ -53,10 +52,6 @@ do
       IDEA_OUTPUT=$2/.idea
       shift
       ;;
-    -c | --conf )
-      CONF_ARG="CONF_NAME=$2"
-      shift
-      ;;
 
     -*)  # bad option
       usage
@@ -69,9 +64,6 @@ do
   shift
 done
 
-if [ -e $IDEA_OUTPUT ] ; then
-    rm -r $IDEA_OUTPUT
-fi
 mkdir -p $IDEA_OUTPUT || exit 1
 cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
 
@@ -99,7 +91,7 @@ if [ "$VERBOSE" = "true" ] ; then
   echo "idea template dir: $IDEA_TEMPLATE"
 fi
 
-cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I $MAKE_DIR/.. idea MAKEOVERRIDES= OUT=$IDEA_OUTPUT/env.cfg MODULES="$*" $CONF_ARG || exit 1
+cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I $MAKE_DIR/.. idea MAKEOVERRIDES= OUT=$IDEA_OUTPUT/env.cfg MODULES="$*" || exit 1
 cd $SCRIPT_DIR
 
 . $IDEA_OUTPUT/env.cfg
@@ -155,32 +147,22 @@ add_replacement() {
 add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
 add_replacement "###VCS_TYPE###" "$VCS_TYPE"
 SPEC_DIR=`dirname $SPEC`
-if [ "x$CYGPATH" != "x" ]; then
-    add_replacement "###BUILD_DIR###" "`$CYGPATH -am $SPEC_DIR`"
-    add_replacement "###IMAGES_DIR###" "`$CYGPATH -am $SPEC_DIR`/images/jdk"
-    add_replacement "###ROOT_DIR###" "`$CYGPATH -am $TOPLEVEL_DIR`"
-    add_replacement "###IDEA_DIR###" "`$CYGPATH -am $IDEA_OUTPUT`"
-    if [ "x$JT_HOME" = "x" ]; then
-      add_replacement "###JTREG_HOME###" ""
-    else
-      add_replacement "###JTREG_HOME###" "`$CYGPATH -am $JT_HOME`"
-    fi
-elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
-    add_replacement "###BUILD_DIR###" "`wslpath -am $SPEC_DIR`"
-    add_replacement "###IMAGES_DIR###" "`wslpath -am $SPEC_DIR`/images/jdk"
-    add_replacement "###ROOT_DIR###" "`wslpath -am $TOPLEVEL_DIR`"
-    add_replacement "###IDEA_DIR###" "`wslpath -am $IDEA_OUTPUT`"
-    if [ "x$JT_HOME" = "x" ]; then
-      add_replacement "###JTREG_HOME###" ""
-    else
-      add_replacement "###JTREG_HOME###" "`wslpath -am $JT_HOME`"
-    fi
-else
+if [ "x$CYGPATH" = "x" ]; then
     add_replacement "###BUILD_DIR###" "$SPEC_DIR"
     add_replacement "###JTREG_HOME###" "$JT_HOME"
     add_replacement "###IMAGES_DIR###" "$SPEC_DIR/images/jdk"
     add_replacement "###ROOT_DIR###" "$TOPLEVEL_DIR"
     add_replacement "###IDEA_DIR###" "$IDEA_OUTPUT"
+else
+    add_replacement "###BUILD_DIR###" "`cygpath -am $SPEC_DIR`"
+    add_replacement "###IMAGES_DIR###" "`cygpath -am $SPEC_DIR`/images/jdk"
+    add_replacement "###ROOT_DIR###" "`cygpath -am $TOPLEVEL_DIR`"
+    add_replacement "###IDEA_DIR###" "`cygpath -am $IDEA_OUTPUT`"
+    if [ "x$JT_HOME" = "x" ]; then
+      add_replacement "###JTREG_HOME###" ""
+    else
+      add_replacement "###JTREG_HOME###" "`cygpath -am $JT_HOME`"
+    fi
 fi
 
 SOURCE_PREFIX="<sourceFolder url=\"file://"
@@ -188,22 +170,9 @@ SOURCE_POSTFIX="\" isTestSource=\"false\" />"
 
 for root in $MODULE_ROOTS; do
     if [ "x$CYGPATH" != "x" ]; then
-      root=`$CYGPATH -am $root`
-    elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
-      root=`wslpath -am $root`
-    fi
-
-    VM_CI="jdk.internal.vm.ci/share/classes"
-    VM_COMPILER="src/jdk.internal.vm.compiler/share/classes"
-    if test "${root#*$VM_CI}" != "$root" || test "${root#*$VM_COMPILER}" != "$root"; then
-        for subdir in "$root"/*; do
-            if [ -d "$subdir" ]; then
-                SOURCES=$SOURCES" $SOURCE_PREFIX""$subdir"/src"$SOURCE_POSTFIX"
-            fi
-        done
-    else
-        SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
+    	root=`cygpath -am $root`
     fi
+    SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
 done
 
 add_replacement "###SOURCE_ROOTS###" "$SOURCES"
@@ -227,37 +196,16 @@ fi
 CP=$ANT_HOME/lib/ant.jar
 rm -rf $CLASSES; mkdir $CLASSES
 
-# If we have a Windows boot JDK, we need a .exe suffix
-if [ -e "$BOOT_JDK/bin/java.exe" ] ; then
-  JAVAC=javac.exe
-else 
-  JAVAC=javac
-fi
-
-# If we are on WSL, the boot JDK might be either Windows or Linux,
-# and we need to use realpath instead of CYGPATH to make javac work on both.
-# We need to handle this case first since CYGPATH might be set on WSL.
-if [ "x$WSL_DISTRO_NAME" != "x" ]; then
-  JAVAC_SOURCE_FILE=`realpath --relative-to=./ $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
-  JAVAC_SOURCE_PATH=`realpath --relative-to=./ $IDEA_OUTPUT/src`
-  JAVAC_CLASSES=`realpath --relative-to=./ $CLASSES`
-  ANT_TEMP=`mktemp -d -p ./`
-  cp $ANT_HOME/lib/ant.jar $ANT_TEMP/ant.jar
-  JAVAC_CP=$ANT_TEMP/ant.jar
-elif [ "x$CYGPATH" != "x" ] ; then ## CYGPATH may be set in env.cfg
-  JAVAC_SOURCE_FILE=`$CYGPATH -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
-  JAVAC_SOURCE_PATH=`$CYGPATH -am $IDEA_OUTPUT/src`
-  JAVAC_CLASSES=`$CYGPATH -am $CLASSES`
-  JAVAC_CP=`$CYGPATH -am $CP`
-else
+if [ "x$CYGPATH" = "x" ] ; then ## CYGPATH may be set in env.cfg
   JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java
   JAVAC_SOURCE_PATH=$IDEA_OUTPUT/src
   JAVAC_CLASSES=$CLASSES
   JAVAC_CP=$CP
+else
+  JAVAC_SOURCE_FILE=`cygpath -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
+  JAVAC_SOURCE_PATH=`cygpath -am $IDEA_OUTPUT/src`
+  JAVAC_CLASSES=`cygpath -am $CLASSES`
+  JAVAC_CP=`cygpath -am $CP`
 fi
 
-$BOOT_JDK/bin/$JAVAC -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC_CP $JAVAC_SOURCE_FILE
-
-if [ "x$WSL_DISTRO_NAME" != "x" ]; then
-  rm -rf $ANT_TEMP
-fi
+$BOOT_JDK/bin/javac -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC_CP $JAVAC_SOURCE_FILE

bin/nashorn/fixwhitespace.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+# 
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+# 
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# 
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+fix() {
+    #convert tabs to spaces
+    find . -name $1 -exec sed -i "" 's/	/    /g' {} \;
+    #remove trailing whitespace
+    find . -name $1 -exec sed -i "" 's/[ 	]*$//' \{} \;
+}
+
+if [ ! -z $1 ]; then 
+    fix $1;
+else
+    fix "*.java"
+    fix "*.js"
+fi

bin/nashorn/runopt.sh

@@ -0,0 +1,135 @@
+#!/bin/sh
+#
+# Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+# 
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+# 
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# 
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+###########################################################################################
+# This is a helper script to evaluate nashorn with optimistic types
+# it produces a flight recording for every run, and uses the best 
+# known flags for performance for the current configration
+###########################################################################################
+
+# Flags to enable assertions, we need the system assertions too, since
+# this script runs Nashorn in the BCP to override any nashorn.jar that might
+# reside in your $JAVA_HOME/jre/lib/ext/nashorn.jar
+#
+ENABLE_ASSERTIONS_FLAGS="-ea -esa"
+
+# Flags to instrument lambdaform computation, caching, interpretation and compilation
+# Default compile threshold for lambdaforms is 30
+#
+#LAMBDAFORM_FLAGS="\
+#    -Djava.lang.invoke.MethodHandle.COMPILE_THRESHOLD=3 \
+#    -Djava.lang.invoke.MethodHandle.DUMP_CLASS_FILES=true \
+#    -Djava.lang.invoke.MethodHandle.TRACE_METHOD_LINKAGE=true \
+#    -Djava.lang.invoke.MethodHandle.TRACE_INTERPRETER=true"
+
+# Flags to run trusted tests from the Nashorn test suite
+#
+#TRUSTED_TEST_FLAGS="\
+#-Djava.security.manager \
+#-Djava.security.policy=../build/nashorn.policy -Dnashorn.debug"
+
+# Testing out new code optimizations using the generic hotspot "new code" parameter
+#
+#USE_NEW_CODE_FLAGS=-XX:+UnlockDiagnosticVMOptions -XX:+UseNewCode
+
+#
+#-Dnashorn.typeInfo.disabled=false \
+# and for Nashorn options: 
+# --class-cache-size=0 --persistent-code-cache=false 
+
+# Unique timestamped file name for JFR recordings. For JFR, we also have to
+# crank up the stack cutoff depth to 1024, because of ridiculously long lambda form
+# stack traces.
+#
+# It is also recommended that you go into $JAVA_HOME/jre/lib/jfr/default.jfc and
+# set the "method-sampling-interval" Normal and Maximum sample time as low as you
+# can go (10 ms on most platforms). The default is normally higher. The increased
+# sampling overhead is usually negligible for Nashorn runs, but the data is better
+
+if [ -z $JFR_FILENAME ]; then
+    JFR_FILENAME="./nashorn_$(date|sed "s/ /_/g"|sed "s/:/_/g").jfr"
+fi
+
+# Flight recorder
+#
+# see above - already in place, copy the flags down here to disable
+ENABLE_FLIGHT_RECORDER_FLAGS="\
+    -XX:+FlightRecorder \
+    -XX:FlightRecorderOptions=defaultrecording=true,disk=true,dumponexit=true,dumponexitpath=$JFR_FILENAME,stackdepth=1024"
+
+# Type specialization and math intrinsic replacement should be enabled by default in 8u20 and nine,
+# keeping this flag around for experimental reasons. Replace + with - to switch it off
+#
+#ENABLE_TYPE_SPECIALIZATION_FLAGS=-XX:+UseTypeSpeculation
+
+# Same with math intrinsics. They should be enabled by default in 8u20 and 9, so
+# this disables them if needed
+#
+#DISABLE_MATH_INTRINSICS_FLAGS=-XX:-UseMathExactIntrinsics
+
+# Add timing to time the compilation phases.
+#ENABLE_TIME_FLAGS=--log=time
+
+# Add ShowHiddenFrames to get lambda form internals on the stack traces
+#ENABLE_SHOW_HIDDEN_FRAMES_FLAGS=-XX:+ShowHiddenFrames
+
+# Add print optoassembly to get an asm dump. This requires 1) a debug build, not product,
+# That tired compilation is switched off, for C2 only output and that the number of
+# compiler threads is set to 1 for determinsm.
+#
+#PRINT_ASM_FLAGS=-XX:+PrintOptoAssembly -XX:-TieredCompilation -XX:CICompilerCount=1 \
+
+# Tier compile threasholds. Default value is 10. (1-100 is useful for experiments)
+#TIER_COMPILATION_THRESHOLD_FLAGS=-XX:IncreaseFirstTierCompileThresholdAt=10
+
+# Directory where to look for nashorn.jar in a dist folder. The default is "..", assuming
+# that we run the script from the make dir
+DIR=..
+NASHORN_JAR=$DIR/dist/nashorn.jar
+
+
+# The built Nashorn jar is placed first in the bootclasspath to override the JDK
+# nashorn.jar in $JAVA_HOME/jre/lib/ext. Thus, we also need -esa, as assertions in
+# nashorn count as system assertions in this configuration
+
+# Type profiling default level is 111, 222 adds some compile time, but is faster
+
+$JAVA_HOME/bin/java \
+$ENABLE_ASSERTIONS_FLAGS \
+$LAMBDAFORM_FLAGS \
+$TRUSTED_FLAGS \
+$USE_NEW_CODE_FLAGS \
+$ENABLE_SHOW_HIDDEN_FRAMES_FLAGS \
+$ENABLE_FLIGHT_RECORDER_FLAGS \
+$ENABLE_TYPE_SPECIALIZATION_FLAGS \
+$TIERED_COMPILATION_THRESOLD_FLAGS \
+$DISABLE_MATH_INTRINSICS_FLAGS \
+$PRINT_ASM_FLAGS \
+-Xbootclasspath/p:$NASHORN_JAR \
+-Xms2G -Xmx2G \
+-XX:TypeProfileLevel=222 \
+-cp $CLASSPATH:../build/test/classes/ \
+jdk.nashorn.tools.Shell $ENABLE_TIME_FLAGS ${@}
+
+

doc/building.html

@@ -76,9 +76,8 @@
 <li><a href="#specifying-the-target-platform">Specifying the Target Platform</a></li>
 <li><a href="#toolchain-considerations">Toolchain Considerations</a></li>
 <li><a href="#native-libraries">Native Libraries</a></li>
-<li><a href="#cross-compiling-with-debian-sysroots">Cross compiling with Debian sysroots</a></li>
+<li><a href="#creating-and-using-sysroots-with-qemu-deboostrap">Creating And Using Sysroots With qemu-deboostrap</a></li>
 <li><a href="#building-for-armaarch64">Building for ARM/aarch64</a></li>
-<li><a href="#building-for-musl">Building for musl</a></li>
 <li><a href="#verifying-the-build">Verifying the Build</a></li>
 </ul></li>
 <li><a href="#build-performance">Build Performance</a><ul>
@@ -96,12 +95,13 @@
 <li><a href="#specific-build-issues">Specific Build Issues</a></li>
 <li><a href="#getting-help">Getting Help</a></li>
 </ul></li>
-<li><a href="#reproducible-builds">Reproducible Builds</a></li>
 <li><a href="#hints-and-suggestions-for-advanced-users">Hints and Suggestions for Advanced Users</a><ul>
+<li><a href="#setting-up-a-repository-for-pushing-changes-defpath">Setting Up a Repository for Pushing Changes (defpath)</a></li>
 <li><a href="#bash-completion">Bash Completion</a></li>
 <li><a href="#using-multiple-configurations">Using Multiple Configurations</a></li>
 <li><a href="#handling-reconfigurations">Handling Reconfigurations</a></li>
 <li><a href="#using-fine-grained-make-targets">Using Fine-Grained Make Targets</a></li>
+<li><a href="#learn-about-mercurial">Learn About Mercurial</a></li>
 </ul></li>
 <li><a href="#understanding-the-build-system">Understanding the Build System</a><ul>
 <li><a href="#configurations">Configurations</a></li>
@@ -115,10 +115,10 @@
 </ul>
 </nav>
 <h2 id="tldr-instructions-for-the-impatient">TL;DR (Instructions for the Impatient)</h2>
-<p>If you are eager to try out building the JDK, these simple steps works most of the time. They assume that you have installed Git (and Cygwin if running on Windows) and cloned the top-level JDK repository that you want to build.</p>
+<p>If you are eager to try out building the JDK, these simple steps works most of the time. They assume that you have installed Mercurial (and Cygwin if running on Windows) and cloned the top-level JDK repository that you want to build.</p>
 <ol type="1">
 <li><p><a href="#getting-the-source-code">Get the complete source code</a>:<br />
-<code>git clone https://git.openjdk.java.net/jdk/</code></p></li>
+<code>hg clone http://hg.openjdk.java.net/jdk/jdk</code></p></li>
 <li><p><a href="#running-configure">Run configure</a>:<br />
 <code>bash configure</code></p>
 <p>If <code>configure</code> fails due to missing dependencies (to either the <a href="#native-compiler-toolchain-requirements">toolchain</a>, <a href="#build-tools-requirements">build tools</a>, <a href="#external-library-requirements">external libraries</a> or the <a href="#boot-jdk-requirements">boot JDK</a>), most of the time it prints a suggestion on how to resolve the situation on your platform. Follow the instructions, and try running <code>bash configure</code> again.</p></li>
@@ -134,8 +134,8 @@
 <p>The JDK is a complex software project. Building it requires a certain amount of technical expertise, a fair number of dependencies on external software, and reasonably powerful hardware.</p>
 <p>If you just want to use the JDK and not build it yourself, this document is not for you. See for instance <a href="http://openjdk.java.net/install">OpenJDK installation</a> for some methods of installing a prebuilt JDK.</p>
 <h2 id="getting-the-source-code">Getting the Source Code</h2>
-<p>Make sure you are getting the correct version. As of JDK 10, the source is no longer split into separate repositories so you only need to clone one single repository. At the <a href="https://git.openjdk.java.net/">OpenJDK Git site</a> you can see a list of all available repositories. If you want to build an older version, e.g. JDK 11, it is recommended that you get the <code>jdk11u</code> repo, which contains incremental updates, instead of the <code>jdk11</code> repo, which was frozen at JDK 11 GA.</p>
-<p>If you are new to Git, a good place to start is the book <a href="https://git-scm.com/book/en/v2">Pro Git</a>. The rest of this document assumes a working knowledge of Git.</p>
+<p>Make sure you are getting the correct version. As of JDK 10, the source is no longer split into separate repositories so you only need to clone one single repository. At the <a href="http://hg.openjdk.java.net/">OpenJDK Mercurial server</a> you can see a list of all available repositories. If you want to build an older version, e.g. JDK 8, it is recommended that you get the <code>jdk8u</code> forest, which contains incremental updates, instead of the <code>jdk8</code> forest, which was frozen at JDK 8 GA.</p>
+<p>If you are new to Mercurial, a good place to start is the <a href="http://www.mercurial-scm.org/guide">Mercurial Beginner's Guide</a>. The rest of this document assumes a working knowledge of Mercurial.</p>
 <h3 id="special-considerations">Special Considerations</h3>
 <p>For a smooth building experience, it is recommended that you follow these rules on where and how to check out the source code.</p>
 <ul>
@@ -146,11 +146,7 @@
 <ul>
 <li><p>Create the directory that is going to contain the top directory of the JDK clone by using the <code>mkdir</code> command in the Cygwin bash shell. That is, do <em>not</em> create it using Windows Explorer. This will ensure that it will have proper Cygwin attributes, and that it's children will inherit those attributes.</p></li>
 <li><p>Do not put the JDK clone in a path under your Cygwin home directory. This is especially important if your user name contains spaces and/or mixed upper and lower case letters.</p></li>
-<li><p>You need to install a git client. You have two choices, Cygwin git or Git for Windows. Unfortunately there are pros and cons with each choice.</p>
-<ul>
-<li><p>The Cygwin <code>git</code> client has no line ending issues and understands Cygwin paths (which are used throughout the JDK build system). However, it does not currently work well with the Skara CLI tooling. Please see the <a href="https://wiki.openjdk.java.net/display/SKARA/Skara#Skara-Git">Skara wiki on Git clients</a> for up-to-date information about the Skara git client support.</p></li>
-<li><p>The <a href="https://gitforwindows.org">Git for Windows</a> client has issues with line endings, and do not understand Cygwin paths. It does work well with the Skara CLI tooling, however. To alleviate the line ending problems, make sure you set <code>core.autocrlf</code> to <code>false</code> (this is asked during installation).</p></li>
-</ul></li>
+<li><p>Clone the JDK repository using the Cygwin command line <code>hg</code> client as instructed in this document. That is, do <em>not</em> use another Mercurial client such as TortoiseHg.</p></li>
 </ul>
 <p>Failure to follow this procedure might result in hard-to-debug build problems.</p></li>
 </ul>
@@ -197,7 +193,7 @@
 <p>Windows XP is not a supported platform, but all newer Windows should be able to build the JDK.</p>
 <p>On Windows, it is important that you pay attention to the instructions in the <a href="#special-considerations">Special Considerations</a>.</p>
 <p>Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. Currently, the only supported such layers are Cygwin and Windows Subsystem for Linux (WSL). (Msys is no longer supported due to a too old bash; msys2 would likely be possible to support in a future version but that would require effort to implement.)</p>
-<p>Internally in the build system, all paths are represented as Unix-style paths, e.g. <code>/cygdrive/c/git/jdk/Makefile</code> rather than <code>C:\git\jdk\Makefile</code>. This rule also applies to input to the build system, e.g. in arguments to <code>configure</code>. So, use <code>--with-msvcr-dll=/cygdrive/c/msvcr100.dll</code> rather than <code>--with-msvcr-dll=c:\msvcr100.dll</code>. For details on this conversion, see the section on <a href="#fixpath">Fixpath</a>.</p>
+<p>Internally in the build system, all paths are represented as Unix-style paths, e.g. <code>/cygdrive/c/hg/jdk9/Makefile</code> rather than <code>C:\hg\jdk9\Makefile</code>. This rule also applies to input to the build system, e.g. in arguments to <code>configure</code>. So, use <code>--with-msvcr-dll=/cygdrive/c/msvcr100.dll</code> rather than <code>--with-msvcr-dll=c:\msvcr100.dll</code>. For details on this conversion, see the section on <a href="#fixpath">Fixpath</a>.</p>
 <h4 id="cygwin">Cygwin</h4>
 <p>A functioning <a href="http://www.cygwin.com/">Cygwin</a> environment is required for building the JDK on Windows. If you have a 64-bit OS, we strongly recommend using the 64-bit version of Cygwin.</p>
 <p><strong>Note:</strong> Cygwin has a model of continuously updating all packages without any easy way to install or revert to a specific version of a package. This means that whenever you add or update a package in Cygwin, you might (inadvertently) update tools that are used by the JDK build process, and that can cause unexpected build problems.</p>
@@ -228,8 +224,6 @@
 <pre><code>sudo apt-get install build-essential</code></pre>
 <p>For rpm-based distributions (Fedora, Red Hat, etc), try this:</p>
 <pre><code>sudo yum groupinstall &quot;Development Tools&quot;</code></pre>
-<p>For Alpine Linux, aside from basic tooling, install the GNU versions of some programs:</p>
-<pre><code>sudo apk add build-base bash grep zip</code></pre>
 <h3 id="aix">AIX</h3>
 <p>Please consult the AIX section of the <a href="https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms">Supported Build Platforms</a> OpenJDK Build Wiki page for details about which versions of AIX are supported.</p>
 <h2 id="native-compiler-toolchain-requirements">Native Compiler (Toolchain) Requirements</h2>
@@ -271,7 +265,7 @@
 <tbody>
 <tr class="odd">
 <td style="text-align: left;">Linux</td>
-<td style="text-align: left;">gcc 10.2.0</td>
+<td style="text-align: left;">gcc 9.2.0</td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">macOS</td>
@@ -279,17 +273,17 @@
 </tr>
 <tr class="odd">
 <td style="text-align: left;">Windows</td>
-<td style="text-align: left;">Microsoft Visual Studio 2019 update 16.7.2</td>
+<td style="text-align: left;">Microsoft Visual Studio 2019 update 16.5.3</td>
 </tr>
 </tbody>
 </table>
 <p>All compilers are expected to be able to compile to the C99 language standard, as some C99 features are used in the source code. Microsoft Visual Studio doesn't fully support C99 so in practice shared code is limited to using C99 features that it does support.</p>
 <h3 id="gcc">gcc</h3>
 <p>The minimum accepted version of gcc is 5.0. Older versions will generate a warning by <code>configure</code> and are unlikely to work.</p>
-<p>The JDK is currently known to be able to compile with at least version 10.2 of gcc.</p>
+<p>The JDK is currently known to be able to compile with at least version 9.2 of gcc.</p>
 <p>In general, any version between these two should be usable.</p>
 <h3 id="clang">clang</h3>
-<p>The minimum accepted version of clang is 3.5. Older versions will not be accepted by <code>configure</code>.</p>
+<p>The minimum accepted version of clang is 3.2. Older versions will not be accepted by <code>configure</code>.</p>
 <p>To use clang instead of gcc on Linux, use <code>--with-toolchain-type=clang</code>.</p>
 <h3 id="apple-xcode">Apple Xcode</h3>
 <p>The oldest supported version of Xcode is 8.</p>
@@ -298,9 +292,9 @@
 <p>It is advisable to keep an older version of Xcode for building the JDK when updating Xcode. This <a href="http://iosdevelopertips.com/xcode/install-multiple-versions-of-xcode.html">blog page</a> has good suggestions on managing multiple Xcode versions. To use a specific version of Xcode, use <code>xcode-select -s</code> before running <code>configure</code>, or use <code>--with-toolchain-path</code> to point to the version of Xcode to use, e.g. <code>configure --with-toolchain-path=/Applications/Xcode8.app/Contents/Developer/usr/bin</code></p>
 <p>If you have recently (inadvertently) updated your OS and/or Xcode version, and the JDK can no longer be built, please see the section on <a href="#problems-with-the-build-environment">Problems with the Build Environment</a>, and <a href="#getting-help">Getting Help</a> to find out if there are any recent, non-merged patches available for this update.</p>
 <h3 id="microsoft-visual-studio">Microsoft Visual Studio</h3>
-<p>The minimum accepted version of Visual Studio is 2017. Older versions will not be accepted by <code>configure</code> and will not work. The maximum accepted version of Visual Studio is 2019.</p>
-<p>If you have multiple versions of Visual Studio installed, <code>configure</code> will by default pick the latest. You can request a specific version to be used by setting <code>--with-toolchain-version</code>, e.g. <code>--with-toolchain-version=2017</code>.</p>
-<p>If you have Visual Studio installed but <code>configure</code> fails to detect it, it may be because of <a href="#spaces-in-path">spaces in path</a>.</p>
+<p>The minimum accepted version of Visual Studio is 2010. Older versions will not be accepted by <code>configure</code>. The maximum accepted version of Visual Studio is 2019. Versions older than 2017 are unlikely to continue working for long.</p>
+<p>If you have multiple versions of Visual Studio installed, <code>configure</code> will by default pick the latest. You can request a specific version to be used by setting <code>--with-toolchain-version</code>, e.g. <code>--with-toolchain-version=2015</code>.</p>
+<p>If you get <code>LINK: fatal error LNK1123: failure during conversion to COFF: file invalid</code> when building using Visual Studio 2010, you have encountered <a href="http://support.microsoft.com/kb/2757355">KB2757355</a>, a bug triggered by a specific installation order. However, the solution suggested by the KB article does not always resolve the problem. See <a href="https://stackoverflow.com/questions/10888391">this stackoverflow discussion</a> for other suggestions.</p>
 <h3 id="ibm-xl-cc">IBM XL C/C++</h3>
 <p>Please consult the AIX section of the <a href="https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms">Supported Build Platforms</a> OpenJDK Build Wiki page for details about which versions of XLC are supported.</p>
 <h2 id="boot-jdk-requirements">Boot JDK Requirements</h2>
@@ -320,8 +314,6 @@
 <ul>
 <li>To install on an apt-based Linux, try running <code>sudo apt-get install libfreetype6-dev</code>.</li>
 <li>To install on an rpm-based Linux, try running <code>sudo yum install freetype-devel</code>.</li>
-<li>To install on Alpine Linux, try running <code>sudo apk add freetype-dev</code>.</li>
-<li>To install on macOS, try running <code>brew install freetype</code>.</li>
 </ul>
 <p>Use <code>--with-freetype-include=&lt;path&gt;</code> and <code>--with-freetype-lib=&lt;path&gt;</code> if <code>configure</code> does not automatically locate the platform FreeType files.</p>
 <h3 id="cups">CUPS</h3>
@@ -329,7 +321,6 @@
 <ul>
 <li>To install on an apt-based Linux, try running <code>sudo apt-get install libcups2-dev</code>.</li>
 <li>To install on an rpm-based Linux, try running <code>sudo yum install cups-devel</code>.</li>
-<li>To install on Alpine Linux, try running <code>sudo apk add cups-dev</code>.</li>
 </ul>
 <p>Use <code>--with-cups=&lt;path&gt;</code> if <code>configure</code> does not properly locate your CUPS files.</p>
 <h3 id="x11">X11</h3>
@@ -337,7 +328,6 @@
 <ul>
 <li>To install on an apt-based Linux, try running <code>sudo apt-get install libx11-dev libxext-dev libxrender-dev libxrandr-dev libxtst-dev libxt-dev</code>.</li>
 <li>To install on an rpm-based Linux, try running <code>sudo yum install libXtst-devel libXt-devel libXrender-devel libXrandr-devel libXi-devel</code>.</li>
-<li>To install on Alpine Linux, try running <code>sudo apk add libx11-dev libxext-dev libxrender-dev libxrandr-dev libxtst-dev libxt-dev</code>.</li>
 </ul>
 <p>Use <code>--with-x=&lt;path&gt;</code> if <code>configure</code> does not properly locate your X11 files.</p>
 <h3 id="alsa">ALSA</h3>
@@ -345,7 +335,6 @@
 <ul>
 <li>To install on an apt-based Linux, try running <code>sudo apt-get install libasound2-dev</code>.</li>
 <li>To install on an rpm-based Linux, try running <code>sudo yum install alsa-lib-devel</code>.</li>
-<li>To install on Alpine Linux, try running <code>sudo apk add alsa-lib-dev</code>.</li>
 </ul>
 <p>Use <code>--with-alsa=&lt;path&gt;</code> if <code>configure</code> does not properly locate your ALSA files.</p>
 <h3 id="libffi">libffi</h3>
@@ -353,7 +342,6 @@
 <ul>
 <li>To install on an apt-based Linux, try running <code>sudo apt-get install libffi-dev</code>.</li>
 <li>To install on an rpm-based Linux, try running <code>sudo yum install libffi-devel</code>.</li>
-<li>To install on Alpine Linux, try running <code>sudo apk add libffi-dev</code>.</li>
 </ul>
 <p>Use <code>--with-libffi=&lt;path&gt;</code> if <code>configure</code> does not properly locate your libffi files.</p>
 <h2 id="build-tools-requirements">Build Tools Requirements</h2>
@@ -362,7 +350,6 @@
 <ul>
 <li>To install on an apt-based Linux, try running <code>sudo apt-get install autoconf</code>.</li>
 <li>To install on an rpm-based Linux, try running <code>sudo yum install autoconf</code>.</li>
-<li>To install on Alpine Linux, try running <code>sudo apk add autoconf</code>.</li>
 <li>To install on macOS, try running <code>brew install autoconf</code>.</li>
 <li>To install on Windows, try running <code>&lt;path to Cygwin setup&gt;/setup-x86_64 -q -P autoconf</code>.</li>
 </ul>
@@ -405,7 +392,7 @@
 <li><code>--enable-jvm-feature-&lt;feature&gt;</code> or <code>--disable-jvm-feature-&lt;feature&gt;</code> - Include (or exclude) <code>&lt;feature&gt;</code> as a JVM feature in Hotspot. You can also specify a list of features to be enabled, separated by space or comma, as <code>--with-jvm-features=&lt;feature&gt;[,&lt;feature&gt;...]</code>. If you prefix <code>&lt;feature&gt;</code> with a <code>-</code>, it will be disabled. These options will modify the default list of features for the JVM variant(s) you are building. For the <code>custom</code> JVM variant, the default list is empty. A complete list of valid JVM features can be found using <code>bash configure --help</code>.</li>
 <li><code>--with-target-bits=&lt;bits&gt;</code> - Create a target binary suitable for running on a <code>&lt;bits&gt;</code> platform. Use this to create 32-bit output on a 64-bit build platform, instead of doing a full cross-compile. (This is known as a <em>reduced</em> build.)</li>
 </ul>
-<p>On Linux, BSD and AIX, it is possible to override where Java by default searches for runtime/JNI libraries. This can be useful in situations where there is a special shared directory for system JNI libraries. This setting can in turn be overridden at runtime by setting the <code>java.library.path</code> property.</p>
+<p>On Linux, BSD and AIX, it is possible to override where Java by default searches for runtime/JNI libraries. This can be useful in situations where there is a special shared directory for system JNI libraries. This setting can in turn be overriden at runtime by setting the <code>java.library.path</code> property.</p>
 <ul>
 <li><code>--with-jni-libpath=&lt;path&gt;</code> - Use the specified path as a default when searching for runtime libraries.</li>
 </ul>
@@ -444,7 +431,7 @@
 <h3 id="configure-control-variables">Configure Control Variables</h3>
 <p>It is possible to control certain aspects of <code>configure</code> by overriding the value of <code>configure</code> variables, either on the command line or in the environment.</p>
 <p>Normally, this is <strong>not recommended</strong>. If used improperly, it can lead to a broken configuration. Unless you're well versed in the build system, this is hard to use properly. Therefore, <code>configure</code> will print a warning if this is detected.</p>
-<p>However, there are a few <code>configure</code> variables, known as <em>control variables</em> that are supposed to be overridden on the command line. These are variables that describe the location of tools needed by the build, like <code>MAKE</code> or <code>GREP</code>. If any such variable is specified, <code>configure</code> will use that value instead of trying to autodetect the tool. For instance, <code>bash configure MAKE=/opt/gnumake4.0/bin/make</code>.</p>
+<p>However, there are a few <code>configure</code> variables, known as <em>control variables</em> that are supposed to be overriden on the command line. These are variables that describe the location of tools needed by the build, like <code>MAKE</code> or <code>GREP</code>. If any such variable is specified, <code>configure</code> will use that value instead of trying to autodetect the tool. For instance, <code>bash configure MAKE=/opt/gnumake4.0/bin/make</code>.</p>
 <p>If a configure argument exists, use that instead, e.g. use <code>--with-jtreg</code> instead of setting <code>JTREGEXE</code>.</p>
 <p>Also note that, despite what autoconf claims, setting <code>CFLAGS</code> will not accomplish anything. Instead use <code>--with-extra-cflags</code> (and similar for <code>cxxflags</code> and <code>ldflags</code>).</p>
 <h2 id="running-make">Running Make</h2>
@@ -481,7 +468,7 @@
 <h3 id="make-control-variables">Make Control Variables</h3>
 <p>It is possible to control <code>make</code> behavior by overriding the value of <code>make</code> variables, either on the command line or in the environment.</p>
 <p>Normally, this is <strong>not recommended</strong>. If used improperly, it can lead to a broken build. Unless you're well versed in the build system, this is hard to use properly. Therefore, <code>make</code> will print a warning if this is detected.</p>
-<p>However, there are a few <code>make</code> variables, known as <em>control variables</em> that are supposed to be overridden on the command line. These make up the &quot;make time&quot; configuration, as opposed to the &quot;configure time&quot; configuration.</p>
+<p>However, there are a few <code>make</code> variables, known as <em>control variables</em> that are supposed to be overriden on the command line. These make up the &quot;make time&quot; configuration, as opposed to the &quot;configure time&quot; configuration.</p>
 <h4 id="general-make-control-variables">General Make Control Variables</h4>
 <ul>
 <li><code>JOBS</code> - Specify the number of jobs to build with. See <a href="#build-performance">Build Performance</a>.</li>
@@ -489,7 +476,7 @@
 <li><code>CONF</code> and <code>CONF_NAME</code> - Selecting the configuration(s) to use. See <a href="#using-multiple-configurations">Using Multiple Configurations</a></li>
 </ul>
 <h4 id="test-make-control-variables">Test Make Control Variables</h4>
-<p>These make control variables only make sense when running tests. Please see <strong>Testing the JDK</strong> (<a href="testing.html">html</a>, <a href="testing.md">markdown</a>) for details.</p>
+<p>These make control variables only make sense when running tests. Please see <a href="testing.html">Testing the JDK</a> for details.</p>
 <ul>
 <li><code>TEST</code></li>
 <li><code>TEST_JOBS</code></li>
@@ -507,7 +494,7 @@
 </ul>
 <h2 id="running-tests">Running Tests</h2>
 <p>Most of the JDK tests are using the <a href="http://openjdk.java.net/jtreg">JTReg</a> test framework. Make sure that your configuration knows where to find your installation of JTReg. If this is not picked up automatically, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc.</p>
-<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
+<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
 <p>Building of Hotspot Gtest suite requires the source code of Google Test framework. The top directory, which contains both <code>googletest</code> and <code>googlemock</code> directories, should be specified via <code>--with-gtest</code>. The supported version of Google Test is 1.8.1, whose source code can be obtained:</p>
 <ul>
 <li>by downloading and unpacking the source bundle from <a href="https://github.com/google/googletest/releases/tag/release-1.8.1">here</a></li>
@@ -515,7 +502,7 @@
 </ul>
 <p>To execute the most basic tests (tier 1), use:</p>
 <pre><code>make run-test-tier1</code></pre>
-<p>For more details on how to run tests, please see <strong>Testing the JDK</strong> (<a href="testing.html">html</a>, <a href="testing.md">markdown</a>).</p>
+<p>For more details on how to run tests, please see the <a href="testing.html">Testing the JDK</a> document.</p>
 <h2 id="cross-compiling">Cross-compiling</h2>
 <p>Cross-compiling means using one platform (the <em>build</em> platform) to generate output that can ran on another platform (the <em>target</em> platform).</p>
 <p>The typical reason for cross-compiling is that the build is performed on a more powerful desktop computer, but the resulting binaries will be able to run on a different, typically low-performing system. Most of the complications that arise when building for embedded is due to this separation of <em>build</em> and <em>target</em> systems.</p>
@@ -630,154 +617,78 @@ cp: cannot stat `arm-linux-gnueabihf/libSM.so&#39;: No such file or directory
 cp: cannot stat `arm-linux-gnueabihf/libXt.so&#39;: No such file or directory</code></pre></li>
 <li><p>If the X11 libraries are not properly detected by <code>configure</code>, you can point them out by <code>--with-x</code>.</p></li>
 </ul>
-<h3 id="cross-compiling-with-debian-sysroots">Cross compiling with Debian sysroots</h3>
+<h3 id="creating-and-using-sysroots-with-qemu-deboostrap">Creating And Using Sysroots With qemu-deboostrap</h3>
 <p>Fortunately, you can create sysroots for foreign architectures with tools provided by your OS. On Debian/Ubuntu systems, one could use <code>qemu-deboostrap</code> to create the <em>target</em> system chroot, which would have the native libraries and headers specific to that <em>target</em> system. After that, we can use the cross-compiler on the <em>build</em> system, pointing into chroot to get the build dependencies right. This allows building for foreign architectures with native compilation speed.</p>
 <p>For example, cross-compiling to AArch64 from x86_64 could be done like this:</p>
 <ul>
-<li><p>Install cross-compiler on the <em>build</em> system:</p>
-<pre><code>apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu</code></pre></li>
-<li><p>Create chroot on the <em>build</em> system, configuring it for <em>target</em> system:</p>
-<pre><code>sudo qemu-debootstrap \
-  --arch=arm64 \
-  --verbose \
-  --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev,libffi-dev \
-  --resolve-deps \
-  buster \
-  ~/sysroot-arm64 \
-  http://httpredir.debian.org/debian/</code></pre></li>
-<li><p>Make sure the symlinks inside the newly created chroot point to proper locations:</p>
-<pre><code>sudo chroot ~/sysroot-arm64 symlinks -cr .</code></pre></li>
-<li><p>Configure and build with newly created chroot as sysroot/toolchain-path:</p>
-<pre><code>sh ./configure \
-  --openjdk-target=aarch64-linux-gnu \
-  --with-sysroot=~/sysroot-arm64
-make images
-ls build/linux-aarch64-server-release/</code></pre></li>
+<li>Install cross-compiler on the <em>build</em> system:</li>
 </ul>
-<p>The build does not create new files in that chroot, so it can be reused for multiple builds without additional cleanup.</p>
-<p>The build system should automatically detect the toolchain paths and dependencies, but sometimes it might require a little nudge with:</p>
+<pre><code>apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu</code></pre>
 <ul>
-<li><p>Native compilers: override <code>CC</code> or <code>CXX</code> for <code>./configure</code></p></li>
-<li><p>Freetype lib location: override <code>--with-freetype-lib</code>, for example <code>${sysroot}/usr/lib/${target}/</code></p></li>
-<li><p>Freetype includes location: override <code>--with-freetype-include</code> for example <code>${sysroot}/usr/include/freetype2/</code></p></li>
-<li><p>X11 libraries location: override <code>--x-libraries</code>, for example <code>${sysroot}/usr/lib/${target}/</code></p></li>
+<li>Create chroot on the <em>build</em> system, configuring it for <em>target</em> system:</li>
 </ul>
+<pre><code>sudo qemu-debootstrap --arch=arm64 --verbose \
+       --include=fakeroot,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng12-dev \
+       --resolve-deps jessie /chroots/arm64 http://httpredir.debian.org/debian/</code></pre>
+<ul>
+<li>Configure and build with newly created chroot as sysroot/toolchain-path:</li>
+</ul>
+<pre><code>CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ sh ./configure --openjdk-target=aarch64-linux-gnu --with-sysroot=/chroots/arm64/ --with-toolchain-path=/chroots/arm64/
+make images
+ls build/linux-aarch64-normal-server-release/</code></pre>
+<p>The build does not create new files in that chroot, so it can be reused for multiple builds without additional cleanup.</p>
 <p>Architectures that are known to successfully cross-compile like this are:</p>
 <table>
 <thead>
 <tr class="header">
 <th style="text-align: left;">Target</th>
-<th style="text-align: left;">Debian tree</th>
-<th style="text-align: left;">Debian arch</th>
+<th style="text-align: left;"><code>CC</code></th>
+<th style="text-align: left;"><code>CXX</code></th>
+<th style="text-align: left;"><code>--arch=...</code></th>
 <th style="text-align: left;"><code>--openjdk-target=...</code></th>
-<th><code>--with-jvm-variants=...</code></th>
 </tr>
 </thead>
 <tbody>
 <tr class="odd">
 <td style="text-align: left;">x86</td>
-<td style="text-align: left;">buster</td>
+<td style="text-align: left;">default</td>
+<td style="text-align: left;">default</td>
 <td style="text-align: left;">i386</td>
 <td style="text-align: left;">i386-linux-gnu</td>
-<td>(all)</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">arm</td>
-<td style="text-align: left;">buster</td>
+<td style="text-align: left;">armhf</td>
+<td style="text-align: left;">gcc-arm-linux-gnueabihf</td>
+<td style="text-align: left;">g++-arm-linux-gnueabihf</td>
 <td style="text-align: left;">armhf</td>
 <td style="text-align: left;">arm-linux-gnueabihf</td>
-<td>(all)</td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">aarch64</td>
-<td style="text-align: left;">buster</td>
+<td style="text-align: left;">gcc-aarch64-linux-gnu</td>
+<td style="text-align: left;">g++-aarch64-linux-gnu</td>
 <td style="text-align: left;">arm64</td>
 <td style="text-align: left;">aarch64-linux-gnu</td>
-<td>(all)</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">ppc64le</td>
-<td style="text-align: left;">buster</td>
+<td style="text-align: left;">ppc64el</td>
+<td style="text-align: left;">gcc-powerpc64le-linux-gnu</td>
+<td style="text-align: left;">g++-powerpc64le-linux-gnu</td>
 <td style="text-align: left;">ppc64el</td>
 <td style="text-align: left;">powerpc64le-linux-gnu</td>
-<td>(all)</td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">s390x</td>
-<td style="text-align: left;">buster</td>
+<td style="text-align: left;">gcc-s390x-linux-gnu</td>
+<td style="text-align: left;">g++-s390x-linux-gnu</td>
 <td style="text-align: left;">s390x</td>
 <td style="text-align: left;">s390x-linux-gnu</td>
-<td>(all)</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">mipsle</td>
-<td style="text-align: left;">buster</td>
-<td style="text-align: left;">mipsel</td>
-<td style="text-align: left;">mipsel-linux-gnu</td>
-<td>zero</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">mips64le</td>
-<td style="text-align: left;">buster</td>
-<td style="text-align: left;">mips64el</td>
-<td style="text-align: left;">mips64el-linux-gnueabi64</td>
-<td>zero</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">armel</td>
-<td style="text-align: left;">buster</td>
-<td style="text-align: left;">arm</td>
-<td style="text-align: left;">arm-linux-gnueabi</td>
-<td>zero</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">ppc</td>
-<td style="text-align: left;">sid</td>
-<td style="text-align: left;">powerpc</td>
-<td style="text-align: left;">powerpc-linux-gnu</td>
-<td>zero</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">ppc64be</td>
-<td style="text-align: left;">sid</td>
-<td style="text-align: left;">ppc64</td>
-<td style="text-align: left;">powerpc64-linux-gnu</td>
-<td>(all)</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">m68k</td>
-<td style="text-align: left;">sid</td>
-<td style="text-align: left;">m68k</td>
-<td style="text-align: left;">m68k-linux-gnu</td>
-<td>zero</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">alpha</td>
-<td style="text-align: left;">sid</td>
-<td style="text-align: left;">alpha</td>
-<td style="text-align: left;">alpha-linux-gnu</td>
-<td>zero</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">sh4</td>
-<td style="text-align: left;">sid</td>
-<td style="text-align: left;">sh4</td>
-<td style="text-align: left;">sh4-linux-gnu</td>
-<td>zero</td>
 </tr>
 </tbody>
 </table>
+<p>Additional architectures might be supported by Debian/Ubuntu Ports.</p>
 <h3 id="building-for-armaarch64">Building for ARM/aarch64</h3>
 <p>A common cross-compilation target is the ARM CPU. When building for ARM, it is useful to set the ABI profile. A number of pre-defined ABI profiles are available using <code>--with-abi-profile</code>: arm-vfp-sflt, arm-vfp-hflt, arm-sflt, armv5-vfp-sflt, armv6-vfp-hflt. Note that soft-float ABIs are no longer properly supported by the JDK.</p>
-<h3 id="building-for-musl">Building for musl</h3>
-<p>Just like it's possible to cross-compile for a different CPU, it's possible to cross-compile for musl libc on a glibc-based <em>build</em> system. A devkit suitable for most target CPU architectures can be obtained from <a href="https://musl.cc">musl.cc</a>. After installing the required packages in the sysroot, configure the build with <code>--openjdk-target</code>:</p>
-<pre><code>sh ./configure --with-jvm-variants=server \
---with-boot-jdk=$BOOT_JDK \
---with-build-jdk=$BUILD_JDK \
---openjdk-target=x86_64-unknown-linux-musl \
---with-devkit=$DEVKIT \
---with-sysroot=$SYSROOT</code></pre>
-<p>and run <code>make</code> normally.</p>
 <h3 id="verifying-the-build">Verifying the Build</h3>
 <p>The build will end up in a directory named like <code>build/linux-arm-normal-server-release</code>.</p>
 <p>Inside this build output directory, the <code>images/jdk</code> will contain the newly built JDK, for your <em>target</em> system.</p>
@@ -821,14 +732,14 @@ ls build/linux-aarch64-server-release/</code></pre></li>
 
 === Output from failing command(s) repeated here ===
 * For target hotspot_variant-server_libjvm_objs_psMemoryPool.o:
-/localhome/git/jdk-sandbox/hotspot/src/share/vm/services/psMemoryPool.cpp:1:1: error: &#39;failhere&#39; does not name a type
+/localhome/hg/jdk9-sandbox/hotspot/src/share/vm/services/psMemoryPool.cpp:1:1: error: &#39;failhere&#39; does not name a type
    ... (rest of output omitted)
 
-* All command lines available in /localhome/git/jdk-sandbox/build/linux-x64/make-support/failure-logs.
+* All command lines available in /localhome/hg/jdk9-sandbox/build/linux-x64/make-support/failure-logs.
 === End of repeated output ===
 
 === Make failed targets repeated here ===
-lib/CompileJvm.gmk:207: recipe for target &#39;/localhome/git/jdk-sandbox/build/linux-x64/hotspot/variant-server/libjvm/objs/psMemoryPool.o&#39; failed
+lib/CompileJvm.gmk:207: recipe for target &#39;/localhome/hg/jdk9-sandbox/build/linux-x64/hotspot/variant-server/libjvm/objs/psMemoryPool.o&#39; failed
 make/Main.gmk:263: recipe for target &#39;hotspot-server-libs&#39; failed
 === End of repeated output ===
 
@@ -855,7 +766,7 @@ Hint: If caused by a warning, try configure --disable-warnings-as-errors.</code>
 <p>Here are a suggested list of things to try if you are having unexpected build problems. Each step requires more time than the one before, so try them in order. Most issues will be solved at step 1 or 2.</p>
 <ol type="1">
 <li><p>Make sure your repository is up-to-date</p>
-<p>Run <code>git pull origin master</code> to make sure you have the latest changes.</p></li>
+<p>Run <code>hg pull -u</code> to make sure you have the latest changes.</p></li>
 <li><p>Clean build results</p>
 <p>The simplest way to fix incremental rebuild issues is to run <code>make clean</code>. This will remove all build results, but not the configuration or any build system support artifacts. In most cases, this will solve build errors resulting from incremental build mismatches.</p></li>
 <li><p>Completely clean the build directory.</p>
@@ -864,8 +775,8 @@ Hint: If caused by a warning, try configure --disable-warnings-as-errors.</code>
 make dist-clean
 bash configure $(cat current-configuration)
 make</code></pre></li>
-<li><p>Re-clone the Git repository</p>
-<p>Sometimes the Git repository gets in a state that causes the product to be un-buildable. In such a case, the simplest solution is often the &quot;sledgehammer approach&quot;: delete the entire repository, and re-clone it. If you have local changes, save them first to a different location using <code>git format-patch</code>.</p></li>
+<li><p>Re-clone the Mercurial repository</p>
+<p>Sometimes the Mercurial repository gets in a state that causes the product to be un-buildable. In such a case, the simplest solution is often the &quot;sledgehammer approach&quot;: delete the entire repository, and re-clone it. If you have local changes, save them first to a different location using <code>hg export</code>.</p></li>
 </ol>
 <h3 id="specific-build-issues">Specific Build Issues</h3>
 <h4 id="clock-skew">Clock Skew</h4>
@@ -880,38 +791,23 @@ Clock skew detected. Your build may be incomplete.</code></pre>
 cannot create ... Permission denied
 spawn failed</code></pre>
 <p>This can be a sign of a Cygwin problem. See the information about solving problems in the <a href="#cygwin">Cygwin</a> section. Rebooting the computer might help temporarily.</p>
-<h4 id="spaces-in-path">Spaces in Path</h4>
-<p>On Windows, when configuring, <code>fixpath.sh</code> may report that some directory names have spaces. Usually, it assumes those directories have <a href="https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/fsutil-8dot3name">short paths</a>. You can run <code>fsutil file setshortname</code> in <code>cmd</code> on certain directories, such as <code>Microsoft Visual Studio</code> or <code>Windows Kits</code>, to assign arbitrary short paths so <code>configure</code> can access them.</p>
 <h3 id="getting-help">Getting Help</h3>
 <p>If none of the suggestions in this document helps you, or if you find what you believe is a bug in the build system, please contact the Build Group by sending a mail to <a href="mailto:build-dev@openjdk.java.net">build-dev@openjdk.java.net</a>. Please include the relevant parts of the configure and/or build log.</p>
 <p>If you need general help or advice about developing for the JDK, you can also contact the Adoption Group. See the section on <a href="#contributing-to-openjdk">Contributing to OpenJDK</a> for more information.</p>
-<h2 id="reproducible-builds">Reproducible Builds</h2>
-<p>Build reproducibility is the property of getting exactly the same bits out when building, every time, independent on who builds the product, or where. This is for many reasons a harder goal than it initially appears, but it is an important goal, for security reasons and others. Please see <a href="https://reproducible-builds.org">Reproducible Builds</a> for more information about the background and reasons for reproducible builds.</p>
-<p>Currently, it is not possible to build OpenJDK fully reproducibly, but getting there is an ongoing effort. There are some things you can do to minimize non-determinism and make a larger part of the build reproducible:</p>
-<ul>
-<li>Turn on build system support for reproducible builds</li>
-</ul>
-<p>Add the flag <code>--enable-reproducible-build</code> to your <code>configure</code> command line. This will turn on support for reproducible builds where it could otherwise be lacking.</p>
-<ul>
-<li>Do not rely on <code>configure</code>'s default adhoc version strings</li>
-</ul>
-<p>Default adhoc version strings OPT segment include user name, source directory and timestamp. You can either override just the OPT segment using <code>--with-version-opt=&lt;any fixed string&gt;</code>, or you can specify the entire version string using <code>--with-version-string=&lt;your version&gt;</code>.</p>
-<ul>
-<li>Specify how the build sets <code>SOURCE_DATE_EPOCH</code></li>
-</ul>
-<p>The JDK build system will set the <code>SOURCE_DATE_EPOCH</code> environment variable during building, depending on the value of the <code>--with-source-date</code> option for <code>configure</code>. The default value is <code>updated</code>, which means that <code>SOURCE_DATE_EPOCH</code> will be set to the current time each time you are running <code>make</code>.</p>
-<p>The <a href="https://reproducible-builds.org/docs/source-date-epoch/"><code>SOURCE_DATE_EPOCH</code> environment variable</a> is an industry standard, that many tools, such as gcc, recognize, and use in place of the current time when generating output.</p>
-<p>For reproducible builds, you need to set this to a fixed value. You can use the special value <code>version</code> which will use the nominal release date for the current JDK version, or a value describing a date, either an epoch based timestamp as an integer, or a valid ISO-8601 date.</p>
-<p><strong>Hint:</strong> If your build environment already sets <code>SOURCE_DATE_EPOCH</code>, you can propagate this using <code>--with-source-date=$SOURCE_DATE_EPOCH</code>.</p>
-<ul>
-<li>Specify a hotspot build time</li>
-</ul>
-<p>Set a fixed hotspot build time. This will be included in the hotspot library (<code>libjvm.so</code> or <code>jvm.dll</code>) and defaults to the current time when building hotspot. Use <code>--with-hotspot-build-time=&lt;any fixed string&gt;</code> for reproducible builds. It's a string so you don't need to format it specifically, so e.g. <code>n/a</code> will do. Another solution is to use the <code>SOURCE_DATE_EPOCH</code> variable, e.g. <code>--with-hotspot-build-time=$(date --date=@$SOURCE_DATE_EPOCH)</code>.</p>
-<ul>
-<li>Copyright year</li>
-</ul>
-<p>The copyright year in some generated text files are normally set to the current year. This can be overridden by <code>--with-copyright-year=&lt;year&gt;</code>. For fully reproducible builds, this needs to be set to a fixed value.</p>
 <h2 id="hints-and-suggestions-for-advanced-users">Hints and Suggestions for Advanced Users</h2>
+<h3 id="setting-up-a-repository-for-pushing-changes-defpath">Setting Up a Repository for Pushing Changes (defpath)</h3>
+<p>To help you prepare a proper push path for a Mercurial repository, there exists a useful tool known as <a href="http://openjdk.java.net/projects/code-tools/defpath">defpath</a>. It will help you setup a proper push path for pushing changes to the JDK.</p>
+<p>Install the extension by cloning <code>http://hg.openjdk.java.net/code-tools/defpath</code> and updating your <code>.hgrc</code> file. Here's one way to do this:</p>
+<pre><code>cd ~
+mkdir hg-ext
+cd hg-ext
+hg clone http://hg.openjdk.java.net/code-tools/defpath
+cat &lt;&lt; EOT &gt;&gt; ~/.hgrc
+[extensions]
+defpath=~/hg-ext/defpath/defpath.py
+EOT</code></pre>
+<p>You can now setup a proper push path using:</p>
+<pre><code>hg defpath -d -u &lt;your OpenJDK username&gt;</code></pre>
 <h3 id="bash-completion">Bash Completion</h3>
 <p>The <code>configure</code> and <code>make</code> commands tries to play nice with bash command-line completion (using <code>&lt;tab&gt;</code> or <code>&lt;tab&gt;&lt;tab&gt;</code>). To use this functionality, make sure you enable completion in your <code>~/.bashrc</code> (see instructions for bash in your operating system).</p>
 <p>Make completion will work out of the box, and will complete valid make targets. For instance, typing <code>make jdk-i&lt;tab&gt;</code> will complete to <code>make jdk-image</code>.</p>
@@ -935,7 +831,7 @@ sudo mv /tmp/configure /usr/local/bin</code></pre>
 <p>If you update the repository and part of the configure script has changed, the build system will force you to re-run <code>configure</code>.</p>
 <p>Most of the time, you will be fine by running <code>configure</code> again with the same arguments as the last time, which can easily be performed by <code>make reconfigure</code>. To simplify this, you can use the <code>CONF_CHECK</code> make control variable, either as <code>make CONF_CHECK=auto</code>, or by setting an environment variable. For instance, if you add <code>export CONF_CHECK=auto</code> to your <code>.bashrc</code> file, <code>make</code> will always run <code>reconfigure</code> automatically whenever the configure script has changed.</p>
 <p>You can also use <code>CONF_CHECK=ignore</code> to skip the check for a needed configure update. This might speed up the build, but comes at the risk of an incorrect build result. This is only recommended if you know what you're doing.</p>
-<p>From time to time, you will also need to modify the command line to <code>configure</code> due to changes. Use <code>make print-configuration</code> to show the command line used for your current configuration.</p>
+<p>From time to time, you will also need to modify the command line to <code>configure</code> due to changes. Use <code>make print-configure</code> to show the command line used for your current configuration.</p>
 <h3 id="using-fine-grained-make-targets">Using Fine-Grained Make Targets</h3>
 <p>The default behavior for make is to create consistent and correct output, at the expense of build speed, if necessary.</p>
 <p>If you are prepared to take some risk of an incorrect build, and know enough of the system to understand how things build and interact, you can speed up the build process considerably by instructing make to only build a portion of the product.</p>
@@ -964,6 +860,14 @@ sudo mv /tmp/configure /usr/local/bin</code></pre>
 <h4 id="rebuilding-part-of-java.base-jdk_filter">Rebuilding Part of java.base (JDK_FILTER)</h4>
 <p>If you are modifying files in <code>java.base</code>, which is the by far largest module in the JDK, then you need to rebuild all those files whenever a single file has changed. (This inefficiency will hopefully be addressed in JDK 10.)</p>
 <p>As a hack, you can use the make control variable <code>JDK_FILTER</code> to specify a pattern that will be used to limit the set of files being recompiled. For instance, <code>make java.base JDK_FILTER=javax/crypto</code> (or, to combine methods, <code>make java.base-java-only JDK_FILTER=javax/crypto</code>) will limit the compilation to files in the <code>javax.crypto</code> package.</p>
+<h3 id="learn-about-mercurial">Learn About Mercurial</h3>
+<p>To become an efficient JDK developer, it is recommended that you invest in learning Mercurial properly. Here are some links that can get you started:</p>
+<ul>
+<li><a href="http://www.mercurial-scm.org/wiki/GitConcepts">Mercurial for git users</a></li>
+<li><a href="http://www.mercurial-scm.org/wiki/Tutorial">The official Mercurial tutorial</a></li>
+<li><a href="http://hginit.com/">hg init</a></li>
+<li><a href="http://hgbook.red-bean.com/read/">Mercurial: The Definitive Guide</a></li>
+</ul>
 <h2 id="understanding-the-build-system">Understanding the Build System</h2>
 <p>This section will give you a more technical description on the details of the build system.</p>
 <h3 id="configurations">Configurations</h3>

doc/building.md

@@ -3,11 +3,11 @@
 ## TL;DR (Instructions for the Impatient)
 
 If you are eager to try out building the JDK, these simple steps works most of
-the time. They assume that you have installed Git (and Cygwin if running
+the time. They assume that you have installed Mercurial (and Cygwin if running
 on Windows) and cloned the top-level JDK repository that you want to build.
 
  1. [Get the complete source code](#getting-the-source-code): \
-    `git clone https://git.openjdk.java.net/jdk/`
+    `hg clone http://hg.openjdk.java.net/jdk/jdk`
 
  2. [Run configure](#running-configure): \
     `bash configure`
@@ -47,14 +47,14 @@ JDK.
 
 Make sure you are getting the correct version. As of JDK 10, the source is no
 longer split into separate repositories so you only need to clone one single
-repository. At the [OpenJDK Git site](https://git.openjdk.java.net/) you
+repository. At the [OpenJDK Mercurial server](http://hg.openjdk.java.net/) you
 can see a list of all available repositories. If you want to build an older version,
-e.g. JDK 11, it is recommended that you get the `jdk11u` repo, which contains
-incremental updates, instead of the `jdk11` repo, which was frozen at JDK 11 GA.
+e.g. JDK 8, it is recommended that you get the `jdk8u` forest, which contains
+incremental updates, instead of the `jdk8` forest, which was frozen at JDK 8 GA.
 
-If you are new to Git, a good place to start is the book [Pro
-Git](https://git-scm.com/book/en/v2). The rest of this document
-assumes a working knowledge of Git.
+If you are new to Mercurial, a good place to start is the [Mercurial Beginner's
+Guide](http://www.mercurial-scm.org/guide). The rest of this document assumes a
+working knowledge of Mercurial.
 
 ### Special Considerations
 
@@ -89,21 +89,9 @@ on where and how to check out the source code.
         directory. This is especially important if your user name contains
         spaces and/or mixed upper and lower case letters.
 
-      * You need to install a git client. You have two choices, Cygwin git or
-        Git for Windows. Unfortunately there are pros and cons with each choice.
-
-        * The Cygwin `git` client has no line ending issues and understands
-          Cygwin paths (which are used throughout the JDK build system).
-          However, it does not currently work well with the Skara CLI tooling.
-          Please see the [Skara wiki on Git clients](
-          https://wiki.openjdk.java.net/display/SKARA/Skara#Skara-Git) for
-          up-to-date information about the Skara git client support.
-
-        * The [Git for Windows](https://gitforwindows.org) client has issues
-          with line endings, and do not understand Cygwin paths. It does work
-          well with the Skara CLI tooling, however. To alleviate the line ending
-          problems, make sure you set `core.autocrlf` to `false` (this is asked
-          during installation).
+      * Clone the JDK repository using the Cygwin command line `hg` client
+        as instructed in this document. That is, do *not* use another Mercurial
+        client such as TortoiseHg.
 
     Failure to follow this procedure might result in hard-to-debug build
     problems.
@@ -185,7 +173,7 @@ likely be possible to support in a future version but that would require effort
 to implement.)
 
 Internally in the build system, all paths are represented as Unix-style paths,
-e.g. `/cygdrive/c/git/jdk/Makefile` rather than `C:\git\jdk\Makefile`. This
+e.g. `/cygdrive/c/hg/jdk9/Makefile` rather than `C:\hg\jdk9\Makefile`. This
 rule also applies to input to the build system, e.g. in arguments to
 `configure`. So, use `--with-msvcr-dll=/cygdrive/c/msvcr100.dll` rather than
 `--with-msvcr-dll=c:\msvcr100.dll`. For details on this conversion, see the section
@@ -285,13 +273,6 @@ For rpm-based distributions (Fedora, Red Hat, etc), try this:
 sudo yum groupinstall "Development Tools"
 ```
 
-For Alpine Linux, aside from basic tooling, install the GNU versions of some
-programs:
-
-```
-sudo apk add build-base bash grep zip
-```
-
 ### AIX
 
 Please consult the AIX section of the [Supported Build Platforms](
@@ -321,9 +302,9 @@ issues.
 
  Operating system   Toolchain version
  ------------------ -------------------------------------------------------
- Linux              gcc 10.2.0
+ Linux              gcc 9.2.0
  macOS              Apple Xcode 10.1 (using clang 10.0.0)
- Windows            Microsoft Visual Studio 2019 update 16.7.2
+ Windows            Microsoft Visual Studio 2019 update 16.5.3
 
 All compilers are expected to be able to compile to the C99 language standard,
 as some C99 features are used in the source code. Microsoft Visual Studio
@@ -335,14 +316,14 @@ features that it does support.
 The minimum accepted version of gcc is 5.0. Older versions will generate a warning
 by `configure` and are unlikely to work.
 
-The JDK is currently known to be able to compile with at least version 10.2 of
+The JDK is currently known to be able to compile with at least version 9.2 of
 gcc.
 
 In general, any version between these two should be usable.
 
 ### clang
 
-The minimum accepted version of clang is 3.5. Older versions will not be
+The minimum accepted version of clang is 3.2. Older versions will not be
 accepted by `configure`.
 
 To use clang instead of gcc on Linux, use `--with-toolchain-type=clang`.
@@ -374,16 +355,20 @@ available for this update.
 
 ### Microsoft Visual Studio
 
-The minimum accepted version of Visual Studio is 2017. Older versions will not
-be accepted by `configure` and will not work. The maximum accepted
-version of Visual Studio is 2019.
+The minimum accepted version of Visual Studio is 2010. Older versions will not
+be accepted by `configure`. The maximum accepted version of Visual Studio is
+2019. Versions older than 2017 are unlikely to continue working for long.
 
 If you have multiple versions of Visual Studio installed, `configure` will by
 default pick the latest. You can request a specific version to be used by
-setting `--with-toolchain-version`, e.g. `--with-toolchain-version=2017`.
+setting `--with-toolchain-version`, e.g. `--with-toolchain-version=2015`.
 
-If you have Visual Studio installed but `configure` fails to detect it, it may
-be because of [spaces in path](#spaces-in-path).
+If you get `LINK: fatal error LNK1123: failure during conversion to COFF: file
+invalid` when building using Visual Studio 2010, you have encountered
+[KB2757355](http://support.microsoft.com/kb/2757355), a bug triggered by a
+specific installation order. However, the solution suggested by the KB article
+does not always resolve the problem. See [this stackoverflow discussion](
+https://stackoverflow.com/questions/10888391) for other suggestions.
 
 ### IBM XL C/C++
 
@@ -453,8 +438,6 @@ rather than bundling the JDK's own copy.
     libfreetype6-dev`.
   * To install on an rpm-based Linux, try running `sudo yum install
     freetype-devel`.
-  * To install on Alpine Linux, try running `sudo apk add freetype-dev`.
-  * To install on macOS, try running `brew install freetype`.
 
 Use `--with-freetype-include=<path>` and `--with-freetype-lib=<path>`
 if `configure` does not automatically locate the platform FreeType files.
@@ -469,7 +452,6 @@ your operating system.
     libcups2-dev`.
   * To install on an rpm-based Linux, try running `sudo yum install
     cups-devel`.
-  * To install on Alpine Linux, try running `sudo apk add cups-dev`.
 
 Use `--with-cups=<path>` if `configure` does not properly locate your CUPS
 files.
@@ -483,8 +465,6 @@ Linux.
     libx11-dev libxext-dev libxrender-dev libxrandr-dev libxtst-dev libxt-dev`.
   * To install on an rpm-based Linux, try running `sudo yum install
     libXtst-devel libXt-devel libXrender-devel libXrandr-devel libXi-devel`.
-  * To install on Alpine Linux, try running `sudo apk add libx11-dev
-    libxext-dev libxrender-dev libxrandr-dev libxtst-dev libxt-dev`.
 
 Use `--with-x=<path>` if `configure` does not properly locate your X11 files.
 
@@ -497,7 +477,6 @@ required on Linux. At least version 0.9.1 of ALSA is required.
     libasound2-dev`.
   * To install on an rpm-based Linux, try running `sudo yum install
     alsa-lib-devel`.
-  * To install on Alpine Linux, try running `sudo apk add alsa-lib-dev`.
 
 Use `--with-alsa=<path>` if `configure` does not properly locate your ALSA
 files.
@@ -512,7 +491,6 @@ Hotspot.
     libffi-dev`.
   * To install on an rpm-based Linux, try running `sudo yum install
     libffi-devel`.
-  * To install on Alpine Linux, try running `sudo apk add libffi-dev`.
 
 Use `--with-libffi=<path>` if `configure` does not properly locate your libffi
 files.
@@ -528,7 +506,6 @@ platforms. At least version 2.69 is required.
     autoconf`.
   * To install on an rpm-based Linux, try running `sudo yum install
     autoconf`.
-  * To install on Alpine Linux, try running `sudo apk add autoconf`.
   * To install on macOS, try running `brew install autoconf`.
   * To install on Windows, try running `<path to Cygwin setup>/setup-x86_64 -q
     -P autoconf`.
@@ -657,7 +634,7 @@ features, use `bash configure --help=short` instead.)
 On Linux, BSD and AIX, it is possible to override where Java by default
 searches for runtime/JNI libraries. This can be useful in situations where
 there is a special shared directory for system JNI libraries. This setting
-can in turn be overridden at runtime by setting the `java.library.path` property.
+can in turn be overriden at runtime by setting the `java.library.path` property.
 
   * `--with-jni-libpath=<path>` - Use the specified path as a default
   when searching for runtime libraries.
@@ -723,7 +700,7 @@ hard to use properly. Therefore, `configure` will print a warning if this is
 detected.
 
 However, there are a few `configure` variables, known as *control variables*
-that are supposed to be overridden on the command line. These are variables that
+that are supposed to be overriden on the command line. These are variables that
 describe the location of tools needed by the build, like `MAKE` or `GREP`. If
 any such variable is specified, `configure` will use that value instead of
 trying to autodetect the tool. For instance, `bash configure
@@ -803,7 +780,7 @@ broken build. Unless you're well versed in the build system, this is hard to
 use properly. Therefore, `make` will print a warning if this is detected.
 
 However, there are a few `make` variables, known as *control variables* that
-are supposed to be overridden on the command line. These make up the "make time"
+are supposed to be overriden on the command line. These make up the "make time"
 configuration, as opposed to the "configure time" configuration.
 
 #### General Make Control Variables
@@ -818,7 +795,7 @@ configuration, as opposed to the "configure time" configuration.
 #### Test Make Control Variables
 
 These make control variables only make sense when running tests. Please see
-**Testing the JDK** ([html](testing.html), [markdown](testing.md)) for details.
+[Testing the JDK](testing.html) for details.
 
   * `TEST`
   * `TEST_JOBS`
@@ -848,7 +825,7 @@ containing `lib/jtreg.jar` etc.
 
 The [Adoption Group](https://wiki.openjdk.java.net/display/Adoption) provides
 recent builds of jtreg [here](
-https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/).
+https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact).
 Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
 `jtreg` directory that you just unpacked.
 
@@ -865,8 +842,8 @@ To execute the most basic tests (tier 1), use:
 make run-test-tier1
 ```
 
-For more details on how to run tests, please see **Testing the JDK**
-([html](testing.html), [markdown](testing.md)).
+For more details on how to run tests, please see the [Testing
+the JDK](testing.html) document.
 
 ## Cross-compiling
 
@@ -1090,7 +1067,7 @@ Note that X11 is needed even if you only want to build a headless JDK.
   * If the X11 libraries are not properly detected by `configure`, you can
     point them out by `--with-x`.
 
-### Cross compiling with Debian sysroots
+### Creating And Using Sysroots With qemu-deboostrap
 
 Fortunately, you can create sysroots for foreign architectures with tools
 provided by your OS. On Debian/Ubuntu systems, one could use `qemu-deboostrap` to
@@ -1102,67 +1079,38 @@ for foreign architectures with native compilation speed.
 For example, cross-compiling to AArch64 from x86_64 could be done like this:
 
   * Install cross-compiler on the *build* system:
-    ```
-    apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
-    ```
+```
+apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
+```
 
   * Create chroot on the *build* system, configuring it for *target* system:
-    ```
-    sudo qemu-debootstrap \
-      --arch=arm64 \
-      --verbose \
-      --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev,libffi-dev \
-      --resolve-deps \
-      buster \
-      ~/sysroot-arm64 \
-      http://httpredir.debian.org/debian/
-    ```
-
-  * Make sure the symlinks inside the newly created chroot point to proper locations:
-    ```
-    sudo chroot ~/sysroot-arm64 symlinks -cr .
-    ```
+```
+sudo qemu-debootstrap --arch=arm64 --verbose \
+       --include=fakeroot,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng12-dev \
+       --resolve-deps jessie /chroots/arm64 http://httpredir.debian.org/debian/
+```
 
   * Configure and build with newly created chroot as sysroot/toolchain-path:
-    ```
-    sh ./configure \
-      --openjdk-target=aarch64-linux-gnu \
-      --with-sysroot=~/sysroot-arm64
-    make images
-    ls build/linux-aarch64-server-release/
-    ```
+```
+CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ sh ./configure --openjdk-target=aarch64-linux-gnu --with-sysroot=/chroots/arm64/ --with-toolchain-path=/chroots/arm64/
+make images
+ls build/linux-aarch64-normal-server-release/
+```
 
 The build does not create new files in that chroot, so it can be reused for multiple builds
 without additional cleanup.
 
-The build system should automatically detect the toolchain paths and dependencies, but sometimes
-it might require a little nudge with:
-
-  * Native compilers: override `CC` or `CXX` for `./configure`
-
-  * Freetype lib location: override `--with-freetype-lib`, for example `${sysroot}/usr/lib/${target}/`
-
-  * Freetype includes location: override `--with-freetype-include` for example `${sysroot}/usr/include/freetype2/`
-
-  * X11 libraries location: override `--x-libraries`, for example `${sysroot}/usr/lib/${target}/`
-
 Architectures that are known to successfully cross-compile like this are:
 
-  Target        Debian tree  Debian arch   `--openjdk-target=...`   `--with-jvm-variants=...`
-  ------------  ------------ ------------- ------------------------ --------------
-  x86           buster       i386          i386-linux-gnu           (all)
-  arm           buster       armhf         arm-linux-gnueabihf      (all)
-  aarch64       buster       arm64         aarch64-linux-gnu        (all)
-  ppc64le       buster       ppc64el       powerpc64le-linux-gnu    (all)
-  s390x         buster       s390x         s390x-linux-gnu          (all)
-  mipsle        buster       mipsel        mipsel-linux-gnu         zero
-  mips64le      buster       mips64el      mips64el-linux-gnueabi64 zero
-  armel         buster       arm           arm-linux-gnueabi        zero
-  ppc           sid          powerpc       powerpc-linux-gnu        zero
-  ppc64be       sid          ppc64         powerpc64-linux-gnu      (all)
-  m68k          sid          m68k          m68k-linux-gnu           zero
-  alpha         sid          alpha         alpha-linux-gnu          zero
-  sh4           sid          sh4           sh4-linux-gnu            zero
+  Target        `CC`                      `CXX`                       `--arch=...`  `--openjdk-target=...`
+  ------------  ------------------------- --------------------------- ------------- -----------------------
+  x86           default                   default                     i386          i386-linux-gnu
+  armhf         gcc-arm-linux-gnueabihf   g++-arm-linux-gnueabihf     armhf         arm-linux-gnueabihf
+  aarch64       gcc-aarch64-linux-gnu     g++-aarch64-linux-gnu       arm64         aarch64-linux-gnu
+  ppc64el       gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu   ppc64el       powerpc64le-linux-gnu
+  s390x         gcc-s390x-linux-gnu       g++-s390x-linux-gnu         s390x         s390x-linux-gnu
+
+Additional architectures might be supported by Debian/Ubuntu Ports.
 
 ### Building for ARM/aarch64
 
@@ -1172,25 +1120,6 @@ available using `--with-abi-profile`: arm-vfp-sflt, arm-vfp-hflt, arm-sflt,
 armv5-vfp-sflt, armv6-vfp-hflt. Note that soft-float ABIs are no longer
 properly supported by the JDK.
 
-### Building for musl
-
-Just like it's possible to cross-compile for a different CPU, it's possible to
-cross-compile for musl libc on a glibc-based *build* system.
-A devkit suitable for most target CPU architectures can be obtained from
-[musl.cc](https://musl.cc). After installing the required packages in the
-sysroot, configure the build with `--openjdk-target`:
-
-```
-sh ./configure --with-jvm-variants=server \
---with-boot-jdk=$BOOT_JDK \
---with-build-jdk=$BUILD_JDK \
---openjdk-target=x86_64-unknown-linux-musl \
---with-devkit=$DEVKIT \
---with-sysroot=$SYSROOT
-```
-
-and run `make` normally.
-
 ### Verifying the Build
 
 The build will end up in a directory named like
@@ -1315,14 +1244,14 @@ ERROR: Build failed for target 'hotspot' in configuration 'linux-x64' (exit code
 
 === Output from failing command(s) repeated here ===
 * For target hotspot_variant-server_libjvm_objs_psMemoryPool.o:
-/localhome/git/jdk-sandbox/hotspot/src/share/vm/services/psMemoryPool.cpp:1:1: error: 'failhere' does not name a type
+/localhome/hg/jdk9-sandbox/hotspot/src/share/vm/services/psMemoryPool.cpp:1:1: error: 'failhere' does not name a type
    ... (rest of output omitted)
 
-* All command lines available in /localhome/git/jdk-sandbox/build/linux-x64/make-support/failure-logs.
+* All command lines available in /localhome/hg/jdk9-sandbox/build/linux-x64/make-support/failure-logs.
 === End of repeated output ===
 
 === Make failed targets repeated here ===
-lib/CompileJvm.gmk:207: recipe for target '/localhome/git/jdk-sandbox/build/linux-x64/hotspot/variant-server/libjvm/objs/psMemoryPool.o' failed
+lib/CompileJvm.gmk:207: recipe for target '/localhome/hg/jdk9-sandbox/build/linux-x64/hotspot/variant-server/libjvm/objs/psMemoryPool.o' failed
 make/Main.gmk:263: recipe for target 'hotspot-server-libs' failed
 === End of repeated output ===
 
@@ -1420,7 +1349,7 @@ order. Most issues will be solved at step 1 or 2.
 
  1. Make sure your repository is up-to-date
 
-    Run `git pull origin master` to make sure you have the latest changes.
+    Run `hg pull -u` to make sure you have the latest changes.
 
  2. Clean build results
 
@@ -1445,13 +1374,13 @@ order. Most issues will be solved at step 1 or 2.
     make
     ```
 
- 4. Re-clone the Git repository
+ 4. Re-clone the Mercurial repository
 
-    Sometimes the Git repository gets in a state that causes the product
+    Sometimes the Mercurial repository gets in a state that causes the product
     to be un-buildable. In such a case, the simplest solution is often the
     "sledgehammer approach": delete the entire repository, and re-clone it.
     If you have local changes, save them first to a different location using
-    `git format-patch`.
+    `hg export`.
 
 ### Specific Build Issues
 
@@ -1483,15 +1412,6 @@ This can be a sign of a Cygwin problem. See the information about solving
 problems in the [Cygwin](#cygwin) section. Rebooting the computer might help
 temporarily.
 
-#### Spaces in Path
-
-On Windows, when configuring, `fixpath.sh` may report that some directory
-names have spaces. Usually, it assumes those directories have
-[short paths](https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/fsutil-8dot3name).
-You can run `fsutil file setshortname` in `cmd` on certain directories, such as
-`Microsoft Visual Studio` or `Windows Kits`, to assign arbitrary short paths so
-`configure` can access them.
-
 ### Getting Help
 
 If none of the suggestions in this document helps you, or if you find what you
@@ -1503,70 +1423,35 @@ If you need general help or advice about developing for the JDK, you can also
 contact the Adoption Group. See the section on [Contributing to OpenJDK](
 #contributing-to-openjdk) for more information.
 
-## Reproducible Builds
-
-Build reproducibility is the property of getting exactly the same bits out when
-building, every time, independent on who builds the product, or where. This is
-for many reasons a harder goal than it initially appears, but it is an important
-goal, for security reasons and others. Please see [Reproducible Builds](
-https://reproducible-builds.org) for more information about the background and
-reasons for reproducible builds.
-
-Currently, it is not possible to build OpenJDK fully reproducibly, but getting
-there is an ongoing effort. There are some things you can do to minimize
-non-determinism and make a larger part of the build reproducible:
-
-  * Turn on build system support for reproducible builds
-
-Add the flag `--enable-reproducible-build` to your `configure` command line.
-This will turn on support for reproducible builds where it could otherwise be
-lacking.
-
-  * Do not rely on `configure`'s default adhoc version strings
-
-Default adhoc version strings OPT segment include user name, source directory
-and timestamp. You can either override just the OPT segment using
-`--with-version-opt=<any fixed string>`, or you can specify the entire version
-string using `--with-version-string=<your version>`.
-
-  * Specify how the build sets `SOURCE_DATE_EPOCH`
-
-The JDK build system will set the `SOURCE_DATE_EPOCH` environment variable
-during building, depending on the value of the `--with-source-date` option for
-`configure`. The default value is `updated`, which means that
-`SOURCE_DATE_EPOCH` will be set to the current time each time you are running
-`make`.
-
-The [`SOURCE_DATE_EPOCH` environment variable](
-https://reproducible-builds.org/docs/source-date-epoch/) is an industry
-standard, that many tools, such as gcc, recognize, and use in place of the
-current time when generating output.
-
-For reproducible builds, you need to set this to a fixed value. You can use the
-special value `version` which will use the nominal release date for the current
-JDK version, or a value describing a date, either an epoch based timestamp as an
-integer, or a valid ISO-8601 date.
-
-**Hint:** If your build environment already sets `SOURCE_DATE_EPOCH`, you can
-propagate this using `--with-source-date=$SOURCE_DATE_EPOCH`.
-
-  * Specify a hotspot build time
-
-Set a fixed hotspot build time. This will be included in the hotspot library
-(`libjvm.so` or `jvm.dll`) and defaults to the current time when building
-hotspot. Use `--with-hotspot-build-time=<any fixed string>` for reproducible
-builds. It's a string so you don't need to format it specifically, so e.g. `n/a`
-will do. Another solution is to use the `SOURCE_DATE_EPOCH` variable, e.g.
-`--with-hotspot-build-time=$(date --date=@$SOURCE_DATE_EPOCH)`.
-
-  * Copyright year
-
-The copyright year in some generated text files are normally set to the current
-year. This can be overridden by `--with-copyright-year=<year>`. For fully
-reproducible builds, this needs to be set to a fixed value.
-
 ## Hints and Suggestions for Advanced Users
 
+### Setting Up a Repository for Pushing Changes (defpath)
+
+To help you prepare a proper push path for a Mercurial repository, there exists
+a useful tool known as [defpath](
+http://openjdk.java.net/projects/code-tools/defpath). It will help you setup a
+proper push path for pushing changes to the JDK.
+
+Install the extension by cloning
+`http://hg.openjdk.java.net/code-tools/defpath` and updating your `.hgrc` file.
+Here's one way to do this:
+
+```
+cd ~
+mkdir hg-ext
+cd hg-ext
+hg clone http://hg.openjdk.java.net/code-tools/defpath
+cat << EOT >> ~/.hgrc
+[extensions]
+defpath=~/hg-ext/defpath/defpath.py
+EOT
+```
+
+You can now setup a proper push path using:
+```
+hg defpath -d -u <your OpenJDK username>
+```
+
 ### Bash Completion
 
 The `configure` and `make` commands tries to play nice with bash command-line
@@ -1632,8 +1517,8 @@ update. This might speed up the build, but comes at the risk of an incorrect
 build result. This is only recommended if you know what you're doing.
 
 From time to time, you will also need to modify the command line to `configure`
-due to changes. Use `make print-configuration` to show the command line used
-for your current configuration.
+due to changes. Use `make print-configure` to show the command line used for
+your current configuration.
 
 ### Using Fine-Grained Make Targets
 
@@ -1707,6 +1592,16 @@ instance, `make java.base JDK_FILTER=javax/crypto` (or, to combine methods,
 `make java.base-java-only JDK_FILTER=javax/crypto`) will limit the compilation
 to files in the `javax.crypto` package.
 
+### Learn About Mercurial
+
+To become an efficient JDK developer, it is recommended that you invest in
+learning Mercurial properly. Here are some links that can get you started:
+
+  * [Mercurial for git users](http://www.mercurial-scm.org/wiki/GitConcepts)
+  * [The official Mercurial tutorial](http://www.mercurial-scm.org/wiki/Tutorial)
+  * [hg init](http://hginit.com/)
+  * [Mercurial: The Definitive Guide](http://hgbook.red-bean.com/read/)
+
 ## Understanding the Build System
 
 This section will give you a more technical description on the details of the

doc/hotspot-style.html

@@ -1,456 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
-<head>
-  <meta charset="utf-8" />
-  <meta name="generator" content="pandoc" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-  <title>HotSpot Coding Style</title>
-  <style type="text/css">
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
-  </style>
-  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
-  <!--[if lt IE 9]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
-  <![endif]-->
-</head>
-<body>
-<header id="title-block-header">
-<h1 class="title">HotSpot Coding Style</h1>
-</header>
-<nav id="TOC">
-<ul>
-<li><a href="#introduction">Introduction</a><ul>
-<li><a href="#why-care-about-style">Why Care About Style?</a></li>
-<li><a href="#counterexamples-and-updates">Counterexamples and Updates</a></li>
-</ul></li>
-<li><a href="#structure-and-formatting">Structure and Formatting</a><ul>
-<li><a href="#factoring-and-class-design">Factoring and Class Design</a></li>
-<li><a href="#source-files">Source Files</a></li>
-<li><a href="#jtreg-tests">JTReg Tests</a></li>
-<li><a href="#naming">Naming</a></li>
-<li><a href="#commenting">Commenting</a></li>
-<li><a href="#macros">Macros</a></li>
-<li><a href="#whitespace">Whitespace</a></li>
-<li><a href="#miscellaneous">Miscellaneous</a></li>
-</ul></li>
-<li><a href="#use-of-c-features">Use of C++ Features</a><ul>
-<li><a href="#error-handling">Error Handling</a></li>
-<li><a href="#rtti-runtime-type-information">RTTI (Runtime Type Information)</a></li>
-<li><a href="#memory-allocation">Memory Allocation</a></li>
-<li><a href="#class-inheritance">Class Inheritance</a></li>
-<li><a href="#namespaces">Namespaces</a></li>
-<li><a href="#c-standard-library">C++ Standard Library</a></li>
-<li><a href="#type-deduction">Type Deduction</a></li>
-<li><a href="#expression-sfinae">Expression SFINAE</a></li>
-<li><a href="#enum">enum</a></li>
-<li><a href="#thread_local">thread_local</a></li>
-<li><a href="#nullptr">nullptr</a></li>
-<li><a href="#atomic">&lt;atomic&gt;</a></li>
-<li><a href="#uniform-initialization">Uniform Initialization</a></li>
-<li><a href="#local-function-objects">Local Function Objects</a></li>
-<li><a href="#additional-permitted-features">Additional Permitted Features</a></li>
-<li><a href="#excluded-features">Excluded Features</a></li>
-<li><a href="#undecided-features">Undecided Features</a></li>
-</ul></li>
-</ul>
-</nav>
-<h2 id="introduction">Introduction</h2>
-<p>This is a collection of rules, guidelines, and suggestions for writing HotSpot code. Following these will help new code fit in with existing HotSpot code, making it easier to read and maintain. Failure to follow these guidelines may lead to discussion during code reviews, if not outright rejection of a change.</p>
-<h3 id="why-care-about-style">Why Care About Style?</h3>
-<p>Some programmers seem to have lexers and even C preprocessors installed directly behind their eyeballs. The rest of us require code that is not only functionally correct but also easy to read. More than that, since there is no one style for easy-to-read code, and since a mashup of many styles is just as confusing as no style at all, it is important for coders to be conscious of the many implicit stylistic choices that historically have gone into the HotSpot code base.</p>
-<p>Some of these guidelines are driven by the cross-platform requirements for HotSpot. Shared code must work on a variety of platforms, and may encounter deficiencies in some. Using platform conditionalization in shared code is usually avoided, while shared code is strongly preferred to multiple platform-dependent implementations, so some language features may be recommended against.</p>
-<p>Some of the guidelines here are relatively arbitrary choices among equally plausible alternatives. The purpose of stating and enforcing these rules is largely to provide a consistent look to the code. That consistency makes the code more readable by avoiding non-functional distractions from the interesting functionality.</p>
-<p>When changing pre-existing code, it is reasonable to adjust it to match these conventions. Exception: If the pre-existing code clearly conforms locally to its own peculiar conventions, it is not worth reformatting the whole thing. Also consider separating changes that make extensive stylistic updates from those which make functional changes.</p>
-<h3 id="counterexamples-and-updates">Counterexamples and Updates</h3>
-<p>Many of the guidelines mentioned here have (sometimes widespread) counterexamples in the HotSpot code base. Finding a counterexample is not sufficient justification for new code to follow the counterexample as a precedent, since readers of your code will rightfully expect your code to follow the greater bulk of precedents documented here.</p>
-<p>Occasionally a guideline mentioned here may be just out of synch with the actual HotSpot code base. If you find that a guideline is consistently contradicted by a large number of counterexamples, please bring it up for discussion and possible change. The architectural rule, of course, is &quot;When in Rome do as the Romans&quot;. Sometimes in the suburbs of Rome the rules are a little different; these differences can be pointed out here.</p>
-<p>Proposed changes should be discussed on the <a href="mailto:hotspot-dev@openjdk.java.net">HotSpot Developers</a> mailing list, and approved by <a href="https://en.wikipedia.org/wiki/Rough_consensus">rough consensus</a> of the <a href="https://openjdk.java.net/census#hotspot">HotSpot Group</a> Members. The Group Lead determines whether consensus has been reached. Changes are likely to be cautious and incremental, since HotSpot coders have been using these guidelines for years.</p>
-<h2 id="structure-and-formatting">Structure and Formatting</h2>
-<h3 id="factoring-and-class-design">Factoring and Class Design</h3>
-<ul>
-<li><p>Group related code together, so readers can concentrate on one section of one file.</p></li>
-<li><p>Classes are the primary code structuring mechanism. Place related functionality in a class, or a set of related classes. Use of either namespaces or public non-member functions is rare in HotSpot code. Static non-member functions are not uncommon.</p></li>
-<li><p>If a class <code>FooBar</code> is going to be used in more than one place, put it a file named fooBar.hpp and fooBar.cpp. If the class is a sidekick to a more important class <code>BazBat</code>, it can go in bazBat.hpp.</p></li>
-<li><p>Put a member function <code>FooBar::bang</code> into the same file that defined <code>FooBar</code>, or its associated <em>.inline.hpp or </em>.cpp file.</p></li>
-<li><p>Use public accessor functions for member variables accessed outside the class.</p></li>
-<li><p>Assign names to constant literals and use the names instead.</p></li>
-<li><p>Keep functions small, a screenful at most. Split out chunks of logic into file-local classes or static functions if needed.</p></li>
-<li><p>Factor away nonessential complexity into local inline helper functions and helper classes.</p></li>
-<li><p>Think clearly about internal invariants that apply to each class, and document them in the form of asserts within member functions.</p></li>
-<li><p>Make simple, self-evident contracts for member functions. If you cannot communicate a simple contract, redesign the class.</p></li>
-<li><p>Implement classes as if expecting rough usage by clients. Check for incorrect usage of a class using <code>assert(...)</code>, <code>guarantee(...)</code>, <code>ShouldNotReachHere()</code> and comments wherever needed. Performance is almost never a reason to omit asserts.</p></li>
-<li><p>When possible, design as if for reusability. This forces a clear design of the class's externals, and clean hiding of its internals.</p></li>
-<li><p>Initialize all variables and data structures to a known state. If a class has a constructor, initialize it there.</p></li>
-<li><p>Do no optimization before its time. Prove the need to optimize.</p></li>
-<li><p>When you must defactor to optimize, preserve as much structure as possible. If you must hand-inline some name, label the local copy with the original name.</p></li>
-<li><p>If you need to use a hidden detail (e.g., a structure offset), name it (as a constant or function) in the class that owns it.</p></li>
-<li><p>Don't use the Copy and Paste keys to replicate more than a couple lines of code. Name what you must repeat.</p></li>
-<li><p>If a class needs a member function to change a user-visible attribute, the change should be done with a &quot;setter&quot; accessor matched to the simple &quot;getter&quot;.</p></li>
-</ul>
-<h3 id="source-files">Source Files</h3>
-<ul>
-<li><p>All source files must have a globally unique basename. The build system depends on this uniqueness.</p></li>
-<li><p>Do not put non-trivial function implementations in .hpp files. If the implementation depends on other .hpp files, put it in a .cpp or a .inline.hpp file.</p></li>
-<li><p>.inline.hpp files should only be included in .cpp or .inline.hpp files.</p></li>
-<li><p>All .inline.hpp files should include their corresponding .hpp file as the first include line. Declarations needed by other files should be put in the .hpp file, and not in the .inline.hpp file. This rule exists to resolve problems with circular dependencies between .inline.hpp files.</p></li>
-<li><p>All .cpp files include precompiled.hpp as the first include line.</p></li>
-<li><p>precompiled.hpp is just a build time optimization, so don't rely on it to resolve include problems.</p></li>
-<li><p>Keep the include lines alphabetically sorted.</p></li>
-<li><p>Put conditional inclusions (<code>#if ...</code>) at the end of the include list.</p></li>
-</ul>
-<h3 id="jtreg-tests">JTReg Tests</h3>
-<ul>
-<li><p>JTReg tests should have meaningful names.</p></li>
-<li><p>JTReg tests associated with specific bugs should be tagged with the <code>@bug</code> keyword in the test description.</p></li>
-<li><p>JTReg tests should be organized by component or feature under <code>test/</code>, in a directory hierarchy that generally follows that of the <code>src/</code> directory. There may be additional subdirectories to further categorize tests by feature. This structure makes it easy to run a collection of tests associated with a specific feature by specifying the associated directory as the source of the tests to run.</p>
-<ul>
-<li>Some (older) tests use the associated bug number in the directory name, the test name, or both. That naming style should no longer be used, with existing tests using that style being candidates for migration.</li>
-</ul></li>
-</ul>
-<h3 id="naming">Naming</h3>
-<ul>
-<li><p>The length of a name may be correlated to the size of its scope. In particular, short names (even single letter names) may be fine in a small scope, but are usually inappropriate for larger scopes.</p></li>
-<li><p>Prefer whole words rather than abbreviations, unless the abbreviation is more widely used than the long form in the code's domain.</p></li>
-<li><p>Choose names consistently. Do not introduce spurious variations. Abbreviate corresponding terms to a consistent length.</p></li>
-<li><p>Global names must be unique, to avoid <a href="https://en.cppreference.com/w/cpp/language/definition" title="One Definition Rule">One Definition Rule</a> (ODR) violations. A common prefixing scheme for related global names is often used. (This is instead of using namespaces, which are mostly avoided in HotSpot.)</p></li>
-<li><p>Don't give two names to the semantically same thing. But use different names for semantically different things, even if they are representationally the same. (So use meaningful <code>typedef</code> or template alias names where appropriate.)</p></li>
-<li><p>When choosing names, avoid categorical nouns like &quot;variable&quot;, &quot;field&quot;, &quot;parameter&quot;, &quot;value&quot;, and verbs like &quot;compute&quot;, &quot;get&quot;. (<code>storeValue(int param)</code> is bad.)</p></li>
-<li><p>Type names and global names should use mixed-case with the first letter of each word capitalized (<code>FooBar</code>).</p></li>
-<li><p>Embedded abbreviations in otherwise mixed-case names are usually capitalized entirely rather than being treated as a single word with only the initial letter capitalized, e.g. &quot;HTML&quot; rather than &quot;Html&quot;.</p></li>
-<li><p>Function and local variable names use lowercase with words separated by a single underscore (<code>foo_bar</code>).</p></li>
-<li><p>Class data member names have a leading underscore, and use lowercase with words separated by a single underscore (<code>_foo_bar</code>).</p></li>
-<li><p>Constant names may be upper-case or mixed-case, according to historical necessity. (Note: There are many examples of constants with lowercase names.)</p></li>
-<li><p>Constant names should follow an existing pattern, and must have a distinct appearance from other names in related APIs.</p></li>
-<li><p>Class and type names should be noun phrases. Consider an &quot;er&quot; suffix for a class that represents an action.</p></li>
-<li><p>Function names should be verb phrases that reflect changes of state known to a class's user, or else noun phrases if they cause no change of state visible to the class's user.</p></li>
-<li><p>Getter accessor names are noun phrases, with no &quot;<code>get_</code>&quot; noise word. Boolean getters can also begin with &quot;<code>is_</code>&quot; or &quot;<code>has_</code>&quot;. Member function for reading data members usually have the same name as the data member, exclusive of the leading underscore.</p></li>
-<li><p>Setter accessor names prepend &quot;<code>set_</code>&quot; to the getter name.</p></li>
-<li><p>Other member function names are verb phrases, as if commands to the receiver.</p></li>
-<li><p>Avoid leading underscores (as &quot;<code>_oop</code>&quot;) except in cases required above. (Names with leading underscores can cause portability problems.)</p></li>
-</ul>
-<h3 id="commenting">Commenting</h3>
-<ul>
-<li><p>Clearly comment subtle fixes.</p></li>
-<li><p>Clearly comment tricky classes and functions.</p></li>
-<li><p>If you have to choose between commenting code and writing wiki content, comment the code. Link from the wiki to the source file if it makes sense.</p></li>
-<li><p>As a general rule don't add bug numbers to comments (they would soon overwhelm the code). But if the bug report contains significant information that can't reasonably be added as a comment, then refer to the bug report.</p></li>
-<li><p>Personal names are discouraged in the source code, which is a team product.</p></li>
-</ul>
-<h3 id="macros">Macros</h3>
-<ul>
-<li><p>You can almost always use an inline function or class instead of a macro. Use a macro only when you really need it.</p></li>
-<li><p>Templates may be preferable to multi-line macros. (There may be subtle performance effects with templates on some platforms; revert to macros if absolutely necessary.)</p></li>
-<li><p><code>#ifdef</code>s should not be used to introduce platform-specific code into shared code (except for <code>_LP64</code>). They must be used to manage header files, in the pattern found at the top of every source file. They should be used mainly for major build features, including <code>PRODUCT</code>, <code>ASSERT</code>, <code>_LP64</code>, <code>INCLUDE_SERIALGC</code>, <code>COMPILER1</code>, etc.</p></li>
-<li><p>For build features such as <code>PRODUCT</code>, use <code>#ifdef PRODUCT</code> for multiple-line inclusions or exclusions.</p></li>
-<li><p>For short inclusions or exclusions based on build features, use macros like <code>PRODUCT_ONLY</code> and <code>NOT_PRODUCT</code>. But avoid using them with multiple-line arguments, since debuggers do not handle that well.</p></li>
-<li><p>Use <code>CATCH</code>, <code>THROW</code>, etc. for HotSpot-specific exception processing.</p></li>
-</ul>
-<h3 id="whitespace">Whitespace</h3>
-<ul>
-<li><p>In general, don't change whitespace unless it improves readability or consistency. Gratuitous whitespace changes will make integrations and backports more difficult.</p></li>
-<li><p>Use One-True-Brace-Style. The opening brace for a function or class is normally at the end of the line; it is sometimes moved to the beginning of the next line for emphasis. Substatements are enclosed in braces, even if there is only a single statement. Extremely simple one-line statements may drop braces around a substatement.</p></li>
-<li><p>Indentation levels are two columns.</p></li>
-<li><p>There is no hard line length limit. That said, bear in mind that excessively long lines can cause difficulties. Some people like to have multiple side-by-side windows in their editors, and long lines may force them to choose among unpleasant options. They can use wide windows, reducing the number that can fit across the screen, and wasting a lot of screen real estate because most lines are not that long. Alternatively, they can have more windows across the screen, with long lines wrapping (or worse, requiring scrolling to see in their entirety), which is harder to read. Similar issues exist for side-by-side code reviews.</p></li>
-<li><p>Tabs are not allowed in code. Set your editor accordingly.<br> (Emacs: <code>(setq-default indent-tabs-mode nil)</code>.)</p></li>
-<li><p>Use good taste to break lines and align corresponding tokens on adjacent lines.</p></li>
-<li><p>Use spaces around operators, especially comparisons and assignments. (Relaxable for boolean expressions and high-precedence operators in classic math-style formulas.)</p></li>
-<li><p>Put spaces on both sides of control flow keywords <code>if</code>, <code>else</code>, <code>for</code>, <code>switch</code>, etc. Don't add spaces around the associated <em>control</em> expressions. Examples:</p>
-<pre><code>while (test_foo(args...)) {   // Yes
-while(test_foo(args...)) {    // No, missing space after while
-while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></li>
-<li><p>Use extra parentheses in expressions whenever operator precedence seems doubtful. Always use parentheses in shift/mask expressions (<code>&lt;&lt;</code>, <code>&amp;</code>, <code>|</code>). Don't add whitespace immediately inside parentheses.</p></li>
-<li><p>Use more spaces and blank lines between larger constructs, such as classes or function definitions.</p></li>
-<li><p>If the surrounding code has any sort of vertical organization, adjust new lines horizontally to be consistent with that organization. (E.g., trailing backslashes on long macro definitions often align.)</p></li>
-</ul>
-<h3 id="miscellaneous">Miscellaneous</h3>
-<ul>
-<li><p>Use the <a href="https://en.cppreference.com/w/cpp/language/raii" title="Resource Acquisition Is Initialization">Resource Acquisition Is Initialization</a> (RAII) design pattern to manage bracketed critical sections. See class <code>ResourceMark</code> for an example.</p></li>
-<li>Avoid implicit conversions to <code>bool</code>.
-<ul>
-<li>Use <code>bool</code> for boolean values.</li>
-<li>Do not use ints or pointers as (implicit) booleans with <code>&amp;&amp;</code>, <code>||</code>, <code>if</code>, <code>while</code>. Instead, compare explicitly, i.e. <code>if (x != 0)</code> or <code>if (ptr != nullptr)</code>, etc.</li>
-<li>Do not use declarations in <em>condition</em> forms, i.e. don't use <code>if (T v = value) { ... }</code>.</li>
-</ul></li>
-<li><p>Use functions from globalDefinitions.hpp and related files when performing bitwise operations on integers. Do not code directly as C operators, unless they are extremely simple. (Examples: <code>align_up</code>, <code>is_power_of_2</code>, <code>exact_log2</code>.)</p></li>
-<li><p>Use arrays with abstractions supporting range checks.</p></li>
-<li><p>Always enumerate all cases in a switch statement or provide a default case. It is ok to have an empty default with comment.</p></li>
-</ul>
-<h2 id="use-of-c-features">Use of C++ Features</h2>
-<p>HotSpot was originally written in a subset of the C++98/03 language. More recently, support for C++14 is provided, though again, HotSpot only uses a subset. (Backports to JDK versions lacking support for more recent Standards must of course stick with the original C++98/03 subset.)</p>
-<p>This section describes that subset. Features from the C++98/03 language may be used unless explicitly excluded here. Features from C++11 and C++14 may be explicitly permitted or explicitly excluded, and discussed accordingly here. There is a third category, undecided features, about which HotSpot developers have not yet reached a consensus, or perhaps have not discussed at all. Use of these features is also excluded.</p>
-<p>(The use of some features may not be immediately obvious and may slip in anyway, since the compiler will accept them. The code review process is the main defense against this.)</p>
-<p>Some features are discussed in their own subsection, typically to provide more extensive discussion or rationale for limitations. Features that don't have their own subsection are listed in omnibus feature sections for permitted, excluded, and undecided features.</p>
-<p>Lists of new features for C++11 and C++14, along with links to their descriptions, can be found in the online documentation for some of the compilers and libraries. The C++14 Standard is the definitive description.</p>
-<ul>
-<li><a href="https://gcc.gnu.org/projects/cxx-status.html">C++ Standards Support in GCC</a></li>
-<li><a href="https://clang.llvm.org/cxx_status.html">C++ Support in Clang</a></li>
-<li><a href="https://docs.microsoft.com/en-us/cpp/visual-cpp-language-conformance">Visual C++ Language Conformance</a></li>
-<li><a href="https://gcc.gnu.org/onlinedocs/libstdc++/manual/status.html">libstdc++ Status</a></li>
-<li><a href="https://libcxx.llvm.org/cxx1y_status.html">libc++ Status</a></li>
-</ul>
-<p>As a rule of thumb, permitting features which simplify writing code and, especially, reading code, is encouraged.</p>
-<p>Similar discussions for some other projects:</p>
-<ul>
-<li><p><a href="https://google.github.io/styleguide/cppguide.html">Google C++ Style Guide</a> — Currently (2020) targeting C++17.</p></li>
-<li><p><a href="https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/c++11.md">C++11 and C++14 use in Chromium</a> — Categorizes features as allowed, banned, or to be discussed.</p></li>
-<li><p><a href="https://llvm.org/docs/CodingStandards.html">llvm Coding Standards</a> — Currently (2020) targeting C++14.</p></li>
-<li><p><a href="https://firefox-source-docs.mozilla.org/code-quality/coding-style/using_cxx_in_firefox_code.html">Using C++ in Mozilla code</a> — C++17 support is required for recent versions (2020).</p></li>
-</ul>
-<h3 id="error-handling">Error Handling</h3>
-<p>Do not use exceptions. Exceptions are disabled by the build configuration for some platforms.</p>
-<p>Rationale: There is significant concern over the performance cost of exceptions and their usage model and implications for maintainable code. That's not just a matter of history that has been fixed; there remain questions and problems even today (2019). See, for example, <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0709r0.pdf">Zero cost deterministic exceptions</a>. Because of this, HotSpot has always used a build configuration that disables exceptions where that is available. As a result, HotSpot code uses error handling mechanisms such as two-phase construction, factory functions, returning error codes, and immediate termination. Even if the cost of exceptions were not a concern, the existing body of code was not written with exception safety in mind. Making HotSpot exception safe would be a very large undertaking.</p>
-<p>In addition to the usual alternatives to exceptions, HotSpot provides its own exception mechanism. This is based on a set of macros defined in utilities/exceptions.hpp.</p>
-<h3 id="rtti-runtime-type-information">RTTI (Runtime Type Information)</h3>
-<p>Do not use <a href="https://en.wikipedia.org/wiki/Run-time_type_information" title="Runtime Type Information">Runtime Type Information</a> (RTTI). <a href="https://en.wikipedia.org/wiki/Run-time_type_information" title="Runtime Type Information">RTTI</a> is disabled by the build configuration for some platforms. Among other things, this means <code>dynamic_cast</code> cannot be used.</p>
-<p>Rationale: Other than to implement exceptions (which HotSpot doesn't use), most potential uses of <a href="https://en.wikipedia.org/wiki/Run-time_type_information" title="Runtime Type Information">RTTI</a> are better done via virtual functions. Some of the remainder can be replaced by bespoke mechanisms. The cost of the additional runtime data structures needed to support <a href="https://en.wikipedia.org/wiki/Run-time_type_information" title="Runtime Type Information">RTTI</a> are deemed not worthwhile, given the alternatives.</p>
-<h3 id="memory-allocation">Memory Allocation</h3>
-<p>Do not use the standard global allocation and deallocation functions (operator new and related functions). Use of these functions by HotSpot code is disabled for some platforms.</p>
-<p>Rationale: HotSpot often uses &quot;resource&quot; or &quot;arena&quot; allocation. Even where heap allocation is used, the standard global functions are avoided in favor of wrappers around malloc and free that support the VM's Native Memory Tracking (NMT) feature.</p>
-<p>Native memory allocation failures are often treated as non-recoverable. The place where &quot;out of memory&quot; is (first) detected may be an innocent bystander, unrelated to the actual culprit.</p>
-<h3 id="class-inheritance">Class Inheritance</h3>
-<p>Use public single inheritance.</p>
-<p>Prefer composition rather than non-public inheritance.</p>
-<p>Restrict inheritance to the &quot;is-a&quot; case; use composition rather than non-is-a related inheritance.</p>
-<p>Avoid multiple inheritance. Never use virtual inheritance.</p>
-<h3 id="namespaces">Namespaces</h3>
-<p>Avoid using namespaces. HotSpot code normally uses &quot;all static&quot; classes rather than namespaces for grouping. An &quot;all static&quot; class is not instantiable, has only static members, and is normally derived (possibly indirectly) from the helper class <code>AllStatic</code>.</p>
-<p>Benefits of using such classes include:</p>
-<ul>
-<li><p>Provides access control for members, which is unavailable with namespaces.</p></li>
-<li><p>Avoids <a href="https://en.cppreference.com/w/cpp/language/adl" title="Argument Dependent Lookup">Argument Dependent Lookup</a> (ADL).</p></li>
-<li><p>Closed for additional members. Namespaces allow names to be added in multiple contexts, making it harder to see the complete API.</p></li>
-</ul>
-<p>Namespaces should be used only in cases where one of those &quot;benefits&quot; is actually a hindrance.</p>
-<p>In particular, don't use anonymous namespaces. They seem like they should be useful, and indeed have some real benefits for naming and generated code size on some platforms. Unfortunately, debuggers don't seem to like them at all.</p>
-<p><a href="https://groups.google.com/forum/#!topic/mozilla.dev.platform/KsaG3lEEaRM" class="uri">https://groups.google.com/forum/#!topic/mozilla.dev.platform/KsaG3lEEaRM</a><br> Suggests Visual Studio debugger might not be able to refer to anonymous namespace symbols, so can't set breakpoints in them. Though the discussion seems to go back and forth on that.</p>
-<p><a href="https://firefox-source-docs.mozilla.org/code-quality/coding-style/coding_style_cpp.html" class="uri">https://firefox-source-docs.mozilla.org/code-quality/coding-style/coding_style_cpp.html</a><br> Search for &quot;Anonymous namespaces&quot; Suggests preferring &quot;static&quot; to anonymous namespaces where applicable, because of poor debugger support for anonymous namespaces.</p>
-<p><a href="https://sourceware.org/bugzilla/show_bug.cgi?id=16874" class="uri">https://sourceware.org/bugzilla/show_bug.cgi?id=16874</a><br> Bug for similar gdb problems.</p>
-<h3 id="c-standard-library">C++ Standard Library</h3>
-<p>Avoid using the C++ Standard Library.</p>
-<p>Historically, HotSpot has mostly avoided use of the Standard Library.</p>
-<p>(It used to be impossible to use most of it in shared code, because the build configuration for Solaris with Solaris Studio made all but a couple of pieces inaccessible. Support for header-only parts was added in mid-2017. Support for Solaris was removed in 2020.)</p>
-<p>Some reasons for this include</p>
-<ul>
-<li><p>Exceptions. Perhaps the largest core issue with adopting the use of Standard Library facilities is exceptions. HotSpot does not use exceptions and, for platforms which allow doing so, builds with them turned off. Many Standard Library facilities implicitly or explicitly use exceptions.</p></li>
-<li><p><code>assert</code>. An issue that is quickly encountered is the <code>assert</code> macro name collision (<a href="https://bugs.openjdk.java.net/browse/JDK-8007770">JDK-8007770</a>). Some mechanism for addressing this would be needed before much of the Standard Library could be used. (Not all Standard Library implementations use assert in header files, but some do.)</p></li>
-<li><p>Memory allocation. HotSpot requires explicit control over where allocations occur. The C++98/03 <code>std::allocator</code> class is too limited to support our usage. (Changes in more recent Standards may remove this limitation.)</p></li>
-<li><p>Implementation vagaries. Bugs, or simply different implementation choices, can lead to different behaviors among the various Standard Libraries we need to deal with.</p></li>
-<li><p>Inconsistent naming conventions. HotSpot and the C++ Standard use different naming conventions. The coexistence of those different conventions might appear jarring and reduce readability.</p></li>
-</ul>
-<p>There are a few exceptions to this rule.</p>
-<ul>
-<li><code>#include &lt;new&gt;</code> to use placement <code>new</code>, <code>std::nothrow</code>, and <code>std::nothrow_t</code>.</li>
-<li><code>#include &lt;limits&gt;</code> to use <code>std::numeric_limits</code>.</li>
-<li><code>#include &lt;type_traits&gt;</code>.</li>
-<li><code>#include &lt;cstddef&gt;</code> to use <code>std::nullptr_t</code>.</li>
-</ul>
-<p>TODO: Rather than directly #including (permitted) Standard Library headers, use a convention of #including wrapper headers (in some location like hotspot/shared/stdcpp). This provides a single place for dealing with issues we might have for any given header, esp. platform-specific issues.</p>
-<h3 id="type-deduction">Type Deduction</h3>
-<p>Use type deduction only if it makes the code clearer or safer. Do not use it merely to avoid the inconvenience of writing an explicit type, unless that type is itself difficult to write. An example of the latter is a function template return type that depends on template parameters in a non-trivial way.</p>
-<p>There are several contexts where types are deduced.</p>
-<ul>
-<li><p>Function argument deduction. This is always permitted, and indeed encouraged. It is nearly always better to allow the type of a function template argument to be deduced rather than explicitly specified.</p></li>
-<li><p><code>auto</code> variable declarations (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1984.pdf">n1984</a>)<br> For local variables, this can be used to make the code clearer by eliminating type information that is obvious or irrelevant. Excessive use can make code much harder to understand.</p></li>
-<li><p>Function return type deduction (<a href="https://isocpp.org/files/papers/N3638.html">n3638</a>)<br> Only use if the function body has a very small number of <code>return</code> statements, and generally relatively little other code.</p></li>
-<li><p>Also see <a href="#lambdaexpressions">lambda expressions</a>.</p></li>
-</ul>
-<h3 id="expression-sfinae">Expression SFINAE</h3>
-<p><a href="https://en.cppreference.com/w/cpp/language/sfinae" title="Substitution Failure Is Not An Error">Substitution Failure Is Not An Error</a> (SFINAE) is a template metaprogramming technique that makes use of template parameter substitution failures to make compile-time decisions.</p>
-<p>C++11 relaxed the rules for what constitutes a hard-error when attempting to substitute template parameters with template arguments, making most deduction errors be substitution errors; see (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2634.html">n2634</a>). This makes <a href="https://en.cppreference.com/w/cpp/language/sfinae" title="Substitution Failure Is Not An Error">SFINAE</a> more powerful and easier to use. However, the implementation complexity for this change is significant, and this seems to be a place where obscure corner-case bugs in various compilers can be found. So while this feature can (and indeed should) be used (and would be difficult to avoid), caution should be used when pushing to extremes.</p>
-<p>Here are a few closely related example bugs:<br> <a href="https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95468" class="uri">https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95468</a><br> <a href="https://developercommunity.visualstudio.com/content/problem/396562/sizeof-deduced-type-is-sometimes-not-a-constant-ex.html" class="uri">https://developercommunity.visualstudio.com/content/problem/396562/sizeof-deduced-type-is-sometimes-not-a-constant-ex.html</a></p>
-<h3 id="enum">enum</h3>
-<p>Where appropriate, <em>scoped-enums</em> should be used. (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2347.pdf">n2347</a>)</p>
-<p>Use of <em>unscoped-enums</em> is permitted, though ordinary constants may be preferable when the automatic initializer feature isn't used.</p>
-<p>The underlying type (the <em>enum-base</em>) of an unscoped enum type should always be specified explicitly. When unspecified, the underlying type is dependent on the range of the enumerator values and the platform.</p>
-<p>The underlying type of a <em>scoped-enum</em> should also be specified explicitly if conversions may be applied to values of that type.</p>
-<p>Due to bugs in certain (very old) compilers, there is widespread use of enums and avoidance of in-class initialization of static integral constant members. Compilers having such bugs are no longer supported. Except where an enum is semantically appropriate, new code should use integral constants.</p>
-<h3 id="thread_local">thread_local</h3>
-<p>Do not use <code>thread_local</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2659.htm">n2659</a>); instead, use the HotSpot macro <code>THREAD_LOCAL</code>. The initializer must be a constant expression.</p>
-<p>As was discussed in the review for <a href="https://mail.openjdk.java.net/pipermail/hotspot-dev/2019-September/039487.html">JDK-8230877</a>, <code>thread_local</code> allows dynamic initialization and destruction semantics. However, that support requires a run-time penalty for references to non-function-local <code>thread_local</code> variables defined in a different translation unit, even if they don't need dynamic initialization. Dynamic initialization and destruction of namespace-scoped thread local variables also has the same ordering problems as for ordinary namespace-scoped variables.</p>
-<h3 id="nullptr">nullptr</h3>
-<p>Prefer <code>nullptr</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf">n2431</a>) to <code>NULL</code>. Don't use (constexpr or literal) 0 for pointers.</p>
-<p>For historical reasons there are widespread uses of both <code>NULL</code> and of integer 0 as a pointer value.</p>
-<h3 id="atomic">&lt;atomic&gt;</h3>
-<p>Do not use facilities provided by the <code>&lt;atomic&gt;</code> header (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2427.html">n2427</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2752.htm">n2752</a>); instead, use the HotSpot <code>Atomic</code> class and related facilities.</p>
-<p>Atomic operations in HotSpot code must have semantics which are consistent with those provided by the JDK's compilers for Java. There are platform-specific implementation choices that a C++ compiler might make or change that are outside the scope of the C++ Standard, and might differ from what the Java compilers implement.</p>
-<p>In addition, HotSpot <code>Atomic</code> has a concept of &quot;conservative&quot; memory ordering, which may differ from (may be stronger than) sequentially consistent. There are algorithms in HotSpot that are believed to rely on that ordering.</p>
-<h3 id="uniform-initialization">Uniform Initialization</h3>
-<p>The use of <em>uniform initialization</em> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2672.htm">n2672</a>), also known as <em>brace initialization</em>, is permitted.</p>
-<p>Some relevant sections from cppreference.com:</p>
-<ul>
-<li><a href="https://en.cppreference.com/w/cpp/language/initialization">initialization</a></li>
-<li><a href="https://en.cppreference.com/w/cpp/language/value_initialization">value initialization</a></li>
-<li><a href="https://en.cppreference.com/w/cpp/language/direct_initialization">direct initialization</a></li>
-<li><a href="https://en.cppreference.com/w/cpp/language/list_initialization">list initialization</a></li>
-<li><a href="https://en.cppreference.com/w/cpp/language/aggregate_initialization">aggregate initialization</a></li>
-</ul>
-<p>Although related, the use of <code>std::initializer_list</code> remains forbidden, as part of the avoidance of the C++ Standard Library in HotSpot code.</p>
-<h3 id="local-function-objects">Local Function Objects</h3>
-<ul>
-<li>Local function objects, including lambda expressions, may be used.</li>
-<li>Lambda expressions must only be used as a downward value.</li>
-<li>Prefer <code>[&amp;]</code> as the capture list of a lambda expression.</li>
-<li>Return type deduction for lambda expressions is permitted, and indeed encouraged.</li>
-<li>An empty parameter list for a lambda expression may be elided.</li>
-<li>A lambda expression must not be <code>mutable</code>.</li>
-<li>Generic lambda expressions are permitted.</li>
-<li>Lambda expressions should be relatively simple.</li>
-<li>Anonymous lambda expressions should not overly clutter the enclosing expression.</li>
-<li>An anonymous lambda expression must not be directly invoked.</li>
-<li>Bind expressions are forbidden.</li>
-</ul>
-<p>Single-use function objects can be defined locally within a function, directly at the point of use. This is an alternative to having a function or function object class defined at class or namespace scope.</p>
-<p>This usage was somewhat limited by C++03, which does not permit such a class to be used as a template parameter. That restriction was removed by C++11 (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm">n2657</a>). Use of this feature is permitted.</p>
-<p>Many HotSpot protocols involve &quot;function-like&quot; objects that involve some named member function rather than a call operator. For example, a function that performs some action on all threads might be written as</p>
-<pre><code>void do_something() {
-  struct DoSomething : public ThreadClosure {
-    virtual void do_thread(Thread* t) {
-      ... do something with t ...
-    }
-  } closure;
-  Threads::threads_do(&amp;closure);
-}</code></pre>
-<p>HotSpot code has historically usually placed the DoSomething class at namespace (or sometimes class) scope. This separates the function's code from its use, often to the detriment of readability. It requires giving the class a globally unique name (if at namespace scope). It also loses the information that the class is intended for use in exactly one place, and does not have any subclasses. (However, the latter can now be indicated by declaring it <code>final</code>.) Often, for simplicity, a local class will skip things like access control and accessor functions, giving the enclosing function direct access to the implementation and eliminating some boilerplate that might be provided if the class is in some outer (more accessible) scope. On the other hand, if there is a lot of surrounding code in the function body or the local class is of significant size, defining it locally can increase clutter and reduce readability.</p>
-<p><a name="lambdaexpressions"></a> C++11 added <em>lambda expressions</em> as a new way to write a function object. Simple lambda expressions can be significantly more concise than a function object, eliminating a lot of boiler-plate. On the other hand, a complex lambda expression may not provide much, if any, readability benefit compared to an ordinary function object. Also, while a lambda can encapsulate a call to a &quot;function-like&quot; object, it cannot be used in place of such.</p>
-<p>A common use for local functions is as one-use <a href="https://en.cppreference.com/w/cpp/language/raii" title="Resource Acquisition Is Initialization">RAII</a> objects. The amount of boilerplate for a function object class (local or not) makes such usage somewhat clumsy and verbose. But with the help of a small amount of supporting utility code, lambdas work particularly well for this use case.</p>
-<p>Another use for local functions is <a href="https://en.wikipedia.org/wiki/Partial_application" title="Partial Application">partial application</a>. Again here, lambdas are typically much simpler and less verbose than function object classes.</p>
-<p>Because of these benefits, lambda expressions are permitted in HotSpot code, with some restrictions and usage guidance. An anonymous lambda is one which is passed directly as an argument. A named lambda is the value of a variable, which is its name.</p>
-<p>Lambda expressions should only be passed downward. In particular, a lambda should not be returned from a function or stored in a global variable, whether directly or as the value of a member of some other object. Lambda capture is syntactically subtle (by design), and propagating a lambda in such ways can easily pass references to captured values to places where they are no longer valid. In particular, members of the enclosing <code>this</code> object are effectively captured by reference, even if the default capture is by-value. For such uses-cases a function object class should be used to make the desired value capturing and propagation explicit.</p>
-<p>Limiting the capture list to <code>[&amp;]</code> (implicitly capture by reference) is a simplifying restriction that still provides good support for HotSpot usage, while reducing the cases a reader must recognize and understand.</p>
-<ul>
-<li><p>Many common lambda uses require reference capture. Not permitting it would substantially reduce the utility of lambdas.</p></li>
-<li><p>Referential transparency. Implicit reference capture makes variable references in the lambda body have the same meaning they would have in the enclosing code. There isn't a semantic barrier across which the meaning of a variable changes.</p></li>
-<li><p>Explicit reference capture introduces significant clutter, especially when lambda expressions are relatively small and simple, as they should be in HotSpot code.</p></li>
-<li><p>There are a number of reasons why by-value capture might be used, but for the most part they don't apply to HotSpot code, given other usage restrictions.</p>
-<ul>
-<li><p>A primary use-case for by-value capture is to support escaping uses, where values captured by-reference might become invalid. That use-case doesn't apply if only downward lambdas are used.</p></li>
-<li><p>By-value capture can also make a lambda-local copy for mutation, which requires making the lambda <code>mutable</code>; see below.</p></li>
-<li><p>By-value capture might be viewed as an optimization, avoiding any overhead for reference capture of cheap to copy values. But the compiler can often eliminate any such overhead.</p></li>
-<li><p>By-value capture by a non-<code>mutable</code> lambda makes the captured values const, preventing any modification by the lambda and making the captured value unaffected by modifications to the outer variable. But this only applies to captured auto variables, not member variables, and is inconsistent with referential transparency.</p></li>
-</ul></li>
-<li><p>Non-capturing lambdas (with an empty capture list - <code>[]</code>) have limited utility. There are cases where no captures are required (pure functions, for example), but if the function is small and simple then that's obvious anyway.</p></li>
-<li><p>Capture initializers (a C++14 feature - <a href="https://isocpp.org/files/papers/N3649.html">N3649</a>) are not permitted. Capture initializers inherently increase the complexity of the capture list, and provide little benefit over an additional in-scope local variable.</p></li>
-</ul>
-<p>The use of <code>mutable</code> lambda expressions is forbidden because there don't seem to be many, if any, good use-cases for them in HotSpot. A lambda expression needs to be mutable in order to modify a by-value captured value. But with only downward lambdas, such usage seems likely to be rare and complicated. It is better to use a function object class in any such cases that arise, rather than requiring all HotSpot developers to understand this relatively obscure feature.</p>
-<p>While it is possible to directly invoke an anonymous lambda expression, that feature should not be used, as such a form can be confusing to readers. Instead, name the lambda and call it by name.</p>
-<p>Some reasons to prefer a named lambda instead of an anonymous lambda are</p>
-<ul>
-<li><p>The body contains non-trivial control flow or declarations or other nested constructs.</p></li>
-<li><p>Its role in an argument list is hard to guess without examining the function declaration. Give it a name that indicates its purpose.</p></li>
-<li><p>It has an unusual capture list.</p></li>
-<li><p>It has a complex explicit return type or parameter types.</p></li>
-</ul>
-<p>Lambda expressions, and particularly anonymous lambda expressions, should be simple and compact. One-liners are good. Anonymous lambdas should usually be limited to a couple lines of body code. More complex lambdas should be named. A named lambda should not clutter the enclosing function and make it long and complex; do continue to break up large functions via the use of separate helper functions.</p>
-<p>An anonymous lambda expression should either be a one-liner in a one-line expression, or isolated in its own set of lines. Don't place part of a lambda expression on the same line as other arguments to a function. The body of a multi-line lambda argument should be indented from the start of the capture list, as if that were the start of an ordinary function definition. The body of a multi-line named lambda should be indented one step from the variable's indentation.</p>
-<p>Some examples:</p>
-<ol type="1">
-<li><code>foo([&amp;] { ++counter; });</code></li>
-<li><code>foo(x, [&amp;] { ++counter; });</code></li>
-<li><code>foo([&amp;] { if (predicate) ++counter; });</code></li>
-<li><code>foo([&amp;] { auto tmp = process(x); tmp.f(); return tmp.g(); })</code></li>
-<li><p>Separate one-line lambda from other arguments:</p>
-<pre><code>foo(c.begin(), c.end(),
-    [&amp;] (const X&amp; x) { do_something(x); return x.value(); });</code></pre></li>
-<li><p>Indentation for multi-line lambda:</p>
-<pre><code>c.do_entries([&amp;] (const X&amp; x) {
-               do_something(x, a);
-               do_something1(x, b);
-               do_something2(x, c);
-             });</code></pre></li>
-<li><p>Separate multi-line lambda from other arguments:</p>
-<pre><code>foo(c.begin(), c.end(),
-    [&amp;] (const X&amp; x) {
-      do_something(x, a);
-      do_something1(x, b);
-      do_something2(x, c);
-    });</code></pre></li>
-<li><p>Multi-line named lambda:</p>
-<pre><code>auto do_entry = [&amp;] (const X&amp; x) {
-  do_something(x, a);
-  do_something1(x, b);
-  do_something2(x, c);
-};</code></pre></li>
-</ol>
-<p>Item 4, and especially items 6 and 7, are pushing the simplicity limits for anonymous lambdas. Item 6 might be better written using a named lambda:</p>
-<pre><code>c.do_entries(do_entry);</code></pre>
-<p>Note that C++11 also added <em>bind expressions</em> as a way to write a function object for partial application, using <code>std::bind</code> and related facilities from the Standard Library. <code>std::bind</code> generalizes and replaces some of the binders from C++03. Bind expressions are not permitted in HotSpot code. They don't provide enough benefit over lambdas or local function classes in the cases where bind expressions are applicable to warrant the introduction of yet another mechanism in this space into HotSpot code.</p>
-<p>References:</p>
-<ul>
-<li>Local and unnamed types as template parameters (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm">n2657</a>)</li>
-<li>New wording for C++0x lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2927.pdf">n2927</a>)</li>
-<li>Generalized lambda capture (init-capture) (<a href="https://isocpp.org/files/papers/N3648.html">N3648</a>)</li>
-<li>Generic (polymorphic) lambda expressions (<a href="https://isocpp.org/files/papers/N3649.html">N3649</a>)</li>
-</ul>
-<p>References from C++17</p>
-<ul>
-<li>Wording for constexpr lambda (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0170r1.pdf">p0170r1</a>)</li>
-<li>Lambda capture of *this by Value (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0018r3.html">p0018r3</a>)</li>
-</ul>
-<p>References from C++20</p>
-<ul>
-<li>Allow lambda capture [=, this] (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0409r2.html">p0409r2</a>)</li>
-<li>Familiar template syntax for generic lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0428r2.pdf">p0428r2</a>)</li>
-<li>Simplifying implicit lambda capture (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0588r1.html">p0588r1</a>)</li>
-<li>Default constructible and assignable stateless lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0624r2.pdf">p0624r2</a>)</li>
-<li>Lambdas in unevaluated contexts (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0315r4.pdf">p0315r4</a>)</li>
-<li>Allow pack expansion in lambda init-capture (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0780r2.html">p0780r2</a>) (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p2095r0.html">p2095r0</a>)</li>
-<li>Deprecate implicit capture of this via [=] (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0806r2.html">p0806r2</a>)</li>
-</ul>
-<p>References from C++23</p>
-<ul>
-<li>Make () more optional for lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p1102r2.html">p1102r2</a>)</li>
-</ul>
-<h3 id="additional-permitted-features">Additional Permitted Features</h3>
-<ul>
-<li><p><code>constexpr</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf">n2235</a>) (<a href="https://isocpp.org/files/papers/N3652.html">n3652</a>)</p></li>
-<li><p>Sized deallocation (<a href="https://isocpp.org/files/papers/n3778.html">n3778</a>)</p></li>
-<li><p>Variadic templates (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2242.pdf">n2242</a>) (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2555.pdf">n2555</a>)</p></li>
-<li><p>Static assertions (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2004/n1720.html">n1720</a>)</p></li>
-<li><p><code>decltype</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2343.pdf">n2343</a>) (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3276.pdf">n3276</a>)</p></li>
-<li><p>Right angle brackets (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1757.html">n1757</a>)</p></li>
-<li><p>Default template arguments for function templates (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#226">CWG D226</a>)</p></li>
-<li><p>Template aliases (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2258.pdf">n2258</a>)</p></li>
-<li><p>Delegating constructors (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1986.pdf">n1986</a>)</p></li>
-<li><p>Explicit conversion operators (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2437.pdf">n2437</a>)</p></li>
-<li><p>Standard Layout Types (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2342.htm">n2342</a>)</p></li>
-<li><p>Defaulted and deleted functions (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2346.htm">n2346</a>)</p></li>
-<li><p>Dynamic initialization and destruction with concurrency (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2660.htm">n2660</a>)</p></li>
-<li><p><code>final</code> virtual specifiers for classes and virtual functions (<a href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm">n2928</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm">n3206</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm">n3272</a>)</p></li>
-<li><p><code>override</code> virtual specifiers for virtual functions (<a href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm">n2928</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm">n3206</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm">n3272</a>)</p></li>
-<li><p>Range-based <code>for</code> loops (<a href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2930.html">n2930</a>) (<a href="https://en.cppreference.com/w/cpp/language/range-for">range-for</a>)</p></li>
-</ul>
-<h3 id="excluded-features">Excluded Features</h3>
-<ul>
-<li>New string and character literals
-<ul>
-<li>New character types (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2249.html">n2249</a>)</li>
-<li>Unicode string literals (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2442.htm">n2442</a>)</li>
-<li>Raw string literals (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2442.htm">n2442</a>)</li>
-<li>Universal character name literals (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2170.html">n2170</a>)</li>
-</ul>
-<p>HotSpot doesn't need any of the new character and string literal types.</p></li>
-<li><p>User-defined literals (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2765.pdf">n2765</a>) — User-defined literals should not be added casually, but only through a proposal to add a specific UDL.</p></li>
-<li><p>Inline namespaces (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2535.htm">n2535</a>) — HotSpot makes very limited use of namespaces.</p></li>
-<li><p><code>using namespace</code> directives. In particular, don't use <code>using namespace std;</code> to avoid needing to qualify Standard Library names.</p></li>
-<li><p>Propagating exceptions (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2179.html">n2179</a>) — HotSpot does not permit the use of exceptions, so this feature isn't useful.</p></li>
-<li><p>Avoid namespace-scoped variables with non-constexpr initialization. In particular, avoid variables with types requiring non-trivial initialization or destruction. Initialization order problems can be difficult to deal with and lead to surprises, as can destruction ordering. HotSpot doesn't generally try to cleanup on exit, and running destructors at exit can also lead to problems.</p></li>
-<li><p><code>[[deprecated]]</code> attribute (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3760.html">n3760</a>) — Not relevant in HotSpot code.</p></li>
-<li><p>Avoid most operator overloading, preferring named functions. When operator overloading is used, ensure the semantics conform to the normal expected behavior of the operation.</p></li>
-<li><p>Avoid most implicit conversion constructors and (implicit or explicit) conversion operators. (Note that conversion to <code>bool</code> isn't needed in HotSpot code because of the &quot;no implicit boolean&quot; guideline.)</p></li>
-<li><p>Avoid covariant return types.</p></li>
-<li><p>Avoid <code>goto</code> statements.</p></li>
-</ul>
-<h3 id="undecided-features">Undecided Features</h3>
-<p>This list is incomplete; it serves to explicitly call out some features that have not yet been discussed.</p>
-<ul>
-<li><p>Trailing return type syntax for functions (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm">n2541</a>)</p></li>
-<li><p>Variable templates (<a href="https://isocpp.org/files/papers/N3651.pdf">n3651</a>)</p></li>
-<li><p>Member initializers and aggregates (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3653.html">n3653</a>)</p></li>
-<li><p><code>[[noreturn]]</code> attribute (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2761.pdf">n2761</a>)</p></li>
-<li><p>Rvalue references and move semantics</p></li>
-</ul>
-</body>
-</html>

doc/hotspot-unit-tests.html

@@ -1,223 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
-<head>
-  <meta charset="utf-8" />
-  <meta name="generator" content="pandoc" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-  <title>Native/Unit Test Development Guidelines</title>
-  <style type="text/css">
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
-  </style>
-  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
-  <!--[if lt IE 9]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
-  <![endif]-->
-</head>
-<body>
-<header id="title-block-header">
-<h1 class="title">Native/Unit Test Development Guidelines</h1>
-</header>
-<nav id="TOC">
-<ul>
-<li><a href="#good-test-properties">Good test properties</a><ul>
-<li><a href="#lightness">Lightness</a></li>
-<li><a href="#isolation">Isolation</a></li>
-<li><a href="#atomicity-and-self-containment">Atomicity and self-containment</a></li>
-<li><a href="#repeatability">Repeatability</a></li>
-<li><a href="#informativeness">Informativeness</a></li>
-<li><a href="#testing-instead-of-visiting">Testing instead of visiting</a></li>
-<li><a href="#nearness">Nearness</a></li>
-</ul></li>
-<li><a href="#asserts">Asserts</a><ul>
-<li><a href="#several-checks">Several checks</a></li>
-<li><a href="#first-parameter-is-expected-value">First parameter is expected value</a></li>
-<li><a href="#floating-point-comparison">Floating-point comparison</a></li>
-<li><a href="#c-string-comparison">C string comparison</a></li>
-<li><a href="#error-messages">Error messages</a></li>
-<li><a href="#uncluttered-output">Uncluttered output</a></li>
-<li><a href="#failures-propagation">Failures propagation</a></li>
-</ul></li>
-<li><a href="#naming-and-grouping">Naming and Grouping</a><ul>
-<li><a href="#test-group-names">Test group names</a></li>
-<li><a href="#filename">Filename</a></li>
-<li><a href="#file-location">File location</a></li>
-<li><a href="#test-names">Test names</a></li>
-<li><a href="#fixture-classes">Fixture classes</a></li>
-<li><a href="#friend-classes">Friend classes</a></li>
-<li><a href="#oscpu-specific-tests">OS/CPU specific tests</a></li>
-</ul></li>
-<li><a href="#miscellaneous">Miscellaneous</a><ul>
-<li><a href="#hotspot-style">Hotspot style</a></li>
-<li><a href="#codetest-metrics">Code/test metrics</a></li>
-<li><a href="#access-to-non-public-members">Access to non-public members</a></li>
-<li><a href="#death-tests">Death tests</a></li>
-<li><a href="#external-flags">External flags</a></li>
-<li><a href="#test-specific-flags">Test-specific flags</a></li>
-<li><a href="#flag-restoring">Flag restoring</a></li>
-<li><a href="#googletest-documentation">GoogleTest documentation</a></li>
-</ul></li>
-<li><a href="#todo">TODO</a></li>
-</ul>
-</nav>
-<p>The purpose of these guidelines is to establish a shared vision on what kind of native tests and how we want to develop them for Hotspot using GoogleTest. Hence these guidelines include style items as well as test approach items.</p>
-<p>First section of this document describes properties of good tests which are common for almost all types of test regardless of language, framework, etc. Further sections provide recommendations to achieve those properties and other HotSpot and/or GoogleTest specific guidelines.</p>
-<h2 id="good-test-properties">Good test properties</h2>
-<h3 id="lightness">Lightness</h3>
-<p>Use the most lightweight type of tests.</p>
-<p>In Hotspot, there are 3 different types of tests regarding their dependency on a JVM, each next level is slower than previous</p>
-<ul>
-<li><p><code>TEST</code> : a test does not depend on a JVM</p></li>
-<li><p><code>TEST_VM</code> : a test does depend on an initialized JVM, but are supposed not to break a JVM, i.e. leave it in a workable state.</p></li>
-<li><p><code>TEST_OTHER_VM</code> : a test depends on a JVM and requires a freshly initialized JVM or leaves a JVM in non-workable state</p></li>
-</ul>
-<h3 id="isolation">Isolation</h3>
-<p>Tests have to be isolated: not to have visible side-effects, influences on other tests results.</p>
-<p>Results of one test should not depend on test execution order, other tests, otherwise it is becoming almost impossible to find out why a test failed. Due to hotspot-specific, it is not so easy to get a full isolation, e.g. we share an initialized JVM between all <code>TEST_VM</code> tests, so if your test changes JVM's state too drastically and does not change it back, you had better consider <code>TEST_OTHER_VM</code>.</p>
-<h3 id="atomicity-and-self-containment">Atomicity and self-containment</h3>
-<p>Tests should be <em>atomic</em> and <em>self-contained</em> at the same time.</p>
-<p>One test should check a particular part of a class, subsystem, functionality, etc. Then it is quite easy to determine what parts of a product are broken basing on test failures. On the other hand, a test should test that part more-or-less entirely, because when one sees a test <code>FooTest::bar</code>, they assume all aspects of bar from <code>Foo</code> are tested.</p>
-<p>However, it is impossible to cover all aspects even of a method, not to mention a subsystem. In such cases, it is recommended to have several tests, one for each aspect of a thing under test. For example one test to tests how <code>Foo::bar</code> works if an argument is <code>null</code>, another test to test how it works if an argument is acceptable but <code>Foo</code> is not in the right state to accept it and so on. This helps not only to make tests atomic, self-contained but also makes test name self-descriptive (discussed in more details in <a href="#test-names">Test names</a>).</p>
-<h3 id="repeatability">Repeatability</h3>
-<p>Tests have to be repeatable.</p>
-<p>Reproducibility is very crucial for a test. No one likes sporadic test failures, they are hard to investigate, fix and verify a fix.</p>
-<p>In some cases, it is quite hard to write a 100% repeatable test, since besides a test there can be other moving parts, e.g. in case of <code>TEST_VM</code> there are several concurrently running threads. Despite this, we should try to make a test as reproducible as possible.</p>
-<h3 id="informativeness">Informativeness</h3>
-<p>In case of a failure, a test should be as <em>informative</em> as possible.</p>
-<p>Having more information about a test failure than just compared values can be very useful for failure troubleshooting, it can reduce or even completely eliminate debugging hours. This is even more important in case of not 100% reproducible failures.</p>
-<p>Achieving this property, one can easily make a test too verbose, so it will be really hard to find useful information in the ocean of useless information. Hence they should not only think about how to provide <a href="#error-messages">good information</a>, but also <a href="#uncluttered-output">when to do it</a>.</p>
-<h3 id="testing-instead-of-visiting">Testing instead of visiting</h3>
-<p>Tests should <em>test</em>.</p>
-<p>It is not enough just to &quot;visit&quot; some code, a test should check that code does that it has to do, compare return values with expected values, check that desired side effects are done, and undesired are not, and so on. In other words, a test should contain at least one GoogleTest assertion and do not rely on JVM asserts.</p>
-<p>Generally speaking to write a good test, one should create a model of the system under tests, a model of possible bugs (or bugs which one wants to find) and design tests using those models.</p>
-<h3 id="nearness">Nearness</h3>
-<p>Prefer having checks inside test code.</p>
-<p>Not only does having test logic outside, e.g. verification method, depending on asserts in product code contradict with several items above but also decreases test’s readability and stability. It is much easier to understand that a test is testing when all testing logic is located inside a test or nearby in shared test libraries. As a rule of thumb, the closer a check to a test, the better.</p>
-<h2 id="asserts">Asserts</h2>
-<h3 id="several-checks">Several checks</h3>
-<p>Prefer <code>EXPECT</code> over <code>ASSERT</code> if possible.</p>
-<p>This is related to the <a href="#informativeness">informativeness</a> property of tests, information for other checks can help to better localize a defect’s root-cause. One should use <code>ASSERT</code> if it is impossible to continue test execution or if it does not make much sense. Later in the text, <code>EXPECT</code> forms will be used to refer to both <code>ASSERT/EXPECT</code>.</p>
-<p>When it is possible to make several different checks, but impossible to continue test execution if at least one check fails, you can use <code>::testing::Test::HasNonfatalFailure()</code> function. The recommended way to express that is <code>ASSERT_FALSE(::testing::Test::HasNonfatalFailure())</code>. Besides making it clear why a test is aborted, it also allows you to provide more information about a failure.</p>
-<h3 id="first-parameter-is-expected-value">First parameter is expected value</h3>
-<p>In all equality assertions, expected values should be passed as the first parameter.</p>
-<p>This convention is adopted by GoogleTest, and there is a slight difference in how GoogleTest treats parameters, the most important one is <code>null</code> detection. Due to different reasons, <code>null</code> detection is enabled only for the first parameter, that is to said <code>EXPECT_EQ(NULL, object)</code> checks that object is <code>null</code>, while <code>EXPECT_EQ(object, NULL)</code> checks that object equals to <code>NULL</code>, GoogleTest is very strict regarding types of compared values so the latter will generates a compile-time error.</p>
-<h3 id="floating-point-comparison">Floating-point comparison</h3>
-<p>Use floating-point special macros to compare <code>float/double</code> values.</p>
-<p>Because of floating-point number representations and round-off errors, regular equality comparison will not return true in most cases. There are special <code>EXPECT_FLOAT_EQ/EXPECT_DOUBLE_EQ</code> assertions which check that the distance between compared values is not more than 4 ULPs, there is also <code>EXPECT_NEAR(v1, v2, eps)</code> which checks that the absolute value of the difference between <code>v1</code> and <code>v2</code> is not greater than <code>eps</code>.</p>
-<h3 id="c-string-comparison">C string comparison</h3>
-<p>Use string special macros for C strings comparisons.</p>
-<p><code>EXPECT_EQ</code> just compares pointers’ values, which is hardly what one wants comparing C strings. GoogleTest provides <code>EXPECT_STREQ</code> and <code>EXPECT_STRNE</code> macros to compare C string contents. There are also case-insensitive versions <code>EXPECT_STRCASEEQ</code>, <code>EXPECT_STRCASENE</code>.</p>
-<h3 id="error-messages">Error messages</h3>
-<p>Provide informative, but not too verbose error messages.</p>
-<p>All GoogleTest asserts print compared expressions and their values, so there is no need to have them in error messages. Asserts print only compared values, they do not print any of interim variables, e.g. <code>ASSERT_TRUE((val1 == val2 &amp;&amp; isFail(foo(8)) || i == 18)</code> prints only one value. If you use some complex predicates, please consider <code>EXPECT_PRED*</code> or <code>EXPECT_FORMAT_PRED</code> assertions family, they check that a predicate returns true/success and print out all parameters values.</p>
-<p>However in some cases, default information is not enough, a commonly used example is an assert inside a loop, GoogleTest will not print iteration values (unless it is an assert's parameter). Other demonstrative examples are printing error code and a corresponding error message; printing internal states which might have an impact on results. One should add this information to assert message using <code>&lt;&lt;</code> operator.</p>
-<h3 id="uncluttered-output">Uncluttered output</h3>
-<p>Print information only if it is needed.</p>
-<p>Too verbose tests which print all information even if they pass are very bad practice. They just pollute output, so it becomes harder to find useful information. In order not print information till it is really needed, one should consider saving it to a temporary buffer and pass to an assert. <a href="https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp" class="uri">https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp</a> has a good example how to do that.</p>
-<h3 id="failures-propagation">Failures propagation</h3>
-<p>Wrap a subroutine call into <code>EXPECT_NO_FATAL_FAILURE</code> macro to propagate failures.</p>
-<p><code>ASSERT</code> and <code>FAIL</code> abort only the current function, so if you have them in a subroutine, a test will not be aborted after the subroutine even if <code>ASSERT</code> or <code>FAIL</code> fails. You should call such subroutines in <code>ASSERT_NO_FATAL_FAILURE</code> macro to propagate fatal failures and abort a test. <code>(EXPECT|ASSERT)_NO_FATAL_FAILURE</code> can also be used to provide more information.</p>
-<p>Due to obvious reasons, there are no <code>(EXPECT|ASSERT)_NO_NONFATAL_FAILURE</code> macros. However, if you need to check if a subroutine generated a nonfatal failure (failed an <code>EXPECT</code>), you can use <code>::testing::Test::HasNonfatalFailure</code> function, or <code>::testing::Test::HasFailure</code> function to check if a subroutine generated any failures, see <a href="#several-checks">Several checks</a>.</p>
-<h2 id="naming-and-grouping">Naming and Grouping</h2>
-<h3 id="test-group-names">Test group names</h3>
-<p>Test group names should be in CamelCase, start and end with a letter. A test group should be named after tested class, functionality, subsystem, etc.</p>
-<p>This naming scheme helps to find tests, filter them and simplifies test failure analysis. For example, class <code>Foo</code> - test group <code>Foo</code>, compiler logging subsystem - test group <code>CompilerLogging</code>, G1 GC — test group <code>G1GC</code>, and so forth.</p>
-<h3 id="filename">Filename</h3>
-<p>A test file must have <code>test_</code> prefix and <code>.cpp</code> suffix.</p>
-<p>Both are actually requirements from the current build system to recognize your tests.</p>
-<h3 id="file-location">File location</h3>
-<p>Test file location should reflect a location of the tested part of the product.</p>
-<ul>
-<li><p>All unit tests for a class from <code>foo/bar/baz.cpp</code> should be placed <code>foo/bar/test_baz.cpp</code> in <code>hotspot/test/native/</code> directory. Having all tests for a class in one file is a common practice for unit tests, it helps to see all existing tests at once, share functions and/or resources without losing encapsulation.</p></li>
-<li><p>For tests which test more than one class, directory hierarchy should be the same as product hierarchy, and file name should reflect the name of the tested subsystem/functionality. For example, if a sub-system under tests belongs to <code>gc/g1</code>, tests should be placed in <code>gc/g1</code> directory.</p></li>
-</ul>
-<p>Please note that framework prepends directory name to a test group name. For example, if <code>TEST(foo, check_this)</code> and <code>TEST(bar, check_that)</code> are defined in <code>hotspot/test/native/gc/shared/test_foo.cpp</code> file, they will be reported as <code>gc/shared/foo::check_this</code> and <code>gc/shared/bar::check_that</code>.</p>
-<h3 id="test-names">Test names</h3>
-<p>Test names should be in small_snake_case, start and end with a letter. A test name should reflect that a test checks.</p>
-<p>Such naming makes tests self-descriptive and helps a lot during the whole test life cycle. It is easy to do test planning, test inventory, to see what things are not tested, to review tests, to analyze test failures, to evolve a test, etc. For example <code>foo_return_0_if_name_is_null</code> is better than <code>foo_sanity</code> or <code>foo_basic</code> or just <code>foo</code>, <code>humongous_objects_can_not_be_moved_by_young_gc</code> is better than <code>ho_young_gc</code>.</p>
-<p>Actually using underscore is against GoogleTest project convention, because it can lead to illegal identifiers, however, this is too strict. Restricting usage of underscore for test names only and prohibiting test name starts or ends with an underscore are enough to be safe.</p>
-<h3 id="fixture-classes">Fixture classes</h3>
-<p>Fixture classes should be named after tested classes, subsystems, etc (follow <a href="#test-group-names">Test group names rule</a>) and have <code>Test</code> suffix to prevent class name conflicts.</p>
-<h3 id="friend-classes">Friend classes</h3>
-<p>All test purpose friends should have either <code>Test</code> or <code>Testable</code> suffix.</p>
-<p>It greatly simplifies understanding of friendship’s purpose and allows statically check that private members are not exposed unexpectedly. Having <code>FooTest</code> as a friend of <code>Foo</code> without any comments will be understood as a necessary evil to get testability.</p>
-<h3 id="oscpu-specific-tests">OS/CPU specific tests</h3>
-<p>Guard OS/CPU specific tests by <code>#ifdef</code> and have OS/CPU name in filename.</p>
-<p>For the time being, we do not support separate directories for OS, CPU, OS-CPU specific tests, in case we will have lots of such tests, we will change directory layout and build system to support that in the same way it is done in hotspot.</p>
-<h2 id="miscellaneous">Miscellaneous</h2>
-<h3 id="hotspot-style">Hotspot style</h3>
-<p>Abide the norms and rules accepted in Hotspot style guide.</p>
-<p>Tests are a part of Hotspot, so everything (if applicable) we use for Hotspot, should be used for tests as well. Those guidelines cover test-specific things.</p>
-<h3 id="codetest-metrics">Code/test metrics</h3>
-<p>Coverage information and other code/test metrics are quite useful to decide what tests should be written, what tests should be improved and what can be removed.</p>
-<p>For unit tests, widely used and well-known coverage metric is branch coverage, which provides good quality of tests with relatively easy test development process. For other levels of testing, branch coverage is not as good, and one should consider others metrics, e.g. transaction flow coverage, data flow coverage.</p>
-<h3 id="access-to-non-public-members">Access to non-public members</h3>
-<p>Use explicit friend class to get access to non-public members.</p>
-<p>We do not use GoogleTest macro to declare friendship relation, because, from our point of view, it is less clear than an explicit declaration.</p>
-<p>Declaring a test fixture class as a friend class of a tested test is the easiest and the clearest way to get access. However, it has some disadvantages, here is some of them:</p>
-<ul>
-<li>Each test has to be declared as a friend</li>
-<li>Subclasses do not inheritance friendship relation</li>
-</ul>
-<p>In other words, it is harder to share code between tests. Hence if you want to share code or expect it to be useful in other tests, you should consider making members in a tested class protected and introduce a shared test-only class which expose those members via public functions, or even making members publicly accessible right away in a product class. If it is not an option to change members visibility, one can create a friend class which exposes members.</p>
-<h3 id="death-tests">Death tests</h3>
-<p>You can not use death tests inside <code>TEST_OTHER_VM</code> and <code>TEST_VM_ASSERT*</code>.</p>
-<p>We tried to make Hotspot-GoogleTest integration as transparent as possible, however, due to the current implementation of <code>TEST_OTHER_VM</code> and <code>TEST_VM_ASSERT*</code> tests, you cannot use death test functionality in them. These tests are implemented as GoogleTest death tests, and GoogleTest does not allow to have a death test inside another death test.</p>
-<h3 id="external-flags">External flags</h3>
-<p>Passing external flags to a tested JVM is not supported.</p>
-<p>The rationality of such design decision is to simplify both tests and a test framework and to avoid failures related to incompatible flags combination till there is a good solution for that. However there are cases when one wants to test a JVM with specific flags combination, <code>_JAVA_OPTIONS</code> environment variable can be used to do that. Flags from <code>_JAVA_OPTIONS</code> will be used in <code>TEST_VM</code>, <code>TEST_OTHER_VM</code> and <code>TEST_VM_ASSERT*</code> tests.</p>
-<h3 id="test-specific-flags">Test-specific flags</h3>
-<p>Passing flags to a tested JVM in <code>TEST_OTHER_VM</code> and <code>TEST_VM_ASSERT*</code> should be possible, but is not implemented yet.</p>
-<p>Facility to pass test-specific flags is needed for system, regression or other types of tests which require a fully initialized JVM in some particular configuration, e.g. with Serial GC selected. There is no support for such tests now, however, there is a plan to add that in upcoming releases.</p>
-<p>For now, if a test depends on flags values, it should have <code>if (!&lt;flag&gt;) { return }</code> guards in the very beginning and <code>@requires</code> comment similar to jtreg <code>@requires</code> directive right before test macros. <a href="https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp" class="uri">https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp</a> ha an example of this temporary workaround. It is important to follow that pattern as it allows us to easily find all such tests and update them as soon as there is an implementation of flag passing facility.</p>
-<p>In long-term, we expect jtreg to support GoogleTest tests as first class citizens, that is to say, jtreg will parse <span class="citation" data-cites="requires">@requires</span> comments and filter out inapplicable tests.</p>
-<h3 id="flag-restoring">Flag restoring</h3>
-<p>Restore changed flags.</p>
-<p>It is quite common for tests to configure JVM in a certain way changing flags’ values. GoogleTest provides two ways to set up environment before a test and restore it afterward: using either constructor and destructor or <code>SetUp</code> and <code>TearDown</code> functions. Both ways require to use a test fixture class, which sometimes is too wordy. The simpler facilities like <code>FLAG_GUARD</code> macro or <code>*FlagSetting</code> classes could be used in such cases to restore/set values.</p>
-<p>Caveats:</p>
-<ul>
-<li><p>Changing a flag’s value could break the invariants between flags' values and hence could lead to unexpected/unsupported JVM state.</p></li>
-<li><p><code>FLAG_SET_*</code> macros can change more than one flag (in order to maintain invariants) so it is hard to predict what flags will be changed and it makes restoring all changed flags a nontrivial task. Thus in case one uses <code>FLAG_SET_*</code> macros, they should use <code>TEST_OTHER_VM</code> test type.</p></li>
-</ul>
-<h3 id="googletest-documentation">GoogleTest documentation</h3>
-<p>In case you have any questions regarding GoogleTest itself, its asserts, test declaration macros, other macros, etc, please consult its documentation.</p>
-<h2 id="todo">TODO</h2>
-<p>Although this document provides guidelines on the most important parts of test development using GTest, it still misses a few items:</p>
-<ul>
-<li><p>Examples, esp for <a href="#access-to-non-public-members">access to non-public members</a></p></li>
-<li>test types: purpose, drawbacks, limitation
-<ul>
-<li><code>TEST_VM</code></li>
-<li><code>TEST_VM_F</code></li>
-<li><code>TEST_OTHER_VM</code></li>
-<li><code>TEST_VM_ASSERT</code></li>
-<li><code>TEST_VM_ASSERT_MSG</code></li>
-</ul></li>
-<li>Miscellaneous
-<ul>
-<li>Test libraries
-<ul>
-<li>where to place</li>
-<li>how to write</li>
-<li>how to use</li>
-</ul></li>
-<li>test your tests
-<ul>
-<li>how to run tests in random order</li>
-<li>how to run only specific tests</li>
-<li>how to run each test separately</li>
-<li>check that a test can find bugs it is supposed to by introducing them</li>
-</ul></li>
-<li>mocks/stubs/dependency injection</li>
-<li>setUp/tearDown
-<ul>
-<li>vs c-tor/d-tor</li>
-<li>empty test to test them</li>
-</ul></li>
-<li>internal (declared in .cpp) struct/classes</li>
-</ul></li>
-</ul>
-</body>
-</html>

doc/hotspot-unit-tests.md

@@ -1,451 +0,0 @@
-% Native/Unit Test Development Guidelines
-
-The purpose of these guidelines is to establish a shared vision on
-what kind of native tests and how we want to develop them for Hotspot
-using GoogleTest. Hence these guidelines include style items as well
-as test approach items.
-
-First section of this document describes properties of good tests
-which are common for almost all types of test regardless of language,
-framework, etc. Further sections provide recommendations to achieve
-those properties and other HotSpot and/or GoogleTest specific
-guidelines.
-
-## Good test properties
-
-### Lightness
-
-Use the most lightweight type of tests.
-
-In Hotspot, there are 3 different types of tests regarding their
-dependency on a JVM, each next level is slower than previous
-
-* `TEST` : a test does not depend on a JVM
-
-* `TEST_VM` : a test does depend on an initialized JVM, but are
-supposed not to break a JVM, i.e. leave it in a workable state.
-
-* `TEST_OTHER_VM` : a test depends on a JVM and requires a freshly
-initialized JVM or leaves a JVM in non-workable state
-
-### Isolation
-
-Tests have to be isolated: not to have visible side-effects,
-influences on other tests results.
-
-Results of one test should not depend on test execution order, other
-tests, otherwise it is becoming almost impossible to find out why a
-test failed. Due to hotspot-specific, it is not so easy to get a full
-isolation, e.g. we share an initialized JVM between all `TEST_VM` tests,
-so if your test changes JVM's state too drastically and does not
-change it back, you had better consider `TEST_OTHER_VM`.
-
-### Atomicity and self-containment
-
-Tests should be *atomic* and *self-contained* at the same time.
-
-One test should check a particular part of a class, subsystem,
-functionality, etc. Then it is quite easy to determine what parts of a
-product are broken basing on test failures. On the other hand, a test
-should test that part more-or-less entirely, because when one sees a
-test `FooTest::bar`, they assume all aspects of bar from `Foo` are tested.
-
-However, it is impossible to cover all aspects even of a method, not
-to mention a subsystem. In such cases, it is recommended to have
-several tests, one for each aspect of a thing under test. For example
-one test to tests how `Foo::bar` works if an argument is `null`, another
-test to test how it works if an argument is acceptable but `Foo` is not
-in the right state to accept it and so on. This helps not only to make
-tests atomic, self-contained but also makes test name self-descriptive
-(discussed in more details in [Test names](#test-names)).
-
-### Repeatability
-
-Tests have to be repeatable.
-
-Reproducibility is very crucial for a test. No one likes sporadic test
-failures, they are hard to investigate, fix and verify a fix.
-
-In some cases, it is quite hard to write a 100% repeatable test, since
-besides a test there can be other moving parts, e.g. in case of
-`TEST_VM` there are several concurrently running threads. Despite this,
-we should try to make a test as reproducible as possible.
-
-### Informativeness
-
-In case of a failure, a test should be as *informative* as possible.
-
-Having more information about a test failure than just compared values
-can be very useful for failure troubleshooting, it can reduce or even
-completely eliminate debugging hours. This is even more important in
-case of not 100% reproducible failures.
-
-Achieving this property, one can easily make a test too verbose, so it
-will be really hard to find useful information in the ocean of useless
-information. Hence they should not only think about how to provide
-[good information](#error-messages), but also
-[when to do it](#uncluttered-output).
-
-### Testing instead of visiting
-
-Tests should *test*.
-
-It is not enough just to "visit" some code, a test should check that
-code does that it has to do, compare return values with expected
-values, check that desired side effects are done, and undesired are
-not, and so on. In other words, a test should contain at least one
-GoogleTest assertion and do not rely on JVM asserts.
-
-Generally speaking to write a good test, one should create a model of
-the system under tests, a model of possible bugs (or bugs which one
-wants to find) and design tests using those models.
-
-### Nearness 
-
-Prefer having checks inside test code.
-
-Not only does having test logic outside, e.g. verification method,
-depending on asserts in product code contradict with several items
-above but also decreases test’s readability and stability. It is much
-easier to understand that a test is testing when all testing logic is
-located inside a test or nearby in shared test libraries. As a rule of
-thumb, the closer a check to a test, the better.
-
-## Asserts
-
-### Several checks
-
-Prefer `EXPECT` over `ASSERT` if possible.
-
-This is related to the [informativeness](#informativeness) property of
-tests, information for other checks can help to better localize a
-defect’s root-cause. One should use `ASSERT` if it is impossible to
-continue test execution or if it does not make much sense. Later in
-the text, `EXPECT` forms will be used to refer to both
-`ASSERT/EXPECT`.
-
-When it is possible to make several different checks, but impossible
-to continue test execution if at least one check fails, you can
-use `::testing::Test::HasNonfatalFailure()` function. The recommended
-way to express that is
-`ASSERT_FALSE(::testing::Test::HasNonfatalFailure())`. Besides making it
-clear why a test is aborted, it also allows you to provide more
-information about a failure.
-
-### First parameter is expected value
-
-In all equality assertions, expected values should be passed as the
-first parameter.
-
-This convention is adopted by GoogleTest, and there is a slight
-difference in how GoogleTest treats parameters, the most important one
-is `null` detection. Due to different reasons, `null` detection is enabled
-only for the first parameter, that is to said `EXPECT_EQ(NULL, object)`
-checks that object is `null`, while `EXPECT_EQ(object, NULL)` checks that
-object equals to `NULL`, GoogleTest is very strict regarding types of
-compared values so the latter will generates a compile-time error.
-
-### Floating-point comparison
-
-Use floating-point special macros to compare `float/double` values.
-
-Because of floating-point number representations and round-off errors,
-regular equality comparison will not return true in most cases. There
-are special `EXPECT_FLOAT_EQ/EXPECT_DOUBLE_EQ` assertions which check
-that the distance between compared values is not more than 4 ULPs,
-there is also `EXPECT_NEAR(v1, v2, eps)` which checks that the absolute
-value of the difference between `v1` and `v2` is not greater than `eps`.
-
-### C string comparison 
-
-Use string special macros for C strings comparisons.
-
-`EXPECT_EQ` just compares pointers’ values, which is hardly what one
-wants comparing C strings. GoogleTest provides `EXPECT_STREQ` and
-`EXPECT_STRNE` macros to compare C string contents. There are also
-case-insensitive versions `EXPECT_STRCASEEQ`, `EXPECT_STRCASENE`.
-
-### Error messages
-
-Provide informative, but not too verbose error messages.
-
-All GoogleTest asserts print compared expressions and their values, so
-there is no need to have them in error messages. Asserts print only
-compared values, they do not print any of interim variables, e.g.
-`ASSERT_TRUE((val1 == val2 && isFail(foo(8)) || i == 18)` prints only
-one value. If you use some complex predicates, please consider
-`EXPECT_PRED*` or `EXPECT_FORMAT_PRED` assertions family, they check that
-a predicate returns true/success and print out all parameters values.
-
-However in some cases, default information is not enough, a commonly
-used example is an assert inside a loop, GoogleTest will not print
-iteration values (unless it is an assert's parameter). Other
-demonstrative examples are printing error code and a corresponding
-error message; printing internal states which might have an impact on
-results. One should add this information to assert message using `<<`
-operator.
-
-### Uncluttered output
-
-Print information only if it is needed.
-
-Too verbose tests which print all information even if they pass are
-very bad practice. They just pollute output, so it becomes harder to
-find useful information. In order not print information till it is
-really needed, one should consider saving it to a temporary buffer and
-pass to an assert.
-<https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp>
-has a good example how to do that.
-
-### Failures propagation
-
-Wrap a subroutine call into `EXPECT_NO_FATAL_FAILURE` macro to
-propagate failures.
-
-`ASSERT` and `FAIL` abort only the current function, so if you have them
-in a subroutine, a test will not be aborted after the subroutine even
-if `ASSERT` or `FAIL` fails. You should call such subroutines in
-`ASSERT_NO_FATAL_FAILURE` macro to propagate fatal failures and abort a
-test. `(EXPECT|ASSERT)_NO_FATAL_FAILURE` can also be used to provide
-more information.
-
-Due to obvious reasons, there are no
-`(EXPECT|ASSERT)_NO_NONFATAL_FAILURE` macros. However, if you need to
-check if a subroutine generated a nonfatal failure (failed an `EXPECT`),
-you can use `::testing::Test::HasNonfatalFailure` function,
-or `::testing::Test::HasFailure` function to check if a subroutine
-generated any failures, see [Several checks](#several-checks).
-
-## Naming and Grouping
-
-### Test group names
-
-Test group names should be in CamelCase, start and end with a letter.
-A test group should be named after tested class, functionality,
-subsystem, etc.
-
-This naming scheme helps to find tests, filter them and simplifies
-test failure analysis. For example, class `Foo` - test group `Foo`,
-compiler logging subsystem - test group `CompilerLogging`, G1 GC — test
-group `G1GC`, and so forth.
-
-### Filename 
-
-A test file must have `test_` prefix and `.cpp` suffix.
-
-Both are actually requirements from the current build system to
-recognize your tests.
-
-### File location
-
-Test file location should reflect a location of the tested part of the product.
-
-* All unit tests for a class from `foo/bar/baz.cpp` should be placed
-`foo/bar/test_baz.cpp` in `hotspot/test/native/` directory. Having all
-tests for a class in one file is a common practice for unit tests, it
-helps to see all existing tests at once, share functions and/or
-resources without losing encapsulation.
-
-* For tests which test more than one class, directory hierarchy should
-be the same as product hierarchy, and file name should reflect the
-name of the tested subsystem/functionality. For example, if a
-sub-system under tests belongs to `gc/g1`, tests should be placed in
-`gc/g1` directory.
-
-Please note that framework prepends directory name to a test group
-name. For example, if `TEST(foo, check_this)` and `TEST(bar, check_that)`
-are defined in `hotspot/test/native/gc/shared/test_foo.cpp` file, they
-will be reported as `gc/shared/foo::check_this` and
-`gc/shared/bar::check_that`.
-
-### Test names
-
-Test names should be in small_snake_case, start and end with a letter.
-A test name should reflect that a test checks.
-
-Such naming makes tests self-descriptive and helps a lot during the
-whole test life cycle. It is easy to do test planning, test inventory,
-to see what things are not tested, to review tests, to analyze test
-failures, to evolve a test, etc. For example
-`foo_return_0_if_name_is_null` is better than `foo_sanity` or `foo_basic` or
-just `foo`, `humongous_objects_can_not_be_moved_by_young_gc` is better
-than `ho_young_gc`.
-
-Actually using underscore is against GoogleTest project convention,
-because it can lead to illegal identifiers, however, this is too
-strict. Restricting usage of underscore for test names only and
-prohibiting test name starts or ends with an underscore are enough to
-be safe.
-
-### Fixture classes
-
-Fixture classes should be named after tested classes, subsystems, etc
-(follow [Test group names rule](#test-group-names)) and have
-`Test` suffix to prevent class name conflicts.
-
-### Friend classes 
-
-All test purpose friends should have either `Test` or `Testable` suffix.
-
-It greatly simplifies understanding of friendship’s purpose and allows
-statically check that private members are not exposed unexpectedly.
-Having `FooTest` as a friend of `Foo` without any comments will be
-understood as a necessary evil to get testability.
-
-### OS/CPU specific tests
-
-Guard OS/CPU specific tests by `#ifdef` and have OS/CPU name in filename.
-
-For the time being, we do not support separate directories for OS,
-CPU, OS-CPU specific tests, in case we will have lots of such tests,
-we will change directory layout and build system to support that in
-the same way it is done in hotspot.
-
-## Miscellaneous
-
-### Hotspot style 
-
-Abide the norms and rules accepted in Hotspot style guide.
-
-Tests are a part of Hotspot, so everything (if applicable) we use for
-Hotspot, should be used for tests as well. Those guidelines cover
-test-specific things.
-
-### Code/test metrics
-
-Coverage information and other code/test metrics are quite useful to
-decide what tests should be written, what tests should be improved and
-what can be removed.
-
-For unit tests, widely used and well-known coverage metric is branch
-coverage, which provides good quality of tests with relatively easy
-test development process. For other levels of testing, branch coverage
-is not as good, and one should consider others metrics, e.g.
-transaction flow coverage, data flow coverage.
-
-### Access to non-public members
-
-Use explicit friend class to get access to non-public members.
-
-We do not use GoogleTest macro to declare friendship relation,
-because, from our point of view, it is less clear than an explicit
-declaration.
-
-Declaring a test fixture class as a friend class of a tested test is
-the easiest and the clearest way to get access. However, it has some
-disadvantages, here is some of them:
-
-* Each test has to be declared as a friend
-* Subclasses do not inheritance friendship relation
-
-In other words, it is harder to share code between tests. Hence if you
-want to share code or expect it to be useful in other tests, you
-should consider making members in a tested class protected and
-introduce a shared test-only class which expose those members via
-public functions, or even making members publicly accessible right
-away in a product class. If it is not an option to change members
-visibility, one can create a friend class which exposes members.
-
-### Death tests
-
-You can not use death tests inside `TEST_OTHER_VM` and `TEST_VM_ASSERT*`.
-
-We tried to make Hotspot-GoogleTest integration as transparent as
-possible, however, due to the current implementation of `TEST_OTHER_VM`
-and `TEST_VM_ASSERT*` tests, you cannot use death test functionality in
-them. These tests are implemented as GoogleTest death tests, and
-GoogleTest does not allow to have a death test inside another death
-test.
-
-### External flags
-
-Passing external flags to a tested JVM is not supported.
-
-The rationality of such design decision is to simplify both tests and
-a test framework and to avoid failures related to incompatible flags
-combination till there is a good solution for that. However there are
-cases when one wants to test a JVM with specific flags combination,
-`_JAVA_OPTIONS` environment variable can be used to do that. Flags from
-`_JAVA_OPTIONS` will be used in `TEST_VM`, `TEST_OTHER_VM` and
-`TEST_VM_ASSERT*` tests.
-
-### Test-specific flags
-
-Passing flags to a tested JVM in `TEST_OTHER_VM` and `TEST_VM_ASSERT*`
-should be possible, but is not implemented yet.
-
-Facility to pass test-specific flags is needed for system, regression
-or other types of tests which require a fully initialized JVM in some
-particular configuration, e.g. with Serial GC selected. There is no
-support for such tests now, however, there is a plan to add that in
-upcoming releases.
-
-For now, if a test depends on flags values, it should have `if
-(!<flag>) { return }` guards in the very beginning and `@requires`
-comment similar to jtreg `@requires` directive right before test macros.
-<https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp>
-ha an example of this temporary workaround.  It is important to follow
-that pattern as it allows us to easily find all such tests and update
-them as soon as there is an implementation of flag passing facility.
-
-In long-term, we expect jtreg to support GoogleTest tests as first
-class citizens, that is to say, jtreg will parse @requires comments
-and filter out inapplicable tests.
-
-### Flag restoring 
-
-Restore changed flags.
-
-It is quite common for tests to configure JVM in a certain way
-changing flags’ values. GoogleTest provides two ways to set up
-environment before a test and restore it afterward: using either
-constructor and destructor or `SetUp` and `TearDown` functions. Both ways
-require to use a test fixture class, which sometimes is too wordy. The
-simpler facilities like `FLAG_GUARD` macro or `*FlagSetting` classes could
-be used in such cases to restore/set values.
-
-Caveats: 
-
-* Changing a flag’s value could break the invariants between flags' values and hence could lead to unexpected/unsupported JVM state.
-
-* `FLAG_SET_*` macros can change more than one flag (in order to
-maintain invariants) so it is hard to predict what flags will be
-changed and it makes restoring all changed flags a nontrivial task.
-Thus in case one uses `FLAG_SET_*` macros, they should use `TEST_OTHER_VM`
-test type.
-
-### GoogleTest documentation
-
-In case you have any questions regarding GoogleTest itself, its
-asserts, test declaration macros, other macros, etc, please consult
-its documentation.
-
-## TODO
-
-Although this document provides guidelines on the most important parts
-of test development using GTest, it still misses a few items:
-
-* Examples, esp for [access to non-public members](#access-to-non-public-members)
-
-* test types: purpose, drawbacks, limitation
-    * `TEST_VM`
-    * `TEST_VM_F`
-    * `TEST_OTHER_VM`
-    * `TEST_VM_ASSERT`
-    * `TEST_VM_ASSERT_MSG`
-
-* Miscellaneous
-    * Test libraries
-        * where to place
-        * how to write
-        * how to use
-    * test your tests
-        * how to run tests in random order
-        * how to run only specific tests
-        * how to run each test separately
-        * check that a test can find bugs it is supposed to by introducing them
-    * mocks/stubs/dependency injection
-    * setUp/tearDown
-        * vs c-tor/d-tor
-        * empty test to test them
-    * internal (declared in .cpp) struct/classes

doc/nashorn/DEVELOPER_README

@@ -0,0 +1,631 @@
+This document describes system properties that are used for internal
+debugging and instrumentation purposes, along with the system loggers,
+which are used for the same thing.
+
+This document is intended as a developer resource, and it is not
+needed as Nashorn documentation for normal usage. Flags and system
+properties described herein are subject to change without notice.
+
+=====================================
+1. System properties used internally
+=====================================
+
+This documentation of the system property flags assume that the
+default value of the flag is false, unless otherwise specified.
+
+SYSTEM PROPERTY: -Dnashorn.args=<string>
+
+This property takes as its value a space separated list of Nashorn
+command line options that should be passed to Nashorn. This might be
+useful in environments where it is hard to tell how a nashorn.jar is
+launched.
+
+Example:
+
+> java -Dnashorn.args="--lazy-complation --log=compiler" large-java-app-with-nashorn.jar 
+> ant -Dnashorn.args="--log=codegen" antjob
+
+SYSTEM PROPERTY: -Dnashorn.args.prepend=<string>
+
+This property behaves like nashorn.args, but adds the given arguments
+before the existing ones instead of after them. Later arguments will
+overwrite earlier ones, so this is useful for setting default arguments
+that can be overwritten.
+
+
+SYSTEM PROPERTY: -Dnashorn.unstable.relink.threshold=x
+
+NOTE: This property is deprecated in favor of the 
+"--unstable-relink-threshold" command line option. It controls how many
+call site misses are allowed before a callsite is relinked with "apply"
+semantics to never change again. In the case of megamorphic callsites, 
+this is necessary, or the program would spend all its time swapping out 
+callsite targets. When neither the system property nor the command line
+option are specified, defaults to 8, or 16 with optimistic types turned
+on.
+
+
+SYSTEM PROPERTY: -Dnashorn.compiler.splitter.threshold=x
+
+This will change the node weight that requires a subgraph of the IR to
+be split into several classes in order not to run out of bytecode space.
+The default value is 0x8000 (32768).
+
+
+SYSTEM PROPERTY: -Dnashorn.serialize.compression=<x>
+
+This property sets the compression level used when deflating serialized
+AST structures of anonymous split functions. Valid values range from 0 to 9,
+the default value is 4. Higher values will reduce memory size of serialized
+AST but increase CPU usage required for compression.
+
+
+SYSTEM PROPERTY: -Dnashorn.codegen.debug.trace=<x>
+
+See the description of the codegen logger below.
+
+
+SYSTEM PROPERTY: -Dnashorn.fields.objects, -Dnashorn.fields.dual
+
+When the nashorn.fields.objects property is true, Nashorn will always
+use object fields for AccessorProperties, requiring boxing for all
+primitive property values. When nashorn.fields.dual is set, Nashorn
+will always use dual long/object fields, which allows primitives to be
+stored without boxing. When neither system property is set, Nashorn
+chooses a setting depending on the optimistic types setting (dual
+fields when optimistic types are enabled, object-only fields otherwise).
+
+With dual fields, Nashorn uses long fields to store primitive values.
+Ints are represented as the 32 low bits of the long fields. Doubles
+are represented as the doubleToLongBits of their value. This way a
+single field can be used for all primitive types. Packing and
+unpacking doubles to their bit representation is intrinsified by
+the JVM and extremely fast.
+
+In the future, this might complement or be replaced by experimental
+feature sun.misc.TaggedArray, which has been discussed on the mlvm
+mailing list. TaggedArrays are basically a way to share data space
+between primitives and references, and have the GC understand this.
+
+
+SYSTEM PROPERTY: -Dnashorn.compiler.symbol.trace=[<x>[,*]], 
+  -Dnashorn.compiler.symbol.stacktrace=[<x>[,*]]
+
+When this property is set, creation and manipulation of any symbol
+named "x" will show information about when the compiler changes its
+type assumption, bytecode local variable slot assignment and other
+data. This is useful if, for example, a symbol shows up as an Object,
+when you believe it should be a primitive. Usually there is an
+explanation for this, for example that it exists in the global scope
+and type analysis has to be more conservative. 
+
+Several symbols names to watch can be specified by comma separation.
+
+If no variable name is specified (and no equals sign), all symbols
+will be watched
+
+By using "stacktrace" instead of or together with "trace", stack
+traces will be displayed upon symbol changes according to the same
+semantics.
+
+
+SYSTEM PROPERTY: -Dnashorn.lexer.xmlliterals
+
+If this property it set, it means that the Lexer should attempt to
+parse XML literals, which would otherwise generate syntax
+errors. Warning: there are currently no unit tests for this
+functionality.
+
+XML literals, when this is enabled, end up as standard LiteralNodes in
+the IR.
+
+
+SYSTEM_PROPERTY: -Dnashorn.debug
+
+If this property is set to true, Nashorn runs in Debug mode. Debug
+mode is slightly slower, as for example statistics counters are enabled
+during the run. Debug mode makes available a NativeDebug instance
+called "Debug" in the global space that can be used to print property
+maps and layout for script objects, as well as a "dumpCounters" method
+that will print the current values of the previously mentioned stats
+counters.
+
+These functions currently exists for Debug:
+
+"map" - print(Debug.map(x)) will dump the PropertyMap for object x to
+stdout (currently there also exist functions called "embedX", where X
+is a value from 0 to 3, that will dump the contents of the embed pool
+for the first spill properties in any script object and "spill", that
+will dump the contents of the growing spill pool of spill properties
+in any script object. This is of course subject to change without
+notice, should we change the script object layout.
+
+"methodHandle" - this method returns the method handle that is used
+for invoking a particular script function.
+
+"identical" - this method compares two script objects for reference
+equality. It is a == Java comparison
+
+"equals" - Returns true if two objects are either referentially
+identical or equal as defined by java.lang.Object.equals.
+
+"dumpCounters" - will dump the debug counters' current values to
+stdout.
+
+Currently we count number of ScriptObjects in the system, number of
+Scope objects in the system, number of ScriptObject listeners added,
+removed and dead (without references).
+
+We also count number of ScriptFunctions, ScriptFunction invocations
+and ScriptFunction allocations.
+
+Furthermore we count PropertyMap statistics: how many property maps
+exist, how many times were property maps cloned, how many times did
+the property map history cache hit, prevent new allocations, how many
+prototype invalidations were done, how many time the property map
+proto cache hit.
+
+Finally we count callsite misses on a per callsite bases, which occur
+when a callsite has to be relinked, due to a previous assumption of
+object layout being invalidated.
+
+"getContext" - return the current Nashorn context.
+
+"equalWithoutType" - Returns true if if the two objects are both
+property maps, and they have identical properties in the same order,
+but allows the properties to differ in their types.
+
+"diffPropertyMaps" Returns a diagnostic string representing the difference
+of two property maps.
+
+"getClass" - Returns the Java class of an object, or undefined if null.
+
+"toJavaString" - Returns the Java toString representation of an object.
+
+"toIdentString" - Returns a string representation of an object consisting
+of its java class name and hash code.
+
+"getListenerCount" - Return the number of property listeners for a
+script object.
+
+"getEventQueueCapacity" - Get the capacity of the event queue.
+
+"setEventQueueCapacity" - Set the event queue capacity.
+
+"addRuntimeEvent" - Add a runtime event to the runtime event queue.
+The queue has a fixed size (see -Dnashorn.runtime.event.queue.size)
+and the oldest entry will be thrown out of the queue is about to overflow.
+
+"expandEventQueueCapacity" - Expands the event queue capacity,
+or truncates if capacity is lower than current capacity. Then only
+the newest entries are kept.
+
+"clearRuntimeEvents" - Clear the runtime event queue.
+
+"removeRuntimeEvent" - Remove a specific runtime event from the event queue.
+
+"getRuntimeEvents" - Return all runtime events in the queue as an array.
+
+"getLastRuntimeEvent" - Return the last runtime event in the queue.
+
+
+SYSTEM PROPERTY: -Dnashorn.methodhandles.debug.stacktrace
+
+This enhances methodhandles logging (see below) to also dump the
+stack trace for every instrumented method handle operation.
+Warning: This is enormously verbose, but provides a pretty
+decent "grep:able" picture of where the calls are coming from.
+
+
+SYSTEM PROPERTY: -Dnashorn.cce
+
+Setting this system property causes the Nashorn linker to rely on
+ClassCastExceptions for triggering a callsite relink. If not set, the linker
+will add an explicit instanceof guard.
+
+
+SYSTEM PROPERTY: -Dnashorn.spill.threshold=<x>
+
+This property sets the number of fields in an object from which to use
+generic array based spill storage instead of Java fields. The default value
+is 256.
+
+
+SYSTEM PROPERTY: -Dnashorn.tcs.miss.samplePercent=<x>
+
+When running with the trace callsite option (-tcs), Nashorn will count
+and instrument any callsite misses that require relinking. As the
+number of relinks is large and usually produces a lot of output, this
+system property can be used to constrain the percentage of misses that
+should be logged. Typically this is set to 1 or 5 (percent). 1% is the
+default value.
+
+SYSTEM PROPERTY: -Dnashorn.persistent.code.cache
+
+This property can be used to set the directory where Nashorn stores
+serialized script classes generated with the -pcc/--persistent-code-cache
+option. The default directory name is "nashorn_code_cache".
+
+
+SYSTEM PROPERTY: -Dnashorn.typeInfo.maxFiles
+
+Maximum number of files to store in the type info cache. The type info cache
+is used to cache type data of JavaScript functions when running with
+optimistic types (-ot/--optimistic-types). There is one file per JavaScript
+function in the cache.
+
+The default value is 0 which means the feature is disabled. Setting this
+to something like 20000 is probably good enough for most applications and
+will usually cap the cache directory to about 80MB presuming a 4kB
+filesystem allocation unit. Set this to "unlimited" to run without limit.
+
+If the value is not 0 or "unlimited", Nashorn will spawn a cleanup thread
+that makes sure the number of files in the cache does not exceed the given
+value by deleting the least recently modified files.
+
+
+SYSTEM PROPERTY: -Dnashorn.typeInfo.cacheDir
+
+This property can be used to set the directory where Nashorn stores the
+type info cache when -Dnashorn.typeInfo.maxFiles is set to a nonzero
+value. The default location is platform specific. On Windows, it is
+"${java.io.tmpdir}\com.oracle.java.NashornTypeInfo". On Linux and
+Solaris it is "~/.cache/com.oracle.java.NashornTypeInfo". On Mac OS X,
+it is "~/Library/Caches/com.oracle.java.NashornTypeInfo".
+
+
+SYSTEM PROPERTY: -Dnashorn.typeInfo.cleanupDelaySeconds=<value>
+
+This sets the delay between cleanups of the typeInfo cache, in seconds.
+The default delay is 20 seconds.
+
+
+SYSTEM PROPERTY: -Dnashorn.profilefile=<filename>
+
+When running with the profile callsite options (-pcs), Nashorn will
+dump profiling data for all callsites to stderr as a shutdown hook. To
+instead redirect this to a file, specify the path to the file using
+this system property.
+
+
+SYSTEM_PROPERTY: -Dnashorn.regexp.impl=[jdk|joni]
+
+This property defines the regular expression engine to be used by
+Nashorn. Set this flag to "jdk" to get an implementation based on the
+JDK's java.util.regex package. Set this property to "joni" to install
+an implementation based on Joni, the regular expression engine used by
+the JRuby project. The default value for this flag is "joni"
+
+SYSTEM PROPERTY: -Dnashorn.runtime.event.queue.size=<value>
+
+Nashorn provides a fixed sized runtime event queue for debugging purposes.
+See -Dnashorn.debug for methods to access the event queue.
+The default value is 1024.
+
+SYSTEM PROPERTY: -Dnashorn.anonymous.classes.threshold=<value>
+
+Nashorn can use anonymous classes for loading compiled scripts, depending
+on the --anonymous-classes=[auto|true|false] option. Anonymous classes load
+faster, but the loaded classes get less optimization applied to them and
+therefore usually run slower. In the default "auto" setting, scripts are
+loaded as anonymous classes if the script size does not exceed 512 bytes.
+The above system property allows to set this threshold to a user defined
+value.
+
+===============
+2. The loggers.
+===============
+
+It is very simple to create your own logger. Use the DebugLogger class
+and give the subsystem name as a constructor argument.
+
+The Nashorn loggers can be used to print per-module or per-subsystem
+debug information with different levels of verbosity. The loggers for
+a given subsystem are available are enabled by using
+
+--log=<systemname>[:<level>]
+
+on the command line.
+
+Here <systemname> identifies the name of the subsystem to be logged
+and the optional colon and level argument is a standard
+java.util.logging.Level name (severe, warning, info, config, fine,
+finer, finest). If the level is left out for a particular subsystem,
+it defaults to "info". Any log message logged as the level or a level
+that is more important will be output to stderr by the logger.
+
+Several loggers can be enabled by a single command line option, by
+putting a comma after each subsystem/level tuple (or each subsystem if
+level is unspecified). The --log option can also be given multiple
+times on the same command line, with the same effect.
+
+For example: --log=codegen,fields:finest is equivalent to
+--log=codegen:info --log=fields:finest
+
+The following is an incomplete list of subsystems that currently
+support logging. Look for classes implementing
+jdk.nashorn.internal.runtime.logging.Loggable for more loggers.
+
+
+* compiler
+
+The compiler is in charge of turning source code and function nodes
+into byte code, and installs the classes into a class loader
+controlled from the Context. Log messages are, for example, about
+things like new compile units being allocated. The compiler has global
+settings that all the tiers of codegen (e.g. Lower and CodeGenerator)
+use.s
+
+
+* recompile
+
+This logger shows information about recompilation of scripts and
+functions at runtime. Recompilation may happen because a function
+was called with different parameter types, or because an optimistic
+assumption failed while executing a function with -ot/--optimistic-types.
+
+
+* codegen
+
+The code generator is the emitter stage of the code pipeline, and
+turns the lowest tier of a FunctionNode into bytecode. Codegen logging
+shows byte codes as they are being emitted, line number information
+and jumps. It also shows the contents of the bytecode stack prior to
+each instruction being emitted. This is a good debugging aid. For
+example:
+
+[codegen] #41                       line:2 (f)_afc824e 
+[codegen] #42                           load symbol x slot=2 
+[codegen] #43  {1:O}                    load int 0 
+[codegen] #44  {2:I O}                  dynamic_runtime_call GT:ZOI_I args=2 returnType=boolean 
+[codegen] #45                              signature (Ljava/lang/Object;I)Z 
+[codegen] #46  {1:Z}                    ifeq  ternary_false_5402fe28 
+[codegen] #47                           load symbol x slot=2 
+[codegen] #48  {1:O}                    goto ternary_exit_107c1f2f 
+[codegen] #49                       ternary_false_5402fe28 
+[codegen] #50                           load symbol x slot=2 
+[codegen] #51  {1:O}                    convert object -> double 
+[codegen] #52  {1:D}                    neg 
+[codegen] #53  {1:D}                    convert double -> object 
+[codegen] #54  {1:O}                ternary_exit_107c1f2f 
+[codegen] #55  {1:O}                    return object 
+
+shows a ternary node being generated for the sequence "return x > 0 ?
+x : -x"
+
+The first number on the log line is a unique monotonically increasing
+emission id per bytecode. There is no guarantee this is the same id
+between runs.  depending on non deterministic code
+execution/compilation, but for small applications it usually is. If
+the system variable -Dnashorn.codegen.debug.trace=<x> is set, where x
+is a bytecode emission id, a stack trace will be shown as the
+particular bytecode is about to be emitted. This can be a quick way to
+determine where it comes from without attaching the debugger. "Who
+generated that neg?"
+
+The --log=codegen option is equivalent to setting the system variable
+"nashorn.codegen.debug" to true.
+
+* fold
+
+Shows constant folding taking place before lowering
+
+* lower
+
+This is the first lowering pass.
+
+Lower is a code generation pass that turns high level IR nodes into
+lower level one, for example substituting comparisons to RuntimeNodes
+and inlining finally blocks.
+
+Lower is also responsible for determining control flow information
+like end points.
+
+* symbols
+
+The symbols logger tracks the assignment os symbols to identifiers.
+
+* scopedepths
+
+This logs the calculation of scope depths for non-local symbols.
+
+* fields
+
+The --log=fields option (at info level) is equivalent to setting the
+system variable "nashorn.fields.debug" to true. At the info level it
+will only show info about type assumptions that were invalidated. If
+the level is set to finest, it will also trace every AccessorProperty
+getter and setter in the program, show arguments, return values
+etc. It will also show the internal representation of respective field
+(Object in the normal case, unless running with the dual field
+representation)
+
+* time
+
+This enables timers for various phases of script compilation. The timers
+will be dumped when the Nashorn process exits. We see a percentage value
+of how much time was spent not executing bytecode (i.e. compilation and
+internal tasks) at the end of the report. 
+
+A finer level than "info" will show individual compilation timings as they
+happen.
+
+Here is an example:
+
+[time] Accumulated complation phase Timings:
+[time] 
+[time] 'JavaScript Parsing'              1076 ms
+[time] 'Constant Folding'                 159 ms
+[time] 'Control Flow Lowering'            303 ms
+[time] 'Program Point Calculation'        282 ms
+[time] 'Builtin Replacement'               71 ms
+[time] 'Code Splitting'                   670 ms
+[time] 'Symbol Assignment'                474 ms
+[time] 'Scope Depth Computation'          249 ms
+[time] 'Optimistic Type Assignment'       186 ms
+[time] 'Local Variable Type Calculation'  526 ms
+[time] 'Bytecode Generation'             5177 ms
+[time] 'Class Installation'              1854 ms
+[time] 
+[time] Total runtime: 11994 ms (Non-runtime: 11027 ms [91%])
+
+* methodhandles
+
+If this logger is enabled, each MethodHandle related call that uses
+the java.lang.invoke package gets its MethodHandle intercepted and an
+instrumentation printout of arguments and return value appended to
+it. This shows exactly which method handles are executed and from
+where. (Also MethodTypes and SwitchPoints).
+
+* classcache
+
+This logger shows information about reusing code classes using the
+in-memory class cache. Nashorn will try to avoid compilation of
+scripts by using existing classes. This can significantly improve
+performance when repeatedly evaluating the same script.
+
+=======================
+3. Undocumented options
+=======================
+
+Here follows a short description of undocumented options for Nashorn.
+To see a list of all undocumented options, use the (undocumented) flag
+"-xhelp".
+
+i.e. jjs -xhelp or java -jar nashorn.jar -xhelp
+
+Undocumented options are not guaranteed to work, run correctly or be
+bug free. They are experimental and for internal or debugging use.
+They are also subject to change without notice.
+
+In practice, though, all options below not explicitly documented as
+EXPERIMENTAL can be relied upon, for example --dump-on-error is useful
+for any JavaScript/Nashorn developer, but there is no guarantee.
+
+A short summary follows:
+
+	-D (-Dname=value. Set a system property. This option can be repeated.)
+
+	-ccs, --class-cache-size (Size of the Class cache size per global scope.)
+
+	-cp, -classpath (-cp path. Specify where to find user class files.)
+
+	-co, --compile-only (Compile without running.)
+		param: [true|false]   default: false
+
+	-d, --dump-debug-dir (specify a destination directory to dump class files.)
+		param: <path>   
+
+	--debug-lines (Generate line number table in .class files.)
+		param: [true|false]   default: true
+
+	--debug-locals (Generate local variable table in .class files.)
+		param: [true|false]   default: false
+
+	-doe, -dump-on-error (Dump a stack trace on errors.)
+		param: [true|false]   default: false
+
+	--early-lvalue-error (invalid lvalue expressions should be reported as early errors.)
+		param: [true|false]   default: true
+
+	--empty-statements (Preserve empty statements in AST.)
+		param: [true|false]   default: false
+
+	-fv, -fullversion (Print full version info of Nashorn.)
+		param: [true|false]   default: false
+
+	--function-statement-error (Report an error when function declaration is used as a statement.)
+		param: [true|false]   default: false
+
+	--function-statement-warning (Warn when function declaration is used as a statement.)
+		param: [true|false]   default: false
+
+	-fx (Launch script as an fx application.)
+		param: [true|false]   default: false
+
+	--global-per-engine (Use single Global instance per script engine instance.)
+		param: [true|false]   default: false
+
+	-h, -help (Print help for command line flags.)
+		param: [true|false]   default: false
+
+	--loader-per-compile (Create a new class loader per compile.)
+		param: [true|false]   default: true
+
+	-l, --locale (Set Locale for script execution.)
+		param: <locale>   default: en-US
+
+	--log (Enable logging of a given level for a given number of sub systems. 
+	      [for example: --log=fields:finest,codegen:info].)
+		param: <module:level>,*   
+
+	-nj, --no-java (Disable Java support.)
+		param: [true|false]   default: false
+
+	-nse, --no-syntax-extensions (Disallow non-standard syntax extensions.)
+		param: [true|false]   default: false
+
+	-nta, --no-typed-arrays (Disable typed arrays support.)
+		param: [true|false]   default: false
+
+	--parse-only (Parse without compiling.)
+		param: [true|false]   default: false
+
+	--print-ast (Print abstract syntax tree.)
+		param: [true|false]   default: false
+
+	-pc, --print-code (Print generated bytecode. If a directory is specified, nothing will 
+	                  be dumped to stderr. Also, in that case, .dot files will be generated 
+	                  for all functions or for the function with the specified name only.)
+		param: [dir:<output-dir>,function:<name>]   
+
+	--print-lower-ast (Print lowered abstract syntax tree.)
+		param: [true|false]   default: false
+
+	-plp, --print-lower-parse (Print the parse tree after lowering.)
+		param: [true|false]   default: false
+
+	--print-no-newline (Print function will not print new line char.)
+		param: [true|false]   default: false
+
+	-pp, --print-parse (Print the parse tree.)
+		param: [true|false]   default: false
+
+	--print-symbols (Print the symbol table.)
+		param: [true|false]   default: false
+
+	-pcs, --profile-callsites (Dump callsite profile data.)
+		param: [true|false]   default: false
+
+	-scripting (Enable scripting features.)
+		param: [true|false]   default: false
+
+	--stderr (Redirect stderr to a filename or to another tty, e.g. stdout.)
+		param: <output console>   
+
+	--stdout (Redirect stdout to a filename or to another tty, e.g. stderr.)
+		param: <output console>   
+
+	-strict (Run scripts in strict mode.)
+		param: [true|false]   default: false
+
+	-t, -timezone (Set timezone for script execution.)
+		param: <timezone>   default: Europe/Stockholm
+
+	-tcs, --trace-callsites (Enable callsite trace mode. Options are: miss [trace callsite misses] 
+	                         enterexit [trace callsite enter/exit], objects [print object properties].)
+		param: [=[option,]*]   
+
+	-urt, --unstable-relink-threshold (Number of times a dynamic call site has to be relinked before it 
+	                                  is considered unstable, when the runtime will try to link it as 
+	                                  if it is megamorphic.)
+
+	--verify-code (Verify byte code before running.)
+		param: [true|false]   default: false
+
+	-v, -version (Print version info of Nashorn.)
+		param: [true|false]   default: false
+
+	-xhelp (Print extended help for command line flags.)
+		param: [true|false]   default: false
+

doc/nashorn/JavaScriptingProgrammersGuide.html

@@ -0,0 +1,988 @@
+<!--
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.  Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
+ by Oracle in the LICENSE file that accompanied this code.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html class=" regenabled  gecko radius jsenabled regloaded" xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<title>Java Scripting Programmer's Guide</title>
+
+<!-- ============ -->
+<!-- MAIN CONTENT -->
+<!-- ============ -->
+<table summary="layout" border="0" width="100%">
+<tbody><tr>
+<td>
+
+<div id="sharepage" class="smallpagetitle"><h1>Java Scripting Programmer's Guide</h1><div class="sharepage">		<div class="sharepagew1 share-mailto">		<table summary="" cellpadding="0" cellspacing="0"><tbody><tr>		<td id="share-mailto"><a href="mailto:?subject=Java%20Documentation%20Page:%20Java%20Scripting%20Programmer%27s%20Guide&amp;body=Check%20out%20this%20page:%20%0A%0Ahttp%3A%2F%2Fdocs.oracle.com%2Fjavase%2F6%2Fdocs%2Ftechnotes%2Fguides%2Fscripting%2Fprogrammer_guide%2Findex.html" class="sharelink mailto" title="Email this page to a friend"></a></td>		<td id="share-technorati"><a href="http://technorati.com/search/http%3A%2F%2Fdocs.oracle.com%2Fjavase%2F6%2Fdocs%2Ftechnotes%2Fguides%2Fscripting%2Fprogrammer_guide%2Findex.html" class="sharelink technorati" title="See who links to this page on Technorati"></a></td>		<td id="share-delicious"><a href="http://del.icio.us/post?v=4;url=http%3A%2F%2Fdocs.oracle.com%2Fjavase%2F6%2Fdocs%2Ftechnotes%2Fguides%2Fscripting%2Fprogrammer_guide%2Findex.html;title=Java%20Scripting%20Programmer%27s%20Guide" class="sharelink delicious" title="Bookmark this page in del.icio.us"></a></td>		<td id="share-digg"><a href="http://digg.com/submit?phase=2&amp;url=http%3A%2F%2Fdocs.oracle.com%2Fjavase%2F6%2Fdocs%2Ftechnotes%2Fguides%2Fscripting%2Fprogrammer_guide%2Findex.html&amp;title=Java%20Scripting%20Programmer%27s%20Guide" class="sharelink digg" title="Submit this page to Digg"></a></td>		<td id="share-slashdot"><a href="http://slashdot.org/bookmark.pl?title=Java%20Scripting%20Programmer%27s%20Guide&amp;url=http%3A%2F%2Fdocs.oracle.com%2Fjavase%2F6%2Fdocs%2Ftechnotes%2Fguides%2Fscripting%2Fprogrammer_guide%2Findex.html" class="sharelink slashdot" title="Submit this page to Slashdot"></a></td>		<td id="share-blank"> </td></tr></tbody></table></div></div></div>
+
+</td>
+</tr>
+</tbody></table>
+<!-- Body text begins here -->
+<ul>
+<li><span><a href="#who">Who is the Java Scripting API
+For?</a></span></li>
+<li><span><a href="#package">Scripting Package</a></span></li>
+<li><span><a href="#examples">Examples</a></span>
+<ul>
+<li><span><a href="#helloworld">"Hello, World"</a></span></li>
+<li><span><a href="#evalfile">Evaluating a Script
+File</a></span></li>
+<li><span><a href="#scriptvars">Script Variables</a></span></li>
+<li><span><a href="#invoke">Invoking Script Functions and
+Methods</a></span></li>
+<li><span><a href="#interfaces">Implementing Java Interfaces by
+Scripts</a></span></li>
+<li><span><a href="#scopes">Multiple Scopes for
+Scripts</a></span></li>
+</ul>
+</li>
+<li><span><a href="#jsengine">JavaScript Script
+Engine</a></span></li>
+<li><span><a href="#jstojava">JavaScript to Java
+Communication</a></span>
+<ul>
+<li><span><a href="#jsjavaclass">Accessing Java
+Classes</a></span></li>
+<li><span><a href="#jsimport">Importing Java Packages,
+Classes</a></span></li>
+<li><span><a href="#jsarrays">Creating, Converting and Using Java
+Arrays</a></span></li>
+<li><span><a href="#jsimplement">Implementing Java
+Interfaces</a></span></li>
+<li><span><a href="#jsextendabstract">Extending Abstract Java Classes
+</a></span></li>
+<li><span><a href="#jsextendconcrete">Extending Concrete Java Classes
+</a></span></li>
+<li><span><a href="#jsimplementmultiple">Implementing Multiple Java Interfaces
+</a></span></li>
+<li><span><a href="#classBoundImplementations">Class-Bound Implementations
+</a></span></li>
+<li><span><a href="#jsoverload">Overload Resolution</a></span></li>
+<li><span><a href="#dataTypeMapping">Mapping of Data Types Between Java
+and JavaScript</a></span></li>
+
+
+
+</ul>
+</li>
+<li><span><a href="#engineimpl">Implementing Your Own Script
+Engine</a></span></li>
+<li><span><a href="#refs">References</a></span></li>
+</ul>
+<span><a name="who" id="who"></a></span>
+<h2><span>Who is the Java Scripting API For?</span></h2>
+<span>Some useful characteristics of scripting languages
+are:</span>
+<ul>
+<li><span><b>Convenience</b>: Most scripting languages are
+dynamically typed. You can usually create new variables without
+declaring the variable type, and you can reuse variables to store
+objects of different types. Also, scripting languages tend to
+perform many type conversions automatically, for example,
+converting the number 10 to the text "10" as necessary.</span></li>
+<li><span><b>Developing rapid prototypes</b>: You can avoid the
+edit-compile-run cycle and just use edit-run!</span></li>
+<li><span><b>Application extension/customization</b>: You can
+"externalize" parts of your application - like configuration
+scripts, business logic/rules and math expressions for financial
+applications.</span></li>
+<li><span><b>"Command line" shells for applications</b> -for
+debugging, runtime/deploy time configuration etc. Most applications
+have a web-based GUI configuaration tool these days. But
+sysadmins/deployers frequently prefer command line tools. Instead
+of inventing ad-hoc scripting language for that purpose, a
+"standard" scripting language can be used.</span></li>
+</ul>
+<p><span>The Java<font size="-1"><sup>TM</sup></font> Scripting API
+is a scripting language indepedent framework for using script
+engines from Java code. With the Java Scripting API, it is possible
+to write customizable/extendable applications in the Java language
+and leave the customization scripting language choice to the end
+user. The Java application developer need not choose the extension
+language during development. If you write your application with
+JSR-223 API, then your users can use any JSR-223 compliant
+scripting language.</span></p>
+<hr>
+<span><a name="package" id="package"></a></span>
+<h2><span>Scripting Package</span></h2>
+<p><span>The Java Scripting functionality is in the <code><a href="http://docs.oracle.com/javase/9/docs/api/javax/script/package-summary.html">javax.script</a></code>
+package. This is a relatively small, simple API. The starting point
+of the scripting API is the <code>ScriptEngineManager</code> class.
+A ScriptEngineManager object can discover script engines through
+the jar file service discovery mechanism. It can also instantiate
+ScriptEngine objects that interpret scripts written in a specific
+scripting language. The simplest way to use the scripting API is as
+follows:</span></p>
+<ol>
+<li><span>Create a <code>ScriptEngineManager</code>
+object.</span></li>
+<li><span>Get a <code>ScriptEngine</code> object from the
+manager.</span></li>
+<li><span>Evaluate script using the <code>ScriptEngine</code>'s
+<code>eval</code> methods.</span></li>
+</ol>
+<p><span>Now, it is time to look at some sample code. While it is
+not mandatory, it may be useful to know a bit of JavaScript to read
+these examples.</span></p>
+<hr>
+<span><a name="examples" id="examples"></a></span>
+<h2><span>Examples</span></h2>
+<span><a name="helloworld" id="helloworld"></a></span>
+<h3><span>"Hello, World"</span></h3>
+<p><span>From the <code>ScriptEngineManager</code> instance, we
+request a JavaScript engine instance using
+<code>getEngineByName</code> method. On the script engine, the
+<code>eval</code> method is called to execute a given String as
+JavaScript code! For brevity, in this as well as in subsequent
+examples, we have not shown exception handling. There are checked
+and runtime exceptions thrown from <code>javax.script</code> API.
+Needless to say, you have to handle the exceptions
+appropriately.</span></p>
+<pre>
+<span><code>
+// <a href="source/EvalScript.java">EvalScript.java</a>
+
+import javax.script.*;
+public class EvalScript {
+    public static void main(String[] args) throws Exception {
+        // create a script engine manager
+        <span class="classref">ScriptEngineManager</span> factory = new ScriptEngineManager();
+        // create a JavaScript engine
+        <span class="classref">ScriptEngine</span> engine = factory.<span class="methodref">getEngineByName</span>("nashorn");
+        // evaluate JavaScript code from String
+        engine.<span class="methodref">eval</span>("print('Hello, World')");
+    }
+}
+</code></span>
+</pre>
+<hr>
+<a name="evalfile" id="evalfile"></a>
+<h3>Evaluating a Script File</h3>
+<p>In this example, we call the <code>eval</code> method that
+accepts <code>java.io.Reader</code> for the input source. The
+script read by the given reader is executed. This way it is
+possible to execute scripts from files, URLs and resources by
+wrapping the relevant input stream objects as readers.</p>
+<pre>
+<code>
+// <a href="source/EvalFile.java">EvalFile.java</a>
+
+import javax.script.*;
+
+public class EvalFile {
+    public static void main(String[] args) throws Exception {
+        // create a script engine manager
+        <span class="classref">ScriptEngineManager</span> factory = new ScriptEngineManager();
+        // create JavaScript engine
+        <span class="classref">ScriptEngine</span> engine = factory.<span class="methodref">getEngineByName</span>("nashorn");
+        // evaluate JavaScript code from given file - specified by first argument
+        engine.<span class="methodref">eval</span>(new java.io.FileReader(args[0]));
+    }
+}
+</code>
+</pre>
+Let us assume that we have the file named <a href="source/test.js">test.js</a> with the
+following text:
+<pre><code>
+print("This is hello from test.js");
+</code>
+</pre>
+We can run the above Java as
+<pre><code>
+java EvalFile test.js
+</code>
+</pre>
+<hr>
+<a name="scriptvars" id="scriptvars"></a>
+<h3>Script Variables</h3>
+<p>When you embed script engines and scripts with your Java
+application, you may want to expose your application objects as
+global variables to scripts. This example demonstrates how you can
+expose your application objects as global variables to a script. We
+create a <code>java.io.File</code> in the application and expose
+the same as a global variable with the name "file". The script can
+access the variable - for example, it can call public methods on
+it. Note that the syntax to access Java objects, methods and fields
+is dependent on the scripting language. JavaScript supports the
+most "natural" Java-like syntax.</p>
+<p>
+Nashorn script engine pre-defines two global variables named "context"
+and "engine". The "context" variable is of type javax.script.ScriptContext
+and refers to the current ScriptContext instance passed to script engine's
+eval method. The "engine" variable is of type javax.script.ScriptEngine and
+refers to the current nashorn script engine instance evaluating the script.
+Both of these variables are non-writable, non-enumerable and non-configurable
+- which implies script code can not write overwrite the value, for..loop iteration
+on global object will not iterate these variables and these variables can not be
+deleted by script.
+<pre><code>
+// <a href="source/ScriptVars.java">ScriptVars.java</a>
+
+import javax.script.*;
+import java.io.*;
+
+public class ScriptVars { 
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        File f = new File("test.txt");
+        // expose File object as variable to script
+        engine.<span class="methodref">put</span>("file", f);
+
+        // evaluate a script string. The script accesses "file" 
+        // variable and calls method on it
+        engine.eval("print(file.getAbsolutePath())");
+    }
+}
+
+</code>
+</pre>
+<hr>
+<a name="invoke" id="invoke"></a>
+<h3>Invoking Script Functions and Methods</h3>
+<p>Sometimes you may want to call a specific scripting function
+repeatedly - for example, your application menu functionality might
+be implemented by a script. In your menu's action event handler you
+may want to call a specific script function. The following example
+demonstrates invoking a specific script function from Java
+code.</p>
+<pre><code>
+// <a href="source/InvokeScriptFunction.java">InvokeScriptFunction.java</a>
+
+import javax.script.*;
+
+public class InvokeScriptFunction {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String
+        String script = "function hello(name) { print('Hello, ' + name); }";
+        // evaluate script
+        engine.eval(script);
+
+        // <code>javax.script.Invocable</code> is an optional interface.
+        // Check whether your script engine implements it or not!
+        // Note that the JavaScript engine implements Invocable interface.
+        <span class="classref">Invocable</span> inv = (Invocable) engine;
+
+        // invoke the global function named "hello"
+        inv.<span class="methodref">invokeFunction</span>("hello", "Scripting!!" );
+    }
+}
+
+</code>
+</pre>
+<p>If your scripting language is object based (like JavaScript) or
+object-oriented, then you can invoke a script method on a script
+object.</p>
+<pre><code>
+// <a href="source/InvokeScriptMethod.java">InvokeScriptMethod.java</a>
+
+import javax.script.*;
+
+public class InvokeScriptMethod {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String. This code defines a script object 'obj'
+        // with one method called 'hello'.        
+        String script = "var obj = new Object(); obj.hello = function(name) { print('Hello, ' + name); }";
+        // evaluate script
+        engine.eval(script);
+
+        // <code>javax.script.Invocable</code> is an optional interface.
+        // Check whether your script engine implements or not!
+        // Note that the JavaScript engine implements Invocable interface.
+        <span class="classref">Invocable</span> inv = (Invocable) engine;
+
+        // get script object on which we want to call the method
+        Object obj = engine.<span class="methodref">get</span>("obj");
+
+        // invoke the method named "hello" on the script object "obj"
+        inv.<span class="methodref">invokeMethod</span>(obj, "hello", "Script Method !!" );
+    }
+}
+
+</code>
+</pre>
+<hr>
+<a name="interfaces" id="interfaces"></a>
+<h3>Implementing Java Interfaces by Scripts</h3>
+<p>Instead of calling specific script functions from Java,
+sometimes it is convenient to implement a Java interface by script
+functions or methods. Also, by using interfaces we can avoid having
+to use the <code>javax.script</code> API in many places. We can get
+an interface implementor object and pass it to various Java APIs.
+The following example demonstrates implementing the
+<code>java.lang.Runnable</code> interface with a script.</p>
+<pre><code>
+// <a href="source/RunnableImpl.java">RunnableImpl.java</a>
+
+import javax.script.*;
+
+public class RunnableImpl {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String
+        String script = "function run() { print('run called'); }";
+
+        // evaluate script
+        engine.eval(script);
+
+        <span class="classref">Invocable</span> inv = (Invocable) engine;
+
+        // get Runnable interface object from engine. This interface methods
+        // are implemented by script functions with the matching name.
+        Runnable r = inv.<span class="methodref">getInterface</span>(Runnable.class);
+
+        // start a new thread that runs the script implemented
+        // runnable interface
+        Thread th = new Thread(r);
+        th.start();
+        th.join();
+    }
+}
+</code>
+</pre>
+<p>If your scripting language is object-based or object-oriented,
+it is possible to implement a Java interface by script methods on
+script objects. This avoids having to call script global functions
+for interface methods. The script object can store the "state"
+associated with the interface implementor.</p>
+<pre><code>
+// <a href="source/RunnableImplObject.java">RunnableImplObject.java</a>
+
+import javax.script.*;
+
+public class RunnableImplObject {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String
+        String script = "var obj = new Object(); obj.run = function() { print('run method called'); }";
+
+        // evaluate script
+        engine.eval(script);
+
+        // get script object on which we want to implement the interface with
+        Object obj = engine.<span class="methodref">get</span>("obj");
+
+        <span class="classref">Invocable</span> inv = (Invocable) engine;
+
+        // get Runnable interface object from engine. This interface methods
+        // are implemented by script methods of object 'obj'
+        Runnable r = inv.<span class="methodref">getInterface</span>(obj, Runnable.class);
+
+        // start a new thread that runs the script implemented
+        // runnable interface
+        Thread th = new Thread(r);
+        th.start();
+        th.join();
+    }
+}
+</code>
+</pre>
+<hr>
+<a name="scopes" id="scopes"></a>
+<h3>Multiple Scopes for Scripts</h3>
+<p>In the <a href="#scriptvars">script variables</a> example, we
+saw how to expose application objects as script global variables.
+It is possible to expose multiple global "scopes" for scripts. A
+single scope is an instance of <code>javax.script.Bindings</code>.
+This interface is derived from <code>java.util.Map&lt;String,
+Object&gt;</code>. A scope a set of name-value pairs where name is
+any non-empty, non-null String.
+<code>javax.script.ScriptContext</code> interface supports multiple
+scopes with associated Bindings for each
+scope. By default, every script engine has a default script
+context. The default script context has atleast one scope called
+"ENGINE_SCOPE". Various scopes supported by a script context are
+available through <code>getScopes</code> method.</p>
+<pre><code>
+// <a href="source/MultiScopes.java">MultiScopes.java</a>
+
+import javax.script.*;
+
+public class MultiScopes {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        engine.put("x", "hello");
+        // print global variable "x"
+        engine.eval("print(x);");
+        // the above line prints "hello"
+
+        // Now, pass a different script context
+        <span class="classref">ScriptContext</span> newContext = new <span class="classref">SimpleScriptContext</span>();
+        newContext.setBindings(engine.createBindings(), ScriptContext.ENGINE_SCOPE);
+        <span class="classref">Bindings</span> engineScope = newContext.<span class="methodref">getBindings</span>(ScriptContext.ENGINE_SCOPE);
+
+        // add new variable "x" to the new engineScope        
+        engineScope.<span class="methodref">put</span>("x", "world");
+
+        // execute the same script - but this time pass a different script context
+        engine.eval("print(x);", newContext);
+        // the above line prints "world"
+    }
+}
+
+</code>
+</pre>
+<hr>
+<a name="jsengine" id="jsengine"></a>
+<h2>JavaScript Script Engine</h2>
+<p>Oracle's implementation of JDK 8 is co-bundled with the Nashorn ECMAScript
+script engine.
+<hr>
+<a name="jstojava" id="jstojava"></a>
+<h2>JavaScript to Java Communication</h2>
+<p>For the most part, accessing Java classes, objects and methods
+is straightforward. In particular field and method access from
+JavaScript is the same as it is from Java. We highlight important
+aspects of JavaScript Java access here. 
+The following examples are JavaScript snippets accessing Java. This
+section requires knowledge of JavaScript. This section can be
+skipped if you are planning to use some other JSR-223 scripting
+language rather than JavaScript.</p>
+<hr>
+<a name="jsjavaclass" id=jsjavalass"></a>
+<h3>Accessing Java Classes</h3>
+<pre>
+<code>
+// <a href="source/javatypes.js">javatypes.js</a>
+
+ var arrayListType = Java.type("java.util.ArrayList")
+ var intType = Java.type("int")
+ var stringArrayType = Java.type("java.lang.String[]")
+ var int2DArrayType = Java.type("int[][]")
+</code>
+</pre> 
+
+Note that the name of the type is always a string for a fully qualified name. You can use any of these expressions to create new instances, e.g.:
+
+<pre><code>
+ var anArrayList = new (Java.type("java.util.ArrayList"))
+</code></pre> 
+
+or
+
+<pre><code>
+ var ArrayList = Java.type("java.util.ArrayList")
+ var anArrayList = new ArrayList
+ var anArrayListWithSize = new ArrayList(16)
+</code></pre> 
+
+In the special case of inner classes, you can either use the JVM fully qualified name, meaning using the dollar sign in the class name, or you can use the dot:
+
+<pre><code>
+ var ftype = Java.type("java.awt.geom.Arc2D$Float")
+</code></pre> 
+ 
+and
+ 
+<pre><code>
+ var ftype = Java.type("java.awt.geom.Arc2D.Float")
+</code></pre> 
+
+both work. Note however that using the dollar sign is faster, as Java.type first tries to resolve the class name as it is originally specified, and the internal JVM names for inner classes use the dollar sign. If you use the dot, Java.type will internally get a ClassNotFoundException and subsequently retry by changing the last dot to dollar sign. As a matter of fact, it'll keep replacing dots with dollar signs until it either successfully loads the class or runs out of all dots in the name. This way it can correctly resolve and load even multiply nested inner classes with the dot notation. Again, this will be slower than using the dollar signs in the name. An alternative way to access the inner class is as a property of the outer class:
+
+<pre><code>
+ var arctype = Java.type("java.awt.geom.Arc2D")
+ var ftype = arctype.Float
+</code></pre> 
+<p>
+You can access both static and non-static inner classes. If you want to create an instance of a non-static inner class, remember to pass an instance of its outer class as the first argument to the constructor.
+</p>
+<p>
+In addition to creating new instances, the type objects returned from <code>Java.type</code> calls can also be used to access the
+static fields and methods of the classes:
+<pre><code>
+ var File = Java.type("java.io.File")
+ File.createTempFile("nashorn", ".tmp")
+</code></pre> 
+<p>
+Methods with names of the form <code>isXxx()</code>, <code>getXxx()</code>, and <code>setXxx()</code> can also be used as properties, for both instances and statics.
+</p>
+<p>
+A type object returned from <code>Java.type</code> is distinct from a <code>java.lang.Class</code> object. You can obtain one from the other using properties <code>class</code> and <code>static</code> on them.
+<pre><code>
+ var ArrayList = Java.type("java.util.ArrayList")
+ var a = new ArrayList
+
+ // All of the following print true:
+ print("Type acts as target of instanceof: " + (a instanceof ArrayList))
+ print("Class doesn't act as target of instanceof: " + !(a instanceof a.getClass()))
+ print("Type is not same as instance's getClass(): " + (a.getClass() !== ArrayList))
+ print("Type's `class` property is same as instance getClass(): " + (a.getClass() === ArrayList.class))
+ print("Type is same as instance getClass()'s `static` property: " + (a.getClass().static === ArrayList))
+</code></pre> 
+<p>
+You can think of the type object as similar to the class names as used in Java source code: you use them as the
+arguments to the <code>new</code> and <code>instanceof</code> operators and as the namespace for the static fields
+and methods, but they are different than the runtime <code>Class</code> objects returned by <code>getClass()</code> calls.
+Syntactically and semantically, this separation produces code that is most similar to Java code, where a distinction
+between compile-time class expressions and runtime class objects also exists. (Also, Java can't have the equivalent of <code>static</code>
+property on a <code>Class</code> object since compile-time class expressions are never reified as objects).
+</p>
+<hr>
+<a name="jsimport" id="jsimport"></a>
+<h3>Importing Java Packages, Classes</h3>
+<p>The built-in functions <code>importPackage</code> (in compatibility script) and
+<code>importClass</code> can be used to import Java packages and
+classes.</p>
+<pre><code>
+
+// <a href="source/importpackageclass.js">importpackageclass.js</a>
+
+// load compatibility script
+load("nashorn:mozilla_compat.js");
+// Import Java packages and classes 
+// like import package.*; in Java
+<span class="functionref">importPackage</span>(java.awt);
+// like import java.awt.Frame in Java
+<span class="functionref">importClass</span>(java.awt.Frame);
+// Create Java Objects by "new ClassName"
+var frame = new java.awt.Frame("hello");
+// Call Java public methods from script
+frame.setVisible(true);
+// Access "JavaBean" properties like "fields"
+print(frame.title);
+</code>
+</pre>
+<p>The <span class="objectref">Packages</span> global variable can
+be used to access Java packages. Examples:
+<code>Packages.java.util.Vector</code>,
+<code>Packages.javax.swing.JFrame</code>. Please note that "java"
+is a shortcut for "Packages.java". There are equivalent shortcuts
+for javax, org, edu, com, net prefixes, so pratically all JDK
+platform classes can be accessed without the "Packages" prefix.</p>
+<p>Note that java.lang is not imported by default (unlike Java)
+because that would result in conflicts with JavaScript's built-in
+Object, Boolean, Math and so on.</p>
+<p><code>importPackage</code> and <code>importClass</code>
+functions "pollute" the global variable scope of JavaScript. To
+avoid that, you may use <span class="functionref">JavaImporter</span>.</p>
+<pre><code>
+
+// <a href="source/javaimporter.js">javaimporter.js</a>
+
+// create JavaImporter with specific packages and classes to import
+
+var SwingGui = new <span class="functionref">JavaImporter</span>(javax.swing,
+                            javax.swing.event,
+                            javax.swing.border,
+                            java.awt.event);
+with (SwingGui) {
+    // within this 'with' statement, we can access Swing and AWT
+    // classes by unqualified (simple) names.
+
+    var mybutton = new JButton("test");
+    var myframe = new JFrame("test");
+}
+
+</code>
+</pre>
+<hr>
+<a name="jsarrays" id="jsarrays"></a>
+<h3>Creating, Converting and Using Java Arrays</h3>
+<p>
+Array element access or length access is the same as in Java.</p>
+<pre><code>
+// <a href="source/javaarray.js">javaarray.js</a>
+
+// create Java String array of 5 elements
+var StringArray = Java.type("java.lang.String[]");
+var a = new StringArray(5);
+
+// Accessing elements and length access is by usual Java syntax
+a[0] = "scripting is great!";
+print(a.length);
+print(a[0]);
+</code>
+</pre>
+<p>
+It is also possible to convert between JavaScript and Java arrays.
+Given a JavaScript array and a Java type, <code>Java.to</code> returns a Java array with the same initial contents, and with the specified array type. 
+</p>
+<pre><code>
+ var anArray = [1, "13", false]
+ var javaIntArray = Java.to(anArray, "int[]")
+ print(javaIntArray[0]) // prints 1
+ print(javaIntArray[1]) // prints 13, as string "13" was converted to number 13 as per ECMAScript ToNumber conversion
+ print(javaIntArray[2]) // prints 0, as boolean false was converted to number 0 as per ECMAScript ToNumber conversion
+</code></pre>
+<p>
+You can use either a string or a type object returned from <code>Java.type()</code> to specify the type of the array. 
+You can also omit the array type, in which case a <code>Object[]</code> will be created.
+</p>
+<p>
+Given a Java array or Collection, <code>Java.from</code> returns a JavaScript array with a shallow copy of its contents. Note that in most cases, you can use Java arrays and lists natively in Nashorn; in cases where for some reason you need to have an actual JavaScript native array (e.g. to work with the array comprehensions functions), you will want to use this method.
+</p>
+<pre><code>
+var File = Java.type("java.io.File");
+var listCurDir = new File(".").listFiles();
+var jsList = Java.from(listCurDir);
+print(jsList);
+</code></pre>
+<hr>
+<a name="jsimplement" id="jsimplement"></a>
+<h3>Implementing Java interfaces</h3>
+<p>A Java interface can be implemented in JavaScript by using a
+Java anonymous class-like syntax:</p>
+<pre><code>
+// <a href="source/runnable.js">runnable.js</a>
+
+var r  = new java.lang.Runnable() {
+    run: function() {
+        print("running...\n");
+    }
+};
+
+// "r" can be passed to Java methods that expect java.lang.Runnable
+var th = new java.lang.Thread(r);
+th.start();
+th.join();
+</code>
+</pre>
+<p>When an interface with a single method is expected, you can pass
+a script function directly.(auto conversion)</p>
+<pre><code>
+// <a href="source/samfunc.js">samfunc.js</a>
+
+function func() {
+     print("I am func!");
+}
+
+// pass script function for java.lang.Runnable argument
+var th = new java.lang.Thread(func);
+th.start();
+th.join();
+</code>
+</pre>
+<hr>
+<a name="jsextendabstract" id="jsextendabstract"></a>
+<h3>Extending Abstract Java Classes</h3>
+<p>
+If a Java class is abstract, you can instantiate an anonymous subclass of it using an argument list that is applicable to any of its public or protected constructors, but inserting a JavaScript object with functions properties that provide JavaScript implementations of the abstract methods. If method names are overloaded, the JavaScript function will provide implementation for all overloads. E.g.:
+</p>
+
+<pre><code>
+ var TimerTask =  Java.type("java.util.TimerTask")
+ var task = new TimerTask({ run: function() { print("Hello World!") } })
+</code></pre>
+
+Nashorn supports a syntactic extension where a "new" expression followed by an argument is identical to invoking the constructor and passing the argument to it, so you can write the above example also as:
+
+<pre><code>
+ var task = new TimerTask {
+     run: function() {
+       print("Hello World!")
+     }
+ }
+</code></pre>
+
+which is very similar to Java anonymous inner class definition. On the other hand, if the type is an abstract type with a single abstract method (commonly referred to as a "SAM type") or all abstract methods it has share the same overloaded name), then instead of an object, you can just pass a function, so the above example can become even more simplified to:
+
+<pre><code>
+ var task = new TimerTask(function() { print("Hello World!") })
+</code></pre>
+
+<p>
+Note that in every one of these cases if you are trying to instantiate an abstract class that has constructors that take some arguments, you can invoke those simply by specifying the arguments after the initial implementation object or function.
+</p>
+<p>
+The use of functions can be taken even further; if you are invoking a Java method that takes a SAM type, you can just pass in a function object, and Nashorn will know what you meant:
+</p>
+<code><pre>
+ Java.type("java.util.Timer")
+ timer.schedule(function() { print("Hello World!") })
+</code></pre>
+
+Here, <code>Timer.schedule()</code> expects a <code>TimerTask</code> as its argument, so Nashorn creates an instance of a TimerTask subclass and uses the passed function to implement its only abstract method, run(). In this usage though, you can't use non-default constructors; the type must be either an interface, or must have a protected or public no-arg constructor.
+
+<hr>
+<a name="jsextendconcrete" id="jsextendconcrete"></a>
+<h3>Extending Concrete Java Classes</h3>
+<p>
+To extend a concrete Java class, you have to use <code>Java.extend</code> function.
+<code>Java.extend</code> returns a type object for a subclass of the specified Java class (or implementation of the specified interface) that acts as a script-to-Java adapter for it.  
+</p>
+<pre><code>
+// <a href="source/javaextend.js">javaextend.js</a>
+
+var ArrayList = Java.type("java.util.ArrayList")
+var ArrayListExtender = Java.extend(ArrayList)
+var printSizeInvokedArrayList = new ArrayListExtender() {
+    size: function() { print("size invoked!"); }
+}
+var printAddInvokedArrayList = new ArrayListExtender() {
+    add: function(x, y) {
+        if(typeof(y) === "undefined") {
+            print("add(e) invoked!");
+        } else {
+            print("add(i, e) invoked!");
+        }
+    }
+};
+printSizeInvokedArrayList.size();
+printAddInvokedArrayList.add(33, 33);
+</code></pre>
+<p>
+The reason you must use <code>Java.extend()</code> with concrete classes is that with concrete classes, there can be a 
+syntactic ambiguity if you just invoke their constructor. Consider this example:
+</p>
+<pre><code>
+var t = new java.lang.Thread({ run: function() { print("Hello!") } })
+</code></pre>
+<p>
+If we allowed subclassing of concrete classes with constructor syntax, Nashorn couldn't tell if you're creating a new 
+<code>Thread</code> and passing it a <code>Runnable</code> at this point, or you are subclassing <code>Thread</code> and
+passing it a new implementation for its own <code>run()</code> method.
+</p>
+<hr>
+<a name="jsimplementmultiple" id="jsimplementmultiple"></a>
+<h3>Implementing Multiple Interfaces</h3>
+<p>
+<code>Java.extend</code> can in fact take a list of multiple types. At most one of the types can be a class, and the rest must
+be interfaces (the class doesn't have to be the first in the list). You will get back an object that extends the class and 
+implements all the interfaces. (Obviously, if you only specify interfaces and no class, the object will extend <code>java.lang.Object</code>).
+<hr>
+<a name="classBoundImplementations" id="classBoundImplementations"></a>
+<h3>Class-Bound Implementations</h3>
+<p>
+The methods shown so far for extending Java classes and implementing interfaces &ndash; passing an implementation JavaScript object 
+or function to a constructor, or using <code>Java.extend</code> with <code>new</code> &ndash; all produce classes that take an
+extra JavaScript object parameter in their constructors that specifies the implementation. The implementation is therefore always bound
+to the actual instance being created with <code>new</code>, and not to the whole class. This has some advantages, for example in the
+memory footprint of the runtime, as Nashorn can just create a single "universal adapter" for every combination of types being implemented.
+In reality, the below code shows that different instantiations of, say, <code>Runnable</code> have the same class regardless of them having
+different JavaScript implementation objects:
+</p>
+<pre><code>
+var Runnable = java.lang.Runnable;
+var r1 = new Runnable(function() { print("I'm runnable 1!") })
+var r2 = new Runnable(function() { print("I'm runnable 2!") })
+r1.run()
+r2.run()
+print("We share the same class: " + (r1.class === r2.class))
+</code></pre>
+<p>
+prints:
+</p>
+<pre><code>
+I'm runnable 1!
+I'm runnable 2!
+We share the same class: true
+</code></pre>
+<p>
+Sometimes, however, you'll want to extend a Java class or implement an interface with implementation bound to the class, not to
+its instances. Such a need arises, for example, when you need to pass the class for instantiation to an external API; prime example
+of this is the JavaFX framework where you need to pass an Application class to the FX API and let it instantiate it.
+</p>
+<p>
+Fortunately, there's a solution for that: <code>Java.extend()</code> &ndash; aside from being able to take any number of type parameters
+denoting a class to extend and interfaces to implement &ndash; can also take one last argument that has to be a JavaScript object
+that serves as the implementation for the methods. In this case, <code>Java.extend()</code> will create a class that has the same
+constructors as the original class had, as they don't need to take an an extra implementation object parameter. The example below
+shows how you can create class-bound implementations, and shows that in this case, the implementation classes for different invocations
+are indeed different:
+</p>
+<pre><code>
+var RunnableImpl1 = Java.extend(java.lang.Runnable, function() { print("I'm runnable 1!") })
+var RunnableImpl2 = Java.extend(java.lang.Runnable, function() { print("I'm runnable 2!") })
+var r1 = new RunnableImpl1()
+var r2 = new RunnableImpl2()
+r1.run()
+r2.run()
+print("We share the same class: " + (r1.class === r2.class))
+</code></pre>
+<p>
+prints:
+</p>
+<pre><code>
+I'm runnable 1!
+I'm runnable 2!
+We share the same class: false
+</code></pre>
+<p>
+As you can see, the major difference here is that we moved the implementation object into the invocation of <code>Java.extend</code>
+from the constructor invocations &ndash; indeed the constructor invocations now don't even need to take an extra parameter! Since
+the implementations are bound to a class, the two classes obviously can't be the same, and we indeed see that the two runnables no
+longer share the same class &ndash; every invocation of <code>Java.extend()</code> with a class-specific implementation object triggers
+the creation of a new Java adapter class.
+</p>
+<p>
+Finally, the adapter classes with class-bound implementations can <i>still</i> take an additional constructor parameter to further
+override the behavior on a per-instance basis. Thus, you can even combine the two approaches: you can provide part of the implementation
+in a class-based JavaScript implementation object passed to <code>Java.extend</code>, and part in another object passed to the constructor.
+Whatever functions are provided by the constructor-passed object will override the functions in the class-bound object.
+</p>
+<pre><code>
+var RunnableImpl = Java.extend(java.lang.Runnable, function() { print("I'm runnable 1!") })
+var r1 = new RunnableImpl()
+var r2 = new RunnableImpl(function() { print("I'm runnable 2!") })
+r1.run()
+r2.run()
+print("We share the same class: " + (r1.class === r2.class))
+</code></pre>
+<p>
+prints:
+</p>
+<pre><code>
+I'm runnable 1!
+I'm runnable 2!
+We share the same class: true
+</code></pre>
+<hr>
+<a name="jsoverload" id="jsoverload"></a>
+<h3>Overload Resolution</h3>
+<p>Java methods can be overloaded by argument types. In Java,
+overload resolution occurs at compile time (performed by javac).
+When calling Java methods from Nashorn, the appropriate method will be
+selected based on the argument types at invocation time. You do not need
+to do anything special &ndash; the correct Java method overload variant 
+is selected based automatically. You still have the option of explicitly
+specifying a particular overload variant. Reasons for this include 
+either running into a genuine ambiguity with actual argument types, or 
+rarely reasons of performance &ndash; if you specify the actual overload
+then the engine doesn't have to perform resolution during invocation.
+Individual overloads of a Java methods are exposed as special properties
+with the name of the method followed with its signature in parentheses. 
+You can invoke them like this:</p>
+<pre><code>
+// <a href="source/overload.js">overload.js</a>
+
+var out = java.lang.System.out;
+
+// select a particular print function 
+out["println(Object)"]("hello");
+</code>
+</pre>
+<p>
+Note that you normally don't even have to use qualified class names in 
+the signatures as long as the unqualified name of the type is sufficient
+for uniquely identifying the signature. In practice this means that only
+in the extremely unlikely case that two overloads only differ in 
+parameter types that have identical unqualified names but come from 
+different packages would you need to use the fully qualified name of the
+class.
+</p>
+<hr>
+<a name="dataTypeMapping" id="dataTypeMapping"></a>
+<h3>Mapping of Data Types Between Java and JavaScript</h3>
+<p>
+We have previously shown some of the data type mappings between Java and JavaScript.
+We saw that arrays need to be explicitly converted. We have also shown that JavaScript functions
+are automatically converted to SAM types when passed as parameters to Java methods. Most other
+conversions work as you would expect.
+</p>
+<p>
+Every JavaScript object is also a <code>java.util.Map</code> so APIs receiving maps will receive them directly.
+</p>
+<p>
+When numbers are passed to a Java API, they will be converted to the expected target numeric type, either boxed or
+primitive, but if the target type is less specific, say <code>Number</code> or <code>Object</code>, you can only
+count on them being a <code>Number</code>, and have to test specifically for whether it's a boxed <code>Double</code>,
+<code>Integer</code>, <code>Long</code>, etc. &ndash; it can be any of these due to internal optimizations. Also, you 
+can pass any JavaScript value to a Java API expecting either a boxed or primitive number; the JavaScript specification's
+<code>ToNumber</code> conversion algorithm will be applied to the value.
+</p>
+<p>
+In a similar vein, if a Java method expects a <code>String</code> or a <code>Boolean</code>, the values will be
+converted using all conversions allowed by the JavaScript specification's <code>ToString</code> and <code>ToBoolean</code>
+conversions.
+</p>
+<p>
+Finally, a word of caution about strings. Due to internal performance optimizations of string operations, JavaScript strings are
+not always necessarily of type <code>java.lang.String</code>, but they will always be of type <code>java.lang.CharSequence</code>.
+If you pass them to a Java method that expects a <code>java.lang.String</code> parameter, then you will naturally receive a Java
+String, but if the signature of your method is more generic, i.e. it receives a <code>java.lang.Object</code> parameter, you can 
+end up with an object of private engine implementation class that implements <code>CharSequence</code> but is not a Java String.
+</p>
+<hr>
+<a name="engineimpl" id="engineimpl"></a>
+<h2>Implementing Your Own Script Engine</h2>
+<p>We will not cover implementation of JSR-223 compliant script
+engines in detail. Minimally, you need to implement the
+<code>javax.script.ScriptEngine</code> and
+<code>javax.script.ScriptEngineFactory</code> interfaces. The
+abstract class <code>javax.script.AbstractScriptEngine</code>
+provides useful defaults for a few methods of the
+<code>ScriptEngine</code> interface.</p>
+<p>Before starting to implement a JSR-223 engine, you may want to
+check <a href="http://java.net/projects/Scripting">http://java.net/projects/Scripting</a>
+project. This project maintains JSR-223 implementations for many
+popular open source scripting languages.</p>
+<hr>
+<a name="refs" id="refs"></a>
+<h2>References</h2>
+<ul>
+<li><a href="http://jcp.org/en/jsr/detail?id=223">JSR-223 Scripting
+for the Java Platform</a></li>
+<li><a href="http://java.net/projects/Scripting">http://java.net/projects/Scripting
+</a></li>
+</ul>
+
+
+
+<div class="hr"><hr></div>
+<table summary="layout" border="0" width="100%">
+<tbody><tr valign="TOP">
+<td width="30%"> <img src="Java%20Scripting%20Programmer%27s%20Guide_files/logo_oracle_footer.gif" alt="Oracle and/or its affiliates" border="0" height="29" width="100"><br>
+<font size="+1"> <i>Java Technology</i></font> </td>
+
+<td width="30%">
+<p><font size="-2">
+<a href="http://docs.oracle.com/javase/6/docs/legal/cpyr.html">Copyright <20></a> 2013, Oracle and/or its affiliates. All rights reserved.
+</font></p> 
+</td>
+<td width="30%">
+<p align="right"><font size="-2"><a href="http://download.oracle.com/javase/feedback.html">Contact Us</a></font></p><font size="-2">
+</font></td>
+</tr>
+</tbody></table> 
+<div class="hr"><hr></div>
+</div>
+
+<!-- Start SiteCatalyst code   -->
+<script language="JavaScript" src="Java%20Scripting%20Programmer%27s%20Guide_files/s_code_download.js"></script>
+<script language="JavaScript" src="Java%20Scripting%20Programmer%27s%20Guide_files/s_code.js"></script>
+ 
+<!-- ********** DO NOT ALTER ANYTHING BELOW THIS LINE ! *********** -->
+<!--  Below code will send the info to Omniture server -->
+<script language="javascript">var s_code=s.t();if(s_code)document.write(s_code)</script>
+ 
+<!-- End SiteCatalyst code -->
+
+
+
+</body></html>

doc/nashorn/source/EvalFile.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+
+@SuppressWarnings("javadoc")
+public class EvalFile {
+    public static void main(final String[] args) throws Exception {
+        // create a script engine manager
+        final ScriptEngineManager factory = new ScriptEngineManager();
+        // create JavaScript engine
+        final ScriptEngine engine = factory.getEngineByName("nashorn");
+        // evaluate JavaScript code from given file - specified by first argument
+        engine.eval(new java.io.FileReader(args[0]));
+    }
+}
+

doc/nashorn/source/EvalScript.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+
+@SuppressWarnings("javadoc")
+public class EvalScript {
+    public static void main(final String[] args) throws Exception {
+        // create a script engine manager
+        final ScriptEngineManager factory = new ScriptEngineManager();
+        // create a JavaScript engine
+        final ScriptEngine engine = factory.getEngineByName("nashorn");
+        // evaluate JavaScript code from String
+        engine.eval("print('Hello, World')");
+    }
+}
+

doc/nashorn/source/InvokeScriptFunction.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+
+@SuppressWarnings("javadoc")
+public class InvokeScriptFunction {
+    public static void main(final String[] args) throws Exception {
+        final ScriptEngineManager manager = new ScriptEngineManager();
+        final ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String
+        final String script = "function hello(name) { print('Hello, ' + name); }";
+        // evaluate script
+        engine.eval(script);
+
+        // javax.script.Invocable is an optional interface.
+        // Check whether your script engine implements or not!
+        // Note that the JavaScript engine implements Invocable interface.
+        final Invocable inv = (Invocable) engine;
+
+        // invoke the global function named "hello"
+        inv.invokeFunction("hello", "Scripting!!" );
+    }
+}
+
+
+

doc/nashorn/source/InvokeScriptMethod.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+
+@SuppressWarnings("javadoc")
+public class InvokeScriptMethod {
+    public static void main(final String[] args) throws Exception {
+        final ScriptEngineManager manager = new ScriptEngineManager();
+        final ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String. This code defines a script object 'obj'
+        // with one method called 'hello'.
+        final String script = "var obj = new Object(); obj.hello = function(name) { print('Hello, ' + name); }";
+        // evaluate script
+        engine.eval(script);
+
+        // javax.script.Invocable is an optional interface.
+        // Check whether your script engine implements or not!
+        // Note that the JavaScript engine implements Invocable interface.
+        final Invocable inv = (Invocable) engine;
+
+        // get script object on which we want to call the method
+        final Object obj = engine.get("obj");
+
+        // invoke the method named "hello" on the script object "obj"
+        inv.invokeMethod(obj, "hello", "Script Method !!" );
+    }
+}

doc/nashorn/source/MultiScopes.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.Bindings;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.SimpleScriptContext;
+
+@SuppressWarnings("javadoc")
+public class MultiScopes {
+    public static void main(final String[] args) throws Exception {
+        final ScriptEngineManager manager = new ScriptEngineManager();
+        final ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        engine.put("x", "hello");
+        // print global variable "x"
+        engine.eval("print(x);");
+        // the above line prints "hello"
+
+        // Now, pass a different script context
+        final ScriptContext newContext = new SimpleScriptContext();
+        newContext.setBindings(engine.createBindings(), ScriptContext.ENGINE_SCOPE);
+        final Bindings engineScope = newContext.getBindings(ScriptContext.ENGINE_SCOPE);
+
+        // add new variable "x" to the new engineScope
+        engineScope.put("x", "world");
+
+        // execute the same script - but this time pass a different script context
+        engine.eval("print(x);", newContext);
+        // the above line prints "world"
+    }
+}
+
+

doc/nashorn/source/RunnableImpl.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+
+@SuppressWarnings("javadoc")
+public class RunnableImpl {
+    public static void main(final String[] args) throws Exception {
+        final ScriptEngineManager manager = new ScriptEngineManager();
+        final ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String
+        final String script = "function run() { print('run called'); }";
+
+        // evaluate script
+        engine.eval(script);
+
+        final Invocable inv = (Invocable) engine;
+
+        // get Runnable interface object from engine. This interface methods
+        // are implemented by script functions with the matching name.
+        final Runnable r = inv.getInterface(Runnable.class);
+
+        // start a new thread that runs the script implemented
+        // runnable interface
+        final Thread th = new Thread(r);
+        th.start();
+        th.join();
+    }
+}

doc/nashorn/source/RunnableImplObject.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+
+@SuppressWarnings("javadoc")
+public class RunnableImplObject {
+    public static void main(final String[] args) throws Exception {
+        final ScriptEngineManager manager = new ScriptEngineManager();
+        final ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String
+        final String script = "var obj = new Object(); obj.run = function() { print('run method called'); }";
+
+        // evaluate script
+        engine.eval(script);
+
+        // get script object on which we want to implement the interface with
+        final Object obj = engine.get("obj");
+
+        final Invocable inv = (Invocable) engine;
+
+        // get Runnable interface object from engine. This interface methods
+        // are implemented by script methods of object 'obj'
+        final Runnable r = inv.getInterface(obj, Runnable.class);
+
+        // start a new thread that runs the script implemented
+        // runnable interface
+        final Thread th = new Thread(r);
+        th.start();
+        th.join();
+    }
+}

doc/nashorn/source/ScriptVars.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.io.File;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+
+@SuppressWarnings("javadoc")
+public class ScriptVars {
+    public static void main(final String[] args) throws Exception {
+        final ScriptEngineManager manager = new ScriptEngineManager();
+        final ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        final File f = new File("test.txt");
+        // expose File object as variable to script
+        engine.put("file", f);
+
+        // evaluate a script string. The script accesses "file"
+        // variable and calls method on it
+        engine.eval("print(file.getAbsolutePath())");
+    }
+}
+
+
+

doc/nashorn/source/importpackageclass.js

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// load compatibility script
+load("nashorn:mozilla_compat.js");
+
+// Import Java packages and classes
+// like import package.*; in Java
+importPackage(java.awt);
+// like import java.awt.Frame in Java
+importClass(java.awt.Frame);
+// Create Java Objects by "new ClassName"
+var frame = new java.awt.Frame("hello");
+// Call Java public methods from script
+frame.setVisible(true);
+// Access "JavaBean" properties like "fields"
+print(frame.title);

doc/nashorn/source/javaarray.js

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// create Java String array of 5 elements
+var StringArray = Java.type("java.lang.String[]");
+var a = new StringArray(5);
+
+// Accessing elements and length access is by usual Java syntax
+a[0] = "scripting is great!";
+print(a.length);
+print(a[0]);
+
+// convert a script array to Java array
+var anArray = [1, "13", false];
+var javaIntArray = Java.to(anArray, "int[]");
+print(javaIntArray[0]);// prints 1
+print(javaIntArray[1]); // prints 13, as string "13" was converted to number 13 as per ECMAScript ToNumber conversion
+print(javaIntArray[2]);// prints 0, as boolean false was converted to number 0 as per ECMAScript ToNumber conversion
+
+// convert a Java array to a JavaScript array
+var File = Java.type("java.io.File");
+var listCurDir = new File(".").listFiles();
+var jsList = Java.from(listCurDir);
+print(jsList);

doc/nashorn/source/javaextend.js

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+var ArrayList = Java.type("java.util.ArrayList")
+var ArrayListExtender = Java.extend(ArrayList)
+var printSizeInvokedArrayList = new ArrayListExtender() {
+    size: function() { print("size invoked!"); }
+}
+var printAddInvokedArrayList = new ArrayListExtender() {
+    add: function(x, y) {
+        if(typeof(y) === "undefined") {
+            print("add(e) invoked!");
+        } else {
+            print("add(i, e) invoked!");
+        }
+    }
+};
+printSizeInvokedArrayList.size();
+printAddInvokedArrayList.add(33, 33);

doc/nashorn/source/javaimporter.js

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// create JavaImporter with specific packages and classes to import
+
+var SwingGui = new JavaImporter(javax.swing,
+                            javax.swing.event,
+                            javax.swing.border,
+                            java.awt.event);
+with (SwingGui) {
+    // within this 'with' statement, we can access Swing and AWT
+    // classes by unqualified (simple) names.
+
+    var mybutton = new JButton("test");
+    print(mybutton);
+    var myframe = new JFrame("test");
+    print(myframe);
+}
+
+

doc/nashorn/source/javatypes.js

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+// accessing java types
+var arrayListType = Java.type("java.util.ArrayList")
+var intType = Java.type("int")
+var stringArrayType = Java.type("java.lang.String[]")
+var int2DArrayType = Java.type("int[][]")
+
+// Using java types
+var ArrayList = Java.type("java.util.ArrayList")
+var anArrayList = new ArrayList
+var anArrayListWithSize = new ArrayList(16)
+
+// fully qualified name
+var ftype = Java.type("java.awt.geom.Arc2D$Float")
+
+// inner class property
+var arctype = Java.type("java.awt.geom.Arc2D")
+var ftype = arctype.Float
+

doc/nashorn/source/overload.js

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+var out = java.lang.System.out;
+
+// select a particular print function
+out["println(java.lang.Object)"]("hello");
+

doc/nashorn/source/runnable.js

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+var r  = new java.lang.Runnable() {
+    run: function() {
+        print("running...\n");
+    }
+};
+
+// "r" can be passed to Java methods that expect java.lang.Runnable
+var th = new java.lang.Thread(r);
+th.start();
+th.join();

doc/nashorn/source/samfunc.js

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+function func() {
+     print("I am func!");
+}
+
+// pass script function for java.lang.Runnable argument
+var th = new java.lang.Thread(func);
+th.start();
+th.join();

doc/nashorn/source/test.js

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+print("This is hello from test.js");

doc/testing.html

@@ -27,7 +27,6 @@
 <li><a href="#configuration">Configuration</a></li>
 </ul></li>
 <li><a href="#test-selection">Test selection</a><ul>
-<li><a href="#common-test-groups">Common Test Groups</a></li>
 <li><a href="#jtreg">JTReg</a></li>
 <li><a href="#gtest">Gtest</a></li>
 <li><a href="#microbenchmarks">Microbenchmarks</a></li>
@@ -68,19 +67,6 @@ $ make exploded-test TEST=tier2</code></pre>
 <p>All functionality is available using the <code>test</code> make target. In this use case, the test or tests to be executed is controlled using the <code>TEST</code> variable. To speed up subsequent test runs with no source code changes, <code>test-only</code> can be used instead, which do not depend on the source and test image build.</p>
 <p>For some common top-level tests, direct make targets have been generated. This includes all JTReg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make test-tier1</code> is equivalent to <code>make test TEST=&quot;tier1&quot;</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>test TEST=&quot;x&quot;</code> solution needs to be used.</p>
 <p>The test specifications given in <code>TEST</code> is parsed into fully qualified test descriptors, which clearly and unambigously show which tests will be run. As an example, <code>:tier1</code> will expand to <code>jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1 jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1</code>. You can always submit a list of fully qualified test descriptors in the <code>TEST</code> variable if you want to shortcut the parser.</p>
-<h3 id="common-test-groups">Common Test Groups</h3>
-<p>Ideally, all tests are run for every change but this may not be practical due to the limited testing resources, the scope of the change, etc.</p>
-<p>The source tree currently defines a few common test groups in the relevant <code>TEST.groups</code> files. There are test groups that cover a specific component, for example <code>hotspot_gc</code>. It is a good idea to look into <code>TEST.groups</code> files to get a sense what tests are relevant to a particular JDK component.</p>
-<p>Component-specific tests may miss some unintended consequences of a change, so other tests should also be run. Again, it might be impractical to run all tests, and therefore <em>tiered</em> test groups exist. Tiered test groups are not component-specific, but rather cover the significant parts of the entire JDK.</p>
-<p>Multiple tiers allow balancing test coverage and testing costs. Lower test tiers are supposed to contain the simpler, quicker and more stable tests. Higher tiers are supposed to contain progressively more thorough, slower, and sometimes less stable tests, or the tests that require special configuration.</p>
-<p>Contributors are expected to run the tests for the areas that are changed, and the first N tiers they can afford to run, but at least tier1.</p>
-<p>A brief description of the tiered test groups:</p>
-<ul>
-<li><p><code>tier1</code>: This is the lowest test tier. Multiple developers run these tests every day. Because of the widespread use, the tests in <code>tier1</code> are carefully selected and optimized to run fast, and to run in the most stable manner. The test failures in <code>tier1</code> are usually followed up on quickly, either with fixes, or adding relevant tests to problem list. GitHub Actions workflows, if enabled, run <code>tier1</code> tests.</p></li>
-<li><p><code>tier2</code>: This test group covers even more ground. These contain, among other things, tests that either run for too long to be at <code>tier1</code>, or may require special configuration, or tests that are less stable, or cover the broader range of non-core JVM and JDK features/components (for example, XML).</p></li>
-<li><p><code>tier3</code>: This test group includes more stressful tests, the tests for corner cases not covered by previous tiers, plus the tests that require GUIs. As such, this suite should either be run with low concurrency (<code>TEST_JOBS=1</code>), or without headful tests (<code>JTREG_KEYWORDS=\!headful</code>), or both.</p></li>
-<li><p><code>tier4</code>: This test group includes every other test not covered by previous tiers. It includes, for example, <code>vmTestbase</code> suites for Hotspot, which run for many hours even on large machines. It also runs GUI tests, so the same <code>TEST_JOBS</code> and <code>JTREG_KEYWORDS</code> caveats apply.</p></li>
-</ul>
 <h3 id="jtreg">JTReg</h3>
 <p>JTReg tests can be selected either by picking a JTReg test group, or a selection of files or directories containing JTReg tests.</p>
 <p>JTReg test groups can be specified either without a test root, e.g. <code>:tier1</code> (or <code>tier1</code>, the initial colon is optional), or with, e.g. <code>hotspot:tier1</code>, <code>test/jdk:jdk_util</code> or <code>$(TOPDIR)/test/hotspot/jtreg:hotspot_all</code>. The test root can be specified either as an absolute path, or a path relative to the JDK top directory, or the <code>test</code> directory. For simplicity, the hotspot JTReg test root, which really is <code>hotspot/jtreg</code> can be abbreviated as just <code>hotspot</code>.</p>
@@ -151,8 +137,6 @@ TEST FAILURE</code></pre>
 <h4 id="timeout_factor-1">TIMEOUT_FACTOR</h4>
 <p>The timeout factor (<code>-timeoutFactor</code>).</p>
 <p>Defaults to 4.</p>
-<h4 id="failure_handler_timeout">FAILURE_HANDLER_TIMEOUT</h4>
-<p>Sets the argument <code>-timeoutHandlerTimeout</code> for JTReg. The default value is 0. This is only valid if the failure handler is built.</p>
 <h4 id="test_mode">TEST_MODE</h4>
 <p>The test mode (<code>agentvm</code> or <code>othervm</code>).</p>
 <p>Defaults to <code>agentvm</code>.</p>
@@ -169,10 +153,8 @@ TEST FAILURE</code></pre>
 <p>Limit memory consumption (<code>-Xmx</code> and <code>-vmoption:-Xmx</code>, or none).</p>
 <p>Limit memory consumption for JTReg test framework and VM under test. Set to 0 to disable the limits.</p>
 <p>Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).</p>
-<h4 id="max_output">MAX_OUTPUT</h4>
-<p>Set the property <code>javatest.maxOutputSize</code> for the launcher, to change the default JTReg log limit.</p>
 <h4 id="keywords">KEYWORDS</h4>
-<p>JTReg keywords sent to JTReg using <code>-k</code>. Please be careful in making sure that spaces and special characters (like <code>!</code>) are properly quoted. To avoid some issues, the special value <code>%20</code> can be used instead of space.</p>
+<p>JTReg kewords sent to JTReg using <code>-k</code>. Please be careful in making sure that spaces and special characters (like <code>!</code>) are properly quoted. To avoid some issues, the special value <code>%20</code> can be used instead of space.</p>
 <h4 id="extra_problem_lists">EXTRA_PROBLEM_LISTS</h4>
 <p>Use additional problem lists file or files, in addition to the default ProblemList.txt located at the JTReg test roots.</p>
 <p>If multiple file names are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
@@ -188,14 +170,10 @@ TEST FAILURE</code></pre>
 <h4 id="vm_options-1">VM_OPTIONS</h4>
 <p>Additional Java options to be used when compiling and running classes (sent to JTReg as <code>-vmoption</code>).</p>
 <p>This option is only needed in special circumstances. To pass Java options to your test classes, use <code>JAVA_OPTIONS</code>.</p>
-<h4 id="launcher_options">LAUNCHER_OPTIONS</h4>
-<p>Additional Java options that are sent to the java launcher that starts the JTReg harness.</p>
 <h4 id="aot_modules-1">AOT_MODULES</h4>
 <p>Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
 <h4 id="retry_count">RETRY_COUNT</h4>
 <p>Retry failed tests up to a set number of times. Defaults to 0.</p>
-<h4 id="repeat_count">REPEAT_COUNT</h4>
-<p>Repeat the tests for a set number of times. Defaults to 0.</p>
 <h3 id="gtest-keywords">Gtest keywords</h3>
 <h4 id="repeat">REPEAT</h4>
 <p>The number of times to repeat the tests (<code>--gtest_repeat</code>).</p>
@@ -227,19 +205,14 @@ TEST FAILURE</code></pre>
 <p>Docker tests with default parameters may fail on systems with glibc versions not compatible with the one used in the default docker image (e.g., Oracle Linux 7.6 for x86). For example, they pass on Ubuntu 16.04 but fail on Ubuntu 18.04 if run like this on x86:</p>
 <pre><code>$ make test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot;</code></pre>
 <p>To run these tests correctly, additional parameters for the correct docker image are required on Ubuntu 18.04 by using <code>JAVA_OPTIONS</code>.</p>
-<pre><code>$ make test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot; \
-    JTREG=&quot;JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu
-    -Djdk.test.docker.image.version=latest&quot;</code></pre>
+<pre><code>$ make test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot; JTREG=&quot;JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest&quot;</code></pre>
 <h3 id="non-us-locale">Non-US locale</h3>
-<p>If your locale is non-US, some tests are likely to fail. To work around this you can set the locale to US. On Unix platforms simply setting <code>LANG=&quot;en_US&quot;</code> in the environment before running tests should work. On Windows or MacOS, setting <code>JTREG=&quot;VM_OPTIONS=-Duser.language=en -Duser.country=US&quot;</code> helps for most, but not all test cases.</p>
-<p>For example:</p>
+<p>If your locale is non-US, some tests are likely to fail. To work around this you can set the locale to US. On Unix platforms simply setting <code>LANG=&quot;en_US&quot;</code> in the environment before running tests should work. On Windows, setting <code>JTREG=&quot;VM_OPTIONS=-Duser.language=en -Duser.country=US&quot;</code> helps for most, but not all test cases. For example:</p>
 <pre><code>$ export LANG=&quot;en_US&quot; &amp;&amp; make test TEST=...
 $ make test JTREG=&quot;VM_OPTIONS=-Duser.language=en -Duser.country=US&quot; TEST=...</code></pre>
 <h3 id="pkcs11-tests">PKCS11 Tests</h3>
-<p>It is highly recommended to use the latest NSS version when running PKCS11 tests. Improper NSS version may lead to unexpected failures which are hard to diagnose. For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu 18.04 with the default NSS version in the system. To run these tests correctly, the system property <code>test.nss.lib.paths</code> is required on Ubuntu 18.04 to specify the alternative NSS lib directories.</p>
-<p>For example:</p>
-<pre><code>$ make test TEST=&quot;jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java&quot; \
-    JTREG=&quot;JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs&quot;</code></pre>
+<p>It is highly recommended to use the latest NSS version when running PKCS11 tests. Improper NSS version may lead to unexpected failures which are hard to diagnose. For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu 18.04 with the default NSS version in the system. To run these tests correctly, the system property <code>test.nss.lib.paths</code> is required on Ubuntu 18.04 to specify the alternative NSS lib directories. For example:</p>
+<pre><code>$ make test TEST=&quot;jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java&quot; JTREG=&quot;JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs&quot;</code></pre>
 <p>For more notes about the PKCS11 tests, please refer to test/jdk/sun/security/pkcs11/README.</p>
 <h3 id="client-ui-tests">Client UI Tests</h3>
 <p>Some Client UI tests use key sequences which may be reserved by the operating system. Usually that causes the test failure. So it is highly recommended to disable system key shortcuts prior testing. The steps to access and disable system key shortcuts for various platforms are provided below.</p>

doc/testing.md

@@ -37,11 +37,11 @@ Note that this option should point to the JTReg home, i.e. the top directory,
 containing `lib/jtreg.jar` etc. (An alternative is to set the `JT_HOME`
 environment variable to point to the JTReg home before running `configure`.)
 
-To be able to run microbenchmarks, `configure` needs to know where to find the
-JMH dependency. Use `--with-jmh=<path to JMH jars>` to point to a directory
-containing the core JMH and transitive dependencies. The recommended
-dependencies can be retrieved by running `sh make/devkit/createJMHBundle.sh`,
-after which `--with-jmh=build/jmh/jars` should work.
+To be able to run microbenchmarks, `configure` needs to know where to find
+the JMH dependency. Use `--with-jmh=<path to JMH jars>` to point to a directory
+containing the core JMH and transitive dependencies. The recommended dependencies
+can be retrieved by running `sh make/devkit/createJMHBundle.sh`, after which
+`--with-jmh=build/jmh/jars` should work.
 
 ## Test selection
 
@@ -64,52 +64,6 @@ jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1`. You can
 always submit a list of fully qualified test descriptors in the `TEST` variable
 if you want to shortcut the parser.
 
-### Common Test Groups
-
-Ideally, all tests are run for every change but this may not be practical due to the limited
-testing resources, the scope of the change, etc.
-
-The source tree currently defines a few common test groups in the relevant `TEST.groups`
-files. There are test groups that cover a specific component, for example `hotspot_gc`.
-It is a good idea to look into `TEST.groups` files to get a sense what tests are relevant
-to a particular JDK component.
-
-Component-specific tests may miss some unintended consequences of a change, so other
-tests should also be run. Again, it might be impractical to run all tests, and therefore
-_tiered_ test groups exist. Tiered test groups are not component-specific, but rather cover
-the significant parts of the entire JDK.
-
-Multiple tiers allow balancing test coverage and testing costs. Lower test tiers are supposed to
-contain the simpler, quicker and more stable tests. Higher tiers are supposed to contain
-progressively more thorough, slower, and sometimes less stable tests, or the tests that require
-special configuration.
-
-Contributors are expected to run the tests for the areas that are changed, and the first N tiers
-they can afford to run, but at least tier1.
-
-A brief description of the tiered test groups:
-
-- `tier1`: This is the lowest test tier. Multiple developers run these tests every day.
-Because of the widespread use, the tests in `tier1` are carefully selected and optimized to run
-fast, and to run in the most stable manner. The test failures in `tier1` are usually followed up
-on quickly, either with fixes, or adding relevant tests to problem list. GitHub Actions workflows,
-if enabled, run `tier1` tests.
-
-- `tier2`: This test group covers even more ground. These contain, among other things,
-tests that either run for too long to be at `tier1`, or may require special configuration,
-or tests that are less stable, or cover the broader range of non-core JVM and JDK features/components
-(for example, XML).
-
-- `tier3`: This test group includes more stressful tests, the tests for corner cases
-not covered by previous tiers, plus the tests that require GUIs. As such, this suite
-should either be run with low concurrency (`TEST_JOBS=1`), or without headful tests
-(`JTREG_KEYWORDS=\!headful`), or both.
-
-- `tier4`: This test group includes every other test not covered by previous tiers. It includes,
-for example, `vmTestbase` suites for Hotspot, which run for many hours even on large
-machines. It also runs GUI tests, so the same `TEST_JOBS` and `JTREG_KEYWORDS` caveats
-apply.
-
 ### JTReg
 
 JTReg tests can be selected either by picking a JTReg test group, or a selection
@@ -228,10 +182,10 @@ variables.
 These variables use a keyword=value approach to allow multiple values to be
 set. So, for instance, `JTREG="JOBS=1;TIMEOUT_FACTOR=8"` will set the JTReg
 concurrency level to 1 and the timeout factor to 8. This is equivalent to
-setting `JTREG_JOBS=1 JTREG_TIMEOUT_FACTOR=8`, but using the keyword format
-means that the `JTREG` variable is parsed and verified for correctness, so
-`JTREG="TMIEOUT_FACTOR=8"` would give an error, while `JTREG_TMIEOUT_FACTOR=8`
-would just pass unnoticed.
+setting `JTREG_JOBS=1 JTREG_TIMEOUT_FACTOR=8`, but using the keyword format means that
+the `JTREG` variable is parsed and verified for correctness, so
+`JTREG="TMIEOUT_FACTOR=8"` would give an error, while `JTREG_TMIEOUT_FACTOR=8` would just
+pass unnoticed.
 
 To separate multiple keyword=value pairs, use `;` (semicolon). Since the shell
 normally eats `;`, the recommended usage is to write the assignment inside
@@ -249,10 +203,9 @@ test suites.
 
 ### General keywords (TEST_OPTS)
 
-Some keywords are valid across different test suites. If you want to run tests
-from multiple test suites, or just don't want to care which test suite specific
-control variable to use, then you can use the general TEST_OPTS control
-variable.
+Some keywords are valid across different test suites. If you want to run
+tests from multiple test suites, or just don't want to care which test suite specific
+control variable to use, then you can use the general TEST_OPTS control variable.
 
 There are also some keywords that applies globally to the test runner system,
 not to any specific test suites. These are also available as TEST_OPTS keywords.
@@ -299,13 +252,12 @@ for only recently changed code. JCOV_DIFF_CHANGESET specifies a source
 revision. A textual report will be generated showing coverage of the diff
 between the specified revision and the repository tip.
 
-The report is stored in
-`build/$BUILD/test-results/jcov-output/diff_coverage_report` file.
+The report is stored in `build/$BUILD/test-results/jcov-output/diff_coverage_report`
+file.
 
 ### JTReg keywords
 
 #### JOBS
-
 The test concurrency (`-concurrency`).
 
 Defaults to TEST_JOBS (if set by `--with-test-jobs=`), otherwise it defaults to
@@ -313,43 +265,32 @@ JOBS, except for Hotspot, where the default is *number of CPU cores/2*,
 but never more than *memory size in GB/2*.
 
 #### TIMEOUT_FACTOR
-
 The timeout factor (`-timeoutFactor`).
 
 Defaults to 4.
 
-#### FAILURE_HANDLER_TIMEOUT
-
-Sets the argument `-timeoutHandlerTimeout` for JTReg. The default value is 0.
-This is only valid if the failure handler is built.
-
 #### TEST_MODE
-
 The test mode (`agentvm` or `othervm`).
 
 Defaults to `agentvm`.
 
 #### ASSERT
-
 Enable asserts (`-ea -esa`, or none).
 
 Set to `true` or `false`. If true, adds `-ea -esa`. Defaults to true, except
 for hotspot.
 
 #### VERBOSE
-
 The verbosity level (`-verbose`).
 
 Defaults to `fail,error,summary`.
 
 #### RETAIN
-
 What test data to retain (`-retain`).
 
 Defaults to `fail,error`.
 
 #### MAX_MEM
-
 Limit memory consumption (`-Xmx` and `-vmoption:-Xmx`, or none).
 
 Limit memory consumption for JTReg test framework and VM under test. Set to 0
@@ -357,14 +298,9 @@ to disable the limits.
 
 Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).
 
-#### MAX_OUTPUT
-
-Set the property `javatest.maxOutputSize` for the launcher, to change the
-default JTReg log limit.
-
 #### KEYWORDS
 
-JTReg keywords sent to JTReg using `-k`. Please be careful in making sure that
+JTReg kewords sent to JTReg using `-k`. Please be careful in making sure that
 spaces and special characters (like `!`) are properly quoted. To avoid some
 issues, the special value `%20` can be used instead of space.
 
@@ -387,30 +323,23 @@ Set to `true` or `false`.
 If `true`, JTReg will use `-match:` option, otherwise `-exclude:` will be used.
 Default is `false`.
 
-#### OPTIONS
 
+#### OPTIONS
 Additional options to the JTReg test framework.
 
 Use `JTREG="OPTIONS=--help all"` to see all available JTReg options.
 
 #### JAVA_OPTIONS
-
 Additional Java options for running test classes (sent to JTReg as
 `-javaoption`).
 
 #### VM_OPTIONS
-
 Additional Java options to be used when compiling and running classes (sent to
 JTReg as `-vmoption`).
 
 This option is only needed in special circumstances. To pass Java options to
 your test classes, use `JAVA_OPTIONS`.
 
-#### LAUNCHER_OPTIONS
-
-Additional Java options that are sent to the java launcher that starts the
-JTReg harness.
-
 #### AOT_MODULES
 
 Generate AOT modules before testing for the specified module, or set of
@@ -421,14 +350,9 @@ modules. If multiple modules are specified, they should be separated by space
 
 Retry failed tests up to a set number of times. Defaults to 0.
 
-#### REPEAT_COUNT
-
-Repeat the tests for a set number of times. Defaults to 0.
-
 ### Gtest keywords
 
 #### REPEAT
-
 The number of times to repeat the tests (`--gtest_repeat`).
 
 Default is 1. Set to -1 to repeat indefinitely. This can be especially useful
@@ -436,7 +360,6 @@ combined with `OPTIONS=--gtest_break_on_failure` to reproduce an intermittent
 problem.
 
 #### OPTIONS
-
 Additional options to the Gtest test framework.
 
 Use `GTEST="OPTIONS=--help"` to see all available Gtest options.
@@ -450,127 +373,98 @@ modules. If multiple modules are specified, they should be separated by space
 ### Microbenchmark keywords
 
 #### FORK
-
 Override the number of benchmark forks to spawn. Same as specifying `-f <num>`.
 
 #### ITER
-
 Number of measurement iterations per fork. Same as specifying `-i <num>`.
 
 #### TIME
-
 Amount of time to spend in each measurement iteration, in seconds. Same as
 specifying `-r <num>`
 
 #### WARMUP_ITER
-
 Number of warmup iterations to run before the measurement phase in each fork.
 Same as specifying `-wi <num>`.
 
 #### WARMUP_TIME
-
 Amount of time to spend in each warmup iteration. Same as specifying `-w <num>`.
 
 #### RESULTS_FORMAT
-
 Specify to have the test run save a log of the values. Accepts the same values
 as `-rff`, i.e., `text`, `csv`, `scsv`, `json`, or `latex`.
 
 #### VM_OPTIONS
-
 Additional VM arguments to provide to forked off VMs. Same as `-jvmArgs <args>`
 
 #### OPTIONS
-
 Additional arguments to send to JMH.
 
 ## Notes for Specific Tests
 
 ### Docker Tests
 
-Docker tests with default parameters may fail on systems with glibc versions
-not compatible with the one used in the default docker image (e.g., Oracle
-Linux 7.6 for x86). For example, they pass on Ubuntu 16.04 but fail on Ubuntu
-18.04 if run like this on x86:
+Docker tests with default parameters may fail on systems with glibc versions not
+compatible with the one used in the default docker image (e.g., Oracle Linux 7.6 for x86).
+For example, they pass on Ubuntu 16.04 but fail on Ubuntu 18.04 if run like this on x86:
 
-```
-$ make test TEST="jtreg:test/hotspot/jtreg/containers/docker"
-```
+    $ make test TEST="jtreg:test/hotspot/jtreg/containers/docker"
 
-To run these tests correctly, additional parameters for the correct docker
-image are required on Ubuntu 18.04 by using `JAVA_OPTIONS`.
+To run these tests correctly, additional parameters for the correct docker image are
+required on Ubuntu 18.04 by using `JAVA_OPTIONS`.
 
-```
-$ make test TEST="jtreg:test/hotspot/jtreg/containers/docker" \
-    JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu
-    -Djdk.test.docker.image.version=latest"
-```
+    $ make test TEST="jtreg:test/hotspot/jtreg/containers/docker" JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest"
 
 ### Non-US locale
 
-If your locale is non-US, some tests are likely to fail. To work around this
-you can set the locale to US. On Unix platforms simply setting `LANG="en_US"`
-in the environment before running tests should work. On Windows or MacOS, setting
-`JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US"` helps for most, but
-not all test cases.
-
+If your locale is non-US, some tests are likely to fail. To work around this you can
+set the locale to US. On Unix platforms simply setting `LANG="en_US"` in the
+environment before running tests should work. On Windows, setting
+`JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US"` helps for most, but not all test cases.
 For example:
 
-```
-$ export LANG="en_US" && make test TEST=...
-$ make test JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US" TEST=...
-```
+    $ export LANG="en_US" && make test TEST=...
+    $ make test JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US" TEST=...
 
 ### PKCS11 Tests
 
-It is highly recommended to use the latest NSS version when running PKCS11
-tests. Improper NSS version may lead to unexpected failures which are hard to
-diagnose. For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail
-on Ubuntu 18.04 with the default NSS version in the system. To run these tests
-correctly, the system property `test.nss.lib.paths` is required on Ubuntu 18.04
-to specify the alternative NSS lib directories.
-
+It is highly recommended to use the latest NSS version when running PKCS11 tests.
+Improper NSS version may lead to unexpected failures which are hard to diagnose.
+For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu
+18.04 with the default NSS version in the system.
+To run these tests correctly, the system property `test.nss.lib.paths` is required
+on Ubuntu 18.04 to specify the alternative NSS lib directories.
 For example:
 
-```
-$ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
-    JTREG="JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs"
-```
+    $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" JTREG="JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs"
 
-For more notes about the PKCS11 tests, please refer to
-test/jdk/sun/security/pkcs11/README.
+For more notes about the PKCS11 tests, please refer to test/jdk/sun/security/pkcs11/README.
 
 ### Client UI Tests
 
 Some Client UI tests use key sequences which may be reserved by the operating
-system. Usually that causes the test failure. So it is highly recommended to
-disable system key shortcuts prior testing. The steps to access and disable
-system key shortcuts for various platforms are provided below.
+system. Usually that causes the test failure. So it is highly recommended to disable
+system key shortcuts prior testing. The steps to access and disable system key shortcuts
+for various platforms are provided below.
 
 #### MacOS
-
 Choose Apple menu; System Preferences, click Keyboard, then click Shortcuts;
 select or deselect desired shortcut.
 
-For example,
-test/jdk/javax/swing/TooltipManager/JMenuItemToolTipKeyBindingsTest/JMenuItemToolTipKeyBindingsTest.java
-fails on MacOS because it uses `CTRL + F1` key sequence to show or hide tooltip
-message but the key combination is reserved by the operating system. To run the
-test correctly the default global key shortcut should be disabled using the
-steps described above, and then deselect "Turn keyboard access on or off"
-option which is responsible for `CTRL + F1` combination.
+For example, test/jdk/javax/swing/TooltipManager/JMenuItemToolTipKeyBindingsTest/JMenuItemToolTipKeyBindingsTest.java fails
+on MacOS because it uses `CTRL + F1` key sequence to show or hide tooltip message
+but the key combination is reserved by the operating system. To run the test correctly
+the default global key shortcut should be disabled using the steps described above, and then deselect
+"Turn keyboard access on or off" option which is responsible for `CTRL + F1` combination.
 
 #### Linux
-
-Open the Activities overview and start typing Settings; Choose Settings, click
-Devices, then click Keyboard; set or override desired shortcut.
+Open the Activities overview and start typing Settings; Choose Settings, click Devices,
+then click Keyboard; set or override desired shortcut.
 
 #### Windows
-
-Type `gpedit` in the Search and then click Edit group policy; navigate to User
-Configuration -> Administrative Templates -> Windows Components -> File
-Explorer; in the right-side pane look for "Turn off Windows key hotkeys" and
-double click on it; enable or disable hotkeys.
+Type `gpedit` in the Search and then click Edit group policy; navigate to
+User Configuration -> Administrative Templates -> Windows Components -> File Explorer;
+in the right-side pane look for "Turn off Windows key hotkeys" and double click on it;
+enable or disable hotkeys.
 
 Note: restart is required to make the settings take effect.
 

make/Bundles.gmk

@@ -242,6 +242,16 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
       )
 
   JDK_SYMBOLS_BUNDLE_FILES := \
+      $(filter \
+          $(JDK_SYMBOLS_EXCLUDE_PATTERN) \
+          $(SYMBOLS_EXCLUDE_PATTERN) \
+          , \
+          $(filter-out \
+              $(JDK_IMAGE_HOMEDIR)/demo/% %.stripped.pdb \
+              , \
+              $(ALL_JDK_SYMBOLS_FILES) \
+          ) \
+      ) \
       $(call FindFiles, $(SYMBOLS_IMAGE_DIR))
 
   TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_DEMOS_IMAGE_HOMEDIR)/demo/%, \
@@ -373,7 +383,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
     $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
         BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
         FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \
-        BASE_DIRS := $(SYMBOLS_IMAGE_DIR), \
+        BASE_DIRS := $(JDK_SYMBOLS_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \
         SUBDIR := $(JDK_BUNDLE_SUBDIR), \
         UNZIP_DEBUGINFO := true, \
     ))
@@ -410,43 +420,17 @@ endif
 
 ################################################################################
 
-ifneq ($(filter docs-jdk-bundles, $(MAKECMDGOALS)), )
-  DOCS_JDK_BUNDLE_FILES := $(call FindFiles, $(DOCS_JDK_IMAGE_DIR))
+ifneq ($(filter docs-bundles, $(MAKECMDGOALS)), )
+  DOCS_BUNDLE_FILES := $(call FindFiles, $(DOCS_IMAGE_DIR))
 
-  $(eval $(call SetupBundleFile, BUILD_DOCS_JDK_BUNDLE, \
-      BUNDLE_NAME := $(DOCS_JDK_BUNDLE_NAME), \
-      FILES := $(DOCS_JDK_BUNDLE_FILES), \
-      BASE_DIRS := $(DOCS_JDK_IMAGE_DIR), \
+  $(eval $(call SetupBundleFile, BUILD_DOCS_BUNDLE, \
+      BUNDLE_NAME := $(DOCS_BUNDLE_NAME), \
+      FILES := $(DOCS_BUNDLE_FILES), \
+      BASE_DIRS := $(DOCS_IMAGE_DIR), \
       SUBDIR := docs, \
   ))
 
-  DOCS_JDK_TARGETS += $(BUILD_DOCS_JDK_BUNDLE)
-endif
-
-ifneq ($(filter docs-javase-bundles, $(MAKECMDGOALS)), )
-  DOCS_JAVASE_BUNDLE_FILES := $(call FindFiles, $(DOCS_JAVASE_IMAGE_DIR))
-
-  $(eval $(call SetupBundleFile, BUILD_DOCS_JAVASE_BUNDLE, \
-      BUNDLE_NAME := $(DOCS_JAVASE_BUNDLE_NAME), \
-      FILES := $(DOCS_JAVASE_BUNDLE_FILES), \
-      BASE_DIRS := $(DOCS_JAVASE_IMAGE_DIR), \
-      SUBDIR := docs-javase, \
-  ))
-
-  DOCS_JAVASE_TARGETS += $(BUILD_DOCS_JAVASE_BUNDLE)
-endif
-
-ifneq ($(filter docs-reference-bundles, $(MAKECMDGOALS)), )
-  DOCS_REFERENCE_BUNDLE_FILES := $(call FindFiles, $(DOCS_REFERENCE_IMAGE_DIR))
-
-  $(eval $(call SetupBundleFile, BUILD_DOCS_REFERENCE_BUNDLE, \
-      BUNDLE_NAME := $(DOCS_REFERENCE_BUNDLE_NAME), \
-      FILES := $(DOCS_REFERENCE_BUNDLE_FILES), \
-      BASE_DIRS := $(DOCS_REFERENCE_IMAGE_DIR), \
-      SUBDIR := docs-reference, \
-  ))
-
-  DOCS_REFERENCE_TARGETS += $(BUILD_DOCS_REFERENCE_BUNDLE)
+  DOCS_TARGETS += $(BUILD_DOCS_BUNDLE)
 endif
 
 ################################################################################
@@ -495,12 +479,9 @@ $(eval $(call IncludeCustomExtension, Bundles.gmk))
 product-bundles: $(PRODUCT_TARGETS)
 legacy-bundles: $(LEGACY_TARGETS)
 test-bundles: $(TEST_TARGETS)
-docs-jdk-bundles: $(DOCS_JDK_TARGETS)
-docs-javase-bundles: $(DOCS_JAVASE_TARGETS)
-docs-reference-bundles: $(DOCS_REFERENCE_TARGETS)
+docs-bundles: $(DOCS_TARGETS)
 static-libs-bundles: $(STATIC_LIBS_TARGETS)
 jcov-bundles: $(JCOV_TARGETS)
 
-.PHONY: all default product-bundles test-bundles \
-    docs-jdk-bundles docs-javase-bundles docs-reference-bundles \
+.PHONY: all default product-bundles test-bundles docs-bundles \
     static-libs-bundles jcov-bundles

make/CompileCommands.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -45,6 +45,11 @@ $(OUTPUTDIR)/compile_commands.json: $(wildcard $(MAKESUPPORT_OUTPUTDIR)/compile-
 	$(RM) $@
 	$(FIND) $(MAKESUPPORT_OUTPUTDIR)/compile-commands/ -name \*.json | \
 	    $(SORT) | $(XARGS) $(CAT) >> $@.tmp
+	$(if $(FIXPATH),$(FIXPATH) $(AWK) 'BEGIN { \
+	    tmpfile = substr(ARGV[2],2); \
+	    cmd = "$(CP) " "\047" tmpfile "\047" " $@.tmp"; \
+	    system(cmd); \
+	}' -- @$@.tmp)
 	$(SED) -e '1s/^/[\$(NEWLINE)/' -e '$(DOLLAR)s/,\s\{0,\}$(DOLLAR)/\$(NEWLINE)]/' $@.tmp > $@
 	$(RM) $@.tmp
 

make/CompileDemos.gmk

@@ -52,6 +52,7 @@ TARGETS =
 # READMEs and other files.
 
 DEMO_SHARE_SRC := $(TOPDIR)/src/demo/share
+GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
 
 DEMO_MANIFEST := $(SUPPORT_OUTPUTDIR)/demos/java-main-manifest.mf
 

make/CompileInterimLangtools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -49,9 +49,8 @@ TARGETS += $(patsubst %, $(BUILDTOOLS_OUTPUTDIR)/gensrc/%/module-info.java, \
     $(INTERIM_LANGTOOLS_MODULES))
 
 $(eval $(call SetupCopyFiles, COPY_PREVIEW_FEATURES, \
-    FILES := $(TOPDIR)/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java \
-        $(TOPDIR)/src/java.base/share/classes/jdk/internal/javac/NoPreview.java, \
-    DEST := $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim/jdk/internal/javac/, \
+    FILES := $(TOPDIR)/src/java.base/share/classes/jdk/internal/PreviewFeature.java, \
+    DEST := $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim/jdk/internal/, \
 ))
 
 TARGETS += $(COPY_PREVIEW_FEATURES)
@@ -71,19 +70,19 @@ define SetupInterimModule
       SRC := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim \
           $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$1) \
           $(TOPDIR)/src/$1/share/classes, \
-      EXCLUDES := sun javax/tools/snippet-files, \
+      EXCLUDES := sun, \
       EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
           Standard.java, \
       EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java, \
-      COPY := .gif .png .xml .css .svg .js .js.template .txt javax.tools.JavaCompilerTool, \
+      COPY := .gif .png .xml .css .js javax.tools.JavaCompilerTool, \
       BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules/$1.interim, \
       DISABLED_WARNINGS := module options, \
       JAVAC_FLAGS := \
           --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
           $$(INTERIM_LANGTOOLS_ADD_EXPORTS) \
           --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
-          --add-exports java.base/jdk.internal.javac=java.compiler.interim \
-          --add-exports java.base/jdk.internal.javac=jdk.compiler.interim, \
+          --add-exports java.base/jdk.internal=java.compiler.interim \
+          --add-exports java.base/jdk.internal=jdk.compiler.interim, \
   ))
 
   $1_DEPS_INTERIM := $$(addsuffix .interim, $$(filter \

make/CompileJavaModules.gmk

@@ -31,6 +31,506 @@ include MakeBase.gmk
 include Modules.gmk
 include JavaCompilation.gmk
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, CompileJavaModules.gmk))
+
+################################################################################
+# Module specific build settings
+
+java.base_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
+java.base_JAVAC_FLAGS += -XDstringConcat=inline
+java.base_COPY += .icu .dat .spp .nrm content-types.properties \
+    hijrah-config-Hijrah-umalqura_islamic-umalqura.properties
+java.base_CLEAN += intrinsic.properties
+
+java.base_EXCLUDE_FILES += \
+  $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
+
+java.base_EXCLUDES += java/lang/doc-files
+
+# Exclude BreakIterator classes that are just used in compile process to generate
+# data files and shouldn't go in the product
+java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
+
+ifeq ($(call isTargetOs, macosx aix), false)
+  java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
+endif
+
+ifeq ($(call isTargetOs, windows), true)
+  java.base_EXCLUDE_FILES += \
+      sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
+      #
+endif
+
+################################################################################
+
+java.compiler_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
+
+################################################################################
+
+java.datatransfer_DOCLINT += -Xdoclint:all/protected,-reference \
+    '-Xdoclint/package:java.*,javax.*'
+java.datatransfer_COPY += flavormap.properties
+
+################################################################################
+
+java.desktop_DOCLINT += -Xdoclint:all/protected,-reference \
+    '-Xdoclint/package:java.*,javax.*'
+java.desktop_COPY += .gif .png .wav .txt .xml .css .pf
+java.desktop_CLEAN += iio-plugin.properties cursors.properties
+
+java.desktop_EXCLUDES += \
+    java/awt/doc-files \
+    javax/swing/doc-files \
+    javax/swing/text/doc-files \
+    javax/swing/plaf/synth/doc-files \
+    javax/swing/undo/doc-files \
+    sun/awt/X11/doc-files \
+    #
+
+java.desktop_EXCLUDE_FILES += \
+    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
+    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
+    javax/swing/plaf/nimbus/ScrollBarPainter.java \
+    javax/swing/plaf/nimbus/SliderPainter.java \
+    javax/swing/plaf/nimbus/SpinnerPainter.java \
+    javax/swing/plaf/nimbus/SplitPanePainter.java \
+    javax/swing/plaf/nimbus/TabbedPanePainter.java \
+    sun/awt/resources/security-icon-bw16.png \
+    sun/awt/resources/security-icon-bw24.png \
+    sun/awt/resources/security-icon-bw32.png \
+    sun/awt/resources/security-icon-bw48.png \
+    sun/awt/resources/security-icon-interim16.png \
+    sun/awt/resources/security-icon-interim24.png \
+    sun/awt/resources/security-icon-interim32.png \
+    sun/awt/resources/security-icon-interim48.png \
+    sun/awt/resources/security-icon-yellow16.png \
+    sun/awt/resources/security-icon-yellow24.png \
+    sun/awt/resources/security-icon-yellow32.png \
+    sun/awt/resources/security-icon-yellow48.png \
+    sun/awt/X11/java-icon16.png \
+    sun/awt/X11/java-icon24.png \
+    sun/awt/X11/java-icon32.png \
+    sun/awt/X11/java-icon48.png \
+    .template \
+    #
+
+ifeq ($(call isTargetOs, macosx), true)
+  # exclude all X11 on Mac.
+  java.desktop_EXCLUDES += \
+      sun/awt/X11 \
+      sun/java2d/x11 \
+      sun/java2d/jules \
+      sun/java2d/xr \
+      com/sun/java/swing/plaf/gtk \
+      #
+  java.desktop_EXCLUDE_FILES += \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
+      #
+else
+  # TBD: figure out how to eliminate this long list
+  java.desktop_EXCLUDE_FILES += \
+      sun/awt/X11/ScreenFormat.java \
+      sun/awt/X11/XArc.java \
+      sun/awt/X11/XChar2b.java \
+      sun/awt/X11/XCharStruct.java \
+      sun/awt/X11/XClassHint.java \
+      sun/awt/X11/XComposeStatus.java \
+      sun/awt/X11/XExtCodes.java \
+      sun/awt/X11/XFontProp.java \
+      sun/awt/X11/XFontSetExtents.java \
+      sun/awt/X11/XFontStruct.java \
+      sun/awt/X11/XGCValues.java \
+      sun/awt/X11/XHostAddress.java \
+      sun/awt/X11/XIMCallback.java \
+      sun/awt/X11/XIMHotKeyTrigger.java \
+      sun/awt/X11/XIMHotKeyTriggers.java \
+      sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
+      sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
+      sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
+      sun/awt/X11/XIMStatusDrawCallbackStruct.java \
+      sun/awt/X11/XIMStringConversionCallbackStruct.java \
+      sun/awt/X11/XIMStringConversionText.java \
+      sun/awt/X11/XIMStyles.java \
+      sun/awt/X11/XIMText.java \
+      sun/awt/X11/XIMValuesList.java \
+      sun/awt/X11/XImage.java \
+      sun/awt/X11/XKeyboardControl.java \
+      sun/awt/X11/XKeyboardState.java \
+      sun/awt/X11/XOMCharSetList.java \
+      sun/awt/X11/XOMFontInfo.java \
+      sun/awt/X11/XOMOrientation.java \
+      sun/awt/X11/XPoint.java \
+      sun/awt/X11/XRectangle.java \
+      sun/awt/X11/XSegment.java \
+      sun/awt/X11/XStandardColormap.java \
+      sun/awt/X11/XTextItem.java \
+      sun/awt/X11/XTextItem16.java \
+      sun/awt/X11/XTextProperty.java \
+      sun/awt/X11/XTimeCoord.java \
+      sun/awt/X11/XWindowChanges.java \
+      sun/awt/X11/XdbeSwapInfo.java \
+      sun/awt/X11/XmbTextItem.java \
+      sun/awt/X11/XwcTextItem.java
+endif
+
+ifeq ($(call isTargetOs, windows), true)
+  java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
+endif
+
+ifdef BUILD_HEADLESS_ONLY
+  java.desktop_EXCLUDES += sun/applet
+endif
+
+ifeq ($(call isTargetOs, windows macosx), false)
+  java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
+endif
+
+# These files do not appear in the build result of the old build. This
+# is because they are generated sources, but the AUTO_JAVA_FILES won't
+# pick them up since they aren't generated when the source dirs are
+# searched and they aren't referenced by any other classes so they won't
+# be picked up by implicit compilation. On a rebuild, they are picked up
+# and compiled. Exclude them here to produce the same rt.jar as the old
+# build does when building just once.
+java.desktop_EXCLUDE_FILES += \
+    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
+    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
+    javax/swing/plaf/nimbus/ScrollBarPainter.java \
+    javax/swing/plaf/nimbus/SliderPainter.java \
+    javax/swing/plaf/nimbus/SpinnerPainter.java \
+    javax/swing/plaf/nimbus/SplitPanePainter.java \
+    javax/swing/plaf/nimbus/TabbedPanePainter.java \
+    #
+
+################################################################################
+
+java.scripting_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
+java.scripting_COPY += .js
+java.scripting_CLEAN += .properties
+
+################################################################################
+
+java.instrument_DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
+
+################################################################################
+
+java.logging_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
+
+################################################################################
+
+java.management_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
+
+################################################################################
+
+java.management.rmi_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:javax.*'
+
+################################################################################
+
+java.prefs_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
+
+################################################################################
+
+java.transaction.xa_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:javax.*'
+
+################################################################################
+
+java.sql_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
+
+################################################################################
+
+java.sql.rowset_DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
+java.sql.rowset_CLEAN_FILES += $(wildcard \
+    $(TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
+    $(TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
+
+################################################################################
+
+java.rmi_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
+java.rmi_CLEAN_FILES += $(wildcard \
+    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
+    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
+
+################################################################################
+
+java.xml_DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:$(call CommaList, javax.xml.catalog javax.xml.datatype \
+    javax.xml.transform javax.xml.validation javax.xml.xpath)'
+java.xml_CLEAN += .properties
+
+################################################################################
+
+java.naming_DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
+java.naming_CLEAN += jndiprovider.properties
+
+################################################################################
+
+java.security.jgss_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
+
+################################################################################
+
+java.smartcardio_DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
+
+################################################################################
+
+java.xml.crypto_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
+java.xml.crypto_COPY += .dtd .xml
+java.xml.crypto_CLEAN += .properties
+
+################################################################################
+
+jdk.charsets_COPY += .dat
+
+################################################################################
+
+################################################################################
+
+jdk.compiler_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*'
+jdk.compiler_JAVAC_FLAGS += -XDstringConcat=inline
+jdk.compiler_CLEAN_FILES += $(wildcard \
+    $(patsubst %, $(TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
+        sun/tools/serialver/resources))
+
+################################################################################
+
+jdk.hotspot.agent_DISABLED_WARNINGS += rawtypes serial cast static overrides \
+    fallthrough
+jdk.hotspot.agent_COPY += .gif .png .properties
+
+################################################################################
+
+jdk.editpad_COPY += .properties
+
+################################################################################
+
+jdk.jshell_COPY += .jsh .properties
+
+################################################################################
+
+jdk.internal.le_COPY += .properties .caps .txt
+
+################################################################################
+
+jdk.internal.opt_COPY += .properties
+
+################################################################################
+
+jdk.jcmd_COPY += _options
+
+################################################################################
+
+jdk.dynalink_CLEAN += .properties
+
+################################################################################
+
+jdk.javadoc_COPY += .xml .css .js .png
+
+################################################################################
+
+jdk.jartool_JAVAC_FLAGS += -XDstringConcat=inline
+
+################################################################################
+
+# No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
+SCTP_IMPL_CLASSES = \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
+
+ifeq ($(call isTargetOs, macosx), true)
+  jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
+endif
+
+ifeq ($(call isTargetOs, aix), true)
+  jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
+endif
+
+################################################################################
+
+jdk.incubator.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst \
+    .postrm .postinst .list .sh .desktop .copyright .control .plist .template \
+    .icns .scpt .wxs .wxl .wxi .ico .bmp .tiff
+
+jdk.incubator.jpackage_CLEAN += .properties
+
+################################################################################
+
+jdk.jconsole_COPY += .gif .png
+
+jdk.jconsole_CLEAN_FILES += $(wildcard \
+    $(TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
+
+################################################################################
+
+jdk.jdeps_COPY += .txt
+
+jdk.jdeps_CLEAN_FILES += $(wildcard \
+    $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
+    $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)
+
+################################################################################
+
+jdk.jdi_EXCLUDES += \
+    com/sun/tools/example/debug/bdi \
+    com/sun/tools/example/debug/event \
+    com/sun/tools/example/debug/gui \
+    com/sun/jdi/doc-files \
+    #
+
+jdk.jdi_EXCLUDE_FILES += jdi-overview.html
+
+################################################################################
+
+jdk.dev_CLEAN_FILES += $(wildcard \
+    $(patsubst %, $(TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
+        com/sun/tools/script/shell))
+
+jdk.dev_COPY += .js oqlhelp.html .txt
+
+################################################################################
+
+jdk.internal.jvmstat_COPY += aliasmap
+
+################################################################################
+
+# -parameters provides method's parameters information in class file,
+# JVMCI compilers make use of that information for various sanity checks.
+# Don't use Indy strings concatenation to have good JVMCI startup performance.
+# The exports are needed since JVMCI is dynamically exported (see
+# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
+
+jdk.internal.vm.ci_JAVAC_FLAGS += -parameters -XDstringConcat=inline
+
+################################################################################
+
+jdk.internal.vm.compiler_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler \
+    #
+
+jdk.internal.vm.compiler_EXCLUDES += \
+    jdk.internal.vm.compiler.collections.test \
+    jdk.tools.jaotc.test \
+    org.graalvm.compiler.api.directives.test \
+    org.graalvm.compiler.api.test \
+    org.graalvm.compiler.asm.aarch64.test \
+    org.graalvm.compiler.asm.amd64.test \
+    org.graalvm.compiler.asm.test \
+    org.graalvm.compiler.core.aarch64.test \
+    org.graalvm.compiler.core.amd64.test \
+    org.graalvm.compiler.core.jdk9.test \
+    org.graalvm.compiler.core.match.processor \
+    org.graalvm.compiler.core.test \
+    org.graalvm.compiler.debug.test \
+    org.graalvm.compiler.graph.test \
+    org.graalvm.compiler.hotspot.aarch64.test \
+    org.graalvm.compiler.hotspot.amd64.test \
+    org.graalvm.compiler.hotspot.jdk15.test \
+    org.graalvm.compiler.hotspot.jdk9.test \
+    org.graalvm.compiler.hotspot.lir.test \
+    org.graalvm.compiler.hotspot.test \
+    org.graalvm.compiler.jtt \
+    org.graalvm.compiler.lir.jtt \
+    org.graalvm.compiler.lir.test \
+    org.graalvm.compiler.loop.test \
+    org.graalvm.compiler.microbenchmarks \
+    org.graalvm.compiler.nodeinfo.processor \
+    org.graalvm.compiler.nodes.test \
+    org.graalvm.compiler.options.processor \
+    org.graalvm.compiler.options.test \
+    org.graalvm.compiler.phases.common.test \
+    org.graalvm.compiler.processor \
+    org.graalvm.compiler.replacements.jdk12.test \
+    org.graalvm.compiler.replacements.jdk9.test \
+    org.graalvm.compiler.replacements.processor \
+    org.graalvm.compiler.replacements.test \
+    org.graalvm.compiler.serviceprovider.processor \
+    org.graalvm.compiler.test \
+    org.graalvm.compiler.virtual.bench \
+    org.graalvm.micro.benchmarks \
+    org.graalvm.util.test \
+    #
+
+################################################################################
+
+# -parameters provides method's parameters information in class file,
+# JVMCI compilers make use of that information for various sanity checks.
+# Don't use Indy strings concatenation to have good JAOTC startup performance.
+# The exports are needed since JVMCI is dynamically exported (see
+# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
+
+jdk.aot_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler,jdk.aot \
+    #
+
+jdk.aot_EXCLUDES += \
+    jdk.tools.jaotc.test
+    #
+
+################################################################################
+
+sun.charsets_COPY += .dat
+
+################################################################################
+
+jdk.localedata_COPY += _dict _th
+# Exclude BreakIterator classes that are just used in compile process to generate
+# data files and shouldn't go in the product
+jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java
+jdk.localedata_KEEP_ALL_TRANSLATIONS := true
+################################################################################
+
+jdk.jfr_DISABLED_WARNINGS += exports
+jdk.jfr_COPY := .xsd .xml .dtd
+jdk.jfr_JAVAC_FLAGS := -XDstringConcat=inline
+
 ################################################################################
 # If this is an imported module that has prebuilt classes, only compile
 # module-info.java.
@@ -67,8 +567,60 @@ MODULESOURCEPATH := $(call GetModuleSrcPath)
 # Add imported modules to the modulepath
 MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES))
 
+ifeq ($(MODULE), jdk.internal.vm.ci)
+  ## WORKAROUND jdk.internal.vm.ci source structure issue
+  JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
+      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
+          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+  MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
+endif
+
+ifeq ($(MODULE), jdk.internal.vm.compiler)
+  ## WORKAROUND jdk.internal.vm.compiler source structure issue
+  VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
+      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \
+          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+  MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
+endif
+
+ifeq ($(MODULE), jdk.aot)
+  ## WORKAROUND jdk.aot source structure issue
+  AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \
+      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
+          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+  MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
+endif
+
+$(eval $(call SetupJavaCompilation, $(MODULE), \
+    SMALL_JAVA := false, \
+    MODULE := $(MODULE), \
+    SRC := $(wildcard $(MODULE_SRC_DIRS)), \
+    INCLUDES := $(JDK_USER_DEFINED_FILTER), \
+    FAIL_NO_SRC := $(FAIL_NO_SRC), \
+    BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
+    HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
+    CREATE_API_DIGEST := true, \
+    JAVAC_FLAGS := \
+        $($(MODULE)_DOCLINT) \
+        $($(MODULE)_JAVAC_FLAGS) \
+        --module-source-path $(MODULESOURCEPATH) \
+        --module-path $(MODULEPATH) \
+        --system none, \
+))
+
+TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)
+
+# Declare dependencies between java compilations of different modules.
+# Since the other modules are declared in different invocations of this file,
+# use the macro to find the correct target file to depend on.
+# Only the javac compilation actually depends on other modules so limit
+# dependency declaration to that by using the *_COMPILE_TARGET variable.
+$($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)), \
+    $(call SetupJavaCompilationApiTarget, $d, \
+        $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d)))
+
 ################################################################################
-# Copy zh_HK properties files from zh_TW (needed by some modules)
+# Copy zh_HK properties files from zh_TW
 
 $(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties
 	$(install-file)
@@ -83,48 +635,13 @@ CreateHkTargets = \
        .properties \
     )
 
-################################################################################
-# Include module specific build settings
+ifeq ($(MODULE), java.sql.rowset)
+  TARGETS += $(call CreateHkTargets, $(java.sql.rowset_CLEAN_FILES))
+endif
 
--include Java.gmk
-
-################################################################################
-# Setup the main compilation
-
-$(eval $(call SetupJavaCompilation, $(MODULE), \
-    SMALL_JAVA := false, \
-    MODULE := $(MODULE), \
-    SRC := $(wildcard $(MODULE_SRC_DIRS)), \
-    INCLUDES := $(JDK_USER_DEFINED_FILTER), \
-    FAIL_NO_SRC := $(FAIL_NO_SRC), \
-    BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
-    HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
-    CREATE_API_DIGEST := true, \
-    CLEAN := $(CLEAN), \
-    CLEAN_FILES := $(CLEAN_FILES), \
-    COPY := $(COPY), \
-    DISABLED_WARNINGS := $(DISABLED_WARNINGS_java), \
-    EXCLUDES := $(EXCLUDES), \
-    EXCLUDE_FILES := $(EXCLUDE_FILES), \
-    KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
-    JAVAC_FLAGS := \
-        $(DOCLINT) \
-        $(JAVAC_FLAGS) \
-        --module-source-path $(MODULESOURCEPATH) \
-        --module-path $(MODULEPATH) \
-        --system none, \
-))
-
-TARGETS += $($(MODULE))
-
-# Declare dependencies between java compilations of different modules.
-# Since the other modules are declared in different invocations of this file,
-# use the macro to find the correct target file to depend on.
-# Only the javac compilation actually depends on other modules so limit
-# dependency declaration to that by using the *_COMPILE_TARGET variable.
-$($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)), \
-    $(call SetupJavaCompilationApiTarget, $d, \
-        $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d)))
+ifeq ($(MODULE), java.rmi)
+  TARGETS += $(call CreateHkTargets, $(java.rmi_CLEAN_FILES))
+endif
 
 ################################################################################
 # If this is an imported module, copy the pre built classes and resources into
@@ -148,6 +665,10 @@ endif
 
 ################################################################################
 
+$(eval $(call IncludeCustomExtension, CompileJavaModules-post.gmk))
+
+################################################################################
+
 all: $(TARGETS)
 
 .PHONY: all

make/CompileModuleTools.gmk

@@ -33,20 +33,8 @@ include JavaCompilation.gmk
 
 TOOLS_CLASSES_DIR := $(BUILDTOOLS_OUTPUTDIR)/tools_jigsaw_classes
 
-# When using an external BUILDJDK, make it possible to shortcut building of
-# these tools using the BUILD_JAVAC instead of having to build the complete
-# exploded image first.
-ifeq ($(EXTERNAL_BUILDJDK), true)
-  COMPILER := buildjdk
-  TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK)
-else
-  COMPILER := interim
-  TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED)
-endif
-
 $(eval $(call SetupJavaCompilation, BUILD_JIGSAW_TOOLS, \
-    TARGET_RELEASE := $(TARGET_RELEASE), \
-    COMPILER := $(COMPILER), \
+    TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
     SRC := $(TOPDIR)/make/jdk/src/classes, \
     INCLUDES := build/tools/deps \
                 build/tools/docs \

make/CompileToolsHotspot.gmk

@@ -36,21 +36,91 @@ TARGETS :=
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, hotspot/CompileTools.gmk))
 
-################################################################################
-# Build tools needed for the JFR source code generation
+ifeq ($(INCLUDE_GRAAL), true)
+  VM_CI_SRC_DIR := $(TOPDIR)/src/jdk.internal.vm.ci/share/classes
 
-HOTSPOT_TOOLS_SRCDIR := $(TOPDIR)/make/src/classes
+  SRC_DIR := $(TOPDIR)/src/jdk.internal.vm.compiler/share/classes
 
-HOTSPOT_TOOLS_OUTPUTDIR := $(BUILDTOOLS_OUTPUTDIR)/buildtools/hotspot_tools_classes
+  ##############################################################################
+  # Compile the annotation processors
+  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_MATCH_PROCESSOR, \
+      TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
+      SRC := \
+          $(SRC_DIR)/org.graalvm.compiler.processor/src \
+          $(SRC_DIR)/org.graalvm.compiler.core.match.processor/src \
+          , \
+      EXCLUDE_FILES := $(EXCLUDE_FILES), \
+      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.match.processor, \
+      JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.match.processor.jar, \
+      DISABLED_WARNINGS := options, \
+  ))
 
-$(eval $(call SetupJavaCompilation, BUILD_TOOLS_HOTSPOT, \
-    COMPILER := bootjdk, \
-    SRC := $(HOTSPOT_TOOLS_SRCDIR), \
-    BIN := $(HOTSPOT_TOOLS_OUTPUTDIR), \
-))
+  TARGETS += $(BUILD_VM_COMPILER_MATCH_PROCESSOR)
 
-TARGETS += $(BUILD_TOOLS_HOTSPOT)
+  ##############################################################################
 
+  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_NODEINFO_PROCESSOR, \
+      TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
+      SRC := \
+          $(SRC_DIR)/org.graalvm.compiler.processor/src \
+          $(SRC_DIR)/org.graalvm.compiler.nodeinfo.processor/src \
+          , \
+      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.nodeinfo.processor, \
+      JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.nodeinfo.processor.jar, \
+      DISABLED_WARNINGS := options, \
+  ))
+
+  TARGETS += $(BUILD_VM_COMPILER_NODEINFO_PROCESSOR)
+
+  ##############################################################################
+
+  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_OPTIONS_PROCESSOR, \
+      TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
+      DISABLED_WARNINGS := options, \
+      SRC := \
+          $(SRC_DIR)/org.graalvm.compiler.processor/src \
+          $(SRC_DIR)/org.graalvm.compiler.options.processor/src \
+          , \
+      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.options.processor, \
+      JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.options.processor.jar, \
+  ))
+
+  TARGETS += $(BUILD_VM_COMPILER_OPTIONS_PROCESSOR)
+
+  ##############################################################################
+
+  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_REPLACEMENTS_PROCESSOR, \
+      TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
+      SRC := \
+          $(SRC_DIR)/org.graalvm.compiler.processor/src \
+          $(SRC_DIR)/org.graalvm.compiler.replacements.processor/src \
+          , \
+      EXCLUDE_FILES := $(EXCLUDE_FILES), \
+      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier, \
+      JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar, \
+      DISABLED_WARNINGS := options, \
+  ))
+
+  TARGETS += $(BUILD_VM_COMPILER_REPLACEMENTS_PROCESSOR)
+
+  ##############################################################################
+
+  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_SERVICEPROVIDER_PROCESSOR, \
+      TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
+      SRC := \
+          $(SRC_DIR)/org.graalvm.compiler.processor/src \
+          $(SRC_DIR)/org.graalvm.compiler.serviceprovider.processor/src \
+          , \
+      EXCLUDE_FILES := $(EXCLUDE_FILES), \
+      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor, \
+      JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor.jar, \
+      DISABLED_WARNINGS := options, \
+  ))
+
+  TARGETS += $(BUILD_VM_COMPILER_SERVICEPROVIDER_PROCESSOR)
+
+  ##############################################################################
+endif
 
 all: $(TARGETS)
 

make/CompileToolsJdk.gmk

@@ -56,8 +56,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
     DISABLED_WARNINGS := options, \
     JAVAC_FLAGS := \
         --add-exports java.desktop/sun.awt=ALL-UNNAMED \
-        --add-exports java.base/sun.text=ALL-UNNAMED \
-        --add-exports java.base/sun.security.util=ALL-UNNAMED, \
+        --add-exports java.base/sun.text=ALL-UNNAMED, \
 ))
 
 TARGETS += $(BUILD_TOOLS_JDK)

make/CreateJmods.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -196,11 +196,6 @@ else # not java.base
   endif
 endif
 
-# Set main class of jdk.httpserver module
-ifeq ($(MODULE), jdk.httpserver)
-    JMOD_FLAGS += --main-class sun.net.httpserver.simpleserver.Main
-endif
-
 # Changes to the jmod tool itself should also trigger a rebuild of all jmods.
 # The variable JMOD_CMD could contain an environment variable assignment before
 # the actual command. Filter that out using wildcard before adding to DEPS.
@@ -218,12 +213,12 @@ endif
 
 ifeq ($(call isTargetOs, windows), true)
   ifeq ($(SHIP_DEBUG_SYMBOLS), )
-    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.pdb,*.map}'
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.pdb,*.map}'
   else
-    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.map}'
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.map}'
   endif
 else
-  JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
+  JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
 endif
 
 # Create jmods in the support dir and then move them into place to keep the

make/Docs.gmk

@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -57,11 +57,14 @@ $(eval $(call IncludeCustomExtension, Docs.gmk))
 ################################################################################
 # Javadoc settings
 
-# Include configuration for URLs in generated javadoc
-include $(TOPDIR)/make/conf/javadoc.conf
-
 MODULES_SOURCE_PATH := $(call PathList, $(call GetModuleSrcPath) )
 
+# URLs
+JAVADOC_BASE_URL := https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage
+BUG_SUBMIT_URL := https://bugreport.java.com/bugreport/
+COPYRIGHT_URL := legal/copyright.html
+LICENSE_URL := https://www.oracle.com/java/javase/terms/license/java$(VERSION_NUMBER)speclicense.html
+REDISTRIBUTION_URL := https://www.oracle.com/technetwork/java/redist-137594.html
 
 # In order to get a specific ordering it's necessary to specify the total
 # ordering of tags as the tags are otherwise ordered in order of definition.
@@ -89,6 +92,7 @@ JAVADOC_TAGS := \
     -tag see \
     -taglet build.tools.taglet.ExtLink \
     -taglet build.tools.taglet.Incubating \
+    -taglet build.tools.taglet.Preview \
     -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     $(CUSTOM_JAVADOC_TAGS) \
     #
@@ -99,8 +103,7 @@ JAVADOC_TAGS := \
 REFERENCE_TAGS := $(JAVADOC_TAGS)
 
 # Which doclint checks to ignore
-JAVADOC_DISABLED_DOCLINT_WARNINGS := missing
-JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
+JAVADOC_DISABLED_DOCLINT := accessibility html missing syntax reference
 
 # The initial set of options for javadoc
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
@@ -154,14 +157,13 @@ COPYRIGHT_BOTTOM = \
     <a href="$(REDISTRIBUTION_URL)">documentation redistribution policy</a>. \
     $(DRAFT_MARKER_STR) <!-- Version $(VERSION_STRING) -->
 
-# $1 - Optional "Other Versions" link
-JAVADOC_BOTTOM = \
+JAVADOC_BOTTOM := \
     <a href="$(BUG_SUBMIT_URL)">Report a bug or suggest an enhancement</a><br> \
     For further API reference and developer documentation see the \
     <a href="$(JAVADOC_BASE_URL)" target="_blank">Java SE \
     Documentation</a>, which contains more detailed, \
     developer-targeted descriptions with conceptual overviews, definitions \
-    of terms, workarounds, and working code examples. $1<br> \
+    of terms, workarounds, and working code examples.<br> \
     Java is a trademark or registered trademark of $(FULL_COMPANY_NAME) in \
     the US and other countries.<br> \
     $(call COPYRIGHT_BOTTOM, {@docroot}/../)
@@ -263,7 +265,6 @@ endef
 #   SHORT_NAME - The short name of this documentation collection
 #   LONG_NAME - The long name of this documentation collection
 #   TARGET_DIR - Where to store the output
-#   OTHER_VERSIONS - URL for other page listing versions
 #
 SetupApiDocsGeneration = $(NamedParamsMacroTemplate)
 define SetupApiDocsGenerationBody
@@ -296,26 +297,18 @@ define SetupApiDocsGenerationBody
 
   # Create a string like "-Xdoclint:all,-syntax,-html,..."
   $1_OPTIONS += -Xdoclint:all,$$(call CommaList, $$(addprefix -, \
-      $$(JAVADOC_DISABLED_DOCLINT_WARNINGS)))
-  # Ignore the doclint warnings in certain packages
-  $1_OPTIONS += -Xdoclint/package:$$(call CommaList, $$(addprefix -, \
-      $$(JAVADOC_DISABLED_DOCLINT_PACKAGES)))
+      $$(JAVADOC_DISABLED_DOCLINT)))
 
   $1_DOC_TITLE := $$($1_LONG_NAME)<br>Version $$(VERSION_SPECIFICATION) API \
       Specification
   $1_WINDOW_TITLE := $$(subst &amp;,&,$$($1_SHORT_NAME))$$(DRAFT_MARKER_TITLE)
   $1_HEADER_TITLE := <div $$(HEADER_STYLE)><strong>$$($1_SHORT_NAME)</strong> \
       $$(DRAFT_MARKER_STR)</div>
-  ifneq ($$($1_OTHER_VERSIONS), )
-      $1_JAVADOC_BOTTOM := $$(call JAVADOC_BOTTOM, <a href="$$($1_OTHER_VERSIONS)">Other versions.</a>)
-  else
-      $1_JAVADOC_BOTTOM := $$(call JAVADOC_BOTTOM, )
-  endif
 
   $1_OPTIONS += -doctitle '$$($1_DOC_TITLE)'
   $1_OPTIONS += -windowtitle '$$($1_WINDOW_TITLE)'
   $1_OPTIONS += -header '$$($1_HEADER_TITLE)'
-  $1_OPTIONS += -bottom '$$($1_JAVADOC_BOTTOM)'
+  $1_OPTIONS += -bottom '$$(JAVADOC_BOTTOM)'
   ifeq ($$(IS_DRAFT), true)
     $1_OPTIONS += -top '$$(JAVADOC_TOP)'
   endif
@@ -332,12 +325,6 @@ define SetupApiDocsGenerationBody
   $$(eval $$(call create_overview_file,$1))
   $1_OPTIONS += -overview $$($1_OVERVIEW)
 
-  # Add summary pages for new/deprecated APIs in recent releases
-  $1_OPTIONS += --since $(call CommaList, \
-      $(filter-out $(VERSION_DOCS_API_SINCE), \
-          $(call sequence, $(VERSION_DOCS_API_SINCE), $(VERSION_FEATURE))))
-  $1_OPTIONS += --since-label "New API since JDK $(VERSION_DOCS_API_SINCE)"
-
   $$(foreach g, $$($1_GROUPS), \
     $$(eval $1_OPTIONS += -group "$$($$g_GROUP_NAME)" "$$($$g_GROUP_MODULES)") \
   )
@@ -453,7 +440,6 @@ $(eval $(call SetupApiDocsGeneration, JDK_API, \
     SHORT_NAME := $(JDK_SHORT_NAME), \
     LONG_NAME := $(JDK_LONG_NAME), \
     TARGET_DIR := $(DOCS_OUTPUTDIR)/api, \
-    OTHER_VERSIONS := $(OTHER_JDK_VERSIONS_URL), \
 ))
 
 # Targets generated are returned in JDK_API_JAVADOC_TARGETS and
@@ -470,7 +456,7 @@ $(eval $(call SetupApiDocsGeneration, JAVASE_API, \
     MODULES := $(JAVASE_MODULES), \
     SHORT_NAME := $(JAVASE_SHORT_NAME), \
     LONG_NAME := $(JAVASE_LONG_NAME), \
-    TARGET_DIR := $(DOCS_JAVASE_IMAGE_DIR)/api, \
+    TARGET_DIR := $(IMAGES_OUTPUTDIR)/javase-docs/api, \
 ))
 
 # Targets generated are returned in JAVASE_API_JAVADOC_TARGETS and
@@ -488,8 +474,8 @@ $(eval $(call SetupApiDocsGeneration, REFERENCE_API, \
     MODULES := $(JAVASE_MODULES), \
     SHORT_NAME := $(JAVASE_SHORT_NAME), \
     LONG_NAME := $(JAVASE_LONG_NAME), \
-    TARGET_DIR := $(DOCS_REFERENCE_IMAGE_DIR)/api, \
-    JAVADOC_CMD := $(DOCS_REFERENCE_JAVADOC), \
+    TARGET_DIR := $(IMAGES_OUTPUTDIR)/reference-docs/api, \
+    JAVADOC_CMD := $(JAVADOC), \
     OPTIONS := $(REFERENCE_OPTIONS), \
     TAGS := $(REFERENCE_TAGS), \
 ))

make/GenerateLinkOptData.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ endif
 
 # Save the stderr output of the command and print it along with stdout in case
 # something goes wrong.
-$(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST_JAR)
+$(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR)
 	$(call MakeDir, $(LINK_OPT_DIR))
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
@@ -88,16 +88,13 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	        $(CAT) $(LINK_OPT_DIR)/stderr $(JLI_TRACE_FILE) ; \
 	        exit $$exitcode \
 	    )
-	$(GREP) -v HelloClasslist $@.raw.2 > $@.raw.3
-	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java \
-	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
-	    build.tools.classlist.SortClasslist $@.raw.3 > $@
+	$(GREP) -v HelloClasslist $@.raw.2 > $@
 
 # The jli trace is created by the same recipe as classlist. By declaring these
 # dependencies, make will correctly rebuild both jli trace and classlist
 # incrementally using the single recipe above.
 $(CLASSLIST_FILE): $(JLI_TRACE_FILE)
-$(JLI_TRACE_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST_JAR)
+$(JLI_TRACE_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR)
 
 TARGETS += $(CLASSLIST_FILE) $(JLI_TRACE_FILE)
 

make/Global.gmk

@@ -101,9 +101,9 @@ help:
 	$(info $(_)                        # method is 'auto', 'ignore' or 'fail' (default))
 	$(info $(_) TEST="test1 ..."       # Use the given test descriptor(s) for testing, e.g.)
 	$(info $(_)                        # make test TEST="jdk_lang gtest:all")
-	$(info $(_) JTREG="OPT1=x;OPT2=y"  # Control the JTREG test harness, use 'help' to list)
-	$(info $(_) GTEST="OPT1=x;OPT2=y"  # Control the GTEST test harness, use 'help' to list)
-	$(info $(_) MICRO="OPT1=x;OPT2=y"  # Control the MICRO test harness, use 'help' to list)
+	$(info $(_) JTREG="OPT1=x;OPT2=y"  # Control the JTREG test harness)
+	$(info $(_) GTEST="OPT1=x;OPT2=y"  # Control the GTEST test harness)
+	$(info $(_) MICRO="OPT1=x;OPT2=y"  # Control the MICRO test harness)
 	$(info $(_) TEST_OPTS="OPT1=x;..." # Generic control of all test harnesses)
 	$(info $(_) TEST_VM_OPTS="ARG ..." # Same as setting TEST_OPTS to VM_OPTIONS="ARG ...")
 	$(info )

make/Hsdis.gmk

@@ -1,146 +0,0 @@
-#
-# Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JdkNativeCompilation.gmk
-
-################################################################################
-# This makefile compiles and installs the hsdis library
-#
-################################################################################
-
-HSDIS_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/hsdis
-
-ifeq ($(call isTargetOs, windows), true)
-  INSTALLED_HSDIS_DIR := $(JDK_OUTPUTDIR)/bin
-
-  # On windows, we need to "fake" a completely different toolchain using gcc
-  # instead of the normal microsoft toolchain. This is quite hacky...
-
-  MINGW_BASE := x86_64-w64-mingw32
-
-  MINGW_SYSROOT = $(shell $(MINGW_BASE)-gcc -print-sysroot)
-  ifeq ($(wildcard $(MINGW_SYSROOT)), )
-    # Use fallback path
-    MINGW_SYSROOT := /usr/$(MINGW_BASE)
-    ifeq ($(wildcard $(MINGW_SYSROOT)), )
-      $(error mingw sysroot not found)
-    endif
-  endif
-
-  $(eval $(call DefineNativeToolchain, TOOLCHAIN_MINGW, \
-      CC := $(MINGW_BASE)-gcc, \
-      LD := $(MINGW_BASE)-ld, \
-      OBJCOPY := $(MINGW_BASE)-objcopy, \
-      RC := $(RC), \
-      SYSROOT_CFLAGS := --sysroot=$(MINGW_SYSROOT), \
-      SYSROOT_LDFLAGS := --sysroot=$(MINGW_SYSROOT), \
-  ))
-
-  MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/mingw/lib
-  ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
-    # Try without mingw
-    MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/lib
-    ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
-      $(error mingw sysroot lib path not found)
-    endif
-  endif
-
-  MINGW_VERSION = $(shell $(MINGW_BASE)-gcc -v 2>&1 | $(GREP) "gcc version" | $(CUT) -d " " -f 3)
-  MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION)
-  ifeq ($(wildcard $(MINGW_GCC_LIB_PATH)), )
-    # Try using only major version number
-    MINGW_VERSION_MAJOR := $(firstword $(subst ., , $(MINGW_VERSION)))
-    MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION_MAJOR)
-    ifeq ($(wildcard $(MINGW_GCC_LIB_PATH)), )
-      $(error mingw gcc lib path not found)
-    endif
-  endif
-
-  TOOLCHAIN_TYPE := gcc
-  OPENJDK_TARGET_OS := linux
-  CC_OUT_OPTION := -o$(SPACE)
-  LD_OUT_OPTION := -o$(SPACE)
-  GENDEPS_FLAGS := -MMD -MF
-  CFLAGS_DEBUG_SYMBOLS := -g
-  DISABLED_WARNINGS :=
-  DISABLE_WARNING_PREFIX := -Wno-
-  CFLAGS_WARNINGS_ARE_ERRORS := -Werror
-  SHARED_LIBRARY_FLAGS := -shared
-
-  HSDIS_TOOLCHAIN := TOOLCHAIN_MINGW
-  HSDIS_TOOLCHAIN_CFLAGS :=
-  HSDIS_TOOLCHAIN_LDFLAGS := -L$(MINGW_GCC_LIB_PATH) -L$(MINGW_SYSROOT_LIB_PATH)
-  MINGW_DLLCRT := $(MINGW_SYSROOT_LIB_PATH)/dllcrt2.o
-  HSDIS_TOOLCHAIN_LIBS := $(MINGW_DLLCRT) -lmingw32 -lgcc -lgcc_eh -lmoldname \
-      -lmingwex -lmsvcrt -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32
-else
-  INSTALLED_HSDIS_DIR := $(JDK_OUTPUTDIR)/lib
-
-  HSDIS_TOOLCHAIN := TOOLCHAIN_DEFAULT
-  HSDIS_TOOLCHAIN_CFLAGS := $(CFLAGS_JDKLIB)
-  HSDIS_TOOLCHAIN_LDFLAGS := $(LDFLAGS_JDKLIB)
-  HSDIS_TOOLCHAIN_LIBS := -ldl
-endif
-
-
-$(eval $(call SetupJdkLibrary, BUILD_HSDIS, \
-    NAME := hsdis, \
-    SRC := $(TOPDIR)/src/utils/hsdis, \
-    TOOLCHAIN := $(HSDIS_TOOLCHAIN), \
-    OUTPUT_DIR := $(HSDIS_OUTPUT_DIR), \
-    OBJECT_DIR := $(HSDIS_OUTPUT_DIR), \
-    DISABLED_WARNINGS_gcc := undef format-nonliteral sign-compare, \
-    DISABLED_WARNINGS_clang := undef format-nonliteral, \
-    CFLAGS := $(HSDIS_TOOLCHAIN_CFLAGS) $(HSDIS_CFLAGS), \
-    LDFLAGS := $(HSDIS_TOOLCHAIN_LDFLAGS) $(SHARED_LIBRARY_FLAGS), \
-    LIBS := $(HSDIS_LIBS) $(HSDIS_TOOLCHAIN_LIBS), \
-))
-
-build: $(BUILD_HSDIS)
-
-TARGETS += build
-
-INSTALLED_HSDIS_NAME := hsdis-$(OPENJDK_TARGET_CPU_LEGACY_LIB)$(SHARED_LIBRARY_SUFFIX)
-
-INSTALLED_HSDIS := $(INSTALLED_HSDIS_DIR)/$(INSTALLED_HSDIS_NAME)
-
-$(INSTALLED_HSDIS): $(BUILD_HSDIS_TARGET)
-	$(call LogWarn, NOTE: The resulting build might not be redistributable. Seek legal advice before distibuting.)
-	$(install-file)
-
-
-install: $(INSTALLED_HSDIS)
-
-TARGETS += install
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: all default build install

make/Images.gmk

@@ -44,7 +44,7 @@ ALL_MODULES := $(call FindAllModules)
 $(eval $(call ReadImportMetaData))
 
 JRE_MODULES += $(filter $(ALL_MODULES), $(BOOT_MODULES) \
-    $(PLATFORM_MODULES) jdk.jdwp.agent)
+    $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
 JDK_MODULES += $(ALL_MODULES)
 
 JRE_MODULES_LIST := $(call CommaList, $(JRE_MODULES))
@@ -238,7 +238,6 @@ endif
 ALL_JDK_MODULES := $(JDK_MODULES)
 ALL_JRE_MODULES := $(sort $(JRE_MODULES), $(foreach m, $(JRE_MODULES), \
     $(call FindTransitiveDepsForModule, $m)))
-ALL_SYMBOLS_MODULES := $(JDK_MODULES)
 
 ifeq ($(call isTargetOs, windows), true)
   LIBS_TARGET_SUBDIR := bin
@@ -294,7 +293,6 @@ SetupCopyDebuginfo = \
 # implementation above.
 $(call SetupCopyDebuginfo,JDK)
 $(call SetupCopyDebuginfo,JRE)
-$(call SetupCopyDebuginfo,SYMBOLS)
 
 ################################################################################
 

make/Init.gmk

@@ -197,10 +197,10 @@ ifeq ($(HAS_SPEC),)
 	            COMPARE_BUILD="$(COMPARE_BUILD)" pre-compare-build && \
 	        $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/Init.gmk \
 	            SPEC=$(spec) HAS_SPEC=true $(MAKE_INIT_WITH_SPEC_ARGUMENTS) \
-	            COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" main && \
+	            COMPARE_BUILD="$(COMPARE_BUILD)" main && \
 	        $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
 	            SPEC=$(spec) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
-	            COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" post-compare-build && \
+	            COMPARE_BUILD="$(COMPARE_BUILD)" post-compare-build && \
 	    ) \
 	  ) true ) \
 	  $(eval TARGET_DONE=true) \

make/InitSupport.gmk

@@ -350,9 +350,6 @@ else # $(HAS_SPEC)=true
           $$(if $$(filter FAIL=%, $$(part)), \
             $$(eval COMPARE_BUILD_FAIL=$$(strip $$(subst +, , $$(patsubst FAIL=%, %, $$(part))))) \
           ) \
-          $$(if $$(filter NODRYRUN=%, $$(part)), \
-            $$(eval COMPARE_BUILD_NODRYRUN=$$(strip $$(subst +, , $$(patsubst NODRYRUN=%, %, $$(part))))) \
-          ) \
         )
       else
         # Separate handling for single field case, to allow for spaces in values.
@@ -375,11 +372,9 @@ else # $(HAS_SPEC)=true
         else ifeq ($$(wildcard $$(COMPARE_BUILD_PATCH)), )
           $$(error Patch file $$(COMPARE_BUILD_PATCH) does not exist)
         endif
-        ifneq ($$(COMPARE_BUILD_NODRYRUN), true)
-          PATCH_DRY_RUN := $$(shell cd $$(topdir) && $$(PATCH) --dry-run -p1 < $$(COMPARE_BUILD_PATCH) > /dev/null 2>&1 || $$(ECHO) FAILED)
-          ifeq ($$(PATCH_DRY_RUN), FAILED)
-            $$(error Patch file $$(COMPARE_BUILD_PATCH) does not apply cleanly)
-          endif
+        PATCH_DRY_RUN := $$(shell cd $$(topdir) && $$(PATCH) --dry-run -p1 < $$(COMPARE_BUILD_PATCH) > /dev/null 2>&1 || $$(ECHO) FAILED)
+        ifeq ($$(PATCH_DRY_RUN), FAILED)
+          $$(error Patch file $$(COMPARE_BUILD_PATCH) does not apply cleanly)
         endif
       endif
       ifneq ($$(COMPARE_BUILD_FAIL), true)

make/InterimImage.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ include Modules.gmk
 ################################################################################
 
 # Use this file inside the image as target for make rule
-JIMAGE_TARGET_FILE := bin/java$(EXECUTABLE_SUFFIX)
+JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
 
 INTERIM_MODULES_LIST := $(call CommaList, $(INTERIM_IMAGE_MODULES))
 

make/MacBundles.gmk

@@ -38,8 +38,11 @@ ifeq ($(call isTargetOs, macosx), true)
 
   MACOSX_PLIST_SRC := $(TOPDIR)/make/data/bundle
 
+  BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(VERSION_SHORT)
   BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(VERSION_SHORT)
   BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) $(VERSION_STRING)
+  BUNDLE_PLATFORM_VERSION := $(VERSION_FEATURE).$(VERSION_INTERIM)
+  BUNDLE_VERSION := $(VERSION_NUMBER)
   ifeq ($(COMPANY_NAME), N/A)
     BUNDLE_VENDOR := UNDEFINED
   else
@@ -72,26 +75,24 @@ ifeq ($(call isTargetOs, macosx), true)
       SOURCE_FILES := $(MACOSX_PLIST_SRC)/JDK-Info.plist, \
       OUTPUT_FILE := $(JDK_MACOSX_CONTENTS_DIR)/Info.plist, \
       REPLACEMENTS := \
-          @@ID@@ => $(MACOSX_BUNDLE_ID_BASE).jdk ; \
+          @@ID@@ => $(BUNDLE_ID).jdk ; \
           @@NAME@@ => $(BUNDLE_NAME) ; \
           @@INFO@@ => $(BUNDLE_INFO) ; \
-          @@VERSION@@ => $(VERSION_NUMBER) ; \
-          @@BUILD_VERSION@@ => $(MACOSX_BUNDLE_BUILD_VERSION) ; \
-          @@VENDOR@@ => $(BUNDLE_VENDOR) ; \
-          @@MACOSX_VERSION_MIN@@ => $(MACOSX_VERSION_MIN) , \
+          @@PLATFORM_VERSION@@ => $(BUNDLE_PLATFORM_VERSION) ; \
+          @@VERSION@@ => $(BUNDLE_VERSION) ; \
+          @@VENDOR@@ => $(BUNDLE_VENDOR) , \
   ))
 
   $(eval $(call SetupTextFileProcessing, BUILD_JRE_PLIST, \
       SOURCE_FILES := $(MACOSX_PLIST_SRC)/JRE-Info.plist, \
       OUTPUT_FILE := $(JRE_MACOSX_CONTENTS_DIR)/Info.plist, \
       REPLACEMENTS := \
-          @@ID@@ => $(MACOSX_BUNDLE_ID_BASE).jre ; \
+          @@ID@@ => $(BUNDLE_ID).jre ; \
           @@NAME@@ => $(BUNDLE_NAME) ; \
           @@INFO@@ => $(BUNDLE_INFO) ; \
-          @@VERSION@@ => $(VERSION_NUMBER) ; \
-          @@BUILD_VERSION@@ => $(BUNDLE_BUILD_VERSION) ; \
-          @@VENDOR@@ => $(BUNDLE_VENDOR) ; \
-          @@MACOSX_VERSION_MIN@@ => $(MACOSX_VERSION_MIN) , \
+          @@PLATFORM_VERSION@@ => $(BUNDLE_PLATFORM_VERSION) ; \
+          @@VERSION@@ => $(BUNDLE_VERSION) ; \
+          @@VENDOR@@ => $(BUNDLE_VENDOR) , \
   ))
 
   $(SUPPORT_OUTPUTDIR)/images/_jdk_bundle_attribute_set: $(COPY_JDK_IMAGE)

make/Main.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -90,10 +90,12 @@ $(eval $(call SetupTarget, buildtools-jdk, \
 
 $(eval $(call SetupTarget, buildtools-modules, \
     MAKEFILE := CompileModuleTools, \
+    DEPS := exploded-image-base, \
 ))
 
 $(eval $(call SetupTarget, buildtools-hotspot, \
     MAKEFILE := CompileToolsHotspot, \
+    DEPS := interim-langtools, \
 ))
 
 ################################################################################
@@ -110,6 +112,7 @@ $(eval $(call SetupTarget, generate-exported-symbols, \
 $(eval $(call DeclareRecipesForPhase, GENSRC, \
     TARGET_SUFFIX := gensrc-src, \
     FILE_PREFIX := Gensrc, \
+    MAKE_SUBDIR := gensrc, \
     CHECK_MODULES := $(ALL_MODULES), \
 ))
 
@@ -147,6 +150,7 @@ ALL_TARGETS += $(GENSRC_TARGETS)
 $(eval $(call DeclareRecipesForPhase, GENDATA, \
     TARGET_SUFFIX := gendata, \
     FILE_PREFIX := Gendata, \
+    MAKE_SUBDIR := gendata, \
     CHECK_MODULES := $(ALL_MODULES), \
 ))
 
@@ -157,6 +161,7 @@ ALL_TARGETS += $(GENDATA_TARGETS)
 $(eval $(call DeclareRecipesForPhase, COPY, \
     TARGET_SUFFIX := copy, \
     FILE_PREFIX := Copy, \
+    MAKE_SUBDIR := copy, \
     CHECK_MODULES := $(ALL_MODULES), \
 ))
 
@@ -186,7 +191,6 @@ JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES))
 define DeclareCompileJavaRecipe
   $1-java:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
-	$(patsubst %,-I%/modules/$1,$(PHASE_MAKEDIRS)) \
 	    -f CompileJavaModules.gmk MODULE=$1)
 endef
 
@@ -199,6 +203,7 @@ ALL_TARGETS += $(JAVA_TARGETS)
 $(eval $(call DeclareRecipesForPhase, LIBS, \
     TARGET_SUFFIX := libs, \
     FILE_PREFIX := Lib, \
+    MAKE_SUBDIR := lib, \
     CHECK_MODULES := $(ALL_MODULES), \
 ))
 
@@ -211,6 +216,7 @@ ALL_TARGETS += $(LIBS_TARGETS)
 $(eval $(call DeclareRecipesForPhase, STATIC_LIBS, \
     TARGET_SUFFIX := static-libs, \
     FILE_PREFIX := Lib, \
+    MAKE_SUBDIR := lib, \
     CHECK_MODULES := $(ALL_MODULES), \
     EXTRA_ARGS := STATIC_LIBS=true, \
 ))
@@ -222,6 +228,7 @@ ALL_TARGETS += $(STATIC_LIBS_TARGETS)
 $(eval $(call DeclareRecipesForPhase, LAUNCHER, \
     TARGET_SUFFIX := launchers, \
     FILE_PREFIX := Launcher, \
+    MAKE_SUBDIR := launcher, \
     CHECK_MODULES := $(ALL_MODULES), \
 ))
 
@@ -324,7 +331,7 @@ $(eval $(call SetupTarget, vscode-project-ccls, \
 # aren't built until after libjava and libjvm are available to link to.
 $(eval $(call SetupTarget, demos-jdk, \
     MAKEFILE := CompileDemos, \
-    DEPS := java.base-libs exploded-image buildtools-jdk, \
+    DEPS := java.base-libs exploded-image, \
 ))
 
 $(eval $(call SetupTarget, test-image-demos-jdk, \
@@ -338,7 +345,7 @@ $(eval $(call SetupTarget, test-image-demos-jdk, \
 
 $(eval $(call SetupTarget, generate-summary, \
     MAKEFILE := GenerateModuleSummary, \
-    DEPS := jmods buildtools-modules runnable-buildjdk, \
+    DEPS := jmods buildtools-modules, \
 ))
 
 ################################################################################
@@ -383,12 +390,12 @@ bootcycle-images:
 
 $(eval $(call SetupTarget, zip-security, \
     MAKEFILE := ZipSecurity, \
-    DEPS := buildtools-jdk java.base-java java.security.jgss-java java.security.jgss-libs, \
+    DEPS := java.base-java java.security.jgss-java java.security.jgss-libs, \
 ))
 
 $(eval $(call SetupTarget, zip-source, \
     MAKEFILE := ZipSource, \
-    DEPS := buildtools-jdk gensrc, \
+    DEPS := gensrc, \
 ))
 
 $(eval $(call SetupTarget, jrtfs-jar, \
@@ -468,7 +475,7 @@ $(eval $(call SetupTarget, docs-jdk-api-javadoc, \
 $(eval $(call SetupTarget, docs-jdk-api-modulegraph, \
     MAKEFILE := Docs, \
     TARGET := docs-jdk-api-modulegraph, \
-    DEPS := buildtools-modules runnable-buildjdk, \
+    DEPS := exploded-image buildtools-modules, \
 ))
 
 $(eval $(call SetupTarget, docs-javase-api-javadoc, \
@@ -479,7 +486,7 @@ $(eval $(call SetupTarget, docs-javase-api-javadoc, \
 $(eval $(call SetupTarget, docs-javase-api-modulegraph, \
     MAKEFILE := Docs, \
     TARGET := docs-javase-api-modulegraph, \
-    DEPS := buildtools-modules runnable-buildjdk, \
+    DEPS := exploded-image buildtools-modules, \
 ))
 
 $(eval $(call SetupTarget, docs-reference-api-javadoc, \
@@ -490,7 +497,7 @@ $(eval $(call SetupTarget, docs-reference-api-javadoc, \
 $(eval $(call SetupTarget, docs-reference-api-modulegraph, \
     MAKEFILE := Docs, \
     TARGET := docs-reference-api-modulegraph, \
-    DEPS := buildtools-modules runnable-buildjdk, \
+    DEPS := exploded-image buildtools-modules, \
 ))
 
 # The gensrc steps for jdk.jdi create html spec files.
@@ -508,13 +515,13 @@ $(eval $(call SetupTarget, docs-jdk-index, \
 $(eval $(call SetupTarget, docs-zip, \
     MAKEFILE := Docs, \
     TARGET := docs-zip, \
-    DEPS :=  docs-jdk buildtools-jdk, \
+    DEPS :=  docs-jdk, \
 ))
 
 $(eval $(call SetupTarget, docs-specs-zip, \
     MAKEFILE := Docs, \
     TARGET := docs-specs-zip, \
-    DEPS := docs-jdk-specs buildtools-jdk, \
+    DEPS := docs-jdk-specs, \
 ))
 
 $(eval $(call SetupTarget, update-build-docs, \
@@ -526,18 +533,6 @@ $(eval $(call SetupTarget, update-x11wrappers, \
     DEPS := java.base-copy buildtools-jdk, \
 ))
 
-ifneq ($(HSDIS_BACKEND), none)
-  $(eval $(call SetupTarget, build-hsdis, \
-      MAKEFILE := Hsdis, \
-      TARGET := build, \
-  ))
-
-  $(eval $(call SetupTarget, install-hsdis, \
-      MAKEFILE := Hsdis, \
-      TARGET := install, \
-  ))
-endif
-
 ################################################################################
 # Cross compilation support
 
@@ -645,20 +640,6 @@ $(eval $(call SetupTarget, test-image-jdk-jtreg-native, \
     DEPS := build-test-jdk-jtreg-native, \
 ))
 
-# Native files needed by the testlib
-$(eval $(call SetupTarget, build-test-lib-native, \
-    MAKEFILE := test/BuildTestLibNative, \
-    TARGET := build-test-lib-native, \
-    DEPS := buildtools-jdk java.base-libs, \
-))
-
-$(eval $(call SetupTarget, test-image-lib-native, \
-    MAKEFILE := test/BuildTestLibNative, \
-    TARGET := test-image-lib-native, \
-    DEPS := build-test-lib-native, \
-))
-
-# Native files needed when testing the testlib itself
 $(eval $(call SetupTarget, build-test-libtest-jtreg-native, \
     MAKEFILE := test/JtregNativeLibTest, \
     TARGET := build-test-libtest-jtreg-native, \
@@ -671,7 +652,19 @@ $(eval $(call SetupTarget, test-image-libtest-jtreg-native, \
     DEPS := build-test-libtest-jtreg-native, \
 ))
 
-ifneq ($(GTEST_FRAMEWORK_SRC), )
+$(eval $(call SetupTarget, build-test-hotspot-jtreg-graal, \
+    MAKEFILE := test/JtregGraalUnit, \
+    TARGET := build-test-hotspot-jtreg-graal, \
+    DEPS := exploded-image, \
+))
+
+$(eval $(call SetupTarget, test-image-hotspot-jtreg-graal, \
+    MAKEFILE := test/JtregGraalUnit, \
+    TARGET := test-image-hotspot-jtreg-graal, \
+    DEPS := build-test-hotspot-jtreg-graal, \
+))
+
+ifneq ($GTEST_FRAMEWORK_SRC), )
   $(eval $(call SetupTarget, test-image-hotspot-gtest, \
       MAKEFILE := hotspot/test/GtestImage, \
       DEPS := hotspot, \
@@ -748,24 +741,12 @@ $(eval $(call SetupTarget, test-bundles, \
     DEPS := test-image, \
 ))
 
-$(eval $(call SetupTarget, docs-jdk-bundles, \
+$(eval $(call SetupTarget, docs-bundles, \
     MAKEFILE := Bundles, \
-    TARGET := docs-jdk-bundles, \
+    TARGET := docs-bundles, \
     DEPS := docs-image, \
 ))
 
-$(eval $(call SetupTarget, docs-javase-bundles, \
-    MAKEFILE := Bundles, \
-    TARGET := docs-javase-bundles, \
-    DEPS := docs-javase-image, \
-))
-
-$(eval $(call SetupTarget, docs-reference-bundles, \
-    MAKEFILE := Bundles, \
-    TARGET := docs-reference-bundles, \
-    DEPS := docs-reference-image, \
-))
-
 $(eval $(call SetupTarget, static-libs-bundles, \
     MAKEFILE := Bundles, \
     TARGET := static-libs-bundles, \
@@ -823,7 +804,7 @@ else
 
   # Declare dependencies between hotspot-<variant>* targets
   $(foreach v, $(JVM_VARIANTS), \
-      $(eval hotspot-$v-gensrc: java.base-copy buildtools-hotspot) \
+      $(eval hotspot-$v-gensrc: java.base-copy) \
       $(eval hotspot-$v-libs: hotspot-$v-gensrc java.base-copy) \
   )
 
@@ -869,14 +850,23 @@ else
   # virtual target.
   jdk.jdwp.agent-libs: jdk.jdwp.agent-gensrc
 
-  # jdk.jfr-gendata uses TOOL_JFR_GEN from buildtools-hotspot
-  jdk.jfr-gendata: buildtools-hotspot
-
   # The swing beans need to have java base properly generated to avoid errors
   # in javadoc. The X11 wrappers need the java.base include files to have been
   # copied and processed.
   java.desktop-gensrc-src: java.base-gensrc java.base-copy
 
+  # The annotation processing for jdk.internal.vm.compiler
+  # and jdk.internal.vm.compiler.management needs classes from the current JDK.
+  jdk.internal.vm.compiler-gensrc-src: $(addsuffix -java, \
+      $(call FindTransitiveDepsForModule, jdk.internal.vm.compiler))
+  jdk.internal.vm.compiler.management-gensrc-src: $(addsuffix -java, \
+      $(call FindTransitiveDepsForModule, jdk.internal.vm.compiler.management))
+
+  # For these modules, the gensrc step is generating a module-info.java.extra
+  # file to be processed by the gensrc-moduleinfo target.
+  jdk.internal.vm.compiler-gensrc-moduleinfo: jdk.internal.vm.compiler-gensrc-src
+  jdk.internal.vm.compiler.management-gensrc-moduleinfo: jdk.internal.vm.compiler.management-gensrc-src
+
   jdk.jdeps-gendata: java
 
   # The ct.sym generation uses all the moduleinfos as input
@@ -947,13 +937,10 @@ else
       $(JMOD_TARGETS) $(INTERIM_JMOD_TARGETS): java.base-libs java.base-copy \
           java.base-gendata jdk.jlink-launchers java
     endif
-  else ifeq ($(EXTERNAL_BUILDJDK), false)
-    # The normal non cross compilation usecase needs to wait for the full
+  else
+    # The normal non cross compilation case uses needs to wait for the full
     # exploded-image to avoid a race with the optimize target.
     $(JMOD_TARGETS) $(INTERIM_JMOD_TARGETS): exploded-image
-    # The buildtools-modules are used for the exploded-image-optimize target,
-    # but can be built either using the exploded-image or an external BUILDJDK.
-    buildtools-modules: exploded-image-base
   endif
 
   # All modules include the main license files from java.base.
@@ -1074,18 +1061,6 @@ ifneq ($(COMPILE_TYPE), cross)
   exploded-image: exploded-image-optimize
 endif
 
-# The runnable-buildjdk target guarantees that the buildjdk is done
-# building and ready to be used. The exact set of dependencies it needs
-# depends on what kind of buildjdk is used for the current configuration.
-runnable-buildjdk:
-ifeq ($(CREATE_BUILDJDK), true)
-  ifneq ($(CREATING_BUILDJDK), true)
-    runnable-buildjdk: create-buildjdk
-  endif
-else ifeq ($(EXTERNAL_BUILDJDK), false)
-  runnable-buildjdk: exploded-image
-endif
-
 create-buildjdk: create-buildjdk-interim-image
 
 docs-jdk-api: docs-jdk-api-javadoc
@@ -1139,21 +1114,11 @@ ifeq ($(call isTargetOs, macosx), true)
   legacy-images: mac-legacy-jre-bundle
 endif
 
-# These targets build the various documentation images
-docs-jdk-image: docs-jdk
-docs-javase-image: docs-javase
-docs-reference-image: docs-reference
-# The docs-jdk-image is what most users expect to be built
-docs-image: docs-jdk-image
-all-docs-images: docs-jdk-image docs-javase-image docs-reference-image
-
-docs-bundles: docs-jdk-bundles
-all-docs-bundles: docs-jdk-bundles docs-javase-bundles docs-reference-bundles
+# This target builds the documentation image
+docs-image: docs-jdk
 
 # This target builds the test image
-test-image: prepare-test-image test-image-jdk-jtreg-native \
-    test-image-demos-jdk test-image-libtest-jtreg-native \
-    test-image-lib-native
+test-image: prepare-test-image test-image-jdk-jtreg-native test-image-demos-jdk test-image-libtest-jtreg-native
 
 ifneq ($(JVM_TEST_IMAGE_TARGETS), )
   # If JVM_TEST_IMAGE_TARGETS is externally defined, use it instead of the
@@ -1164,6 +1129,10 @@ else
   ifneq ($(GTEST_FRAMEWORK_SRC), )
     test-image: test-image-hotspot-gtest
   endif
+
+  ifeq ($(INCLUDE_GRAAL), true)
+    test-image: test-image-hotspot-jtreg-graal
+  endif
 endif
 
 ifeq ($(BUILD_FAILURE_HANDLER), true)
@@ -1177,7 +1146,7 @@ endif
 ################################################################################
 
 # all-images builds all our deliverables as images.
-all-images: product-images test-image all-docs-images
+all-images: product-images test-image docs-image
 
 # all-bundles packages all our deliverables as tar.gz bundles.
 all-bundles: product-bundles test-bundles docs-bundles static-libs-bundles
@@ -1185,11 +1154,10 @@ all-bundles: product-bundles test-bundles docs-bundles static-libs-bundles
 ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
     copy java libs static-libs launchers jmods \
     jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
-    exploded-image-base exploded-image runnable-buildjdk \
+    exploded-image-base exploded-image \
     create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \
     docs-javase docs-reference docs-javadoc mac-bundles product-images legacy-images \
-    docs-image docs-javase-image docs-reference-image all-docs-images \
-    docs-bundles all-docs-bundles test-image all-images \
+    docs-image test-image all-images \
     all-bundles
 
 ################################################################################

make/MainSupport.gmk

@@ -150,7 +150,9 @@ define DeclareRecipeForModuleMakefile
   $2-$$($1_TARGET_SUFFIX):
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
 	    -f ModuleWrapper.gmk -I $$(TOPDIR)/make/common/modules  \
-	    $$(patsubst %,-I%/modules/$2,$$(PHASE_MAKEDIRS)) \
+	    $$(addprefix -I, $$(PHASE_MAKEDIRS) \
+	        $$(addsuffix /modules/$2, $$(PHASE_MAKEDIRS)) \
+	    ) \
 	    MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX) $$($1_EXTRA_ARGS))
 
 endef
@@ -183,6 +185,7 @@ endef
 # Param 1: Name of list to add targets to
 # Named params:
 # TARGET_SUFFIX : Suffix of target to create for recipe
+# MAKE_SUBDIR : Subdir for this build phase
 # FILE_PREFIX : File prefix for this build phase
 # CHECK_MODULES : List of modules to try
 # MULTIPLE_MAKEFILES : Set to true to handle makefiles for the same module and

make/ModuleWrapper.gmk

@@ -39,7 +39,7 @@ include MakeBase.gmk
 TARGETS :=
 
 # Include the file being wrapped.
-include $(MAKEFILE_PREFIX).gmk
+include modules/$(MODULE)/$(MAKEFILE_PREFIX).gmk
 
 # Setup copy rules from the modules directories to the jdk image directory.
 ifeq ($(call isTargetOs, windows), true)

make/ReleaseFile.gmk

@@ -53,7 +53,6 @@ define create-info-file
   $(call info-file-item, "JAVA_VERSION_DATE", "$(VERSION_DATE)")
   $(call info-file-item, "OS_NAME", "$(RELEASE_FILE_OS_NAME)")
   $(call info-file-item, "OS_ARCH", "$(RELEASE_FILE_OS_ARCH)")
-  $(call info-file-item, "LIBC", "$(RELEASE_FILE_LIBC)")
 endef
 
 # Param 1 - The file containing the MODULES list

make/RunTests.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@ endif
 
 $(eval $(call ParseKeywordVariable, TEST_OPTS, \
     SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR JCOV JCOV_DIFF_CHANGESET, \
-    STRING_KEYWORDS := VM_OPTIONS JAVA_OPTIONS, \
+    STRING_KEYWORDS := VM_OPTIONS JAVA_OPTIONS AOT_MODULES, \
 ))
 
 # Helper function to propagate TEST_OPTS values.
@@ -60,14 +60,19 @@ define SetTestOpt
   endif
 endef
 
-# Setup _NT_SYMBOL_PATH on Windows, which points to our pdb files.
+# Setup _NT_SYMBOL_PATH on Windows
 ifeq ($(call isTargetOs, windows), true)
   ifndef _NT_SYMBOL_PATH
-    SYMBOL_PATH := $(call PathList, $(sort $(patsubst %/, %, $(dir $(wildcard \
-        $(addprefix $(SYMBOLS_IMAGE_DIR)/bin/, *.pdb */*.pdb))))))
-    export _NT_SYMBOL_PATH := $(subst \\,\, $(call FixPath, \
-        $(subst $(DQUOTE),, $(SYMBOL_PATH))))
-    $(call LogDebug, Setting _NT_SYMBOL_PATH to $(_NT_SYMBOL_PATH))
+    # Can't use PathList here as it adds quotes around the value.
+    _NT_SYMBOL_PATH := \
+        $(subst $(SPACE),;,$(strip \
+            $(foreach p, $(sort $(dir $(wildcard \
+                $(addprefix $(SYMBOLS_IMAGE_DIR)/bin/, *.pdb */*.pdb)))), \
+              $(call FixPath, $p) \
+            ) \
+        ))
+    export _NT_SYMBOL_PATH
+    $(call LogDebug, Rewriting _NT_SYMBOL_PATH to $(_NT_SYMBOL_PATH))
   endif
 endif
 
@@ -134,6 +139,91 @@ ifeq ($(GCOV_ENABLED), true)
   JTREG_COV_OPTIONS += -e:GCOV_PREFIX="$(GCOV_OUTPUT_DIR)"
 endif
 
+################################################################################
+# Optionally create AOT libraries for specified modules before running tests.
+# Note, this could not be done during JDK build time.
+################################################################################
+
+# Note, this could not be done during JDK build time.
+
+# Parameter 1 is the name of the rule.
+#
+# Remaining parameters are named arguments.
+#   MODULE      The module to generate a library for
+#   BIN         Output directory in which to put the library
+#   VM_OPTIONS  List of JVM arguments to use when creating library
+#   OPTIONS_VAR Name of variable to put AOT java options in
+#   PREREQS_VAR Name of variable to put all AOT prerequisite rule targets in
+#               for test rules to depend on
+#
+SetupAotModule = $(NamedParamsMacroTemplate)
+define SetupAotModuleBody
+  $1_AOT_LIB := $$($1_BIN)/$$(call SHARED_LIBRARY,$$($1_MODULE))
+  $1_AOT_CCLIST := $$(wildcard $$(TOPDIR)/test/hotspot/jtreg/compiler/aot/scripts/$$($1_MODULE)-list.txt)
+
+  # Create jaotc flags.
+  # VM flags which don't affect AOT code generation are filtered out:
+  # -Xcomp, -XX:+-TieredCompilation
+  $1_JAOTC_OPTS := \
+      -J-Xmx4g --info \
+      $$(addprefix -J, $$(filter-out -Xcomp %TieredCompilation, $$($1_VM_OPTIONS))) \
+      $$(addprefix --compile-commands$(SPACE), $$($1_AOT_CCLIST)) \
+      --linker-path $$(LD_JAOTC) \
+      #
+
+  ifneq ($$(filter -ea, $$($1_VM_OPTIONS)), )
+    $1_JAOTC_OPTS += --compile-with-assertions
+  endif
+
+  $$($1_AOT_LIB): $$(JDK_UNDER_TEST)/release \
+      $$(call DependOnVariable, $1_JAOTC_OPTS) \
+      $$(call DependOnVariable, JDK_UNDER_TEST)
+	$$(call LogWarn, Generating $$(patsubst $$(OUTPUTDIR)/%, %, $$@))
+	$$(call MakeTargetDir)
+	$$(call ExecuteWithLog, $$@, \
+	    $((COV_ENVIRONMENT) \
+	    $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/jaotc \
+	        $$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \
+	)
+	$$(call ExecuteWithLog, $$@.check, ( \
+	    $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/java \
+	        $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions \
+	        -XX:+PrintAOT -XX:+UseAOTStrictLoading \
+	        -XX:AOTLibrary=$$@ -version \
+	         > $$@.verify-aot \
+	))
+
+  $1_AOT_OPTIONS += -XX:+UnlockExperimentalVMOptions
+  $1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB)
+  $1_AOT_TARGETS += $$($1_AOT_LIB)
+endef
+
+# Parameter 1 is the name of the rule.
+#
+# Remaining parameters are named arguments.
+#   MODULES     The modules to generate a library for
+#   VM_OPTIONS  List of JVM arguments to use when creating libraries
+#
+# After calling this, the following variables are defined
+#   $1_AOT_OPTIONS List of all java options needed to use the AOT libraries
+#   $1_AOT_TARGETS List of all targets that the test rule will need to depend on
+#
+SetupAot = $(NamedParamsMacroTemplate)
+define SetupAotBody
+  $$(info Running with AOTd libraries for $$($1_MODULES))
+  # Put aot libraries in a separate directory so they are not deleted between
+  # test runs and may be reused between make invocations.
+  $$(foreach m, $$($1_MODULES), \
+    $$(eval $$(call SetupAotModule, $1_$$m, \
+        MODULE := $$m, \
+        BIN := $$(TEST_SUPPORT_DIR)/aot/$1, \
+        VM_OPTIONS := $$($1_VM_OPTIONS), \
+    )) \
+    $$(eval $1_AOT_OPTIONS += $$($1_$$m_AOT_OPTIONS)) \
+    $$(eval $1_AOT_TARGETS += $$($1_$$m_AOT_TARGETS)) \
+  )
+endef
+
 ################################################################################
 # Setup global test running parameters
 ################################################################################
@@ -192,6 +282,7 @@ endif
 
 $(eval $(call SetTestOpt,VM_OPTIONS,JTREG))
 $(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG))
+$(eval $(call SetTestOpt,AOT_MODULES,JTREG))
 
 $(eval $(call SetTestOpt,JOBS,JTREG))
 $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
@@ -200,10 +291,9 @@ $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
 $(eval $(call ParseKeywordVariable, JTREG, \
     SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
         TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS \
-        RETRY_COUNT REPEAT_COUNT MAX_OUTPUT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
+        RETRY_COUNT, \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
-        EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
-        $(CUSTOM_JTREG_STRING_KEYWORDS), \
+        EXTRA_PROBLEM_LISTS AOT_MODULES, \
 ))
 
 ifneq ($(JTREG), )
@@ -215,10 +305,11 @@ endif
 
 $(eval $(call SetTestOpt,VM_OPTIONS,GTEST))
 $(eval $(call SetTestOpt,JAVA_OPTIONS,GTEST))
+$(eval $(call SetTestOpt,AOT_MODULES,GTEST))
 
 $(eval $(call ParseKeywordVariable, GTEST, \
     SINGLE_KEYWORDS := REPEAT, \
-    STRING_KEYWORDS := OPTIONS VM_OPTIONS JAVA_OPTIONS, \
+    STRING_KEYWORDS := OPTIONS VM_OPTIONS JAVA_OPTIONS AOT_MODULES, \
 ))
 
 ifneq ($(GTEST), )
@@ -259,6 +350,8 @@ langtools_JTREG_PROBLEM_LIST += $(TOPDIR)/test/langtools/ProblemList.txt
 hotspot_JTREG_PROBLEM_LIST += $(TOPDIR)/test/hotspot/jtreg/ProblemList.txt
 lib-test_JTREG_PROBLEM_LIST += $(TOPDIR)/test/lib-test/ProblemList.txt
 
+langtools_JTREG_MAX_MEM := 768m
+
 ################################################################################
 # Parse test selection
 #
@@ -499,18 +592,23 @@ define SetupRunGtestTestBody
     $1_GTEST_REPEAT :=--gtest_repeat=$$(GTEST_REPEAT)
   endif
 
-  run-test-$1: pre-run-test
+  ifneq ($$(GTEST_AOT_MODULES), )
+    $$(eval $$(call SetupAot, $1, \
+        MODULES := $$(GTEST_AOT_MODULES), \
+        VM_OPTIONS := $$(GTEST_VM_OPTIONS) $$(GTEST_JAVA_OPTIONS), \
+    ))
+  endif
+
+  run-test-$1: pre-run-test $$($1_AOT_TARGETS)
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
 	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, ( \
-	    $$(CD) $$($1_TEST_SUPPORT_DIR) && \
 	    $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \
 	        -jdk $(JDK_UNDER_TEST) $$($1_GTEST_FILTER) \
 	        --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \
-	        --gtest_catch_exceptions=0 \
 	        $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \
-	        $$(GTEST_JAVA_OPTIONS) \
+	        $$(GTEST_JAVA_OPTIONS) $$($1_AOT_OPTIONS) \
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
@@ -721,7 +819,7 @@ define SetupRunJtregTestBody
   # Convert JTREG_foo into $1_JTREG_foo with a suitable value.
   $$(eval $$(call SetJtregValue,$1,JTREG_TEST_MODE,agentvm))
   $$(eval $$(call SetJtregValue,$1,JTREG_ASSERT,true))
-  $$(eval $$(call SetJtregValue,$1,JTREG_MAX_MEM,768m))
+  $$(eval $$(call SetJtregValue,$1,JTREG_MAX_MEM,512m))
   $$(eval $$(call SetJtregValue,$1,JTREG_NATIVEPATH))
   $$(eval $$(call SetJtregValue,$1,JTREG_BASIC_OPTIONS))
   $$(eval $$(call SetJtregValue,$1,JTREG_PROBLEM_LIST))
@@ -737,7 +835,7 @@ define SetupRunJtregTestBody
 
   # Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since
   # we may end up with a lot of JVM's
-  $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $(AWK) 'BEGIN { print 25 / $$($1_JTREG_JOBS); }')
+  $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
 
   JTREG_TIMEOUT_FACTOR ?= 4
 
@@ -745,37 +843,16 @@ define SetupRunJtregTestBody
   JTREG_RETAIN ?= fail,error
   JTREG_RUN_PROBLEM_LISTS ?= false
   JTREG_RETRY_COUNT ?= 0
-  JTREG_REPEAT_COUNT ?= 0
-
-  ifneq ($$(JTREG_RETRY_COUNT), 0)
-    ifneq ($$(JTREG_REPEAT_COUNT), 0)
-      $$(info Error: Cannot use both JTREG_RETRY_COUNT and JTREG_REPEAT_COUNT together.)
-      $$(info Please choose one or the other.)
-      $$(error Cannot continue)
-    endif
-  endif
-
-  ifneq ($$(JTREG_LAUNCHER_OPTIONS), )
-    $1_JTREG_LAUNCHER_OPTIONS += $$(JTREG_LAUNCHER_OPTIONS)
-  endif
-
-  ifneq ($$(JTREG_MAX_OUTPUT), )
-    $1_JTREG_LAUNCHER_OPTIONS += -Djavatest.maxOutputSize=$$(JTREG_MAX_OUTPUT)
-  endif
 
   ifneq ($$($1_JTREG_MAX_MEM), 0)
     $1_JTREG_BASIC_OPTIONS += -vmoption:-Xmx$$($1_JTREG_MAX_MEM)
     $1_JTREG_LAUNCHER_OPTIONS += -Xmx$$($1_JTREG_MAX_MEM)
   endif
 
-  # Make sure the tmp dir is normalized as some tests will react badly otherwise
-  $1_TEST_TMP_DIR := $$(abspath $$($1_TEST_SUPPORT_DIR)/tmp)
-
   $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
       -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
       -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
-      -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) \
-      -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
+      -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE)
 
   $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
 
@@ -826,6 +903,7 @@ define SetupRunJtregTestBody
   endif
 
   $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_DIR=$(TEST_IMAGE_DIR)
+  $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_GRAAL_DIR=$(TEST_IMAGE_DIR)/hotspot/jtreg/graal
 
   ifneq ($$(JTREG_FAILURE_HANDLER_OPTIONS), )
     $1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)"
@@ -842,7 +920,16 @@ define SetupRunJtregTestBody
     endif
   endif
 
-  $$(eval $$(call SetupRunJtregTestCustom, $1))
+  ifneq ($$(JTREG_AOT_MODULES), )
+    $$(eval $$(call SetupAot, $1, \
+        MODULES := $$(JTREG_AOT_MODULES), \
+        VM_OPTIONS := $$(JTREG_VM_OPTIONS) $$(JTREG_JAVA_OPTIONS), \
+    ))
+  endif
+
+  ifneq ($$($1_AOT_OPTIONS), )
+    $1_JTREG_BASIC_OPTIONS += -vmoptions:"$$($1_AOT_OPTIONS)"
+  endif
 
   clean-workdir-$1:
 	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
@@ -878,23 +965,10 @@ define SetupRunJtregTestBody
         done
   endif
 
-  ifneq ($$(JTREG_REPEAT_COUNT), 0)
-    $1_COMMAND_LINE := \
-        for i in {1..$$(JTREG_REPEAT_COUNT)}; do \
-          $$(PRINTF) "\nRepeating Jtreg run: $$$$i out of $$(JTREG_REPEAT_COUNT)\n"; \
-          $$($1_COMMAND_LINE); \
-          if [ "`$$(CAT) $$($1_EXITCODE)`" != "0" ]; then \
-            $$(PRINTF) "\nFailures detected, no more repeats.\n"; \
-            break; \
-          fi; \
-        done
-  endif
-
-  run-test-$1: pre-run-test clean-workdir-$1
+  run-test-$1: pre-run-test clean-workdir-$1 $$($1_AOT_TARGETS)
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
-	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR) \
-	    $$($1_TEST_TMP_DIR))
+	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
 	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, ( \
             $$(COV_ENVIRONMENT) $$($1_COMMAND_LINE) \
 	))

make/RunTestsPrebuilt.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -189,11 +189,15 @@ ifeq ($(OPENJDK_TARGET_CPU), x86_64)
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  FIXPATH_BASE := $(BASH) $(TOPDIR)/make/scripts/fixpath.sh
-  FIXPATH := $(FIXPATH_BASE) exec
+  ifeq ($(wildcard $(TEST_IMAGE_DIR)/bin/fixpath.exe), )
+    $(info Error: fixpath is missing from test image '$(TEST_IMAGE_DIR)')
+    $(error Cannot continue.)
+  endif
+  FIXPATH := $(TEST_IMAGE_DIR)/bin/fixpath.exe -c
+  PATH_SEP:=;
 else
-  FIXPATH_BASE :=
   FIXPATH :=
+  PATH_SEP:=:
 endif
 
 # Check number of cores and memory in MB
@@ -222,6 +226,25 @@ ifeq ($(MEMORY_SIZE), )
   MEMORY_SIZE := 1024
 endif
 
+# Setup LD for AOT support
+ifneq ($(DEVKIT_HOME), )
+  ifeq ($(OPENJDK_TARGET_OS), windows)
+    LD_JAOTC := $(DEVKIT_HOME)/VC/bin/x64/link.exe
+    LIBRARY_PREFIX :=
+    SHARED_LIBRARY_SUFFIX := .dll
+  else ifeq ($(OPENJDK_TARGET_OS), linux)
+    LD_JAOTC := $(DEVKIT_HOME)/bin/ld
+    LIBRARY_PREFIX := lib
+    SHARED_LIBRARY_SUFFIX := .so
+  else ifeq ($(OPENJDK_TARGET_OS), macosx)
+    LD_JAOTC := $(DEVKIT_HOME)/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+    LIBRARY_PREFIX := lib
+    SHARED_LIBRARY_SUFFIX := .dylib
+  endif
+else
+  LD := ld
+endif
+
 ifneq ($(wildcard $(JDK_IMAGE_DIR)/template.xml), )
   TEST_OPTS_JCOV := true
   JCOV_IMAGE_DIR := $(JDK_IMAGE_DIR)
@@ -256,8 +279,8 @@ $(call CreateNewSpec, $(NEW_SPEC), \
     MAKE := $(MAKE), \
     BASH := $(BASH), \
     JIB_JAR := $(JIB_JAR), \
-    FIXPATH_BASE := $(FIXPATH_BASE), \
     FIXPATH := $(FIXPATH), \
+    PATH_SEP := $(PATH_SEP), \
     OPENJDK_TARGET_OS := $(OPENJDK_TARGET_OS), \
     OPENJDK_TARGET_OS_TYPE := $(OPENJDK_TARGET_OS_TYPE), \
     OPENJDK_TARGET_OS_ENV := $(OPENJDK_TARGET_OS_ENV), \
@@ -267,6 +290,9 @@ $(call CreateNewSpec, $(NEW_SPEC), \
     OPENJDK_TARGET_CPU_ENDIAN := $(OPENJDK_TARGET_CPU_ENDIAN), \
     NUM_CORES := $(NUM_CORES), \
     MEMORY_SIZE := $(MEMORY_SIZE), \
+    LD_JAOTC := $(LD_JAOTC), \
+    LIBRARY_PREFIX := $(LIBRARY_PREFIX), \
+    SHARED_LIBRARY_SUFFIX := $(SHARED_LIBRARY_SUFFIX), \
     include $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk, \
     TEST_OPTS_JCOV := $(TEST_OPTS_JCOV), \
     $(CUSTOM_NEW_SPEC_LINE), \

make/RunTestsPrebuiltSpec.gmk

@@ -116,13 +116,16 @@ JAVAC_CMD := $(BOOT_JDK)/bin/javac
 JAR_CMD := $(BOOT_JDK)/bin/jar
 JLINK_CMD := $(JDK_OUTPUTDIR)/bin/jlink
 JMOD_CMD := $(JDK_OUTPUTDIR)/bin/jmod
+JARSIGNER_CMD := $(BOOT_JDK)/bin/jarsigner
 
 JAVA := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
 JAVA_SMALL := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
+JAVA_DETACH := $(FIXPATH) $(FIXPATH_DETACH_FLAG) $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
 JAVAC := $(FIXPATH) $(JAVAC_CMD)
 JAR := $(FIXPATH) $(JAR_CMD)
 JLINK := $(FIXPATH) $(JLINK_CMD)
 JMOD := $(FIXPATH) $(JMOD_CMD)
+JARSIGNER := $(FIXPATH) $(JARSIGNER_CMD)
 
 BUILD_JAVA := $(JDK_IMAGE_DIR)/bin/JAVA
 ################################################################################
@@ -150,6 +153,7 @@ LN := ln
 MIG := mig
 MKDIR := mkdir
 MV := mv
+NAWK := nawk
 NICE := nice
 PATCH := patch
 PRINTF := printf
@@ -163,6 +167,7 @@ TAIL := tail
 TEE := tee
 TR := tr
 TOUCH := touch
+UNIQ := uniq
 WC := wc
 XARGS := xargs
 ZIPEXE := zip
@@ -173,7 +178,7 @@ HG := hg
 ULIMIT := ulimit
 
 ifeq ($(OPENJDK_BUILD_OS), windows)
-  PATHTOOL := cygpath
+  CYGPATH := cygpath
 endif
 
 ################################################################################

make/TestImage.gmk

@@ -30,25 +30,34 @@ include MakeBase.gmk
 
 ############################################################################
 
+ifeq ($(call isTargetOs, windows), true)
+  FIXPATH_COPY := $(TEST_IMAGE_DIR)/bin/fixpath.exe
+
+  $(FIXPATH_COPY): $(firstword $(FIXPATH))
+	$(call install-file)
+
+  FIXPATH_WORKSPACE_ROOT := $(call FixPath, $(WORKSPACE_ROOT))
+  FIXPATH_OUTPUTDIR := $(call FixPath, $(OUTPUTDIR))
+else
+  FIXPATH_WORKSPACE_ROOT := $(WORKSPACE_ROOT)
+  FIXPATH_OUTPUTDIR := $(OUTPUTDIR)
+endif
+
+
 BUILD_INFO_PROPERTIES := $(TEST_IMAGE_DIR)/build-info.properties
 
 $(BUILD_INFO_PROPERTIES):
 	$(call MakeTargetDir)
 	$(ECHO) "# Build info properties for JDK tests" > $@
-	$(ECHO) 'build.workspace.root=$(call FixPath, $(WORKSPACE_ROOT))' >> $@
-	$(ECHO) 'build.output.root=$(call FixPath, $(OUTPUTDIR))' >> $@
+	$(ECHO) "build.workspace.root=$(FIXPATH_WORKSPACE_ROOT)" >> $@
+	$(ECHO) "build.output.root=$(FIXPATH_OUTPUTDIR)" >> $@
 
-README := $(TEST_IMAGE_DIR)/Readme.txt
-
-$(README):
-	$(call MakeTargetDir)
-	$(ECHO) > $@ 'JDK test image'
-
-TARGETS += $(BUILD_INFO_PROPERTIES) $(README)
+prepare-test-image: $(FIXPATH_COPY) $(BUILD_INFO_PROPERTIES)
+	$(call MakeDir, $(TEST_IMAGE_DIR))
+	$(ECHO) > $(TEST_IMAGE_DIR)/Readme.txt 'JDK test image'
 
 ################################################################################
 
-prepare-test-image: $(TARGETS)
 all: prepare-test-image
 
 .PHONY: default all prepare-test-image

make/ToolsHotspot.gmk

@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-ifndef _TOOLS_HOTSPOT_GMK
-_TOOLS_HOTSPOT_GMK := 1
-
-include JavaCompilation.gmk
-
-HOTSPOT_TOOLS_OUTPUTDIR := $(BUILDTOOLS_OUTPUTDIR)/buildtools/hotspot_tools_classes
-
-################################################################################
-# To avoid reevaluating the compilation setup for the tools each time this file
-# is included, the actual compilation is handled by CompileToolsHotspot.gmk. The
-# following trick is used to be able to declare a dependency on the built tools.
-BUILD_TOOLS_HOTSPOT := $(call SetupJavaCompilationCompileTarget, \
-    BUILD_TOOLS_HOTSPOT, $(HOTSPOT_TOOLS_OUTPUTDIR))
-
-################################################################################
-
-TOOL_JFR_GEN := $(JAVA_SMALL) -cp $(HOTSPOT_TOOLS_OUTPUTDIR) \
-    build.tools.jfr.GenerateJfrFiles
-
-##########################################################################################
-
-endif # _TOOLS_HOTSPOT_GMK

make/ToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -67,23 +67,18 @@ TOOL_GENERATECURRENCYDATA = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_
 TOOL_TZDB = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.tzdb.TzdbZoneRulesCompiler
 
-TOOL_BLOCKED_CERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    --add-exports java.base/sun.security.util=ALL-UNNAMED \
-    build.tools.blockedcertsconverter.BlockedCertsConverter
+TOOL_BLACKLISTED_CERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    build.tools.blacklistedcertsconverter.BlacklistedCertsConverter
 
 TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.makejavasecurity.MakeJavaSecurity
 
 TOOL_GENERATECACERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    -Dkeystore.pkcs12.certProtectionAlgorithm=NONE \
-    -Dkeystore.pkcs12.macAlgorithm=NONE \
     build.tools.generatecacerts.GenerateCacerts
 
 TOOL_GENERATEEMOJIDATA = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.generateemojidata.GenerateEmojiData
 
-TOOL_MAKEZIPREPRODUCIBLE = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    build.tools.makezipreproducible.MakeZipReproducible
 
 # TODO: There are references to the jdwpgen.jar in jdk/make/netbeans/jdwpgen/build.xml
 # and nbproject/project.properties in the same dir. Needs to be looked at.

make/autoconf/basic.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -70,30 +70,40 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   fi
 
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    BASIC_SETUP_PATHS_WINDOWS
+    PATH_SEP=";"
+    EXE_SUFFIX=".exe"
+    BASIC_CHECK_PATHS_WINDOWS
+  else
+    PATH_SEP=":"
+    EXE_SUFFIX=""
   fi
+  AC_SUBST(PATH_SEP)
+  AC_SUBST(EXE_SUFFIX)
 
   # We get the top-level directory from the supporting wrappers.
-  BASIC_WINDOWS_VERIFY_DIR($TOPDIR, source)
-  UTIL_FIXUP_PATH(TOPDIR)
   AC_MSG_CHECKING([for top-level directory])
   AC_MSG_RESULT([$TOPDIR])
   AC_SUBST(TOPDIR)
+  AC_SUBST(CONFIGURE_START_DIR)
 
   if test "x$CUSTOM_ROOT" != x; then
-    BASIC_WINDOWS_VERIFY_DIR($CUSTOM_ROOT, custom root)
-    UTIL_FIXUP_PATH(CUSTOM_ROOT)
     WORKSPACE_ROOT="${CUSTOM_ROOT}"
   else
     WORKSPACE_ROOT="${TOPDIR}"
   fi
   AC_SUBST(WORKSPACE_ROOT)
 
+  # We can only call UTIL_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
   UTIL_FIXUP_PATH(CONFIGURE_START_DIR)
-  AC_SUBST(CONFIGURE_START_DIR)
+  UTIL_FIXUP_PATH(TOPDIR)
 
   # Locate the directory of this script.
   AUTOCONF_DIR=$TOPDIR/make/autoconf
+
+  # Setup username (for use in adhoc version strings etc)
+  # Outer [ ] to quote m4.
+  [ USERNAME=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` ]
+  AC_SUBST(USERNAME)
 ])
 
 ###############################################################################
@@ -106,16 +116,6 @@ AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE],
   fi
 ])
 
-###############################################################################
-# Evaluates platform specific overrides for build devkit variables.
-# $1: Name of variable
-AC_DEFUN([BASIC_EVAL_BUILD_DEVKIT_VARIABLE],
-[
-  if test "x[$]$1" = x; then
-    eval $1="\${$1_${OPENJDK_BUILD_CPU}}"
-  fi
-])
-
 ###############################################################################
 AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
 [
@@ -223,12 +223,9 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
     # if no Xcode installed, xcodebuild exits with 1
     # if Xcode is installed, even if xcode-select is misconfigured, then it exits with 0
     if test "x$DEVKIT_ROOT" != x || /usr/bin/xcodebuild -version >/dev/null 2>&1; then
-      # We need to use xcodebuild in the toolchain dir provided by the user
-      UTIL_LOOKUP_PROGS(XCODEBUILD, xcodebuild, $TOOLCHAIN_PATH)
-      if test x$XCODEBUILD = x; then
-        # fall back on the stub binary in /usr/bin/xcodebuild
-        XCODEBUILD=/usr/bin/xcodebuild
-      fi
+      # We need to use xcodebuild in the toolchain dir provided by the user, this will
+      # fall back on the stub binary in /usr/bin/xcodebuild
+      AC_PATH_PROG([XCODEBUILD], [xcodebuild], [/usr/bin/xcodebuild], [$TOOLCHAIN_PATH])
     else
       # this should result in SYSROOT being empty, unless --with-sysroot is provided
       # when only the command line tools are installed there are no SDKs, so headers
@@ -298,7 +295,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
   AC_MSG_RESULT([$SYSROOT])
   AC_MSG_CHECKING([for toolchain path])
   AC_MSG_RESULT([$TOOLCHAIN_PATH])
-  AC_SUBST(TOOLCHAIN_PATH)
   AC_MSG_CHECKING([for extra path])
   AC_MSG_RESULT([$EXTRA_PATH])
 ])
@@ -373,7 +369,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
   AC_MSG_CHECKING([what configuration name to use])
   AC_MSG_RESULT([$CONF_NAME])
 
-  BASIC_WINDOWS_VERIFY_DIR($OUTPUTDIR, output)
   UTIL_FIXUP_PATH(OUTPUTDIR)
 
   CONFIGURESUPPORT_OUTPUTDIR="$OUTPUTDIR/configure-support"
@@ -410,16 +405,26 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
   # df -l lists only local disks; if the given directory is not found then
   # a non-zero exit code is given
   if test "x$DF" = x; then
-    # No df here, say it's local
-    $2
+    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+      # msys does not have df; use Windows "net use" instead.
+      IS_NETWORK_DISK=`net use | grep \`pwd -W | cut -d ":" -f 1 | tr a-z A-Z\`:`
+      if test "x$IS_NETWORK_DISK" = x; then
+        $2
+      else
+        $3
+      fi
+    else
+      # No df here, say it's local
+      $2
+    fi
   else
     # JDK-8189619
     # df on AIX does not understand -l. On modern AIXes it understands "-T local" which
     # is the same. On older AIXes we just continue to live with a "not local build" warning.
     if test "x$OPENJDK_TARGET_OS" = xaix; then
       DF_LOCAL_ONLY_OPTION='-T local'
-    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1"; then
-      # In WSL1, we can only build on a drvfs file system (that is, a mounted real Windows drive)
+    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+      # In WSL, we can only build on a drvfs file system (that is, a mounted real Windows drive)
       DF_LOCAL_ONLY_OPTION='-t drvfs'
     else
       DF_LOCAL_ONLY_OPTION='-l'

make/autoconf/basic_tools.m4

@@ -28,37 +28,38 @@
 # but is used by much of the early bootstrap code.
 AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
 [
-  # Bootstrapping: These tools are needed by UTIL_LOOKUP_PROGS
-  AC_PATH_PROGS(BASENAME, basename)
-  UTIL_CHECK_NONEMPTY(BASENAME)
-  AC_PATH_PROGS(DIRNAME, dirname)
-  UTIL_CHECK_NONEMPTY(DIRNAME)
-  AC_PATH_PROGS(FILE, file)
-  UTIL_CHECK_NONEMPTY(FILE)
-  AC_PATH_PROGS(LDD, ldd)
+  # Start with tools that do not need have cross compilation support
+  # and can be expected to be found in the default PATH. These tools are
+  # used by configure.
 
-  # First are all the fundamental required tools.
+  # First are all the simple required tools.
+  UTIL_REQUIRE_PROGS(BASENAME, basename)
   UTIL_REQUIRE_PROGS(BASH, bash)
   UTIL_REQUIRE_PROGS(CAT, cat)
   UTIL_REQUIRE_PROGS(CHMOD, chmod)
+  UTIL_REQUIRE_PROGS(CMP, cmp)
+  UTIL_REQUIRE_PROGS(COMM, comm)
   UTIL_REQUIRE_PROGS(CP, cp)
   UTIL_REQUIRE_PROGS(CUT, cut)
   UTIL_REQUIRE_PROGS(DATE, date)
-  UTIL_REQUIRE_PROGS(DIFF, gdiff diff)
+  UTIL_REQUIRE_PROGS(DIFF, [gdiff diff])
+  UTIL_REQUIRE_PROGS(DIRNAME, dirname)
   UTIL_REQUIRE_PROGS(ECHO, echo)
   UTIL_REQUIRE_PROGS(EXPR, expr)
+  UTIL_REQUIRE_PROGS(FILE, file)
   UTIL_REQUIRE_PROGS(FIND, find)
+  UTIL_REQUIRE_PROGS(HEAD, head)
   UTIL_REQUIRE_PROGS(GUNZIP, gunzip)
   UTIL_REQUIRE_PROGS(GZIP, pigz gzip)
-  UTIL_REQUIRE_PROGS(HEAD, head)
   UTIL_REQUIRE_PROGS(LN, ln)
   UTIL_REQUIRE_PROGS(LS, ls)
   # gmkdir is known to be safe for concurrent invocations with -p flag.
-  UTIL_REQUIRE_PROGS(MKDIR, gmkdir mkdir)
+  UTIL_REQUIRE_PROGS(MKDIR, [gmkdir mkdir])
   UTIL_REQUIRE_PROGS(MKTEMP, mktemp)
   UTIL_REQUIRE_PROGS(MV, mv)
-  UTIL_REQUIRE_PROGS(AWK, gawk nawk awk)
+  UTIL_REQUIRE_PROGS(NAWK, [nawk gawk awk])
   UTIL_REQUIRE_PROGS(PRINTF, printf)
+  UTIL_REQUIRE_PROGS(READLINK, [greadlink readlink])
   UTIL_REQUIRE_PROGS(RM, rm)
   UTIL_REQUIRE_PROGS(RMDIR, rmdir)
   UTIL_REQUIRE_PROGS(SH, sh)
@@ -69,31 +70,34 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
   UTIL_REQUIRE_PROGS(TOUCH, touch)
   UTIL_REQUIRE_PROGS(TR, tr)
   UTIL_REQUIRE_PROGS(UNAME, uname)
+  UTIL_REQUIRE_PROGS(UNIQ, uniq)
   UTIL_REQUIRE_PROGS(WC, wc)
+  UTIL_REQUIRE_PROGS(WHICH, which)
   UTIL_REQUIRE_PROGS(XARGS, xargs)
 
   # Then required tools that require some special treatment.
+  UTIL_REQUIRE_SPECIAL(AWK, [AC_PROG_AWK])
   UTIL_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP])
   UTIL_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP])
   UTIL_REQUIRE_SPECIAL(FGREP, [AC_PROG_FGREP])
   UTIL_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
 
-  # Optional tools, we can do without them
-  UTIL_LOOKUP_PROGS(DF, df)
-  UTIL_LOOKUP_PROGS(NICE, nice)
-  UTIL_LOOKUP_PROGS(READLINK, greadlink readlink)
-
-  # These are only needed on some platforms
-  UTIL_LOOKUP_PROGS(PATHTOOL, cygpath wslpath)
-  UTIL_LOOKUP_PROGS(LSB_RELEASE, lsb_release)
-  UTIL_LOOKUP_PROGS(CMD, cmd.exe, $PATH:/cygdrive/c/windows/system32:/mnt/c/windows/system32:/c/windows/system32)
-
-  # For compare.sh only
-  UTIL_LOOKUP_PROGS(CMP, cmp)
-  UTIL_LOOKUP_PROGS(UNIQ, uniq)
-
   # Always force rm.
   RM="$RM -f"
+
+  # pwd behaves differently on various platforms and some don't support the -L flag.
+  # Always use the bash builtin pwd to get uniform behavior.
+  THEPWDCMD=pwd
+
+  # These are not required on all platforms
+  UTIL_PATH_PROGS(CYGPATH, cygpath)
+  UTIL_PATH_PROGS(WSLPATH, wslpath)
+  UTIL_PATH_PROGS(DF, df)
+  UTIL_PATH_PROGS(CPIO, [cpio bsdcpio])
+  UTIL_PATH_PROGS(NICE, nice)
+
+  UTIL_PATH_PROGS(LSB_RELEASE, lsb_release)
+  UTIL_PATH_PROGS(CMD, cmd.exe, $PATH /cygdrive/c/Windows/System32 /mnt/c/Windows/System32)
 ])
 
 ###############################################################################
@@ -128,14 +132,10 @@ AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
         if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
           if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
             MAKE_EXPECTED_ENV='cygwin'
-          elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys2"; then
+          elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
             MAKE_EXPECTED_ENV='msys'
-          elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1" || test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
-            if test "x$OPENJDK_BUILD_CPU" = "xaarch64"; then
-              MAKE_EXPECTED_ENV='aarch64-.*-linux-gnu'
-            else
-              MAKE_EXPECTED_ENV='x86_64-.*-linux-gnu'
-            fi
+          elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+            MAKE_EXPECTED_ENV='x86_64-.*-linux-gnu'
           else
             AC_MSG_ERROR([Unknown Windows environment])
           fi
@@ -187,14 +187,14 @@ AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC],
 # Goes looking for a usable version of GNU make.
 AC_DEFUN([BASIC_CHECK_GNU_MAKE],
 [
-  UTIL_SETUP_TOOL(MAKE,
+  UTIL_SETUP_TOOL([MAKE],
   [
     # Try our hardest to locate a correct version of GNU make
-    UTIL_LOOKUP_PROGS(CHECK_GMAKE, gmake)
+    AC_PATH_PROGS(CHECK_GMAKE, gmake)
     BASIC_CHECK_MAKE_VERSION("$CHECK_GMAKE", [gmake in PATH])
 
     if test "x$FOUND_MAKE" = x; then
-      UTIL_LOOKUP_PROGS(CHECK_MAKE, make)
+      AC_PATH_PROGS(CHECK_MAKE, make)
       BASIC_CHECK_MAKE_VERSION("$CHECK_MAKE", [make in PATH])
     fi
 
@@ -203,10 +203,10 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE],
         # We have a toolchain path, check that as well before giving up.
         OLD_PATH=$PATH
         PATH=$TOOLCHAIN_PATH:$PATH
-        UTIL_LOOKUP_PROGS(CHECK_TOOLSDIR_GMAKE, gmake)
+        AC_PATH_PROGS(CHECK_TOOLSDIR_GMAKE, gmake)
         BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_GMAKE", [gmake in tools-dir])
         if test "x$FOUND_MAKE" = x; then
-          UTIL_LOOKUP_PROGS(CHECK_TOOLSDIR_MAKE, make)
+          AC_PATH_PROGS(CHECK_TOOLSDIR_MAKE, make)
           BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_MAKE", [make in tools-dir])
         fi
         PATH=$OLD_PATH
@@ -336,17 +336,24 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
 
   # Non-required basic tools
 
-  UTIL_LOOKUP_PROGS(READELF, greadelf readelf)
-  UTIL_LOOKUP_PROGS(DOT, dot)
-  UTIL_LOOKUP_PROGS(HG, hg)
-  UTIL_LOOKUP_PROGS(GIT, git)
-  UTIL_LOOKUP_PROGS(STAT, stat)
-  UTIL_LOOKUP_PROGS(TIME, time)
-  UTIL_LOOKUP_PROGS(FLOCK, flock)
+  UTIL_PATH_PROGS(LDD, ldd)
+  if test "x$LDD" = "x"; then
+    # List shared lib dependencies is used for
+    # debug output and checking for forbidden dependencies.
+    # We can build without it.
+    LDD="true"
+  fi
+  UTIL_PATH_PROGS(READELF, [greadelf readelf])
+  UTIL_PATH_PROGS(DOT, dot)
+  UTIL_PATH_PROGS(HG, hg)
+  UTIL_PATH_PROGS(GIT, git)
+  UTIL_PATH_PROGS(STAT, stat)
+  UTIL_PATH_PROGS(TIME, time)
+  UTIL_PATH_PROGS(FLOCK, flock)
   # Dtrace is usually found in /usr/sbin, but that directory may not
   # be in the user path.
-  UTIL_LOOKUP_PROGS(DTRACE, dtrace, $PATH:/usr/sbin)
-  UTIL_LOOKUP_PROGS(PATCH, gpatch patch)
+  UTIL_PATH_PROGS(DTRACE, dtrace, $PATH:/usr/sbin)
+  UTIL_PATH_PROGS(PATCH, [gpatch patch])
   # Check if it's GNU time
   IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
   if test "x$IS_GNU_TIME" != x; then
@@ -356,19 +363,11 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
   fi
   AC_SUBST(IS_GNU_TIME)
 
-  # Check if it's GNU date
-  check_date=`$DATE --version 2>&1 | $GREP GNU`
-  if test "x$check_date" != x; then
-    IS_GNU_DATE=yes
-  else
-    IS_GNU_DATE=no
-  fi
-
   if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
     UTIL_REQUIRE_PROGS(DSYMUTIL, dsymutil)
     UTIL_REQUIRE_PROGS(MIG, mig)
     UTIL_REQUIRE_PROGS(XATTR, xattr)
-    UTIL_LOOKUP_PROGS(CODESIGN, codesign)
+    UTIL_PATH_PROGS(CODESIGN, codesign)
 
     if test "x$CODESIGN" != "x"; then
       # Check for user provided code signing identity.
@@ -409,7 +408,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
     UTIL_REQUIRE_PROGS(SETFILE, SetFile)
   fi
   if ! test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    UTIL_REQUIRE_PROGS(ULIMIT, ulimit)
+    UTIL_REQUIRE_BUILTIN_PROGS(ULIMIT, ulimit)
   fi
 ])
 
@@ -455,7 +454,7 @@ AC_DEFUN_ONCE([BASIC_CHECK_BASH_OPTIONS],
 #
 AC_DEFUN_ONCE([BASIC_SETUP_PANDOC],
 [
-  UTIL_LOOKUP_PROGS(PANDOC, pandoc)
+  UTIL_PATH_PROGS(PANDOC, pandoc)
 
   PANDOC_MARKDOWN_FLAG="markdown"
   if test -n "$PANDOC"; then

make/autoconf/basic_windows.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,161 +24,97 @@
 #
 
 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
-AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
+AC_DEFUN([BASIC_CHECK_PATHS_WINDOWS],
 [
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
-    # Clarify if it is wsl1 or wsl2, and use that as OS_ENV from this point forward
-    $PATHTOOL -w / > /dev/null 2>&1
-    if test $? -ne 0; then
-      # Without Windows access to our root, it's definitely WSL1
-      OPENJDK_BUILD_OS_ENV=windows.wsl1
-    else
-      # This test is not guaranteed, but there is no documented way of
-      # distinguishing between WSL1 and WSL2.
-      # Check whether "Hyper-V" appears in /proc/interrupts because WSL2 runs on Hyper-V.
-      $GREP -q Hyper-V /proc/interrupts
-      if test $? -eq 0; then
-        OPENJDK_BUILD_OS_ENV=windows.wsl2
-      else
-        OPENJDK_BUILD_OS_ENV=windows.wsl1
-      fi
-    fi
-    # This is a bit silly since we really don't have a target env as such,
-    # but do it to keep consistency.
-    OPENJDK_TARGET_OS_ENV=$OPENJDK_BUILD_OS_ENV
-  fi
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys2"; then
-    # Must be done prior to calling any commands to avoid mangling of command line
-    export MSYS2_ARG_CONV_EXCL="*"
-  fi
-
-  AC_MSG_CHECKING([Windows environment type])
-  WINENV_VENDOR=${OPENJDK_BUILD_OS_ENV#windows.}
-  AC_MSG_RESULT([$WINENV_VENDOR])
-
-  if test "x$WINENV_VENDOR" = x; then
-    AC_MSG_ERROR([Unknown Windows environment. Neither cygwin, msys2, wsl1 nor wsl2 was detected.])
-  fi
-
-  if test "x$PATHTOOL" = x; then
-    AC_MSG_ERROR([Incorrect $WINENV_VENDOR installation. Neither cygpath nor wslpath was found])
-  fi
-
-  if test "x$CMD" = x; then
-    AC_MSG_ERROR([Incorrect Windows/$WINENV_VENDOR setup. Could not locate cmd.exe])
-  fi
-
-  AC_MSG_CHECKING([$WINENV_VENDOR drive prefix])
-  WINENV_PREFIX=`$PATHTOOL -u c:/ | $SED -e 's!/c/!!'`
-  AC_MSG_RESULT(['$WINENV_PREFIX'])
-  AC_SUBST(WINENV_PREFIX)
-
-  AC_MSG_CHECKING([$WINENV_VENDOR root directory as Windows path])
-  if test "x$OPENJDK_BUILD_OS_ENV" != "xwindows.wsl1"; then
-    WINENV_ROOT=`$PATHTOOL -w / 2> /dev/null`
-    # msys2 has a trailing backslash; strip it
-    WINENV_ROOT=${WINENV_ROOT%\\}
-  else
-    WINENV_ROOT='[[unavailable]]'
-  fi
-  AC_MSG_RESULT(['$WINENV_ROOT'])
-  AC_SUBST(WINENV_ROOT)
-
-  AC_MSG_CHECKING([$WINENV_VENDOR temp directory])
-  WINENV_TEMP_DIR=$($PATHTOOL -u $($CMD /q /c echo %TEMP% 2> /dev/null) | $TR -d '\r\n')
-  AC_MSG_RESULT([$WINENV_TEMP_DIR])
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
-    # Don't trust the current directory for WSL2, but change to an OK temp dir
-    cd "$WINENV_TEMP_DIR"
-    # Bring along confdefs.h or autoconf gets all confused
-    cp "$CONFIGURE_START_DIR/confdefs.h" "$WINENV_TEMP_DIR"
-  fi
-
-  AC_MSG_CHECKING([$WINENV_VENDOR release])
-  WINENV_UNAME_RELEASE=`$UNAME -r`
-  AC_MSG_RESULT([$WINENV_UNAME_RELEASE])
-
-  AC_MSG_CHECKING([$WINENV_VENDOR version])
-  WINENV_UNAME_VERSION=`$UNAME -v`
-  AC_MSG_RESULT([$WINENV_UNAME_VERSION])
-
-  WINENV_VERSION="$WINENV_UNAME_RELEASE, $WINENV_UNAME_VERSION"
-
-  AC_MSG_CHECKING([Windows version])
-
-  # We must change directory to one guaranteed to work, otherwise WSL1
-  # can complain (since it does not have a WINENV_ROOT so it can't access
-  # unix-style paths from Windows.
-  # Additional [] needed to keep m4 from mangling shell constructs.
-  [ WINDOWS_VERSION=`cd $WINENV_TEMP_DIR && $CMD /c ver | $EGREP -o '([0-9]+\.)+[0-9]+'` ]
-  AC_MSG_RESULT([$WINDOWS_VERSION])
-
-  # Additional handling per specific env
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    # Additional [] needed to keep m4 from mangling shell constructs.
-    [ CYGWIN_VERSION_OLD=`$ECHO $WINENV_UNAME_RELEASE | $GREP -e '^1\.[0-6]'` ]
-    if test "x$CYGWIN_VERSION_OLD" != x; then
-      AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_RELEASE, but at least cygwin 1.7 is required. Please upgrade.])
-      AC_MSG_ERROR([Cannot continue])
-    fi
-    if test "x$LDD" = x; then
-      AC_MSG_ERROR([ldd is missing, which is needed on cygwin])
-    fi
-    WINENV_MARKER_DLL=cygwin1.dll
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys2"; then
-    if test "x$LDD" = x; then
-      AC_MSG_ERROR([ldd is missing, which is needed on msys2])
-    fi
-    WINENV_MARKER_DLL=msys-2.0.dll
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1" || test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
-    AC_MSG_CHECKING([wsl distribution])
-    WSL_DISTRIBUTION=`$LSB_RELEASE -d | sed 's/Description:\t//'`
-    AC_MSG_RESULT([$WSL_DISTRIBUTION])
-
-    WINENV_VERSION="$WINENV_VERSION ($WSL_DISTRIBUTION)"
-
-    # Tell WSL to automatically translate the PATH variable
-    export WSLENV=PATH/l
-  fi
-
-  # Chicken and egg: FIXPATH is needed for UTIL_FIXUP_PATH to work. So for the
-  # first run we use the auto-detect abilities of fixpath.sh.
-  FIXPATH_DIR="$TOPDIR/make/scripts"
-  FIXPATH="$BASH $FIXPATH_DIR/fixpath.sh exec"
-  FIXPATH_BASE="$BASH $FIXPATH_DIR/fixpath.sh"
-  FIXPATH_SAVED_PATH="$PATH"
-  UTIL_FIXUP_PATH(FIXPATH_DIR)
-
-  # Now we can use FIXPATH_DIR to rewrite path to fixpath.sh properly.
-  if test "x$WINENV_PREFIX" = x; then
-    # On msys the prefix is empty, but we need to pass something to have the
-    # fixpath.sh options parser happy.
-    WINENV_PREFIX_ARG="NONE"
-  else
-    WINENV_PREFIX_ARG="$WINENV_PREFIX"
-  fi
-  FIXPATH_ARGS="-e $PATHTOOL -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\}  -t $WINENV_TEMP_DIR -c $CMD -q"
-  FIXPATH_BASE="$BASH $FIXPATH_DIR/fixpath.sh $FIXPATH_ARGS"
-  FIXPATH="$FIXPATH_BASE exec"
-
-  AC_SUBST(FIXPATH_BASE)
-  AC_SUBST(FIXPATH)
-
-  SRC_ROOT_LENGTH=`$ECHO "$TOPDIR" | $WC -m`
+  SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m`
   if test $SRC_ROOT_LENGTH -gt 100; then
     AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported])
   fi
 
-  # Test if windows or unix "find" is first in path.
+  AC_MSG_CHECKING([Windows version])
+  # Additional [] needed to keep m4 from mangling shell constructs.
+  [ WINDOWS_VERSION=`$CMD /c ver.exe | $EGREP -o '([0-9]+\.)+[0-9]+'` ]
+  AC_MSG_RESULT([$WINDOWS_VERSION])
+
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+    AC_MSG_CHECKING([cygwin release])
+    CYGWIN_RELEASE=`$UNAME -r`
+    AC_MSG_RESULT([$CYGWIN_RELEASE])
+
+    AC_MSG_CHECKING([cygwin version])
+    CYGWIN_VERSION=`$UNAME -v`
+    AC_MSG_RESULT([$CYGWIN_VERSION])
+
+    # Additional [] needed to keep m4 from mangling shell constructs.
+    [ CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_RELEASE | $GREP -e '^1\.[0-6]'` ]
+    if test "x$CYGWIN_VERSION_OLD" != x; then
+      AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_RELEASE, but at least cygwin 1.7 is required. Please upgrade.])
+      AC_MSG_ERROR([Cannot continue])
+    fi
+
+    WINDOWS_ENV_VENDOR='cygwin'
+    WINDOWS_ENV_VERSION="$CYGWIN_RELEASE, $CYGWIN_VERSION"
+
+    if test "x$CYGPATH" = x; then
+      AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path])
+    fi
+    AC_MSG_CHECKING([cygwin root directory as unix-style path])
+    # The cmd output ends with Windows line endings (CR/LF)
+    cygwin_winpath_root=`cd / ; cmd /c cd | $TR -d '\r\n'`
+    # Force cygpath to report the proper root by including a trailing space, and then stripping it off again.
+    CYGWIN_ROOT_PATH=`$CYGPATH -u "$cygwin_winpath_root " | $CUT -f 1 -d " "`
+    AC_MSG_RESULT([$CYGWIN_ROOT_PATH])
+    WINDOWS_ENV_ROOT_PATH="$CYGWIN_ROOT_PATH"
+    test_cygdrive_prefix=`$ECHO $CYGWIN_ROOT_PATH | $GREP ^/cygdrive/`
+    if test "x$test_cygdrive_prefix" = x; then
+      AC_MSG_ERROR([Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c.])
+    fi
+  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+    AC_MSG_CHECKING([msys release])
+    MSYS_RELEASE=`$UNAME -r`
+    AC_MSG_RESULT([$MSYS_RELEASE])
+
+    AC_MSG_CHECKING([msys version])
+    MSYS_VERSION=`$UNAME -v`
+    AC_MSG_RESULT([$MSYS_VERSION])
+
+    WINDOWS_ENV_VENDOR='msys'
+    WINDOWS_ENV_VERSION="$MSYS_RELEASE, $MSYS_VERSION"
+
+    AC_MSG_CHECKING([msys root directory as unix-style path])
+    # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away
+    MSYS_ROOT_PATH=`cd / ; cmd /c cd | $GREP ".*"`
+    UTIL_REWRITE_AS_UNIX_PATH(MSYS_ROOT_PATH)
+    AC_MSG_RESULT([$MSYS_ROOT_PATH])
+    WINDOWS_ENV_ROOT_PATH="$MSYS_ROOT_PATH"
+  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+
+    AC_MSG_CHECKING([WSL kernel version])
+    WSL_KERNEL_VERSION=`$UNAME -v`
+    AC_MSG_RESULT([$WSL_KERNEL_VERSION])
+
+    AC_MSG_CHECKING([WSL kernel release])
+    WSL_KERNEL_RELEASE=`$UNAME -r`
+    AC_MSG_RESULT([$WSL_KERNEL_RELEASE])
+
+    AC_MSG_CHECKING([WSL distribution])
+    WSL_DISTRIBUTION=`$LSB_RELEASE -d | sed 's/Description:\t//'`
+    AC_MSG_RESULT([$WSL_DISTRIBUTION])
+
+    WINDOWS_ENV_VENDOR='wsl'
+    WINDOWS_ENV_VERSION="$WSL_KERNEL_RELEASE, $WSL_KERNEL_VERSION ($WSL_DISTRIBUTION)"
+  else
+    AC_MSG_ERROR([Unknown Windows environment. Neither cygwin, msys, nor wsl was detected.])
+  fi
+
+  # Test if windows or unix (cygwin/msys) find is first in path.
   AC_MSG_CHECKING([what kind of 'find' is first on the PATH])
   FIND_BINARY_OUTPUT=`find --version 2>&1`
   if test "x`echo $FIND_BINARY_OUTPUT | $GREP GNU`" != x; then
     AC_MSG_RESULT([unix style])
   elif test "x`echo $FIND_BINARY_OUTPUT | $GREP FIND`" != x; then
     AC_MSG_RESULT([Windows])
-    AC_MSG_NOTICE([Your path contains Windows tools (C:\Windows\system32) before your unix tools.])
+    AC_MSG_NOTICE([Your path contains Windows tools (C:\Windows\system32) before your unix (cygwin or msys) tools.])
     AC_MSG_NOTICE([This will not work. Please correct and make sure /usr/bin (or similar) is first in path.])
     AC_MSG_ERROR([Cannot continue])
   else
@@ -187,39 +123,73 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
   fi
 ])
 
-# Verify that the directory is usable on Windows
-AC_DEFUN([BASIC_WINDOWS_VERIFY_DIR],
-[
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1"; then
-    OUTPUTDIR_WIN=`$FIXPATH_BASE print $1`
-    if test "x$OUTPUTDIR_WIN" = x; then
-      AC_MSG_NOTICE([For wsl1, the $2 dir must be located on a Windows drive. Please see doc/building.md for details.])
-      AC_MSG_ERROR([Cannot continue])
-    fi
-  fi
-])
-
-# Create fixpath wrapper
-AC_DEFUN([BASIC_WINDOWS_FINALIZE_FIXPATH],
+AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH],
 [
+  # When using cygwin or msys, we need a wrapper binary that renames
+  # /cygdrive/c/ arguments into c:/ arguments and peeks into
+  # @files and rewrites these too! This wrapper binary is
+  # called fixpath.
+  FIXPATH=
   if test "x$OPENJDK_BUILD_OS" = xwindows; then
-    FIXPATH_CMDLINE=". $TOPDIR/make/scripts/fixpath.sh -e $PATHTOOL \
-        -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\}  -t $WINENV_TEMP_DIR \
-        -c $CMD -q"
-    $ECHO >  $OUTPUTDIR/fixpath '#!/bin/bash'
-    $ECHO >> $OUTPUTDIR/fixpath export PATH='"[$]PATH:'$PATH'"'
-    $ECHO >> $OUTPUTDIR/fixpath $FIXPATH_CMDLINE '"[$]@"'
-    $CHMOD +x $OUTPUTDIR/fixpath
-    FIXPATH_BASE="$OUTPUTDIR/fixpath"
-    FIXPATH="$FIXPATH_BASE exec"
-  fi
-])
-
-# Platform-specific finalization
-AC_DEFUN([BASIC_WINDOWS_FINALIZE],
-[
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
-    # Change back from temp dir
+    AC_MSG_CHECKING([if fixpath can be created])
+    FIXPATH_SRC="$TOPDIR/make/src/native/fixpath.c"
+    FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe"
+    FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath"
+    if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
+      # Important to keep the .exe suffix on Cygwin for Hotspot makefiles
+      FIXPATH="$FIXPATH_BIN -c"
+    elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
+      # Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line
+      # @ was chosen as separator to minimize risk of other tools messing around with it
+      all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" \
+          | tr ' ' '\n' | $GREP '^/./' | $SORT | $UNIQ`
+      fixpath_argument_list=`echo $all_unique_prefixes  | tr ' ' '@'`
+      FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list"
+    elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.wsl; then
+      FIXPATH="$FIXPATH_BIN -w"
+    fi
+    FIXPATH_SRC_W="$FIXPATH_SRC"
+    FIXPATH_BIN_W="$FIXPATH_BIN"
+    UTIL_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_SRC_W])
+    UTIL_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_BIN_W])
+    $RM -rf $FIXPATH_BIN $FIXPATH_DIR
+    $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
+    cd $FIXPATH_DIR
+    $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
     cd $CONFIGURE_START_DIR
+
+    if test ! -x $FIXPATH_BIN; then
+      AC_MSG_RESULT([no])
+      cat $FIXPATH_DIR/fixpath1.log
+      AC_MSG_ERROR([Could not create $FIXPATH_BIN])
+    fi
+    AC_MSG_RESULT([yes])
+
+    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+      OLD_WSLENV="$WSLENV"
+      WSLENV=`$ECHO $WSLENV | $SED 's/PATH\/l://'`
+      UTIL_APPEND_TO_PATH(WSLENV, "FIXPATH_PATH")
+      export WSLENV
+      export FIXPATH_PATH=$VS_PATH_WINDOWS
+      AC_MSG_NOTICE([FIXPATH_PATH is $FIXPATH_PATH])
+      AC_MSG_NOTICE([Rewriting WSLENV from $OLD_WSLENV to $WSLENV])
+    fi
+
+    AC_MSG_CHECKING([if fixpath.exe works])
+    cd $FIXPATH_DIR
+    $FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
+        > $FIXPATH_DIR/fixpath2.log 2>&1
+    cd $CONFIGURE_START_DIR
+    if test ! -x $FIXPATH_DIR/fixpath2.exe; then
+      AC_MSG_RESULT([no])
+      cat $FIXPATH_DIR/fixpath2.log
+      AC_MSG_ERROR([fixpath did not work!])
+    fi
+    AC_MSG_RESULT([yes])
+
+    FIXPATH_DETACH_FLAG="--detach"
   fi
+
+  AC_SUBST(FIXPATH)
+  AC_SUBST(FIXPATH_DETACH_FLAG)
 ])

make/autoconf/boot-jdk.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -63,23 +63,19 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
     # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
     if test "x$BOOT_JDK_FOUND" = xmaybe; then
       # Do we have a bin/java?
-      if test ! -x "$BOOT_JDK/bin/java" && test ! -x "$BOOT_JDK/bin/java.exe"; then
+      if test ! -x "$BOOT_JDK/bin/java$EXE_SUFFIX"; then
         AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring])
         BOOT_JDK_FOUND=no
       else
         # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac" && test ! -x "$BOOT_JDK/bin/javac.exe"; then
+        if test ! -x "$BOOT_JDK/bin/javac$EXE_SUFFIX"; then
           AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring])
           AC_MSG_NOTICE([(This might be an JRE instead of an JDK)])
           BOOT_JDK_FOUND=no
         else
           # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-          java_to_test="$BOOT_JDK/bin/java"
-          UTIL_FIXUP_EXECUTABLE(java_to_test)
-          BOOT_JDK_VERSION_OUTPUT=`$java_to_test $USER_BOOT_JDK_OPTIONS -version 2>&1`
           # Additional [] needed to keep m4 from mangling shell constructs.
-          [ BOOT_JDK_VERSION=`echo $BOOT_JDK_VERSION_OUTPUT | $AWK '/version "[0-9a-zA-Z\._\-]+"/ {print $ 0; exit;}'` ]
-
+          [ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java$EXE_SUFFIX" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $AWK '/version \"[0-9a-zA-Z\._\-]+\"/{print $ 0; exit;}'` ]
           if [ [[ "$BOOT_JDK_VERSION" =~ "Picked up" ]] ]; then
             AC_MSG_NOTICE([You have _JAVA_OPTIONS or JAVA_TOOL_OPTIONS set. This can mess up the build. Please use --with-boot-jdk-jvmargs instead.])
             AC_MSG_NOTICE([Java reports: "$BOOT_JDK_VERSION".])
@@ -95,12 +91,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
           # Extra M4 quote needed to protect [] in grep expression.
           [FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION \
               | $EGREP "\"(${DEFAULT_ACCEPTABLE_BOOT_VERSIONS// /|})([\.+-].*)?\""`]
-
-          if test "x$BOOT_JDK_VERSION" = x; then
-            AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK is not a working JDK; ignoring])
-            AC_MSG_NOTICE([Output from java -version was: $BOOT_JDK_VERSION_OUTPUT])
-            BOOT_JDK_FOUND=no
-          elif test "x$FOUND_CORRECT_VERSION" = x; then
+          if test "x$FOUND_CORRECT_VERSION" = x; then
             AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring])
             AC_MSG_NOTICE([(Your Boot JDK version must be one of: $DEFAULT_ACCEPTABLE_BOOT_VERSIONS)])
             BOOT_JDK_FOUND=no
@@ -111,9 +102,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
             AC_MSG_CHECKING([for Boot JDK])
             AC_MSG_RESULT([$BOOT_JDK])
             AC_MSG_CHECKING([Boot JDK version])
-            BOOT_JDK_VERSION=`$java_to_test $USER_BOOT_JDK_OPTIONS -version 2>&1 | $TR -d '\r'`
-            # This is not a no-op; it will portably convert newline to space
-            BOOT_JDK_VERSION=`$ECHO $BOOT_JDK_VERSION`
+            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java$EXE_SUFFIX" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $TR '\n\r' '  '`
             AC_MSG_RESULT([$BOOT_JDK_VERSION])
           fi # end check jdk version
         fi # end check javac
@@ -162,8 +151,8 @@ AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME],
 [
   if test "x$JAVA_HOME" != x; then
     JAVA_HOME_PROCESSED="$JAVA_HOME"
-    UTIL_FIXUP_PATH(JAVA_HOME_PROCESSED, NOFAIL)
-    if test "x$JAVA_HOME_PROCESSED" = x || test ! -d "$JAVA_HOME_PROCESSED"; then
+    UTIL_FIXUP_PATH(JAVA_HOME_PROCESSED)
+    if test ! -d "$JAVA_HOME_PROCESSED"; then
       AC_MSG_NOTICE([Your JAVA_HOME points to a non-existing directory!])
     else
       # Aha, the user has set a JAVA_HOME
@@ -178,8 +167,8 @@ AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME],
 # Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
 AC_DEFUN([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK],
 [
-  UTIL_LOOKUP_PROGS(JAVAC_CHECK, javac, , NOFIXPATH)
-  UTIL_LOOKUP_PROGS(JAVA_CHECK, java, , NOFIXPATH)
+  AC_PATH_PROG(JAVAC_CHECK, javac)
+  AC_PATH_PROG(JAVA_CHECK, java)
   BINARY="$JAVAC_CHECK"
   if test "x$JAVAC_CHECK" = x; then
     BINARY="$JAVA_CHECK"
@@ -218,9 +207,9 @@ AC_DEFUN([BOOTJDK_CHECK_MACOSX_JAVA_LOCATOR],
     # First check at user selected default
     BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME()])
     # If that did not work out (e.g. too old), try explicit versions instead
-    for ver in $DEFAULT_ACCEPTABLE_BOOT_VERSIONS ; do
-      BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME([-v $ver])])
-    done
+    BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME([-v 1.9])])
+    BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME([-v 1.8])])
+    BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME([-v 1.7])])
   fi
 ])
 
@@ -253,10 +242,8 @@ AC_DEFUN([BOOTJDK_FIND_BEST_JDK_IN_WINDOWS_VIRTUAL_DIRECTORY],
 [
   if test "x[$]$1" != x; then
     VIRTUAL_DIR="[$]$1/Java"
-    UTIL_FIXUP_PATH(VIRTUAL_DIR, NOFAIL)
-    if test "x$VIRTUAL_DIR" != x; then
-      BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY($VIRTUAL_DIR)
-    fi
+    UTIL_REWRITE_AS_UNIX_PATH(VIRTUAL_DIR)
+    BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY($VIRTUAL_DIR)
   fi
 ])
 
@@ -283,43 +270,20 @@ AC_DEFUN([BOOTJDK_CHECK_WELL_KNOWN_LOCATIONS],
 AC_DEFUN([BOOTJDK_CHECK_TOOL_IN_BOOTJDK],
 [
   # Use user overridden value if available, otherwise locate tool in the Boot JDK.
-  UTIL_REQUIRE_SPECIAL($1,
+  UTIL_SETUP_TOOL($1,
     [
-      AC_MSG_CHECKING([for $2 [[Boot JDK]]])
+      AC_MSG_CHECKING([for $2 in Boot JDK])
       $1=$BOOT_JDK/bin/$2
-      if test ! -x [$]$1 && test ! -x [$]$1.exe; then
+      if test ! -x [$]$1; then
         AC_MSG_RESULT(not found)
         AC_MSG_NOTICE([Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk])
         AC_MSG_ERROR([Could not find $2 in the Boot JDK])
       fi
-      AC_MSG_RESULT(\[$]BOOT_JDK/bin/$2)
-      UTIL_FIXUP_EXECUTABLE($1)
+      AC_MSG_RESULT(ok)
       AC_SUBST($1)
     ])
 ])
 
-# Setup CLASSPATH environment variable
-AC_DEFUN([BOOTJDK_SETUP_CLASSPATH],
-[
-  AC_ARG_WITH([classpath], [AS_HELP_STRING([--with-classpath],
-      [Optional classpath to set as CLASSPATH to all Java invocations @<:@none@:>@])])
-
-  if test "x$CLASSPATH" != x; then
-    AC_MSG_WARN([CLASSPATH is set in the environment. This will be ignored. Use --with-classpath instead.])
-  fi
-
-  CLASSPATH=
-
-  if test "x$with_classpath" != x && test "x$with_classpath" != xyes &&
-      test "x$with_classpath" != xno ; then
-    CLASSPATH="$with_classpath"
-    AC_MSG_CHECKING([for classpath to use for all Java invocations])
-    AC_MSG_RESULT([$CLASSPATH])
-  fi
-
-  AC_SUBST(CLASSPATH)
-])
-
 ###############################################################################
 #
 # We need a Boot JDK to bootstrap the build.
@@ -349,12 +313,12 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
     AC_MSG_ERROR([The path given by --with-boot-jdk does not contain a valid Boot JDK])
   fi
 
-  # Test: Is $JAVA_HOME set?
-  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_HOME])
-
   # Test: On MacOS X, can we find a boot jdk using /usr/libexec/java_home?
   BOOTJDK_DO_CHECK([BOOTJDK_CHECK_MACOSX_JAVA_LOCATOR])
 
+  # Test: Is $JAVA_HOME set?
+  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_HOME])
+
   # Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
   BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK])
 
@@ -372,10 +336,11 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
   AC_SUBST(BOOT_JDK)
 
   # Setup tools from the Boot JDK.
-  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA, java)
-  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac)
-  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVADOC, javadoc)
-  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR, jar)
+  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA, java$EXE_SUFFIX)
+  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac$EXE_SUFFIX)
+  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVADOC, javadoc$EXE_SUFFIX)
+  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR, jar$EXE_SUFFIX)
+  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JARSIGNER, jarsigner$EXE_SUFFIX)
 
   # Finally, set some other options...
 
@@ -388,7 +353,7 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
   AC_SUBST(BOOT_JDK_SOURCETARGET)
 
   # Check if the boot jdk is 32 or 64 bit
-  if $JAVA -version 2>&1 | $GREP -q "64-Bit"; then
+  if "$JAVA" -version 2>&1 | $GREP -q "64-Bit"; then
     BOOT_JDK_BITS="64"
   else
     BOOT_JDK_BITS="32"
@@ -403,7 +368,7 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
 
   if test "x$boot_jdk_cds_args" != x; then
     # Try creating a CDS archive
-    $JAVA $boot_jdk_cds_args -Xshare:dump > /dev/null 2>&1
+    "$JAVA" $boot_jdk_cds_args -Xshare:dump > /dev/null 2>&1
     if test $? -eq 0; then
       BOOTJDK_USE_LOCAL_CDS=true
       AC_MSG_RESULT([yes, created])
@@ -416,8 +381,6 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
     BOOTJDK_USE_LOCAL_CDS=false
     AC_MSG_RESULT([no, -XX:SharedArchiveFile not supported])
   fi
-
-  BOOTJDK_SETUP_CLASSPATH
 ])
 
 AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
@@ -553,7 +516,7 @@ AC_DEFUN([BOOTJDK_CHECK_BUILD_JDK],
       else
         # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
         # Additional [] needed to keep m4 from mangling shell constructs.
-        [ BUILD_JDK_VERSION=`"$BUILD_JDK/bin/java" -version 2>&1 | $AWK '/version "[0-9a-zA-Z\._\-]+"/ {print $ 0; exit;}'` ]
+        [ BUILD_JDK_VERSION=`"$BUILD_JDK/bin/java" -version 2>&1 | $AWK '/version \"[0-9a-zA-Z\._\-]+\"/{print $ 0; exit;}'` ]
 
         # Extra M4 quote needed to protect [] in grep expression.
         [FOUND_CORRECT_VERSION=`echo $BUILD_JDK_VERSION | $EGREP "\"$VERSION_FEATURE([\.+-].*)?\""`]
@@ -611,12 +574,8 @@ AC_DEFUN([BOOTJDK_SETUP_BUILD_JDK],
     fi
   fi
 
-  # Since these tools do not yet exist, we cannot use UTIL_FIXUP_EXECUTABLE to
-  # detect the need of fixpath
   JMOD="$BUILD_JDK/bin/jmod"
-  UTIL_ADD_FIXPATH(JMOD)
   JLINK="$BUILD_JDK/bin/jlink"
-  UTIL_ADD_FIXPATH(JLINK)
   AC_SUBST(JMOD)
   AC_SUBST(JLINK)
 
@@ -630,28 +589,3 @@ AC_DEFUN([BOOTJDK_SETUP_BUILD_JDK],
   AC_SUBST(BUILD_JDK)
   AC_SUBST(EXTERNAL_BUILDJDK)
 ])
-
-# The docs-reference JDK is used to run javadoc for the docs-reference targets.
-# If not set, the reference docs will be built using the interim javadoc.
-AC_DEFUN([BOOTJDK_SETUP_DOCS_REFERENCE_JDK],
-[
-  AC_ARG_WITH(docs-reference-jdk, [AS_HELP_STRING([--with-docs-reference-jdk],
-      [path to JDK to use for building the reference documentation])])
-
-  AC_MSG_CHECKING([for docs-reference JDK])
-  if test "x$with_docs_reference_jdk" != "x"; then
-    DOCS_REFERENCE_JDK="$with_docs_reference_jdk"
-    AC_MSG_RESULT([$DOCS_REFERENCE_JDK])
-    DOCS_REFERENCE_JAVADOC="$DOCS_REFERENCE_JDK/bin/javadoc"
-    if test ! -x "$DOCS_REFERENCE_JAVADOC"; then
-      AC_MSG_ERROR([docs-reference JDK found at $DOCS_REFERENCE_JDK did not contain bin/javadoc])
-    fi
-    UTIL_FIXUP_EXECUTABLE(DOCS_REFERENCE_JAVADOC)
-  else
-    AC_MSG_RESULT([no, using interim javadoc for the docs-reference targets])
-    # By leaving this empty, Docs.gmk will revert to the default interim javadoc
-    DOCS_REFERENCE_JAVADOC=
-  fi
-
-  AC_SUBST(DOCS_REFERENCE_JAVADOC)
-])

make/autoconf/bootcycle-spec.gmk.in

@@ -28,6 +28,14 @@
 # First include the real base spec.gmk file
 include @SPEC@
 
+# Check that the user did not try to specify a different java to use for compiling.
+# On windows we need to account for fixpath being first word.
+ifeq ($(firstword $(JAVA)),$(FIXPATH))
+  JAVA_EXEC_POS=2
+else
+  JAVA_EXEC_POS=1
+endif
+
 # Override specific values to do a boot cycle build
 
 # Use a different Boot JDK
@@ -39,9 +47,10 @@ OUTPUTDIR:=$(OLD_OUTPUTDIR)/bootcycle-build
 # No spaces in patsubst to avoid leading space in variable
 JAVAC_SERVER_DIR:=$(patsubst $(OLD_OUTPUTDIR)%,$(OUTPUTDIR)%,$(JAVAC_SERVER_DIR))
 
-JAVA_CMD := $(FIXPATH) $(BOOT_JDK)/bin/java
-JAVAC_CMD := $(FIXPATH) $(BOOT_JDK)/bin/javac
-JAR_CMD := $(FIXPATH) $(BOOT_JDK)/bin/jar
+JAVA_CMD:=$(BOOT_JDK)/bin/java
+JAVAC_CMD:=$(BOOT_JDK)/bin/javac
+JAR_CMD:=$(BOOT_JDK)/bin/jar
+JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner
 # The bootcycle JVM arguments may differ from the original boot jdk.
 JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@
 # Any CDS settings generated for the bootjdk are invalid in the bootcycle build.
@@ -49,3 +58,5 @@ JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@
 # settings for CDS.
 JAVA_FLAGS := $(filter-out -XX:SharedArchiveFile% -Xshare%, $(JAVA_FLAGS))
 
+# Pandoc cannot be used without the jjs plugin, which was removed with Nashorn.
+ENABLE_PANDOC := false

make/autoconf/build-aux/config.guess

@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
+# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,17 +30,6 @@
 DIR=`dirname $0`
 OUT=`. $DIR/autoconf-config.guess`
 
-# Detect C library.
-# Use '-gnu'  suffix on systems that use glibc.
-# Use '-musl' suffix on systems that use the musl libc.
-echo $OUT | grep -- -linux- > /dev/null 2> /dev/null
-if test $? = 0; then
-  libc_vendor=`ldd --version 2>&1 | sed -n '1s/.*\(musl\).*/\1/p'`
-  if [ x"${libc_vendor}" = x"musl" ]; then
-    OUT=`echo $OUT | sed 's/-gnu/-musl/'`
-  fi
-fi
-
 # Test and fix cygwin on x86_64
 echo $OUT | grep 86-pc-cygwin > /dev/null 2> /dev/null
 if test $? != 0; then
@@ -57,11 +45,11 @@ if test $? = 0; then
 fi
 
 # Test and fix wsl
-echo $OUT | grep unknown-linux-gnu > /dev/null 2> /dev/null
+echo $OUT | grep x86_64-unknown-linux-gnu > /dev/null 2> /dev/null
 if test $? = 0; then
   uname -r | grep -i microsoft > /dev/null 2> /dev/null
   if test $? = 0; then
-    OUT=`echo $OUT | sed -e 's/unknown-linux-gnu/pc-wsl/'`
+    OUT="x86_64-pc-wsl"
   fi
 fi
 
@@ -102,27 +90,6 @@ if [ "x$OUT" = x ]; then
   fi
 fi
 
-# Test and fix LoongArch64.
-if [ "x$OUT" = x ]; then
-  if [ `uname -s` = Linux ]; then
-    if [ `uname -m` = loongarch64 ]; then
-      OUT=loongarch64-unknown-linux-gnu
-    fi
-  fi
-fi
-
-# Test and fix cpu on macos-aarch64, uname -p reports arm, buildsys expects aarch64
-echo $OUT | grep arm-apple-darwin > /dev/null 2> /dev/null
-if test $? != 0; then
-  # The GNU version of uname may be on the PATH which reports arm64 instead
-  echo $OUT | grep arm64-apple-darwin > /dev/null 2> /dev/null
-fi
-if test $? = 0; then
-  if [ `uname -m` = arm64 ]; then
-    OUT=aarch64`echo $OUT | sed -e 's/[^-]*//'`
-  fi
-fi
-
 # Test and fix cpu on Macosx when C preprocessor is not on the path
 echo $OUT | grep i386-apple-darwin > /dev/null 2> /dev/null
 if test $? = 0; then

make/autoconf/build-aux/config.sub

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,19 +29,8 @@
 
 DIR=`dirname $0`
 
-if echo $* | grep linux-musl >/dev/null ; then
-    echo $*
-    exit
-fi
-
 # Allow wsl
-if echo $* | grep pc-wsl >/dev/null ; then
-    echo $*
-    exit
-fi
-
-# Allow msys2
-if echo $* | grep pc-msys >/dev/null ; then
+if echo $* | grep x86_64-pc-wsl >/dev/null ; then
     echo $*
     exit
 fi
@@ -55,7 +44,7 @@ if ! echo $* | grep '^aarch64-' >/dev/null ; then
 fi
 
 while test $# -gt 0 ; do
-    case $1 in
+    case $1 in 
         -- )   # Stop option processing
             shift; break ;;
         aarch64-* )

make/autoconf/build-performance.m4

@@ -175,7 +175,7 @@ AC_DEFUN([BPERF_SETUP_CCACHE],
   if test "x$TOOLCHAIN_PATH" != x; then
     PATH=$TOOLCHAIN_PATH:$PATH
   fi
-  UTIL_LOOKUP_PROGS(CCACHE, ccache)
+  UTIL_PATH_PROGS(CCACHE, ccache)
   PATH="$OLD_PATH"
 
   AC_MSG_CHECKING([if ccache is available])

make/autoconf/buildjdk-spec.gmk.in

@@ -54,13 +54,11 @@ IMAGES_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(IMAGES_OUT
 
 OPENJDK_BUILD_CPU_LEGACY := @OPENJDK_BUILD_CPU_LEGACY@
 OPENJDK_BUILD_CPU_LEGACY_LIB := @OPENJDK_BUILD_CPU_LEGACY_LIB@
-OPENJDK_BUILD_LIBC := @OPENJDK_BUILD_LIBC@
 OPENJDK_TARGET_CPU := @OPENJDK_BUILD_CPU@
 OPENJDK_TARGET_CPU_ARCH := @OPENJDK_BUILD_CPU_ARCH@
 OPENJDK_TARGET_CPU_BITS := @OPENJDK_BUILD_CPU_BITS@
 OPENJDK_TARGET_CPU_ENDIAN := @OPENJDK_BUILD_CPU_ENDIAN@
 OPENJDK_TARGET_CPU_LEGACY := @OPENJDK_BUILD_CPU_LEGACY@
-OPENJDK_TARGET_LIBC := @OPENJDK_BUILD_LIBC@
 OPENJDK_TARGET_OS_INCLUDE_SUBDIR := @OPENJDK_BUILD_OS_INCLUDE_SUBDIR@
 
 HOTSPOT_TARGET_OS := @HOTSPOT_BUILD_OS@
@@ -68,7 +66,6 @@ HOTSPOT_TARGET_OS_TYPE := @HOTSPOT_BUILD_OS_TYPE@
 HOTSPOT_TARGET_CPU := @HOTSPOT_BUILD_CPU@
 HOTSPOT_TARGET_CPU_ARCH := @HOTSPOT_BUILD_CPU_ARCH@
 HOTSPOT_TARGET_CPU_DEFINE := @HOTSPOT_BUILD_CPU_DEFINE@
-HOTSPOT_TARGET_LIBC := @HOTSPOT_BUILD_LIBC@
 
 CFLAGS_JDKLIB := @OPENJDK_BUILD_CFLAGS_JDKLIB@
 CXXFLAGS_JDKLIB := @OPENJDK_BUILD_CXXFLAGS_JDKLIB@

make/autoconf/compare.sh.in

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ export CMP="@CMP@"
 export CP="@CP@"
 export CUT="@CUT@"
 export DIFF="@DIFF@"
-export DUMPBIN="@DUMPBIN@"
+export DUMPBIN="@FIXPATH@ @DUMPBIN@"
 export EXPR="@EXPR@"
 export FILE="@FILE@"
 export FIND="@FIND@"
@@ -53,6 +53,7 @@ export LDD="@LDD@"
 export LN="@LN@"
 export MKDIR="@MKDIR@"
 export MV="@MV@"
+export NAWK="@NAWK@"
 export NM="@GNM@"
 export OBJDUMP="@OBJDUMP@"
 export OTOOL="@OTOOL@"
@@ -86,10 +87,12 @@ else
 fi
 
 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-  if [[ $OPENJDK_BUILD_OS_ENV =~ ^windows.wsl ]]; then
-    export WSLENV=PATH/l
+  if [ "$OPENJDK_BUILD_OS_ENV" = "windows.wsl" ]; then
+    export FIXPATH_PATH="@VS_PATH_WINDOWS@"
+    export WSLENV="$WSLENV:FIXPATH_PATH:DEBUG_FIXPATH"
+  else
+    export PATH="@VS_PATH@"
   fi
-  export PATH="$PATH:@TOOLCHAIN_PATH@"
 fi
 
 export HOTSPOT_BUILD_TIME="@HOTSPOT_BUILD_TIME@"

make/autoconf/configure

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@ export LC_ALL=C
 if test "x$CUSTOM_CONFIG_DIR" != x; then
   custom_hook=$CUSTOM_CONFIG_DIR/custom-hook.m4
   if test ! -e $custom_hook; then
-    echo "CUSTOM_CONFIG_DIR ($CUSTOM_CONFIG_DIR) not pointing to a proper custom config dir."
+    echo "CUSTOM_CONFIG_DIR not pointing to a proper custom config dir."
     echo "Error: Cannot continue" 1>&2
     exit 1
   fi
@@ -78,12 +78,11 @@ generated_script="$build_support_dir/generated-configure.sh"
 ###
 
 autoconf_missing_help() {
-  APT_GET="`type -p apt-get 2> /dev/null`"
-  YUM="`type -p yum 2> /dev/null`"
-  BREW="`type -p brew 2> /dev/null`"
-  ZYPPER="`type -p zypper 2> /dev/null`"
-  CYGWIN="`type -p cygpath 2> /dev/null`"
-  UNAMEOUT="`uname 2> /dev/null`"
+  APT_GET="`which apt-get 2> /dev/null | grep -v '^no apt-get in'`"
+  YUM="`which yum 2> /dev/null | grep -v '^no yum in'`"
+  BREW="`which brew 2> /dev/null | grep -v '^no brew in'`"
+  ZYPPER="`which zypper 2> /dev/null | grep -v '^no zypper in'`"
+  CYGWIN="`which cygpath 2> /dev/null | grep -v '^no cygpath in'`"
 
   if test "x$ZYPPER" != x; then
     PKGHANDLER_COMMAND="sudo zypper install autoconf"
@@ -93,8 +92,6 @@ autoconf_missing_help() {
     PKGHANDLER_COMMAND="sudo yum install autoconf"
   elif test "x$BREW" != x; then
     PKGHANDLER_COMMAND="brew install autoconf"
-  elif test "x$UNAMEOUT" == xAIX; then
-    echo "You might be able to fix this by installing autoconf from the 'AIX Toolbox for Linux Applications' (or compile it from the sources)."
   elif test "x$CYGWIN" != x; then
     PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P autoconf )"
   fi
@@ -114,10 +111,10 @@ generate_configure_script() {
       exit 1
     fi
   else
-    AUTOCONF="`type -p autoconf 2> /dev/null`"
+    AUTOCONF="`which autoconf 2> /dev/null | grep -v '^no autoconf in'`"
     if test "x$AUTOCONF" = x; then
       echo
-      echo "Autoconf is not found on the PATH ($PATH), and AUTOCONF is not set."
+      echo "Autoconf is not found on the PATH, and AUTOCONF is not set."
       echo "You need autoconf to be able to generate a runnable configure script."
       autoconf_missing_help
       echo "Error: Cannot find autoconf" 1>&2

make/autoconf/configure.ac

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -106,8 +106,6 @@ BASIC_SETUP_DEVKIT
 # To properly create a configuration name, we need to have the OpenJDK target
 # and options (variants and debug level) parsed.
 BASIC_SETUP_OUTPUT_DIR
-# After we have the output dir we can finalize the fixpath wrapper
-BASIC_WINDOWS_FINALIZE_FIXPATH
 
 # Must be done before we can call HELP_MSG_MISSING_DEPENDENCY.
 HELP_SETUP_DEPENDENCY_HELP
@@ -144,7 +142,6 @@ JDKVER_SETUP_JDK_VERSION_NUMBERS
 
 BOOTJDK_SETUP_BOOT_JDK
 BOOTJDK_SETUP_BUILD_JDK
-BOOTJDK_SETUP_DOCS_REFERENCE_JDK
 
 ###############################################################################
 #
@@ -206,8 +203,7 @@ FLAGS_POST_TOOLCHAIN
 PLATFORM_SETUP_OPENJDK_TARGET_BITS
 PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS
 
-# Configure flags for the tools. Need to know if we should build reproducible.
-JDKOPT_SETUP_REPRODUCIBLE_BUILD
+# Configure flags for the tools
 FLAGS_SETUP_FLAGS
 
 # Setup debug symbols (need objcopy from the toolchain for that)
@@ -223,6 +219,9 @@ JDKOPT_SETUP_ADDRESS_SANITIZER
 #
 ###############################################################################
 
+# After we have toolchain, we can compile fixpath. It's needed by the lib checks.
+BASIC_COMPILE_FIXPATH
+
 LIB_DETERMINE_DEPENDENCIES
 LIB_SETUP_LIBRARIES
 
@@ -243,13 +242,13 @@ HOTSPOT_SETUP_MISC
 #
 ###############################################################################
 
+JDKOPT_DETECT_INTREE_EC
 JDKOPT_ENABLE_DISABLE_FAILURE_HANDLER
 JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST
 JDKOPT_EXCLUDE_TRANSLATIONS
 JDKOPT_ENABLE_DISABLE_MANPAGES
 JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE
-JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT
-JDKOPT_SETUP_HSDIS
+JDKOPT_SETUP_REPRODUCIBLE_BUILD
 
 ###############################################################################
 #
@@ -296,7 +295,6 @@ BASIC_CHECK_LEFTOVER_OVERRIDDEN
 CONFIG_STATUS="$CONFIGURESUPPORT_OUTPUTDIR/config.status"
 
 # Create the actual output files. Now the main work of configure is done.
-BASIC_WINDOWS_FINALIZE
 AC_OUTPUT
 
 # After AC_OUTPUT, we need to do final work

make/autoconf/flags-cflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -130,20 +130,14 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
   case "${TOOLCHAIN_TYPE}" in
     microsoft)
       DISABLE_WARNING_PREFIX="-wd"
-      BUILD_CC_DISABLE_WARNING_PREFIX="-wd"
       CFLAGS_WARNINGS_ARE_ERRORS="-WX"
 
       WARNINGS_ENABLE_ALL="-W3"
       DISABLED_WARNINGS="4800"
-      if test "x$TOOLCHAIN_VERSION" = x2017; then
-        # VS2017 incorrectly triggers this warning for constexpr
-        DISABLED_WARNINGS="$DISABLED_WARNINGS 4307"
-      fi
       ;;
 
     gcc)
       DISABLE_WARNING_PREFIX="-Wno-"
-      BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
       CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
 
       # Additional warnings that are not activated by -Wall and -Wextra
@@ -155,6 +149,7 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       WARNINGS_ENABLE_ALL_CXXFLAGS="$WARNINGS_ENABLE_ALL_CFLAGS $WARNINGS_ENABLE_ADDITIONAL_CXX"
 
       DISABLED_WARNINGS="unused-parameter unused"
+      BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
       ;;
 
     clang)
@@ -168,6 +163,11 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
 
       DISABLED_WARNINGS="unknown-warning-option unused-parameter unused"
 
+      if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+        # missing-method-return-type triggers in JavaNativeFoundation framework
+        DISABLED_WARNINGS="$DISABLED_WARNINGS missing-method-return-type"
+      fi
+
       ;;
 
     xlc)
@@ -227,14 +227,8 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
     # -D_FORTIFY_SOURCE=2 hardening option needs optimization (at least -O1) enabled
     # set for lower O-levels -U_FORTIFY_SOURCE to overwrite previous settings
     if test "x$OPENJDK_TARGET_OS" = xlinux -a "x$DEBUG_LEVEL" = "xfastdebug"; then
+      ENABLE_FORTIFY_CFLAGS="-D_FORTIFY_SOURCE=2"
       DISABLE_FORTIFY_CFLAGS="-U_FORTIFY_SOURCE"
-      # ASan doesn't work well with _FORTIFY_SOURCE
-      # See https://github.com/google/sanitizers/wiki/AddressSanitizer#faq
-      if test "x$ASAN_ENABLED" = xyes; then
-        ENABLE_FORTIFY_CFLAGS="${DISABLE_FORTIFY_CFLAGS}"
-      else
-        ENABLE_FORTIFY_CFLAGS="-D_FORTIFY_SOURCE=2"
-      fi
       C_O_FLAG_HIGHEST_JVM="${C_O_FLAG_HIGHEST_JVM} ${ENABLE_FORTIFY_CFLAGS}"
       C_O_FLAG_HIGHEST="${C_O_FLAG_HIGHEST} ${ENABLE_FORTIFY_CFLAGS}"
       C_O_FLAG_HI="${C_O_FLAG_HI} ${ENABLE_FORTIFY_CFLAGS}"
@@ -518,18 +512,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   fi
   TOOLCHAIN_CFLAGS_JDK_CONLY="$LANGSTD_CFLAGS $TOOLCHAIN_CFLAGS_JDK_CONLY"
 
-  # CXXFLAGS C++ language level for all of JDK, including Hotspot.
-  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xxlc; then
-    LANGSTD_CXXFLAGS="-std=c++14"
-  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    LANGSTD_CXXFLAGS="-std:c++14"
-  else
-    AC_MSG_ERROR([Don't know how to enable C++14 for this toolchain])
-  fi
-  TOOLCHAIN_CFLAGS_JDK_CXXONLY="$TOOLCHAIN_CFLAGS_JDK_CXXONLY $LANGSTD_CXXFLAGS"
-  TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM $LANGSTD_CXXFLAGS"
-  ADLC_LANGSTD_CXXFLAGS="$LANGSTD_CXXFLAGS"
-
   # CFLAGS WARNINGS STUFF
   # Set JVM_CFLAGS warning handling
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
@@ -560,11 +542,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     fi
   fi
 
-  OS_CFLAGS="$OS_CFLAGS -DLIBC=$OPENJDK_TARGET_LIBC"
-  if test "x$OPENJDK_TARGET_LIBC" = xmusl; then
-    OS_CFLAGS="$OS_CFLAGS -DMUSL_LIBC"
-  fi
-
   # Where does this really belong??
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     PICFLAG="-fPIC"
@@ -600,6 +577,25 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     fi
   fi
 
+  # Optional POSIX functionality needed by the JVM
+  #
+  # Check if clock_gettime is available and in which library. This indicates
+  # availability of CLOCK_MONOTONIC for hotspot. But we don't need to link, so
+  # don't let it update LIBS.
+  save_LIBS="$LIBS"
+  AC_SEARCH_LIBS(clock_gettime, rt, [HAS_CLOCK_GETTIME=true], [])
+  if test "x$LIBS" = "x-lrt "; then
+    CLOCK_GETTIME_IN_LIBRT=true
+  fi
+  LIBS="$save_LIBS"
+
+  if test "x$HAS_CLOCK_GETTIME" = "xtrue"; then
+    OS_CFLAGS_JVM="$OS_CFLAGS_JVM -DSUPPORTS_CLOCK_MONOTONIC"
+    if test "x$CLOCK_GETTIME_IN_LIBRT" = "xtrue"; then
+      OS_CFLAGS_JVM="$OS_CFLAGS_JVM -DNEEDS_LIBRT"
+    fi
+  fi
+
   # Extra flags needed when building optional static versions of certain
   # JDK libraries.
   STATIC_LIBS_CFLAGS="-DSTATIC_BUILD=1"
@@ -640,17 +636,21 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
   $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -DARCH='\"$FLAGS_CPU_LEGACY\"' \
       -D$FLAGS_CPU_LEGACY"
 
-  if test "x$FLAGS_CPU_BITS" = x64 && test "x$FLAGS_OS" != xaix; then
-    # xlc on AIX defines _LP64=1 by default and issues a warning if we redefine it.
-    $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_LP64=1"
-    $1_DEFINES_CPU_JVM="${$1_DEFINES_CPU_JVM} -D_LP64=1"
+  if test "x$FLAGS_CPU_BITS" = x64; then
+    # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
+    # unpack200.exe.
+    if test "x$FLAGS_OS" = xlinux || test "x$FLAGS_OS" = xmacosx; then
+      $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_LP64=1"
+    fi
+    if test "x$FLAGS_OS" != xaix; then
+      # xlc on AIX defines _LP64=1 by default and issues a warning if we redefine it.
+      $1_DEFINES_CPU_JVM="${$1_DEFINES_CPU_JVM} -D_LP64=1"
+    fi
   fi
 
   # toolchain dependend, per-cpu
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    if test "x$FLAGS_CPU" = xaarch64; then
-      $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_ARM64_ -Darm64"
-    elif test "x$FLAGS_CPU" = xx86_64; then
+    if test "x$FLAGS_CPU" = xx86_64; then
       $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_AMD64_ -Damd64"
     else
       $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_X86_ -Dx86"
@@ -660,21 +660,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
   # CFLAGS PER CPU
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     # COMMON to gcc and clang
-    AC_MSG_CHECKING([if $1 is x86])
     if test "x$FLAGS_CPU" = xx86; then
-      AC_MSG_RESULT([yes])
-      AC_MSG_CHECKING([if control flow protection is enabled by additional compiler flags])
-      if echo "${EXTRA_CFLAGS}${EXTRA_CXXFLAGS}${EXTRA_ASFLAGS}" | ${GREP} -q 'fcf-protection' ; then
-        # cf-protection requires CMOV and thus i686
-        $1_CFLAGS_CPU="-march=i686"
-        AC_MSG_RESULT([yes, forcing ${$1_CFLAGS_CPU}])
-      else
-        # Force compatibility with i586 on 32 bit intel platforms.
-        $1_CFLAGS_CPU="-march=i586"
-        AC_MSG_RESULT([no, forcing ${$1_CFLAGS_CPU}])
-      fi
-    else
-      AC_MSG_RESULT([no])
+      # Force compatibility with i586 on 32 bit intel platforms.
+      $1_CFLAGS_CPU="-march=i586"
     fi
   fi
 
@@ -706,6 +694,13 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
     fi
 
+    $1_CXXSTD_CXXFLAG="-std=gnu++98"
+    FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${$1_CXXSTD_CXXFLAG}],
+        PREFIX: $3, IF_FALSE: [$1_CXXSTD_CXXFLAG=""])
+    $1_TOOLCHAIN_CFLAGS_JDK_CXXONLY="${$1_CXXSTD_CXXFLAG}"
+    $1_TOOLCHAIN_CFLAGS_JVM="${$1_TOOLCHAIN_CFLAGS_JVM} ${$1_CXXSTD_CXXFLAG}"
+    $2ADLC_CXXFLAG="${$1_CXXSTD_CXXFLAG}"
+
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$FLAGS_OS" = xlinux; then
       # ppc test not really needed for clang
@@ -737,27 +732,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
     $1_TOOLCHAIN_CFLAGS="${$1_GCC6_CFLAGS}"
 
     $1_WARNING_CFLAGS_JVM="-Wno-format-zero-length -Wtype-limits -Wuninitialized"
-  elif test "x$TOOLCHAIN_TYPE" = xclang; then
-    NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
-    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG],
-        PREFIX: $3,
-        IF_FALSE: [
-            NO_DELETE_NULL_POINTER_CHECKS_CFLAG=
-        ]
-    )
-    $1_TOOLCHAIN_CFLAGS="${NO_DELETE_NULL_POINTER_CHECKS_CFLAG}"
-  fi
-
-  if test "x$TOOLCHAIN_TYPE" = xmicrosoft && test "x$ENABLE_REPRODUCIBLE_BUILD" = xtrue; then
-    # Enabling deterministic creates warnings if __DATE__ or __TIME__ are
-    # used, and since we are, silence that warning.
-    REPRODUCIBLE_CFLAGS="-experimental:deterministic -wd5048"
-    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${REPRODUCIBLE_CFLAGS}],
-        PREFIX: $3,
-        IF_FALSE: [
-            REPRODUCIBLE_CFLAGS=
-        ]
-    )
   fi
 
   # Prevent the __FILE__ macro from generating absolute paths into the built
@@ -778,27 +752,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
               FILE_MACRO_CFLAGS=
           ]
       )
-    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft &&
-        test "x$ENABLE_REPRODUCIBLE_BUILD" = xtrue; then
-      # There is a known issue with the pathmap if the mapping is made to the
-      # empty string. Add a minimal string "s" as prefix to work around this.
-      # PATHMAP_FLAGS is also added to LDFLAGS in flags-ldflags.m4.
-      PATHMAP_FLAGS="-pathmap:${WORKSPACE_ROOT}=s"
-      FILE_MACRO_CFLAGS="$PATHMAP_FLAGS"
-      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${FILE_MACRO_CFLAGS}],
-          PREFIX: $3,
-          IF_FALSE: [
-              PATHMAP_FLAGS=
-              FILE_MACRO_CFLAGS=
-          ]
-      )
-    fi
-
-    AC_MSG_CHECKING([how to prevent absolute paths in output])
-    if test "x$FILE_MACRO_CFLAGS" != x; then
-      AC_MSG_RESULT([using compiler options])
-    else
-      AC_MSG_RESULT([using relative paths])
     fi
   fi
   AC_SUBST(FILE_MACRO_CFLAGS)
@@ -807,13 +760,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
   CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM \
       $TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \
       $OS_CFLAGS $OS_CFLAGS_JVM $CFLAGS_OS_DEF_JVM $DEBUG_CFLAGS_JVM \
-      $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS \
-      $REPRODUCIBLE_CFLAGS"
+      $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS"
 
   CFLAGS_JDK_COMMON="$ALWAYS_CFLAGS_JDK $ALWAYS_DEFINES_JDK $TOOLCHAIN_CFLAGS_JDK \
       $OS_CFLAGS $CFLAGS_OS_DEF_JDK $DEBUG_CFLAGS_JDK $DEBUG_OPTIONS_FLAGS_JDK \
       $WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK \
-      $FILE_MACRO_CFLAGS $REPRODUCIBLE_CFLAGS"
+      $FILE_MACRO_CFLAGS"
 
   # Use ${$2EXTRA_CFLAGS} to block EXTRA_CFLAGS to be added to build flags.
   # (Currently we don't have any OPENJDK_BUILD_EXTRA_CFLAGS, but that might
@@ -843,7 +795,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
   AC_SUBST($2CFLAGS_JDKEXE)
   AC_SUBST($2CXXFLAGS_JDKLIB)
   AC_SUBST($2CXXFLAGS_JDKEXE)
-  AC_SUBST($2ADLC_LANGSTD_CXXFLAGS)
+  AC_SUBST($2ADLC_CXXFLAG)
 
   COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
   # Check that the compiler supports -ffp-contract=off flag

make/autoconf/flags-ldflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,10 +32,16 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS],
 
   # Setup the target toolchain
 
-  # The target dir matches the name of VM variant
-  TARGET_JVM_VARIANT_PATH=$JVM_VARIANT_MAIN
-
   # On some platforms (mac) the linker warns about non existing -L dirs.
+  # For any of the variants server, client or minimal, the dir matches the
+  # variant name. The "main" variant should be used for linking. For the
+  # rest, the dir is just server.
+  if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) \
+      || HOTSPOT_CHECK_JVM_VARIANT(minimal); then
+    TARGET_JVM_VARIANT_PATH=$JVM_VARIANT_MAIN
+  else
+    TARGET_JVM_VARIANT_PATH=server
+  fi
   FLAGS_SETUP_LDFLAGS_CPU_DEP([TARGET])
 
   # Setup the build toolchain
@@ -47,7 +53,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS],
 
   LDFLAGS_TESTEXE="${TARGET_LDFLAGS_JDK_LIBPATH}"
   AC_SUBST(LDFLAGS_TESTEXE)
-  AC_SUBST(ADLC_LDFLAGS)
 ])
 
 ################################################################################
@@ -60,11 +65,11 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     # Add -z,defs, to forbid undefined symbols in object files.
     # add -z,relro (mark relocations read only) for all libs
     # add -z,now ("full relro" - more of the Global Offset Table GOT is marked read only)
-    BASIC_LDFLAGS="-Wl,-z,defs -Wl,-z,relro -Wl,-z,now"
+    BASIC_LDFLAGS="-Wl,--hash-style=gnu -Wl,-z,defs -Wl,-z,relro -Wl,-z,now"
     # Linux : remove unused code+data in link step
     if test "x$ENABLE_LINKTIME_GC" = xtrue; then
       if test "x$OPENJDK_TARGET_CPU" = xs390x; then
-        BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,--gc-sections"
+        BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,--gc-sections -Wl,--print-gc-sections"
       else
         BASIC_LDFLAGS_JDK_ONLY="$BASIC_LDFLAGS_JDK_ONLY -Wl,--gc-sections"
       fi
@@ -100,7 +105,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
       # Assume clang or gcc.
       # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead.
       OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
-      OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN"
+      OS_LDFLAGS_JDK_ONLY="-mmacosx-version-min=$MACOSX_VERSION_MIN"
     fi
   fi
 
@@ -131,17 +136,9 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     fi
   fi
 
-  if test "x$ENABLE_REPRODUCIBLE_BUILD" = "xtrue"; then
-    if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-      REPRODUCIBLE_LDFLAGS="-experimental:deterministic"
-    fi
-  fi
-
   if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
     if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
       BASIC_LDFLAGS="$BASIC_LDFLAGS -pdbaltpath:%_PDB%"
-      # PATHMAP_FLAGS is setup in flags-cflags.m4.
-      FILE_MACRO_LDFLAGS="${PATHMAP_FLAGS}"
     fi
   fi
 
@@ -166,30 +163,21 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
       $1_CPU_LDFLAGS="$ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS"
     fi
 
-    # MIPS ABI does not support GNU hash style
-    if test "x${OPENJDK_$1_CPU}" = xmips ||
-       test "x${OPENJDK_$1_CPU}" = xmipsel ||
-       test "x${OPENJDK_$1_CPU}" = xmips64 ||
-       test "x${OPENJDK_$1_CPU}" = xmips64el; then
-      $1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--hash-style=sysv"
-    else
-      $1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--hash-style=gnu"
-    fi
-
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    if test "x${OPENJDK_$1_CPU_BITS}" = "x32"; then
-      $1_CPU_EXECUTABLE_LDFLAGS="-stack:327680"
-    elif test "x${OPENJDK_$1_CPU_BITS}" = "x64"; then
-      $1_CPU_EXECUTABLE_LDFLAGS="-stack:1048576"
-    fi
     if test "x${OPENJDK_$1_CPU}" = "xx86"; then
       $1_CPU_LDFLAGS="-safeseh"
+      # NOTE: Old build added -machine. Probably not needed.
+      $1_CPU_LDFLAGS_JVM_ONLY="-machine:I386"
+      $1_CPU_EXECUTABLE_LDFLAGS="-stack:327680"
+    else
+      $1_CPU_LDFLAGS_JVM_ONLY="-machine:AMD64"
+      $1_CPU_EXECUTABLE_LDFLAGS="-stack:1048576"
     fi
   fi
 
   # JVM_VARIANT_PATH depends on if this is build or target...
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    $1_LDFLAGS_JDK_LIBPATH="-libpath:\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base"
+    $1_LDFLAGS_JDK_LIBPATH="-libpath:${OUTPUTDIR}/support/modules_libs/java.base"
   else
     $1_LDFLAGS_JDK_LIBPATH="-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
         -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/${$1_JVM_VARIANT_PATH}"
@@ -197,17 +185,15 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
 
   # Export variables according to old definitions, prefix with $2 if present.
   LDFLAGS_JDK_COMMON="$BASIC_LDFLAGS $BASIC_LDFLAGS_JDK_ONLY \
-      $OS_LDFLAGS $DEBUGLEVEL_LDFLAGS_JDK_ONLY ${$2EXTRA_LDFLAGS}"
+      $OS_LDFLAGS_JDK_ONLY $DEBUGLEVEL_LDFLAGS_JDK_ONLY ${$2EXTRA_LDFLAGS}"
   $2LDFLAGS_JDKLIB="$LDFLAGS_JDK_COMMON $BASIC_LDFLAGS_JDK_LIB_ONLY \
-      ${$1_LDFLAGS_JDK_LIBPATH} $SHARED_LIBRARY_FLAGS \
-      $REPRODUCIBLE_LDFLAGS $FILE_MACRO_LDFLAGS"
+      ${$1_LDFLAGS_JDK_LIBPATH} $SHARED_LIBRARY_FLAGS"
   $2LDFLAGS_JDKEXE="$LDFLAGS_JDK_COMMON $EXECUTABLE_LDFLAGS \
-      ${$1_CPU_EXECUTABLE_LDFLAGS} $REPRODUCIBLE_LDFLAGS $FILE_MACRO_LDFLAGS"
+      ${$1_CPU_EXECUTABLE_LDFLAGS}"
 
-  $2JVM_LDFLAGS="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY $OS_LDFLAGS $OS_LDFLAGS_JVM_ONLY \
+  $2JVM_LDFLAGS="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY $OS_LDFLAGS_JVM_ONLY \
       $DEBUGLEVEL_LDFLAGS $DEBUGLEVEL_LDFLAGS_JVM_ONLY $BASIC_LDFLAGS_ONLYCXX \
-      ${$1_CPU_LDFLAGS} ${$1_CPU_LDFLAGS_JVM_ONLY} ${$2EXTRA_LDFLAGS} \
-      $REPRODUCIBLE_LDFLAGS $FILE_MACRO_LDFLAGS"
+      ${$1_CPU_LDFLAGS} ${$1_CPU_LDFLAGS_JVM_ONLY} ${$2EXTRA_LDFLAGS}"
 
   AC_SUBST($2LDFLAGS_JDKLIB)
   AC_SUBST($2LDFLAGS_JDKEXE)

make/autoconf/flags-other.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -64,39 +64,47 @@ AC_DEFUN([FLAGS_SETUP_RCFLAGS],
 [
   # On Windows, we need to set RC flags.
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    RCFLAGS="-nologo"
+    RC_FLAGS="-nologo -l0x409"
+    JVM_RCFLAGS="-nologo"
     if test "x$DEBUG_LEVEL" = xrelease; then
-      RCFLAGS="$RCFLAGS -DNDEBUG"
+      RC_FLAGS="$RC_FLAGS -DNDEBUG"
+      JVM_RCFLAGS="$JVM_RCFLAGS -DNDEBUG"
     fi
+
+    # The version variables used to create RC_FLAGS may be overridden
+    # in a custom configure script, or possibly the command line.
+    # Let those variables be expanded at make time in spec.gmk.
+    # The \$ are escaped to the shell, and the $(...) variables
+    # are evaluated by make.
+    RC_FLAGS="$RC_FLAGS \
+        -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \
+        -D\"JDK_COMPANY=\$(COMPANY_NAME)\" \
+        -D\"JDK_FILEDESC=\$(JDK_RC_NAME) binary\" \
+        -D\"JDK_VER=\$(VERSION_NUMBER)\" \
+        -D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
+        -D\"JDK_NAME=\$(JDK_RC_NAME) \$(VERSION_FEATURE)\" \
+        -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\""
+
+    JVM_RCFLAGS="$JVM_RCFLAGS \
+        -D\"HS_VERSION_STRING=\$(VERSION_STRING)\" \
+        -D\"HS_COMPANY=\$(COMPANY_NAME)\" \
+        -D\"HS_VER=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \
+        -D\"HS_INTERNAL_NAME=jvm\" \
+        -D\"HS_COPYRIGHT=Copyright $COPYRIGHT_YEAR\" \
+        -D\"HS_FNAME=jvm.dll\" \
+        -D\"HS_NAME=\$(PRODUCT_NAME) \$(VERSION_SHORT)\" \
+        -D\"HS_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\""
   fi
-  AC_SUBST(RCFLAGS)
+  AC_SUBST(RC_FLAGS)
+  AC_SUBST(JVM_RCFLAGS)
 ])
 
 ################################################################################
 # platform independent
 AC_DEFUN([FLAGS_SETUP_ASFLAGS],
 [
-  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-    # Force preprocessor to run, just to make sure
-    BASIC_ASFLAGS="-x assembler-with-cpp"
-  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    BASIC_ASFLAGS="-nologo -c"
-  fi
-  AC_SUBST(BASIC_ASFLAGS)
-
   if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    JVM_BASIC_ASFLAGS="-mno-omit-leaf-frame-pointer -mstack-alignment=16"
-
-    # Fix linker warning.
-    # Code taken from make/autoconf/flags-cflags.m4 and adapted.
-    JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS \
-        -DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
-        -mmacosx-version-min=$MACOSX_VERSION_MIN"
-
-    if test -n "$MACOSX_VERSION_MAX"; then
-        JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS $OS_CFLAGS \
-            -DMAC_OS_X_VERSION_MAX_ALLOWED=$MACOSX_VERSION_MAX_NODOTS"
-    fi
+    JVM_BASIC_ASFLAGS="-x assembler-with-cpp -mno-omit-leaf-frame-pointer -mstack-alignment=16"
   fi
 ])
 

make/autoconf/flags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -125,25 +125,19 @@ AC_DEFUN([FLAGS_SETUP_MACOSX_VERSION],
 [
   # Additional macosx handling
   if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    # The expected format for <version> is either nn.n.n or nn.nn.nn. See
-    # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/AvailabilityVersions.h
-
     # MACOSX_VERSION_MIN specifies the lowest version of Macosx that the built
     # binaries should be compatible with, even if compiled on a newer version
     # of the OS. It currently has a hard coded value. Setting this also limits
     # exposure to API changes in header files. Bumping this is likely to
     # require code changes to build.
-    if test "x$OPENJDK_TARGET_CPU_ARCH" = xaarch64; then
-      MACOSX_VERSION_MIN=11.00.00
-    else
-      MACOSX_VERSION_MIN=10.12.0
-    fi
+    MACOSX_VERSION_MIN=10.9.0
     MACOSX_VERSION_MIN_NODOTS=${MACOSX_VERSION_MIN//\./}
 
     AC_SUBST(MACOSX_VERSION_MIN)
 
     # Setting --with-macosx-version-max=<version> makes it an error to build or
-    # link to macosx APIs that are newer than the given OS version.
+    # link to macosx APIs that are newer than the given OS version. The expected
+    # format for <version> is either nn.n.n or nn.nn.nn. See /usr/include/AvailabilityMacros.h.
     AC_ARG_WITH([macosx-version-max], [AS_HELP_STRING([--with-macosx-version-max],
         [error on use of newer functionality. @<:@macosx@:>@])],
         [
@@ -224,20 +218,10 @@ AC_DEFUN([FLAGS_SETUP_SYSROOT_FLAGS],
     # We also need -iframework<path>/System/Library/Frameworks
     $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -iframework [$]$1SYSROOT/System/Library/Frameworks"
     $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -iframework [$]$1SYSROOT/System/Library/Frameworks"
-    if test -d "[$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks" ; then
-      # These always need to be set on macOS 10.X, or we can't find the frameworks embedded in JavaVM.framework
-      # set this here so it doesn't have to be peppered throughout the forest
-      $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
-      $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
-    fi
-  fi
-
-  # For the microsoft toolchain, we need to get the SYSROOT flags from the
-  # Visual Studio environment. Currently we cannot handle this as a separate
-  # build toolchain.
-  if test "x$1" = x && test "x$OPENJDK_BUILD_OS" = "xwindows" \
-      && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
-    TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
+    # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
+    # set this here so it doesn't have to be peppered throughout the forest
+    $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
+    $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
   fi
 
   AC_SUBST($1SYSROOT_CFLAGS)
@@ -248,7 +232,6 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
 [
   # We should always include user supplied flags
   FLAGS_SETUP_USER_SUPPLIED_FLAGS
-
   # The sysroot flags are needed for configure to be able to run the compilers
   FLAGS_SETUP_SYSROOT_FLAGS
 
@@ -265,14 +248,6 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
     fi
   fi
 
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-      MACHINE_FLAG="$MACHINE_FLAG -arch arm64"
-    elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-      MACHINE_FLAG="$MACHINE_FLAG -arch x86_64"
-    fi
-  fi
-
   # FIXME: global flags are not used yet...
   # The "global" flags will *always* be set. Without them, it is not possible to
   # get a working compilation.
@@ -281,6 +256,10 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
   GLOBAL_LDFLAGS="$MACHINE_FLAG $SYSROOT_LDFLAGS $USER_LDFLAGS"
   # FIXME: Don't really know how to do with this, but this was the old behavior
   GLOBAL_CPPFLAGS="$SYSROOT_CFLAGS"
+  AC_SUBST(GLOBAL_CFLAGS)
+  AC_SUBST(GLOBAL_CXXFLAGS)
+  AC_SUBST(GLOBAL_LDFLAGS)
+  AC_SUBST(GLOBAL_CPPFLAGS)
 
   # FIXME: For compatilibity, export this as EXTRA_CFLAGS for now.
   EXTRA_CFLAGS="$MACHINE_FLAG $USER_CFLAGS"
@@ -299,14 +278,6 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
   CXXFLAGS="$GLOBAL_CXXFLAGS"
   LDFLAGS="$GLOBAL_LDFLAGS"
   CPPFLAGS="$GLOBAL_CPPFLAGS"
-
-  if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    # When autoconf sends both compiler and linker flags to cl.exe at the same
-    # time, linker flags must be last at the command line. Achieve this by
-    # moving them to LIBS.
-    LIBS="$LIBS -link $LDFLAGS"
-    LDFLAGS=""
-  fi
 ])
 
 AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
@@ -374,13 +345,15 @@ AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
 
   # Generate make dependency files
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    GENDEPS_FLAGS="-MMD -MF"
+    C_FLAG_DEPS="-MMD -MF"
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
-    GENDEPS_FLAGS="-MMD -MF"
+    C_FLAG_DEPS="-MMD -MF"
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
-    GENDEPS_FLAGS="-qmakedep=gcc -MF"
+    C_FLAG_DEPS="-qmakedep=gcc -MF"
   fi
-  AC_SUBST(GENDEPS_FLAGS)
+  CXX_FLAG_DEPS="$C_FLAG_DEPS"
+  AC_SUBST(C_FLAG_DEPS)
+  AC_SUBST(CXX_FLAG_DEPS)
 ])
 
 AC_DEFUN_ONCE([FLAGS_POST_TOOLCHAIN],
@@ -395,6 +368,9 @@ AC_DEFUN_ONCE([FLAGS_POST_TOOLCHAIN],
       BUILD_SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS"
     fi
   fi
+  AC_SUBST(BUILD_SYSROOT_CFLAGS)
+  AC_SUBST(BUILD_SYSROOT_LDFLAGS)
+
 ])
 
 AC_DEFUN([FLAGS_SETUP_FLAGS],

make/autoconf/help.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 AC_DEFUN_ONCE([HELP_SETUP_DEPENDENCY_HELP],
 [
-  UTIL_LOOKUP_PROGS(PKGHANDLER, zypper apt-get yum brew port pkgutil pkgadd pacman)
+  AC_CHECK_PROGS(PKGHANDLER, zypper apt-get yum brew port pkgutil pkgadd)
 ])
 
 AC_DEFUN([HELP_MSG_MISSING_DEPENDENCY],
@@ -38,26 +38,26 @@ AC_DEFUN([HELP_MSG_MISSING_DEPENDENCY],
     HELP_MSG="OpenJDK distributions are available at http://jdk.java.net/."
   elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
     cygwin_help $MISSING_DEPENDENCY
+  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+    msys_help $MISSING_DEPENDENCY
   else
     PKGHANDLER_COMMAND=
 
     case $PKGHANDLER in
-      *apt-get)
+      apt-get)
         apt_help     $MISSING_DEPENDENCY ;;
-      *yum)
+      yum)
         yum_help     $MISSING_DEPENDENCY ;;
-      *brew)
+      brew)
         brew_help    $MISSING_DEPENDENCY ;;
-      *port)
+      port)
         port_help    $MISSING_DEPENDENCY ;;
-      *pkgutil)
+      pkgutil)
         pkgutil_help $MISSING_DEPENDENCY ;;
-      *pkgadd)
+      pkgadd)
         pkgadd_help  $MISSING_DEPENDENCY ;;
-      *zypper)
+      zypper)
         zypper_help  $MISSING_DEPENDENCY ;;
-      *pacman)
-        pacman_help  $MISSING_DEPENDENCY ;;
     esac
 
     if test "x$PKGHANDLER_COMMAND" != x; then
@@ -80,17 +80,13 @@ cygwin_help() {
       PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P make )"
       HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
       ;;
-    i686-w64-mingw32-gcc)
-      PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P gcc-core i686-w64-mingw32-gcc-core mingw64-i686-glib2.0 )"
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-      ;;
-    x86_64-w64-mingw32-gcc)
-      PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P gcc-core x86_64-w64-mingw32-gcc-core mingw64-x86_64-glib2.0 )"
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-      ;;
   esac
 }
 
+msys_help() {
+  PKGHANDLER_COMMAND=""
+}
+
 apt_help() {
   case $1 in
     reduced)
@@ -105,8 +101,6 @@ apt_help() {
       PKGHANDLER_COMMAND="sudo apt-get install libfontconfig1-dev" ;;
     freetype)
       PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
-    harfbuzz)
-      PKGHANDLER_COMMAND="sudo apt-get install libharfbuzz-dev" ;;
     ffi)
       PKGHANDLER_COMMAND="sudo apt-get install libffi-dev" ;;
     x11)
@@ -130,8 +124,6 @@ zypper_help() {
       PKGHANDLER_COMMAND="sudo zypper install fontconfig-devel" ;;
     freetype)
       PKGHANDLER_COMMAND="sudo zypper install freetype-devel" ;;
-    harfbuzz)
-      PKGHANDLER_COMMAND="sudo zypper install harfbuzz-devel" ;;
     x11)
       PKGHANDLER_COMMAND="sudo zypper install libX11-devel libXext-devel libXrender-devel libXrandr-devel libXtst-devel libXt-devel libXi-devel" ;;
     ccache)
@@ -151,8 +143,6 @@ yum_help() {
       PKGHANDLER_COMMAND="sudo yum install fontconfig-devel" ;;
     freetype)
       PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
-    harfbuzz)
-      PKGHANDLER_COMMAND="sudo yum install harfbuzz-devel" ;;
     x11)
       PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXrandr-devel libXi-devel" ;;
     ccache)
@@ -169,17 +159,6 @@ brew_help() {
   esac
 }
 
-pacman_help() {
-  case $1 in
-    unzip)
-      PKGHANDLER_COMMAND="sudo pacman -S unzip" ;;
-    zip)
-      PKGHANDLER_COMMAND="sudo pacman -S zip" ;;
-    make)
-      PKGHANDLER_COMMAND="sudo pacman -S make" ;;
-  esac
-}
-
 port_help() {
   PKGHANDLER_COMMAND=""
 }
@@ -253,7 +232,6 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
 
   printf "\n"
   printf "Configuration summary:\n"
-  printf "* Name:           $CONF_NAME\n"
   printf "* Debug level:    $DEBUG_LEVEL\n"
   printf "* HS debug level: $HOTSPOT_DEBUG_LEVEL\n"
   printf "* JVM variants:   $JVM_VARIANTS\n"
@@ -272,17 +250,20 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
   printf "\n"
   printf "Tools summary:\n"
   if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
-    printf "* Environment:    %s version %s; windows version %s; prefix \"%s\"; root \"%s\"\n" \
-        "$WINENV_VENDOR" "$WINENV_VERSION" "$WINDOWS_VERSION" "$WINENV_PREFIX" "$WINENV_ROOT"
+    printf "* Environment:    $WINDOWS_ENV_VENDOR version $WINDOWS_ENV_VERSION. Windows version $WINDOWS_VERSION"
+    if test "x$WINDOWS_ENV_ROOT_PATH" != "x"; then
+      printf ". Root at $WINDOWS_ENV_ROOT_PATH"
+    fi
+    printf "\n"
   fi
   printf "* Boot JDK:       $BOOT_JDK_VERSION (at $BOOT_JDK)\n"
   printf "* Toolchain:      $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION)\n"
-  printf "* C Compiler:     Version $CC_VERSION_NUMBER (at ${CC#"$FIXPATH "})\n"
-  printf "* C++ Compiler:   Version $CXX_VERSION_NUMBER (at ${CXX#"$FIXPATH "})\n"
+  printf "* C Compiler:     Version $CC_VERSION_NUMBER (at $CC)\n"
+  printf "* C++ Compiler:   Version $CXX_VERSION_NUMBER (at $CXX)\n"
 
   printf "\n"
   printf "Build performance summary:\n"
-  printf "* Build jobs:     $JOBS\n"
+  printf "* Cores to use:   $JOBS\n"
   printf "* Memory limit:   $MEMORY_SIZE MB\n"
   if test "x$CCACHE_STATUS" != "x"; then
     printf "* ccache status:  $CCACHE_STATUS\n"

make/autoconf/hotspot.m4

@@ -83,10 +83,19 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS],
     AC_MSG_ERROR([Cannot continue])
   fi
 
+  # All "special" variants share the same output directory ("server")
+  VALID_MULTIPLE_JVM_VARIANTS="server client minimal"
+  UTIL_GET_NON_MATCHING_VALUES(INVALID_MULTIPLE_VARIANTS, $JVM_VARIANTS, \
+      $VALID_MULTIPLE_JVM_VARIANTS)
+  if  test "x$INVALID_MULTIPLE_VARIANTS" != x && \
+      test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = xtrue; then
+    AC_MSG_ERROR([You can only build multiple variants using these variants: '$VALID_MULTIPLE_JVM_VARIANTS'])
+  fi
+
   # The "main" variant is the one used by other libs to link against during the
   # build.
   if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xtrue"; then
-    MAIN_VARIANT_PRIO_ORDER="server client minimal zero"
+    MAIN_VARIANT_PRIO_ORDER="server client minimal"
     for variant in $MAIN_VARIANT_PRIO_ORDER; do
       if HOTSPOT_CHECK_JVM_VARIANT($variant); then
         JVM_VARIANT_MAIN="$variant"

make/autoconf/jdk-options.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -169,23 +169,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   fi
   AC_SUBST(CACERTS_FILE)
 
-  # Choose cacerts source folder for user provided PEM files
-  AC_ARG_WITH(cacerts-src, [AS_HELP_STRING([--with-cacerts-src],
-      [specify alternative cacerts source folder containing certificates])])
-  CACERTS_SRC=""
-  AC_MSG_CHECKING([for cacerts source])
-  if test "x$with_cacerts_src" == x; then
-    AC_MSG_RESULT([default])
-  else
-    CACERTS_SRC=$with_cacerts_src
-    if test ! -d "$CACERTS_SRC"; then
-      AC_MSG_RESULT([fail])
-      AC_MSG_ERROR([Specified cacerts source folder "$CACERTS_SRC" does not exist])
-    fi
-    AC_MSG_RESULT([$CACERTS_SRC])
-  fi
-  AC_SUBST(CACERTS_SRC)
-
   # Enable or disable unlimited crypto
   UTIL_ARG_ENABLE(NAME: unlimited-crypto, DEFAULT: true, RESULT: UNLIMITED_CRYPTO,
       DESC: [enable unlimited crypto policy])
@@ -216,12 +199,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
     AC_MSG_ERROR([Copyright year must have a value])
   elif test "x$with_copyright_year" != x; then
     COPYRIGHT_YEAR="$with_copyright_year"
-  elif test "x$SOURCE_DATE_EPOCH" != x; then
-    if test "x$IS_GNU_DATE" = xyes; then
-      COPYRIGHT_YEAR=`date --date=@$SOURCE_DATE_EPOCH +%Y`
-    else
-      COPYRIGHT_YEAR=`date -j -f %s $SOURCE_DATE_EPOCH +%Y`
-    fi
   else
     COPYRIGHT_YEAR=`$DATE +'%Y'`
   fi
@@ -251,6 +228,23 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
 ])
 
 ###############################################################################
+#
+# Enable or disable the elliptic curve crypto implementation
+#
+AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
+[
+  AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
+
+  if test -d "${TOPDIR}/src/jdk.crypto.ec/share/native/libsunec/impl"; then
+    ENABLE_INTREE_EC=true
+    AC_MSG_RESULT([yes])
+  else
+    ENABLE_INTREE_EC=false
+    AC_MSG_RESULT([no])
+  fi
+
+  AC_SUBST(ENABLE_INTREE_EC)
+])
 
 AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
 [
@@ -263,7 +257,11 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
       [AS_HELP_STRING([--with-native-debug-symbols],
       [set the native debug symbol configuration (none, internal, external, zipped) @<:@varying@:>@])],
       [
-        if test "x$OPENJDK_TARGET_OS" = xwindows; then
+        if test "x$OPENJDK_TARGET_OS" = xaix; then
+          if test "x$withval" = xexternal || test "x$withval" = xzipped; then
+            AC_MSG_ERROR([AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols])
+          fi
+        elif test "x$OPENJDK_TARGET_OS" = xwindows; then
           if test "x$withval" = xinternal; then
             AC_MSG_ERROR([Windows does not support the parameter 'internal' for --with-native-debug-symbols])
           fi
@@ -273,7 +271,12 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
         if test "x$STATIC_BUILD" = xtrue; then
           with_native_debug_symbols="none"
         else
-          with_native_debug_symbols="external"
+          if test "x$OPENJDK_TARGET_OS" = xaix; then
+            # AIX doesn't support 'external' so use 'internal' as default
+            with_native_debug_symbols="internal"
+          else
+            with_native_debug_symbols="external"
+          fi
         fi
       ])
   AC_MSG_RESULT([$with_native_debug_symbols])
@@ -402,9 +405,9 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_CODE_COVERAGE],
     UTIL_FIXUP_PATH(JCOV_HOME)
     if test "x$with_jcov_input_jdk" != "x" ; then
       JCOV_INPUT_JDK="$with_jcov_input_jdk"
-      if test ! -f "$JCOV_INPUT_JDK/bin/java" && test ! -f "$JCOV_INPUT_JDK/bin/java.exe"; then
+      if test ! -f "$JCOV_INPUT_JDK/bin/java$EXE_SUFFIX"; then
         AC_MSG_RESULT([fail])
-        AC_MSG_ERROR([Invalid JDK bundle: "$JCOV_INPUT_JDK/bin/java" does not exist])
+        AC_MSG_ERROR([Invalid JDK bundle: "$JCOV_INPUT_JDK/bin/java$EXE_SUFFIX" does not exist])
       fi
       UTIL_FIXUP_PATH(JCOV_INPUT_JDK)
     fi
@@ -437,10 +440,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
         fi
       ],
       IF_ENABLED: [
-        # ASan is simply incompatible with gcc -Wstringop-truncation. See
-        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85650
-        # It's harmless to be suppressed in clang as well.
-        ASAN_CFLAGS="-fsanitize=address -Wno-stringop-truncation -fno-omit-frame-pointer"
+        ASAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
         ASAN_LDFLAGS="-fsanitize=address"
         JVM_CFLAGS="$JVM_CFLAGS $ASAN_CFLAGS"
         JVM_LDFLAGS="$JVM_LDFLAGS $ASAN_LDFLAGS"
@@ -599,30 +599,6 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE],
   AC_SUBST(BUILD_CDS_ARCHIVE)
 ])
 
-################################################################################
-#
-# Enable the alternative CDS core region alignment
-#
-AC_DEFUN([JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT],
-[
-  UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: false,
-      RESULT: ENABLE_COMPATIBLE_CDS_ALIGNMENT,
-      DESC: [enable use alternative compatible cds core region alignment],
-      DEFAULT_DESC: [disabled],
-      CHECKING_MSG: [if compatible cds region alignment enabled],
-      CHECK_AVAILABLE: [
-        AC_MSG_CHECKING([if CDS archive is available])
-        if test "x$ENABLE_CDS" = "xfalse"; then
-          AVAILABLE=false
-          AC_MSG_RESULT([no (CDS is disabled)])
-        else
-          AVAILABLE=true
-          AC_MSG_RESULT([yes])
-        fi
-      ])
-  AC_SUBST(ENABLE_COMPATIBLE_CDS_ALIGNMENT)
-])
-
 ################################################################################
 #
 # Disallow any output from containing absolute paths from the build system.
@@ -678,7 +654,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_REPRODUCIBLE_BUILD],
     SOURCE_DATE=$($DATE +"%s")
     AC_MSG_RESULT([$SOURCE_DATE, from 'current'])
   elif test "x$with_source_date" = xversion; then
-    # Use the date from version-numbers.conf
+    # Use the date from version-numbers
     UTIL_GET_EPOCH_TIMESTAMP(SOURCE_DATE, $DEFAULT_VERSION_DATE)
     if test "x$SOURCE_DATE" = x; then
       AC_MSG_RESULT([unavailable])
@@ -702,197 +678,11 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_REPRODUCIBLE_BUILD],
     fi
   fi
 
-  REPRODUCIBLE_BUILD_DEFAULT=$with_source_date_present
-
-  if test "x$OPENJDK_BUILD_OS" = xwindows && \
-      test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = xfalse; then
-    # To support banning absolute paths on Windows, we must use the -pathmap
-    # method, which requires reproducible builds.
-    REPRODUCIBLE_BUILD_DEFAULT=true
-  fi
-
-  UTIL_ARG_ENABLE(NAME: reproducible-build, DEFAULT: $REPRODUCIBLE_BUILD_DEFAULT,
+  UTIL_ARG_ENABLE(NAME: reproducible-build, DEFAULT: $with_source_date_present,
       RESULT: ENABLE_REPRODUCIBLE_BUILD,
       DESC: [enable reproducible builds (not yet fully functional)],
-      DEFAULT_DESC: [enabled if --with-source-date is given or on Windows without absolute paths])
-
-  if test "x$OPENJDK_BUILD_OS" = xwindows && \
-      test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = xfalse && \
-      test "x$ENABLE_REPRODUCIBLE_BUILD" = xfalse; then
-    AC_MSG_NOTICE([On Windows it is not possible to combine  --disable-reproducible-build])
-    AC_MSG_NOTICE([with --disable-absolute-paths-in-output.])
-    AC_MSG_ERROR([Cannot continue])
-  fi
+      DEFAULT_DESC: [enabled if --with-source-date is given])
 
   AC_SUBST(SOURCE_DATE)
   AC_SUBST(ENABLE_REPRODUCIBLE_BUILD)
 ])
-
-################################################################################
-#
-# Helper function to build binutils from source.
-#
-AC_DEFUN([JDKOPT_BUILD_BINUTILS],
-[
-  BINUTILS_SRC="$with_binutils_src"
-  UTIL_FIXUP_PATH(BINUTILS_SRC)
-
-  if ! test -d $BINUTILS_SRC; then
-    AC_MSG_ERROR([--with-binutils-src is not pointing to a directory])
-  fi
-  if ! test -x $BINUTILS_SRC/configure; then
-    AC_MSG_ERROR([--with-binutils-src does not look like a binutils source directory])
-  fi
-
-  if test -e $BINUTILS_SRC/bfd/libbfd.a && \
-      test -e $BINUTILS_SRC/opcodes/libopcodes.a && \
-      test -e $BINUTILS_SRC/libiberty/libiberty.a && \
-      test -e $BINUTILS_SRC/zlib/libz.a; then
-    AC_MSG_NOTICE([Found binutils binaries in binutils source directory -- not building])
-  else
-    # On Windows, we cannot build with the normal Microsoft CL, but must instead use
-    # a separate mingw toolchain.
-    if test "x$OPENJDK_BUILD_OS" = xwindows; then
-      if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
-        target_base="i686-w64-mingw32"
-      else
-        target_base="$OPENJDK_TARGET_CPU-w64-mingw32"
-      fi
-      binutils_cc="$target_base-gcc"
-      binutils_target="--host=$target_base --target=$target_base"
-      # Somehow the uint typedef is not included when building with mingw
-      binutils_cflags="-Duint=unsigned"
-      compiler_version=`$binutils_cc --version 2>&1`
-      if ! [ [[ "$compiler_version" =~ GCC ]] ]; then
-        AC_MSG_NOTICE([Could not find correct mingw compiler $binutils_cc.])
-        HELP_MSG_MISSING_DEPENDENCY([$binutils_cc])
-        AC_MSG_ERROR([Cannot continue. $HELP_MSG])
-      else
-        AC_MSG_NOTICE([Using compiler $binutils_cc with version $compiler_version])
-      fi
-    elif test "x$OPENJDK_BUILD_OS" = xmacosx; then
-      if test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
-        binutils_target="--enable-targets=aarch64-darwin"
-      else
-        binutils_target=""
-      fi
-    else
-      binutils_cc="$CC $SYSROOT_CFLAGS"
-      binutils_target=""
-    fi
-    binutils_cflags="$binutils_cflags $MACHINE_FLAG $JVM_PICFLAG $C_O_FLAG_NORM"
-
-    AC_MSG_NOTICE([Running binutils configure])
-    AC_MSG_NOTICE([configure command line: ./configure --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" $binutils_target])
-    saved_dir=`pwd`
-    cd "$BINUTILS_SRC"
-    ./configure --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" $binutils_target
-    if test $? -ne 0 || ! test -e $BINUTILS_SRC/Makefile; then
-      AC_MSG_NOTICE([Automatic building of binutils failed on configure. Try building it manually])
-      AC_MSG_ERROR([Cannot continue])
-    fi
-    AC_MSG_NOTICE([Running binutils make])
-    $MAKE all-opcodes
-    if test $? -ne 0; then
-      AC_MSG_NOTICE([Automatic building of binutils failed on make. Try building it manually])
-      AC_MSG_ERROR([Cannot continue])
-    fi
-    cd $saved_dir
-    AC_MSG_NOTICE([Building of binutils done])
-  fi
-
-  BINUTILS_DIR="$BINUTILS_SRC"
-])
-
-################################################################################
-#
-# Determine if hsdis should be built, and if so, with which backend.
-#
-AC_DEFUN_ONCE([JDKOPT_SETUP_HSDIS],
-[
-  AC_ARG_WITH([hsdis], [AS_HELP_STRING([--with-hsdis],
-      [what hsdis backend to use ('none', 'binutils') @<:@none@:>@])])
-
-  AC_ARG_WITH([binutils], [AS_HELP_STRING([--with-binutils],
-      [where to find the binutils files needed for hsdis/binutils])])
-
-  AC_ARG_WITH([binutils-src], [AS_HELP_STRING([--with-binutils-src],
-      [where to find the binutils source for building])])
-
-  AC_MSG_CHECKING([what hsdis backend to use])
-
-  if test "x$with_hsdis" = xyes; then
-    AC_MSG_ERROR([--with-hsdis must have a value])
-  elif test "x$with_hsdis" = xnone || test "x$with_hsdis" = xno || test "x$with_hsdis" = x; then
-    HSDIS_BACKEND=none
-    AC_MSG_RESULT(['none', hsdis will not be built])
-  elif test "x$with_hsdis" = xbinutils; then
-    HSDIS_BACKEND=binutils
-    AC_MSG_RESULT(['binutils'])
-
-    # We need the binutils static libs and includes.
-    if test "x$with_binutils_src" != x; then
-      # Try building the source first. If it succeeds, it sets $BINUTILS_DIR.
-      JDKOPT_BUILD_BINUTILS
-    fi
-
-    if test "x$with_binutils" != x; then
-      BINUTILS_DIR="$with_binutils"
-    fi
-
-    binutils_system_error=""
-    HSDIS_LIBS=""
-    if test "x$BINUTILS_DIR" = xsystem; then
-      AC_CHECK_LIB(bfd, bfd_openr, [ HSDIS_LIBS="-lbfd" ], [ binutils_system_error="libbfd not found" ])
-      AC_CHECK_LIB(opcodes, disassembler, [ HSDIS_LIBS="$HSDIS_LIBS -lopcodes" ], [ binutils_system_error="libopcodes not found" ])
-      AC_CHECK_LIB(iberty, xmalloc, [ HSDIS_LIBS="$HSDIS_LIBS -liberty" ], [ binutils_system_error="libiberty not found" ])
-      AC_CHECK_LIB(z, deflate, [ HSDIS_LIBS="$HSDIS_LIBS -lz" ], [ binutils_system_error="libz not found" ])
-    elif test "x$BINUTILS_DIR" != x; then
-      if test -e $BINUTILS_DIR/bfd/libbfd.a && \
-          test -e $BINUTILS_DIR/opcodes/libopcodes.a && \
-          test -e $BINUTILS_DIR/libiberty/libiberty.a; then
-        HSDIS_CFLAGS="-I$BINUTILS_DIR/include -I$BINUTILS_DIR/bfd -DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB"
-        HSDIS_LIBS="$BINUTILS_DIR/bfd/libbfd.a $BINUTILS_DIR/opcodes/libopcodes.a $BINUTILS_DIR/libiberty/libiberty.a $BINUTILS_DIR/zlib/libz.a"
-      fi
-    fi
-
-    AC_MSG_CHECKING([for binutils to use with hsdis])
-    case "x$BINUTILS_DIR" in
-      xsystem)
-        if test "x$OPENJDK_TARGET_OS" != xlinux; then
-          AC_MSG_RESULT([invalid])
-          AC_MSG_ERROR([binutils on system is supported for Linux only])
-        elif test "x$binutils_system_error" = x; then
-          AC_MSG_RESULT([system])
-          HSDIS_CFLAGS="-DSYSTEM_BINUTILS"
-        else
-          AC_MSG_RESULT([invalid])
-          AC_MSG_ERROR([$binutils_system_error])
-        fi
-        ;;
-      x)
-        AC_MSG_RESULT([missing])
-        AC_MSG_NOTICE([--with-hsdis=binutils requires specifying a binutils installation.])
-        AC_MSG_NOTICE([Download binutils from https://www.gnu.org/software/binutils and unpack it,])
-        AC_MSG_NOTICE([and point --with-binutils-src to the resulting directory, or use])
-        AC_MSG_NOTICE([--with-binutils to point to a pre-built binutils installation.])
-        AC_MSG_ERROR([Cannot continue])
-        ;;
-      *)
-        if test "x$HSDIS_LIBS" != x; then
-          AC_MSG_RESULT([$BINUTILS_DIR])
-        else
-          AC_MSG_RESULT([invalid])
-          AC_MSG_ERROR([$BINUTILS_DIR does not contain a proper binutils installation])
-        fi
-        ;;
-    esac
-  else
-    AC_MSG_RESULT([invalid])
-    AC_MSG_ERROR([Incorrect hsdis backend "$with_hsdis"])
-  fi
-
-  AC_SUBST(HSDIS_BACKEND)
-  AC_SUBST(HSDIS_CFLAGS)
-  AC_SUBST(HSDIS_LIBS)
-])

make/autoconf/jdk-version.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -58,9 +58,7 @@ AC_DEFUN([JDKVER_CHECK_AND_SET_NUMBER],
 AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
 [
   # Source the version numbers file
-  . $TOPDIR/make/conf/version-numbers.conf
-  # Source the branding file
-  . $TOPDIR/make/conf/branding.conf
+  . $AUTOCONF_DIR/version-numbers
 
   # Some non-version number information is set in that file
   AC_SUBST(LAUNCHER_NAME)
@@ -69,16 +67,33 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   AC_SUBST(JDK_RC_PLATFORM_NAME)
   AC_SUBST(HOTSPOT_VM_DISTRO)
 
-  # Setup username (for use in adhoc version strings etc)
-  AC_ARG_WITH([build-user], [AS_HELP_STRING([--with-build-user],
-      [build username to use in version strings])])
-  if test "x$with_build_user" != x; then
-    USERNAME="$with_build_user"
-  else
-    # Outer [ ] to quote m4.
-    [ USERNAME=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` ]
+  # Set the MACOSX Bundle Name base
+  AC_ARG_WITH(macosx-bundle-name-base, [AS_HELP_STRING([--with-macosx-bundle-name-base],
+      [Set the MacOSX Bundle Name base. This is the base name for calculating MacOSX Bundle Names.
+      @<:@not specified@:>@])])
+  if test "x$with_macosx_bundle_name_base" = xyes; then
+    AC_MSG_ERROR([--with-macosx-bundle-name-base must have a value])
+  elif [ ! [[ $with_macosx_bundle_name_base =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-macosx-bundle-name-base contains non-printing characters: $with_macosx_bundle_name_base])
+  elif test "x$with_macosx_bundle_name_base" != x; then
+    # Set MACOSX_BUNDLE_NAME_BASE to the configured value.
+    MACOSX_BUNDLE_NAME_BASE="$with_macosx_bundle_name_base"
   fi
-  AC_SUBST(USERNAME)
+  AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
+
+  # Set the MACOSX Bundle ID base
+  AC_ARG_WITH(macosx-bundle-id-base, [AS_HELP_STRING([--with-macosx-bundle-id-base],
+      [Set the MacOSX Bundle ID base. This is the base ID for calculating MacOSX Bundle IDs.
+      @<:@not specified@:>@])])
+  if test "x$with_macosx_bundle_id_base" = xyes; then
+    AC_MSG_ERROR([--with-macosx-bundle-id-base must have a value])
+  elif [ ! [[ $with_macosx_bundle_id_base =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-macosx-bundle-id-base contains non-printing characters: $with_macosx_bundle_id_base])
+  elif test "x$with_macosx_bundle_id_base" != x; then
+    # Set MACOSX_BUNDLE_ID_BASE to the configured value.
+    MACOSX_BUNDLE_ID_BASE="$with_macosx_bundle_id_base"
+  fi
+  AC_SUBST(MACOSX_BUNDLE_ID_BASE)
 
   # Set the JDK RC name
   AC_ARG_WITH(jdk-rc-name, [AS_HELP_STRING([--with-jdk-rc-name],
@@ -92,7 +107,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     # Set JDK_RC_NAME to a custom value if '--with-jdk-rc-name' was used and is not empty.
     JDK_RC_NAME="$with_jdk_rc_name"
   else
-    # Otherwise calculate from "branding.conf" included above.
+    # Otherwise calculate from "version-numbers" included above.
     JDK_RC_NAME="$PRODUCT_NAME $JDK_RC_PLATFORM_NAME"
   fi
   AC_SUBST(JDK_RC_NAME)
@@ -107,7 +122,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-vendor-name contains non-printing characters: $with_vendor_name])
   elif test "x$with_vendor_name" != x; then
     # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty.
-    # Otherwise we will use the value from "branding.conf" included above.
+    # Otherwise we will use the value from "version-numbers" included above.
     COMPANY_NAME="$with_vendor_name"
   fi
   AC_SUBST(COMPANY_NAME)
@@ -121,7 +136,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
   elif test "x$with_vendor_url" != x; then
     # Only set VENDOR_URL if '--with-vendor-url' was used and is not empty.
-    # Otherwise we will use the value from "branding.conf" included above.
+    # Otherwise we will use the value from "version-numbers" included above.
     VENDOR_URL="$with_vendor_url"
   fi
   AC_SUBST(VENDOR_URL)
@@ -135,7 +150,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
   elif test "x$with_vendor_bug_url" != x; then
     # Only set VENDOR_URL_BUG if '--with-vendor-bug-url' was used and is not empty.
-    # Otherwise we will use the value from "branding.conf" included above.
+    # Otherwise we will use the value from "version-numbers" included above.
     VENDOR_URL_BUG="$with_vendor_bug_url"
   fi
   AC_SUBST(VENDOR_URL_BUG)
@@ -149,7 +164,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url])
   elif test "x$with_vendor_vm_bug_url" != x; then
     # Only set VENDOR_URL_VM_BUG if '--with-vendor-vm-bug-url' was used and is not empty.
-    # Otherwise we will use the value from "branding.conf" included above.
+    # Otherwise we will use the value from "version-numbers" included above.
     VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
   fi
   AC_SUBST(VENDOR_URL_VM_BUG)
@@ -293,7 +308,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     fi
   else
     if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
-      # Default is to get value from version-numbers.conf
+      # Default is to get value from version-numbers
       VERSION_FEATURE="$DEFAULT_VERSION_FEATURE"
     fi
   fi
@@ -487,64 +502,9 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     VENDOR_VERSION_STRING="$with_vendor_version_string"
   fi
 
-  # Set the MACOSX Bundle Name base
-  AC_ARG_WITH(macosx-bundle-name-base, [AS_HELP_STRING([--with-macosx-bundle-name-base],
-      [Set the MacOSX Bundle Name base. This is the base name for calculating MacOSX Bundle Names.
-      @<:@not specified@:>@])])
-  if test "x$with_macosx_bundle_name_base" = xyes; then
-    AC_MSG_ERROR([--with-macosx-bundle-name-base must have a value])
-  elif [ ! [[ $with_macosx_bundle_name_base =~ ^[[:print:]]*$ ]] ]; then
-    AC_MSG_ERROR([--with-macosx-bundle-name-base contains non-printing characters: $with_macosx_bundle_name_base])
-  elif test "x$with_macosx_bundle_name_base" != x; then
-    # Set MACOSX_BUNDLE_NAME_BASE to the configured value.
-    MACOSX_BUNDLE_NAME_BASE="$with_macosx_bundle_name_base"
-  fi
-  AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
-
-  # Set the MACOSX Bundle ID base
-  AC_ARG_WITH(macosx-bundle-id-base, [AS_HELP_STRING([--with-macosx-bundle-id-base],
-      [Set the MacOSX Bundle ID base. This is the base ID for calculating MacOSX Bundle IDs.
-      @<:@not specified@:>@])])
-  if test "x$with_macosx_bundle_id_base" = xyes; then
-    AC_MSG_ERROR([--with-macosx-bundle-id-base must have a value])
-  elif [ ! [[ $with_macosx_bundle_id_base =~ ^[[:print:]]*$ ]] ]; then
-    AC_MSG_ERROR([--with-macosx-bundle-id-base contains non-printing characters: $with_macosx_bundle_id_base])
-  elif test "x$with_macosx_bundle_id_base" != x; then
-    # Set MACOSX_BUNDLE_ID_BASE to the configured value.
-    MACOSX_BUNDLE_ID_BASE="$with_macosx_bundle_id_base"
-  else
-    # If using the default value, append the VERSION_PRE if there is one
-    # to make it possible to tell official builds apart from developer builds
-    if test "x$VERSION_PRE" != x; then
-      MACOSX_BUNDLE_ID_BASE="$MACOSX_BUNDLE_ID_BASE-$VERSION_PRE"
-    fi
-  fi
-  AC_SUBST(MACOSX_BUNDLE_ID_BASE)
-
-  # Set the MACOSX CFBundleVersion field
-  AC_ARG_WITH(macosx-bundle-build-version, [AS_HELP_STRING([--with-macosx-bundle-build-version],
-      [Set the MacOSX Bundle CFBundleVersion field. This key is a machine-readable
-      string composed of one to three period-separated integers and should represent the
-      build version. Defaults to the build number.])])
-  if test "x$with_macosx_bundle_build_version" = xyes; then
-    AC_MSG_ERROR([--with-macosx-bundle-build-version must have a value])
-  elif [ ! [[ $with_macosx_bundle_build_version =~ ^[0-9\.]*$ ]] ]; then
-    AC_MSG_ERROR([--with-macosx-bundle-build-version contains non numbers and periods: $with_macosx_bundle_build_version])
-  elif test "x$with_macosx_bundle_build_version" != x; then
-    MACOSX_BUNDLE_BUILD_VERSION="$with_macosx_bundle_build_version"
-  else
-    MACOSX_BUNDLE_BUILD_VERSION="$VERSION_BUILD"
-    # If VERSION_OPT consists of only numbers and periods, add it.
-    if [ [[ $VERSION_OPT =~ ^[0-9\.]+$ ]] ]; then
-      MACOSX_BUNDLE_BUILD_VERSION="$MACOSX_BUNDLE_BUILD_VERSION.$VERSION_OPT"
-    fi
-  fi
-  AC_SUBST(MACOSX_BUNDLE_BUILD_VERSION)
-
   # We could define --with flags for these, if really needed
   VERSION_CLASSFILE_MAJOR="$DEFAULT_VERSION_CLASSFILE_MAJOR"
   VERSION_CLASSFILE_MINOR="$DEFAULT_VERSION_CLASSFILE_MINOR"
-  VERSION_DOCS_API_SINCE="$DEFAULT_VERSION_DOCS_API_SINCE"
   JDK_SOURCE_TARGET_VERSION="$DEFAULT_JDK_SOURCE_TARGET_VERSION"
 
   AC_MSG_CHECKING([for version string])
@@ -569,6 +529,5 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   AC_SUBST(VENDOR_VERSION_STRING)
   AC_SUBST(VERSION_CLASSFILE_MAJOR)
   AC_SUBST(VERSION_CLASSFILE_MINOR)
-  AC_SUBST(VERSION_DOCS_API_SINCE)
   AC_SUBST(JDK_SOURCE_TARGET_VERSION)
 ])

make/autoconf/jvm-features.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
 m4_define(jvm_features_valid, m4_normalize( \
     ifdef([custom_jvm_features_valid], custom_jvm_features_valid) \
     \
-    cds compiler1 compiler2 dtrace epsilongc g1gc jfr jni-check \
+    aot cds compiler1 compiler2 dtrace epsilongc g1gc graal jfr jni-check \
     jvmci jvmti link-time-opt management minimal nmt opt-size parallelgc \
     serialgc services shenandoahgc static-build vm-structs zero zgc \
 ))
@@ -55,12 +55,14 @@ m4_define(jvm_features_deprecated, m4_normalize(
 ))
 
 # Feature descriptions
+m4_define(jvm_feature_desc_aot, [enable ahead of time compilation (AOT)])
 m4_define(jvm_feature_desc_cds, [enable class data sharing (CDS)])
 m4_define(jvm_feature_desc_compiler1, [enable hotspot compiler C1])
 m4_define(jvm_feature_desc_compiler2, [enable hotspot compiler C2])
 m4_define(jvm_feature_desc_dtrace, [enable dtrace support])
 m4_define(jvm_feature_desc_epsilongc, [include the epsilon (no-op) garbage collector])
 m4_define(jvm_feature_desc_g1gc, [include the G1 garbage collector])
+m4_define(jvm_feature_desc_graal, [enable Graal (jdk.internal.vm.compiler)])
 m4_define(jvm_feature_desc_jfr, [enable JDK Flight Recorder (JFR)])
 m4_define(jvm_feature_desc_jni_check, [enable -Xcheck:jni support])
 m4_define(jvm_feature_desc_jvmci, [enable JVM Compiler Interface (JVMCI)])
@@ -92,6 +94,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_PARSE_OPTIONS],
 
   # For historical reasons, some jvm features have their own, shorter names.
   # Keep those as aliases for the --enable-jvm-feature-* style arguments.
+  UTIL_ALIASED_ARG_ENABLE(aot, --enable-jvm-feature-aot)
   UTIL_ALIASED_ARG_ENABLE(cds, --enable-jvm-feature-cds)
   UTIL_ALIASED_ARG_ENABLE(dtrace, --enable-jvm-feature-dtrace)
 
@@ -156,7 +159,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_PARSE_OPTIONS],
   # Likewise, check for deprecated arguments.
   m4_foreach(FEATURE, m4_split(jvm_features_deprecated), [
     AC_ARG_ENABLE(jvm-feature-FEATURE, AS_HELP_STRING(
-        [--enable-jvm-feature-FEATURE],
+        [--enable-jvm-feature-FEATURE], 
         [Deprecated. Option is kept for backwards compatibility and is ignored]))
 
     m4_define(FEATURE_SHELL, [enable_jvm_feature_]m4_translit(FEATURE, -, _))
@@ -226,6 +229,33 @@ AC_DEFUN([JVM_FEATURES_CHECK_AVAILABILITY],
   fi
 ])
 
+###############################################################################
+# Check if the feature 'aot' is available on this platform.
+#
+AC_DEFUN_ONCE([JVM_FEATURES_CHECK_AOT],
+[
+  JVM_FEATURES_CHECK_AVAILABILITY(aot, [
+    AC_MSG_CHECKING([if platform is supported by AOT])
+    # AOT is only available where JVMCI is available since it requires JVMCI.
+    if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
+        test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU])
+      AVAILABLE=false
+    fi
+
+    AC_MSG_CHECKING([if AOT source code is present])
+    if test -e "${TOPDIR}/src/jdk.internal.vm.compiler" && \
+        test -e "${TOPDIR}/src/jdk.aot"; then
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no, missing src/jdk.internal.vm.compiler or src/jdk.aot])
+      AVAILABLE=false
+    fi
+  ])
+])
+
 ###############################################################################
 # Check if the feature 'cds' is available on this platform.
 #
@@ -233,11 +263,11 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_CDS],
 [
   JVM_FEATURES_CHECK_AVAILABILITY(cds, [
     AC_MSG_CHECKING([if platform is supported by CDS])
-    if test "x$OPENJDK_TARGET_OS" = xaix; then
-      AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
-      AVAILABLE=false
-    else
+    if test "x$OPENJDK_TARGET_OS" != xaix; then
       AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no, $OPENJDK_TARGET_OS])
+      AVAILABLE=false
     fi
   ])
 ])
@@ -265,6 +295,24 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_DTRACE],
   ])
 ])
 
+###############################################################################
+# Check if the feature 'graal' is available on this platform.
+#
+AC_DEFUN_ONCE([JVM_FEATURES_CHECK_GRAAL],
+[
+  JVM_FEATURES_CHECK_AVAILABILITY(graal, [
+    AC_MSG_CHECKING([if platform is supported by Graal])
+    # Graal is only available where JVMCI is available since it requires JVMCI.
+    if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
+        test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU])
+      AVAILABLE=false
+    fi
+  ])
+])
+
 ###############################################################################
 # Check if the feature 'jfr' is available on this platform.
 #
@@ -288,9 +336,8 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_JVMCI],
 [
   JVM_FEATURES_CHECK_AVAILABILITY(jvmci, [
     AC_MSG_CHECKING([if platform is supported by JVMCI])
-    if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
-      AC_MSG_RESULT([yes])
-    elif test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+    if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
+        test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
       AC_MSG_RESULT([yes])
     else
       AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU])
@@ -307,8 +354,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_SHENANDOAHGC],
   JVM_FEATURES_CHECK_AVAILABILITY(shenandoahgc, [
     AC_MSG_CHECKING([if platform is supported by Shenandoah])
     if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || \
-        test "x$OPENJDK_TARGET_CPU" = "xaarch64" || \
-        test "x$OPENJDK_TARGET_CPU" = "xppc64le"; then
+        test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
       AC_MSG_RESULT([yes])
     else
       AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU])
@@ -349,22 +395,8 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_ZGC],
         AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
         AVAILABLE=false
       fi
-    elif test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
-      if test "x$OPENJDK_TARGET_OS" = "xlinux" || \
-          test "x$OPENJDK_TARGET_OS" = "xwindows" || \
-          test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-        AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
-        AVAILABLE=false
-      fi
-    elif test "x$OPENJDK_TARGET_CPU" = "xppc64le"; then
-      if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
-        AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
-        AVAILABLE=false
-      fi
+    elif test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-aarch64"; then
+      AC_MSG_RESULT([yes])
     else
       AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
       AVAILABLE=false
@@ -398,8 +430,10 @@ AC_DEFUN_ONCE([JVM_FEATURES_PREPARE_PLATFORM],
   # The checks below should add unavailable features to
   # JVM_FEATURES_PLATFORM_UNAVAILABLE.
 
+  JVM_FEATURES_CHECK_AOT
   JVM_FEATURES_CHECK_CDS
   JVM_FEATURES_CHECK_DTRACE
+  JVM_FEATURES_CHECK_GRAAL
   JVM_FEATURES_CHECK_JFR
   JVM_FEATURES_CHECK_JVMCI
   JVM_FEATURES_CHECK_SHENANDOAHGC
@@ -432,18 +466,18 @@ AC_DEFUN([JVM_FEATURES_PREPARE_VARIANT],
   elif test "x$variant" = "xcore"; then
     JVM_FEATURES_VARIANT_UNAVAILABLE="cds minimal zero"
   elif test "x$variant" = "xzero"; then
-    JVM_FEATURES_VARIANT_UNAVAILABLE="cds compiler1 compiler2 \
-        jvmci minimal zgc"
+    JVM_FEATURES_VARIANT_UNAVAILABLE="aot cds compiler1 compiler2 \
+        epsilongc g1gc graal jvmci minimal shenandoahgc zgc"
   else
     JVM_FEATURES_VARIANT_UNAVAILABLE="minimal zero"
   fi
 
   # Check which features should be off by default for this JVM variant.
   if test "x$variant" = "xclient"; then
-    JVM_FEATURES_VARIANT_FILTER="compiler2 jvmci link-time-opt opt-size"
+    JVM_FEATURES_VARIANT_FILTER="aot compiler2 graal jvmci link-time-opt opt-size"
   elif test "x$variant" = "xminimal"; then
-    JVM_FEATURES_VARIANT_FILTER="cds compiler2 dtrace epsilongc g1gc \
-        jfr jni-check jvmci jvmti management nmt parallelgc services \
+    JVM_FEATURES_VARIANT_FILTER="aot cds compiler2 dtrace epsilongc g1gc \
+        graal jfr jni-check jvmci jvmti management nmt parallelgc services \
         shenandoahgc vm-structs zgc"
     if test "x$OPENJDK_TARGET_CPU" = xarm ; then
       JVM_FEATURES_VARIANT_FILTER="$JVM_FEATURES_VARIANT_FILTER opt-size"
@@ -453,7 +487,7 @@ AC_DEFUN([JVM_FEATURES_PREPARE_VARIANT],
           link-time-opt"
     fi
   elif test "x$variant" = "xcore"; then
-    JVM_FEATURES_VARIANT_FILTER="compiler1 compiler2 jvmci \
+    JVM_FEATURES_VARIANT_FILTER="aot compiler1 compiler2 graal jvmci \
         link-time-opt opt-size"
   elif test "x$variant" = "xzero"; then
     JVM_FEATURES_VARIANT_FILTER="jfr link-time-opt opt-size"
@@ -529,6 +563,15 @@ AC_DEFUN([JVM_FEATURES_VERIFY],
 [
   variant=$1
 
+  # Verify that dependencies are met for inter-feature relations.
+  if JVM_FEATURES_IS_ACTIVE(aot) && ! JVM_FEATURES_IS_ACTIVE(graal); then
+    AC_MSG_ERROR([Specified JVM feature 'aot' requires feature 'graal' for variant '$variant'])
+  fi
+
+  if JVM_FEATURES_IS_ACTIVE(graal) && ! JVM_FEATURES_IS_ACTIVE(jvmci); then
+    AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci' for variant '$variant'])
+  fi
+
   if JVM_FEATURES_IS_ACTIVE(jvmci) && ! (JVM_FEATURES_IS_ACTIVE(compiler1) || \
       JVM_FEATURES_IS_ACTIVE(compiler2)); then
     AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1' for variant '$variant'])
@@ -544,15 +587,18 @@ AC_DEFUN([JVM_FEATURES_VERIFY],
 
   # For backwards compatibility, disable a feature "globally" if one variant
   # is missing the feature.
+  if ! JVM_FEATURES_IS_ACTIVE(aot); then
+    ENABLE_AOT="false"
+  fi
   if ! JVM_FEATURES_IS_ACTIVE(cds); then
     ENABLE_CDS="false"
   fi
+  if ! JVM_FEATURES_IS_ACTIVE(graal); then
+    INCLUDE_GRAAL="false"
+  fi
   if ! JVM_FEATURES_IS_ACTIVE(jvmci); then
     INCLUDE_JVMCI="false"
   fi
-  if JVM_FEATURES_IS_ACTIVE(compiler2); then
-    INCLUDE_COMPILER2="true"
-  fi
 
   # Verify that we have at least one gc selected (i.e., feature named "*gc").
   if ! JVM_FEATURES_IS_ACTIVE(.*gc); then
@@ -574,9 +620,10 @@ AC_DEFUN_ONCE([JVM_FEATURES_SETUP],
   # For backwards compatibility, tentatively enable these features "globally",
   # and disable them in JVM_FEATURES_VERIFY if a variant is found that are
   # missing any of them.
+  ENABLE_AOT="true"
   ENABLE_CDS="true"
+  INCLUDE_GRAAL="true"
   INCLUDE_JVMCI="true"
-  INCLUDE_COMPILER2="false"
 
   for variant in $JVM_VARIANTS; do
     # Figure out if any features are unavailable, or should be filtered out
@@ -612,7 +659,8 @@ AC_DEFUN_ONCE([JVM_FEATURES_SETUP],
   AC_SUBST(JVM_FEATURES_zero)
   AC_SUBST(JVM_FEATURES_custom)
 
+  AC_SUBST(ENABLE_AOT)
+  AC_SUBST(INCLUDE_GRAAL)
   AC_SUBST(INCLUDE_JVMCI)
-  AC_SUBST(INCLUDE_COMPILER2)
 
 ])

make/autoconf/lib-bundled.m4

@@ -40,7 +40,6 @@ AC_DEFUN_ONCE([LIB_SETUP_BUNDLED_LIBS],
   LIB_SETUP_LIBPNG
   LIB_SETUP_ZLIB
   LIB_SETUP_LCMS
-  LIB_SETUP_HARFBUZZ
 ])
 
 ################################################################################
@@ -264,43 +263,3 @@ AC_DEFUN_ONCE([LIB_SETUP_LCMS],
   AC_SUBST(LCMS_CFLAGS)
   AC_SUBST(LCMS_LIBS)
 ])
-
-################################################################################
-# Setup harfbuzz
-################################################################################
-AC_DEFUN_ONCE([LIB_SETUP_HARFBUZZ],
-[
-  AC_ARG_WITH(harfbuzz, [AS_HELP_STRING([--with-harfbuzz],
-      [use harfbuzz from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
-
-  AC_MSG_CHECKING([for which harfbuzz to use])
-
-  DEFAULT_HARFBUZZ=bundled
-  # If user didn't specify, use DEFAULT_HARFBUZZ
-  if test "x${with_harfbuzz}" = "x"; then
-    with_harfbuzz=${DEFAULT_HARFBUZZ}
-  fi
-
-  if test "x${with_harfbuzz}" = "xbundled"; then
-    USE_EXTERNAL_HARFBUZZ=false
-    HARFBUZZ_CFLAGS=""
-    HARFBUZZ_LIBS=""
-    AC_MSG_RESULT([bundled])
-  elif test "x${with_harfbuzz}" = "xsystem"; then
-    AC_MSG_RESULT([system])
-    PKG_CHECK_MODULES([HARFBUZZ], [harfbuzz], [HARFBUZZ_FOUND=yes], [HARFBUZZ_FOUND=no])
-    if test "x${HARFBUZZ_FOUND}" = "xyes"; then
-      # PKG_CHECK_MODULES will set HARFBUZZ_CFLAGS and HARFBUZZ_LIBS
-      USE_EXTERNAL_HARFBUZZ=true
-    else
-      HELP_MSG_MISSING_DEPENDENCY([harfbuzz])
-      AC_MSG_ERROR([--with-harfbuzz=system specified, but no harfbuzz found! $HELP_MSG])
-    fi
-  else
-    AC_MSG_ERROR([Invalid value for --with-harfbuzz: ${with_harfbuzz}, use 'system' or 'bundled'])
-  fi
-
-  AC_SUBST(USE_EXTERNAL_HARFBUZZ)
-  AC_SUBST(HARFBUZZ_CFLAGS)
-  AC_SUBST(HARFBUZZ_LIBS)
-])

make/autoconf/lib-ffi.m4

@@ -87,20 +87,6 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
           [LIBFFI_FOUND=no]
       )
     fi
-    # on macos we need a special case for system's libffi as
-    # headers are located only in sdk in $SYSROOT and in ffi subfolder
-    if test "x$LIBFFI_FOUND" = xno; then
-      if test "x$SYSROOT" != "x"; then
-        AC_CHECK_HEADER([$SYSROOT/usr/include/ffi/ffi.h],
-            [
-              LIBFFI_FOUND=yes
-              LIBFFI_CFLAGS="-I${SYSROOT}/usr/include/ffi"
-              LIBFFI_LIBS=-lffi
-            ],
-            [LIBFFI_FOUND=no]
-        )
-      fi
-    fi
     if test "x$LIBFFI_FOUND" = xno; then
       HELP_MSG_MISSING_DEPENDENCY([ffi])
       AC_MSG_ERROR([Could not find libffi! $HELP_MSG])
@@ -149,7 +135,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
           else
             AC_MSG_ERROR([Could not locate libffi.so.? for bundling])
           fi
-        elif test "x${OPENJDK_TARGET_CPU}" = "xx86_64" || test "x${OPENJDK_TARGET_CPU}" = "xaarch64"; then
+        elif test "x${OPENJDK_TARGET_CPU}" = "xx86_64"; then
           if test -e ${SYSROOT}/usr/lib64/libffi.so.? ; then
             LIBFFI_LIB_FILE="${SYSROOT}/usr/lib64/libffi.so.?"
           elif test -e ${SYSROOT}/usr/lib/x86_64-linux-gnu/libffi.so.? ; then

make/autoconf/lib-freetype.m4

@@ -192,16 +192,6 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
               [$FREETYPE_BASE_DIR/lib], [well-known location])
         fi
 
-        if test "x$FOUND_FREETYPE" != "xyes" ; then
-          LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include],
-              [$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI], [well-known location])
-        fi
-
-        if test "x$FOUND_FREETYPE" != "xyes" ; then
-          LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include],
-              [$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI], [well-known location])
-        fi
-
         if test "x$FOUND_FREETYPE" != "xyes" ; then
           FREETYPE_BASE_DIR="$SYSROOT/usr/X11"
           LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include],

make/autoconf/lib-std.m4

@@ -70,7 +70,6 @@ AC_DEFUN_ONCE([LIB_SETUP_STD_LIBS],
     else
       LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
       JVM_LDFLAGS="$JVM_LDFLAGS $STATIC_STDCXX_FLAGS"
-      ADLC_LDFLAGS="$ADLC_LDFLAGS $STATIC_STDCXX_FLAGS"
       # Ideally, we should test stdc++ for the BUILD toolchain separately. For now
       # just use the same setting as for the TARGET toolchain.
       OPENJDK_BUILD_JVM_LDFLAGS="$OPENJDK_BUILD_JVM_LDFLAGS $STATIC_STDCXX_FLAGS"

make/autoconf/lib-tests.m4

@@ -23,6 +23,38 @@
 # questions.
 #
 
+###############################################################################
+#
+# Check for graalunit libs, needed for running graalunit tests.
+#
+AC_DEFUN_ONCE([LIB_TESTS_SETUP_GRAALUNIT],
+[
+  AC_ARG_WITH(graalunit-lib, [AS_HELP_STRING([--with-graalunit-lib],
+      [specify location of 3rd party libraries used by Graal unit tests])])
+
+  GRAALUNIT_LIB=
+  if test "x${with_graalunit_lib}" != x; then
+    AC_MSG_CHECKING([for graalunit libs])
+    if test "x${with_graalunit_lib}" = xno; then
+      AC_MSG_RESULT([disabled, graalunit tests can not be run])
+    elif test "x${with_graalunit_lib}" = xyes; then
+      AC_MSG_RESULT([not specified])
+      AC_MSG_ERROR([You must specify the path to 3rd party libraries used by Graal unit tests])
+    else
+      GRAALUNIT_LIB="${with_graalunit_lib}"
+      if test ! -d "${GRAALUNIT_LIB}"; then
+        AC_MSG_RESULT([no])
+        AC_MSG_ERROR([Could not find graalunit 3rd party libraries as specified. (${with_graalunit_lib})])
+      else
+        AC_MSG_RESULT([$GRAALUNIT_LIB])
+      fi
+    fi
+  fi
+
+  UTIL_FIXUP_PATH([GRAALUNIT_LIB])
+  AC_SUBST(GRAALUNIT_LIB)
+])
+
 ###############################################################################
 #
 # Setup and check for gtest framework source files

make/autoconf/lib-x11.m4

@@ -68,10 +68,6 @@ AC_DEFUN_ONCE([LIB_SETUP_X11],
             x_libraries="$SYSROOT/usr/lib64"
           elif test -f "$SYSROOT/usr/lib/libX11.so"; then
             x_libraries="$SYSROOT/usr/lib"
-          elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"; then
-            x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"
-          elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"; then
-            x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"
           fi
         fi
       fi

make/autoconf/libraries.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -101,6 +101,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   LIB_SETUP_LIBFFI
   LIB_SETUP_BUNDLED_LIBS
   LIB_SETUP_MISC_LIBS
+  LIB_TESTS_SETUP_GRAALUNIT
   LIB_TESTS_SETUP_GTEST
 
   BASIC_JDKLIB_LIBS=""
@@ -121,29 +122,6 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread"
   fi
 
-  # librt for legacy clock_gettime
-  if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    # Hotspot needs to link librt to get the clock_* functions.
-    # But once our supported minimum build and runtime platform
-    # has glibc 2.17, this can be removed as the functions are
-    # in libc.
-    BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lrt"
-  fi
-
-  # Atomic library
-  # 32-bit platforms needs fallback library for 8-byte atomic ops on Zero
-  if HOTSPOT_CHECK_JVM_VARIANT(zero); then
-    if test "x$OPENJDK_TARGET_OS" = xlinux &&
-        (test "x$OPENJDK_TARGET_CPU" = xarm ||
-         test "x$OPENJDK_TARGET_CPU" = xm68k ||
-         test "x$OPENJDK_TARGET_CPU" = xmips ||
-         test "x$OPENJDK_TARGET_CPU" = xmipsel ||
-         test "x$OPENJDK_TARGET_CPU" = xppc ||
-         test "x$OPENJDK_TARGET_CPU" = xsh); then
-      BASIC_JVM_LIBS="$BASIC_JVM_LIBS -latomic"
-    fi
-  fi
-
   # perfstat lib
   if test "x$OPENJDK_TARGET_OS" = xaix; then
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lperfstat"

make/autoconf/platform.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -72,12 +72,6 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
       VAR_CPU_BITS=64
       VAR_CPU_ENDIAN=little
       ;;
-    loongarch64)
-      VAR_CPU=loongarch64
-      VAR_CPU_ARCH=loongarch
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=little
-      ;;
     m68k)
       VAR_CPU=m68k
       VAR_CPU_ARCH=m68k
@@ -212,9 +206,9 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_OS],
       VAR_OS=windows
       VAR_OS_ENV=windows.wsl
       ;;
-    *msys*)
+    *mingw*)
       VAR_OS=windows
-      VAR_OS_ENV=windows.msys2
+      VAR_OS_ENV=windows.msys
       ;;
     *aix*)
       VAR_OS=aix
@@ -226,51 +220,6 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_OS],
   esac
 ])
 
-# Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD.
-# Converts autoconf style OS name to OpenJDK style, into
-# VAR_LIBC.
-AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_LIBC],
-[
-  case "$1" in
-    *linux*-musl)
-      VAR_LIBC=musl
-      ;;
-    *linux*-gnu)
-      VAR_LIBC=gnu
-      ;;
-    *)
-      VAR_LIBC=default
-      ;;
-  esac
-])
-
-# Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD.
-# Converts autoconf style OS name to OpenJDK style, into
-# VAR_ABI.
-AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_ABI],
-[
-  case "$1" in
-    *linux*-musl)
-      VAR_ABI=musl
-      ;;
-    *linux*-gnu)
-      VAR_ABI=gnu
-      ;;
-    *linux*-gnueabi)
-      VAR_ABI=gnueabi
-      ;;
-    *linux*-gnueabihf)
-      VAR_ABI=gnueabihf
-      ;;
-    *linux*-gnuabi64)
-      VAR_ABI=gnuabi64
-      ;;
-    *)
-      VAR_ABI=default
-      ;;
-  esac
-])
-
 # Expects $host_os $host_cpu $build_os and $build_cpu
 # and $with_target_bits to have been setup!
 #
@@ -288,11 +237,9 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
   AC_SUBST(OPENJDK_TARGET_AUTOCONF_NAME)
   AC_SUBST(OPENJDK_BUILD_AUTOCONF_NAME)
 
-  # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU/LIBC variables.
+  # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
   PLATFORM_EXTRACT_VARS_FROM_OS($build_os)
   PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu)
-  PLATFORM_EXTRACT_VARS_FROM_LIBC($build_os)
-  PLATFORM_EXTRACT_VARS_FROM_ABI($build_os)
   # ..and setup our own variables. (Do this explicitly to facilitate searching)
   OPENJDK_BUILD_OS="$VAR_OS"
   if test "x$VAR_OS_TYPE" != x; then
@@ -309,9 +256,6 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
   OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
   OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
   OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
-  OPENJDK_BUILD_CPU_AUTOCONF="$build_cpu"
-  OPENJDK_BUILD_LIBC="$VAR_LIBC"
-  OPENJDK_BUILD_ABI="$VAR_ABI"
   AC_SUBST(OPENJDK_BUILD_OS)
   AC_SUBST(OPENJDK_BUILD_OS_TYPE)
   AC_SUBST(OPENJDK_BUILD_OS_ENV)
@@ -319,23 +263,13 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
   AC_SUBST(OPENJDK_BUILD_CPU_ARCH)
   AC_SUBST(OPENJDK_BUILD_CPU_BITS)
   AC_SUBST(OPENJDK_BUILD_CPU_ENDIAN)
-  AC_SUBST(OPENJDK_BUILD_CPU_AUTOCONF)
-  AC_SUBST(OPENJDK_BUILD_LIBC)
-  AC_SUBST(OPENJDK_BUILD_ABI)
 
   AC_MSG_CHECKING([openjdk-build os-cpu])
   AC_MSG_RESULT([$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU])
 
-  if test "x$OPENJDK_BUILD_OS" = "xlinux"; then
-    AC_MSG_CHECKING([openjdk-build C library])
-    AC_MSG_RESULT([$OPENJDK_BUILD_LIBC])
-  fi
-
-  # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU/LIBC variables.
+  # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
   PLATFORM_EXTRACT_VARS_FROM_OS($host_os)
   PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
-  PLATFORM_EXTRACT_VARS_FROM_LIBC($host_os)
-  PLATFORM_EXTRACT_VARS_FROM_ABI($host_os)
   # ... and setup our own variables. (Do this explicitly to facilitate searching)
   OPENJDK_TARGET_OS="$VAR_OS"
   if test "x$VAR_OS_TYPE" != x; then
@@ -352,10 +286,7 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
   OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
   OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
   OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
-  OPENJDK_TARGET_CPU_AUTOCONF="$host_cpu"
   OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  OPENJDK_TARGET_LIBC="$VAR_LIBC"
-  OPENJDK_TARGET_ABI="$VAR_ABI"
 
   AC_SUBST(OPENJDK_TARGET_OS)
   AC_SUBST(OPENJDK_TARGET_OS_TYPE)
@@ -365,17 +296,9 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
   AC_SUBST(OPENJDK_TARGET_CPU_ARCH)
   AC_SUBST(OPENJDK_TARGET_CPU_BITS)
   AC_SUBST(OPENJDK_TARGET_CPU_ENDIAN)
-  AC_SUBST(OPENJDK_TARGET_CPU_AUTOCONF)
-  AC_SUBST(OPENJDK_TARGET_LIBC)
-  AC_SUBST(OPENJDK_TARGET_ABI)
 
   AC_MSG_CHECKING([openjdk-target os-cpu])
   AC_MSG_RESULT([$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
-
-  if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
-    AC_MSG_CHECKING([openjdk-target C library])
-    AC_MSG_RESULT([$OPENJDK_TARGET_LIBC])
-  fi
 ])
 
 # Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour
@@ -486,11 +409,9 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
   fi
 
   # The new version string in JDK 9 also defined new naming of OS and ARCH for bundles
-  # The macOS bundle name was revised in JDK 17
-  #
-  # macosx is macos and x86_64 is x64
+  # Macosx is osx and x86_64 is x64
   if test "x$OPENJDK_$1_OS" = xmacosx; then
-    OPENJDK_$1_OS_BUNDLE="macos"
+    OPENJDK_$1_OS_BUNDLE="osx"
   else
     OPENJDK_$1_OS_BUNDLE="$OPENJDK_TARGET_OS"
   fi
@@ -499,13 +420,7 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
   else
     OPENJDK_$1_CPU_BUNDLE="$OPENJDK_$1_CPU"
   fi
-
-  OPENJDK_$1_LIBC_BUNDLE=""
-  if test "x$OPENJDK_$1_LIBC" = "xmusl"; then
-    OPENJDK_$1_LIBC_BUNDLE="-$OPENJDK_$1_LIBC"
-  fi
-
-  OPENJDK_$1_BUNDLE_PLATFORM="${OPENJDK_$1_OS_BUNDLE}-${OPENJDK_$1_CPU_BUNDLE}${OPENJDK_$1_LIBC_BUNDLE}"
+  OPENJDK_$1_BUNDLE_PLATFORM="${OPENJDK_$1_OS_BUNDLE}-${OPENJDK_$1_CPU_BUNDLE}"
   AC_SUBST(OPENJDK_$1_BUNDLE_PLATFORM)
 
   if test "x$COMPILE_TYPE" = "xcross"; then
@@ -578,9 +493,6 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
   fi
   AC_SUBST(HOTSPOT_$1_CPU_DEFINE)
 
-  HOTSPOT_$1_LIBC=$OPENJDK_$1_LIBC
-  AC_SUBST(HOTSPOT_$1_LIBC)
-
   # For historical reasons, the OS include directories have odd names.
   OPENJDK_$1_OS_INCLUDE_SUBDIR="$OPENJDK_TARGET_OS"
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
@@ -606,11 +518,9 @@ AC_DEFUN([PLATFORM_SET_RELEASE_FILE_OS_VALUES],
     RELEASE_FILE_OS_NAME="AIX"
   fi
   RELEASE_FILE_OS_ARCH=${OPENJDK_TARGET_CPU}
-  RELEASE_FILE_LIBC=${OPENJDK_TARGET_LIBC}
 
   AC_SUBST(RELEASE_FILE_OS_NAME)
   AC_SUBST(RELEASE_FILE_OS_ARCH)
-  AC_SUBST(RELEASE_FILE_LIBC)
 ])
 
 AC_DEFUN([PLATFORM_SET_MODULE_TARGET_OS_VALUES],

make/autoconf/source-dirs.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,9 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_DIRS],
   OUTPUTDIR="$OUTPUTDIR"
   AC_SUBST(OUTPUTDIR)
   JDK_OUTPUTDIR="$OUTPUTDIR/jdk"
+
+  # Where are the sources.
+  AC_SUBST(TOPDIR)
 ])
 
 ################################################################################

make/autoconf/spec.gmk.in

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -54,9 +54,6 @@ MAKE := @MAKE@
 # Make sure all shell commands are executed with the C locale
 export LC_ALL := C
 
-# Make sure we override any local CLASSPATH variable
-export CLASSPATH := @CLASSPATH@
-
 # The default make arguments
 MAKE_ARGS = $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
     MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" $(MAKE_LOG_VARS)
@@ -83,8 +80,6 @@ OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@
 OPENJDK_TARGET_CPU_BITS:=@OPENJDK_TARGET_CPU_BITS@
 OPENJDK_TARGET_CPU_ENDIAN:=@OPENJDK_TARGET_CPU_ENDIAN@
 
-OPENJDK_TARGET_LIBC:=@OPENJDK_TARGET_LIBC@
-
 COMPILE_TYPE:=@COMPILE_TYPE@
 
 # Legacy support
@@ -100,8 +95,6 @@ HOTSPOT_TARGET_CPU := @HOTSPOT_TARGET_CPU@
 HOTSPOT_TARGET_CPU_ARCH := @HOTSPOT_TARGET_CPU_ARCH@
 HOTSPOT_TARGET_CPU_DEFINE := @HOTSPOT_TARGET_CPU_DEFINE@
 
-HOTSPOT_TARGET_LIBC := @HOTSPOT_TARGET_LIBC@
-
 OPENJDK_TARGET_BUNDLE_PLATFORM:=@OPENJDK_TARGET_BUNDLE_PLATFORM@
 JDK_ARCH_ABI_PROP_NAME := @JDK_ARCH_ABI_PROP_NAME@
 
@@ -116,8 +109,6 @@ OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
 OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
 OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
 
-OPENJDK_BUILD_LIBC:=@OPENJDK_BUILD_LIBC@
-
 OPENJDK_BUILD_OS_INCLUDE_SUBDIR:=@OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
 
 # Target platform value in ModuleTarget class file attribute.
@@ -126,7 +117,6 @@ OPENJDK_MODULE_TARGET_PLATFORM:=@OPENJDK_MODULE_TARGET_PLATFORM@
 # OS_* properties in release file
 RELEASE_FILE_OS_NAME:=@RELEASE_FILE_OS_NAME@
 RELEASE_FILE_OS_ARCH:=@RELEASE_FILE_OS_ARCH@
-RELEASE_FILE_LIBC:=@RELEASE_FILE_LIBC@
 
 SOURCE_DATE := @SOURCE_DATE@
 ENABLE_REPRODUCIBLE_BUILD := @ENABLE_REPRODUCIBLE_BUILD@
@@ -134,24 +124,20 @@ ENABLE_REPRODUCIBLE_BUILD := @ENABLE_REPRODUCIBLE_BUILD@
 LIBM:=@LIBM@
 LIBDL:=@LIBDL@
 
-WINENV_ROOT := @WINENV_ROOT@
-WINENV_PREFIX := @WINENV_PREFIX@
-
-ifneq ($(findstring windows.wsl, @OPENJDK_BUILD_OS_ENV@), )
-  # Tell WSL to convert PATH between linux and windows
-  export WSLENV := PATH/l
-else ifeq (@OPENJDK_BUILD_OS_ENV@, windows.msys2)
-  # Prohibit msys2 from attemping any path wrangling
-  export MSYS2_ARG_CONV_EXCL := "*"
-endif
+# colon or semicolon
+PATH_SEP:=@PATH_SEP@
 
 # Save the original path before replacing it with the Visual Studio tools
-ORIGINAL_PATH := @ORIGINAL_PATH@
-
-ifeq (@TOOLCHAIN_TYPE@, microsoft)
-  # The Visual Studio toolchain needs the PATH to be adjusted to include
-  # Visual Studio tools.
-  export PATH := @TOOLCHAIN_PATH@:$(PATH)
+ORIGINAL_PATH:=@ORIGINAL_PATH@
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  # On Windows, the Visual Studio toolchain needs the PATH to be adjusted
+  # to include Visual Studio tools (this needs to be in cygwin/msys style).
+  ifeq ($(OPENJDK_TARGET_OS_ENV), windows.wsl)
+    export FIXPATH_PATH:=@VS_PATH_WINDOWS@
+    export WSLENV:=$(WSLENV):FIXPATH_PATH:DEBUG_FIXPATH
+  else
+    export PATH:=@VS_PATH@
+  endif
 endif
 
 SYSROOT_CFLAGS := @SYSROOT_CFLAGS@
@@ -184,7 +170,6 @@ COMPANY_NAME:=@COMPANY_NAME@
 HOTSPOT_VM_DISTRO:=@HOTSPOT_VM_DISTRO@
 MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
 MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
-MACOSX_BUNDLE_BUILD_VERSION=@MACOSX_BUNDLE_BUILD_VERSION@
 USERNAME:=@USERNAME@
 VENDOR_URL:=@VENDOR_URL@
 VENDOR_URL_BUG:=@VENDOR_URL_BUG@
@@ -233,9 +218,6 @@ VENDOR_VERSION_STRING := @VENDOR_VERSION_STRING@
 VERSION_CLASSFILE_MAJOR := @VERSION_CLASSFILE_MAJOR@
 VERSION_CLASSFILE_MINOR := @VERSION_CLASSFILE_MINOR@
 
-# Version for API docs "new-since" feature
-VERSION_DOCS_API_SINCE := @VERSION_DOCS_API_SINCE@
-
 JDK_SOURCE_TARGET_VERSION := @JDK_SOURCE_TARGET_VERSION@
 
 # Convenience CFLAGS settings for passing version information into native programs.
@@ -261,7 +243,7 @@ VERSION_CFLAGS := \
     #
 
 ifneq ($(COMPANY_NAME),)
-  # COMPANY_NAME is set to "N/A" in make/conf/branding.conf by default,
+  # COMPANY_NAME is set to "N/A" in $AUTOCONF_DIR/version-numbers by default,
   # but can be customized with the '--with-vendor-name' configure option.
   # Only export "VENDOR" to the build if COMPANY_NAME contains a real value.
   # Otherwise the default value for VENDOR, which is used to set the "java.vendor"
@@ -355,14 +337,8 @@ BUILD_MANPAGES := @BUILD_MANPAGES@
 
 BUILD_CDS_ARCHIVE := @BUILD_CDS_ARCHIVE@
 
-ENABLE_COMPATIBLE_CDS_ALIGNMENT := @ENABLE_COMPATIBLE_CDS_ALIGNMENT@
-
 ALLOW_ABSOLUTE_PATHS_IN_OUTPUT := @ALLOW_ABSOLUTE_PATHS_IN_OUTPUT@
 
-HSDIS_BACKEND := @HSDIS_BACKEND@
-HSDIS_CFLAGS := @HSDIS_CFLAGS@
-HSDIS_LIBS := @HSDIS_LIBS@
-
 # The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep
 # it in sync.
 BOOT_JDK:=@BOOT_JDK@
@@ -402,6 +378,7 @@ LIBFFI_LIBS:=@LIBFFI_LIBS@
 LIBFFI_CFLAGS:=@LIBFFI_CFLAGS@
 ENABLE_LIBFFI_BUNDLING:=@ENABLE_LIBFFI_BUNDLING@
 LIBFFI_LIB_FILE:=@LIBFFI_LIB_FILE@
+GRAALUNIT_LIB := @GRAALUNIT_LIB@
 FILE_MACRO_CFLAGS := @FILE_MACRO_CFLAGS@
 
 STATIC_LIBS_CFLAGS := @STATIC_LIBS_CFLAGS@
@@ -416,8 +393,6 @@ GTEST_FRAMEWORK_SRC := @GTEST_FRAMEWORK_SRC@
 
 # Source file for cacerts
 CACERTS_FILE=@CACERTS_FILE@
-# Source folder for user provided cacerts PEM files 
-CACERTS_SRC=@CACERTS_SRC@
 
 # Enable unlimited crypto policy
 UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
@@ -488,7 +463,8 @@ CXX_O_FLAG_NORM:=@CXX_O_FLAG_NORM@
 CXX_O_FLAG_NONE:=@CXX_O_FLAG_NONE@
 CXX_O_FLAG_SIZE:=@CXX_O_FLAG_SIZE@
 
-GENDEPS_FLAGS := @GENDEPS_FLAGS@
+C_FLAG_DEPS:=@C_FLAG_DEPS@
+CXX_FLAG_DEPS:=@CXX_FLAG_DEPS@
 
 DISABLE_WARNING_PREFIX := @DISABLE_WARNING_PREFIX@
 CFLAGS_WARNINGS_ARE_ERRORS:=@CFLAGS_WARNINGS_ARE_ERRORS@
@@ -500,11 +476,10 @@ DISABLED_WARNINGS_CXX := @DISABLED_WARNINGS_CXX@
 WARNINGS_AS_ERRORS := @WARNINGS_AS_ERRORS@
 
 CFLAGS_CCACHE:=@CFLAGS_CCACHE@
-ADLC_LANGSTD_CXXFLAGS=@ADLC_LANGSTD_CXXFLAGS@
-ADLC_LDFLAGS=@ADLC_LDFLAGS@
+ADLC_CXXFLAG=@ADLC_CXXFLAG@
 
 # Tools that potentially need to be cross compilation aware.
-CC := @CCACHE@ @ICECC@ @CC@
+CC:=@FIXPATH@ @CCACHE@ @ICECC@ @CC@
 
 # CFLAGS used to compile the jdk native libraries (C-code)
 CFLAGS_JDKLIB:=@CFLAGS_JDKLIB@
@@ -519,8 +494,7 @@ JVM_CFLAGS := @JVM_CFLAGS@
 JVM_LDFLAGS := @JVM_LDFLAGS@
 JVM_ASFLAGS := @JVM_ASFLAGS@
 JVM_LIBS := @JVM_LIBS@
-
-BASIC_ASFLAGS := @BASIC_ASFLAGS@
+JVM_RCFLAGS := @JVM_RCFLAGS@
 
 # These flags might contain variables set by a custom extension that is included later.
 EXTRA_CFLAGS = @EXTRA_CFLAGS@
@@ -528,12 +502,15 @@ EXTRA_CXXFLAGS = @EXTRA_CXXFLAGS@
 EXTRA_LDFLAGS = @EXTRA_LDFLAGS@
 EXTRA_ASFLAGS = @EXTRA_ASFLAGS@
 
-CXX := @CCACHE@ @ICECC@ @CXX@
+CXX:=@FIXPATH@ @CCACHE@ @ICECC@ @CXX@
 
-CPP := @CPP@
+CPP:=@FIXPATH@ @CPP@
 
 # The linker can be gcc or ld on unix systems, or link.exe on windows systems.
-LD := @LD@
+LD:=@FIXPATH@ @LD@
+
+# Linker used by the jaotc tool for AOT compilation.
+LD_JAOTC:=@LD_JAOTC@
 
 # Xcode SDK path
 SDKROOT:=@SDKROOT@
@@ -550,7 +527,7 @@ JDKEXE_LIBS:=@JDKEXE_LIBS@
 LDFLAGS_CXX_JDK:=@LDFLAGS_CXX_JDK@
 
 # Sometimes a different linker is needed for c++ libs
-LDCXX := @LDCXX@
+LDCXX:=@FIXPATH@ @LDCXX@
 # The flags for linking libstdc++ linker.
 LIBCXX:=@LIBCXX@
 
@@ -559,22 +536,22 @@ LDFLAGS_TESTEXE:=@LDFLAGS_TESTEXE@
 
 # BUILD_CC/BUILD_LD is a compiler/linker that generates code that is runnable on the
 # build platform.
-BUILD_CC := @BUILD_ICECC@ @BUILD_CC@
-BUILD_CXX := @BUILD_ICECC@ @BUILD_CXX@
-BUILD_LD := @BUILD_LD@
-BUILD_LDCXX := @BUILD_LDCXX@
-BUILD_AS := @BUILD_AS@
-BUILD_AR := @BUILD_AR@
-BUILD_NM := @BUILD_NM@
+BUILD_CC:=@FIXPATH@ @BUILD_ICECC@ @BUILD_CC@
+BUILD_CXX:=@FIXPATH@ @BUILD_ICECC@ @BUILD_CXX@
+BUILD_LD:=@FIXPATH@ @BUILD_LD@
+BUILD_LDCXX:=@FIXPATH@ @BUILD_LDCXX@
+BUILD_AS:=@FIXPATH@ @BUILD_AS@
+BUILD_AR:=@FIXPATH@ @BUILD_AR@
+BUILD_NM:=@FIXPATH@ @BUILD_NM@
 BUILD_OBJCOPY:=@BUILD_OBJCOPY@
 BUILD_STRIP:=@BUILD_STRIP@
 BUILD_SYSROOT_CFLAGS:=@BUILD_SYSROOT_CFLAGS@
 BUILD_SYSROOT_LDFLAGS:=@BUILD_SYSROOT_LDFLAGS@
 
-AS := @AS@
+AS:=@FIXPATH@ @AS@
 
 # AR is used to create a static library (is ar in unix, lib.exe in windows)
-AR := @AR@
+AR:=@FIXPATH@ @AR@
 ARFLAGS:=@ARFLAGS@
 
 NM:=@NM@
@@ -585,8 +562,6 @@ CXXFILT:=@CXXFILT@
 
 LIPO:=@LIPO@
 INSTALL_NAME_TOOL:=@INSTALL_NAME_TOOL@
-METAL := @METAL@
-METALLIB := @METALLIB@
 
 # Options to linker to specify a mapfile.
 # (Note absence of := assignment, because we do not want to evaluate the macro body here)
@@ -625,7 +600,7 @@ STATIC_LIBRARY=@STATIC_LIBRARY@
 LIBRARY_PREFIX:=@LIBRARY_PREFIX@
 SHARED_LIBRARY_SUFFIX:=@SHARED_LIBRARY_SUFFIX@
 STATIC_LIBRARY_SUFFIX:=@STATIC_LIBRARY_SUFFIX@
-EXECUTABLE_SUFFIX:=@EXECUTABLE_SUFFIX@
+EXE_SUFFIX:=@EXE_SUFFIX@
 OBJ_SUFFIX:=@OBJ_SUFFIX@
 STATIC_BUILD:=@STATIC_BUILD@
 
@@ -646,23 +621,23 @@ JAVADOC_CMD:=@JAVADOC@
 JAR_CMD:=@JAR@
 JLINK_CMD := @JLINK@
 JMOD_CMD := @JMOD@
+JARSIGNER_CMD:=@JARSIGNER@
 # These variables are meant to be used. They are defined with = instead of := to make
 # it possible to override only the *_CMD variables.
-JAVA = $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
-JAVA_SMALL = $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
-JAVAC = $(JAVAC_CMD)
-JAVADOC = $(JAVADOC_CMD)
-JAR = $(JAR_CMD)
-JLINK = $(JLINK_CMD)
-JMOD = $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL)
+JAVA=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
+JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
+JAVA_DETACH =@FIXPATH@ @FIXPATH_DETACH_FLAG@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
+JAVAC=@FIXPATH@ $(JAVAC_CMD)
+JAVADOC=@FIXPATH@ $(JAVADOC_CMD)
+JAR=@FIXPATH@ $(JAR_CMD)
+JLINK = @FIXPATH@ $(JLINK_CMD)
+JMOD = @FIXPATH@ $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL)
+JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD)
 
 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
-BUILD_JAVAC=@FIXPATH@ $(BUILD_JDK)/bin/javac
 BUILD_JAR=@FIXPATH@ $(BUILD_JDK)/bin/jar
 
-DOCS_REFERENCE_JAVADOC := @DOCS_REFERENCE_JAVADOC@
-
 # Interim langtools modules and arguments
 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
@@ -671,8 +646,6 @@ INTERIM_LANGTOOLS_ADD_EXPORTS := \
     --add-exports java.base/jdk.internal.jmod=jdk.compiler.interim \
     --add-exports java.base/jdk.internal.misc=jdk.compiler.interim \
     --add-exports java.base/sun.invoke.util=jdk.compiler.interim \
-    --add-exports java.base/jdk.internal.javac=java.compiler.interim \
-    --add-exports java.base/jdk.internal.javac=jdk.compiler.interim \
     #
 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
     $(INTERIM_LANGTOOLS_MODULES))))
@@ -680,7 +653,6 @@ INTERIM_LANGTOOLS_ARGS := \
     --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \
     --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \
     --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
-    --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
     $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
     #
 JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main
@@ -693,7 +665,12 @@ NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS)
 
 JLINK_KEEP_PACKAGED_MODULES:=@JLINK_KEEP_PACKAGED_MODULES@
 
-RCFLAGS := @RCFLAGS@
+# Base flags for RC
+# Guarding this against resetting value. Legacy make files include spec multiple
+# times.
+ifndef RC_FLAGS
+  RC_FLAGS:=@RC_FLAGS@
+endif
 
 # Tools adhering to a minimal and common standard of posix compliance.
 AWK:=@AWK@
@@ -704,7 +681,9 @@ CCACHE:=@CCACHE@
 CD:=cd
 CHMOD:=@CHMOD@
 CODESIGN:=@CODESIGN@
+COMM:=@COMM@
 CP:=@CP@
+CPIO:=@CPIO@
 CUT:=@CUT@
 DATE:=@DATE@
 DIFF:=@DIFF@
@@ -724,8 +703,9 @@ LN:=@LN@
 MIG:=@MIG@
 MKDIR:=@MKDIR@
 MV:=@MV@
+NAWK:=@NAWK@
 NICE:=@NICE@
-PANDOC:=@PANDOC@
+PANDOC:=@FIXPATH@ @PANDOC@
 PATCH:=@PATCH@
 PRINTF:=@PRINTF@
 READLINK:=@READLINK@
@@ -741,14 +721,15 @@ TIME:=@TIME@
 IS_GNU_TIME:=@IS_GNU_TIME@
 TR:=@TR@
 TOUCH:=@TOUCH@
+UNIQ:=@UNIQ@
 WC:=@WC@
 XARGS:=@XARGS@
 ZIPEXE:=@ZIPEXE@
 UNZIP:=@UNZIP@
-MT:=@MT@
-RC:=@RC@
-DUMPBIN:=@DUMPBIN@
-PATHTOOL:=@PATHTOOL@
+MT:=@FIXPATH@ @MT@
+RC:=@FIXPATH@ @RC@
+DUMPBIN:=@FIXPATH@ @DUMPBIN@
+CYGPATH:=@CYGPATH@
 WSLPATH:=@WSLPATH@
 LDD:=@LDD@
 OTOOL:=@OTOOL@
@@ -765,8 +746,7 @@ JT_HOME:=@JT_HOME@
 JIB_HOME:=@JIB_HOME@
 XCODEBUILD=@XCODEBUILD@
 DTRACE := @DTRACE@
-FIXPATH := @FIXPATH@
-FIXPATH_BASE := @FIXPATH_BASE@
+FIXPATH:=@FIXPATH@
 ULIMIT:=@ULIMIT@
 
 TAR_TYPE:=@TAR_TYPE@
@@ -774,6 +754,8 @@ TAR_INCLUDE_PARAM:=@TAR_INCLUDE_PARAM@
 TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@
 
 # Build setup
+ENABLE_AOT:=@ENABLE_AOT@
+ENABLE_INTREE_EC:=@ENABLE_INTREE_EC@
 USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
 USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
 USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
@@ -847,10 +829,6 @@ USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@
 LCMS_CFLAGS:=@LCMS_CFLAGS@
 LCMS_LIBS:=@LCMS_LIBS@
 
-USE_EXTERNAL_HARFBUZZ:=@USE_EXTERNAL_HARFBUZZ@
-HARFBUZZ_CFLAGS:=@HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS:=@HARFBUZZ_LIBS@
-
 USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@
 PNG_LIBS:=@PNG_LIBS@
 PNG_CFLAGS:=@PNG_CFLAGS@
@@ -861,8 +839,8 @@ PNG_CFLAGS:=@PNG_CFLAGS@
 #
 
 INCLUDE_SA=@INCLUDE_SA@
+INCLUDE_GRAAL=@INCLUDE_GRAAL@
 INCLUDE_JVMCI=@INCLUDE_JVMCI@
-INCLUDE_COMPILER2=@INCLUDE_COMPILER2@
 
 OS_VERSION_MAJOR:=@OS_VERSION_MAJOR@
 OS_VERSION_MINOR:=@OS_VERSION_MINOR@
@@ -891,14 +869,10 @@ INTERIM_JMODS_DIR := $(SUPPORT_OUTPUTDIR)/interim-jmods
 INTERIM_IMAGE_DIR := $(SUPPORT_OUTPUTDIR)/interim-image
 
 # Docs image
-DOCS_JDK_IMAGE_SUBDIR := docs
-DOCS_JDK_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_JDK_IMAGE_SUBDIR)
-DOCS_JAVASE_IMAGE_SUBDIR := docs-javase
-DOCS_JAVASE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_JAVASE_IMAGE_SUBDIR)
-DOCS_REFERENCE_IMAGE_SUBDIR := docs-reference
-DOCS_REFERENCE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_REFERENCE_IMAGE_SUBDIR)
+DOCS_IMAGE_SUBDIR := docs
+DOCS_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_IMAGE_SUBDIR)
 # Output docs directly into image
-DOCS_OUTPUTDIR := $(DOCS_JDK_IMAGE_DIR)
+DOCS_OUTPUTDIR := $(DOCS_IMAGE_DIR)
 
 # Static libs image
 STATIC_LIBS_IMAGE_SUBDIR := static-libs
@@ -941,9 +915,7 @@ JRE_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
 JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
 TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz
 TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
-DOCS_JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
-DOCS_JAVASE_BUNDLE_NAME := javase-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
-DOCS_REFERENCE_BUNDLE_NAME := jdk-reference-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
+DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
 STATIC_LIBS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs$(DEBUG_PART).tar.gz
 JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
 
@@ -952,9 +924,7 @@ JRE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
 JDK_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
 TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME)
 TEST_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
-DOCS_JDK_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_JDK_BUNDLE_NAME)
-DOCS_JAVASE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_JAVASE_BUNDLE_NAME)
-DOCS_REFERENCE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_REFERENCE_BUNDLE_NAME)
+DOCS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME)
 JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME)
 
 # This macro is called to allow inclusion of closed source counterparts.

make/autoconf/toolchain.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
 # compilers and related tools that are used.
 ########################################################################
 
-m4_include([toolchain_microsoft.m4])
+m4_include([toolchain_windows.m4])
 
 # All valid toolchains, regardless of platform (used by help.m4)
 VALID_TOOLCHAINS_all="gcc clang xlc microsoft"
@@ -50,9 +50,9 @@ TOOLCHAIN_DESCRIPTION_microsoft="Microsoft Visual Studio"
 TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
 
 # Minimum supported versions, empty means unspecified
-TOOLCHAIN_MINIMUM_VERSION_clang="3.5"
-TOOLCHAIN_MINIMUM_VERSION_gcc="6.0"
-TOOLCHAIN_MINIMUM_VERSION_microsoft="19.10.0.0" # VS2017
+TOOLCHAIN_MINIMUM_VERSION_clang="3.2"
+TOOLCHAIN_MINIMUM_VERSION_gcc="5.0"
+TOOLCHAIN_MINIMUM_VERSION_microsoft="16.00.30319.01" # VS2010
 TOOLCHAIN_MINIMUM_VERSION_xlc=""
 
 # Minimum supported linker versions, empty means unspecified
@@ -179,7 +179,6 @@ AC_DEFUN([TOOLCHAIN_SETUP_FILENAME_PATTERNS],
     SHARED_LIBRARY='[$]1.dll'
     STATIC_LIBRARY='[$]1.lib'
     OBJ_SUFFIX='.obj'
-    EXECUTABLE_SUFFIX='.exe'
   else
     LIBRARY_PREFIX=lib
     SHARED_LIBRARY_SUFFIX='.so'
@@ -187,7 +186,6 @@ AC_DEFUN([TOOLCHAIN_SETUP_FILENAME_PATTERNS],
     SHARED_LIBRARY='lib[$]1.so'
     STATIC_LIBRARY='lib[$]1.a'
     OBJ_SUFFIX='.o'
-    EXECUTABLE_SUFFIX=''
     if test "x$OPENJDK_TARGET_OS" = xmacosx; then
       # For full static builds, we're overloading the SHARED_LIBRARY
       # variables in order to limit the amount of changes required.
@@ -211,7 +209,6 @@ AC_DEFUN([TOOLCHAIN_SETUP_FILENAME_PATTERNS],
   AC_SUBST(SHARED_LIBRARY)
   AC_SUBST(STATIC_LIBRARY)
   AC_SUBST(OBJ_SUFFIX)
-  AC_SUBST(EXECUTABLE_SUFFIX)
 ])
 
 # Determine which toolchain type to use, and make sure it is valid for this
@@ -221,12 +218,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
   AC_ARG_WITH(toolchain-type, [AS_HELP_STRING([--with-toolchain-type],
       [the toolchain type (or family) to use, use '--help' to show possible values @<:@platform dependent@:>@])])
 
-  # Linux x86_64 needs higher binutils after 8265783
-  # (this really is a dependency on as version, but we take ld as a check for a general binutils version)
-  if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
-    TOOLCHAIN_MINIMUM_LD_VERSION_gcc="2.25"
-  fi
-
   # Use indirect variable referencing
   toolchain_var_name=VALID_TOOLCHAINS_$OPENJDK_BUILD_OS
   VALID_TOOLCHAINS=${!toolchain_var_name}
@@ -234,7 +225,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
   if test "x$OPENJDK_TARGET_OS" = xmacosx; then
     if test -n "$XCODEBUILD"; then
       # On Mac OS X, default toolchain to clang after Xcode 5
-      XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version | $HEAD -n 1`
+      XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version 2>&1 | $HEAD -n 1`
       $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
       if test $? -ne 0; then
         AC_MSG_NOTICE([xcodebuild output: $XCODE_VERSION_OUTPUT])
@@ -301,12 +292,12 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
 
   TOOLCHAIN_CC_BINARY_clang="clang"
   TOOLCHAIN_CC_BINARY_gcc="gcc"
-  TOOLCHAIN_CC_BINARY_microsoft="cl"
+  TOOLCHAIN_CC_BINARY_microsoft="cl$EXE_SUFFIX"
   TOOLCHAIN_CC_BINARY_xlc="xlclang"
 
   TOOLCHAIN_CXX_BINARY_clang="clang++"
   TOOLCHAIN_CXX_BINARY_gcc="g++"
-  TOOLCHAIN_CXX_BINARY_microsoft="cl"
+  TOOLCHAIN_CXX_BINARY_microsoft="cl$EXE_SUFFIX"
   TOOLCHAIN_CXX_BINARY_xlc="xlclang++"
 
   # Use indirect variable referencing
@@ -334,6 +325,9 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
 # special setup, e.g. additional paths etc.
 AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
 [
+  # FIXME: Is this needed?
+  AC_LANG(C++)
+
   # Store the CFLAGS etc passed to the configure script.
   ORG_CFLAGS="$CFLAGS"
   ORG_CXXFLAGS="$CXXFLAGS"
@@ -341,26 +335,52 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
   # autoconf magic only relies on PATH, so update it if tools dir is specified
   OLD_PATH="$PATH"
 
-  if test "x$XCODE_VERSION_OUTPUT" != x; then
-    # For Xcode, we set the Xcode version as TOOLCHAIN_VERSION
-    TOOLCHAIN_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | $CUT -f 2 -d ' '`
-    TOOLCHAIN_DESCRIPTION="$TOOLCHAIN_DESCRIPTION from Xcode $TOOLCHAIN_VERSION"
+  # On Windows, we need to detect the visual studio installation first.
+  # This will change the PATH, but we need to keep that new PATH even
+  # after toolchain detection is done, since the compiler (on x86) uses
+  # it for DLL resolution in runtime.
+  if test "x$OPENJDK_BUILD_OS" = "xwindows" \
+      && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
+    TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
+    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+      # Append VS_PATH. In WSL, VS_PATH will not contain the WSL env path needed
+      # for using basic Unix tools, so need to keep the original PATH.
+      UTIL_APPEND_TO_PATH(PATH, $VS_PATH)
+      UTIL_APPEND_TO_PATH(WSLENV, "PATH/l:LIB:INCLUDE")
+      export WSLENV
+    else
+      # Reset path to VS_PATH. It will include everything that was on PATH at the time we
+      # ran TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV.
+      PATH="$VS_PATH"
+    fi
+    # The microsoft toolchain also requires INCLUDE and LIB to be set.
+    export INCLUDE="$VS_INCLUDE"
+    export LIB="$VS_LIB"
+  else
+    if test "x$XCODE_VERSION_OUTPUT" != x; then
+      # For Xcode, we set the Xcode version as TOOLCHAIN_VERSION
+      TOOLCHAIN_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | $CUT -f 2 -d ' '`
+      TOOLCHAIN_DESCRIPTION="$TOOLCHAIN_DESCRIPTION from Xcode $TOOLCHAIN_VERSION"
+    else
+      # Currently we do not define this for other toolchains. This might change as the need arise.
+      TOOLCHAIN_VERSION=
+    fi
   fi
   AC_SUBST(TOOLCHAIN_VERSION)
 
-  # Finally prepend TOOLCHAIN_PATH to the PATH, to allow --with-tools-dir to
+  # Finally add TOOLCHAIN_PATH at the beginning, to allow --with-tools-dir to
   # override all other locations.
   if test "x$TOOLCHAIN_PATH" != x; then
-    export PATH=$TOOLCHAIN_PATH:$PATH
+    PATH=$TOOLCHAIN_PATH:$PATH
   fi
 ])
 
 # Restore path, etc
 AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION],
 [
-  # Restore old path, except for the microsoft toolchain, which requires the
-  # toolchain path to remain in place. Otherwise the compiler will not work in
-  # some siutations in later configure checks.
+  # Restore old path, except for the microsoft toolchain, which requires VS_PATH
+  # to remain in place. Otherwise the compiler will not work in some siutations
+  # in later configure checks.
   if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then
     PATH="$OLD_PATH"
   fi
@@ -407,7 +427,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
     # First line typically looks something like:
     # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
     # but the compiler name may vary depending on locale.
-    COMPILER_VERSION_OUTPUT=`$COMPILER 2>&1 1>/dev/null | $HEAD -n 1 | $TR -d '\r'`
+    COMPILER_VERSION_OUTPUT=`"$COMPILER" 2>&1 | $GREP -v 'ERROR.*UtilTranslatePathList' | $HEAD -n 1 | $TR -d '\r'`
     # Check that this is likely to be Microsoft CL.EXE.
     $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Microsoft" > /dev/null
     if test $? -ne 0; then
@@ -486,7 +506,7 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
     if test "x`basename [$]$1`" = "x[$]$1"; then
       # A command without a complete path is provided, search $PATH.
 
-      UTIL_LOOKUP_PROGS(POTENTIAL_$1, [$]$1)
+      AC_PATH_PROGS(POTENTIAL_$1, [$]$1)
       if test "x$POTENTIAL_$1" != x; then
         $1=$POTENTIAL_$1
       else
@@ -508,16 +528,34 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
     # If we are not cross compiling, then the default compiler name will be
     # used.
 
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(POTENTIAL_$1, $SEARCH_LIST)
-    if test "x$POTENTIAL_$1" != x; then
+    $1=
+    # If TOOLCHAIN_PATH is set, check for all compiler names in there first
+    # before checking the rest of the PATH.
+    # FIXME: Now that we prefix the TOOLS_DIR to the PATH in the PRE_DETECTION
+    # step, this should not be necessary.
+    if test -n "$TOOLCHAIN_PATH"; then
+      PATH_save="$PATH"
+      PATH="$TOOLCHAIN_PATH"
+      AC_PATH_TOOL(TOOLCHAIN_PATH_$1, $SEARCH_LIST)
+      $1=$TOOLCHAIN_PATH_$1
+      PATH="$PATH_save"
+    fi
+
+    # AC_PATH_TOOL can't be run multiple times with the same variable,
+    # so create a new name for this run.
+    if test "x[$]$1" = x; then
+      AC_PATH_TOOL(POTENTIAL_$1, $SEARCH_LIST)
       $1=$POTENTIAL_$1
-    else
+    fi
+
+    if test "x[$]$1" = x; then
       HELP_MSG_MISSING_DEPENDENCY([devkit])
       AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG])
     fi
   fi
 
   # Now we have a compiler binary in $1. Make sure it's okay.
+  UTIL_FIXUP_EXECUTABLE($1)
   TEST_COMPILER="[$]$1"
 
   AC_MSG_CHECKING([resolved symbolic links for $1])
@@ -558,7 +596,12 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_LD_VERSION],
     # There is no specific version flag, but all output starts with a version string.
     # First line typically looks something like:
     #   Microsoft (R) Incremental Linker Version 12.00.31101.0
-    LINKER_VERSION_STRING=`$LINKER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
+    # Reset PATH since it can contain a mix of WSL/linux paths and Windows paths from VS,
+    # which, in combination with WSLENV, will make the WSL layer complain
+    old_path="$PATH"
+    PATH=
+    LINKER_VERSION_STRING=`$LD 2>&1 | $HEAD -n 1 | $TR -d '\r'`
+    PATH="$old_path"
     # Extract version number
     [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
         $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*/\1/'` ]
@@ -569,7 +612,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_LD_VERSION],
     #   This program is free software; [...]
     # If using gold it will look like:
     #   GNU gold (GNU Binutils 2.30) 1.15
-    LINKER_VERSION_STRING=`$LINKER -Wl,--version 2> /dev/null | $HEAD -n 1`
+    LINKER_VERSION_STRING=`$LD -Wl,--version 2> /dev/null | $HEAD -n 1`
     # Extract version number
     if [ [[ "$LINKER_VERSION_STRING" == *gold* ]] ]; then
       [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
@@ -586,7 +629,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_LD_VERSION],
     # or
     #   GNU ld (GNU Binutils for Ubuntu) 2.26.1
 
-    LINKER_VERSION_STRING=`$LINKER -Wl,-v 2>&1 | $HEAD -n 1`
+    LINKER_VERSION_STRING=`$LD -Wl,-v 2>&1 | $HEAD -n 1`
     # Check if we're using the GNU ld
     $ECHO "$LINKER_VERSION_STRING" | $GREP "GNU" > /dev/null
     if test $? -eq 0; then
@@ -606,23 +649,6 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_LD_VERSION],
   AC_MSG_NOTICE([Using $TOOLCHAIN_TYPE $LINKER_NAME version $LINKER_VERSION_NUMBER @<:@$LINKER_VERSION_STRING@:>@])
 ])
 
-# Make sure we did not pick up /usr/bin/link, which is the unix-style link
-# executable.
-#
-# $1 = linker to test (LD or BUILD_LD)
-AC_DEFUN(TOOLCHAIN_VERIFY_LINK_BINARY,
-[
-  LINKER=[$]$1
-
-  AC_MSG_CHECKING([if the found link.exe is actually the Visual Studio linker])
-  $LINKER --version > /dev/null
-  if test $? -eq 0 ; then
-    AC_MSG_RESULT([no])
-    AC_MSG_ERROR([$LINKER is the winenv link tool. Please check your PATH and rerun configure.])
-  else
-    AC_MSG_RESULT([yes])
-  fi
-])
 # Detect the core components of the toolchain, i.e. the compilers (CC and CXX),
 # preprocessor (CPP and CXXCPP), the linker (LD), the assembler (AS) and the
 # archiver (AR). Verify that the compilers are correct according to the
@@ -667,15 +693,42 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
   #
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     # In the Microsoft toolchain we have a separate LD command "link".
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(LD, link)
-    TOOLCHAIN_VERIFY_LINK_BINARY(LD)
+    # Make sure we reject /usr/bin/link (as determined in CYGWIN_LINK), which is
+    # a cygwin program for something completely different.
+    AC_CHECK_PROG([LD], [link$EXE_SUFFIX],[link$EXE_SUFFIX],,, [$CYGWIN_LINK])
+    UTIL_FIXUP_EXECUTABLE(LD)
+    # Verify that we indeed succeeded with this trick.
+    AC_MSG_CHECKING([if the found link.exe is actually the Visual Studio linker])
+
+    # Reset PATH since it can contain a mix of WSL/linux paths and Windows paths from VS,
+    # which, in combination with WSLENV, will make the WSL layer complain
+    old_path="$PATH"
+    PATH=
+
+    "$LD" --version > /dev/null
+
+    if test $? -eq 0 ; then
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([This is the Cygwin link tool. Please check your PATH and rerun configure.])
+    else
+      AC_MSG_RESULT([yes])
+    fi
+
+    PATH="$old_path"
+
     LDCXX="$LD"
+    # jaotc being a windows program expects the linker to be supplied with exe suffix.
+    LD_JAOTC="$LD$EXE_SUFFIX"
   else
     # All other toolchains use the compiler to link.
     LD="$CC"
     LDCXX="$CXX"
+    # jaotc expects 'ld' as the linker rather than the compiler.
+    UTIL_CHECK_TOOLS([LD_JAOTC], ld)
+    UTIL_FIXUP_EXECUTABLE(LD_JAOTC)
   fi
   AC_SUBST(LD)
+  AC_SUBST(LD_JAOTC)
   # FIXME: it should be CXXLD, according to standard (cf CXXCPP)
   AC_SUBST(LDCXX)
 
@@ -683,10 +736,9 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
   TOOLCHAIN_PREPARE_FOR_LD_VERSION_COMPARISONS
 
   if test "x$TOOLCHAIN_MINIMUM_LD_VERSION" != x; then
-    AC_MSG_NOTICE([comparing linker version to minimum version $TOOLCHAIN_MINIMUM_LD_VERSION])
     TOOLCHAIN_CHECK_LINKER_VERSION(VERSION: $TOOLCHAIN_MINIMUM_LD_VERSION,
         IF_OLDER_THAN: [
-          AC_MSG_ERROR([You are using a linker older than $TOOLCHAIN_MINIMUM_LD_VERSION. This is not a supported configuration.])
+          AC_MSG_WARN([You are using a linker older than $TOOLCHAIN_MINIMUM_LD_VERSION. This is not a supported configuration.])
         ]
     )
   fi
@@ -694,17 +746,8 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
   #
   # Setup the assembler (AS)
   #
-  if test "x$TOOLCHAIN_TYPE" != xmicrosoft; then
-    AS="$CC -c"
-  else
-    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
-      # On 64 bit windows, the assember is "ml64.exe"
-      UTIL_LOOKUP_TOOLCHAIN_PROGS(AS, ml64)
-    else
-      # otherwise, the assember is "ml.exe"
-      UTIL_LOOKUP_TOOLCHAIN_PROGS(AS, ml)
-    fi
-  fi
+  # FIXME: is this correct for microsoft?
+  AS="$CC -c"
   AC_SUBST(AS)
 
   #
@@ -712,12 +755,13 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
   #
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     # The corresponding ar tool is lib.exe (used to create static libraries)
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(AR, lib)
+    AC_CHECK_PROG([AR], [lib$EXE_SUFFIX],[lib$EXE_SUFFIX],,,)
   elif test "x$TOOLCHAIN_TYPE" = xgcc; then
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(AR, ar gcc-ar)
+    UTIL_CHECK_TOOLS(AR, ar gcc-ar)
   else
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(AR, ar)
+    UTIL_CHECK_TOOLS(AR, ar)
   fi
+  UTIL_FIXUP_EXECUTABLE(AR)
 ])
 
 # Setup additional tools that is considered a part of the toolchain, but not the
@@ -726,52 +770,41 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
 AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
 [
   if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-    UTIL_LOOKUP_PROGS(LIPO, lipo)
+    UTIL_PATH_PROGS(LIPO, lipo)
+    UTIL_FIXUP_EXECUTABLE(LIPO)
     UTIL_REQUIRE_PROGS(OTOOL, otool)
+    UTIL_FIXUP_EXECUTABLE(OTOOL)
     UTIL_REQUIRE_PROGS(INSTALL_NAME_TOOL, install_name_tool)
-
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(METAL, metal)
-    if test "x$METAL" = x; then
-      AC_MSG_CHECKING([if metal can be run using xcrun])
-      METAL="xcrun -sdk macosx metal"
-      test_metal=`$METAL --version 2>&1`
-      if test $? -ne 0; then
-        AC_MSG_RESULT([no])
-        AC_MSG_ERROR([XCode tool 'metal' neither found in path nor with xcrun])
-      else
-        AC_MSG_RESULT([yes, will be using '$METAL'])
-      fi
-    fi
-
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(METALLIB, metallib)
-    if test "x$METALLIB" = x; then
-      AC_MSG_CHECKING([if metallib can be run using xcrun])
-      METALLIB="xcrun -sdk macosx metallib"
-      test_metallib=`$METALLIB --version 2>&1`
-      if test $? -ne 0; then
-        AC_MSG_RESULT([no])
-        AC_MSG_ERROR([XCode tool 'metallib' neither found in path nor with xcrun])
-      else
-        AC_MSG_RESULT([yes, will be using '$METALLIB'])
-      fi
-    fi
+    UTIL_FIXUP_EXECUTABLE(INSTALL_NAME_TOOL)
   fi
 
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    # Setup the manifest tool (MT)
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(MT, mt)
+    AC_CHECK_PROG([MT], [mt$EXE_SUFFIX], [mt$EXE_SUFFIX],,, [/usr/bin/mt])
+    UTIL_FIXUP_EXECUTABLE(MT)
     # Setup the resource compiler (RC)
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(RC, rc)
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(DUMPBIN, dumpbin)
+    AC_CHECK_PROG([RC], [rc$EXE_SUFFIX], [rc$EXE_SUFFIX],,, [/usr/bin/rc])
+    UTIL_FIXUP_EXECUTABLE(RC)
+    AC_CHECK_PROG([DUMPBIN], [dumpbin$EXE_SUFFIX], [dumpbin$EXE_SUFFIX],,,)
+    UTIL_FIXUP_EXECUTABLE(DUMPBIN)
+    # We need to check for 'msbuild.exe' because at the place where we expect to
+    # find 'msbuild.exe' there's also a directory called 'msbuild' and configure
+    # won't find the 'msbuild.exe' executable in that case (and the
+    # 'ac_executable_extensions' is unusable due to performance reasons).
+    # Notice that we intentionally don't fix up the path to MSBUILD because we
+    # will call it in a DOS shell during freetype detection on Windows (see
+    # 'LIB_SETUP_FREETYPE' in "libraries.m4"
+    AC_CHECK_PROG([MSBUILD], [msbuild$EXE_SUFFIX], [msbuild$EXE_SUFFIX],,,)
   fi
 
   if test "x$OPENJDK_TARGET_OS" != xwindows; then
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(STRIP, strip)
+    UTIL_CHECK_TOOLS(STRIP, strip)
+    UTIL_FIXUP_EXECUTABLE(STRIP)
     if test "x$TOOLCHAIN_TYPE" = xgcc; then
-      UTIL_LOOKUP_TOOLCHAIN_PROGS(NM, nm gcc-nm)
+      UTIL_CHECK_TOOLS(NM, nm gcc-nm)
     else
-      UTIL_LOOKUP_TOOLCHAIN_PROGS(NM, nm)
+      UTIL_CHECK_TOOLS(NM, nm)
     fi
+    UTIL_FIXUP_EXECUTABLE(NM)
     GNM="$NM"
     AC_SUBST(GNM)
   fi
@@ -779,14 +812,25 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
   # objcopy is used for moving debug symbols to separate files when
   # full debug symbols are enabled.
   if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(OBJCOPY, gobjcopy objcopy)
+    UTIL_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
+    # Only call fixup if objcopy was found.
+    if test -n "$OBJCOPY"; then
+      UTIL_FIXUP_EXECUTABLE(OBJCOPY)
+    fi
   fi
 
-  UTIL_LOOKUP_TOOLCHAIN_PROGS(OBJDUMP, gobjdump objdump)
+  UTIL_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
+  if test "x$OBJDUMP" != x; then
+    # Only used for compare.sh; we can live without it. UTIL_FIXUP_EXECUTABLE
+    # bails if argument is missing.
+    UTIL_FIXUP_EXECUTABLE(OBJDUMP)
+  fi
 
   case $TOOLCHAIN_TYPE in
     gcc|clang)
-      UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, c++filt)
+      UTIL_CHECK_TOOLS(CXXFILT, [c++filt])
+      UTIL_CHECK_NONEMPTY(CXXFILT)
+      UTIL_FIXUP_EXECUTABLE(CXXFILT)
       ;;
   esac
 ])
@@ -828,18 +872,14 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
           . $CONFIGURESUPPORT_OUTPUTDIR/build-devkit.info
           # This potentially sets the following:
           # A descriptive name of the devkit
-          BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_NAME])
+          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_NAME])
           # Corresponds to --with-extra-path
-          BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_EXTRA_PATH])
+          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_EXTRA_PATH])
           # Corresponds to --with-toolchain-path
-          BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_TOOLCHAIN_PATH])
+          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_TOOLCHAIN_PATH])
           # Corresponds to --with-sysroot
-          BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_SYSROOT])
-
-          if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-            BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_VS_INCLUDE])
-            BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_VS_LIB])
-          fi
+          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_SYSROOT])
+          # Skip the Window specific parts
         fi
 
         AC_MSG_CHECKING([for build platform devkit])
@@ -849,76 +889,36 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
           AC_MSG_RESULT([$BUILD_DEVKIT_ROOT])
         fi
 
-        # Fallback default of just /bin if DEVKIT_PATH is not defined
+        BUILD_SYSROOT="$BUILD_DEVKIT_SYSROOT"
+
+         # Fallback default of just /bin if DEVKIT_PATH is not defined
         if test "x$BUILD_DEVKIT_TOOLCHAIN_PATH" = x; then
           BUILD_DEVKIT_TOOLCHAIN_PATH="$BUILD_DEVKIT_ROOT/bin"
         fi
         PATH="$BUILD_DEVKIT_TOOLCHAIN_PATH:$BUILD_DEVKIT_EXTRA_PATH"
-
-        BUILD_SYSROOT="$BUILD_DEVKIT_SYSROOT"
-
-        if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-          # For historical reasons, paths are separated by ; in devkit.info
-          BUILD_VS_INCLUDE="${BUILD_DEVKIT_VS_INCLUDE//;/:}"
-          BUILD_VS_LIB="${BUILD_DEVKIT_VS_LIB//;/:}"
-
-          TOOLCHAIN_SETUP_VISUAL_STUDIO_SYSROOT_FLAGS(BUILD_, BUILD_)
-        fi
-      fi
-    else
-      if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-        # If we got no devkit, we need to go hunting for the proper env
-        TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE($OPENJDK_BUILD_CPU, [$TOOLCHAIN_VERSION])
-        TOOLCHAIN_EXTRACT_VISUAL_STUDIO_ENV($OPENJDK_BUILD_CPU, BUILD_)
-
-        # We cannot currently export the VS_PATH to spec.gmk. This is probably
-        # strictly not correct, but seems to work anyway.
-
-        # Convert VS_INCLUDE and VS_LIB into sysroot flags
-        TOOLCHAIN_SETUP_VISUAL_STUDIO_SYSROOT_FLAGS(BUILD_)
       fi
     fi
 
-    if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-      UTIL_REQUIRE_PROGS(BUILD_CC, cl, [$VS_PATH])
-      UTIL_REQUIRE_PROGS(BUILD_CXX, cl, [$VS_PATH])
-
-      # On windows, the assember is "ml.exe". We currently don't need this so
-      # do not require.
-      if test "x$OPENJDK_BUILD_CPU_BITS" = "x64"; then
-        # On 64 bit windows, the assember is "ml64.exe"
-        UTIL_LOOKUP_PROGS(BUILD_AS, ml64, [$VS_PATH])
-      else
-        # otherwise the assember is "ml.exe"
-        UTIL_LOOKUP_PROGS(BUILD_AS, ml, [$VS_PATH])
-      fi
-
-      # On windows, the ar tool is lib.exe (used to create static libraries).
-      # We currently don't need this so do not require.
-      UTIL_LOOKUP_PROGS(BUILD_AR, lib, [$VS_PATH])
-
-      # In the Microsoft toolchain we have a separate LD command "link".
-      UTIL_REQUIRE_PROGS(BUILD_LD, link, [$VS_PATH])
-      TOOLCHAIN_VERIFY_LINK_BINARY(BUILD_LD)
-      BUILD_LDCXX="$BUILD_LD"
-    else
-      if test "x$OPENJDK_BUILD_OS" = xmacosx; then
-        UTIL_REQUIRE_PROGS(BUILD_CC, clang cc gcc)
-        UTIL_REQUIRE_PROGS(BUILD_CXX, clang++ CC g++)
-      else
-        UTIL_REQUIRE_PROGS(BUILD_CC, cc gcc)
-        UTIL_REQUIRE_PROGS(BUILD_CXX, CC g++)
-      fi
-      UTIL_LOOKUP_PROGS(BUILD_NM, nm gcc-nm)
-      UTIL_LOOKUP_PROGS(BUILD_AR, ar gcc-ar lib)
-      UTIL_LOOKUP_PROGS(BUILD_OBJCOPY, objcopy)
-      UTIL_LOOKUP_PROGS(BUILD_STRIP, strip)
-      # Assume the C compiler is the assembler
-      BUILD_AS="$BUILD_CC -c"
-      # Just like for the target compiler, use the compiler as linker
-      BUILD_LD="$BUILD_CC"
-      BUILD_LDCXX="$BUILD_CXX"
-    fi
+    # FIXME: we should list the discovered compilers as an exclude pattern!
+    # If we do that, we can do this detection before POST_DETECTION, and still
+    # find the build compilers in the tools dir, if needed.
+    UTIL_REQUIRE_PROGS(BUILD_CC, [cl cc gcc])
+    UTIL_FIXUP_EXECUTABLE(BUILD_CC)
+    UTIL_REQUIRE_PROGS(BUILD_CXX, [cl CC g++])
+    UTIL_FIXUP_EXECUTABLE(BUILD_CXX)
+    UTIL_PATH_PROGS(BUILD_NM, nm gcc-nm)
+    UTIL_FIXUP_EXECUTABLE(BUILD_NM)
+    UTIL_PATH_PROGS(BUILD_AR, ar gcc-ar)
+    UTIL_FIXUP_EXECUTABLE(BUILD_AR)
+    UTIL_PATH_PROGS(BUILD_OBJCOPY, objcopy)
+    UTIL_FIXUP_EXECUTABLE(BUILD_OBJCOPY)
+    UTIL_PATH_PROGS(BUILD_STRIP, strip)
+    UTIL_FIXUP_EXECUTABLE(BUILD_STRIP)
+    # Assume the C compiler is the assembler
+    BUILD_AS="$BUILD_CC -c"
+    # Just like for the target compiler, use the compiler as linker
+    BUILD_LD="$BUILD_CC"
+    BUILD_LDCXX="$BUILD_CXX"
 
     PATH="$OLDPATH"
 
@@ -959,7 +959,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
   # Check for extra potential brokenness.
   if test  "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     # On Windows, double-check that we got the right compiler.
-    CC_VERSION_OUTPUT=`$CC 2>&1 1>/dev/null | $HEAD -n 1 | $TR -d '\r'`
+    CC_VERSION_OUTPUT=`$CC 2>&1 | $GREP -v 'ERROR.*UtilTranslatePathList' | $HEAD -n 1 | $TR -d '\r'`
     COMPILER_CPU_TEST=`$ECHO $CC_VERSION_OUTPUT | $SED -n "s/^.* \(.*\)$/\1/p"`
     if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
       if test "x$COMPILER_CPU_TEST" != "x80x86" -a "x$COMPILER_CPU_TEST" != "xx86"; then
@@ -969,10 +969,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
       if test "x$COMPILER_CPU_TEST" != "xx64"; then
         AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "x64".])
       fi
-    elif test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
-      if test "x$COMPILER_CPU_TEST" != "xARM64"; then
-        AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "arm64".])
-      fi
     fi
   fi
 
@@ -1055,7 +1051,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
     if test "x$JT_HOME" = x; then
       # JT_HOME is not set in environment, or was deemed invalid.
       # Try to find jtreg on path
-      UTIL_LOOKUP_PROGS(JTREGEXE, jtreg)
+      UTIL_PATH_PROGS(JTREGEXE, jtreg)
       if test "x$JTREGEXE" != x; then
         # That's good, now try to derive JT_HOME
         JT_HOME=`(cd $($DIRNAME $JTREGEXE)/.. && pwd)`

make/autoconf/toolchain_microsoft.m4

@@ -1,714 +0,0 @@
-#
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# The order of these defines the priority by which we try to find them.
-VALID_VS_VERSIONS="2019 2017 2022"
-
-VS_DESCRIPTION_2017="Microsoft Visual Studio 2017"
-VS_VERSION_INTERNAL_2017=141
-VS_MSVCR_2017=vcruntime140.dll
-VS_MSVCP_2017=msvcp140.dll
-VS_ENVVAR_2017="VS150COMNTOOLS"
-VS_USE_UCRT_2017="true"
-VS_VS_INSTALLDIR_2017="Microsoft Visual Studio/2017"
-VS_EDITIONS_2017="BuildTools Community Professional Enterprise"
-VS_SDK_INSTALLDIR_2017=
-VS_VS_PLATFORM_NAME_2017="v141"
-VS_SDK_PLATFORM_NAME_2017=
-VS_SUPPORTED_2017=true
-VS_TOOLSET_SUPPORTED_2017=true
-
-VS_DESCRIPTION_2019="Microsoft Visual Studio 2019"
-VS_VERSION_INTERNAL_2019=142
-VS_MSVCR_2019=vcruntime140.dll
-VS_VCRUNTIME_1_2019=vcruntime140_1.dll
-VS_MSVCP_2019=msvcp140.dll
-VS_ENVVAR_2019="VS160COMNTOOLS"
-VS_USE_UCRT_2019="true"
-VS_VS_INSTALLDIR_2019="Microsoft Visual Studio/2019"
-VS_EDITIONS_2019="BuildTools Community Professional Enterprise"
-VS_SDK_INSTALLDIR_2019=
-VS_VS_PLATFORM_NAME_2019="v142"
-VS_SDK_PLATFORM_NAME_2019=
-VS_SUPPORTED_2019=true
-VS_TOOLSET_SUPPORTED_2019=true
-
-VS_DESCRIPTION_2022="Microsoft Visual Studio 2022"
-VS_VERSION_INTERNAL_2022=143
-VS_MSVCR_2022=vcruntime140.dll
-VS_VCRUNTIME_1_2022=vcruntime140_1.dll
-VS_MSVCP_2022=msvcp140.dll
-VS_ENVVAR_2022="VS170COMNTOOLS"
-VS_USE_UCRT_2022="true"
-VS_VS_INSTALLDIR_2022="Microsoft Visual Studio/2022"
-VS_EDITIONS_2022="BuildTools Community Professional Enterprise"
-VS_SDK_INSTALLDIR_2022=
-VS_VS_PLATFORM_NAME_2022="v143"
-VS_SDK_PLATFORM_NAME_2022=
-VS_SUPPORTED_2022=true
-VS_TOOLSET_SUPPORTED_2022=true
-
-################################################################################
-
-AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
-[
-  if test "x$VS_ENV_CMD" = x; then
-    TARGET_CPU="$1"
-    VS_VERSION="$2"
-    VS_BASE="$3"
-    METHOD="$4"
-
-    UTIL_FIXUP_PATH(VS_BASE, NOFAIL)
-
-    if test "x$VS_BASE" != x && test -d "$VS_BASE"; then
-      # In VS 2017 and VS 2019, the default installation is in a subdir named after the edition.
-      # Find the first one present and use that.
-      if test "x$VS_EDITIONS" != x; then
-        for edition in $VS_EDITIONS; do
-          if test -d "$VS_BASE/$edition"; then
-            VS_BASE="$VS_BASE/$edition"
-            break
-          fi
-        done
-      fi
-
-      AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
-      if test "x$TARGET_CPU" = xx86; then
-        VCVARSFILES="vc/bin/vcvars32.bat vc/auxiliary/build/vcvars32.bat"
-      elif test "x$TARGET_CPU" = xx86_64; then
-        VCVARSFILES="vc/bin/amd64/vcvars64.bat vc/bin/x86_amd64/vcvarsx86_amd64.bat \
-            vc/auxiliary/build/vcvarsx86_amd64.bat vc/auxiliary/build/vcvars64.bat"
-      elif test "x$TARGET_CPU" = xaarch64; then
-        # for host x86-64, target aarch64
-        VCVARSFILES="vc/auxiliary/build/vcvarsamd64_arm64.bat \
-            vc/auxiliary/build/vcvarsx86_arm64.bat"
-      fi
-
-      for VCVARSFILE in $VCVARSFILES; do
-        if test -f "$VS_BASE/$VCVARSFILE"; then
-          VS_ENV_CMD="$VS_BASE/$VCVARSFILE"
-          break
-        fi
-      done
-
-      if test "x$VS_ENV_CMD" = x; then
-        AC_MSG_NOTICE([Warning: None of $VCVARSFILES were found, Visual Studio installation not recognized. Ignoring])
-      else
-        # PLATFORM_TOOLSET is used during the compilation of the freetype sources
-        # (see 'LIB_BUILD_FREETYPE' in libraries.m4) and must be one of 'v100',
-        # 'v110' or 'v120' for VS 2010, 2012 or VS2013
-        eval PLATFORM_TOOLSET="\${VS_VS_PLATFORM_NAME_${VS_VERSION}}"
-      fi
-    fi
-  fi
-])
-
-################################################################################
-
-AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT],
-[
-  if test "x$VS_ENV_CMD" = x; then
-    TARGET_CPU="$1"
-    VS_VERSION="$2"
-    WIN_SDK_BASE="$3"
-    METHOD="$4"
-
-    UTIL_FIXUP_PATH(WIN_SDK_BASE, NOFAIL)
-
-    if test "x$WIN_SDK_BASE" != x && test -d "$WIN_SDK_BASE"; then
-      # There have been cases of partial or broken SDK installations. A missing
-      # lib dir is not going to work.
-      if test ! -d "$WIN_SDK_BASE/lib"; then
-        AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
-        AC_MSG_NOTICE([Warning: Installation is broken, lib dir is missing. Ignoring])
-      elif test -f "$WIN_SDK_BASE/bin/setenv.cmd"; then
-        AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
-        VS_ENV_CMD="$WIN_SDK_BASE/bin/setenv.cmd"
-        if test "x$TARGET_CPU" = xx86; then
-          VS_ENV_ARGS="/x86"
-        elif test "x$TARGET_CPU" = xx86_64; then
-          VS_ENV_ARGS="/x64"
-        elif test "x$TARGET_CPU" = xaarch64; then
-          VS_ENV_ARGS="/arm64"
-        fi
-        # PLATFORM_TOOLSET is used during the compilation of the freetype sources (see
-        # 'LIB_BUILD_FREETYPE' in libraries.m4) and must be 'Windows7.1SDK' for Windows7.1SDK
-        # TODO: improve detection for other versions of SDK
-        eval PLATFORM_TOOLSET="\${VS_SDK_PLATFORM_NAME_${VS_VERSION}}"
-      else
-        AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
-        AC_MSG_NOTICE([Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring])
-      fi
-    fi
-  fi
-])
-
-################################################################################
-# Finds the bat or cmd file in Visual Studio or the SDK that sets up a proper
-# build environment and assigns it to VS_ENV_CMD
-AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
-[
-  # VS2017 provides the option to install previous minor versions of the MSVC
-  # toolsets. It is not possible to directly download earlier minor versions of
-  # VS2017 and in order to build with a previous minor compiler toolset version,
-  # it is now possible to compile with earlier minor versions by passing
-  # -vcvars_ver=<toolset_version> argument to vcvarsall.bat.
-  AC_ARG_WITH(msvc-toolset-version, [AS_HELP_STRING([--with-msvc-toolset-version],
-      [specific MSVC toolset version to use, passed as -vcvars_ver argument to
-       pass to vcvarsall.bat (Windows only)])])
-
-  TARGET_CPU="$1"
-  VS_VERSION="$2"
-  eval VS_COMNTOOLS_VAR="\${VS_ENVVAR_${VS_VERSION}}"
-  eval VS_COMNTOOLS="\$${VS_COMNTOOLS_VAR}"
-  eval VS_INSTALL_DIR="\${VS_VS_INSTALLDIR_${VS_VERSION}}"
-  eval VS_EDITIONS="\${VS_EDITIONS_${VS_VERSION}}"
-  eval SDK_INSTALL_DIR="\${VS_SDK_INSTALLDIR_${VS_VERSION}}"
-  eval VS_ENV_ARGS="\${VS_ENV_ARGS_${VS_VERSION}}"
-  eval VS_TOOLSET_SUPPORTED="\${VS_TOOLSET_SUPPORTED_${VS_VERSION}}"
-
-  VS_ENV_CMD=""
-
-  # When using --with-tools-dir, assume it points to the correct and default
-  # version of Visual Studio or that --with-toolchain-version was also set.
-  if test "x$with_tools_dir" != x; then
-    TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$TARGET_CPU], [$VS_VERSION],
-        [$with_tools_dir/../..], [--with-tools-dir])
-    TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$TARGET_CPU], [$VS_VERSION],
-        [$with_tools_dir/../../..], [--with-tools-dir])
-    if test "x$VS_ENV_CMD" = x; then
-      # Having specified an argument which is incorrect will produce an instant failure;
-      # we should not go on looking
-      AC_MSG_NOTICE([The path given by --with-tools-dir does not contain a valid])
-      AC_MSG_NOTICE([Visual Studio installation. Please point to the VC/bin or VC/bin/amd64])
-      AC_MSG_NOTICE([directory within the Visual Studio installation])
-      AC_MSG_ERROR([Cannot locate a valid Visual Studio installation])
-    fi
-  fi
-
-  if test "x$VS_COMNTOOLS" != x; then
-    TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$TARGET_CPU], [$VS_VERSION],
-        [$VS_COMNTOOLS/../..], [$VS_COMNTOOLS_VAR variable])
-  fi
-  if test "x$PROGRAMFILES" != x; then
-    TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$TARGET_CPU], [$VS_VERSION],
-        [$PROGRAMFILES/$VS_INSTALL_DIR], [well-known name])
-  fi
-  # Work around the insanely named ProgramFiles(x86) env variable
-  PROGRAMFILES_X86="`env | $SED -n 's/^ProgramFiles(x86)=//p'`"
-  if test "x$PROGRAMFILES_X86" != x; then
-    TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$TARGET_CPU], [$VS_VERSION],
-        [$PROGRAMFILES_X86/$VS_INSTALL_DIR], [well-known name])
-  fi
-  TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$TARGET_CPU], [$VS_VERSION],
-      [c:/program files/$VS_INSTALL_DIR], [well-known name])
-  TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$TARGET_CPU], [$VS_VERSION],
-      [c:/program files (x86)/$VS_INSTALL_DIR], [well-known name])
-  if test "x$SDK_INSTALL_DIR" != x; then
-    if test "x$ProgramW6432" != x; then
-      TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$TARGET_CPU], [$VS_VERSION],
-          [$ProgramW6432/$SDK_INSTALL_DIR], [well-known name])
-    fi
-    if test "x$PROGRAMW6432" != x; then
-      TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$TARGET_CPU], [$VS_VERSION],
-          [$PROGRAMW6432/$SDK_INSTALL_DIR], [well-known name])
-    fi
-    if test "x$PROGRAMFILES" != x; then
-      TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$TARGET_CPU], [$VS_VERSION],
-          [$PROGRAMFILES/$SDK_INSTALL_DIR], [well-known name])
-    fi
-    TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$TARGET_CPU], [$VS_VERSION],
-        [c:/program files/$SDK_INSTALL_DIR], [well-known name])
-    TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$TARGET_CPU], [$VS_VERSION],
-        [c:/program files (x86)/$SDK_INSTALL_DIR], [well-known name])
-  fi
-
-  VCVARS_VER=auto
-  if test "x$VS_TOOLSET_SUPPORTED" != x; then
-    if test "x$with_msvc_toolset_version" != x; then
-      VCVARS_VER="$with_msvc_toolset_version"
-    fi
-  fi
-])
-
-################################################################################
-
-AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO],
-[
-  AC_ARG_WITH(toolchain-version, [AS_HELP_STRING([--with-toolchain-version],
-      [the version of the toolchain to look for, use '--help' to show possible values @<:@platform dependent@:>@])])
-
-  if test "x$with_toolchain_version" = xlist; then
-    # List all toolchains
-    AC_MSG_NOTICE([The following toolchain versions are valid on this platform:])
-    for version in $VALID_VS_VERSIONS; do
-      eval VS_DESCRIPTION=\${VS_DESCRIPTION_$version}
-      $PRINTF "  %-10s  %s\n" $version "$VS_DESCRIPTION"
-    done
-
-    exit 0
-  elif test "x$DEVKIT_VS_VERSION" != x; then
-    VS_VERSION=$DEVKIT_VS_VERSION
-    TOOLCHAIN_VERSION=$VS_VERSION
-    # If the devkit has a name, use that as description
-    VS_DESCRIPTION="$DEVKIT_NAME"
-    if test "x$VS_DESCRIPTION" = x; then
-      eval VS_DESCRIPTION="\${VS_DESCRIPTION_${VS_VERSION}}"
-    fi
-    eval VS_VERSION_INTERNAL="\${VS_VERSION_INTERNAL_${VS_VERSION}}"
-    eval MSVCR_NAME="\${VS_MSVCR_${VS_VERSION}}"
-    eval VCRUNTIME_1_NAME="\${VS_VCRUNTIME_1_${VS_VERSION}}"
-    eval MSVCP_NAME="\${VS_MSVCP_${VS_VERSION}}"
-    eval USE_UCRT="\${VS_USE_UCRT_${VS_VERSION}}"
-    eval VS_SUPPORTED="\${VS_SUPPORTED_${VS_VERSION}}"
-    eval PLATFORM_TOOLSET="\${VS_VS_PLATFORM_NAME_${VS_VERSION}}"
-
-    # For historical reasons, paths are separated by ; in devkit.info
-    VS_INCLUDE=${DEVKIT_VS_INCLUDE//;/:}
-    VS_LIB=${DEVKIT_VS_LIB//;/:}
-
-    AC_MSG_NOTICE([Found devkit $VS_DESCRIPTION])
-
-  elif test "x$with_toolchain_version" != x; then
-    # User override; check that it is valid
-    if test "x${VALID_VS_VERSIONS/$with_toolchain_version/}" = "x${VALID_VS_VERSIONS}"; then
-      AC_MSG_NOTICE([Visual Studio version $with_toolchain_version is not valid.])
-      AC_MSG_NOTICE([Valid Visual Studio versions: $VALID_VS_VERSIONS.])
-      AC_MSG_ERROR([Cannot continue.])
-    fi
-    VS_VERSIONS_PROBE_LIST="$with_toolchain_version"
-  else
-    # No flag given, use default
-    VS_VERSIONS_PROBE_LIST="$VALID_VS_VERSIONS"
-  fi
-
-  for VS_VERSION in $VS_VERSIONS_PROBE_LIST; do
-    TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE($OPENJDK_TARGET_CPU, [$VS_VERSION])
-    if test "x$VS_ENV_CMD" != x; then
-      TOOLCHAIN_VERSION=$VS_VERSION
-      eval VS_DESCRIPTION="\${VS_DESCRIPTION_${VS_VERSION}}"
-      eval VS_VERSION_INTERNAL="\${VS_VERSION_INTERNAL_${VS_VERSION}}"
-      eval MSVCR_NAME="\${VS_MSVCR_${VS_VERSION}}"
-      eval VCRUNTIME_1_NAME="\${VS_VCRUNTIME_1_${VS_VERSION}}"
-      eval MSVCP_NAME="\${VS_MSVCP_${VS_VERSION}}"
-      eval USE_UCRT="\${VS_USE_UCRT_${VS_VERSION}}"
-      eval VS_SUPPORTED="\${VS_SUPPORTED_${VS_VERSION}}"
-      # The rest of the variables are already evaled while probing
-      AC_MSG_NOTICE([Found $VS_DESCRIPTION])
-      break
-    fi
-  done
-
-  TOOLCHAIN_DESCRIPTION="$VS_DESCRIPTION"
-  if test "x$VS_SUPPORTED" = "xfalse"; then
-    UNSUPPORTED_TOOLCHAIN_VERSION=yes
-  fi
-])
-
-AC_DEFUN([TOOLCHAIN_EXTRACT_VISUAL_STUDIO_ENV],
-[
-  TARGET_CPU=$1
-
-  AC_MSG_NOTICE([Trying to extract Visual Studio environment variables for $TARGET_CPU])
-  AC_MSG_NOTICE([using $VS_ENV_CMD $VS_ENV_ARGS])
-
-  VS_ENV_TMP_DIR="$CONFIGURESUPPORT_OUTPUTDIR/vs-env-$TARGET_CPU"
-  $MKDIR -p $VS_ENV_TMP_DIR
-
-  # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).
-  # Instead create a shell script which will set the relevant variables when run.
-
-  OLDPATH="$PATH"
-  # Make sure we only capture additions to PATH needed by VS.
-  # Clear out path, but need system dir present for vsvars cmd file to be able to run
-  export PATH=$WINENV_PREFIX/c/windows/system32
-  # The "| cat" is to stop SetEnv.Cmd to mess with system colors on some systems
-  # We can't pass -vcvars_ver=$VCVARS_VER here because cmd.exe eats all '='
-  # in bat file arguments. :-(
-  $FIXPATH $CMD /c "$TOPDIR/make/scripts/extract-vs-env.cmd" "$VS_ENV_CMD" \
-      "$VS_ENV_TMP_DIR/set-vs-env.sh" $VCVARS_VER $VS_ENV_ARGS \
-      > $VS_ENV_TMP_DIR/extract-vs-env.log | $CAT 2>&1
-  PATH="$OLDPATH"
-
-  if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then
-    AC_MSG_NOTICE([Could not succesfully extract the environment variables needed for the VS setup.])
-    AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation.])
-    AC_MSG_NOTICE([To analyze the problem, see extract-vs-env.log and extract-vs-env.bat in])
-    AC_MSG_NOTICE([$VS_ENV_TMP_DIR.])
-    AC_MSG_ERROR([Cannot continue])
-  fi
-
-  # Remove windows line endings
-  $SED -i -e 's|\r||g' $VS_ENV_TMP_DIR/set-vs-env.sh
-
-  # Now set all paths and other env variables by executing the generated
-  # shell script. This will allow the rest of the configure script to find
-  # and run the compiler in the proper way.
-  AC_MSG_NOTICE([Setting extracted environment variables for $TARGET_CPU])
-  . $VS_ENV_TMP_DIR/set-vs-env.sh
-
-  # Extract only what VS_ENV_CMD added to the PATH
-  VS_PATH=${PATH_AFTER/"$PATH_BEFORE"}
-  VS_PATH=${VS_PATH//::/:}
-
-  # Remove any paths containing # (typically F#) as that messes up make. This
-  # is needed if visual studio was installed with F# support.
-  [ VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[^:#]*#[^:]*://g'` ]
-
-  # Sometimes case is off
-  if test -z "$WINDOWSSDKDIR"; then
-    WINDOWSSDKDIR="$WindowsSdkDir"
-  fi
-  # Now we have VS_PATH, VS_INCLUDE, VS_LIB. For further checking, we
-  # also define VCINSTALLDIR and WINDOWSSDKDIR. All are in
-  # unix style.
-])
-
-################################################################################
-# Check if the VS env variables were setup prior to running configure.
-# If not, then find vcvarsall.bat and run it automatically, and integrate
-# the set env variables into the spec file.
-AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
-[
-  # Locate the vsvars bat file and save it as VS_ENV_CMD
-  TOOLCHAIN_FIND_VISUAL_STUDIO
-
-  # If we have a devkit, we don't need to run VS_ENV_CMD
-  if test "x$DEVKIT_VS_VERSION" = x; then
-    if test "x$VS_ENV_CMD" != x; then
-      # We have found a Visual Studio environment on disk, let's extract variables
-      # from the vsvars bat file into shell variables in the configure script.
-      TOOLCHAIN_EXTRACT_VISUAL_STUDIO_ENV($OPENJDK_TARGET_CPU)
-
-      # Now we have VS_PATH, VS_INCLUDE, VS_LIB. For further checking, we
-      # also define VCINSTALLDIR and WINDOWSSDKDIR. All are in
-      # unix style.
-    else
-      # We did not find a vsvars bat file.
-      AC_MSG_ERROR([Cannot locate a valid Visual Studio installation])
-    fi
-  fi
-
-  # At this point, we should have correct variables in the environment
-  AC_MSG_CHECKING([that Visual Studio variables have been correctly extracted])
-
-  if test "x$VCINSTALLDIR" != x || test "x$WINDOWSSDKDIR" != x \
-      || test "x$DEVKIT_NAME" != x; then
-    if test "x$VS_INCLUDE" = x || test "x$VS_LIB" = x; then
-      AC_MSG_RESULT([no; Visual Studio present but broken])
-      AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.])
-    else
-      AC_MSG_RESULT([ok])
-
-      # Turn VS_PATH into TOOLCHAIN_PATH
-      TOOLCHAIN_PATH="$TOOLCHAIN_PATH:$VS_PATH"
-
-      # Convert VS_INCLUDE and VS_LIB into sysroot flags
-      TOOLCHAIN_SETUP_VISUAL_STUDIO_SYSROOT_FLAGS
-    fi
-  else
-    AC_MSG_RESULT([not found])
-
-    if test "x$VS_ENV_CMD" = x; then
-      AC_MSG_NOTICE([Cannot locate a valid Visual Studio or Windows SDK installation on disk])
-    else
-      AC_MSG_NOTICE([Running the extraction script failed])
-    fi
-    AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation.])
-    AC_MSG_NOTICE([To analyze the problem, see extract-vs-env.log and extract-vs-env.bat in])
-    AC_MSG_NOTICE([$VS_ENV_TMP_DIR.])
-    AC_MSG_ERROR([Cannot continue])
-  fi
-])
-
-AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL],
-[
-  DLL_NAME="$1"
-  POSSIBLE_MSVC_DLL="$2"
-  METHOD="$3"
-  if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
-    AC_MSG_NOTICE([Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD])
-
-    # Need to check if the found msvcr is correct architecture
-    AC_MSG_CHECKING([found $DLL_NAME architecture])
-    MSVC_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVC_DLL"`
-    if test "x$OPENJDK_TARGET_CPU" = xx86; then
-      CORRECT_MSVCR_ARCH=386
-    elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-      CORRECT_MSVCR_ARCH=x86-64
-    elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-      # The cygwin 'file' command only returns "PE32+ executable (DLL) (console), for MS Windows",
-      # without specifying which architecture it is for specifically. This has been fixed upstream.
-      # https://github.com/file/file/commit/b849b1af098ddd530094bf779b58431395db2e10#diff-ff2eced09e6860de75057dd731d092aeR142
-      CORRECT_MSVCR_ARCH="PE32+ executable"
-    fi
-    if $ECHO "$MSVC_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
-      AC_MSG_RESULT([ok])
-      MSVC_DLL="$POSSIBLE_MSVC_DLL"
-      AC_MSG_CHECKING([for $DLL_NAME])
-      AC_MSG_RESULT([$MSVC_DLL])
-    else
-      AC_MSG_RESULT([incorrect, ignoring])
-      AC_MSG_NOTICE([The file type of the located $DLL_NAME is $MSVC_DLL_FILETYPE])
-    fi
-  fi
-])
-
-AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
-[
-  DLL_NAME="$1"
-  MSVC_DLL=
-
-  if test "x$OPENJDK_TARGET_CPU" = xx86; then
-    vs_target_cpu=x86
-  elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-    vs_target_cpu=x64
-  elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-    vs_target_cpu=arm64
-  fi
-
-  if test "x$MSVC_DLL" = x; then
-    if test "x$VCINSTALLDIR" != x; then
-      if test "$VS_VERSION" -lt 2017; then
-        # Probe: Using well-known location from Visual Studio 12.0 and older
-        POSSIBLE_MSVC_DLL="$VCINSTALLDIR/redist/$vs_target_cpu/microsoft.vc${VS_VERSION_INTERNAL}.crt/$DLL_NAME"
-      else
-        # Probe: Using well-known location from VS 2017 and VS 2019
-        POSSIBLE_MSVC_DLL="`ls $VCToolsRedistDir/$vs_target_cpu/microsoft.vc${VS_VERSION_INTERNAL}.crt/$DLL_NAME 2> /dev/null`"
-      fi
-      # In case any of the above finds more than one file, loop over them.
-      for possible_msvc_dll in $POSSIBLE_MSVC_DLL; do
-        TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$possible_msvc_dll],
-            [well-known location in VCINSTALLDIR])
-      done
-    fi
-  fi
-
-  if test "x$MSVC_DLL" = x; then
-    # Probe: Check in the Boot JDK directory.
-    POSSIBLE_MSVC_DLL="$BOOT_JDK/bin/$DLL_NAME"
-    TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
-        [well-known location in Boot JDK])
-  fi
-
-  if test "x$MSVC_DLL" = x; then
-    # Probe: Look in the Windows system32 directory
-    WIN_SYSTEMROOT="$SYSTEMROOT"
-    UTIL_FIXUP_PATH(WIN_SYSTEMROOT, NOFAIL)
-    if test "x$WIN_SYSTEMROOT" != x; then
-      POSSIBLE_MSVC_DLL="$WIN_SYSTEMROOT/system32/$DLL_NAME"
-      TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
-          [well-known location in SYSTEMROOT])
-    fi
-  fi
-
-  if test "x$MSVC_DLL" = x; then
-    # Probe: If Visual Studio Express is installed, there is usually one with the debugger
-    if test "x$VS100COMNTOOLS" != x; then
-      WIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
-      UTIL_FIXUP_PATH(WIN_VS_TOOLS_DIR, NOFAIL)
-      if test "x$WIN_VS_TOOLS_DIR" != x; then
-        POSSIBLE_MSVC_DLL=`$FIND "$WIN_VS_TOOLS_DIR" -name $DLL_NAME \
-        | $GREP -i /$vs_target_cpu/ | $HEAD --lines 1`
-        TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
-            [search of VS100COMNTOOLS])
-      fi
-    fi
-  fi
-
-  if test "x$MSVC_DLL" = x; then
-    # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
-    # (This was the original behaviour; kept since it might turn something up)
-    if test "x$VCINSTALLDIR" != x; then
-      if test "x$OPENJDK_TARGET_CPU" = xx86; then
-        POSSIBLE_MSVC_DLL=`$FIND "$VCINSTALLDIR" -name $DLL_NAME \
-        | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $GREP -v arm64 | $HEAD --lines 1`
-        if test "x$POSSIBLE_MSVC_DLL" = x; then
-          # We're grasping at straws now...
-          POSSIBLE_MSVC_DLL=`$FIND "$VCINSTALLDIR" -name $DLL_NAME \
-          | $HEAD --lines 1`
-        fi
-      else
-        POSSIBLE_MSVC_DLL=`$FIND "$VCINSTALLDIR" -name $DLL_NAME \
-        | $GREP x64 | $HEAD --lines 1`
-      fi
-
-      TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
-          [search of VCINSTALLDIR])
-    fi
-  fi
-
-  if test "x$MSVC_DLL" = x; then
-    AC_MSG_CHECKING([for $DLL_NAME])
-    AC_MSG_RESULT([no])
-    AC_MSG_ERROR([Could not find $DLL_NAME. Please specify using --with-msvcr-dll.])
-  fi
-])
-
-AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
-[
-  AC_ARG_WITH(msvcr-dll, [AS_HELP_STRING([--with-msvcr-dll],
-      [path to microsoft C runtime dll (msvcr*.dll) (Windows only) @<:@probed@:>@])])
-
-  if test "x$with_msvcr_dll" != x; then
-    # If given explicitly by user, do not probe. If not present, fail directly.
-    TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL($MSVCR_NAME, [$with_msvcr_dll], [--with-msvcr-dll])
-    if test "x$MSVC_DLL" = x; then
-      AC_MSG_ERROR([Could not find a proper $MSVCR_NAME as specified by --with-msvcr-dll])
-    fi
-    MSVCR_DLL="$MSVC_DLL"
-  elif test "x$DEVKIT_MSVCR_DLL" != x; then
-    TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL($MSVCR_NAME, [$DEVKIT_MSVCR_DLL], [devkit])
-    if test "x$MSVC_DLL" = x; then
-      AC_MSG_ERROR([Could not find a proper $MSVCR_NAME as specified by devkit])
-    fi
-    MSVCR_DLL="$MSVC_DLL"
-  else
-    TOOLCHAIN_SETUP_MSVC_DLL([${MSVCR_NAME}])
-    MSVCR_DLL="$MSVC_DLL"
-  fi
-  AC_SUBST(MSVCR_DLL)
-
-  AC_ARG_WITH(msvcp-dll, [AS_HELP_STRING([--with-msvcp-dll],
-      [path to microsoft C++ runtime dll (msvcp*.dll) (Windows only) @<:@probed@:>@])])
-
-  if test "x$MSVCP_NAME" != "x"; then
-    if test "x$with_msvcp_dll" != x; then
-      # If given explicitly by user, do not probe. If not present, fail directly.
-      TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL($MSVCP_NAME, [$with_msvcp_dll], [--with-msvcp-dll])
-      if test "x$MSVC_DLL" = x; then
-        AC_MSG_ERROR([Could not find a proper $MSVCP_NAME as specified by --with-msvcp-dll])
-      fi
-      MSVCP_DLL="$MSVC_DLL"
-    elif test "x$DEVKIT_MSVCP_DLL" != x; then
-      TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL($MSVCP_NAME, [$DEVKIT_MSVCP_DLL], [devkit])
-      if test "x$MSVC_DLL" = x; then
-        AC_MSG_ERROR([Could not find a proper $MSVCP_NAME as specified by devkit])
-      fi
-      MSVCP_DLL="$MSVC_DLL"
-    else
-      TOOLCHAIN_SETUP_MSVC_DLL([${MSVCP_NAME}])
-      MSVCP_DLL="$MSVC_DLL"
-    fi
-    AC_SUBST(MSVCP_DLL)
-  fi
-
-  AC_ARG_WITH(vcruntime-1-dll, [AS_HELP_STRING([--with-vcruntime-1-dll],
-      [path to microsoft C++ runtime dll (vcruntime*_1.dll) (Windows x64 only) @<:@probed@:>@])])
-
-  if test "x$VCRUNTIME_1_NAME" != "x" && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-    if test "x$with_vcruntime_1_dll" != x; then
-      # If given explicitly by user, do not probe. If not present, fail directly.
-      TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL($VCRUNTIME_1_NAME, [$with_vcruntime_1_dll],
-          [--with-vcruntime-1-dll])
-      if test "x$MSVC_DLL" = x; then
-        AC_MSG_ERROR([Could not find a proper $VCRUNTIME_1_NAME as specified by --with-vcruntime-1-dll])
-      fi
-      VCRUNTIME_1_DLL="$MSVC_DLL"
-    elif test "x$DEVKIT_VCRUNTIME_1_DLL" != x; then
-      TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL($VCRUNTIME_1_NAME, [$DEVKIT_VCRUNTIME_1_DLL], [devkit])
-      if test "x$MSVC_DLL" = x; then
-        AC_MSG_ERROR([Could not find a proper $VCRUNTIME_1_NAME as specified by devkit])
-      fi
-      VCRUNTIME_1_DLL="$MSVC_DLL"
-    else
-      TOOLCHAIN_SETUP_MSVC_DLL([${VCRUNTIME_1_NAME}])
-      VCRUNTIME_1_DLL="$MSVC_DLL"
-    fi
-  fi
-  AC_SUBST(VCRUNTIME_1_DLL)
-
-  AC_ARG_WITH(ucrt-dll-dir, [AS_HELP_STRING([--with-ucrt-dll-dir],
-      [path to Microsoft Windows Kit UCRT DLL dir (Windows only) @<:@probed@:>@])])
-
-  if test "x$USE_UCRT" = "xtrue" && test "x$OPENJDK_TARGET_CPU" != xaarch64; then
-    AC_MSG_CHECKING([for UCRT DLL dir])
-    if test "x$with_ucrt_dll_dir" != x; then
-      if test -z "$(ls -d "$with_ucrt_dll_dir/"*.dll 2> /dev/null)"; then
-        AC_MSG_RESULT([no])
-        AC_MSG_ERROR([Could not find any dlls in $with_ucrt_dll_dir])
-      else
-        AC_MSG_RESULT([$with_ucrt_dll_dir])
-        UCRT_DLL_DIR="$with_ucrt_dll_dir"
-        UTIL_FIXUP_PATH([UCRT_DLL_DIR])
-      fi
-    elif test "x$DEVKIT_UCRT_DLL_DIR" != "x"; then
-      UCRT_DLL_DIR="$DEVKIT_UCRT_DLL_DIR"
-      AC_MSG_RESULT($UCRT_DLL_DIR)
-    else
-      dll_subdir=$OPENJDK_TARGET_CPU
-      if test "x$dll_subdir" = "xaarch64"; then
-        dll_subdir="arm64"
-      elif test "x$dll_subdir" = "xx86_64"; then
-        dll_subdir="x64"
-      fi
-      UCRT_DLL_DIR="$WINDOWSSDKDIR/redist/ucrt/dlls/$dll_subdir"
-      if test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
-        # Try with version subdir
-        UCRT_DLL_DIR="`ls -d $WINDOWSSDKDIR/redist/*/ucrt/dlls/$dll_subdir \
-            2> /dev/null | $SORT -d | $HEAD -n1`"
-        if test -z "$UCRT_DLL_DIR" \
-            || test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
-          AC_MSG_RESULT([no])
-          AC_MSG_ERROR([Could not find any dlls in $UCRT_DLL_DIR])
-        else
-          AC_MSG_RESULT($UCRT_DLL_DIR)
-        fi
-      else
-        AC_MSG_RESULT($UCRT_DLL_DIR)
-      fi
-    fi
-  else
-    UCRT_DLL_DIR=
-  fi
-  AC_SUBST(UCRT_DLL_DIR)
-])
-
-# Setup the sysroot flags and add them to global CFLAGS and LDFLAGS so
-# that configure can use them while detecting compilers.
-# TOOLCHAIN_TYPE is available here.
-# Param 1 - Optional prefix to SYSROOT variables. (e.g BUILD_)
-# Param 2 - Optional prefix to VS variables. (e.g BUILD_)
-AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_SYSROOT_FLAGS],
-[
-  OLDIFS="$IFS"
-  IFS=":"
-
-  # Convert VS_INCLUDE into SYSROOT_CFLAGS
-  for ipath in [$]$2VS_INCLUDE; do
-    $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -I$ipath"
-  done
-
-  # Convert VS_LIB into SYSROOT_LDFLAGS
-  for libpath in [$]$2VS_LIB; do
-    $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -libpath:$libpath"
-  done
-
-  IFS="$OLDIFS"
-
-  AC_SUBST($1SYSROOT_CFLAGS)
-  AC_SUBST($1SYSROOT_LDFLAGS)
-])