Delete filesstudio-master-dev-osx

am: fb35cb606e

Change-Id: I92a13e2fede3694168e878240d481a9b7f67a1e3

87 files changed, 0 insertions, 112654 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 869cb6c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-corba/
-hotspot/
-jaxp/
-jaxws/
-jdk/
-langtools/
-nashorn/
-jb/
-get_source.sh
-build/
diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index ee5ec91..0000000
--- a/.hgignore
+++ /dev/null
@@ -1,7 +0,0 @@
-^build/
-^dist/
-nbproject/private/
-^webrev
-^.hgtip
-^.bridge2
-.DS_Store
diff --git a/.hgtags b/.hgtags
deleted file mode 100644
index a4412ec..0000000
--- a/.hgtags
+++ /dev/null
@@ -1,694 +0,0 @@
-cfeea66a3fa8ca3686a7cfa2d0ce8ab0169f168d jdk7-b24
-cbc8ad9dd0e085a607427ea35411990982f19a36 jdk7-b25
-9410f77cc30c604d1caf7c9fe3a57fa19e1acbe8 jdk7-b26
-11b4dc9f2be3523ef989a0db8459eb56b3045c3a jdk7-b27
-56652b46f328937f6b9b5130f1e4cd80f48868ef jdk7-b28
-31e08f70e88d77c2053f91c21b49a04296bdc59a jdk7-b29
-2dab2f712e1832c92acfa63ec0337048b9422c20 jdk7-b30
-3300a35a0bd56d695b92fe0b34f03ebbfc939064 jdk7-b31
-64da805be725721bf2004e7409a0d7a16fc8ddbc jdk7-b32
-bb1ef4ee3d2c8cbf43a37d372325a7952be590b9 jdk7-b33
-46a989ab932992b2084b946eeb322fa99b9fee6c jdk7-b34
-143c1abedb7d3095eff0f9ee5fec9bf48e3490fc jdk7-b35
-4b4f5fea8d7d0743f0c30d91fcd9bf9d96e5d2ad jdk7-b36
-744554f5a3290e11c71cd2ddb1aff49e431f9ed0 jdk7-b37
-cc47a76899ed33a2c513cb688348244c9b5a1288 jdk7-b38
-ab523b49de1fc73fefe6855ce1e0349bdbd7af29 jdk7-b39
-44be42de6693063fb191989bf0e188de2fa51e7c jdk7-b40
-541bdc5ad32fc33255944d0a044ad992f3d915e8 jdk7-b41
-94052b87287303527125026fe4b2698cf867ea83 jdk7-b42
-848e684279d2ba42577d9621d5b2e5af3823d12d jdk7-b43
-a395e3aac4744cc9033fcd819fad1239a45add52 jdk7-b44
-99846f001ca214015578d593802d26e27246a802 jdk7-b45
-e8a2a4d187773a62f3309b0fa265c13425bc2258 jdk7-b46
-d7744e86dedc21a8ecf6bdb73eb191b8eaf5b0da jdk7-b47
-4ae9f4bfdb98f65bd957e3fe72471b320150b38e jdk7-b48
-aee93a8992d2389121eb610c00a86196f3e2b9b0 jdk7-b49
-5111e13e44e542fe945b47ab154546daec36737d jdk7-b50
-0f0189d55ce4a1f7840da7582ac7d970b3b7ab15 jdk7-b51
-4264c2fe66493e57c411045a1b61377796641e45 jdk7-b52
-c235f4a8559d196879c56af80159f67ee5d0e720 jdk7-b53
-2ef382b1bbd58a68e668391c6145a4b2066c5b96 jdk7-b54
-aea0ace7a1e43619800931d42bbf69c579361c2d jdk7-b55
-ba12117a5e6c918578d6b2a8c693232a33289024 jdk7-b56
-ffd09e767dfa6d21466183a400f72cf62d53297f jdk7-b57
-59b497130f82ec809c245ffb5e521e3a5fabf8af jdk7-b58
-030142474602b4a067662fffc0c8e541de5a78df jdk7-b59
-39565502682c7085369bd09e51640919dc741097 jdk7-b60
-472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61
-c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62
-57f7e028c7ad1806500ae89eb3f4cd9a51b10e18 jdk7-b63
-269c1ec4435dfb7b452ae6e3bdde005d55c5c830 jdk7-b64
-e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
-6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66
-c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
-e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68
-82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69
-175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70
-4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71
-0d7e03b426df27c21dcc44ffb9178eacd1b04f10 jdk7-b72
-3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73
-2c88089b6e1c053597418099a14232182c387edc jdk7-b74
-d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75
-c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
-1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
-ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
-20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
-a3242906c7747b5d9bcc3d118c7c3c69aa40f4b7 jdk7-b80
-8403096d1fe7ff5318df9708cfec84a3fd3e1cf9 jdk7-b81
-e1176f86805fe07fd9fb9da065dc51b47712ce76 jdk7-b82
-6880a3af9addb41541e80ebe8cde6f79ec402a58 jdk7-b83
-2f3ea057d1ad56cf3b269cdc4de2741411151982 jdk7-b84
-cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85
-433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86
-6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87
-82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88
-7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89
-425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90
-97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91
-5f5c33d417f3a14706b09a4a95e65fa7b6fa54d6 jdk7-b92
-5fc102ff48f0e787ce9cc77249841d5ff0941b75 jdk7-b93
-d7f35c61afa092b6357c2c4bce3f298f16620f71 jdk7-b94
-fd3663286e77b9f13c39eee124db2beb079b3ca6 jdk7-b95
-cf71cb5151166f35433afebaf67dbf34a704a170 jdk7-b96
-5e197c942c6ebd8b92f324a31049c5f1d26d40ef jdk7-b97
-6cea9984d73d74de0cd01f30d07ac0a1ed196117 jdk7-b98
-e7f18db469a3e947b7096bfd12e87380e5a042cd jdk7-b99
-b218a53ec7d3d42be61d31d6917a6c5c037b6f56 jdk7-b100
-4193eaf5f1b82794c6a0fb1a8d11af43d1b1d611 jdk7-b101
-a136a51f5113da4dad3853b74a8536ab583ab112 jdk7-b102
-be2aedc4e3b1751c1310f334242ba69e90867f38 jdk7-b103
-f8be576feefce0c6695f188ef97ec16b73ad9cfd jdk7-b104
-9f96a4269d7727dad68864eaab795eafce270311 jdk7-b105
-43096cccf1cee749c2f4e7714ee71f4e9e0f4d7f jdk7-b106
-7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107
-140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
-81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109
-2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110
-9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111
-b852103caf73da70068473777ae867a457bb3ae1 jdk7-b112
-c1df968c4527bfab5f97662a89245f15d12d378b jdk7-b113
-27985a5c6e5268014d25d55886e0ecb96af4763d jdk7-b114
-e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115
-94e9a1bfba8b8d1fe0bfd43b88629b1f27b02a76 jdk7-b116
-7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117
-a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118
-661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
-366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
-2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121
-f1591eed71f64f6eba79fb7426f5616cc4dfea73 jdk7-b122
-ed6950da30cf1e8904b4bdb034d471647942271f jdk7-b123
-024a6755895bf91b5a3c98984c89ee018efbf538 jdk7-b124
-5c4df7e992775c102f08e9f1c0a124b324641b70 jdk7-b125
-b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126
-bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
-57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128
-a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129
-cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130
-5d86d951426aaf340b1ba84ae2d5ab5da65a71e2 jdk7-b131
-0f62a65fb666b337caa585015ab6ea2e60e709ca jdk7-b132
-c6f380693342feadccc5fe2c5adf500e861361aa jdk7-b133
-ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134
-783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135
-2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136
-7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137
-fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138
-7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139
-dcfe74f1c6553c556e7d361c30b0b614eb5e40f6 jdk7-b140
-c6569c5585851dfd39b8de8e021c3c312f51af12 jdk7-b141
-cfbbdb77eac0397b03eb99ee2e07ea00e0a7b81e jdk7-b142
-14b8e7eee1058fd4ed5a2700a2ce14b3616278f1 jdk7-b143
-7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
-55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145
-2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
-d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
-f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01
-69f592185747226a9c765a9fe139c1d34d616f9c jdk8-b02
-587bb549dff83131b65f40aa51864f69562f34a7 jdk8-b03
-0b66a233bfb9ba2ebda1e5cdfdb0373d6c1e3c69 jdk8-b04
-b910aac18c772b823b1f7da03e2c6528725cc6de jdk8-b05
-28cf2aec4dd7c3c75efc1c15078522467c781a6d jdk8-b06
-0db7ae9f2b1017124c779bccd016c976928859a0 jdk8-b07
-fb1bc13260d76447e269e843859eb593fe2a8ab2 jdk8-b08
-8adb70647b5af5273dfe6a540f07be667cd50216 jdk8-b09
-a6c4c248e8fa350c35014fa94bab5ac1a1ac3299 jdk8-b10
-1defbc57940a56f0aa41e9dee87b71e8c8b71103 jdk8-b11
-8e2104d565baee473895d5eba20e39f85ab4bf9f jdk8-b12
-26fb81a1e9ceb9baffba216acd9ded62e9e9d5ab jdk8-b13
-23aa7f2c80a2fa354c80decf03e7c2018177ef4e jdk8-b14
-a4f28069d44a379cda99dd1d921d19f819726d22 jdk8-b15
-4e06ae613e99549835896720c7a68c29ad5543f5 jdk8-b17
-4e06ae613e99549835896720c7a68c29ad5543f5 jdk8-b16
-7010bd24cdd07bc7daef80702f39124854dec36c jdk8-b18
-237bc29afbfc6f56a4fe4a6008e2befb59c44bac jdk8-b19
-5a5eaf6374bcbe23530899579fed17a05b7705f3 jdk8-b20
-cc771d92284f71765eca14d6d08703c4af254c04 jdk8-b21
-7ad075c809952e355d25030605da6af30456ed74 jdk8-b22
-60d6f64a86b1e511169d264727f6d51415978df0 jdk8-b23
-1a5f1d6b98d6827cdb529a4abe6e52a886d944f4 jdk8-b24
-221a378e06a326f45e5d89e2123cd6323e0181d1 jdk8-b25
-2accafff224ae39caf5f532c305251ba624bf2c0 jdk8-b26
-1533dfab9903e4edcfead3b0192643f38c418b9b jdk8-b27
-6e2541d60f4e342b5b67140271d7611643929dc3 jdk8-b28
-41460de042580bc4a4ce3f863779c66f39cb8578 jdk8-b29
-6cea54809b51db92979c22fd8aa8fcb1cb13d12e jdk8-b30
-0b66f43b89a6c0ac1c15d7ec51992c541cdc9089 jdk8-b31
-88176171e940f02916a312c265a34c32552a8376 jdk8-b32
-42f275168fa5d9e7c70b246614dca8cf81f52c2e jdk8-b33
-894a478d2c4819a1a0f230bd7bdd09f3b2de9a8c jdk8-b34
-5285317ebb4e8e4f6d8d52b5616fa801e2ea844d jdk8-b35
-6a6ba0a07f33d37a2f97b1107e60c6a9a69ec84d jdk8-b36
-b2972095a4b1e2a97409b7c3df61f3b263a5ce14 jdk8-b37
-d939bd0ab13c16647ffa38cc4b64fb31b7d44e10 jdk8-b38
-8927dd68aee3fa54a1a698e2980e1b2f6c7c12c1 jdk8-b39
-a2b2d435f1d275fa8010774c653197c64e326d3a jdk8-b40
-1a8c7c530f8a9b7f5bdb9b0693b2f5435ca5205e jdk8-b41
-1ce5dc16416611c58b7480ca67a2eee5153498a6 jdk8-b42
-661c9aae602bbd9766d12590800c90f1edd1d8dd jdk8-b43
-e4f81a817447c3a4f6868f083c81c2fb1b15d44c jdk8-b44
-633f2378c904c92bb922a6e19e9f62fe8eac14af jdk8-b45
-27fa766a2298ba8347dc198f0cf85ba6618e17db jdk8-b46
-1dcb4b7b9373e64e135c12fe1f8699f1f80e51e8 jdk8-b47
-3f6c72d1c2a6e5c9e7d81c3dc984886678a128ad jdk8-b48
-c97b99424815c43818e3cc3ffcdd1a60f3198b52 jdk8-b49
-2fd67618b9a3c847780ed7b9d228e862b6e2824c jdk8-b50
-57c0aee7309050b9d6cfcbd202dc704e9260b377 jdk8-b51
-8d24def5ceb3b8f2e857f2e18b2804fc59eecf8d jdk8-b52
-febd7ff5280067ca482faaeb9418ae88764c1a35 jdk8-b53
-c1a277c6022affbc6855bdfb039511e73fbe2395 jdk8-b54
-b85b44cced2406792cfb9baab1377ff03e7001d8 jdk8-b55
-76844579fa4b30929731115b237e477181a82394 jdk8-b56
-522dfac8ca4d07c0b74025d4ac3b6e5feefbb829 jdk8-b57
-9367024804874faf8e958adeb333682bab1c0c47 jdk8-b58
-dae9821589ccd2611bdf7084269b98e819091770 jdk8-b59
-e07f499b9dccb529ecf74172cf6ac11a195ec57a jdk8-b60
-20ff117b509075c3aec4ee3a57990ecd5db5df9c jdk8-b61
-8a3fe0ae06a8cc21347da5a18384b0aa6c2349f5 jdk8-b62
-3229597524cab4239325bc3602df6c486397a511 jdk8-b63
-1c8370a55b305d35353346202bde042ba9e8a9fd jdk8-b64
-b772de306dc24c17f7bd1398531ddeb58723b804 jdk8-b65
-13bb8c326e7b7b0b19d78c8088033e3932e3f7ca jdk8-b66
-9a6ec97ec45c1a62d5233cefa91e8390e380e13a jdk8-b67
-cdb401a60cea6ad5ef3f498725ed1decf8dda1ea jdk8-b68
-6ee8080a6efe0639fcd00627a5e0f839bf010481 jdk8-b69
-105a25ffa4a4f0af70188d4371b4a0385009b7ce jdk8-b70
-51ad2a34342055333eb5f36e2fb514b027895708 jdk8-b71
-c1be681d80a1f1c848dc671d664fccb19e046a12 jdk8-b72
-93b9664f97eeb6f89397a8842318ebacaac9feb9 jdk8-b73
-b43aa5bd8ca5c8121336495382d35ecfa7a71536 jdk8-b74
-2a713921952cbd77a1e699626976cb6cdfe3e57e jdk8-b75
-278af9fc67e7eba2884936b49ec07345f423aabb jdk8-b76
-3933eebc659d58c597aa8cb4b3e58f2250ce3e1a jdk8-b77
-fd1a5574cf68af24bfd52decc37ac6361afb278a jdk8-b78
-91d35211e74464dca5edf9b66ab01d0d0d8cded7 jdk8-b79
-907a926d3c96472f357617b48b6b968ea855c23c jdk8-b80
-145dbc56f931c134e837b675b9e6e7bf08902e93 jdk8-b81
-29153d0df68f84162ffe8c2cf4f402a3f2245e85 jdk8-b82
-466685ba01bfb7bc1e1ac61490fd8c0f3cc18763 jdk8-b83
-01f631f89fa392b4e484d0812c40ea8f9d2353aa jdk8-b84
-7fc358f5943676b82f1dccd3152b1ac07d92e38b jdk8-b85
-df9b5240f0a76c91cfe1a5b39da4d08df56e05be jdk8-b86
-b9415faa7066a4d3b16d466556d5428446918d95 jdk8-b87
-e1a929afcfc492470d50be0b6b0e8dc77d3760b9 jdk8-b88
-892a0196d10c67f3a12f0eefb0bb536e423d8868 jdk8-b89
-69b773a221b956a3386933ecdbfeccee0edeac47 jdk8-b90
-cb51fb4789ac0b8be4056482077ddfb8f3bd3805 jdk8-b91
-3a36c926a7aafa9d4a892a45ef3678e87ad8359b jdk8-b92
-27c51c6e31c1ef36afa0e6efb031f9b13f26c12b jdk8-b93
-50d2bde060f2a9bbbe4da0c8986e20aca61f2e2e jdk8-b94
-785d07fe38901ecc1b7e0145e53e1c3da9361fee jdk8-b95
-c156084add486f941c12d886a0b1b2854795d557 jdk8-b96
-a1c1e8bf71f354f3aec0214cf13d6668811e021d jdk8-b97
-0d0c983a817bbe8518a5ff201306334a8de267f2 jdk8-b98
-59dc9da813794c924a0383c2a6241af94defdfed jdk8-b99
-d2dcb110e9dbaf9903c05b211df800e78e4b394e jdk8-b100
-9f74a220677dc265a724515d8e2617548cef62f1 jdk8-b101
-5eb3c1dc348f72a7f84f7d9d07834e8bbe09a799 jdk8-b102
-b7e64be81c8a7690703df5711f4fc2375da8a9cb jdk8-b103
-96c1b9b7524b52c3fcefc90ffad4c767396727c8 jdk8-b104
-5166118c59178b5d31001bc4058e92486ee07d9b jdk8-b105
-8e7b4d9fb00fdf1334376aeac050c9bca6d1b383 jdk8-b106
-0874bb4707b723d5bb108d379c557cf41529d1a7 jdk8-b107
-9286a6e61291246d88af713f1ef79adeea30fe2e jdk8-b108
-91f47e8da5c60de58ed195e9b57f3bf192a18f83 jdk8-b109
-4faa09c7fe555de086dd9048d3c5cc92317d6f45 jdk8-b110
-d086227bfc45d124f09b3bd72a07956b4073bf71 jdk8-b111
-547316ea137d83d9c63083a9b83db64198fe0c81 jdk8-b112
-6ba4c7cb623ec612031e05cf8bf279d8f407bd1e jdk8-b113
-4f2011496393a26dcfd7b1f7787a3673ddd32599 jdk8-b114
-763ada2a1d8c5962bc8c3d297e57c562d2e95338 jdk8-b115
-cbfe5da942c63ef865cab4a7159e01eff7d7fcf5 jdk8-b116
-a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117
-0a6db1aac998cdc88e52f9adb97d40ca5b0f1da6 jdk8-b118
-9e90215673be68a3e77a9e444e4232076373734d jdk8-b119
-cd3825b2983045784d6fc6d1729c799b08215752 jdk8-b120
-1e1f86d5d4e22c15a9bf9f1581acddb8c59abae2 jdk8-b121
-347009c5881668b1e44f64d56d4a96cb20a183fa jdk8-b122
-ff1478785e43718146ffbce97e007f39c3bcaa32 jdk8-b123
-c330fa67c4daffdc86527f1a24941aa5a3500098 jdk8u20-b00
-790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b124
-78abb27c27d988a86e6c82b2cce03cdc04211127 jdk8u20-b01
-790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b125
-9ccce5bf1b0ea0d3f3fb871be069f305f9cea530 jdk8-b126
-2e2ffb9e4b690c63b32142861177390e0f2c40e9 jdk8-b127
-101e42de46869e6604fbf095e1666fbf07fcb93c jdk8-b128
-1e5fe865491300cd0c63261ecf8d34e621e1345c jdk8-b129
-cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02
-6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03
-7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04
-69e0af208dad70fdef65a89ab2c4c468ed9e24b8 jdk8u20-b05
-839546caab1285c7699a9c2aa1467f57c9ea7f30 jdk8-b130
-0c38dfecab2ad9f9b5b5edf54b991602147cd040 jdk8-b131
-2a8f4c022aa03e7916223f3291517dbcc38e07cd jdk8-b132
-c41935d79b8744af8b7b56cd4d4ab781027fb22e jdk8u5-b01
-6f3357d3dbf83c1ef0098bcb853e3aa3b26f4cb8 jdk8u5-b02
-794b4365b6884e9a15f0840792539f5821814127 jdk8u5-b03
-c200d6cb184056e44afe7102913004b717896aa3 jdk8u5-b04
-eb537d7c31e069ac10de0901727515743f7535d2 jdk8u11-b00
-eb537d7c31e069ac10de0901727515743f7535d2 jdk8u5-b05
-75cdae18810a479cc3c0fe8eb9055d968ae31c63 jdk8u5-b06
-b1585984f29320737ca0da5af029b1225a75c476 jdk8u5-b07
-a445d4130af79027fd9d6675b1ad7a8990225749 jdk8u5-b08
-e5403ff707fbd828e56bf390931f236028f9617b jdk8u5-b09
-fae51c73a06d71304c9dbff22984ee501812b972 jdk8u5-b10
-dd3bd272ceedbd69fabafc531b6b1e056659f733 jdk8u5-b11
-3e05b6ae0a1e2bd7352462e9bf8e7262246fb77f jdk8u5-b12
-d81e301cae70f1f95f4bb976ec053c915dee503a jdk8u5-b13
-19dd42ebf97c187fbf53884f45dca84274909c3e jdk8u5-b31
-397902f53444be14aa4e261cd47064fac82919c9 jdk8u11-b01
-6ffd41be920a3e63c5767f36ac725e9e3bf5ec50 jdk8u11-b02
-3078ab9b8d4ad37cf18bf6a1ed49c8015e70ec73 jdk8u11-b03
-7be4371ce4ed33cf779606ef3b6256f316898e08 jdk8u11-b04
-97c6d6a8e5bb3dfc24b9a32711aa0906ea110e23 jdk8u11-b05
-5ea1a19659427ea813ae4a00ae9d54338c7faec6 jdk8u11-b06
-fe460afb120e2312769454f4630cccd406ded3f6 jdk8u11-b07
-81f3392f551c45578cabe29552c670b87170d325 jdk8u11-b08
-390084098df7bffecd0eb2318facc6f0f9a46b70 jdk8u11-b09
-6d324f36e2448f486d0caa67f70e5a6cf5ac6c0d jdk8u11-b10
-f0b9fee1d40a6aae31be4780f70aba02148ec54c jdk8u11-b11
-e85bf9b28eb7f4098eeb25ba0e3afed34058ef09 jdk8u11-b12
-66b17e2403b04cfe98dc1cce270f15ed817d0336 jdk8u11-b31
-ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06
-cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02
-6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03
-7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04
-69e0af208dad70fdef65a89ab2c4c468ed9e24b8 jdk8u20-b05
-ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06
-6403ef94cb0db32d9221a5e8f09f3664cd7744dc jdk8u20-b07
-b7750b6ee1578fd5b2b1f6758f905b332503d8ed jdk8u20-b08
-d420eae635c42be98b166e1ce9c64fc0a8825529 jdk8u20-b09
-cc4ca2ff0afcfb932da6fa4fffdd01f08e4ff71b jdk8u20-b10
-61291eee163ab5bbe0b38b37b77673bac9bf5310 jdk8u20-b11
-2feecdcd7b677f3baf9df6e8ea46f7e08c7e4411 jdk8u20-b12
-26764db977ecb590cdee637d27996a87cdd9507e jdk8u20-b13
-548afd2496385263874c0ce970158764166b1156 jdk8u20-b14
-12a1fd80b05aa9c5daab22ca5fab8e2c9c3df61c jdk8u20-b15
-4095a7a49a9ea95f4c59f936acf45ca1f87b8fff jdk8u20-b16
-3a49a08a2e3991a10e6bec531e9dbfa7c503fcb4 jdk8u20-b17
-1695032e51faa36ed9c39b2817baa374ca361513 jdk8u20-b18
-2f40422f564b892a26cb04c62885bb5bc85984e3 jdk8u20-b19
-5b76ecd0cdcf899261da2c9965862771f6da4e26 jdk8u20-b20
-0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u20-b21
-6c1fb59fa5d7095d93a023553a949f873f324c6b jdk8u20-b22
-b14daf2459c5430dfe5d435483d6f424cff09584 jdk8u20-b23
-1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b24
-1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b25
-d1a7ea2c3e1091e0df1285963328a96f475f240d jdk8u20-b26
-3229d7b76babcf6710b3a965a2eda3f3bb2aa972 jdk8u20-b31
-9955a899edb359f2dc1704ea86044e9819cb805d jdk8u20-b32
-97c6d6a8e5bb3dfc24b9a32711aa0906ea110e23 jdk8u25-b00
-c4cfb4376f5916c5d7eb1f39a0e23402de0d9818 jdk8u25-b01
-b4d29a751077e5500e766b8104dd1cb7148a550f jdk8u25-b02
-d3df54be114a5c41d4881b61cd42fbb0e52aaf4a jdk8u25-b03
-64e7567a8539078a678853a384340eee469168b0 jdk8u25-b04
-6de13ae93be20b97f53e3837739947d59fb4fd65 jdk8u25-b05
-69d17ee59c0e77033aca293501a642d0abc20c85 jdk8u25-b06
-561d066eaa6428088b4f7e273a8caed90e8f6073 jdk8u25-b07
-c2a5ad21d01c5d921c4e928edcb14cc3d61eb62b jdk8u25-b08
-1249614d7f1d9bf8443f0abd0622b4d2a3ab0638 jdk8u25-b09
-0c5d41165be3f4bb989bd84283c2df3e37b9845d jdk8u25-b10
-cc5ab3e0fe815ae80bb52fa5affcb35ee0f51cff jdk8u25-b11
-c35e73e4acd8ed03e77e8e20023bac115c7dfe38 jdk8u25-b12
-5d990a43c996ef039c6619e55215d589e09d1022 jdk8u25-b13
-4429ea47ee6eca6b8a1dbda1950566ee821ba19d jdk8u25-b14
-09eaef69f384ecf8ec0342b87a8b150740941140 jdk8u25-b15
-f0a48c214c46b7351ff8e6d6b6dc533463a4be21 jdk8u25-b16
-d117f01bfb4f34668ac216c9837e88acead14dce jdk8u25-b17
-efac90a2da447c2b2d43ee1b1e20c0828659f9c5 jdk8u25-b18
-1a0b4ec68abc4e9248ca6041fff04612674a9b9f jdk8u25-b31
-cc8541804eb47d86b30c5b005c6fa6ecb6a53538 jdk8u25-b32
-ec5219b942d277059d89063fb3702bc5e076dfd0 jdk8u25-b33
-6db0898d3f90ad9eae2f017299314b88766446e3 jdk8u31-b00
-85792859f3bdd6a2c1bdfcf2828bb2730e06ac3c jdk8u31-b01
-4898a7460ae620ac5356cb224e1fdf3c29312533 jdk8u31-b02
-886ace09d0934d5410572764685f13119d523823 jdk8u31-b03
-e2d32fe85fb93ce5179c25f5bfd49750a85c9342 jdk8u31-b04
-97de4d73edf1435c9b87d765d2ad91bb16c8d913 jdk8u31-b05
-f1b61760d01de6ad8d360227ac6c2122765680a2 jdk8u31-b06
-e9cbffb6c1119f3ef39c68db53c36c5e544c0d3c jdk8u31-b07
-4cec543118e7720d6105f25b60742d25a458cab7 jdk8u31-b08
-ea4b31ec437d74c62b844bd8b35f0bc3a27915b4 jdk8u31-b09
-01a98532348477a84b6e3c322fdd12dfed28d96d jdk8u31-b10
-ec85d5d0e3c05b0b6d61f4fc3f41313448ed9b05 jdk8u31-b11
-ca98e3e9727ffdcde2c9980668d0c7f344261938 jdk8u31-b12
-fde671d8b2537b6be61f67e583164b5b8b33ac5b jdk8u31-b13
-a198f93b1e0be5edce7a351b1399cb5c4e64c8f4 jdk8u31-b31
-99c79d83152585991682bd86e21fdcfe6f6ab9b2 jdk8u31-b32
-cf4ebf47413902376f66d2cddaf0282d49699ba7 jdk8u31-b33
-685af74060e723783f83c84040c04902674e2e1f jdk8u31-b34
-0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00
-f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01
-b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02
-a0224ac4135108efdbcf316c7c4b02f8a93c35fe jdk8u40-b03
-e9473185d77a9278e47fc916a255c4905aa74d98 jdk8u40-b04
-7e286a0c90fb26766b91e3a19467848f39d1f973 jdk8u40-b05
-8881a63f7f00a4a5611800db7715aecc8f6b3601 jdk8u40-b06
-cf9afcfcb7a41b892fc896c1dbf245d5dcc42395 jdk8u40-b07
-515a912fb5a9a61774fa2afa10f4472589be5602 jdk8u40-b08
-0958d0a9f44efcebe30b17b07240abaa42a2112b jdk8u40-b09
-1053aeab6b12d5cd4e063bf9ee37f20811450084 jdk8u40-b10
-2ffefbac794be27e0c60d7e5f2cb598f04ec2411 jdk8u40-b11
-3e6d3c8810ee495ba599443e29b0dc72c0dd53fd jdk8u40-b12
-43ccc2b9d5b7c06baca33162c6aff8900fa76b65 jdk8u40-b13
-df659b8b0bc82214358e2f0ef340612011d5ed3b jdk8u40-b14
-60d2bf063f7d8baa4e0954b6400aa6d30f9064f9 jdk8u40-b15
-64790e9792f88fadd9d25eaf4dcba7e6e96664de jdk8u40-b16
-e1c506c8e1db7356d120dd7d22b2c50276b6bcee jdk8u40-b17
-83d1d42c3df409c87ef7cb0126343a009857ca71 jdk8u40-b18
-ae4980d195b64eec58884b233d7efd312205bac8 jdk8u40-b19
-b31a07adaef50dacba20e376cff6f1096e745092 jdk8u40-b20
-765a17e75fd622f7b892381e23c9b2c531d416f0 jdk8u40-b21
-b6d03a810a61116268fea08517a9632bd66a7363 jdk8u40-b22
-5dd2ad6c7911a1e21f15a28f13ffad662378a3be jdk8u40-b23
-5b37e6757d7c95c9c58b07fb3c9eba234567385a jdk8u40-b24
-e26f15704e37f28acebb22378c4785891aaec637 jdk8u40-b25
-7a552439756eaad0618ae82a94c034edb65f5d7e jdk8u40-b26
-12deacac825756e266e91a906db9edab73c4c90b jdk8u40-b27
-eee2ebbb97f136cd458d4f3a825ee40d0046f425 jdk8u40-b31
-b92f3d486e47d29dfb1ea2096db295077328368e jdk8u40-b32
-8b3c10f939d77adacf2a3ff7510de66bd024cfe4 jdk8u40-b33
-ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00
-635ba0c81b894a88ff737fefc9d7af398f761643 jdk8u45-b01
-801c65bb74b770600a2d48189764e416e5cfe265 jdk8u45-b02
-7d11a7eee8c0512fa15d3ed2dcded5391b0c091d jdk8u45-b03
-3d79ef8a102ffe22b083d07649a1d9e22cf784b6 jdk8u45-b04
-45f8fc9d30021026a5101c8946af98f7c079b537 jdk8u45-b05
-9a5843fdd2cf8120515d98572440c5c35118254d jdk8u45-b06
-74ef61db0fe02e3eaa5156a7bab9f00f2a2143de jdk8u45-b07
-0c10bc33556383b8e665998c62145a8398e7f7ef jdk8u45-b08
-733d16eb42cb105749588c9b93cc408155ed99ad jdk8u45-b09
-9a343fd13810a8f09d3dd4a9e2e20791bb866166 jdk8u45-b10
-6738b8755c80905e3eecedf94e27f03d23f02ba9 jdk8u45-b11
-54709b761404dd3bc1b58acf5582fa9bd70ff59a jdk8u45-b12
-6b2f1bf5c72873d01b37103fc20ac7a63e7881dd jdk8u45-b13
-15b679d327da9ee99c05d7ddd75512ce335d5994 jdk8u45-b14
-438cc91b51330a61a790f0a0ac64816b565d25f0 jdk8u45-b15
-5a4ccc33ab26b635f91ddd424742b0009a37bcc0 jdk8u45-b31
-4597cb5171773416c4b2e1843db8592a69ff7a99 jdk8u45-b32
-5d158dedeb68fdcb58f3c66ff61d64d5d1ea47c3 jdk8u45-b33
-ebebf3d201322c5ac421a4b97ce14293c3963c2a jdk8u45-b34
-8f4dba55bb2a4a767067a89523346b54f0be9e19 jdk8u45-b35
-f85b9174094cfa8f250b115e591601602f142f76 jdk8u45-b36
-ac6b7b573c39e6a9b95c599c2ddecf1858e3fe88 jdk8u45-b37
-a1682688c9aec33c172146ce4be8d3969e7d76bb jdk8u51-b00
-e04f2ee2d03d9927d2012286a9bcbf511eb887ae jdk8u51-b01
-4dee64570ad013eb5e1cb16304f9eff558c1c5e9 jdk8u51-b02
-df8e9cbe5a8a7ce9cf2e0a78910302d08e2dbb53 jdk8u51-b03
-1d29a8f9bd262c4f3556e0250db80d8dc64d95d3 jdk8u51-b04
-046d1cfaedc892bfd49570d42dd655338278d476 jdk8u51-b05
-7875bd6e35fb6af4b150dda213d7812bdb9fcba1 jdk8u51-b06
-2c7a34442763e809d2cf1459d5b8d6d5528f6494 jdk8u51-b07
-a96b442d99131e87c7c974a0fa277a5f971732c6 jdk8u51-b08
-3a95f1e13da9720a6243c0bd41688544b037e182 jdk8u51-b09
-d99f3f935397fdc65dcb776a97110e8ff5cc519c jdk8u51-b10
-29612174658436601ba833993227ae96117f632c jdk8u51-b11
-f07a9ef02d513435e19fd70abcce2871d1c91342 jdk8u51-b12
-6ef21f3e0946aaab8dc1f4e9cad21dacb97c4f8c jdk8u51-b13
-5a2078b398485d21fa6577cf9481aa488d2e28d0 jdk8u51-b14
-54b6481aa9e2f39699a96a4572b825b6d81f434f jdk8u51-b15
-3ee37a71b2ab50e1e47febab6b69771b6846ba6b jdk8u51-b16
-58f6ddf5d59fffc52d190d82890ba25698fb80e3 jdk8u51-b31
-3dcabe6d7fdd37e73ebdd82d414c4939a50b58b7 jdk8u51-b32
-586cfdfb13dd3f3b787d4fc1de7a03abd3a2457d jdk8u51-b33
-ad2f7ed088f1ce14564e573611c2d10635fbfab3 jdk8u51-b34
-ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00
-acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01
-2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02
-590cc3ca1fec083de3543b18b0062651b597e376 jdk8u60-b03
-d8d408861c2094c24e9757a67bf2941ed37ce01f jdk8u60-b04
-e532f3672f635bd83c673c349b7563db6dd470bb jdk8u60-b05
-74dbdbcb6aac9fd62f3599ad4e0a1f930b1e9ac1 jdk8u60-b06
-ea714a39e902fb8729f71f2d0f634855646e297d jdk8u60-b07
-0785e45b19c864264f2054a8130c49fe6f70925c jdk8u60-b08
-da6d0717c74a1e2ae4498bf4dc230e20686517ed jdk8u60-b09
-39cd90aa447ae87ed3b2968dcf1a90d08fff964d jdk8u60-b10
-db15b96c78126b2c8a8e19dcc65cdd0b246bd12b jdk8u60-b11
-ba0772198525025803b0fddd6a628fc2416b3b85 jdk8u60-b12
-6ff963c0dd414da5973a00c59b9ce7feb327a8ed jdk8u60-b13
-455a74ebdf59e91116e58d1545b15fd143624e36 jdk8u60-b14
-7ed130e10665ae5bed82aa8c4cdc18373292a6d7 jdk8u60-b15
-08a417ec9b3eea2f02eb02c7b7635f9701813f65 jdk8u60-b16
-ec24cc303a2cfeb10ff0a5fb7b3d49ef47bb66f7 jdk8u60-b17
-d1d9eb953fbbe1f63a6badb0742508ae5f0d3ab5 jdk8u60-b18
-ff2ddaa4ea3292e2f0931a9a0c3feb33288d7d7f jdk8u60-b19
-c641f979dff0d28dcdc4f303e9d93dda3079a456 jdk8u60-b20
-99d323d5830fad8551038da15113639d8518a8e6 jdk8u60-b21
-01bb22b4ebb6348efa14726ba139858d6defefcd jdk8u60-b22
-91e6153db0df9245c4b60197c78f72e510026b2c jdk8u60-b23
-280834e00e6267fae1ae2a86a8bd7d1fdd160cba jdk8u60-b24
-be2ddf520d263ea27a075f895d93adada6702027 jdk8u60-b25
-d3bdbc19827e1a97e046b65e39cb9c7255d4603b jdk8u60-b26
-d50c3672fd185a4ca074c43d261edfcb1df7bc54 jdk8u60-b27
-cdc5223800ccf9607e19740d41429dacca03c623 jdk8u60-b31
-d7f8f147ff1d78987a4d963b2eda1477804cccec jdk8u60-b32
-45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u52-b06
-2b07cd3f89aab19a2f7f119f3d885b776342efcc jdk8u52-b07
-45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u65-b00
-566b0467f9b3dc7053e3a998b1ddec2243ee09d9 jdk8u65-b01
-760c71b8c3f4e5d2c1b52bd165149621d4ac8b98 jdk8u65-b02
-159ed2ae97c93d024bc0212595a09e8cc9b08958 jdk8u65-b03
-62625c423592073a935388bf46a78a3747c6fbe3 jdk8u65-b04
-5476dd40852d9d38afa4850edb78a951e91c14dd jdk8u65-b05
-350f9114b53d85ece93ca95d6a277d0b1503f3f1 jdk8u65-b06
-2b2d10e6b9bf2702b934140fb8ff2e1509b20daf jdk8u65-b07
-9878eea65684af2d5d3454c0e16e8f0f8852708e jdk8u65-b08
-2a9aa9c38c69fcacc9bc90a109964988ab77e108 jdk8u65-b09
-c357526ce049e246f096e4cf0395635fd90d9f5f jdk8u65-b10
-7ed61fe56605812844c02bf8921cc256e0d62eb8 jdk8u65-b11
-371fb189b6948aff2641574f4e82bda2eeaf2cc8 jdk8u65-b12
-0e84a03d4afde812ebb908b8ee43735d9ed0c3e5 jdk8u65-b13
-0787e2c3160eeaea4183bcc9e3ffbd7adbe0d345 jdk8u65-b14
-3b1c03ea5649b2e317f327c0b4d949d49504a591 jdk8u65-b15
-170b44557b27ba97d12f45e2b94b7709a1bf8b54 jdk8u65-b16
-c684352da3e3c0df6a219796019142748d593fe5 jdk8u65-b17
-01bb22b4ebb6348efa14726ba139858d6defefcd jdk8u66-b00
-0ca005b45d10fc8b93852670136a3992038c3722 jdk8u66-b01
-dc132a110960e6b9feff81f0616f7a40a97f3f0f jdk8u66-b02
-5a6bbf54c3fedb8a9a1a1d942cf0935f2f924ef0 jdk8u66-b07
-7c16434480a17a2ac608e1b7e99f99367e361370 jdk8u66-b08
-2c1cbf1288f502baf0d9810c04db0c25849131db jdk8u66-b09
-bcf0cbfa9e3f5642ef2e88b45b8866cc689fffc2 jdk8u66-b10
-b64faa91edc386aed8d41f0131a8f9dcd8afc2e4 jdk8u66-b11
-dc7aab86502475a30bca3c96cb1b153aa31e1fff jdk8u66-b12
-62c53803e364fb3862c5529795d822b9d0410da5 jdk8u66-b13
-b5c54b2e12c3fbc54c7d7e0f22187fa601feb749 jdk8u66-b14
-d45e1dc28a6ee6fd03348ee170d9895957888124 jdk8u66-b15
-5f29f2da7993f09564f6a5cb34e2799981ea96bb jdk8u66-b16
-6eab3ce957aa560f8f9080a2c9535d1ee70fc834 jdk8u66-b17
-a482cd45f31d7bf4ffc77acace705a0b9f888489 jdk8u66-b18
-e6361dcd087eef288fdeeaa17c2dbf9aa4793d5d jdk8u66-b31
-b0bbac715f3bcefc57350b653decd9806144288a jdk8u66-b32
-75d6658e00b4115648b643dcad86a6879c9c94f3 jdk8u66-b33
-2a363653a0918df1eb369f6dc637258afeb6f7d1 jdk8u66-b34
-1719690a0ee77b273a487bcc4a38a721cee3785b jdk8u66-b35
-07707d0f0c781e37bc6897e9d89136e869840969 jdk8u66-b36
-ab2d570584a2bb01a6fedf7bd483443fdfc3d799 jdk8u71-b00
-1956eeeaed470cc9b46addabceb91c9900f2f83a jdk8u71-b01
-b9c864410397ae0e23219b8ab218c33c9859c592 jdk8u71-b02
-3ae95bcc5c89751e50c9181be12887ed6931e615 jdk8u71-b03
-1c87b989c16309652cec988e645dc7f277cfb56d jdk8u71-b04
-c70fdd779a6775bc5f90d60ff1feca2c90e3c2b7 jdk8u71-b05
-2c05fc89cda0befb802e838b442fc27d5b83980b jdk8u71-b06
-9b1bb13cc10cae3379849f341ccd0f21600de863 jdk8u71-b07
-0ed543b92df44dfcfbfd074b9d6461a50e5f198f jdk8u71-b08
-4231747bc5013bbead0cefa37ae4d2a390f2d446 jdk8u71-b09
-5b9d5e755832e86824826fda37c8e6ee4ed064f5 jdk8u71-b10
-4ad71baca90cbe089c121457a80f6693aa80b4e6 jdk8u71-b11
-4d09473111deb8fd6323df6f9e9536084cae2844 jdk8u71-b12
-4f9e7b1a4e04f2ae44c1f6501e4444b82c45afff jdk8u71-b13
-1397b1bae600666de90459de7fba3576bb99eeb8 jdk8u71-b14
-2e46e952ddd80370beee2f4f1b77efd0283d4049 jdk8u71-b15
-31a6e29ec33a9a3c6ac13ce66d3b96196700841c jdk8u72-b00
-d0afaafe3790d446d24ca35ddf61380457362b39 jdk8u72-b01
-2ffdd22b85317d3ba5ab28e34bcd288a5f18d998 jdk8u72-b02
-4270b7d818b26a67f9704b1575208876ab07f45d jdk8u72-b03
-19bf2975a37001daa2d45c171f65ae4e12d639df jdk8u72-b04
-674a69ec28a9e62b1adc90b138a4957bbc82946c jdk8u72-b05
-8c0ad72a45012464c18b4a74fdd711fe82e8842d jdk8u72-b06
-98f42c9df8c121347367164776eff3ebd50cb91e jdk8u72-b07
-55c885702381d47704589a37f05c0f7045be4e36 jdk8u72-b08
-178589d241af764add3d4cbf6977945f65859c1d jdk8u72-b09
-bd25b660575f8ac3567b5ae2ac1e7f6b31df583e jdk8u72-b10
-3b454f1fb441a71836666b6727274a937249ca92 jdk8u72-b11
-e831ce671fb072501670ee593e1080659cbc9804 jdk8u72-b12
-8f5ca46a90af013525cbdf3b023727450cdb8119 jdk8u72-b13
-6cbd347daa9367b78e385f2e8eba222a30b3bea1 jdk8u72-b14
-fff0c11d2811deb70bef213d6d8478b3e3796658 jdk8u72-b15
-928374287059bb10b87dade1c2d984f8c4df01b3 jdk8u72-b31
-443abbc4e048b13e075486a86ddafca520257fdf jdk8u73-b00
-fc0ed68cbc5cbdb2efdb75f3309b5de2a64f5a57 jdk8u73-b01
-6aacbee7e4c84a30761faf58a682b07b8bdf54da jdk8u73-b02
-87614decb34cd6076f136b6d51be83f13e3e6aed jdk8u74-b00
-33b310c85259e0d7ed112ab2e01008228e263371 jdk8u74-b01
-bee679b986f51fe4d65d6df11fea93d1543b6502 jdk8u74-b02
-fd813938f2dd5f8e9d7caa2c1628af6da6683831 jdk8u74-b31
-9d7c49d756f01acbcbe8d0d3c5d5d4e92a7cf119 jdk8u74-b32
-928374287059bb10b87dade1c2d984f8c4df01b3 jdk8u72-b31
-443abbc4e048b13e075486a86ddafca520257fdf jdk8u73-b00
-fc0ed68cbc5cbdb2efdb75f3309b5de2a64f5a57 jdk8u73-b01
-6aacbee7e4c84a30761faf58a682b07b8bdf54da jdk8u73-b02
-87614decb34cd6076f136b6d51be83f13e3e6aed jdk8u74-b00
-33b310c85259e0d7ed112ab2e01008228e263371 jdk8u74-b01
-bee679b986f51fe4d65d6df11fea93d1543b6502 jdk8u74-b02
-fd813938f2dd5f8e9d7caa2c1628af6da6683831 jdk8u74-b31
-9d7c49d756f01acbcbe8d0d3c5d5d4e92a7cf119 jdk8u74-b32
-ac4e9dfd23236821432786b27566fa2f800aa3d4 jdk8u75-b00
-d63a77fb06149b75dbb043a175a9c4a906ac26ef jdk8u75-b01
-320f984ac52b56da66aff581a2c4830eadc0404e jdk8u75-b02
-53dc743a34f164a9eb4e336f90cb21a58291a0b1 jdk8u75-b03
-722fc7e276ff8b4b6460b399e4eb65da518435f0 jdk8u101-b00
-722fc7e276ff8b4b6460b399e4eb65da518435f0 jdk8u75-b04
-57f1232cccbdfb8716f7258bc42982eb3e236e51 jdk8u75-b05
-9ea73143a5184a4034a1276733a9f9f356b67278 jdk8u75-b06
-ab064675c0669fd31bc7c424611686fe73c1509f jdk8u75-b07
-af84471ad4fd4e474ce984440718d87a386df4a8 jdk8u75-b08
-22ba4f1ad75c80bf78539f4c80b9867d227184d3 jdk8u75-b09
-9da1d3f8905be682e33579857dd7b176f847e938 jdk8u75-b10
-d8708cd521ff11851b259cd1171e8f18b90564a1 jdk8u75-b12
-417ff12d11d60c7f2235b498fdea9ef85514fc75 jdk8u77-b00
-6683e1d7422d0b6fc6566a1454604ca1ba7e86d9 jdk8u77-b01
-7dd1be8bd46cd4c80526671607e8035c3c671c14 jdk8u77-b02
-3fbef9f4cddf934f9cc0e06f61e641b5b845b901 jdk8u77-b03
-08dc508915433fdf3d970ea4d2fd33b4dffd67ca jdk8u77-b31
-4c41657db1862352b0e107b910be32c86eb5b1ff jdk8u91-b00
-0c798868f18548af144de0f0ab69f09a4c968cd2 jdk8u91-b13
-5744173381186940733aecf7904053ba6e83180e jdk8u91-b14
-dca1ae1fd0fdb55a4fa12f58726a1fa7086e7ae0 jdk8u91-b15
-e8bed1496ff254d91d52c8da7c6d8d361862d773 jdk8u76-b00
-832508a6165c877aa1de03ca9b6520c7bfe5a28e jdk8u76-b01
-0861105394355ad24c07cb2ff58a731ef91502a8 jdk8u76-b02
-4db8c011697524c7ba76fb317763940d85af0c12 jdk8u76-b03
-120282f77af0321604f51edcbcd368aff23b42b7 jdk8u76-b04
-7cc0806883e51bdf966e155bb4bb5397bf7005fa jdk8u76-b05
-3614fb87088c7c5990daff20dd39845d58c86b1e jdk8u76-b06
-62e05c53156767c2398381d527e4e204d09dfa40 jdk8u76-b07
-ca4f552fb08f4420f478d7a86098e540ddf91b31 jdk8u76-b08
-b5e3d2c78818af23d855cb10bac51fab5b7b2884 jdk8u76-b09
-2377ea341a26d0a6875f148dc555811bdf2e9533 jdk8u76-b10
-94746373e4d5590536bacb0df4a19188e4d1bdd8 jdk8u76-b11
-9f2404d26c945178219c4f826fee5a084896ba55 jdk8u76-b12
-118aba9e37f0264a7cadb20ac0438eaea4180998 jdk8u92-b00
-94158f2e5cbdff8956b8e643e0305ca178d856e3 jdk8u92-b13
-51f64c980bcdef152a6eb043aaa5d04cc08c6624 jdk8u92-b14
-9005b6faa5f616a8b403ea3aa660b963a7cdde24 jdk8u92-b31
-7e728e8e6120e276d05f82c1a01c3d8fe4a63584 jdk8u92-b32
-5e69844e2c69d21e6f139845451ad8c5acdef709 jdk8u92-b33
-f8ea719757e3bee133e59c7fd69589e190785292 jdk8u92-b34
-722fc7e276ff8b4b6460b399e4eb65da518435f0 jdk8u81-b00
-534d4e07c81fc8656cdb0856e22aafbdc54e474a jdk8u101-b01
-18e1f0ee965b0565514027543546348ed99bf4a4 jdk8u101-b02
-fe138c6f5aa8455ee704e58d7d7ffc90fdd230c3 jdk8u101-b03
-fe901996777f50198be2c785cd7e3b8198692bbe jdk8u101-b04
-9c51e0213472d584b91cf42c4c454c1caf7dbaf4 jdk8u101-b05
-1babb07d0e02471f947b9166f869720e3ae805ab jdk8u101-b06
-93e821287367a5bccbae1cfef8d3ce6c8f632d03 jdk8u101-b07
-7ede5c151d790625552ed9c683844be820d9277b jdk8u101-b08
-0b1358bc93ca7a30bab6cf2d7da09bb5a11f5a93 jdk8u101-b09
-1db5081d8ee77caffa0f534496af5fb908e9b61f jdk8u101-b10
-81cdb3e279f8f245f740e7d3e79a1629b6599325 jdk8u101-b11
-d6f920823feb4d44e67cec383d8c6e4a5dba9d76 jdk8u101-b12
-e983a19c64390d18004d1d0c7907394714e697b3 jdk8u101-b13
-e8bed1496ff254d91d52c8da7c6d8d361862d773 jdk8u76-b00
-832508a6165c877aa1de03ca9b6520c7bfe5a28e jdk8u76-b01
-0861105394355ad24c07cb2ff58a731ef91502a8 jdk8u76-b02
-4db8c011697524c7ba76fb317763940d85af0c12 jdk8u76-b03
-120282f77af0321604f51edcbcd368aff23b42b7 jdk8u76-b04
-f6d50bd27913fe801a6ec445437d7503b458a422 jdk8u102-b00
-f6d50bd27913fe801a6ec445437d7503b458a422 jdk8u82-b00
-c0b0fb35c047fe3a654c5899e7204e9c68de532a jdk8u102-b01
-914eb7d20df00012875ddd3a26c2452671c6134c jdk8u102-b02
-c3596cd9b5c8a3774e6f200ac8d055b031a5e25b jdk8u102-b03
-067570c5c0b2604ff422d2eee6f07dfc4953e44a jdk8u102-b04
-9c5541aa49f4a6bd7206085be175bf4d6a5294e9 jdk8u102-b05
-b1de940771d47cbc7b9702fea16efda94b7fa654 jdk8u102-b06
-f428f6a9060b1ac1dad41ee8a3850efdeb564bc4 jdk8u102-b07
-6bef5f85b095d712cbab5c8cbaf8330036e8593b jdk8u102-b08
-3489cf2e35b743ab5d122136e7af46895bb9739c jdk8u102-b09
-96dac192aa74ccefa6fe7a7984ac3f8acabe5dc2 jdk8u102-b10
-5839c5f4292a8755a4c102cb0f983536f5bfe8be jdk8u102-b11
-163dc486915300b020f203e89fdf1985cc3c4814 jdk8u102-b12
-04471bfd1cc2e8f4d8d198e79b21e64dd4499db8 jdk8u102-b13
-daafd7d3a76a0c448e4982afd7c4e9471ab1c916 jdk8u102-b14
-3a3064f9363c79f70a0d9b2201342acc880e1e76 jdk8u102-b31
-fb4fc26136253424c0a4f4f5a10dc54f612b64fd jdk8u102-b32
-b8ca429448f7d3dfbdea3a6c349a7a3850fdd27f jdk8u102-b33
-57cbdae98283951a2e2fc382223c5736a9d8d57c jdk8u102-b34
-39483f225bc2a196d07a500940e74b3b2e13f9c3 jdk8u102-b35
-fe901996777f50198be2c785cd7e3b8198692bbe jdk8u111-b00
-38fc232c37019c1e3fdf87495ca9b6e689a08a34 jdk8u111-b01
-b363f4507ef46d86951d7d00eff4fb6624ebb728 jdk8u111-b02
-193aed1bc403b1960fbced8630ac0104f03eb480 jdk8u111-b03
-e64a88d7d60f1756fe816f3e996b45433df25434 jdk8u111-b04
-58ac6fce1d10c1fba366ad58950a6a54b27a5bcb jdk8u111-b05
-8a2538bb35f96ff56a5877fa77119146ad8c11b3 jdk8u111-b06
-b4dbbfe1b5fe3e095dc62a25e14688820336a968 jdk8u111-b07
-85cd32cbf2c8a66e1ab5470f5d47c8210d9e7c94 jdk8u111-b08
-e96502b0b33aedfa4ad62a80d358b042fb9cfca4 jdk8u111-b09
-c715ad822dda1ff956bb7210814ad4f23d561f29 jdk8u111-b10
-fc69426e3eeb88652a433088ddf715ca100606d2 jdk8u111-b11
-5b64df33d63a60d21edd5094173a21b1f2431b0a jdk8u111-b12
-7b105a10b1a3e656939e47e87fcf9e8066fa78f0 jdk8u111-b13
-07c7b5880ac35b894978c3313e6e40a487d4756d jdk8u111-b14
-31aca84184b4d54890b4fade1c614927203051b4 jdk8u112-b00
-37bd26595d994939ccf98d8c444e692c4fdfff55 jdk8u112-b01
-817d9fb584baecae7c989dfd7009a7f0ac7c6360 jdk8u112-b02
-d1d3129671c90db26f04ed837e2f105ee9586bef jdk8u112-b03
-b2a03d93ed533a0459f27dc109a8be1f7d2f1024 jdk8u112-b04
-e1418dc5266e03bf6b06a193da6cdb99ca309f75 jdk8u112-b06
-29e1388fa1cafeb05d9c337226c505916c6586b9 jdk8u112-b07
-00809b3e07ee374850dd61ade9432b0d9716ebfc jdk8u112-b08
-9eca585fba8b8dbdca3320d20bf6eaddd0a9081f jdk8u112-b09
-78a5e7d66e4f84a6bf6cc74c7ecafc3ff62d0fad jdk8u112-b10
-3360efec9958585e54a54a738636433b92e81b46 jdk8u112-b11
-bbde0cbbfc1b4f7260162a738ea1e9018ddea413 jdk8u112-b12
-c7043839334d65f6cefd0f7d54705cbb61e40377 jdk8u112-b13
-b4441c5520688b42c52caa36861744429ec4385a jdk8u112-b14
-bfb88850a367a747e77f4cb164a12ea54ec8e8da jdk8u112-b15
-14388b14d4847c3eacce677eae37980e6fa545cd jdk8u112-b16
-1a7a5fe22a028e438a724d909d27da2ea96c6d86 jdk8u112-b31
-58ac6fce1d10c1fba366ad58950a6a54b27a5bcb jdk8u121-b00
-a2c5309f998f8aa207a6e381464263e9a7dd50e0 jdk8u121-b01
-a2aa2e98905609a0b5809a38163239a7c97d31c1 jdk8u121-b02
-863cc5f631621da7026ae42828016a8070a1056d jdk8u121-b03
-c14b6b6d51d86fb36c8af1021e0bdf55f9cf7440 jdk8u121-b04
-ee85a5feaf10020ca74f071c609f44d8c4b2866c jdk8u121-b05
-7fdb1ca64ac7f62e3b17c699e493568da38ea4f3 jdk8u121-b06
-22eb8db7bf5b140e5d84fd91c7ea16c02736cd13 jdk8u121-b07
-b9e523138b2dc4e8456c3ac295f9bb57d21f1f77 jdk8u121-b08
-6eb8178c697ef3d55d99f222121093e6ad0363c4 jdk8u121-b09
-51c053cb4468768757cb25e687edd8e021ff2eb3 jdk8u121-b10
-bfe05759587ddc30a32c00637180588cec309ee3 jdk8u121-b11
-97c858f7f7c827730d05eb69134ac89e156f8685 jdk8u121-b12
-f2b5b6ab1f5544b92074adb5bb80cc031649d0e7 jdk8u121-b13
-b94f31b809debc683b996146ac20acbb269381f9 jdk8u122-b00
-73494e6ff8e5a5a66cb87445d6c5a0a8acab3409 jdk8u122-b01
-89062b8ff53bfc62689c52373f5564369cd61609 jdk8u122-b02
-4cf57a6813323a1c3336bef63ca7c16d52146637 jdk8u122-b03
-4cf57a6813323a1c3336bef63ca7c16d52146637 jdk8u122-b03
-0000000000000000000000000000000000000000 jdk8u122-b03
-0000000000000000000000000000000000000000 jdk8u122-b03
-b6e27dc2775764b59755eb054c66fbec9b2684b7 jdk8u122-b03
-6dd80b19838ded52371aa280cb8a68ad80aed22d jdk8u122-b04
-1e501e6d58a962a1ef5dd933dc4cce56a5358a98 jdk8u132-b00
-d15b51f1149bd1b7e87f4ec6a1bc5678c15275ef jdk8u152-b00
-b6446826930c8577c7a90009dd472b7eb813e495 jdk8u152-b01
diff --git a/.jcheck/conf b/.jcheck/conf
deleted file mode 100644
index 5bd24b1..0000000
--- a/.jcheck/conf
+++ /dev/null
@@ -1,2 +0,0 @@
-project=jdk8
-bugids=dup
diff --git a/ASSEMBLY_EXCEPTION b/ASSEMBLY_EXCEPTION
deleted file mode 100644
index 065b8d9..0000000
--- a/ASSEMBLY_EXCEPTION
+++ /dev/null
@@ -1,27 +0,0 @@
-
-OPENJDK ASSEMBLY EXCEPTION
-
-The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
-openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
-General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
-only ("GPL2"), with the following clarification and special exception.
-
-    Linking this OpenJDK Code statically or dynamically with other code
-    is making a combined work based on this library.  Thus, the terms
-    and conditions of GPL2 cover the whole combination.
-
-    As a special exception, Oracle gives you permission to link this
-    OpenJDK Code with certain code licensed by Oracle as indicated at
-    http://openjdk.java.net/legal/exception-modules-2007-05-08.html
-    ("Designated Exception Modules") to produce an executable,
-    regardless of the license terms of the Designated Exception Modules,
-    and to copy and distribute the resulting executable under GPL2,
-    provided that the Designated Exception Modules continue to be
-    governed by the licenses under which they were offered by Oracle.
-
-As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code
-to build an executable that includes those portions of necessary code that
-Oracle could not provide under GPL2 (or that Oracle has provided under GPL2
-with the Classpath exception).  If you modify or add to the OpenJDK code,
-that new GPL2 code may still be combined with Designated Exception Modules
-if the new code is made subject to this exception by its copyright holder.
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 8b400c7..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,347 +0,0 @@
-The GNU General Public License (GPL)
-
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share
-and change it.  By contrast, the GNU General Public License is intended to
-guarantee your freedom to share and change free software--to make sure the
-software is free for all its users.  This General Public License applies to
-most of the Free Software Foundation's software and to any other program whose
-authors commit to using it.  (Some other Free Software Foundation software is
-covered by the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not price.  Our
-General Public Licenses are designed to make sure that you have the freedom to
-distribute copies of free software (and charge for this service if you wish),
-that you receive source code or can get it if you want it, that you can change
-the software or use pieces of it in new free programs; and that you know you
-can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny
-you these rights or to ask you to surrender the rights.  These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for
-a fee, you must give the recipients all the rights that you have.  You must
-make sure that they, too, receive or can get the source code.  And you must
-show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute
-and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software.  If the
-software is modified by someone else and passed on, we want its recipients to
-know that what they have is not the original, so that any problems introduced
-by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents.  We
-wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program proprietary.
-To prevent this, we have made it clear that any patent must be licensed for
-everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms of
-this General Public License.  The "Program", below, refers to any such program
-or work, and a "work based on the Program" means either the Program or any
-derivative work under copyright law: that is to say, a work containing the
-Program or a portion of it, either verbatim or with modifications and/or
-translated into another language.  (Hereinafter, translation is included
-without limitation in the term "modification".) Each licensee is addressed as
-"you".
-
-Activities other than copying, distribution and modification are not covered by
-this License; they are outside its scope.  The act of running the Program is
-not restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made by
-running the Program).  Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as
-you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the
-Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may
-at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus
-forming a work based on the Program, and copy and distribute such modifications
-or work under the terms of Section 1 above, provided that you also meet all of
-these conditions:
-
-    a) You must cause the modified files to carry prominent notices stating
-    that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in whole or
-    in part contains or is derived from the Program or any part thereof, to be
-    licensed as a whole at no charge to all third parties under the terms of
-    this License.
-
-    c) If the modified program normally reads commands interactively when run,
-    you must cause it, when started running for such interactive use in the
-    most ordinary way, to print or display an announcement including an
-    appropriate copyright notice and a notice that there is no warranty (or
-    else, saying that you provide a warranty) and that users may redistribute
-    the program under these conditions, and telling the user how to view a copy
-    of this License.  (Exception: if the Program itself is interactive but does
-    not normally print such an announcement, your work based on the Program is
-    not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If identifiable
-sections of that work are not derived from the Program, and can be reasonably
-considered independent and separate works in themselves, then this License, and
-its terms, do not apply to those sections when you distribute them as separate
-works.  But when you distribute the same sections as part of a whole which is a
-work based on the Program, the distribution of the whole must be on the terms
-of this License, whose permissions for other licensees extend to the entire
-whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise the
-right to control the distribution of derivative or collective works based on
-the Program.
-
-In addition, mere aggregation of another work not based on the Program with the
-Program (or with a work based on the Program) on a volume of a storage or
-distribution medium does not bring the other work under the scope of this
-License.
-
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1 and
-2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable source
-    code, which must be distributed under the terms of Sections 1 and 2 above
-    on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three years, to
-    give any third party, for a charge no more than your cost of physically
-    performing source distribution, a complete machine-readable copy of the
-    corresponding source code, to be distributed under the terms of Sections 1
-    and 2 above on a medium customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer to
-    distribute corresponding source code.  (This alternative is allowed only
-    for noncommercial distribution and only if you received the program in
-    object code or executable form with such an offer, in accord with
-    Subsection b above.)
-
-The source code for a work means the preferred form of the work for making
-modifications to it.  For an executable work, complete source code means all
-the source code for all modules it contains, plus any associated interface
-definition files, plus the scripts used to control compilation and installation
-of the executable.  However, as a special exception, the source code
-distributed need not include anything that is normally distributed (in either
-source or binary form) with the major components (compiler, kernel, and so on)
-of the operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the source
-code from the same place counts as distribution of the source code, even though
-third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License.  Any attempt otherwise to copy, modify,
-sublicense or distribute the Program is void, and will automatically terminate
-your rights under this License.  However, parties who have received copies, or
-rights, from you under this License will not have their licenses terminated so
-long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the Program
-or its derivative works.  These actions are prohibited by law if you do not
-accept this License.  Therefore, by modifying or distributing the Program (or
-any work based on the Program), you indicate your acceptance of this License to
-do so, and all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program),
-the recipient automatically receives a license from the original licensor to
-copy, distribute or modify the Program subject to these terms and conditions.
-You may not impose any further restrictions on the recipients' exercise of the
-rights granted herein.  You are not responsible for enforcing compliance by
-third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues), conditions
-are imposed on you (whether by court order, agreement or otherwise) that
-contradict the conditions of this License, they do not excuse you from the
-conditions of this License.  If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Program at all.
-For example, if a patent license would not permit royalty-free redistribution
-of the Program by all those who receive copies directly or indirectly through
-you, then the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and
-the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system, which is implemented by public license practices.  Many
-people have made generous contributions to the wide range of software
-distributed through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing to
-distribute software through any other system and a licensee cannot impose that
-choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original
-copyright holder who places the Program under this License may add an explicit
-geographical distribution limitation excluding those countries, so that
-distribution is permitted only in or among countries not thus excluded.  In
-such case, this License incorporates the limitation as if written in the body
-of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the
-General Public License from time to time.  Such new versions will be similar in
-spirit to the present version, but may differ in detail to address new problems
-or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any later
-version", you have the option of following the terms and conditions either of
-that version or of any later version published by the Free Software Foundation.
-If the Program does not specify a version number of this License, you may
-choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, write to the author to ask for
-permission.  For software which is copyrighted by the Free Software Foundation,
-write to the Free Software Foundation; we sometimes make exceptions for this.
-Our decision will be guided by the two goals of preserving the free status of
-all derivatives of our free software and of promoting the sharing and reuse of
-software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
-THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
-PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE,
-YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
-ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
-PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
-INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
-BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
-OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest possible
-use to the public, the best way to achieve this is to make it free software
-which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program.  It is safest to attach
-them to the start of each source file to most effectively convey the exclusion
-of warranty; and each file should have at least the "copyright" line and a
-pointer to where the full notice is found.
-
-    One line to give the program's name and a brief idea of what it does.
-
-    Copyright (C) <year> <name of author>
-
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the Free
-    Software Foundation; either version 2 of the License, or (at your option)
-    any later version.
-
-    This program 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 for
-    more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this when it
-starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
-    with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free
-    software, and you are welcome to redistribute it under certain conditions;
-    type 'show c' for details.
-
-The hypothetical commands 'show w' and 'show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may be
-called something other than 'show w' and 'show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
-is a sample; alter the names:
-
-    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-    'Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-    signature of Ty Coon, 1 April 1989
-
-    Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General Public
-License instead of this License.
-
-
-"CLASSPATH" EXCEPTION TO THE GPL
-
-Certain source files distributed by Oracle America and/or its affiliates are
-subject to the following clarification and special exception to the GPL, but
-only where Oracle has expressly included in the particular source file's header
-the words "Oracle designates this particular file as subject to the "Classpath"
-exception as provided by Oracle in the LICENSE file that accompanied this code."
-
-    Linking this library statically or dynamically with other modules is making
-    a combined work based on this library.  Thus, the terms and conditions of
-    the GNU General Public License cover the whole combination.
-
-    As a special exception, the copyright holders of this library give you
-    permission to link this library with independent modules to produce an
-    executable, regardless of the license terms of these independent modules,
-    and to copy and distribute the resulting executable under terms of your
-    choice, provided that you also meet, for each linked independent module,
-    the terms and conditions of the license of that module.  An independent
-    module is a module which is not derived from or based on this library.  If
-    you modify this library, you may extend this exception to your version of
-    the library, but you are not obligated to do so.  If you do not wish to do
-    so, delete this exception statement from your version.
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7fe922b..0000000
--- a/Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# Copyright (c) 2012, 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.
-#
-
-# This must be the first rule
-default:
-
-# Inclusion of this pseudo-target will cause make to execute this file
-# serially, regardless of -j. Recursively called makefiles will not be
-# affected, however. This is required for correct dependency management.
-.NOTPARALLEL:
-
-# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
-# /usr/ccs/bin/make lacks basically every other flow control mechanism.
-TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
-
-# Assume we have GNU make, but check version.
-ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), )
-  $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
-endif
-
-# Locate this Makefile
-ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
-  makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
-  makefile_path:=$(lastword $(MAKEFILE_LIST))
-endif
-root_dir:=$(dir $(makefile_path))
-
-# ... and then we can include our helper functions
-include $(root_dir)/make/MakeHelpers.gmk
-
-$(eval $(call ParseLogLevel))
-$(eval $(call ParseConfAndSpec))
-
-# Now determine if we have zero, one or several configurations to build.
-ifeq ($(SPEC),)
-  # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
-else
-  ifeq ($(words $(SPEC)),1)
-    # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
-    include $(root_dir)/make/Main.gmk
-  else
-    # We are building multiple configurations.
-    # First, find out the valid targets
-    # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
-    # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
-    all_phony_targets=$(filter-out $(global_targets), $(strip $(shell \
-        cd $(root_dir) && $(MAKE) -p -q FRC SPEC=$(firstword $(SPEC)) | \
-        grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
-
-    $(all_phony_targets):
-	@$(foreach spec,$(SPEC),(cd $(root_dir) && $(MAKE) SPEC=$(spec) \
-	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
-
-    .PHONY: $(all_phony_targets)
-
-  endif
-endif
-
-# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
-# If you addd more global targets, please update the variable global_targets in MakeHelpers.
-
-help:
-	$(info )
-	$(info OpenJDK Makefile help)
-	$(info =====================)
-	$(info )
-	$(info Common make targets)
-	$(info .  make [default]         # Compile all product in langtools, hotspot, jaxp, jaxws,)
-	$(info .                         # corba and jdk)
-	$(info .  make all               # Compile everything, all repos and images)
-	$(info .  make images            # Create complete j2sdk and j2re images)
-	$(info .  make docs              # Create javadocs)
-	$(info .  make overlay-images    # Create limited images for sparc 64 bit platforms)
-	$(info .  make profiles          # Create complete j2re compact profile images)
-	$(info .  make bootcycle-images  # Build images twice, second time with newly build JDK)
-	$(info .  make install           # Install the generated images locally)
-	$(info .  make clean             # Remove all files generated by make, but not those)
-	$(info .                         # generated by configure)
-	$(info .  make dist-clean        # Remove all files, including configuration)
-	$(info .  make help              # Give some help on using make)
-	$(info .  make test              # Run tests, default is all tests (see TEST below))
-	$(info )
-	$(info Targets for specific components)
-	$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
-	$(info .  make <component>       # Build <component> and everything it depends on. )
-	$(info .  make <component>-only  # Build <component> only, without dependencies. This)
-	$(info .                         # is faster but can result in incorrect build results!)
-	$(info .  make clean-<component> # Remove files generated by make for <component>)
-	$(info )
-	$(info Useful make variables)
-	$(info .  make CONF=             # Build all configurations (note, assignment is empty))
-	$(info .  make CONF=<substring>  # Build the configuration(s) with a name matching)
-	$(info .                         # <substring>)
-	$(info )
-	$(info .  make LOG=<loglevel>    # Change the log level from warn to <loglevel>)
-	$(info .                         # Available log levels are:)
-	$(info .                         # 'warn' (default), 'info', 'debug' and 'trace')
-	$(info .                         # To see executed command lines, use LOG=debug)
-	$(info )
-	$(info .  make JOBS=<n>          # Run <n> parallel make jobs)
-	$(info .                         # Note that -jN does not work as expected!)
-	$(info )
-	$(info .  make test TEST=<test>  # Only run the given test or tests, e.g.)
-	$(info .                         # make test TEST="jdk_lang jdk_net")
-	$(info )
-
-.PHONY: help
diff --git a/README-builds.html b/README-builds.html
deleted file mode 100644
index 14796a2..0000000
--- a/README-builds.html
+++ /dev/null
@@ -1,2495 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>OpenJDK Build README</title>
-    </head>
-    <body style="background-color:aquamarine">
-
-        <!-- ====================================================== -->
-        <table width="100%">
-            <tr>
-                <td align="center">
-                    <img alt="OpenJDK" 
-                         src="http://openjdk.java.net/images/openjdk.png" 
-                         width=256>
-                </td>
-            </tr>
-            <tr>
-                <td align=center>
-                    <h1>OpenJDK Build README</h1>
-                </td>
-            </tr>
-        </table>
-
-        <!-- ====================================================== -->
-        <hr>
-        <h2><a name="introduction">Introduction</a></h2>
-        <blockquote>
-            This README file contains build instructions for the
-            <a href="http://openjdk.java.net"  target="_blank">OpenJDK</a>.
-            Building the source code for the
-            OpenJDK
-            requires
-            a certain degree of technical expertise.
-
-            <!-- ====================================================== -->
-            <h3>!!!!!!!!!!!!!!! THIS IS A MAJOR RE-WRITE of this document. !!!!!!!!!!!!!</h3>
-            <blockquote>
-                Some Headlines:
-                <ul>
-                    <li>
-                        The build is now a "<code>configure &amp;&amp; make</code>" style build
-                    </li>
-                    <li>
-                        Any GNU make 3.81 or newer should work
-                    </li>
-                    <li>
-                        The build should scale, i.e. more processors should
-                        cause the build to be done in less wall-clock time
-                    </li>
-                    <li>
-                        Nested or recursive make invocations have been significantly
-                        reduced, as has the total fork/exec or spawning
-                        of sub processes during the build
-                    </li>
-                    <li>
-                        Windows MKS usage is no longer supported
-                    </li>
-                    <li>
-                        Windows Visual Studio <code>vsvars*.bat</code> and 
-                        <code>vcvars*.bat</code> files are run automatically
-                    </li>
-                    <li>
-                        Ant is no longer used when building the OpenJDK
-                    </li>
-                    <li>
-                        Use of ALT_* environment variables for configuring the
-                        build is no longer supported
-                    </li>
-                </ul>
-            </blockquote>
-        </blockquote>
-
-        <!-- ====================================================== -->
-        <hr>
-        <h2><a name="contents">Contents</a></h2>
-        <blockquote>
-            <ul>
-                <li><a href="#introduction">Introduction</a></li>
-
-                <li><a href="#hg">Use of Mercurial</a>
-                    <ul>
-                        <li><a href="#get_source">Getting the Source</a></li>
-                        <li><a href="#repositories">Repositories</a></li>
-                    </ul>
-                </li>
-
-                <li><a href="#building">Building</a>
-                    <ul>
-                        <li><a href="#setup">System Setup</a>
-                            <ul>
-                                <li><a href="#linux">Linux</a></li>
-                                <li><a href="#solaris">Solaris</a></li>
-                                <li><a href="#macosx">Mac OS X</a></li>
-                                <li><a href="#windows">Windows</a></li>
-                            </ul>
-                        </li>
-                        <li><a href="#configure">Configure</a></li>
-                        <li><a href="#make">Make</a></li>
-                    </ul>
-                </li>
-                <li><a href="#testing">Testing</a></li>
-            </ul>
-            <hr>
-            <ul>
-                <li><a href="#hints">Appendix A: Hints and Tips</a>
-                    <ul>
-                        <li><a href="#faq">FAQ</a></li>
-                        <li><a href="#performance">Build Performance Tips</a></li>
-                        <li><a href="#troubleshooting">Troubleshooting</a></li>
-                    </ul>
-                </li>
-                <li><a href="#gmake">Appendix B: GNU Make Information</a></li>
-                <li><a href="#buildenvironments">Appendix C: Build Environments</a></li>
-
-                <!-- Leave out
-                <li><a href="#mapping">Appendix D: Mapping Old Builds to the New Builds</a></li>    
-                -->
-
-            </ul>
-        </blockquote>
-
-        <!-- ====================================================== -->
-        <hr>
-        <h2><a name="hg">Use of Mercurial</a></h2>
-        <blockquote>
-            The OpenJDK sources are maintained with the revision control system
-            <a href="http://mercurial.selenic.com/wiki/Mercurial">Mercurial</a>.
-            If you are new to Mercurial, please see the
-            <a href="http://mercurial.selenic.com/wiki/BeginnersGuides">
-                Beginner Guides</a>
-            or refer to the <a href="http://hgbook.red-bean.com/">
-                Mercurial Book</a>.
-            The first few chapters of the book provide an excellent overview of
-            Mercurial, what it is and how it works.
-            <br>
-            For using Mercurial with the OpenJDK refer to the
-            <a href="http://openjdk.java.net/guide/repositories.html#installConfig">
-                Developer Guide: Installing and Configuring Mercurial</a>
-            section for more information.
-
-            <h3><a name="get_source">Getting the Source</a></h3>
-            <blockquote>
-                To get the entire set of OpenJDK Mercurial repositories
-                use the script <code>get_source.sh</code> located in the 
-                root repository:
-                <blockquote>
-                    <code>
-                        hg clone http://hg.openjdk.java.net/jdk8/jdk8 
-                        <i>YourOpenJDK</i>
-                        <br>
-                        cd <i>YourOpenJDK</i>
-                        <br>
-                        bash ./get_source.sh
-                    </code>
-                </blockquote>
-                Once you have all the repositories, keep in mind that each
-                repository is its own independent repository.
-                You can also re-run <code>./get_source.sh</code> anytime to
-                pull over all the latest changesets in all the repositories.
-                This set of nested repositories has been given the term
-                "forest" and there are various ways to apply the same
-                <code>hg</code> command to each of the repositories.
-                For example, the script <code>make/scripts/hgforest.sh</code>
-                can be used to repeat the same <code>hg</code>
-                command on every repository, e.g.
-                <blockquote>
-                    <code>
-                        cd <i>YourOpenJDK</i>
-                        <br>
-                        bash ./make/scripts/hgforest.sh status
-                    </code>
-                </blockquote>
-            </blockquote>
-
-            <h3><a name="repositories">Repositories</a></h3>
-            <blockquote>
-                <p>The set of repositories and what they contain:</p>
-                <table border="1">
-                    <thead>
-                        <tr>
-                            <th>Repository</th>
-                            <th>Contains</th>
-                        </tr>
-                    </thead>                   
-                    <tbody>
-                        <tr>
-                            <td>
-                                . (root)
-                            </td>
-                            <td>
-                                common configure and makefile logic
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                hotspot
-                            </td>
-                            <td>
-                                source code and make files for building
-                                the OpenJDK Hotspot Virtual Machine                         
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                langtools
-                            </td>
-                            <td>
-                                source code for the OpenJDK javac and language tools
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                jdk
-                            </td>
-                            <td>
-                                source code and make files for building
-                                the OpenJDK runtime libraries and misc files
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                jaxp
-                            </td>
-                            <td>
-                                source code for the OpenJDK JAXP functionality
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                jaxws
-                            </td>
-                            <td>
-                                source code for the OpenJDK JAX-WS functionality
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                corba
-                            </td>
-                            <td>
-                                source code for the OpenJDK Corba functionality
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                nashorn
-                            </td>
-                            <td>
-                                source code for the OpenJDK JavaScript implementation
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </blockquote>
-
-            <h3><a name="guidelines">Repository Source Guidelines</a></h3>
-            <blockquote>
-                There are some very basic guidelines:
-                <ul>
-                    <li>
-                        Use of whitespace in source files
-                        (.java, .c, .h, .cpp, and .hpp files)
-                        is restricted.
-                        No TABs, no trailing whitespace on lines, and files
-                        should not terminate in more than one blank line.
-                    </li>
-                    <li>
-                        Files with execute permissions should not be added
-                        to the source repositories.
-                    </li>
-                    <li>
-                        All generated files need to be kept isolated from 
-                        the files
-                        maintained or managed by the source control system.
-                        The standard area for generated files is the top level
-                        <code>build/</code> directory.
-                    </li>
-                    <li>
-                        The default build process should be to build the product
-                        and nothing else, in one form, e.g. a product (optimized),
-                        debug (non-optimized, -g plus assert logic), or
-                        fastdebug (optimized, -g plus assert logic).
-                    </li>
-                    <li>
-                        The <tt>.hgignore</tt> file in each repository
-                        must exist and should
-                        include <tt>^build/</tt>, <tt>^dist/</tt> and 
-                        optionally any
-                        <tt>nbproject/private</tt> directories.
-                        <strong>It should NEVER</strong> include 
-                        anything in the
-                        <tt>src/</tt> or <tt>test/</tt>
-                        or any managed directory area of a repository.
-                    </li>
-                    <li>
-                        Directory names and file names should never contain
-                        blanks or
-                        non-printing characters.
-                    </li>
-                    <li>
-                        Generated source or binary files should NEVER be added to
-                        the repository (that includes <tt>javah</tt> output).
-                        There are some exceptions to this rule, in particular
-                        with some of the generated configure scripts.
-                    </li>
-                    <li>
-                        Files not needed for typical building
-                        or testing of the repository
-                        should not be added to the repository.
-                    </li>
-                </ul>
-            </blockquote>
-
-        </blockquote>
-
-        <!-- ====================================================== -->
-        <hr>
-        <h2><a name="building">Building</a></h2>
-        <blockquote>
-            The very first step in building the OpenJDK is making sure the
-            system itself has everything it needs to do OpenJDK builds.
-            Once a system is setup, it generally doesn't need to be done again.
-            <br>
-            Building the OpenJDK is now done with running a 
-            <a href="#configure"><code>configure</code></a>
-            script which will try and find and verify you have everything
-            you need, followed by running
-            <a href="#gmake"><code>make</code></a>, e.g.
-            <blockquote>
-                <b>
-                    <code>
-                        bash ./configure<br>
-                        make all
-                    </code>
-                </b>
-            </blockquote>
-            Where possible the <code>configure</code> script will attempt to located the
-            various components in the default locations or via component
-            specific variable settings.
-            When the normal defaults fail or components cannot be found,
-            additional <code>configure</code> options may be necessary to help <code>configure</code>
-            find the necessary tools for the build, or you may need to
-            re-visit the setup of your system due to missing software
-            packages.
-            <br>
-            <strong>NOTE:</strong> The <code>configure</code> script
-            file does not have
-            execute permissions and will need to be explicitly run with
-            <code>bash</code>,
-            see the <a href="#guidelines">source guidelines</a>.
-
-            <!-- ====================================================== -->
-            <hr>
-            <h3><a name="setup">System Setup</a></h3>
-            <blockquote>
-                Before even attempting to use a system to build the OpenJDK
-                there are some very basic system setups needed.
-                For all systems:
-                <ul>
-                    <li>
-                        Be sure the GNU make utility is version 3.81 or newer,
-                        e.g. run "<code>make -version</code>"
-                    </li>
-                    <li>
-                        Install a
-                        <a name="bootjdk">Bootstrap JDK</a>.
-                        All OpenJDK builds require access to a previously released
-                        JDK called the <i>bootstrap JDK</i> or <i>boot JDK.</i>
-                        The general rule is that the bootstrap JDK
-                        must be an instance of the previous major
-                        release of the JDK. In addition, there may be
-                        a requirement to use a release at or beyond a
-                        particular update level.
-                        <br>&nbsp;<br>
-
-                        <b><i>Building JDK 8 requires use of a version
-                        of JDK 7 that is at Update 7 or newer. JDK 8
-                        developers should not use JDK 8 as the boot
-                        JDK, to ensure that JDK 8 dependencies are
-                        not introduced into the parts of the system
-                        that are built with JDK 7.</i></b>
-
-                        <br>&nbsp;<br>
-                        The JDK 7 binaries can be downloaded from Oracle's 
-                        <a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
-                           target="_blank">JDK 7 download site</a>.
-                        For build performance reasons
-                        is very important that this bootstrap JDK be made available 
-                        on the local disk of the machine doing the build.
-                        You should add its <code>bin</code> directory
-                        to the <code>PATH</code> environment variable.
-                        If <code>configure</code> has any issues finding this JDK, you may
-                        need to use the <code>configure</code> option
-                        <code>--with-boot-jdk</code>.
-                    </li>
-                    <li>
-                        Ensure that GNU make, the Bootstrap JDK,
-                        and the compilers are all
-                        in your PATH environment variable
-                    </li>
-                </ul>
-                And for specific systems:
-                <table border="1">
-                    <thead>
-                        <tr>
-                            <th>Linux</th>
-                            <th>Solaris</th>
-                            <th>Windows</th>
-                            <th>Mac OS X</th>
-                        </tr>
-                    </thead>                   
-                    <tbody>
-                        <tr>
-                            <td>
-                                Install all the software development
-                                packages needed including
-                                <a href="#alsa">alsa</a>,
-                                <a href="#freetype">freetype</a>,
-                                <a href="#cups">cups</a>, and
-                                <a href="#xrender">xrender</a>.
-                                <br>
-                                See
-                                <a href="#SDBE">specific system packages</a>.
-                            </td>
-                            <td>
-                                Install all the software development
-                                packages needed  including
-                                <a href="#studio">Studio Compilers</a>,
-                                <a href="#freetype">freetype</a>,
-                                <a href="#cups">cups</a>, and
-                                <a href="#xrender">xrender</a>.
-                                <br>
-                                See
-                                <a href="#SDBE">specific system packages</a>.
-                            </td>
-                            <td>
-                                <ul>
-                                    <li>
-                                        Install one of
-                                        <a href="#cygwin">CYGWIN</a> or
-                                        <a href="#msys">MinGW/MSYS</a>
-                                    </li>
-                                    <li>
-                                        Install
-                                        <a href="#vs2010">Visual Studio 2010</a>
-                                    </li>
-                                </ul>
-                            </td>
-                            <td>
-                                Install 
-                                <a href="https://developer.apple.com/xcode/">XCode 4.5.2</a> 
-                                and also install the "Command line tools" found under the
-                                preferences pane "Downloads"
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-
-                <h4><a name="linux">Linux</a></h4>
-                <blockquote>
-                    With Linux, try and favor the system packages over 
-                    building your own
-                    or getting packages from other areas.
-                    Most Linux builds should be possible with the system's
-                    available packages.
-                    <br>
-                    Note that some Linux systems have a habit of pre-populating
-                    your environment variables for you, for example <code>JAVA_HOME</code>
-                    might get pre-defined for you to refer to the JDK installed on
-                    your Linux system.
-                    You will need to unset <code>JAVA_HOME</code>.
-                    It's a good idea to run <code>env</code> and verify the
-                    environment variables you are getting from the default system
-                    settings make sense for building the OpenJDK.
-
-                </blockquote>
-
-                <h4><a name="solaris">Solaris</a></h4>
-                <blockquote>
-                    <h5><a name="studio">Studio Compilers</a></h5>
-                    <blockquote>
-                        At a minimum, the
-                        <a href="http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index.htm" target="_blank">
-                            Studio 12 Update 1 Compilers</a>
-                        (containing version 5.10 of the C and C++ compilers) is required,
-                        including specific patches.
-                        <p>
-                            The Solaris SPARC patch list is:
-                        <ul>
-                            <li>
-                                118683-05: SunOS 5.10: Patch for profiling libraries and assembler
-                            </li>
-                            <li>
-                                119963-21: SunOS 5.10: Shared library patch for C++
-                            </li>
-                            <li>
-                                120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch
-                            </li>
-                            <li>
-                                128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler
-                            </li>
-                            <li>
-                                141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95
-                            </li>
-                            <li>
-                                141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler
-                            </li>
-                            <li>
-                                142371-01: Sun Studio 12.1 Update 1: Patch for dbx
-                            </li>
-                            <li>
-                                143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling
-                            </li>
-                            <li>
-                                143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95
-                            </li>
-                            <li>
-                                142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools
-                            </li>
-                        </ul>
-                        <p>
-                            The Solaris X86 patch list is:
-                        <ul>
-                            <li>
-                                119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler
-                            </li>
-                            <li>
-                                119964-21: SunOS 5.10_x86: Shared library patch for C++_x86
-                            </li>
-                            <li>
-                                120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch
-                            </li>
-                            <li>
-                                141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend
-                            </li>
-                            <li>
-                                128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler
-                            </li>
-                            <li>
-                                142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler
-                            </li>
-                            <li>
-                                142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools
-                            </li>
-                        </ul>
-                        <p> 
-                            Place the <code>bin</code> directory in <code>PATH</code>.
-                        <p>
-                            The Oracle Solaris Studio Express compilers at:
-                            <a href="http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index-jsp-142582.html" target="_blank">
-                                Oracle Solaris Studio Express Download site</a>
-                            are also an option, although these compilers have not
-                            been extensively used yet.
-                    </blockquote>
-
-                </blockquote> <!-- Solaris -->
-
-                <h4><a name="windows">Windows</a></h4>
-                <blockquote>
-
-                    <h5><a name="toolkit">Windows Unix Toolkit</a></h5>
-                    <blockquote>
-                        Building on Windows requires a Unix-like environment, notably a 
-                        Unix-like shell.
-                        There are several such environments available of which 
-                        <a href="http://www.cygwin.com/">Cygwin</a> and 
-                        <a href="http://www.mingw.org/wiki/MSYS">MinGW/MSYS</a> are 
-                        currently supported for
-                        the OpenJDK build. One of the differences of these 
-                        systems from standard Windows tools is the way
-                        they handle Windows path names, particularly path names which contain
-                        spaces, backslashes as path separators and possibly drive letters. 
-                        Depending
-                        on the use case and the specifics of each environment these path 
-                        problems can
-                        be solved by a combination of quoting whole paths, translating 
-                        backslashes to
-                        forward slashes, escaping backslashes with additional backslashes and
-                        translating the path names to their 
-                        <a href="http://en.wikipedia.org/wiki/8.3_filename">
-                            "8.3" version</a>.
-
-                        <h6><a name="cygwin">CYGWIN</a></h6>
-                        <blockquote>
-                            CYGWIN is an open source, Linux-like environment which tries to emulate
-                            a complete POSIX layer on Windows. It tries to be smart about path names
-                            and can usually handle all kinds of paths if they are correctly quoted
-                            or escaped although internally it maps drive letters <code>&lt;drive&gt;:</code> 
-                            to a virtual directory <code>/cygdrive/&lt;drive&gt;</code>.
-                            <p>
-                                You can always use the <code>cygpath</code> utility to map pathnames with spaces
-                                or the backslash character into the <code>C:/</code> style of pathname
-                                (called 'mixed'), e.g. <code>cygpath -s -m "<i>path</i>"</code>.
-                            </p>
-                            <p>
-                                Note that the use of CYGWIN creates a unique problem with regards to
-                                setting <a href="#path"><code>PATH</code></a>. Normally on Windows
-                                the <code>PATH</code> variable contains directories
-                                separated with the ";" character (Solaris and Linux use ":").
-                                With CYGWIN, it uses ":", but that means that paths like "C:/path"
-                                cannot be placed in the CYGWIN version  of <code>PATH</code> and
-                                instead CYGWIN uses something like <code>/cygdrive/c/path</code>
-                                which CYGWIN understands, but only CYGWIN understands.
-                            </p>
-                            <p>
-                                The OpenJDK build requires CYGWIN version 1.7.16 or newer.
-                                Information about CYGWIN can
-                                be obtained from the CYGWIN website at
-                                <a href="http://www.cygwin.com" target="_blank">www.cygwin.com</a>.
-                            </p>
-                            <p>
-                                By default CYGWIN doesn't install all the tools required for building
-                                the OpenJDK.
-                                Along with the default installation, you need to install
-                                the following tools.
-                            <blockquote>
-                                <table border="1">
-                                    <thead>
-                                        <tr>
-                                            <td>Binary Name</td>
-                                            <td>Category</td>
-                                            <td>Package</td>
-                                            <td>Description</td>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr>
-                                            <td>ar.exe</td>
-                                            <td>Devel</td>
-                                            <td>binutils</td>
-                                            <td>
-                                                The GNU assembler, linker and binary utilities
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>make.exe</td>
-                                            <td>Devel</td>
-                                            <td>make</td>
-                                            <td>
-                                                The GNU version of the 'make' utility built for CYGWIN
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>m4.exe</td>
-                                            <td>Interpreters</td>
-                                            <td>m4</td>
-                                            <td>
-                                                GNU implementation of the traditional Unix macro
-                                                processor
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>cpio.exe</td>
-                                            <td>Utils</td>
-                                            <td>cpio</td>
-                                            <td>
-                                                A program to manage archives of files
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>gawk.exe</td>
-                                            <td>Utils</td>
-                                            <td>awk</td>
-                                            <td>
-                                                Pattern-directed scanning and processing language
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>file.exe</td>
-                                            <td>Utils</td>
-                                            <td>file</td>
-                                            <td>
-                                                Determines file type using 'magic' numbers
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>zip.exe</td>
-                                            <td>Archive</td>
-                                            <td>zip</td>
-                                            <td>
-                                                Package and compress (archive) files
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>unzip.exe</td>
-                                            <td>Archive</td>
-                                            <td>unzip</td>
-                                            <td>
-                                                Extract compressed files in a ZIP archive
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>free.exe</td>
-                                            <td>System</td>
-                                            <td>procps</td>
-                                            <td>
-                                                Display amount of free and used memory in the system
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </blockquote>
-                            Note that the CYGWIN software can conflict with other non-CYGWIN
-                            software on your Windows system.
-                            CYGWIN provides a
-                            <a href="http://cygwin.com/faq/faq.using.html" target="_blank">FAQ</a> for
-                            known issues and problems, of particular interest is the
-                            section on
-                            <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda" target="_blank">
-                                BLODA (applications that interfere with CYGWIN)</a>.
-                        </blockquote>
-
-                        <h6><a name="msys">MinGW/MSYS</a></h6> 
-                        <blockquote>
-                            MinGW ("Minimalist GNU for Windows") is a collection of free Windows
-                            specific header files and import libraries combined with GNU toolsets that
-                            allow one to produce native Windows programs that do not rely on any
-                            3rd-party C runtime DLLs. MSYS is a supplement to MinGW which allows building
-                            applications and programs which rely on traditional UNIX tools to
-                            be present. Among others this includes tools like <code>bash</code>
-                            and <code>make</code>.
-                            See <a href="http://www.mingw.org/wiki/MSYS" target="_blank">MinGW/MSYS</a>
-                            for more information.
-                            <p>
-                                Like Cygwin, MinGW/MSYS can handle different types of path formats. They
-                                are internally converted to paths with forward slashes and drive letters
-                                <code>&lt;drive&gt;:</code> replaced by a virtual
-                                directory <code>/&lt;drive&gt;</code>.  Additionally, MSYS automatically
-                                detects binaries compiled for the MSYS environment and feeds them with the
-                                internal, Unix-style path names. If native Windows applications are called
-                                from within MSYS programs their path arguments are automatically converted
-                                back to Windows style path names with drive letters and backslashes as
-                                path separators. This may cause problems for Windows applications which
-                                use forward slashes as parameter separator (e.g. <code>cl /nologo /I</code>)
-                                because MSYS may wrongly <a href="http://mingw.org/wiki/Posix_path_conversion">
-                                    replace such parameters by drive letters</a>.
-                            </p>
-                            <p>
-                                In addition to the tools which will be installed
-                                by default, you have
-                                to manually install the
-                                <code>msys-zip</code> and
-                                <code>msys-unzip</code> packages.
-                                This can be easily done with the MinGW command line installer:
-                            <blockquote> 
-                                <code>mingw-get.exe install msys-zip</code>
-                                <br>
-                                <code>mingw-get.exe install msys-unzip</code>
-                            </blockquote> 
-                        </blockquote>
-
-                    </blockquote>
-
-                    <h5><a name="vs2010">Visual Studio 2010 Compilers</a></h5>
-                    <blockquote>
-                        <p>
-                            The 32-bit and 64-bit OpenJDK Windows build requires
-                            Microsoft Visual Studio C++ 2010 (VS2010) Professional
-                            Edition or Express compiler.
-                            The compiler and other tools are expected to reside
-                            in the location defined by the variable
-                            <code>VS100COMNTOOLS</code> which
-                            is set by the Microsoft Visual Studio installer.
-                        </p>
-                        <p>
-                            Only the C++ part of VS2010 is needed.
-                            Try to let the installation go to the default 
-                            install directory.
-                            Always reboot your system after installing VS2010.
-                            The system environment variable VS100COMNTOOLS 
-                            should be
-                            set in your environment.
-                        </p>
-                        <p>
-                            Make sure that TMP and TEMP are also set 
-                            in the environment
-                            and refer to Windows paths that exist, 
-                            like <code>C:\temp</code>,
-                            not <code>/tmp</code>, not <code>/cygdrive/c/temp</code>, 
-                            and not <code>C:/temp</code>.
-                            <code>C:\temp</code> is just an example, 
-                            it is assumed that this area is
-                            private to the user, so by default 
-                            after installs you should
-                            see a unique user path in these variables.
-                        </p>
-                    </blockquote>
-
-
-                </blockquote> <!-- Windows -->
-
-                <h4><a name="macosx">Mac OS X</a></h4>
-                <blockquote>
-                    Make sure you get the right XCode version.
-                </blockquote> <!-- Mac OS X -->
-
-            </blockquote>
-
-            <!-- ====================================================== -->
-            <hr>
-            <h3><a name="configure">Configure</a></h3>
-            <blockquote>
-                The basic invocation of the <code>configure</code> script
-                looks like:
-                <blockquote>
-                    <b><code>bash ./configure [<i>options</i>]</code></b>
-                </blockquote>
-                This will create an output directory containing the
-                "configuration" and setup an area for the build result.
-                This directory typically looks like:
-                <blockquote>
-                    <b><code>build/linux-x64-normal-server-release</code></b>
-                </blockquote>
-                <code>configure</code> will try to figure out what system you are running on 
-                and where all necessary build components are.
-                If you have all prerequisites for building installed,
-                it should find everything.
-                If it fails to detect any component automatically,
-                it will exit and inform you about the problem.
-                When this happens, read more below in
-                <a href="#configureoptions">the <code>configure</code> options</a>.
-                <p>
-                    Some examples:
-                </p>
-                <table border="1">
-                    <thead>
-                        <tr>
-                            <th>Description</th>
-                            <th>Configure Command Line</th>
-                        </tr>
-                    </thead>                   
-                    <tbody>
-                        <tr>
-                            <td>Windows 32bit build with freetype specified</td>
-                            <td>
-                                <code>bash ./configure --with-freetype=/cygdrive/c/freetype-i586 --with-target-bits=32</code>   
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Debug 64bit Build</td>
-                            <td>
-                                <code>bash ./configure --enable-debug --with-target-bits=64</code>   
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-
-                <!-- ====================================================== -->
-                <h4><a name="configureoptions">Configure Options</a></h4>
-                <blockquote>
-                    Complete details on all the OpenJDK <code>configure</code> options can
-                    be seen with:
-                    <blockquote>
-                        <b><code>bash ./configure --help=short</code></b>
-                    </blockquote>
-                    Use <code>-help</code> to see all the <code>configure</code> options
-                    available.
-
-                    You can generate any number of different configurations,
-                    e.g. debug, release, 32, 64, etc.
-
-                    Some of the more commonly used <code>configure</code> options are:
-
-                    <table border="1">
-                        <thead>
-                            <tr>
-                                <th width="300">OpenJDK Configure Option</th>
-                                <th>Description</th>
-                            </tr>
-                        </thead>                   
-                        <tbody>
-                            <tr>
-                                <td><b><code>--enable-debug</code></b></td>
-                                <td>
-                                    set the debug level to fastdebug (this is a shorthand for
-                                    <code>--with-debug-level=fastdebug</code>)
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><b><code>--with-alsa=</code></b><i>path</i></td>
-                                <td>
-                                    select the location of the
-                                    <a name="alsa">Advanced Linux Sound Architecture (ALSA)</a>
-                                    <br>                        
-                                    Version 0.9.1 or newer of the ALSA files are
-                                    required for building the OpenJDK on Linux.
-                                    These Linux files are usually available from an "alsa"
-                                    of "libasound"
-                                    development package,
-                                    and it's highly recommended that you try and use
-                                    the package provided by the particular version of Linux that
-                                    you are using.
-                                </td>
-                            </tr>   
-                            <tr>
-                                <td><b><code>--with-boot-jdk=</code></b><i>path</i></td>
-                                <td>
-                                    select the <a href="#bootjdk">Bootstrap JDK</a>
-                                </td>
-                            </tr>                      
-                            <tr>
-                                <td><b><code>--with-boot-jdk-jvmargs=</code></b>"<i>args</i>"</td>
-                                <td>
-                                    provide the JVM options to be used to run the 
-                                    <a href="#bootjdk">Bootstrap JDK</a>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><b><code>--with-cacerts=</code></b><i>path</i></td>
-                                <td>
-                                    select the path to the cacerts file.
-                                    <br>
-                                    See <a href="http://en.wikipedia.org/wiki/Certificate_Authority" target="_blank">
-                                        http://en.wikipedia.org/wiki/Certificate_Authority</a>
-                                    for a better understanding of the Certificate Authority (CA).
-                                    A certificates file named "cacerts"
-                                    represents a system-wide keystore with CA certificates. 
-                                    In JDK and JRE
-                                    binary bundles, the "cacerts" file contains root CA certificates from
-                                    several public CAs (e.g., VeriSign, Thawte, and Baltimore).
-                                    The source contain a cacerts file
-                                    without CA root certificates. 
-                                    Formal JDK builders will need to secure
-                                    permission from each public CA and include the certificates into their
-                                    own custom cacerts file. 
-                                    Failure to provide a populated cacerts file
-                                    will result in verification errors of a certificate chain during runtime.
-                                    By default an empty cacerts file is provided and that should be
-                                    fine for most JDK developers.
-                                </td>
-                            </tr>    
-                            <tr>
-                                <td><b><code>--with-cups=</code></b><i>path</i></td>
-                                <td>
-                                    select the CUPS install location
-                                    <br>
-                                    The
-                                    <a name="cups">Common UNIX Printing System (CUPS) Headers</a>
-                                    are required for building the 
-                                    OpenJDK on Solaris and Linux.
-                                    The Solaris header files can be obtained by installing 
-                                    the package <strong>SFWcups</strong> from the Solaris Software
-                                    Companion CD/DVD, these often will be installed into the
-                                    directory <code>/opt/sfw/cups</code>.
-                                    <br>
-                                    The CUPS header files can always be downloaded from
-                                    <a href="http://www.cups.org" target="_blank">www.cups.org</a>.
-                                </td>
-                            </tr>    
-                            <tr>
-                                <td><b><code>--with-cups-include=</code></b><i>path</i></td>
-                                <td>
-                                    select the CUPS include directory location
-                                </td>
-                            </tr>                           
-                            <tr>
-                                <td><b><code>--with-debug-level=</code></b><i>level</i></td>
-                                <td>
-                                    select the debug information level of release,
-                                    fastdebug, or slowdebug
-                                </td>
-                            </tr>                          
-                            <tr>
-                                <td><b><code>--with-dev-kit=</code></b><i>path</i></td>
-                                <td>
-                                    select location of the compiler install or
-                                    developer install location
-                                </td>
-                            </tr>       
-                            <tr>
-                                <td><b><code>--with-freetype=</code></b><i>path</i></td>
-                                <td>
-                                    select the freetype files to use.
-                                    <br>
-                                    Expecting the
-                                    <a name="freetype">freetype</a> libraries under
-                                    <code>lib/</code> and the
-                                    headers under <code>include/</code>.
-                                    <br>
-                                    Version 2.3 or newer of FreeType is required.
-                                    On Unix systems required files can be available as part of your
-                                    distribution (while you still may need to upgrade them).
-                                    Note that you need development version of package that 
-                                    includes both the FreeType library and header files.
-                                    <br>
-                                    You can always download latest FreeType version from the
-                                    <a href="http://www.freetype.org" target="_blank">FreeType website</a>.
-                                    <br>
-                                    Building the freetype 2 libraries from scratch is also possible,
-                                    however on Windows refer to the
-                                    <a href="http://freetype.freedesktop.org/wiki/FreeType_DLL">
-                                        Windows FreeType DLL build instructions</a>.
-                                    <br>
-                                    Note that by default FreeType is built with byte code hinting
-                                    support disabled due to licensing restrictions.
-                                    In this case, text appearance and metrics are expected to
-                                    differ from Sun's official JDK build.
-                                    See
-                                    <a href="http://freetype.sourceforge.net/freetype2/index.html">
-                                        the SourceForge FreeType2 Home Page
-                                    </a>
-                                    for more information.
-                                </td>
-                            </tr>                          
-                            <tr>
-                                <td><b><code>--with-import-hotspot=</code></b><i>path</i></td>
-                                <td>
-                                    select the location to find hotspot
-                                    binaries from a previous build to avoid building
-                                    hotspot
-                                </td>
-                            </tr>                          
-                            <tr>
-                                <td><b><code>--with-target-bits=</code></b><i>arg</i></td>
-                                <td>
-                                    select 32 or 64 bit build
-                                </td>
-                            </tr>                           
-                            <tr>
-                                <td><b><code>--with-jvm-variants=</code></b><i>variants</i></td>
-                                <td>
-                                    select the JVM variants to build from, comma
-                                    separated list that can include:
-                                    server, client, kernel, zero and zeroshark
-                                </td>
-                            </tr>                           
-                            <tr>
-                                <td><b><code>--with-memory-size=</code></b><i>size</i></td>
-                                <td>
-                                    select the RAM size that GNU make will think
-                                    this system has
-                                </td>
-                            </tr>                            
-                            <tr>
-                                <td><a name="msvcrNN"><b><code>--with-msvcr-dll=</code></b><i>path</i></a></td>
-                                <td>
-                                    select the <code>msvcr100.dll</code>
-                                    file to include in the
-                                    Windows builds (C/C++ runtime library for
-                                    Visual Studio).
-                                    <br>
-                                    This is usually picked up automatically
-                                    from the redist
-                                    directories of Visual Studio 2010.
-                                </td>
-                            </tr>                            
-                            <tr>
-                                <td><b><code>--with-num-cores=</code></b><i>cores</i></td>
-                                <td>
-                                    select the number of cores to use (processor
-                                    count or CPU count)
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><b><code>--with-x=</code></b><i>path</i></td>
-                                <td>
-                                    select the location of the X11 and xrender files.
-                                    <br>
-                                    The
-                                    <a name="xrender">XRender Extension Headers</a>
-                                    are required for building the
-                                    OpenJDK on Solaris and Linux.
-                                    <br>
-                                    The Linux header files are usually available from a "Xrender"
-                                    development package, it's recommended that you try and use
-                                    the package provided by the particular distribution of Linux that
-                                    you are using.
-                                    <br>
-                                    The Solaris XRender header files is
-                                    included with the other X11 header files
-                                    in the package <strong>SFWxwinc</strong>
-                                    on new enough versions of
-                                    Solaris and will be installed in
-                                    <code>/usr/X11/include/X11/extensions/Xrender.h</code> or
-                                    <code>/usr/openwin/share/include/X11/extensions/Xrender.h</code>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </blockquote>
-
-            </blockquote>
-
-            <!-- ====================================================== -->
-            <hr>
-            <h3><a name="make">Make</a></h3>
-            <blockquote>
-                The basic invocation of the <code>make</code> utility
-                looks like:
-                <blockquote>
-                    <b><code>make all</code></b>
-                </blockquote>
-                This will start the build to the output directory containing the
-                "configuration" that was created by the <code>configure</code>
-                script. Run <code>make help</code> for more information on
-                the available targets.
-                <br>
-                There are some of the make targets that
-                are of general interest:
-                <table border="1">
-                    <thead>
-                        <tr>
-                            <th>Make Target</th>
-                            <th>Description</th>
-                        </tr>
-                    </thead>                   
-                    <tbody>
-                        <tr>
-                            <td><i>empty</i></td>
-                            <td>build everything but no images</td>
-                        </tr>
-                        <tr>
-                            <td><b><code>all</code></b></td>
-                            <td>build everything including images</td>
-                        </tr>
-                        <tr>
-                            <td><b><code>all-conf</code></b></td>
-                            <td>build all configurations</td>
-                        </tr>
-                        <tr>
-                            <td><b><code>images</code></b></td>
-                            <td>create complete j2sdk and j2re images</td>
-                        </tr>
-                        <tr>
-                            <td><b><code>install</code></b></td>
-                            <td>install the generated images locally, 
-                                typically in <code>/usr/local</code></td>
-                        </tr>
-                        <tr>
-                            <td><b><code>clean</code></b></td>
-                            <td>remove all files generated by make, 
-                                but not those generated by <code>configure</code></td>
-                        </tr>
-                        <tr>
-                            <td><b><code>dist-clean</code></b></td>
-                            <td>remove all files generated by both 
-                                and <code>configure</code> (basically killing the configuration)</td>
-                        </tr>
-                        <tr>
-                            <td><b><code>help</code></b></td>
-                            <td>give some help on using <code>make</code>, 
-                                including some interesting make targets</td>
-                        </tr>
-                    </tbody>
-                </table>
-            </blockquote>
-        </blockquote>
-
-        <!-- ====================================================== -->
-        <hr>
-        <h2><a name="testing">Testing</a></h2>
-        <blockquote>
-            When the build is completed, you should see the generated
-            binaries and associated files in the <code>j2sdk-image</code> 
-            directory in the output directory. 
-            In particular, the 
-            <code>build/<i>*</i>/images/j2sdk-image/bin</code>
-            directory should contain executables for the 
-            OpenJDK tools and utilities for that configuration.
-            The testing tool <code>jtreg</code> will be needed
-            and can be found at:
-            <a href="http://openjdk.java.net/jtreg/" target="_blank">
-                the jtreg site</a>.
-            The provided regression tests in the repositories
-            can be run with the command:
-            <blockquote>
-                <code><b>cd test &amp;&amp; make PRODUCT_HOME=`pwd`/../build/*/images/j2sdk-image all</b></code>
-            </blockquote>
-        </blockquote>
-
-        <!-- ====================================================== -->
-        <!-- ====================================================== -->
-        <!-- ====================================================== -->
-        <!-- ====================================================== -->
-        <!-- ====================================================== -->
-        <!-- ====================================================== -->
-        <!-- ====================================================== -->
-        <!-- ====================================================== -->
-        <!-- ====================================================== -->
-
-        <!-- ====================================================== -->
-        <hr>
-        <h2><a name="hints">Appendix A: Hints and Tips</a></h2>
-        <blockquote>
-
-            <h3><a name="faq">FAQ</a></h3>
-            <blockquote>
-
-                <p>
-                    <b>Q:</b> The <code>generated-configure.sh</code> file looks horrible! 
-                    How are you going to edit it?
-                    <br>
-                    <b>A:</b> The <code>generated-configure.sh</code> file is generated (think
-                    "compiled") by the autoconf tools. The source code is
-                    in <code>configure.ac</code> and various .m4 files in common/autoconf,
-                    which are much more readable.
-                </p>
-
-                <p>
-                    <b>Q:</b> 
-                    Why is the <code>generated-configure.sh</code> file checked in, 
-                    if it is generated?
-                    <br>
-                    <b>A:</b> 
-                    If it was not generated, every user would need to have the autoconf 
-                    tools installed, and re-generate the <code>configure</code> file
-                    as the first step. 
-                    Our goal is to minimize the work needed to be done by the user 
-                    to start building OpenJDK, and to minimize
-                    the number of external dependencies required.
-                </p>
-
-                <p>
-                    <b>Q:</b>
-                    Do you require a specific version of autoconf for regenerating
-                    <code>generated-configure.sh</code>?
-                    <br>
-                    <b>A:</b>
-                    Yes, version 2.69 is required and should be easy
-                    enough to aquire on all supported operating
-                    systems.  The reason for this is to avoid
-                    large spurious changes in <code>generated-configure.sh</code>.
-                </p>
-
-                <p>
-                    <b>Q:</b>
-                    How do you regenerate <code>generated-configure.sh</code>
-                    after making changes to the input files?
-                    <br>
-                    <b>A:</b>
-                    Regnerating <code>generated-configure.sh</code>
-                    should always be done using the
-                    script <code>common/autoconf/autogen.sh</code> to
-                    ensure that the correct files get updated. This
-                    script should also be run after mercurial tries to
-                    merge <code>generated-configure.sh</code> as a
-                    merge of the generated file is not guaranteed to
-                    be correct.
-                </p>
-
-                <p>
-                    <b>Q:</b> 
-                    What are the files in <code>common/makefiles/support/*</code> for? 
-                    They look like gibberish.
-                    <br>
-                    <b>A:</b>
-                    They are a somewhat ugly hack to compensate for command line length
-                    limitations on certain platforms (Windows, Solaris).
-                    Due to a combination of limitations in make and the shell, 
-                    command lines containing too many files will not work properly. 
-                    These
-                    helper files are part of an elaborate hack that will compress the
-                    command line in the makefile and then uncompress it safely. 
-                    We're
-                    not proud of it, but it does fix the problem. 
-                    If you have any better suggestions, we're all ears! :-)
-                </p>
-
-                <p>
-                    <b>Q:</b> 
-                    I want to see the output of the commands that make runs, 
-                    like in the old build. How do I do that?
-                    <br>
-                    <b>A:</b> 
-                    You specify the <code>LOG</code> variable to make. There are
-                    several log levels:
-                </p>
-                <blockquote>
-                    <ul>
-                        <li>
-                            <b><code>warn</code></b> &mdash; Default and very quiet.
-                        </li>
-                        <li>
-                            <b><code>info</code></b> &mdash; Shows more progress information
-                            than warn.
-                        </li>
-                        <li>
-                            <b><code>debug</code></b> &mdash; Echos all command lines and
-                            prints all macro calls for compilation definitions.
-                        </li>
-                        <li>
-                            <b><code>trace</code></b> &mdash; Echos all $(shell) command
-                            lines as well.
-                        </li>
-                    </ul>
-                </blockquote>
-
-                <p>
-                    <b>Q:</b> 
-                    When do I have to re-run <code>configure</code>?
-                    <br>
-                    <b>A:</b> 
-                    Normally you will run <code>configure</code> only once for creating a 
-                    configuration. 
-                    You need to re-run configuration only if you want to change any
-                    configuration options, 
-                    or if you pull down changes to the <code>configure</code> script.
-                </p>
-
-                <p>
-                    <b>Q:</b> 
-                    I have added a new source file. Do I need to modify the makefiles?
-                    <br>
-                    <b>A:</b> 
-                    Normally, no. If you want to create e.g. a new native
-                    library, 
-                    you will need to modify the makefiles. But for normal file
-                    additions or removals, no changes are needed. There are certan
-                    exceptions for some native libraries where the source files are spread
-                    over many directories which also contain sources for other
-                    libraries. In these cases it was simply easier to create include lists
-                    rather than excludes.
-                </p>
-
-                <p>
-                    <b>Q:</b>
-                    When I run <code>configure --help</code>, I see many strange options, 
-                    like <code>--dvidir</code>. What is this?
-                    <br>
-                    <b>A:</b> 
-                    Configure provides a slew of options by default, to all projects 
-                    that use autoconf. Most of them are not used in OpenJDK,
-                    so you can safely ignore them. To list only OpenJDK specific features, 
-                    use <code>configure --help=short</code> instead.
-                </p>
-
-                <p>
-                    <b>Q:</b> 
-                    <code>configure</code> provides OpenJDK-specific features such as
-                    <code>--with-builddeps-server</code> that are not
-                    described in this document. What about those? 
-                    <br>
-                    <b>A:</b>
-                    Try them out if you like! But be aware that most of these are 
-                    experimental features. 
-                    Many of them don't do anything at all at the moment; the option 
-                    is just a placeholder. Others depend on
-                    pieces of code or infrastructure that is currently 
-                    not ready for prime time.
-                </p>
-
-                <p>
-                    <b>Q:</b> 
-                    How will you make sure you don't break anything?
-                    <br>
-                    <b>A:</b> 
-                    We have a script that compares the result of the new build system
-                    with the result of the old. For most part, we aim for (and achieve)
-                    byte-by-byte identical output. There are however technical issues 
-                    with e.g. native binaries, which might differ in a byte-by-byte 
-                    comparison, even
-                    when building twice with the old build system. 
-                    For these, we compare relevant aspects 
-                    (e.g. the symbol table and file size). 
-                    Note that we still don't have 100%
-                    equivalence, but we're close.
-                </p>
-
-                <p>
-                    <b>Q:</b> 
-                    I noticed this thing X in the build that looks very broken by design. 
-                    Why don't you fix it?
-                    <br>
-                    <b>A:</b>
-                    Our goal is to produce a build output that is as close as 
-                    technically possible to the old build output. 
-                    If things were weird in the old build,
-                    they will be weird in the new build. 
-                    Often, things were weird before due to obscurity, 
-                    but in the new build system the weird stuff comes up to the surface.
-                    The plan is to attack these things at a later stage, 
-                    after the new build system is established.
-                </p>
-
-                <p>
-                    <b>Q:</b> 
-                    The code in the new build system is not that well-structured.
-                    Will you fix this?
-                    <br>
-                    <b>A:</b>
-                    Yes! The new build system has grown bit by bit as we converted 
-                    the old system. When all of the old build system is converted,
-                    we can take a step back and clean up the structure of the new build
-                    system. Some of this we plan to do before replacing the old build
-                    system and some will need to wait until after.
-                </p>
-
-                <p>
-                    <b>Q:</b> 
-                    Is anything able to use the results of the new build's default make target?
-                    <br>
-                    <b>A:</b> 
-                    Yes, this is the minimal (or roughly minimal) 
-                    set of compiled output needed for a developer to actually 
-                    execute the newly built JDK. The idea is that in an incremental 
-                    development fashion, when doing a normal make, 
-                    you should only spend time recompiling what's changed 
-                    (making it purely incremental) and only do the work that's 
-                    needed to actually run and test your code.
-                    The packaging stuff that is part of the <code>images</code>
-                    target is not needed for a normal developer who wants to
-                    test his new code. Even if it's quite fast, it's still unnecessary. 
-                    We're targeting sub-second incremental rebuilds! ;-) 
-                    (Or, well, at least single-digit seconds...)
-                </p>
-
-                <p>
-                    <b>Q:</b>
-                    I usually set a specific environment variable when building, 
-                    but I can't find the equivalent in the new build. 
-                    What should I do?
-                    <br>
-                    <b>A:</b>
-                    It might very well be that we have neglected to add support for
-                    an option that was actually used from outside the build system.
-                    Email us and we will add support for it!
-                </p>
-
-            </blockquote>
-
-            <h3><a name="performance">Build Performance Tips</a></h3>
-            <blockquote>
-
-                <p>Building OpenJDK requires a lot of horsepower. 
-                    Some of the build tools can be adjusted to utilize more or less
-                    of resources such as
-                    parallel threads and memory. 
-                    The <code>configure</code> script analyzes your system and selects reasonable 
-                    values for such options based on your hardware.
-                    If you encounter resource problems, such as out of memory conditions, 
-                    you can modify the detected values with:</p>
-
-                <ul>
-                    <li>
-                        <b><code>--with-num-cores</code></b> 
-                        &mdash; 
-                        number of cores in the build system,
-                        e.g. <code>--with-num-cores=8</code>
-                    </li>
-                    <li>
-                        <b><code>--with-memory-size</code></b> 
-                        &mdash; memory (in MB) available in the build system,
-                        e.g. <code>--with-memory-size=1024</code>
-                    </li>
-                </ul>
-
-                <p>It might also be necessary to specify the JVM arguments passed 
-                    to the Bootstrap JDK, using e.g.
-                    <code>--with-boot-jdk-jvmargs="-Xmx8G -enableassertions"</code>. 
-                    Doing this will override the default JVM arguments 
-                    passed to the Bootstrap JDK.</p>
-
-
-                <p>One of the top goals of the new build system is to improve the
-                    build performance and decrease the time needed to build. This will
-                    soon also apply to the java compilation when the Smart Javac wrapper
-                    is making its way into jdk8. It can be tried in the build-infra
-                    repository already. You are likely to find that the new build system
-                    is faster than the old one even without this feature.</p>
-
-                <p>At the end of a successful execution of <code>configure</code>, 
-                    you will get a performance summary, 
-                    indicating how well the build will perform. Here you will
-                    also get performance hints. 
-                    If you want to build fast, pay attention to those!</p>
-
-                <h4>Building with ccache</h4>
-
-                <p>A simple way to radically speed up compilation of native code
-                    (typically hotspot and native libraries in JDK) is to install
-                    ccache. This will cache and reuse prior compilation results, if the
-                    source code is unchanged. However, ccache versions prior to 3.1.4
-                    does not work correctly with the precompiled headers used in
-                    OpenJDK. So if your platform supports ccache at 3.1.4 or later, we
-                    highly recommend installing it. This is currently only supported on
-                    linux.</p> 
-
-                <h4>Building on local disk</h4>
-
-                <p>If you are using network shares, e.g. via NFS, for your source code, 
-                    make sure the build directory is situated on local disk. 
-                    The performance
-                    penalty is extremely high for building on a network share, 
-                    close to unusable.</p>
-
-                <h4>Building only one JVM</h4>
-
-                <p>The old build builds multiple JVMs on 32-bit systems (client and
-                    server; and on Windows kernel as well). In the new build we have
-                    changed this default to only build server when it's available. This
-                    improves build times for those not interested in multiple JVMs. To
-                    mimic the old behavior on platforms that support it, 
-                    use <code>--with-jvm-variants=client,server</code>.</p>
-
-                <h4>Selecting the number of cores to build on</h4>
-
-                <p>By default, <code>configure</code> will analyze your machine and run the make
-                    process in parallel with as many threads as you have cores. This
-                    behavior can be overridden, either "permanently" (on a <code>configure</code>
-                    basis) using <code>--with-num-cores=N</code> or for a single build
-                    only (on a make basis), using <code>make JOBS=N</code>.</p>
-
-                <p>If you want to make a slower build just this time, to save some CPU
-                    power for other processes, you can run
-                    e.g. <code>make JOBS=2</code>. This will force the makefiles
-                    to only run 2 parallel processes, or even <code>make JOBS=1</code>
-                    which will disable parallelism.</p>
-
-                <p>If you want to have it the other way round, namely having slow 
-                    builds default and override with fast if you're
-                    impatient, you should call <code>configure</code> with 
-                    <code>--with-num-cores=2</code>, making 2 the default. 
-                    If you want to run with more
-                    cores, run <code>make JOBS=8</code></p>
-
-            </blockquote>
-
-            <h3><a name="troubleshooting">Troubleshooting</a></h3>
-            <blockquote>
-
-                <h4>Solving build problems</h4>
-
-                <blockquote>
-                    If the build fails (and it's not due to a compilation error in 
-                    a source file you've changed), the first thing you should do
-                    is to re-run the build with more verbosity. 
-                    Do this by adding <code>LOG=debug</code> to your make command line.
-                    <br>
-                    The build log (with both stdout and stderr intermingled,
-                    basically the same as you see on your console) can be found as
-                    <code>build.log</code> in your build directory.
-                    <br>
-                    You can ask for help on build problems with the new build system 
-                    on either the
-                    <a href="http://mail.openjdk.java.net/mailman/listinfo/build-dev">
-                        build-dev</a>
-                    or the
-                    <a href="http://mail.openjdk.java.net/mailman/listinfo/build-infra-dev">
-                        build-infra-dev</a>
-                    mailing lists. Please include the relevant parts
-                    of the build log.
-                    <br>
-                    A build can fail for any number of reasons. 
-                    Most failures
-                    are a result of trying to build in an environment in which all the
-                    pre-build requirements have not been met. 
-                    The first step in
-                    troubleshooting a build failure is to recheck that you have satisfied
-                    all the pre-build requirements for your platform.
-                    Scanning the <code>configure</code> log is a good first step, making
-                    sure that what it found makes sense for your system.
-                    Look for strange error messages or any difficulties that
-                    <code>configure</code> had in finding things.
-                    <br>
-                    Some of the more common problems with builds are briefly
-                    described
-                    below, with suggestions for remedies.
-                    <ul>
-                        <li>
-                            <b>Corrupted Bundles on Windows:</b>
-                            <blockquote>
-                                Some virus scanning software has been known to 
-                                corrupt the
-                                downloading of zip bundles.
-                                It may be necessary to disable the 'on access' or 
-                                'real time'
-                                virus scanning features to prevent this corruption.
-                                This type of "real time" virus scanning can also 
-                                slow down the
-                                build process significantly.
-                                Temporarily disabling the feature, or excluding the build
-                                output directory may be necessary to get correct and
-                                faster builds.
-                            </blockquote>
-                        </li>
-                        <li>
-                            <b>Slow Builds:</b>
-                            <blockquote>
-                                If your build machine seems to be overloaded from too many
-                                simultaneous C++ compiles, try setting the 
-                                <code>JOBS=1</code> on the <code>make</code> command line.
-                                Then try increasing the count slowly to an acceptable
-                                level for your system. Also:
-                                <blockquote>
-                                    Creating the javadocs can be very slow, 
-                                    if you are running
-                                    javadoc, consider skipping that step.
-                                    <br>
-                                    Faster CPUs, more RAM, and a faster DISK usually helps.
-                                    The VM build tends to be CPU intensive 
-                                    (many C++ compiles),
-                                    and the rest of the JDK will often be disk intensive.
-                                    <br>
-                                    Faster compiles are possible using a tool called
-                                    <a href="http://ccache.samba.org/" target="_blank">ccache</a>.
-                                </blockquote>
-                            </blockquote>
-                        </li>
-                        <li>
-                            <b>File time issues:</b>
-                            <blockquote>
-                                If you see warnings that refer to file time stamps, e.g.
-                                <blockquote>
-                                    <i>Warning message:</i><code> 
-                                        File `xxx' has modification time in
-                                        the future.</code>
-                                    <br>
-                                    <i>Warning message:</i> <code> Clock skew detected. 
-                                        Your build may
-                                        be incomplete.</code>
-                                </blockquote>
-                                These warnings can occur when the clock on the build 
-                                machine is out of
-                                sync with the timestamps on the source files. 
-                                Other errors, apparently
-                                unrelated but in fact caused by the clock skew, 
-                                can occur along with
-                                the clock skew warnings. 
-                                These secondary errors may tend to obscure the
-                                fact that the true root cause of the problem 
-                                is an out-of-sync clock.
-                                <p>
-                                    If you see these warnings, reset the clock on the
-                                    build
-                                    machine, run "<code><i>gmake</i> clobber</code>" 
-                                    or delete the directory
-                                    containing the build output, and restart the 
-                                    build from the beginning.
-                            </blockquote>
-                        </li>
-                        <li>
-                            <b>Error message: 
-                                <code>Trouble writing out table to disk</code></b>
-                            <blockquote>
-                                Increase the amount of swap space on your build machine.
-                                This  could be caused by overloading the system and
-                                it may be necessary to use:
-                                <blockquote>
-                                    <code>make JOBS=1</code>
-                                </blockquote>
-                                to reduce the load on the system.
-                            </blockquote>
-                        </li>
-                        <li>
-                            <b>Error Message: 
-                                <code>libstdc++ not found:</code></b>
-                            <blockquote>
-                                This is caused by a missing libstdc++.a library.
-                                This is installed as part of a specific package
-                                (e.g. libstdc++.so.devel.386).
-                                By default some 64-bit Linux versions (e.g. Fedora)
-                                only install the 64-bit version of the libstdc++ package.
-                                Various parts of the JDK build require a static
-                                link of the C++ runtime libraries to allow for maximum
-                                portability of the built images.
-                            </blockquote>
-                        </li>
-                        <li>
-                            <b>Linux Error Message:
-                                <code>cannot restore segment prot after reloc</code></b>
-                            <blockquote>
-                                This is probably an issue with SELinux (See
-                                <a href="http://en.wikipedia.org/wiki/SELinux" target="_blank">
-                                    http://en.wikipedia.org/wiki/SELinux</a>).
-                                Parts of the VM is built without the <code>-fPIC</code> for
-                                performance reasons.
-                                <p>
-                                    To completely disable SELinux:
-                                <ol>
-                                    <li><code>$ su root</code></li>
-                                    <li><code># system-config-securitylevel</code></li>
-                                    <li><code>In the window that appears, select the SELinux tab</code></li>
-                                    <li><code>Disable SELinux</code></li>
-                                </ol>
-                                <p>
-                                    Alternatively, instead of completely disabling it you could
-                                    disable just this one check.
-                                <ol>
-                                    <li>Select System->Administration->SELinux Management</li>
-                                    <li>In the SELinux Management Tool which appears,
-                                        select "Boolean" from the menu on the left</li>
-                                    <li>Expand the "Memory Protection" group</li>
-                                    <li>Check the first item, labeled
-                                        "Allow all unconfined executables to use 
-                                        libraries requiring text relocation ..."</li>
-                                </ol>
-                            </blockquote>
-                        </li>
-                        <li>
-                            <b>Windows Error Messages:</b>
-                            <br>
-                            <code>*** fatal error - couldn't allocate heap, ... </code>
-                            <br>
-                            <code>rm fails with "Directory not empty"</code>
-                            <br>
-                            <code>unzip fails with "cannot create ... Permission denied"</code>
-                            <br>
-                            <code>unzip fails with "cannot create ... Error 50"</code>
-                            <br>
-                            <blockquote>
-                                The CYGWIN software can conflict with other non-CYGWIN
-                                software. See the CYGWIN FAQ section on
-                                <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda" target="_blank">
-                                    BLODA (applications that interfere with CYGWIN)</a>.
-                            </blockquote>
-                        </li>
-                        <li>
-                            <b>Windows Error Message: <code>spawn failed</code></b>
-                            <blockquote>
-                                Try rebooting the system, or there could be some kind of
-                                issue with the disk or disk partition being used.
-                                Sometimes it comes with a "Permission Denied" message.
-                            </blockquote>
-                        </li>
-                    </ul>
-                </blockquote>
-
-            </blockquote> <!-- Troubleshooting -->
-
-        </blockquote> <!-- Appendix A -->
-
-        <!-- ====================================================== -->
-        <hr>
-        <h2><a name="gmake">Appendix B: GNU make</a></h2>
-        <blockquote>
-
-            The Makefiles in the OpenJDK are only valid when used with the 
-            GNU version of the utility command <code>make</code>
-            (usually called <code>gmake</code> on Solaris).
-            A few notes about using GNU make:
-            <ul>
-                <li>
-                    You need GNU make version 3.81 or newer.
-                    If the GNU make utility on your systems is not
-                    3.81 or newer,
-                    see <a href="#buildgmake">"Building GNU make"</a>.
-                </li>
-                <li>
-                    Place the location of the GNU make binary in the
-                    <code>PATH</code>. 
-                </li>
-                <li>
-                    <strong>Solaris:</strong>
-                    Do NOT use <code>/usr/bin/make</code> on Solaris.
-                    If your Solaris system has the software
-                    from the Solaris Developer Companion CD installed, 
-                    you should try and use <code>gmake</code>
-                    which will be located in either the
-                    <code>/usr/bin</code>, <code>/opt/sfw/bin</code> or 
-                    <code>/usr/sfw/bin</code> directory.
-                </li>
-                <li>
-                    <strong>Windows:</strong>
-                    Make sure you start your build inside a bash shell.
-                </li>
-                <li>
-                    <strong>Mac OS X:</strong>
-                    The XCode "command line tools" must be installed on your Mac.
-                </li>
-            </ul>
-            <p>
-                Information on GNU make, and access to ftp download sites, are
-                available on the
-                <a href="http://www.gnu.org/software/make/make.html" target="_blank">
-                    GNU make web site
-                </a>.
-                The latest source to GNU make is available at
-                <a href="http://ftp.gnu.org/pub/gnu/make/" target="_blank">
-                    ftp.gnu.org/pub/gnu/make/</a>.
-            </p>
-
-            <h3><a name="buildgmake">Building GNU make</a></h3>
-            <blockquote>
-                First step is to get the GNU make 3.81 or newer source from
-                <a href="http://ftp.gnu.org/pub/gnu/make/" target="_blank">
-                    ftp.gnu.org/pub/gnu/make/</a>.
-                Building is a little different depending on the OS but is
-                basically done with:
-                <blockquote>
-                    <code>bash ./configure</code>
-                    <br>
-                    <code>make</code>
-                </blockquote>
-            </blockquote>
-
-        </blockquote> <!-- Appendix B -->
-
-        <!-- ====================================================== -->
-        <hr>
-        <h2><a name="buildenvironments">Appendix C: Build Environments</a></h2>
-        <blockquote>
-
-            <h3><a name="MBE">Minimum Build Environments</a></h3>
-            <blockquote>
-                This file often describes specific requirements for what we 
-                call the
-                "minimum build environments" (MBE) for this 
-                specific release of the JDK.
-                What is listed below is what the Oracle Release
-                Engineering Team will use to build the Oracle JDK product.
-                Building with the MBE will hopefully generate the most compatible
-                bits that install on, and run correctly on, the most variations
-                of the same base OS and hardware architecture.
-                In some cases, these represent what is often called the
-                least common denominator, but each Operating System has different
-                aspects to it.
-                <p>
-                    In all cases, the Bootstrap JDK version minimum is critical,
-                    we cannot guarantee builds will work with older Bootstrap JDK's.
-                    Also in all cases, more RAM and more processors is better,
-                    the minimums listed below are simply recommendations.
-                <p>
-                    With Solaris and Mac OS X, the version listed below is the
-                    oldest release we can guarantee builds and works, and the
-                    specific version of the compilers used could be critical.
-                <p>
-                    With Windows the critical aspect is the Visual Studio compiler
-                    used, which due to it's runtime, generally dictates what Windows
-                    systems can do the builds and where the resulting bits can
-                    be used.<br>
-                    <b>NOTE: We expect a change here off these older Windows OS releases
-                        and to a 'less older' one, probably Windows 2008R2 X64.</b>
-                <p>
-                    With Linux, it was just a matter of picking a
-                    stable distribution that is a good representative for Linux
-                    in general.<br>
-                    <b>NOTE: We expect a change here from Fedora 9 to something else,
-                        but it has not been completely determined yet, possibly
-                        Ubuntu 12.04 X64, unbiased community feedback would be welcome on
-                        what a good choice would be here.</b>
-                <p>
-                    It is understood that most developers will NOT be using these 
-                    specific versions, and in fact creating these specific versions
-                    may be difficult due to the age of some of this software.
-                    It is expected that developers are more often using the more
-                    recent releases and distributions of these operating systems.
-                <p>
-                    Compilation problems with newer or different C/C++ compilers is a
-                    common problem.
-                    Similarly, compilation problems related to changes to the
-                    <code>/usr/include</code> or system header files is also a
-                    common problem with older, newer, or unreleased OS versions.
-                    Please report these types of problems as bugs so that they
-                    can be dealt with accordingly.
-                </p>
-                <table border="1">
-                    <thead>
-                        <tr>
-                            <th>Base OS and Architecture</th>
-                            <th>OS</th>
-                            <th>C/C++ Compiler</th>
-                            <th>Bootstrap JDK</th>
-                            <th>Processors</th>
-                            <th>RAM Minimum</th>
-                            <th>DISK Needs</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td>Linux X86 (32-bit) and X64 (64-bit)</td>
-                            <td>Fedora 9</td>
-                            <td>gcc 4.3 </td>
-                            <td>JDK 7u7</td>
-                            <td>2 or more</td>
-                            <td>1 GB</td>
-                            <td>6 GB</td>
-                        </tr>
-                        <tr>
-                            <td>Solaris SPARC (32-bit) and SPARCV9 (64-bit)</td>
-                            <td>Solaris 10 Update 6</td>
-                            <td>Studio 12 Update 1 + patches</td>
-                            <td>JDK 7u7</td>
-                            <td>4 or more</td>
-                            <td>4 GB</td>
-                            <td>8 GB</td>
-                        </tr>
-                        <tr>
-                            <td>Solaris X86 (32-bit) and X64 (64-bit)</td>
-                            <td>Solaris 10 Update 6</td>
-                            <td>Studio 12 Update 1 + patches</td>
-                            <td>JDK 7u7</td>
-                            <td>4 or more</td>
-                            <td>4 GB</td>
-                            <td>8 GB</td>
-                        </tr>
-                        <tr>
-                            <td>Windows X86 (32-bit)</td>
-                            <td>Windows XP</td>
-                            <td>Microsoft Visual Studio C++ 2010 Professional Edition</td>
-                            <td>JDK 7u7</td>
-                            <td>2 or more</td>
-                            <td>2 GB</td>
-                            <td>6 GB</td>
-                        </tr>
-                        <tr>
-                            <td>Windows X64 (64-bit)</td>
-                            <td>Windows Server 2003 - Enterprise x64 Edition</td>
-                            <td>Microsoft Visual Studio C++ 2010 Professional Edition</td>
-                            <td>JDK 7u7</td>
-                            <td>2 or more</td>
-                            <td>2 GB</td>
-                            <td>6 GB</td>
-                        </tr>
-                        <tr>
-                            <td>Mac OS X X64 (64-bit)</td>
-                            <td>Mac OS X 10.7 "Lion"</td>
-                            <td>XCode 4.5.2 or newer</td>
-                            <td>JDK 7u7</td>
-                            <td>2 or more</td>
-                            <td>4 GB</td>
-                            <td>6 GB</td>
-                        </tr>
-                    </tbody>
-                </table>
-            </blockquote>
-
-            <!-- ====================================================== -->
-            <hr>
-            <h3><a name="SDBE">Specific Developer Build Environments</a></h3>
-            <blockquote>
-                We won't be listing all the possible environments, but
-                we will try to provide what information we have available to us.
-                <p>
-                    <strong>NOTE: The community can help out by updating
-                        this part of the document.
-                    </strong>
-
-                <h4><a name="fedora">Fedora</a></h4>
-                <blockquote>
-                    After installing the latest
-                    <a href="http://fedoraproject.org">Fedora</a>
-                    you need to install several build dependencies.
-                    The simplest way to do it is to execute the 
-                    following commands as user <code>root</code>:
-                    <blockquote>
-                        <code>yum-builddep java-1.7.0-openjdk</code>
-                        <br>
-                        <code>yum install gcc gcc-c++</code>
-                    </blockquote>
-                    <p>
-                        In addition, it's necessary to set a few environment 
-                        variables for the build:
-                    <blockquote>
-                        <code>export LANG=C</code>
-                        <br>
-                        <code>export PATH="/usr/lib/jvm/java-openjdk/bin:${PATH}"</code>
-                    </blockquote>
-                </blockquote>
-
-
-                <h4><a name="centos">CentOS 5.5</a></h4>
-                <blockquote>
-                    After installing
-                    <a href="http://www.centos.org/">CentOS 5.5</a>
-                    you need to make sure you have
-                    the following Development bundles installed:
-                    <blockquote>
-                        <ul>
-                            <li>Development Libraries</li>
-                            <li>Development Tools</li>
-                            <li>Java Development</li>
-                            <li>X Software Development (Including XFree86-devel)</li>
-                        </ul>
-                    </blockquote>
-                    <p>
-                        Plus the following packages:
-                    <blockquote>
-                        <ul>
-                            <li>cups devel: Cups Development Package</li>
-                            <li>alsa devel: Alsa Development Package</li>
-                            <li>Xi devel: libXi.so Development Package</li>
-                        </ul>
-                    </blockquote>
-                    <p>
-                        The freetype 2.3 packages don't seem to be available,
-                        but the freetype 2.3 sources can be downloaded, built,
-                        and installed easily enough from
-                        <a href="http://downloads.sourceforge.net/freetype">
-                            the freetype site</a>.
-                        Build and install with something like:
-                    <blockquote>
-                        <code>bash ./configure</code>
-                        <br>
-                        <code>make</code>
-                        <br>
-                        <code>sudo -u root make install</code>
-                    </blockquote>
-                    <p>
-                        Mercurial packages could not be found easily, but a Google
-                        search should find ones, and they usually include Python if
-                        it's needed.
-                </blockquote>
-
-                <h4><a name="debian">Debian 5.0 (Lenny)</a></h4>
-                <blockquote>
-                    After installing <a href="http://debian.org">Debian</a> 5 
-                    you need to install several build dependencies. 
-                    The simplest way to install the build dependencies is to 
-                    execute the following commands as user <code>root</code>:
-                    <blockquote>
-                        <code>aptitude build-dep openjdk-7</code>
-                        <br>
-                        <code>aptitude install openjdk-7-jdk libmotif-dev</code>
-                    </blockquote>
-                    <p>
-                        In addition, it's necessary to set a few environment 
-                        variables for the build:
-                    <blockquote>
-                        <code>export LANG=C</code>
-                        <br>
-                        <code>export PATH="/usr/lib/jvm/java-7-openjdk/bin:${PATH}"</code>
-                    </blockquote>
-                </blockquote>
-
-                <h4><a name="ubuntu">Ubuntu 12.04</a></h4>
-                <blockquote>                       
-                    After installing <a href="http://ubuntu.org">Ubuntu</a> 12.04 
-                    you need to install several build dependencies. The simplest
-                    way to do it is to execute the following commands:
-                    <blockquote>
-                        <code>sudo aptitude build-dep openjdk-7</code>
-                        <br>
-                        <code>sudo aptitude install openjdk-7-jdk</code>
-                    </blockquote>
-                    <p>
-                        In addition, it's necessary to set a few environment 
-                        variables for the build:
-                    <blockquote>
-                        <code>export LANG=C</code>
-                        <br>
-                        <code>export PATH="/usr/lib/jvm/java-7-openjdk/bin:${PATH}"</code>
-                    </blockquote>
-                </blockquote>
-
-                <h4><a name="opensuse">OpenSUSE 11.1</a></h4>
-                <blockquote>
-                    After installing <a href="http://opensuse.org">OpenSUSE</a> 11.1 
-                    you need to install several build dependencies. 
-                    The simplest way to install the build dependencies is to 
-                    execute the following commands:
-                    <blockquote>
-                        <code>sudo zypper source-install -d java-1_7_0-openjdk</code>
-                        <br>
-                        <code>sudo zypper install make</code>
-                    </blockquote>
-                    <p>
-                        In addition, it is necessary to set a few environment 
-                        variables for the build:
-                    <blockquote>
-                        <code>export LANG=C</code>
-                        <br>
-                        <code>export PATH="/usr/lib/jvm/java-1.7.0-openjdk/bin:$[PATH}"</code>
-                    </blockquote>
-                    <p>
-                        Finally, you need to unset the <code>JAVA_HOME</code> 
-                        environment variable:
-                    <blockquote>
-                        <code>export -n JAVA_HOME</code>
-                    </blockquote>
-                </blockquote>
-
-                <h4><a name="mandriva">Mandriva Linux One 2009 Spring</a></h4>
-                <blockquote>
-                    After installing <a href="http://mandriva.org">Mandriva</a>
-                    Linux One 2009 Spring 
-                    you need to install several build dependencies. 
-                    The simplest way to install the build dependencies is to 
-                    execute the following commands as user <code>root</code>:
-                    <blockquote>
-                        <code>urpmi java-1.7.0-openjdk-devel make gcc gcc-c++ 
-                            freetype-devel zip unzip libcups2-devel libxrender1-devel
-                            libalsa2-devel libstc++-static-devel libxtst6-devel 
-                            libxi-devel</code>
-                    </blockquote>
-                    <p>
-                        In addition, it is necessary to set a few environment 
-                        variables for the build:
-                    <blockquote>
-                        <code>export LANG=C</code>
-                        <br>
-                        <code>export PATH="/usr/lib/jvm/java-1.7.0-openjdk/bin:${PATH}"</code>
-                    </blockquote>
-                </blockquote>
-
-                <h4><a name="opensolaris">OpenSolaris 2009.06</a></h4>
-                <blockquote>
-                    After installing <a href="http://opensolaris.org">OpenSolaris</a> 2009.06 
-                    you need to install several build dependencies. 
-                    The simplest way to install the build dependencies is to 
-                    execute the following commands:
-                    <blockquote>
-                        <code>pfexec pkg install SUNWgmake SUNWj7dev 
-                            sunstudioexpress SUNWcups SUNWzip SUNWunzip SUNWxwhl 
-                            SUNWxorg-headers SUNWaudh SUNWfreetype2</code>
-                    </blockquote>
-                    <p>
-                        In addition, it is necessary to set a few environment 
-                        variables for the build:
-                    <blockquote>
-                        <code>export LANG=C</code>
-                        <br>
-                        <code>export PATH="/opt/SunStudioExpress/bin:${PATH}"</code>
-                    </blockquote>
-                </blockquote>
-
-            </blockquote>
-
-        </blockquote> <!-- Appendix C -->
-
-        <!-- ====================================================== -->
-
-        <!-- Leave out Appendix D --
-
-<hr>
-<h2><a name="mapping">Appendix D: Mapping Old to New</a></h2>
-<blockquote>
-    <p>This table will help you convert some idioms of the old build
-        system to the new build system.</p>
-    <table summary="Cheat sheet for converting from old to new build system">
-        <tr valign="top">
-            <th>In the old build system, you used to...</th>
-            <th>In the new build system, you should ...</th>
-        </tr>
-        <tr valign="top">
-            <td>run <code>make sanity</code></td>
-            <td>run <code>bash ./configure</code></td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>ALT_OUTPUTDIR=build/my-special-output</code></td>
-            <td>before building the first time:
-                <br>
-                <code>cd build/my-special-output</code>
-                <br>
-                <code>bash ../../configure</code>
-                <br>
-                to build:
-                <br>
-                <code>cd build/my-special-output</code>
-                <br>
-                <code>make</code>
-            </td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>ALT_BOOTDIR=/opt/java/jdk7</code></td>
-            <td>run <code>configure --with-boot-jdk=/opt/java/jdk7</code></td>
-        </tr>
-        <tr valign="top">
-            <td>run <code>make ARCH_DATA_MODEL=32</code></td>
-            <td>run <code>configure --with-target-bits=32</code></td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>BUILD_CLIENT_ONLY=true</code></td>
-            <td>run <code>configure --with-jvm-variants=client</code></td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>ALT_FREETYPE_LIB_PATH=/opt/freetype/lib</code> 
-                and <code>ALT_FREETYPE_HEADERS_PATH=/opt/freetype/include</code></td>
-            <td>run <code>configure --with-freetype=/opt/freetype</code></td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>ALT_CUPS_HEADERS_PATH=/opt/cups/include</code></td>
-            <td>run <code>configure --with-cups=/opt/cups</code></td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>ALT_OPENWIN_HOME=/opt/X11R6</code></td>
-            <td>run <code>configure --with-x=/opt/X11R6</code></td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>ALT_MSVCRNN_DLL_PATH=c:/vc_redist</code></td>
-            <td>run <code>configure --with-msvcr100dll=/cygdrive/c/vc_redist</code></td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>ALT_COMPILER_PATH=/opt/my-gcc/bin/gcc</code></td>
-            <td>run <code>CC=/opt/my-gcc/bin/gcc configure</code> 
-                or <code>CXX=/opt/my-gcc/bin/g++ configure</code>
-            </td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>BUILD_HEADLESS_ONLY=true</code></td>
-            <td>run <code>configure --disable-headful</code></td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>ALT_DEVTOOLS_PATH=/opt/mytools</code></td>
-            <td>just run <code>configure</code>, 
-                your tools should be detected automatically. 
-                If you have an unusual configuration, 
-                add the tools directory to your <code>PATH</code>.
-            </td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>ALT_DROPS_DIR=/home/user/dropdir</code></td>
-            <td>source drops are not used anymore</td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>USE_ONLY_BOOTDIR_TOOLS=true</code></td>
-            <td>not needed, <code>configure</code> should always do the Right Thing automatically</td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>ALT_JDK_IMPORT_PATH=/opt/java/import-jdk</code>
-                or <code>ALT_BUILD_JDK_IMPORT_PATH=/opt/java/import-jdk</code>
-            </td>
-            <td>Importing JDKs is no longer possible, 
-                but hotspot can be imported using 
-                <code>--with-import-hotspot</code>. 
-                Documentation on how to achieve a 
-                similar solution will come soon!
-            </td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>EXTRA_CFLAGS=-Xfoo</code></td>
-            <td>run <code>CFLAGS=-Xfoo configure</code></td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>CROSS_COMPILE_ARCH=i586</code></td>
-            <td>see <a href="#sec7.3"> section 7.3, Cross-compilation</a></td>
-        </tr>
-        <tr valign="top">
-            <td>set <code>SKIP_BOOT_CYCLE=false</code></td>
-            <td>Run <code>make bootcycle-images</code>.</td>
-        </tr>
-    </table>
-
-    <h3><a name="variables">Environment/Make Variables</a></h3>
-    <p>
-        Some of the
-        environment or make variables (just called <b>variables</b> in this
-        document) that can impact the build are:
-    <blockquote>
-        <dl>
-            <dt><a name="path"><code>PATH</code></a> </dt>
-            <dd>Typically you want to set the <code>PATH</code> to include:
-                <ul>
-                    <li>The location of the GNU make binary</li>
-                    <li>The location of the Bootstrap JDK <code>java</code> 
-                        (see <a href="#bootjdk">Bootstrap JDK</a>)</li>
-                    <li>The location of the C/C++ compilers 
-                        (see <a href="#compilers"><code>compilers</code></a>)</li>
-                    <li>The location or locations for the Unix command utilities
-                        (e.g. <code>/usr/bin</code>)</li>
-                </ul>
-            </dd>
-            <dt><code>MILESTONE</code> </dt>
-            <dd>
-                The milestone name for the build (<i>e.g.</i>"beta"). 
-                The default value is "internal".
-            </dd>
-            <dt><code>BUILD_NUMBER</code> </dt>
-            <dd>
-                The build number for the build (<i>e.g.</i> "b27"). 
-                The default value is "b00".
-            </dd>
-            <dt><a name="arch_data_model"><code>ARCH_DATA_MODEL</code></a></dt>
-            <dd>The <code>ARCH_DATA_MODEL</code> variable
-                is used to specify whether the build is to generate 32-bit or 64-bit
-                binaries. 
-                The Solaris build supports either 32-bit or 64-bit builds, but
-                Windows and Linux will support only one, depending on the specific
-                OS being used.
-                Normally, setting this variable is only necessary on Solaris.
-                Set <code>ARCH_DATA_MODEL</code> to <code>32</code> for generating 32-bit binaries, 
-                or to <code>64</code> for generating 64-bit binaries.
-            </dd>
-            <dt><a name="ALT_BOOTDIR"><code>ALT_BOOTDIR</code></a></dt>
-            <dd>
-                The location of the bootstrap JDK installation. 
-                See <a href="#bootjdk">Bootstrap JDK</a> for more information.
-                You should always install your own local Bootstrap JDK and
-                always set <code>ALT_BOOTDIR</code> explicitly.
-            </dd>
-            <dt><a name="ALT_OUTPUTDIR"><code>ALT_OUTPUTDIR</code></a> </dt>
-            <dd>
-                An override for specifying the (absolute) path of where the
-                build output is to go.
-                The default output directory will be build/<i>platform</i>.
-            </dd>
-            <dt><a name="ALT_COMPILER_PATH"><code>ALT_COMPILER_PATH</code></a> </dt>
-            <dd>
-                The location of the C/C++ compiler.
-                The default varies depending on the platform. 
-            </dd>
-            <dt><code><a name="ALT_CACERTS_FILE">ALT_CACERTS_FILE</a></code></dt>
-            <dd>
-                The location of the <a href="#cacerts">cacerts</a> file.
-                The default will refer to 
-                <code>jdk/src/share/lib/security/cacerts</code>.
-            </dd>
-            <dt><a name="ALT_CUPS_HEADERS_PATH"><code>ALT_CUPS_HEADERS_PATH</code></a> </dt>
-            <dd>
-                The location of the CUPS header files.
-                See <a href="#cups">CUPS information</a> for more information.
-                If this path does not exist the fallback path is 
-                <code>/usr/include</code>.
-            </dd>
-            <dt><a name="ALT_FREETYPE_LIB_PATH"><code>ALT_FREETYPE_LIB_PATH</code></a></dt>
-            <dd>
-                The location of the FreeType shared library. 
-                See <a href="#freetype">FreeType information</a> for details. 
-            </dd>
-            <dt><a name="ALT_FREETYPE_HEADERS_PATH"><code>ALT_FREETYPE_HEADERS_PATH</code></a></dt>
-            <dd>
-                The location of the FreeType header files.
-                See <a href="#freetype">FreeType information</a> for details. 
-            </dd>
-            <dt><a name="ALT_JDK_DEVTOOLS_PATH"><code>ALT_JDK_DEVTOOLS_PATH</code></a></dt>
-            <dd>
-                The default root location of the devtools.
-                The default value is 
-                <code>$(ALT_SLASH_JAVA)/devtools</code>.
-            </dd>
-            <dt><code><a name="ALT_DEVTOOLS_PATH">ALT_DEVTOOLS_PATH</a></code> </dt>
-            <dd>
-                The location of tools like the 
-                <a href="#zip"><code>zip</code> and <code>unzip</code></a>
-                binaries, but might also contain the GNU make utility
-                (<code><i>gmake</i></code>).
-                So this area is a bit of a grab bag, especially on Windows.
-                The default value depends on the platform and
-                Unix Commands being used.
-                On Linux the default will be 
-                <code>$(ALT_JDK_DEVTOOLS_PATH)/linux/bin</code>, 
-                on Solaris
-                <code>$(ALT_JDK_DEVTOOLS_PATH)/<i>{sparc,i386}</i>/bin</code>, 
-                and on Windows with CYGWIN
-                <code>/usr/bin</code>.
-            </dd>
-            <dt><a name="ALT_UNIXCCS_PATH"><code>ALT_UNIXCCS_PATH</code></a></dt>
-            <dd>
-                <strong>Solaris only:</strong>
-                An override for specifying where the Unix CCS
-                command set are located.
-                The default location is <code>/usr/ccs/bin</code> 
-            </dd>
-            <dt><a name="ALT_SLASH_JAVA"><code>ALT_SLASH_JAVA</code></a></dt>
-            <dd>
-                The default root location for many of the ALT path locations
-                of the following ALT variables.
-                The default value is 
-                <code>"/java"</code> on Solaris and Linux, 
-                <code>"J:"</code> on Windows.
-            </dd>
-
-            <dt><a name="ALT_OPENWIN_HOME"><code>ALT_OPENWIN_HOME</code></a></dt>
-            <dd>
-                The top-level directory of the libraries and include files 
-                for the platform's 
-                graphical programming environment. 
-                The default location is platform specific. 
-                For example, on Linux it defaults to <code>/usr/X11R6/</code>.
-            </dd>
-            <dt><strong>Windows specific:</strong></dt>
-            <dd>
-                <dl>
-                    <dt><a name="ALT_WINDOWSSDKDIR"><code>ALT_WINDOWSSDKDIR</code></a> </dt>
-                    <dd>
-                        The location of the 
-                        Microsoft Windows SDK where some tools will be
-                        located.
-                        The default is whatever WINDOWSSDKDIR is set to
-                        (or WindowsSdkDir) or the path
-                        <br>
-                        <code>c:\Program Files\Microsoft SDKs\Windows\v7.0a</code>
-                    </dd>
-                    <dt><code><a name="ALT_DXSDK_PATH">ALT_DXSDK_PATH</a></code> </dt>
-                    <dd>
-                        The location of the 
-                        <a href="#dxsdk">Microsoft DirectX 9 SDK</a>.
-                        The default will be to try and use the DirectX environment
-                        variable <code>DXSDK_DIR</code>,
-                        failing that, look in <code>C:/DXSDK</code>.
-                    </dd>
-                    <dt><code><a name="ALT_MSVCRNN_DLL_PATH">ALT_MSVCRNN_DLL_PATH</a></code> </dt>
-                    <dd>
-                        The location of the 
-                        <a href="#msvcrNN"><code>MSVCR100.DLL</code></a>. 
-                    </dd>
-                </dl>
-            </dd>
-            <dt><strong>Cross-Compilation Support:</strong></dt>
-            <dd>
-                <dl>
-                    <dt><a name="CROSS_COMPILE_ARCH"><code>CROSS_COMPILE_ARCH</code></a> </dt>
-                    <dd>
-                        Set to the target architecture of a 
-                        cross-compilation build. If set, this
-                        variable is used to signify that we are 
-                        cross-compiling. The expectation
-                        is that
-                        <a href="#ALT_COMPILER_PATH"><code>ALT_COMPILER_PATH</code></a> 
-                        is set
-                        to point to the cross-compiler and that any
-                        cross-compilation specific flags
-                        are passed using 
-                        <a href="#EXTRA_CFLAGS"><code>EXTRA_CFLAGS</code></a>.
-                        The <a href="#ALT_OPENWIN_HOME"><code>ALT_OPENWIN_HOME</code></a>
-                        variable should 
-                        also be set to point to the graphical header files
-                        (e.g. X11) provided with 
-                        the cross-compiler.
-                        When cross-compiling we skip execution of any demos 
-                        etc that may be built, and
-                        also skip binary-file verification.
-                    </dd>
-                    <dt><code><a name="EXTRA_CFLAGS">EXTRA_CFLAGS</a></code> </dt>
-                    <dd>
-                        Used to pass cross-compilation options to the 
-                        cross-compiler.
-                        These are added to the <code>CFLAGS</code> 
-                        and <code>CXXFLAGS</code> variables. 
-                    </dd>
-                    <dt><code><a name="USE_ONLY_BOOTDIR_TOOLS">USE_ONLY_BOOTDIR_TOOLS</a></code> </dt>
-                    <dd>
-                        Used primarily for cross-compilation builds
-                        (and always set in that case)
-                        this variable indicates that tools from the
-                        boot JDK should be used during
-                        the build process, not the tools
-                        (<code>javac</code>, <code>javah</code>, <code>jar</code>)
-                        just built (which can't execute on the build host).
-                    </dd>
-                    <dt><code><a name="HOST_CC">HOST_CC</a></code> </dt>
-                    <dd>
-                        The location of the C compiler to generate programs 
-                        to run on the build host.
-                        Some parts of the build generate programs that are
-                        then compiled and executed
-                        to produce other parts of the build. Normally the 
-                        primary C compiler is used
-                        to do this, but when cross-compiling that would be
-                        the cross-compiler and the
-                        resulting program could not be executed. 
-                        On Linux this defaults to <code>/usr/bin/gcc</code>; 
-                        on other platforms it must be
-                        set explicitly.
-                    </dd>
-                </dl>
-            <dt><strong>Specialized Build Options:</strong></dt>
-            <dd>
-                Some build variables exist to support specialized build 
-                environments and/or specialized
-                build products. Their use is only supported in those contexts:
-                <dl>
-                    <dt><code><a name="BUILD_CLIENT_ONLY">BUILD_CLIENT_ONLY</a></code> </dt>
-                    <dd>
-                        Indicates this build will only contain the 
-                        Hotspot client VM. In addition to
-                        controlling the Hotspot build target, 
-                        it ensures that we don't try to copy
-                        any server VM files/directories, 
-                        and defines a default <code>jvm.cfg</code> file
-                        suitable for a client-only environment. 
-                        Using this in a 64-bit build will
-                        generate a sanity warning as 64-bit client 
-                        builds are not directly supported.
-                    </dd>
-                    <dt><code><a name="BUILD_HEADLESS_ONLY"></a>BUILD_HEADLESS_ONLY</code> </dt>
-                    <dd>
-                        Used when the build environment has no graphical 
-                        capabilities at all. This
-                        excludes building anything that requires graphical 
-                        libraries to be available.
-                    </dd>
-                    <dt><code><a name="JAVASE_EMBEDDED"></a>JAVASE_EMBEDDED</code> </dt>
-                    <dd>
-                        Used to indicate this is a build of the Oracle 
-                        Java SE Embedded product. 
-                        This will enable the directives included in the 
-                        SE-Embedded specific build 
-                        files.
-                    </dd>
-                    <dt><code><a name="LIBZIP_CAN_USE_MMAP">LIBZIP_CAN_USE_MMAP</a></code> </dt>
-                    <dd>
-                        If set to false, disables the use of mmap by the
-                        zip utility. Otherwise,
-                        mmap will be used.
-                    </dd>
-                    <dt><code><a name="COMPRESS_JARS"></a>COMPRESS_JARS</code> </dt>
-                    <dd>
-                        If set to true, causes certain jar files that 
-                        would otherwise be built without
-                        compression, to use compression.
-                    </dd>
-                </dl>
-            </dd>
-        </dl>
-    </blockquote>
-
-</blockquote> <!-- Appendix D -->
-
-        <!-- ====================================================== -->
-        <hr>
-        <p>End of OpenJDK README-builds.html document.<br>Please come again!
-        <hr>
-
-    </body>
-</html>
diff --git a/README.md b/README.md
deleted file mode 100644
index c53c3f2..0000000
--- a/README.md
+++ /dev/null
@@ -1,149 +0,0 @@
-[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
-
-# Downloads
-
-|Windows-x86  |Windows-x64  |macOS        |Linux-x86    |Linux-x64    |
-|-------------|-------------|-------------|-------------|-------------|
-|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk8-windows-x86/_latestVersion"> <img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk8-windows-x86/images/download.svg"/></a>|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk8-windows-x64/_latestVersion"> <img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk8-windows-x64/images/download.svg"/></a>|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk8-osx-x64/_latestVersion"> <img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk8-osx-x64/images/download.svg"/></a>|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk8-linux-x86/_latestVersion"> <img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk8-linux-x86/images/download.svg"/></a>|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk8-linux-x64/_latestVersion"><img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk8-linux-x64/images/download.svg"/></a>|
-
-
-# How JetBrains Runtime is organised
-## Workspaces
-
-[github.com/JetBrains/jdk8u](https://github.com/JetBrains/jdk8u/)  
-[github.com/JetBrains/jdk8u_corba](https://github.com/JetBrains/jdk8u_corba/)  
-[github.com/JetBrains/jdk8u_hotspot](https://github.com/JetBrains/jdk8u_hotspot/)  
-[github.com/JetBrains/jdk8u_jaxp](https://github.com/JetBrains/jdk8u_jaxp/)  
-[github.com/JetBrains/jdk8u_jaxws](https://github.com/JetBrains/jdk8u_jaxws/)  
-[github.com/JetBrains/jdk8u_jdk](https://github.com/JetBrains/jdk8u_jdk/)  
-[github.com/JetBrains/jdk8u_langtools](https://github.com/JetBrains/jdk8u_langtools/)  
-[github.com/JetBrains/jdk8u_nashorn](https://github.com/JetBrains/jdk8u_nashorn/)  
-
-Usually, we do not modify any of the repositories except [jdk](https://github.com/JetBrains/jdk8u_jdk/) module. Other repositories are needed for build purposes.
-## Getting sources
-__OSX, Linux:__
-```
-git config --global core.autocrlf input
-git clone git@github.com:JetBrains/jdk8u.git
-cd jdk8u
-./getModules.sh
-```
-
-__Windows:__
-```
-git config --global core.autocrlf false
-git clone git@github.com:JetBrains/jdk8u.git
-cd jdk8u
-getModules.bat
-```
-
-# Configure Local Build Environment
-## Linux
-```
-sudo apt-get install git zip bzip2 unzip tar curl
-sudo apt-get install ccache make gcc g++ ca-certificates ca-certificates-java
-sudo apt-get install libxext-dev libxrender-dev libxtst-dev libxt-dev
-sudo apt-get install libasound2-dev libcups2-dev libfreetype6-dev
-git clone git@github.com:JetBrains/jdk8u.git
-cd jdk8u
-./getModules.sh
-download jdk8 from Oracle into /home/user/jdk1.8.0_102
-export JAVA_HOME=/home/user/jdk1.8.0_102
-sh ./configure
-make
-```
-
-## Windows
-
-Install:
-
-* [Cygwin x64](http://www.cygwin.com/)
-  Required packages (binutils, cpio, diffutils, file, gawk, gcc-core, make, m4, unzip, zip)
-* Windows SDK 7.1 offline installer [GRMSDKX_EN_DVD.iso](https://download.microsoft.com/download/F/1/0/F10113F5-B750-4969-A255-274341AC6BCE/GRMSDKX_EN_DVD.iso)
-Run Setup\SDKSetup 
-* Visual Studio Express 2010 offline installer [VS2010Express1.iso](http://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso)
-  * [Virtual CloneDrive](http://www.elby.ch/products/vcd.html) may help to mount ISO images
-* [DirectX 9.0 SDK](http://www.microsoft.com/en-us/download/details.aspx?id=6812)
-* [Java 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
-
-Build Freetype:
-* Download [sources](https://www.freetype.org/download.html)
-* Execute the following script in builds\windows\vc2010
-```
-(echo ^<?xml version="1.0" encoding="utf-8"?^>
-echo ^<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"^>
-echo ^<PropertyGroup Label="Globals"^>
-echo ^<TargetName^>freetype^</TargetName^>
-echo ^<UserIncludeDirectories^>.^</UserIncludeDirectories^>
-echo ^</PropertyGroup^>
-echo ^<ItemDefinitionGroup^>
-echo ^<ClCompile^>
-echo ^<ForcedIncludeFiles^>jb_custom.h^</ForcedIncludeFiles^>
-echo ^</ClCompile^>
-echo ^</ItemDefinitionGroup^>
-echo ^</Project^>) > freetype.user.props
-(echo #ifndef __JB_CUSTOM_H__
-echo #define __JB_CUSTOM_H__
-echo #define FT_EXPORT^(x^) __declspec^(dllexport^) x
-echo #define FT_BASE^(x^) __declspec^(dllexport^) x
-echo #endif) > jb_custom.h
-```
-* Build with VC Express for **x64** or **win32** target
-* Put freetype.dll, freetype.lib, freetype.exp in lib folder at the same level with include:
-```
-freetype
-  include
-  lib
-```
-
-Configure and run make  in cygwin shell 
-* __32 bit__ (use --with-msvcr-dll=/cygdrive/c/windows/SysWOW64/msvcr100.dll on 64 bit windows)
-```    
-  cd /cygdrive/c/jdk8/
- ./configure  --with-target-bits=32 --with-freetype=/cygdrive/freetype/  
-  make images
-```
-* __64 bit__
-```    
-  cd /cygdrive/c/jdk8/
- ./configure  --with-target-bits=64 --with-freetype=/cygdrive/freetype/  
-  make images
-```
-
-## OSX
-XCode
-* Login to https://developer.apple.com with your Apple ID. Download 
-[Xcode 4.6.3](https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/xcode_4.6.3/xcode4630916281a.dmg)
-and put Xcode.app into /Applications/Xcode4
-
-_The latest XCode can be used, but you need to run make with COMPILER_WARNINGS_FATAL=false_
-
-Command Line Tools
-* Download and install Command Line Tools via XCode Preferences / Downloads or from https://developer.apple.com (for example, [Command Line Tools, April 2014](https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_os_x_mountain_lion_for_xcode__april_2014/command_line_tools_for_osx_mountain_lion_april_2014.dmg) for OS X Mountain Lion).
-
-Freetype
-* Install [XQuartz](https://dl.bintray.com/xquartz/downloads/XQuartz-2.7.9.dmg) or build Freetype from 
- [sources](https://www.freetype.org/download.html)
-```
-cd freetype
-./configure
-./make
-mkdir lib
-cp objs/.libs/libfreetype.dylib lib/
-```
-
-Configure and build jdk
-```
-export MACOSX_DEPLOYMENT_TARGET=10.8
-cd /path_to_jdk8/
-bash configure --with-xcode-path=/Applications/Xcode4/Xcode4.app --with-freetype=/opt/X11/lib --with-freetype-include=/usr/X11/include/freetype2
-make images
-```
-or
-```
-make COMPILER_WARNINGS_FATAL=false images
-```
-for the latest XCode
-
-## Contribution
-We will be happy to receive your pull requests. Before you submit one, please sign our Contributor License Agreement (CLA)  https://www.jetbrains.com/agreements/cla/ 
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
deleted file mode 100644
index 2b20da2..0000000
--- a/THIRD_PARTY_README
+++ /dev/null
@@ -1,3574 +0,0 @@
-DO NOT TRANSLATE OR LOCALIZE.
------------------------------
-
-%% This notice is provided with respect to ASM Bytecode Manipulation 
-Framework v5.0.3, which may be included with JRE 8, and JDK 8, and 
-OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 2000-2011 France Télécom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. 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.
-
-3. Neither the name of the copyright holders 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.
-
---- end of LICENSE ---
-
---------------------------------------------------------------------------------
-
-%% This notice is provided with respect to BSDiff v4.3, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright 2003-2005 Colin Percival
-All rights reserved
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted providing that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. 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.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to CodeViewer 1.0, which may be
-included with JDK 8.
-
---- begin of LICENSE ---
-
-Copyright 1999 by CoolServlets.com.
-
-Any errors or suggested improvements to this class can be reported as
-instructed on CoolServlets.com. We hope you enjoy this program... your
-comments will encourage further development!  This software is distributed
-under the terms of the BSD License.  Redistribution and use in source and
-binary forms, with or without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. 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 name of CoolServlets.com 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 COOLSERVLETS.COM 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 AUTHOR 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."
-
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Cryptix AES 3.2.0, which may be
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Cryptix General License
-
-Copyright (c) 1995-2005 The Cryptix Foundation Limited.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  1. Redistributions of source code must retain the copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. 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.
-
-THIS SOFTWARE IS PROVIDED BY THE CRYPTIX FOUNDATION LIMITED 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 CRYPTIX FOUNDATION LIMITED 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.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to CUP Parser Generator for 
-Java 0.10k, which may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both the
-copyright notice and this permission notice and warranty disclaimer appear in
-supporting documentation, and that the names of the authors or their
-employers not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.
-
-The authors and their employers disclaim all warranties with regard to
-this software, including all implied warranties of merchantability and fitness.
-In no event shall the authors or their employers be liable for any special,
-indirect or consequential damages or any damages whatsoever resulting from
-loss of use, data or profits, whether in an action of contract, negligence or
-other tortious action, arising out of or in connection with the use or
-performance of this software.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Document Object Model (DOM) Level 2
-& 3, which may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-W3C SOFTWARE NOTICE AND LICENSE
-
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other
-related items) is being provided by the copyright holders under the following
-license. By obtaining, using and/or copying this work, you (the licensee)
-agree that you have read, understood, and will comply with the following terms
-and conditions.
-
-Permission to copy, modify, and distribute this software and its
-documentation, with or without modification, for any purpose and without fee
-or royalty is hereby granted, provided that you include the following on ALL
-copies of the software and documentation or portions thereof, including
-modifications:
-
-   1.The full text of this NOTICE in a location viewable to users of the
-   redistributed or derivative work.
-
-   2.Any pre-existing intellectual property disclaimers, notices, or terms and
-   conditions. If none exist, the W3C Software Short Notice should be included
-   (hypertext is preferred, text is permitted) within the body of any
-   redistributed or derivative code.
-
-   3.Notice of any changes or modifications to the files, including the date
-   changes were made. (We recommend you provide URIs to the location from
-   which the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
-MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
-PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY
-THIRD PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-DOCUMENTATION.  The name and trademarks of copyright holders may NOT be used
-in advertising or publicity pertaining to the software without specific,
-written prior permission. Title to copyright in this software and any
-associated documentation will at all times remain with copyright holders.
-
-____________________________________
-
-This formulation of W3C's notice and license became active on December 31
-2002. This version removes the copyright ownership notice such that this
-license can be used with materials other than those owned by the W3C, reflects
-that ERCIM is now a host of the W3C, includes references to this specific
-dated version of the license, and removes the ambiguous grant of "use".
-Otherwise, this version is the same as the previous version and is written so
-as to preserve the Free Software Foundation's assessment of GPL compatibility
-and OSI's certification under the Open Source Definition. Please see our
-Copyright FAQ for common questions about using materials from our site,
-including specific terms and conditions for packages like libwww, Amaya, and
-Jigsaw. Other questions about this notice can be directed to
-site-policy@w3.org.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Dynalink v0.5, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 2009-2013, Attila Szegedi
-
-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 Attila
-Szegedi 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 HOLDER 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 THEPOSSIBILITY OF SUCH DAMAGE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Elliptic Curve Cryptography, which 
-may be included with JRE 8, JDK 8, and OpenJDK 8.
-
-You are receiving a copy of the Elliptic Curve Cryptography library in source
-form with the JDK 8 and OpenJDK 8 source distributions, and as object code in
-the JRE 8 & JDK 8 runtimes.
-
-In the case of the JRE 8 & JDK 8 runtimes, the terms of the Oracle license do
-NOT apply to the Elliptic Curve Cryptography library; it is licensed under the
-following license, separately from Oracle's JDK & JRE.  If you do not wish to
-install the Elliptic Curve Cryptography library, you may delete the library
-named libsunec.so (on Solaris and Linux systems) or sunec.dll (on Windows
-systems) from the JRE bin directory reserved for native libraries.
-
-
---- begin of LICENSE ---
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to  ECMAScript Language
-Specification ECMA-262 Edition 5.1 which may be included with 
-JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright notice
-Copyright © 2011 Ecma International
-Ecma International
-Rue du Rhone 114
-CH-1204 Geneva
-Tel: +41 22 849 6000
-Fax: +41 22 849 6001
-Web: http://www.ecma-international.org
-
-This document and possible translations of it may be copied and furnished to
-others, and derivative works that comment on or otherwise explain it or assist
-in its implementation may be prepared, copied, published, and distributed, in
-whole or in part, without restriction of any kind, provided that the above
-copyright notice and this section are included on all such copies and derivative
-works. However, this document itself may not be modified in any way, including
-by removing the copyright notice or references to Ecma International, except as
-needed for the purpose of developing any document or deliverable produced by
-Ecma International (in which case the rules applied to copyrights must be
-followed) or as required to translate it into languages other than English. The
-limited permissions granted above are perpetual and will not be revoked by Ecma
-International or its successors or assigns. This document and the information
-contained herein is provided on an "AS IS" basis and ECMA INTERNATIONAL
-DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY
-WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP
-RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE." Software License
-
-All Software contained in this document ("Software)" is protected by copyright
-and is being made available under the "BSD License", included below. This
-Software may be subject to third party rights (rights from parties other than
-Ecma International), including patent rights, and no licenses under such third
-party rights are granted under this license even if the third party concerned is
-a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS
-AVAILABLE AT http://www.ecma-international.org/memento/codeofconduct.htm FOR
-INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO
-IMPLEMENT ECMA INTERNATIONAL STANDARDS*. Redistribution and use in source and
-binary forms, with or without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. 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.
-
-3. Neither the name of the authors nor Ecma International may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "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 ECMA INTERNATIONAL 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.
---- end of LICENSE ---
-
-%% This notice is provided with respect to Dynalink library which is included
-with the Nashorn technology.
-
---- begin of LICENSE ---
-Copyright (c) 2009-2013, Attila Szegedi
-
-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 the copyright holder nor the names of
-  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 COPYRIGHT HOLDER
-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.
---- end of LICENSE ---
-
-%% This notice is provided with respect to Joni library which is included
-with the Nashorn technology.
-
---- begin of LICENSE ---
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to FontConfig 2.5, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8 source distributions on
-Linux and Solaris.
-
---- begin of LICENSE ---
-
-Copyright © 2001,2003 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and that
-the name of Keith Packard not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior permission.
-Keith Packard makes no representations about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL KEITH
-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to IAIK PKCS#11 Wrapper, 
-which may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-IAIK PKCS#11 Wrapper License
-
-Copyright (c) 2002 Graz University of Technology. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. 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.
-
-3. The end-user documentation included with the redistribution, if any, must
-   include the following acknowledgment:
-
-   "This product includes software developed by IAIK of Graz University of
-    Technology."
-
-   Alternately, this acknowledgment may appear in the software itself, if and
-   wherever such third-party acknowledgments normally appear.
-
-4. The names "Graz University of Technology" and "IAIK of Graz University of
-   Technology" must not be used to endorse or promote products derived from this
-   software without prior written permission.
-
-5. Products derived from this software may not be called "IAIK PKCS Wrapper",
-   nor may "IAIK" appear in their name, without prior written permission of
-   Graz University of Technology.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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
-LICENSOR 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.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to ICU4C 4.0.1 and ICU4J 4.4, which 
-may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 1995-2010 International Business Machines Corporation and others 
-
-All rights reserved. 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so,
-provided that the above copyright notice(s) and this permission notice appear
-in all copies of the Software and that both the above copyright notice(s) and
-this permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
-NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE
-LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization of the copyright holder.
-All trademarks and registered trademarks mentioned herein are the property of
-their respective owners.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to IJG JPEG 6b, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-This software is copyright (C) 1991-1998, Thomas G. Lane.
-All Rights Reserved except as specified below.
-
-Permission is hereby granted to use, copy, modify, and distribute this
-software (or portions thereof) for any purpose, without fee, subject to these
-conditions:
-(1) If any part of the source code for this software is distributed, then this
-README file must be included, with this copyright and no-warranty notice
-unaltered; and any additions, deletions, or changes to the original files
-must be clearly indicated in accompanying documentation.
-(2) If only executable code is distributed, then the accompanying
-documentation must state that "this software is based in part on the work of
-the Independent JPEG Group".
-(3) Permission for use of this software is granted only if the user accepts
-full responsibility for any undesirable consequences; the authors accept
-NO LIABILITY for damages of any kind.
-
-These conditions apply to any software derived from or based on the IJG code,
-not just to the unmodified library.  If you use our work, you ought to
-acknowledge us.
-
-Permission is NOT granted for the use of any IJG author's name or company name
-in advertising or publicity relating to this software or products derived from
-it.  This software may be referred to only as "the Independent JPEG Group's
-software".
-
-We specifically permit and encourage the use of this software as the basis of
-commercial products, provided that all warranty or liability claims are
-assumed by the product vendor.
-
---- end of LICENSE ---
-
---------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Joni v1.1.9, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to JOpt-Simple v3.0,  which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
- Copyright (c) 2004-2009 Paul R. Holser, Jr.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
---- end of LICENSE ---
-
---------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Kerberos functionality, which 
-which may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
- (C) Copyright IBM Corp. 1999 All Rights Reserved.
- Copyright 1997 The Open Group Research Institute. All rights reserved.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Kerberos functionality from 
-FundsXpress, INC., which may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
- Copyright (C) 1998 by the FundsXpress, INC.
-
- All rights reserved.
-
- Export of this software from the United States of America may require
- a specific license from the United States Government.  It is the
- responsibility of any person or organization contemplating export to
- obtain such a license before exporting.
-
- WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- distribute this software and its documentation for any purpose and
- without fee is hereby granted, provided that the above copyright
- notice appear in all copies and that both that copyright notice and
- this permission notice appear in supporting documentation, and that
- the name of FundsXpress. not be used in advertising or publicity pertaining
- to distribution of the software without specific, written prior
- permission.  FundsXpress makes no representations about the suitability of
- this software for any purpose.  It is provided "as is" without express
- or implied warranty.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Kronos OpenGL headers, which may be 
-included with JDK 8 and OpenJDK 8 source distributions.
-
---- begin of LICENSE ---
-
- Copyright (c) 2007 The Khronos Group Inc.
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and/or associated documentation files (the "Materials"), to
- deal in the Materials without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Materials, and to permit persons to whom the Materials are
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Materials.
-
- THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN THE
- MATERIALS.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% Portions Copyright Eastman Kodak Company 1992
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to libpng 1.6.16, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-This copy of the libpng notices is provided for your convenience.  In case of
-any discrepancy between this copy and the notices in the file png.h that is
-included in the libpng distribution, the latter shall prevail.
-
-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
-
-If you modify libpng you may insert additional notices immediately following
-this sentence.
-
-This code is released under the libpng license.
-
-libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
-Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.2.5
-with the following individual added to the list of Contributing Authors
-
-   Cosmin Truta
-
-libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
-Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.0.6
-with the following individuals added to the list of Contributing Authors
-
-   Simon-Pierre Cadieux
-   Eric S. Raymond
-   Gilles Vollant
-
-and with the following additions to the disclaimer:
-
-   There is no warranty against interference with your enjoyment of the
-   library or against infringement.  There is no warranty that our
-   efforts or the library will fulfill any of your particular purposes
-   or needs.  This library is provided with all faults, and the entire
-   risk of satisfactory quality, performance, accuracy, and effort is with
-   the user.
-
-libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
-Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-0.96,
-with the following individuals added to the list of Contributing Authors:
-
-   Tom Lane
-   Glenn Randers-Pehrson
-   Willem van Schaik
-
-libpng versions 0.89, June 1996, through 0.96, May 1997, are
-Copyright (c) 1996, 1997 Andreas Dilger
-Distributed according to the same disclaimer and license as libpng-0.88,
-with the following individuals added to the list of Contributing Authors:
-
-   John Bowler
-   Kevin Bracey
-   Sam Bushell
-   Magnus Holmgren
-   Greg Roelofs
-   Tom Tanner
-
-libpng versions 0.5, May 1995, through 0.88, January 1996, are
-Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
-
-For the purposes of this copyright and license, "Contributing Authors"
-is defined as the following set of individuals:
-
-   Andreas Dilger
-   Dave Martindale
-   Guy Eric Schalnat
-   Paul Schmidt
-   Tim Wegner
-
-The PNG Reference Library is supplied "AS IS".  The Contributing Authors
-and Group 42, Inc. disclaim all warranties, expressed or implied,
-including, without limitation, the warranties of merchantability and of
-fitness for any purpose.  The Contributing Authors and Group 42, Inc.
-assume no liability for direct, indirect, incidental, special, exemplary,
-or consequential damages, which may result from the use of the PNG
-Reference Library, even if advised of the possibility of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute this
-source code, or portions hereof, for any purpose, without fee, subject
-to the following restrictions:
-
-1. The origin of this source code must not be misrepresented.
-
-2. Altered versions must be plainly marked as such and must not
-   be misrepresented as being the original source.
-
-3. This Copyright notice may not be removed or altered from any
-   source or altered source distribution.
-
-The Contributing Authors and Group 42, Inc. specifically permit, without
-fee, and encourage the use of this source code as a component to
-supporting the PNG file format in commercial products.  If you use this
-source code in a product, acknowledgment is not required but would be
-appreciated.
-
-
-A "png_get_copyright" function is available, for convenient use in "about"
-boxes and the like:
-
-   printf("%s",png_get_copyright(NULL));
-
-Also, the PNG logo (in PNG format, of course) is supplied in the
-files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
-
-Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
-certification mark of the Open Source Initiative.
-
-Glenn Randers-Pehrson
-glennrp at users.sourceforge.net
-December 22, 2014
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-The GIFLIB distribution is Copyright (c) 1997  Eric S. Raymond
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Little CMS 2.7, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Little CMS
-Copyright (c) 1998-2015 Marti Maria Saguer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% Lucida is a registered trademark or trademark of Bigelow & Holmes in the
-U.S. and other countries.
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Mesa 3D Graphics Library v4.1,
-which may be included with JRE 8, JDK 8, and OpenJDK 8 source distributions.
-
---- begin of LICENSE ---
-
- Mesa 3-D graphics library
- Version:  4.1
-
- Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Mozilla Network Security
-Services (NSS), which is supplied with the JDK test suite in the OpenJDK
-source code repository. It is licensed under Mozilla Public License (MPL),
-version 2.0.
-
-The NSS libraries are supplied in executable form, built from unmodified
-NSS source code labeled with the "NSS_3_16_RTM" HG tag.
-
-The NSS source code is available in the OpenJDK source code repository at:
-    jdk/test/sun/security/pkcs11/nss/src
-
-The NSS libraries are available in the OpenJDK source code repository at:
-    jdk/test/sun/security/pkcs11/nss/lib
-
---- begin of LICENSE ---
-
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in 
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1,
-which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
-
---- begin of LICENSE ---
-
-Copyright (c) 1999-2004 David Corcoran <corcoran@linuxnet.com>
-Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. 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.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-     This product includes software developed by: 
-      David Corcoran <corcoran@linuxnet.com>
-      http://www.linuxnet.com (MUSCLE)
-4. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-Changes to this license can be made only by the copyright author with 
-explicit written consent.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to PorterStemmer v4, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-See: http://tartarus.org/~martin/PorterStemmer
-
-The software is completely free for any purpose, unless notes at the head of
-the program text indicates otherwise (which is rare). In any case, the notes
-about licensing are never more restrictive than the BSD License.
-
-In every case where the software is not written by me (Martin Porter), this
-licensing arrangement has been endorsed by the contributor, and it is
-therefore unnecessary to ask the contributor again to confirm it.
-
-I have not asked any contributors (or their employers, if they have them) for
-proofs that they have the right to distribute their software in this way.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Relax NG Object/Parser v.20050510,
-which may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions: The above copyright
-notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to RelaxNGCC v1.12, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 2000-2003 Daisuke Okajima and Kohsuke Kawaguchi.  
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. 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.
-
-3. The end-user documentation included with the redistribution, if any, must
-   include the following acknowledgment:
-
-    "This product includes software developed by Daisuke Okajima
-    and Kohsuke Kawaguchi (http://relaxngcc.sf.net/)."
-
-Alternately, this acknowledgment may appear in the software itself, if and
-wherever such third-party acknowledgments normally appear.
-
-4. The names of the copyright holders must not be used to endorse or promote
-   products derived from this software without prior written permission. For
-   written permission, please contact the copyright holders.
-
-5. Products derived from this software may not be called "RELAXNGCC", nor may
-  "RELAXNGCC" appear in their name, without prior written permission of the
-  copyright holders.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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 APACHE
-SOFTWARE FOUNDATION OR ITS 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.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to SAX 2.0.1, which may be included 
-with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
- SAX is free!
-
- In fact, it's not possible to own a license to SAX, since it's been placed in
- the public domain.
-
- No Warranty
-
- Because SAX is released to the public domain, there is no warranty for the
- design or for the software implementation, to the extent permitted by
- applicable law. Except when otherwise stated in writing the copyright holders
- and/or other parties provide SAX "as is" without warranty of any kind, either
- expressed or implied, including, but not limited to, the implied warranties
- of merchantability and fitness for a particular purpose. The entire risk as
- to the quality and performance of SAX is with you. Should SAX prove
- defective, you assume the cost of all necessary servicing, repair or
- correction.
-
- In no event unless required by applicable law or agreed to in writing will
- any copyright holder, or any other party who may modify and/or redistribute
- SAX, be liable to you for damages, including any general, special, incidental
- or consequential damages arising out of the use or inability to use SAX
- (including but not limited to loss of data or data being rendered inaccurate
- or losses sustained by you or third parties or a failure of the SAX to
- operate with any other programs), even if such holder or other party has been
- advised of the possibility of such damages.
-
- Copyright Disclaimers 
-
- This page includes statements to that effect by David Megginson, who would
- have been able to claim copyright for the original work.  SAX 1.0
-
- Version 1.0 of the Simple API for XML (SAX), created collectively by the
- membership of the XML-DEV mailing list, is hereby released into the public
- domain.
-
- No one owns SAX: you may use it freely in both commercial and non-commercial
- applications, bundle it with your software distribution, include it on a
- CD-ROM, list the source code in a book, mirror the documentation at your own
- web site, or use it in any other way you see fit.
-
- David Megginson, sax@megginson.com
- 1998-05-11
-
- SAX 2.0 
-
- I hereby abandon any property rights to SAX 2.0 (the Simple API for XML), and
- release all of the SAX 2.0 source code, compiled code, and documentation
- contained in this distribution into the Public Domain. SAX comes with NO
- WARRANTY or guarantee of fitness for any purpose.
-
- David Megginson, david@megginson.com
- 2000-05-05
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to SoftFloat version 2b, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8 on Linux/ARM.
-
---- begin of LICENSE ---
-
-Use of any of this software is governed by the terms of the license below:
-
-SoftFloat was written by me, John R. Hauser. This work was made possible in 
-part by the International Computer Science Institute, located at Suite 600, 
-1947 Center Street, Berkeley, California 94704. Funding was partially 
-provided by the National Science Foundation under grant MIP-9311980. The 
-original version of this code was written as part of a project to build 
-a fixed-point vector processor in collaboration with the University of 
-California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. 
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort 
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT 
-TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO 
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL 
-LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO 
-FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER 
-SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, 
-COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE 
-SOFTWARE. 
-
-Derivative works are acceptable, even for commercial purposes, provided 
-that the minimal documentation requirements stated in the source code are 
-satisfied. 
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Sparkle 1.5,
-which may be included with JRE 8 on Mac OS X.
-
---- begin of LICENSE ---
-
-Copyright (c) 2012 Sparkle.org and Andy Matuschak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% Portions licensed from Taligent, Inc.
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Thai Dictionary, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright (C) 1982 The Royal Institute, Thai Royal Government.
-
-Copyright (C) 1998 National Electronics and Computer Technology Center,
-National Science and Technology Development Agency,
-Ministry of Science Technology and Environment,
-Thai Royal Government.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Unicode 6.2.0 & CLDR 21.0.1
-which may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Unicode Terms of Use
-
-For the general privacy policy governing access to this site, see the Unicode
-Privacy Policy. For trademark usage, see the Unicode® Consortium Name and
-Trademark Usage Policy.
-
-A. Unicode Copyright.
-   1. Copyright © 1991-2013 Unicode, Inc. All rights reserved.
-
-   2. Certain documents and files on this website contain a legend indicating
-      that "Modification is permitted." Any person is hereby authorized,
-      without fee, to modify such documents and files to create derivative
-      works conforming to the Unicode® Standard, subject to Terms and
-      Conditions herein.
-
-    3. Any person is hereby authorized, without fee, to view, use, reproduce,
-       and distribute all documents and files solely for informational
-       purposes in the creation of products supporting the Unicode Standard,
-       subject to the Terms and Conditions herein.
-
-    4. Further specifications of rights and restrictions pertaining to the use
-       of the particular set of data files known as the "Unicode Character
-       Database" can be found in Exhibit 1.
-
-    5. Each version of the Unicode Standard has further specifications of
-       rights and restrictions of use. For the book editions (Unicode 5.0 and
-       earlier), these are found on the back of the title page. The online
-       code charts carry specific restrictions. All other files, including
-       online documentation of the core specification for Unicode 6.0 and
-       later, are covered under these general Terms of Use.
-
-    6. No license is granted to "mirror" the Unicode website where a fee is
-       charged for access to the "mirror" site.
-
-    7. Modification is not permitted with respect to this document. All copies
-       of this document must be verbatim.
-
-B. Restricted Rights Legend. Any technical data or software which is licensed
-   to the United States of America, its agencies and/or instrumentalities
-   under this Agreement is commercial technical data or commercial computer
-   software developed exclusively at private expense as defined in FAR 2.101,
-   or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use,
-   duplication, or disclosure by the Government is subject to restrictions as
-   set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov
-   1995) and this Agreement. For Software, in accordance with FAR 12-212 or
-   DFARS 227-7202, as applicable, use, duplication or disclosure by the
-   Government is subject to the restrictions set forth in this Agreement.
-
-C. Warranties and Disclaimers.
-   1. This publication and/or website may include technical or typographical
-      errors or other inaccuracies . Changes are periodically added to the
-      information herein; these changes will be incorporated in new editions
-      of the publication and/or website. Unicode may make improvements and/or
-      changes in the product(s) and/or program(s) described in this
-      publication and/or website at any time.
-
-    2. If this file has been purchased on magnetic or optical media from
-       Unicode, Inc. the sole and exclusive remedy for any claim will be
-       exchange of the defective media within ninety (90) days of original
-       purchase.
-
-    3. EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR SOFTWARE IS
-       PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED,
-       OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF
-       MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
-       UNICODE AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR
-       OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH
-       ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
-
-D. Waiver of Damages. In no event shall Unicode or its licensors be liable for
-   any special, incidental, indirect or consequential damages of any kind, or
-   any damages whatsoever, whether or not Unicode was advised of the
-   possibility of the damage, including, without limitation, those resulting
-   from the following: loss of use, data or profits, in connection with the
-   use, modification or distribution of this information or its derivatives.
-
-E.Trademarks & Logos.
-   1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode,
-      Inc.  “The Unicode Consortium” and “Unicode, Inc.” are trade names of
-      Unicode, Inc.  Use of the information and materials found on this
-      website indicates your acknowledgement of Unicode, Inc.’s exclusive
-      worldwide rights in the Unicode Word Mark, the Unicode Logo, and the
-      Unicode trade names.
-
-   2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark
-      Policy”) are incorporated herein by reference and you agree to abide by
-      the provisions of the Trademark Policy, which may be changed from time
-      to time in the sole discretion of Unicode, Inc.
-
-   3. All third party trademarks referenced herein are the property of their
-      respective owners.
-
-Miscellaneous.
-   1. Jurisdiction and Venue. This server is operated from a location in the
-      State of California, United States of America. Unicode makes no
-      representation that the materials are appropriate for use in other
-      locations. If you access this server from other locations, you are
-      responsible for compliance with local laws. This Agreement, all use of
-      this site and any claims and damages resulting from use of this site are
-      governed solely by the laws of the State of California without regard to
-      any principles which would apply the laws of a different jurisdiction.
-      The user agrees that any disputes regarding this site shall be resolved
-      solely in the courts located in Santa Clara County, California. The user
-      agrees said courts have personal jurisdiction and agree to waive any
-      right to transfer the dispute to any other forum.
-
-   2. Modification by Unicode.  Unicode shall have the right to modify this
-      Agreement at any time by posting it to this site. The user may not
-      assign any part of this Agreement without Unicode’s prior written
-      consent.
-
-   3. Taxes. The user agrees to pay any taxes arising from access to this
-      website or use of the information herein, except for those based on
-      Unicode’s net income.
-
-   4. Severability.  If any provision of this Agreement is declared invalid or
-      unenforceable, the remaining provisions of this Agreement shall remain
-      in effect.
-
-   5. Entire Agreement. This Agreement constitutes the entire agreement
-      between the parties.
-
-EXHIBIT 1
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
-Unicode Data Files include all data files under the directories
-http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
-http://www.unicode.org/cldr/data/. Unicode Data Files do not include PDF
-online code charts under the directory http://www.unicode.org/Public/.
-Software includes any source code published in the Unicode Standard or under
-the directories http://www.unicode.org/Public/,
-http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/.
-
-NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING,
-INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA
-FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO
-BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT
-AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR
-SOFTWARE.
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the
-Terms of Use in http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the Unicode data files and any associated documentation (the "Data Files")
-or Unicode software and any associated documentation (the "Software") to deal
-in the Data Files or Software without restriction, including without
-limitation the rights to use, copy, modify, merge, publish, distribute, and/or
-sell copies of the Data Files or Software, and to permit persons to whom the
-Data Files or Software are furnished to do so, provided that (a) the above
-copyright notice(s) and this permission notice appear with all copies of the
-Data Files or Software, (b) both the above copyright notice(s) and this
-permission notice appear in associated documentation, and (c) there is clear
-notice in each modified Data File or in the Software as well as in the
-documentation associated with the Data File(s) or Software that the data or
-software has been modified.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
-PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
-THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE
-DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in these Data Files or Software without prior written authorization of the
-copyright holder.
-
-Unicode and the Unicode logo are trademarks of Unicode, Inc. in the United
-States and other countries. All third party trademarks referenced herein are
-the property of their respective owners.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to UPX v3.01, which may be included 
-with JRE 8 on Windows.
-
---- begin of LICENSE ---
-
-Use of any of this software is governed by the terms of the license below:
-
-
-                 ooooo     ooo ooooooooo.   ooooooo  ooooo
-                 `888'     `8' `888   `Y88.  `8888    d8'
-                  888       8   888   .d88'    Y888..8P
-                  888       8   888ooo88P'      `8888'
-                  888       8   888            .8PY888.
-                  `88.    .8'   888           d8'  `888b
-                    `YbodP'    o888o        o888o  o88888o
-
-
-                    The Ultimate Packer for eXecutables
-          Copyright (c) 1996-2000 Markus Oberhumer & Laszlo Molnar
-               http://wildsau.idv.uni-linz.ac.at/mfx/upx.html
-                          http://www.nexus.hu/upx
-                            http://upx.tsx.org
-
-
-PLEASE CAREFULLY READ THIS LICENSE AGREEMENT, ESPECIALLY IF YOU PLAN
-TO MODIFY THE UPX SOURCE CODE OR USE A MODIFIED UPX VERSION.
-
-
-ABSTRACT
-========
-
-   UPX and UCL are copyrighted software distributed under the terms
-   of the GNU General Public License (hereinafter the "GPL").
-
-   The stub which is imbedded in each UPX compressed program is part
-   of UPX and UCL, and contains code that is under our copyright. The
-   terms of the GNU General Public License still apply as compressing
-   a program is a special form of linking with our stub.
-
-   As a special exception we grant the free usage of UPX for all
-   executables, including commercial programs.
-   See below for details and restrictions.
-
-
-COPYRIGHT
-=========
-
-   UPX and UCL are copyrighted software. All rights remain with the authors.
-
-   UPX is Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
-   UPX is Copyright (C) 1996-2000 Laszlo Molnar
-
-   UCL is Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
-
-
-GNU GENERAL PUBLIC LICENSE
-==========================
-
-   UPX and the UCL library are free software; you can redistribute them
-   and/or modify them under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   UPX and UCL are distributed in the hope that they 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 for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.
-
-
-SPECIAL EXCEPTION FOR COMPRESSED EXECUTABLES
-============================================
-
-   The stub which is imbedded in each UPX compressed program is part
-   of UPX and UCL, and contains code that is under our copyright. The
-   terms of the GNU General Public License still apply as compressing
-   a program is a special form of linking with our stub.
-
-   Hereby Markus F.X.J. Oberhumer and Laszlo Molnar grant you special
-   permission to freely use and distribute all UPX compressed programs
-   (including commercial ones), subject to the following restrictions:
-
-   1. You must compress your program with a completely unmodified UPX
-      version; either with our precompiled version, or (at your option)
-      with a self compiled version of the unmodified UPX sources as
-      distributed by us.
-   2. This also implies that the UPX stub must be completely unmodfied, i.e.
-      the stub imbedded in your compressed program must be byte-identical
-      to the stub that is produced by the official unmodified UPX version.
-   3. The decompressor and any other code from the stub must exclusively get
-      used by the unmodified UPX stub for decompressing your program at
-      program startup. No portion of the stub may get read, copied,
-      called or otherwise get used or accessed by your program.
-
-
-ANNOTATIONS
-===========
-
-  - You can use a modified UPX version or modified UPX stub only for
-    programs that are compatible with the GNU General Public License.
-
-  - We grant you special permission to freely use and distribute all UPX
-    compressed programs. But any modification of the UPX stub (such as,
-    but not limited to, removing our copyright string or making your
-    program non-decompressible) will immediately revoke your right to
-    use and distribute a UPX compressed program.
-
-  - UPX is not a software protection tool; by requiring that you use
-    the unmodified UPX version for your proprietary programs we
-    make sure that any user can decompress your program. This protects
-    both you and your users as nobody can hide malicious code -
-    any program that cannot be decompressed is highly suspicious
-    by definition.
-
-  - You can integrate all or part of UPX and UCL into projects that
-    are compatible with the GNU GPL, but obviously you cannot grant
-    any special exceptions beyond the GPL for our code in your project.
-
-  - We want to actively support manufacturers of virus scanners and
-    similar security software. Please contact us if you would like to
-    incorporate parts of UPX or UCL into such a product.
-
-
-
-Markus F.X.J. Oberhumer                   Laszlo Molnar
-markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-Linz, Austria, 25 Feb 2000
-
-Additional License(s)
-
-The UPX license file is at http://upx.sourceforge.net/upx-license.html.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Xfree86-VidMode Extension 1.0,
-which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
-
---- begin of LICENSE ---
-
-Version 1.1 of XFree86 ProjectLicence.
-
-Copyright (C) 1994-2004 The XFree86 Project, Inc.    All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicence, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so,subject to the following conditions:
-
-   1. Redistributions of source code must retain the above copyright
-   notice,this list of conditions, and the following disclaimer.
-
-   2. 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, and in the same place
-   and form as other copyright, license and disclaimer information.
-
-   3. The end-user documentation included with the redistribution, if any,must
-   include the following acknowledgment: "This product includes
-   software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and
-   its contributors", in the same place and form as other third-party
-   acknowledgments. Alternately, this acknowledgment may appear in the software
-   itself, in the same form and location as other such third-party
-   acknowledgments.
-
-    4. Except as contained in this notice, the name of The XFree86 Project,Inc
-    shall not be used in advertising or otherwise to promote the sale, use
-    or other dealings in this Software without prior written authorization from
-    The XFree86 Project, Inc.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 XFREE86 PROJECT, INC OR ITS 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.  
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to X Window System 6.8.2, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
-
---- begin of LICENSE ---
-
-          Licenses
-The X.Org Foundation March 2004
-
-1. Introduction
-
-The X.org Foundation X Window System distribution is a compilation of code and
-documentation from many sources. This document is intended primarily as a
-guide to the licenses used in the distribution: you must check each file
-and/or package for precise redistribution terms. None-the-less, this summary
-may be useful to many users. No software incorporating the XFree86 1.1 license
-has been incorporated.
-
-This document is based on the compilation from XFree86.
-
-2. XFree86 License
-
-XFree86 code without an explicit copyright is covered by the following
-copyright/license:
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the XFree86 Project.
-
-3. Other Licenses
-
-Portions of code are covered by the following licenses/copyrights. See
-individual files for the copyright dates.
-
-3.1. X/MIT Copyrights
-
-3.1.1. X Consortium
-
-Copyright (C) <date> X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X
-CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from the X Consortium.
-
-X Window System is a trademark of X Consortium, Inc.
-
-3.1.2. The Open Group
-
-Copyright <date> The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation.
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from The Open Group.  3.2.
-Berkeley-based copyrights:
-
-o
-3.2.1. General
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-   2. 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.
-
-   3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.  3.2.2. UCB/LBL
-
-Copyright (c) 1993 The Regents of the University of California. All rights
-reserved.
-
-This software was developed by the Computer Systems Engineering group at
-Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to
-Berkeley.
-
-All advertising materials mentioning features or use of this software must
-display the following acknowledgement: This product includes software
-developed by the University of California, Lawrence Berkeley Laboratory.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-   2. 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.
-
-   3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement: This product includes software
-   developed by the University of California, Berkeley and its contributors.
-
-   4. Neither the name of the University 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 REGENTS 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 REGENTS 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.  3.2.3. The
-NetBSD Foundation, Inc.
-
-Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved.
-
-This code is derived from software contributed to The NetBSD Foundation by Ben
-Collver <collver1@attbi.com>
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-   2. 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.
-
-   3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement: This product includes software
-   developed by the NetBSD Foundation, Inc. and its contributors.
-
-   4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.  3.2.4. Theodore
-Ts'o.
-
-Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All rights
-reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-   and the entire permission notice in its entirety, including the disclaimer
-   of warranties.
-
-   2. 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.
-
-   3. he name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR 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 NOT ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  3.2.5. Theo de Raadt and Damien Miller
-
-Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. Copyright (c)
-2001-2002 Damien Miller. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-   2. 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.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.  3.2.6. Todd C. Miller
-
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-
-Permission to use, copy, modify, and distribute this software for any purpose
-with or without fee is hereby granted, provided that the above copyright
-notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  3.2.7. Thomas
-Winischhofer
-
-Copyright (C) 2001-2004 Thomas Winischhofer
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-   2. 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.
-
-   3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED 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 AUTHOR 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.  3.3. NVIDIA Corp
-
-Copyright (c) 1996 NVIDIA, Corp. All rights reserved.
-
-NOTICE TO USER: The source code is copyrighted under U.S. and international
-laws. NVIDIA, Corp. of Sunnyvale, California owns the copyright and as design
-patents pending on the design and interface of the NV chips. Users and
-possessors of this source code are hereby granted a nonexclusive, royalty-free
-copyright and design patent license to use this code in individual and
-commercial software.
-
-Any use of this source code must include, in the user documentation and
-internal comments to the code, notices to the end user as follows:
-
-Copyright (c) 1996 NVIDIA, Corp. NVIDIA design patents pending in the U.S. and
-foreign countries.
-
-NVIDIA, CORP. MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE
-CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED
-WARRANTY OF ANY KIND. NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA, CORP. BE LIABLE
-FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.  3.4. GLX Public
-License
-
-GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License")
-
-Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby
-grants permission to Recipient (defined below), under Recipient's copyrights
-in the Original Software (defined below), to use, copy, modify, merge,
-publish, distribute, sublicense and/or sell copies of Subject Software
-(defined below), and to permit persons to whom the Subject Software is
-furnished in accordance with this License to do the same, subject to all of
-the following terms and conditions, which Recipient accepts by engaging in any
-such use, copying, modifying, merging, publishing, distributing, sublicensing
-or selling:
-
-1. Definitions.
-
-    (a) "Original Software" means source code of computer software code which
-    is described in Exhibit A as Original Software.
-
-    (b) "Modifications" means any addition to or deletion from the substance
-    or structure of either the Original Software or any previous
-    Modifications. When Subject Software is released as a series of files, a
-    Modification means (i) any addition to or deletion from the contents of a
-    file containing Original Software or previous Modifications and (ii) any
-    new file that contains any part of the Original Code or previous
-    Modifications.
-
-    (c) "Subject Software" means the Original Software or Modifications or the
-    combination of the Original Software and Modifications, or portions of any
-    of the foregoing.
-
-    (d) "Recipient" means an individual or a legal entity exercising rights
-    under, and complying with all of the terms of, this License. For legal
-    entities, "Recipient" includes any entity which controls, is controlled
-    by, or is under common control with Recipient. For purposes of this
-    definition, "control" of an entity means (a) the power, direct or
-    indirect, to direct or manage such entity, or (b) ownership of fifty
-    percent (50%) or more of the outstanding shares or beneficial ownership of
-    such entity.
-
-2. Redistribution of Source Code Subject to These Terms. Redistributions of
-Subject Software in source code form must retain the notice set forth in
-Exhibit A, below, in every file. A copy of this License must be included in
-any documentation for such Subject Software where the recipients' rights
-relating to Subject Software are described. Recipient may distribute the
-source code version of Subject Software under a license of Recipient's choice,
-which may contain terms different from this License, provided that (i)
-Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13 of
-this License, which terms may not be modified or superseded by any other terms
-of such license. If Recipient distributes the source code version under a
-different license Recipient must make it absolutely clear that any terms which
-differ from this License are offered by Recipient alone, not by SGI. Recipient
-hereby agrees to indemnify SGI for any liability incurred by SGI as a result
-of any such terms Recipient offers.
-
-3. Redistribution in Executable Form. The notice set forth in Exhibit A must
-be conspicuously included in any notice in an executable version of Subject
-Software, related documentation or collateral in which Recipient describes the
-user's rights relating to the Subject Software. Recipient may distribute the
-executable version of Subject Software under a license of Recipient's choice,
-which may contain terms different from this License, provided that (i)
-Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of
-this License, which terms may not be modified or superseded by any other terms
-of such license. If Recipient distributes the executable version under a
-different license Recipient must make it absolutely clear that any terms which
-differ from this License are offered by Recipient alone, not by SGI. Recipient
-hereby agrees to indemnify SGI for any liability incurred by SGI as a result
-of any such terms Recipient offers.
-
-4. Termination. This License and the rights granted hereunder will terminate
-automatically if Recipient fails to comply with terms herein and fails to cure
-such breach within 30 days of the breach. Any sublicense to the Subject
-Software which is properly granted shall survive any termination of this
-License absent termination by the terms of such sublicense. Provisions which,
-by their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-5. No Trademark Rights. This License does not grant any rights to use any
-trade name, trademark or service mark whatsoever. No trade name, trademark or
-service mark of SGI may be used to endorse or promote products derived from
-the Subject Software without prior written permission of SGI.
-
-6. No Other Rights. This License does not grant any rights with respect to the
-OpenGL API or to any software or hardware implementation thereof or to any
-other software whatsoever, nor shall any other rights or licenses not
-expressly granted hereunder arise by implication, estoppel or otherwise with
-respect to the Subject Software. Title to and ownership of the Original
-Software at all times remains with SGI. All rights in the Original Software
-not expressly granted under this License are reserved.
-
-7. Compliance with Laws; Non-Infringement. Recipient shall comply with all
-applicable laws and regulations in connection with use and distribution of the
-Subject Software, including but not limited to, all export and import control
-laws and regulations of the U.S. government and other countries. Recipient may
-not distribute Subject Software that (i) in any way infringes (directly or
-contributorily) the rights (including patent, copyright, trade secret,
-trademark or other intellectual property rights of any kind) of any other
-person or entity or (ii) breaches any representation or warranty, express,
-implied or statutory, which under any applicable law it might be deemed to
-have been distributed.
-
-8. Claims of Infringement. If Recipient at any time has knowledge of any one
-or more third party claims that reproduction, modification, use, distribution,
-import or sale of Subject Software (including particular functionality or code
-incorporated in Subject Software) infringes the third party's intellectual
-property rights, Recipient must place in a well-identified web page bearing
-the title "LEGAL" a description of each such claim and a description of the
-party making each such claim in sufficient detail that a user of the Subject
-Software will know whom to contact regarding the claim. Also, upon gaining
-such knowledge of any such claim, Recipient must conspicuously include the URL
-for such web page in the Exhibit A notice required under Sections 2 and 3,
-above, and in the text of any related documentation, license agreement or
-collateral in which Recipient describes end user's rights relating to the
-Subject Software. If Recipient obtains such knowledge after it makes Subject
-Software available to any other person or entity, Recipient shall take other
-steps (such as notifying appropriate mailing lists or newsgroups) reasonably
-calculated to inform those who received the Subject Software that new
-knowledge has been obtained.
-
-9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS,
-MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO
-RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY
-SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
-WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY),
-CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
-STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
-THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
-TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO
-THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT
-ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT.
-
-11. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc. from
-and against any loss, liability, damages, costs or expenses (including the
-payment of reasonable attorneys fees) arising out of Recipient's use,
-modification, reproduction and distribution of the Subject Software or out of
-any representation or warranty made by Recipient.
-
-12. U.S. Government End Users. The Subject Software is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S. Government End Users
-acquire only the rights set forth in this License and are subject to the terms
-of this License.
-
-13. Miscellaneous. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed so as to achieve as nearly as
-possible the same economic effect as the original provision and the remainder
-of this License will remain in effect. This License shall be governed by and
-construed in accordance with the laws of the United States and the State of
-California as applied to agreements entered into and to be performed entirely
-within California between California residents. Any litigation relating to
-this License shall be subject to the exclusive jurisdiction of the Federal
-Courts of the Northern District of California (or, absent subject matter
-jurisdiction in such courts, the courts of the State of California), with
-venue lying exclusively in Santa Clara County, California, with the losing
-party responsible for costs, including without limitation, court costs and
-reasonable attorneys fees and expenses. The application of the United Nations
-Convention on Contracts for the International Sale of Goods is expressly
-excluded. Any law or regulation which provides that the language of a contract
-shall be construed against the drafter shall not apply to this License.
-
-Exhibit A
-
-The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and 13
-of the GLX Public License Version 1.0 (the "License"). You may not use this
-file except in compliance with those sections of the License. You may obtain a
-copy of the License at Silicon Graphics, Inc., attn: Legal Services, 2011 N.
-Shoreline Blvd., Mountain View, CA 94043 or at
-http://www.sgi.com/software/opensource/glx/license.html.
-
-Software distributed under the License is distributed on an "AS IS" basis. ALL
-WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON-
-INFRINGEMENT. See the License for the specific language governing rights and
-limitations under the License.
-
-The Original Software is GLX version 1.2 source code, released February, 1999.
-The developer of the Original Software is Silicon Graphics, Inc. Those
-portions of the Subject Software created by Silicon Graphics, Inc. are
-Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.  3.5. CID
-Font Code Public License
-
-CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License")
-
-Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI")
-hereby grants permission to Recipient (defined below), under SGI's copyrights
-in the Original Software (defined below), to use, copy, modify, merge,
-publish, distribute, sublicense and/or sell copies of Subject Software
-(defined below) in both source code and executable form, and to permit persons
-to whom the Subject Software is furnished in accordance with this License to
-do the same, subject to all of the following terms and conditions, which
-Recipient accepts by engaging in any such use, copying, modifying, merging,
-publication, distributing, sublicensing or selling:
-
-1. Definitions.
-
-    a. "Original Software" means source code of computer software code that is
-    described in Exhibit A as Original Software.
-
-    b. "Modifications" means any addition to or deletion from the substance or
-    structure of either the Original Software or any previous Modifications.
-    When Subject Software is released as a series of files, a Modification
-    means (i) any addition to or deletion from the contents of a file
-    containing Original Software or previous Modifications and (ii) any new
-    file that contains any part of the Original Code or previous
-    Modifications.
-
-    c. "Subject Software" means the Original Software or Modifications or the
-    combination of the Original Software and Modifications, or portions of any
-    of the foregoing.
-
-    d. "Recipient" means an individual or a legal entity exercising rights
-    under the terms of this License. For legal entities, "Recipient" includes
-    any entity that controls, is controlled by, or is under common control
-    with Recipient. For purposes of this definition, "control" of an entity
-    means (i) the power, direct or indirect, to direct or manage such entity,
-    or (ii) ownership of fifty percent (50%) or more of the outstanding shares
-    or beneficial ownership of such entity.
-
-    e. "Required Notice" means the notice set forth in Exhibit A to this
-    License.
-
-    f. "Accompanying Technology" means any software or other technology that
-    is not a Modification and that is distributed or made publicly available
-    by Recipient with the Subject Software. Separate software files that do
-    not contain any Original Software or any previous Modification shall not
-    be deemed a Modification, even if such software files are aggregated as
-    part of a product, or in any medium of storage, with any file that does
-    contain Original Software or any previous Modification.
-
-2. License Terms. All distribution of the Subject Software must be made
-subject to the terms of this License. A copy of this License and the Required
-Notice must be included in any documentation for Subject Software where
-Recipient's rights relating to Subject Software and/or any Accompanying
-Technology are described. Distributions of Subject Software in source code
-form must also include the Required Notice in every file distributed. In
-addition, a ReadMe file entitled "Important Legal Notice" must be distributed
-with each distribution of one or more files that incorporate Subject Software.
-That file must be included with distributions made in both source code and
-executable form. A copy of the License and the Required Notice must be
-included in that file. Recipient may distribute Accompanying Technology under
-a license of Recipient's choice, which may contain terms different from this
-License, provided that (i) Recipient is in compliance with the terms of this
-License, (ii) such other license terms do not modify or supersede the terms of
-this License as applicable to the Subject Software, (iii) Recipient hereby
-indemnifies SGI for any liability incurred by SGI as a result of the
-distribution of Accompanying Technology or the use of other license terms.
-
-3. Termination. This License and the rights granted hereunder will terminate
-automatically if Recipient fails to comply with terms herein and fails to cure
-such breach within 30 days of the breach. Any sublicense to the Subject
-Software that is properly granted shall survive any termination of this
-License absent termination by the terms of such sublicense. Provisions which,
-by their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-4. Trademark Rights. This License does not grant any rights to use any trade
-name, trademark or service mark whatsoever. No trade name, trademark or
-service mark of SGI may be used to endorse or promote products derived from or
-incorporating any Subject Software without prior written permission of SGI.
-
-5. No Other Rights. No rights or licenses not expressly granted hereunder
-shall arise by implication, estoppel or otherwise. Title to and ownership of
-the Original Software at all times remains with SGI. All rights in the
-Original Software not expressly granted under this License are reserved.
-
-6. Compliance with Laws; Non-Infringement. Recipient shall comply with all
-applicable laws and regulations in connection with use and distribution of the
-Subject Software, including but not limited to, all export and import control
-laws and regulations of the U.S. government and other countries. Recipient may
-not distribute Subject Software that (i) in any way infringes (directly or
-contributorily) the rights (including patent, copyright, trade secret,
-trademark or other intellectual property rights of any kind) of any other
-person or entity, or (ii) breaches any representation or warranty, express,
-implied or statutory, which under any applicable law it might be deemed to
-have been distributed.
-
-7. Claims of Infringement. If Recipient at any time has knowledge of any one
-or more third party claims that reproduction, modification, use, distribution,
-import or sale of Subject Software (including particular functionality or code
-incorporated in Subject Software) infringes the third party's intellectual
-property rights, Recipient must place in a well-identified web page bearing
-the title "LEGAL" a description of each such claim and a description of the
-party making each such claim in sufficient detail that a user of the Subject
-Software will know whom to contact regarding the claim. Also, upon gaining
-such knowledge of any such claim, Recipient must conspicuously include the URL
-for such web page in the Required Notice, and in the text of any related
-documentation, license agreement or collateral in which Recipient describes
-end user's rights relating to the Subject Software. If Recipient obtains such
-knowledge after it makes Subject Software available to any other person or
-entity, Recipient shall take other steps (such as notifying appropriate
-mailing lists or newsgroups) reasonably calculated to provide such knowledge
-to those who received the Subject Software.
-
-8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS,
-MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO
-RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY
-SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
-WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY),
-CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SUBJECT SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT
-ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND
-LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED.
-
-10. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold SGI and its successors and assigns
-harmless from and against any loss, liability, damages, costs or expenses
-(including the payment of reasonable attorneys fees) arising out of
-(Recipient's use, modification, reproduction and distribution of the Subject
-Software or out of any representation or warranty made by Recipient.
-
-11. U.S. Government End Users. The Subject Software is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S. Government End Users
-acquire only the rights set forth in this License and are subject to the terms
-of this License.
-
-12. Miscellaneous. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be
-unenforceable by any judicial or administrative authority having proper
-jurisdiction with respect thereto, such provision shall be reformed so as to
-achieve as nearly as possible the same economic effect as the original
-provision and the remainder of this License will remain in effect. This
-License shall be governed by and construed in accordance with the laws of the
-United States and the State of California as applied to agreements entered
-into and to be performed entirely within California between California
-residents. Any litigation relating to this License shall be subject to the
-exclusive jurisdiction of the Federal Courts of the Northern District of
-California (or, absent subject matter jurisdiction in such courts, the courts
-of the State of California), with venue lying exclusively in Santa Clara
-County, California, with the losing party responsible for costs, including
-without limitation, court costs and reasonable attorneys fees and expenses.
-The application of the United Nations Convention on Contracts for the
-International Sale of Goods is expressly excluded. Any law or regulation that
-provides that the language of a contract shall be construed against the
-drafter shall not apply to this License.
-
-Exhibit A
-
-Copyright (c) 1994-1999 Silicon Graphics, Inc.
-
-The contents of this file are subject to the CID Font Code Public License
-Version 1.0 (the "License"). You may not use this file except in compliance
-with the License. You may obtain a copy of the License at Silicon Graphics,
-Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-or at http://www.sgi.com/software/opensource/cid/license.html
-
-Software distributed under the License is distributed on an "AS IS" basis. ALL
-WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF
-NON-INFRINGEMENT. See the License for the specific language governing rights
-and limitations under the License.
-
-The Original Software (as defined in the License) is CID font code that was
-developed by Silicon Graphics, Inc. Those portions of the Subject Software (as
-defined in the License) that were created by Silicon Graphics, Inc. are
-Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved.
-
-[NOTE: When using this text in connection with Subject Software delivered
-solely in object code form, Recipient may replace the words "this file" with
-"this software" in both the first and second sentences.] 3.6. Bitstream Vera
-Fonts Copyright
-
-The fonts have a generous copyright, allowing derivative works (as long as
-"Bitstream" or "Vera" are not in the names), and full redistribution (so long
-as they are not *sold* by themselves). They can be be bundled, redistributed
-and sold with any software.
-
-The fonts are distributed under the following copyright:
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a
-trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated documentation
-files (the "Font Software"), to reproduce and distribute the Font Software,
-including without limitation the rights to use, copy, merge, publish,
-distribute, and/or sell copies of the Font Software, and to permit persons to
-whom the Font Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright and trademark notices and this permission notice shall be
-included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular the
-designs of glyphs or characters in the Fonts may be modified and additional
-glyphs or characters may be added to the Fonts, only if the fonts are renamed
-to names not containing either the words "Bitstream" or the word "Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream Vera"
-names.
-
-The Font Software may be sold as part of a larger software package but no copy
-of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL,
-SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO
-USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome Foundation,
-and Bitstream Inc., shall not be used in advertising or otherwise to promote
-the sale, use or other dealings in this Font Software without prior written
-authorization from the Gnome Foundation or Bitstream Inc., respectively. For
-further information, contact: fonts at gnome dot org.  3.7. Bigelow & Holmes
-Inc and URW++ GmbH Luxi font license
-
-Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction
-code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a
-registered trademark of Bigelow & Holmes Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of these Fonts and associated documentation files (the "Font Software"), to
-deal in the Font Software, including without limitation the rights to use,
-copy, merge, publish, distribute, sublicense, and/or sell copies of the Font
-Software, and to permit persons to whom the Font Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright and trademark notices and this permission notice shall be
-included in all copies of one or more of the Font Software.
-
-The Font Software may not be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may not be modified nor may
-additional glyphs or characters be added to the Fonts. This License becomes
-null and void when the Fonts or Font Software have been modified.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++
-GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY
-GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
-INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT
-SOFTWARE.
-
-Except as contained in this notice, the names of Bigelow & Holmes Inc. and
-URW++ GmbH. shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in this Font Software without prior written
-authorization from Bigelow & Holmes Inc. and URW++ GmbH.
-
-For further information, contact:
-
-info@urwpp.de or design@bigelowandholmes.com
-
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to zlib v1.2.8, which may be included 
-with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-  version 1.2.8, April 28th, 2013
-
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to the following which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
-  Apache Commons Math 3.2
-  Apache Derby 10.11.1.2
-  Apache Jakarta BCEL 5.1 
-  Apache Jakarta Regexp 1.4 
-  Apache Santuario XML Security for Java 1.5.4
-  Apache Xalan-Java 2.7.1 
-  Apache Xerces Java 2.10.0 
-  Apache XML Resolver 1.1 
-  Dynalink 0.5
-
-
---- begin of LICENSE ---
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
diff --git a/common/autoconf/Makefile.in b/common/autoconf/Makefile.in
deleted file mode 100644
index 000a9e7..0000000
--- a/common/autoconf/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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 Makefile was generated by configure @DATE_WHEN_CONFIGURED@
-# GENERATED FILE, DO NOT EDIT
-SPEC:=@OUTPUT_ROOT@/spec.gmk
-include @SRC_ROOT@/Makefile
diff --git a/common/autoconf/autogen.sh b/common/autoconf/autogen.sh
deleted file mode 100644
index 69bb67e..0000000
--- a/common/autoconf/autogen.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-script_dir=`dirname $0`
-
-# Create a timestamp as seconds since epoch
-if test "x`uname -s`" = "xSunOS"; then
-  TIMESTAMP=`date +%s`
-  if test "x$TIMESTAMP" = "x%s"; then
-    # date +%s not available on this Solaris, use workaround from nawk(1):
-    TIMESTAMP=`nawk 'BEGIN{print srand()}'`
-  fi
-else
-  TIMESTAMP=`date +%s`
-fi
-
-if test "x$CUSTOM_CONFIG_DIR" = "x"; then
-  custom_script_dir="$script_dir/../../jdk/make/closed/autoconf"
-else
-  custom_script_dir=$CUSTOM_CONFIG_DIR
-fi
-
-custom_hook=$custom_script_dir/custom-hook.m4
-
-AUTOCONF="`which autoconf 2> /dev/null | grep -v '^no autoconf in'`"
-
-echo "Autoconf found: ${AUTOCONF}"
-
-if test "x${AUTOCONF}" = x; then
-  echo You need autoconf installed to be able to regenerate the configure script
-  echo Error: Cannot find autoconf 1>&2
-  exit 1
-fi
-
-echo Generating generated-configure.sh with ${AUTOCONF}
-cat $script_dir/configure.ac  | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | ${AUTOCONF} -W all -I$script_dir - > $script_dir/generated-configure.sh
-rm -rf autom4te.cache
-
-if test -e $custom_hook; then
-  echo Generating custom generated-configure.sh
-  # We have custom sources available; also generate configure script
-  # with custom hooks compiled in.
-  cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | \
-      sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | ${AUTOCONF} -W all -I$script_dir - > $custom_script_dir/generated-configure.sh
-  rm -rf autom4te.cache
-else
-  echo No custom hook found:  $custom_hook
-fi
diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4
deleted file mode 100644
index 67d0ff9..0000000
--- a/common/autoconf/basics.m4
+++ /dev/null
@@ -1,751 +0,0 @@
-#
-# Copyright (c) 2011, 2015, 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.
-#
-
-# Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
-# If so, then append $1 to $2 \
-# Also set JVM_ARG_OK to true/false depending on outcome.
-AC_DEFUN([ADD_JVM_ARG_IF_OK],
-[
-  $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD
-  $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD
-  OUTPUT=`$3 $1 -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    $2="[$]$2 $1"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD
-    $ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD
-    JVM_ARG_OK=false
-  fi
-])
-
-# Appends a string to a path variable, only adding the : when needed.
-AC_DEFUN([BASIC_APPEND_TO_PATH],
-[
-  if test "x[$]$1" = x; then
-    $1="$2"
-  else
-    $1="[$]$1:$2"
-  fi
-])
-
-# This will make sure the given variable points to a full and proper
-# path. This means:
-# 1) There will be no spaces in the path. On posix platforms,
-#    spaces in the path will result in an error. On Windows,
-#    the path will be rewritten using short-style to be space-free.
-# 2) The path will be absolute, and it will be in unix-style (on
-#     cygwin).
-# $1: The name of the variable to fix
-AC_DEFUN([BASIC_FIXUP_PATH],
-[
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    BASIC_FIXUP_PATH_CYGWIN($1)
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    BASIC_FIXUP_PATH_MSYS($1)
-  else
-    # We're on a posix platform. Hooray! :)
-    path="[$]$1"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
-      AC_MSG_ERROR([Spaces are not allowed in this path.])
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
-    fi
-
-    $1="`cd "$path"; $THEPWDCMD -L`"
-  fi
-])
-
-# This will make sure the given variable points to a executable
-# with a full and proper path. This means:
-# 1) There will be no spaces in the path. On posix platforms,
-#    spaces in the path will result in an error. On Windows,
-#    the path will be rewritten using short-style to be space-free.
-# 2) The path will be absolute, and it will be in unix-style (on
-#     cygwin).
-# Any arguments given to the executable is preserved.
-# If the input variable does not have a directory specification, then
-# it need to be in the PATH.
-# $1: The name of the variable to fix
-AC_DEFUN([BASIC_FIXUP_EXECUTABLE],
-[
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    BASIC_FIXUP_EXECUTABLE_CYGWIN($1)
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    BASIC_FIXUP_EXECUTABLE_MSYS($1)
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="[$]$1"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      AC_MSG_NOTICE([Resolving $1 (as $path) failed, using $path directly.])
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.])
-      fi
-      AC_MSG_ERROR([Cannot locate the the path of $1])
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    $1="$new_complete"
-    AC_MSG_NOTICE([Rewriting $1 to "$new_complete"])
-  fi
-])
-
-AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
-[
-  if test "x$OPENJDK_BUILD_OS" != xwindows; then
-    # Follow a chain of symbolic links. Use readlink
-    # where it exists, else fall back to horribly
-    # complicated shell code.
-    if test "x$READLINK_TESTED" != yes; then
-      # On MacOSX there is a readlink tool with a different
-      # purpose than the GNU readlink tool. Check the found readlink.
-      ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
-      if test "x$ISGNU" = x; then
-        # A readlink that we do not know how to use.
-        # Are there other non-GNU readlinks out there?
-        READLINK_TESTED=yes
-        READLINK=
-      fi
-    fi
-
-    if test "x$READLINK" != x; then
-      $1=`$READLINK -f [$]$1`
-    else
-      # Save the current directory for restoring afterwards
-      STARTDIR=$PWD
-      COUNTER=0
-      sym_link_dir=`$DIRNAME [$]$1`
-      sym_link_file=`$BASENAME [$]$1`
-      cd $sym_link_dir
-      # Use -P flag to resolve symlinks in directories.
-      cd `$THEPWDCMD -P`
-      sym_link_dir=`$THEPWDCMD -P`
-      # Resolve file symlinks
-      while test $COUNTER -lt 20; do
-        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
-        if test "x$ISLINK" == x; then
-          # This is not a symbolic link! We are done!
-          break
-        fi
-        # Again resolve directory symlinks since the target of the just found
-        # link could be in a different directory
-        cd `$DIRNAME $ISLINK`
-        sym_link_dir=`$THEPWDCMD -P`
-        sym_link_file=`$BASENAME $ISLINK`
-        let COUNTER=COUNTER+1
-      done
-      cd $STARTDIR
-      $1=$sym_link_dir/$sym_link_file
-    fi
-  fi
-])
-
-# Register a --with argument but mark it as deprecated
-# $1: The name of the with argument to deprecate, not including --with-
-AC_DEFUN([BASIC_DEPRECATED_ARG_WITH],
-[
-  AC_ARG_WITH($1, [AS_HELP_STRING([--with-$1],
-      [Deprecated. Option is kept for backwards compatibility and is ignored])],
-      [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])])
-])
-
-# Register a --enable argument but mark it as deprecated
-# $1: The name of the with argument to deprecate, not including --enable-
-# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
-AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE],
-[
-  AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1],
-      [Deprecated. Option is kept for backwards compatibility and is ignored])])
-  if test "x$enable_$2" != x; then
-    AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.])
-  fi
-])
-
-AC_DEFUN_ONCE([BASIC_INIT],
-[
-  # Save the original command line. This is passed to us by the wrapper configure script.
-  AC_SUBST(CONFIGURE_COMMAND_LINE)
-  DATE_WHEN_CONFIGURED=`LANG=C date`
-  AC_SUBST(DATE_WHEN_CONFIGURED)
-  AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.])
-  AC_MSG_NOTICE([configure script generated at timestamp $DATE_WHEN_GENERATED.])
-])
-
-# Test that variable $1 denoting a program is not empty. If empty, exit with an error.
-# $1: variable to check
-# $2: executable name to print in warning (optional)
-AC_DEFUN([BASIC_CHECK_NONEMPTY],
-[
-  if test "x[$]$1" = x; then
-    if test "x$2" = x; then
-      PROG_NAME=translit($1,A-Z,a-z)
-    else
-      PROG_NAME=$2
-    fi
-    AC_MSG_NOTICE([Could not find $PROG_NAME!])
-    AC_MSG_ERROR([Cannot continue])
-  fi
-])
-
-# Does AC_PATH_PROG followed by BASIC_CHECK_NONEMPTY.
-# Arguments as AC_PATH_PROG:
-# $1: variable to set
-# $2: executable name to look for
-AC_DEFUN([BASIC_REQUIRE_PROG],
-[
-  AC_PATH_PROGS($1, $2)
-  BASIC_CHECK_NONEMPTY($1, $2)
-])
-
-# Setup the most fundamental tools that relies on not much else to set up,
-# but is used by much of the early bootstrap code.
-AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
-[
-
-  # 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. Nor are these tools expected to be found in the
-  # devkit from the builddeps server either, since they are
-  # needed to download the devkit.
-
-  # First are all the simple required tools.
-  BASIC_REQUIRE_PROG(BASENAME, basename)
-  BASIC_REQUIRE_PROG(BASH, bash)
-  BASIC_REQUIRE_PROG(CAT, cat)
-  BASIC_REQUIRE_PROG(CHMOD, chmod)
-  BASIC_REQUIRE_PROG(CMP, cmp)
-  BASIC_REQUIRE_PROG(COMM, comm)
-  BASIC_REQUIRE_PROG(CP, cp)
-  BASIC_REQUIRE_PROG(CPIO, cpio)
-  BASIC_REQUIRE_PROG(CUT, cut)
-  BASIC_REQUIRE_PROG(DATE, date)
-  BASIC_REQUIRE_PROG(DIFF, [gdiff diff])
-  BASIC_REQUIRE_PROG(DIRNAME, dirname)
-  BASIC_REQUIRE_PROG(ECHO, echo)
-  BASIC_REQUIRE_PROG(EXPR, expr)
-  BASIC_REQUIRE_PROG(FILE, file)
-  BASIC_REQUIRE_PROG(FIND, find)
-  BASIC_REQUIRE_PROG(HEAD, head)
-  BASIC_REQUIRE_PROG(LN, ln)
-  BASIC_REQUIRE_PROG(LS, ls)
-  BASIC_REQUIRE_PROG(MKDIR, mkdir)
-  BASIC_REQUIRE_PROG(MKTEMP, mktemp)
-  BASIC_REQUIRE_PROG(MV, mv)
-  BASIC_REQUIRE_PROG(PRINTF, printf)
-  BASIC_REQUIRE_PROG(RM, rm)
-  BASIC_REQUIRE_PROG(SH, sh)
-  BASIC_REQUIRE_PROG(SORT, sort)
-  BASIC_REQUIRE_PROG(TAIL, tail)
-  BASIC_REQUIRE_PROG(TAR, tar)
-  BASIC_REQUIRE_PROG(TEE, tee)
-  BASIC_REQUIRE_PROG(TOUCH, touch)
-  BASIC_REQUIRE_PROG(TR, tr)
-  BASIC_REQUIRE_PROG(UNAME, uname)
-  BASIC_REQUIRE_PROG(UNIQ, uniq)
-  BASIC_REQUIRE_PROG(WC, wc)
-  BASIC_REQUIRE_PROG(WHICH, which)
-  BASIC_REQUIRE_PROG(XARGS, xargs)
-
-  # Then required tools that require some special treatment.
-  AC_PROG_AWK
-  BASIC_CHECK_NONEMPTY(AWK)
-  AC_PROG_GREP
-  BASIC_CHECK_NONEMPTY(GREP)
-  AC_PROG_EGREP
-  BASIC_CHECK_NONEMPTY(EGREP)
-  AC_PROG_FGREP
-  BASIC_CHECK_NONEMPTY(FGREP)
-  AC_PROG_SED
-  BASIC_CHECK_NONEMPTY(SED)
-
-  AC_PATH_PROGS(NAWK, [nawk gawk awk])
-  BASIC_CHECK_NONEMPTY(NAWK)
-
-  # 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
-  AC_PATH_PROG(CYGPATH, cygpath)
-  AC_PATH_PROG(READLINK, readlink)
-  AC_PATH_PROG(DF, df)
-  AC_PATH_PROG(SETFILE, SetFile)
-])
-
-# Setup basic configuration paths, and platform-specific stuff related to PATHs.
-AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
-[
-  # Locate the directory of this script.
-  SCRIPT="[$]0"
-  AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
-
-  # Where is the source? It is located two levels above the configure script.
-  CURDIR="$PWD"
-  cd "$AUTOCONF_DIR/../.."
-  SRC_ROOT="`$THEPWDCMD -L`"
-
-  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    PATH_SEP=";"
-    BASIC_CHECK_PATHS_WINDOWS
-  else
-    PATH_SEP=":"
-  fi
-
-  AC_SUBST(SRC_ROOT)
-  AC_SUBST(PATH_SEP)
-  cd "$CURDIR"
-
-  BASIC_FIXUP_PATH(SRC_ROOT)
-  BASIC_FIXUP_PATH(CURDIR)
-
-  if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
-    # Add extra search paths on solaris for utilities like ar and as etc...
-    PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
-  fi
-
-  # You can force the sys-root if the sys-root encoded into the cross compiler tools
-  # is not correct.
-  AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
-      [pass this sys-root to the compilers and tools (for cross-compiling)])])
-
-  if test "x$with_sys_root" != x; then
-    SYS_ROOT=$with_sys_root
-  else
-    SYS_ROOT=/
-  fi
-  AC_SUBST(SYS_ROOT)
-
-  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
-      [search this directory for compilers and tools (for cross-compiling)])],
-      [TOOLS_DIR=$with_tools_dir]
-  )
-
-  # Xcode version will be validated later
-  AC_ARG_WITH([xcode-path], [AS_HELP_STRING([--with-xcode-path],
-      [explicit path to Xcode 4 (generally for building on 10.9 and later)])],
-      [XCODE_PATH=$with_xcode_path]
-  )
-
-  AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
-      [use this directory as base for tools-dir and sys-root (for cross-compiling)])],
-      [
-        if test "x$with_sys_root" != x; then
-          AC_MSG_ERROR([Cannot specify both --with-devkit and --with-sys-root at the same time])
-        fi
-        BASIC_FIXUP_PATH([with_devkit])
-        BASIC_APPEND_TO_PATH([TOOLS_DIR],$with_devkit/bin)
-        if test -d "$with_devkit/$host_alias/libc"; then
-          SYS_ROOT=$with_devkit/$host_alias/libc
-        elif test -d "$with_devkit/$host/sys-root"; then
-          SYS_ROOT=$with_devkit/$host/sys-root
-        fi
-      ])
-])
-
-AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
-[
-
-  AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
-      [use this as the name of the configuration @<:@generated from important configuration options@:>@])],
-      [ CONF_NAME=${with_conf_name} ])
-
-  # Test from where we are running configure, in or outside of src root.
-  if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
-      || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
-      || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
-    # We are running configure from the src root.
-    # Create a default ./build/target-variant-debuglevel output root.
-    if test "x${CONF_NAME}" = x; then
-      CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
-    fi
-    OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
-    $MKDIR -p "$OUTPUT_ROOT"
-    if test ! -d "$OUTPUT_ROOT"; then
-      AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])
-    fi
-  else
-    # We are running configure from outside of the src dir.
-    # Then use the current directory as output dir!
-    # If configuration is situated in normal build directory, just use the build
-    # directory name as configuration name, otherwise use the complete path.
-    if test "x${CONF_NAME}" = x; then
-      CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
-    fi
-    OUTPUT_ROOT="$CURDIR"
-
-    # WARNING: This might be a bad thing to do. You need to be sure you want to
-    # have a configuration in this directory. Do some sanity checks!
-
-    if test ! -e "$OUTPUT_ROOT/spec.gmk"; then
-      # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
-      # other files
-      files_present=`$LS $OUTPUT_ROOT`
-      # Configure has already touched config.log and confdefs.h in the current dir when this check
-      # is performed.
-      filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \
-      | $TR -d '\n'`
-      if test "x$filtered_files" != x; then
-        AC_MSG_NOTICE([Current directory is $CURDIR.])
-        AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here])
-        AC_MSG_NOTICE([(as opposed to creating a configuration in <src_root>/build/<conf-name>).])
-        AC_MSG_NOTICE([However, this directory is not empty. This is not allowed, since it could])
-        AC_MSG_NOTICE([seriously mess up just about everything.])
-        AC_MSG_NOTICE([Try 'cd $SRC_ROOT' and restart configure])
-        AC_MSG_NOTICE([(or create a new empty directory and cd to it).])
-        AC_MSG_ERROR([Will not continue creating configuration in $CURDIR])
-      fi
-    fi
-  fi
-  AC_MSG_CHECKING([what configuration name to use])
-  AC_MSG_RESULT([$CONF_NAME])
-
-  BASIC_FIXUP_PATH(OUTPUT_ROOT)
-
-  AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk)
-  AC_SUBST(CONF_NAME, $CONF_NAME)
-  AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT)
-
-  # Most of the probed defines are put into config.h
-  AC_CONFIG_HEADERS([$OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in])
-  # The spec.gmk file contains all variables for the make system.
-  AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])
-  # The hotspot-spec.gmk file contains legacy variables for the hotspot make system.
-  AC_CONFIG_FILES([$OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in])
-  # The bootcycle-spec.gmk file contains support for boot cycle builds.
-  AC_CONFIG_FILES([$OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in])
-  # The compare.sh is used to compare the build output to other builds.
-  AC_CONFIG_FILES([$OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in])
-  # Spec.sh is currently used by compare-objects.sh
-  AC_CONFIG_FILES([$OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in])
-  # The generated Makefile knows where the spec.gmk is and where the source is.
-  # You can run make from the OUTPUT_ROOT, or from the top-level Makefile
-  # which will look for generated configurations
-  AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in])
-
-  # Save the arguments given to us
-  echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
-])
-
-AC_DEFUN_ONCE([BASIC_SETUP_LOGGING],
-[
-  # Setup default logging of stdout and stderr to build.log in the output root.
-  BUILD_LOG='$(OUTPUT_ROOT)/build.log'
-  BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
-  BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
-  AC_SUBST(BUILD_LOG)
-  AC_SUBST(BUILD_LOG_PREVIOUS)
-  AC_SUBST(BUILD_LOG_WRAPPER)
-])
-
-
-#%%% Simple tools %%%
-
-# Check if we have found a usable version of make
-# $1: the path to a potential make binary (or empty)
-# $2: the description on how we found this
-AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
-[
-  MAKE_CANDIDATE="$1"
-  DESCRIPTION="$2"
-  if test "x$MAKE_CANDIDATE" != x; then
-    AC_MSG_NOTICE([Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION])
-    MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
-    IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
-    if test "x$IS_GNU_MAKE" = x; then
-      AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.])
-    else
-      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[[12]]' -e '4\.'`
-      if test "x$IS_MODERN_MAKE" = x; then
-        AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring.])
-      else
-        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.msys"; then
-            MAKE_EXPECTED_ENV='msys'
-          else
-            AC_MSG_ERROR([Unknown Windows environment])
-          fi
-          MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
-          IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
-        else
-          # Not relevant for non-Windows
-          IS_MAKE_CORRECT_ENV=true
-        fi
-        if test "x$IS_MAKE_CORRECT_ENV" = x; then
-          AC_MSG_NOTICE([Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring.])
-        else
-          FOUND_MAKE=$MAKE_CANDIDATE
-          BASIC_FIXUP_EXECUTABLE(FOUND_MAKE)
-        fi
-      fi
-    fi
-  fi
-])
-
-# Goes looking for a usable version of GNU make.
-AC_DEFUN([BASIC_CHECK_GNU_MAKE],
-[
-  # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
-  if test "x$MAKE" != x; then
-    # User has supplied a make, test it.
-    if test ! -f "$MAKE"; then
-      AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not found.])
-    fi
-    BASIC_CHECK_MAKE_VERSION("$MAKE", [user supplied MAKE=$MAKE])
-    if test "x$FOUND_MAKE" = x; then
-      AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.])
-    fi
-  else
-    # Try our hardest to locate a correct version of GNU make
-    AC_PATH_PROGS(CHECK_GMAKE, gmake)
-    BASIC_CHECK_MAKE_VERSION("$CHECK_GMAKE", [gmake in PATH])
-
-    if test "x$FOUND_MAKE" = x; then
-      AC_PATH_PROGS(CHECK_MAKE, make)
-      BASIC_CHECK_MAKE_VERSION("$CHECK_MAKE", [make in PATH])
-    fi
-
-    if test "x$FOUND_MAKE" = x; then
-      if test "x$TOOLS_DIR" != x; then
-        # We have a tools-dir, check that as well before giving up.
-        OLD_PATH=$PATH
-        PATH=$TOOLS_DIR:$PATH
-        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
-          AC_PATH_PROGS(CHECK_TOOLSDIR_MAKE, make)
-          BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_MAKE", [make in tools-dir])
-        fi
-        PATH=$OLD_PATH
-      fi
-    fi
-
-    if test "x$FOUND_MAKE" = x; then
-      AC_MSG_ERROR([Cannot find GNU make 3.81 or newer! Please put it in the path, or add e.g. MAKE=/opt/gmake3.81/make as argument to configure.])
-    fi
-  fi
-
-  MAKE=$FOUND_MAKE
-  AC_SUBST(MAKE)
-  AC_MSG_NOTICE([Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)])
-])
-
-AC_DEFUN([BASIC_CHECK_FIND_DELETE],
-[
-  # Test if find supports -delete
-  AC_MSG_CHECKING([if find supports -delete])
-  FIND_DELETE="-delete"
-
-  DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
-
-  echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
-
-  TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
-  if test -f $DELETEDIR/TestIfFindSupportsDelete; then
-    # No, it does not.
-    rm $DELETEDIR/TestIfFindSupportsDelete
-    FIND_DELETE="-exec rm \{\} \+"
-    AC_MSG_RESULT([no])
-  else
-    AC_MSG_RESULT([yes])
-  fi
-  rmdir $DELETEDIR
-  AC_SUBST(FIND_DELETE)
-])
-
-AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
-[
-  BASIC_CHECK_GNU_MAKE
-
-  BASIC_CHECK_FIND_DELETE
-
-  # These tools might not be installed by default,
-  # need hint on how to install them.
-  BASIC_REQUIRE_PROG(UNZIP, unzip)
-  BASIC_REQUIRE_PROG(ZIP, zip)
-
-  # Non-required basic tools
-
-  AC_PATH_PROG(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
-  AC_PATH_PROGS(READELF, [readelf greadelf])
-  AC_PATH_PROG(HG, hg)
-  AC_PATH_PROG(STAT, stat)
-  AC_PATH_PROG(TIME, time)
-  # Check if it's GNU time
-  IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
-  if test "x$IS_GNU_TIME" != x; then
-    IS_GNU_TIME=yes
-  else
-    IS_GNU_TIME=no
-  fi
-  AC_SUBST(IS_GNU_TIME)
-
-  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    BASIC_REQUIRE_PROG(COMM, comm)
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-    BASIC_REQUIRE_PROG(DSYMUTIL, dsymutil)
-    BASIC_REQUIRE_PROG(XATTR, xattr)
-    AC_PATH_PROG(CODESIGN, codesign)
-    if test "x$CODESIGN" != "x"; then
-      # Verify that the openjdk_codesign certificate is present
-      AC_MSG_CHECKING([if openjdk_codesign certificate is present])
-      rm -f codesign-testfile
-      touch codesign-testfile
-      codesign -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
-      rm -f codesign-testfile
-      if test "x$CODESIGN" = x; then
-        AC_MSG_RESULT([no])
-      else
-        AC_MSG_RESULT([yes])
-      fi
-    fi
-  fi
-])
-
-# Check if build directory is on local disk. If not possible to determine,
-# we prefer to claim it's local.
-# Argument 1: directory to test
-# Argument 2: what to do if it is on local disk
-# Argument 3: what to do otherwise (remote disk or failure)
-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
-    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
-    if $DF -l $1 > /dev/null 2>&1; then
-      $2
-    else
-      $3
-    fi
-  fi
-])
-
-# Check that source files have basic read permissions set. This might
-# not be the case in cygwin in certain conditions.
-AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
-[
-  if test x"$OPENJDK_BUILD_OS" = xwindows; then
-    file_to_test="$SRC_ROOT/LICENSE"
-    if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
-      AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
-    fi
-  fi
-])
-
-AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
-[
-  AC_MSG_CHECKING([if build directory is on local disk])
-  BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT,
-      [OUTPUT_DIR_IS_LOCAL="yes"],
-      [OUTPUT_DIR_IS_LOCAL="no"])
-  AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL)
-
-  BASIC_CHECK_SRC_PERMS
-
-  # Check if the user has any old-style ALT_ variables set.
-  FOUND_ALT_VARIABLES=`env | grep ^ALT_`
-
-  # Before generating output files, test if they exist. If they do, this is a reconfigure.
-  # Since we can't properly handle the dependencies for this, warn the user about the situation
-  if test -e $OUTPUT_ROOT/spec.gmk; then
-    IS_RECONFIGURE=yes
-  else
-    IS_RECONFIGURE=no
-  fi
-
-  if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then
-    HIDE_PERFORMANCE_HINTS=yes
-  else
-    HIDE_PERFORMANCE_HINTS=no
-    # Hide it the next time around...
-    $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1
-  fi
-])
diff --git a/common/autoconf/basics_windows.m4 b/common/autoconf/basics_windows.m4
deleted file mode 100644
index 31b9817..0000000
--- a/common/autoconf/basics_windows.m4
+++ /dev/null
@@ -1,420 +0,0 @@
-#
-# 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
-# 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.
-#
-
-AC_DEFUN([BASIC_WINDOWS_REWRITE_AS_UNIX_PATH],
-[
-  windows_path="[$]$1"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    $1="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    $1="$unix_path"
-  fi
-])
-
-AC_DEFUN([BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH],
-[
-  unix_path="[$]$1"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    windows_path=`$CYGPATH -m "$unix_path"`
-    $1="$windows_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    windows_path=`cmd //c echo $unix_path`
-    $1="$windows_path"
-  fi
-])
-
-# Helper function which possibly converts a path using DOS-style short mode.
-# If so, the updated path is stored in $new_path.
-# $1: The path to check
-AC_DEFUN([BASIC_MAKE_WINDOWS_SPACE_SAFE_CYGWIN],
-[
-  input_path="$1"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use @<:@ and @:>@ instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP @<:@^-._/a-zA-Z0-9@:>@`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $1 | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-])
-
-# Helper function which possibly converts a path using DOS-style short mode.
-# If so, the updated path is stored in $new_path.
-# $1: The path to check
-AC_DEFUN([BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS],
-[
-  input_path="$1"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use @<:@ and @:>@ instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP @<:@^-_/:a-zA-Z0-9@:>@`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-])
-
-# FIXME: The BASIC_FIXUP_*_CYGWIN/MSYS is most likely too convoluted
-# and could probably be heavily simplified. However, all changes in this
-# area tend to need lot of testing in different scenarios, and in lack of
-# proper unit testing, cleaning this up has not been deemed worth the effort
-# at the moment.
-
-AC_DEFUN([BASIC_FIXUP_PATH_CYGWIN],
-[
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="[$]$1"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
-    AC_MSG_ERROR([Cannot locate the the path of $1])
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  BASIC_MAKE_WINDOWS_SPACE_SAFE_CYGWIN([$new_path])
-
-  if test "x$path" != "x$new_path"; then
-    $1="$new_path"
-    AC_MSG_NOTICE([Rewriting $1 to "$new_path"])
-  fi
-])
-
-AC_DEFUN([BASIC_FIXUP_PATH_MSYS],
-[
-  path="[$]$1"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-  BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS([$new_path])
-  BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
-  if test "x$path" != "x$new_path"; then
-    $1="$new_path"
-    AC_MSG_NOTICE([Rewriting $1 to "$new_path"])
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes@<:@@@:>@}" "${new_path:0:10}")
-])
-
-AC_DEFUN([BASIC_FIXUP_EXECUTABLE_CYGWIN],
-[
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="[$]$1"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        AC_MSG_NOTICE([You might be mixing spaces in the path and extra arguments, which is not allowed.])
-      fi
-      AC_MSG_ERROR([Cannot locate the the path of $1])
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      AC_MSG_NOTICE([The path of $1, which resolves as "$new_path", is invalid.])
-      AC_MSG_NOTICE([Neither "$new_path" nor "$new_path.exe/cmd" can be found])
-      AC_MSG_ERROR([Cannot locate the the path of $1])
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-  BASIC_MAKE_WINDOWS_SPACE_SAFE_CYGWIN([$input_to_shortpath])
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-])
-
-AC_DEFUN([BASIC_FIXUP_EXECUTABLE_MSYS],
-[
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="[$]$1"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-  BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-    BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        AC_MSG_NOTICE([You might be mixing spaces in the path and extra arguments, which is not allowed.])
-      fi
-      AC_MSG_ERROR([Cannot locate the the path of $1])
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-    BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS([$new_path])
-    # Output is in $new_path
-    BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes@<:@@@:>@}" "${new_path:0:10}")
-  fi
-])
-
-# Setup basic configuration paths, and platform-specific stuff related to PATHs.
-AC_DEFUN([BASIC_CHECK_PATHS_WINDOWS],
-[
-  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
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    AC_MSG_CHECKING([cygwin release])
-    CYGWIN_VERSION=`$UNAME -r`
-    AC_MSG_RESULT([$CYGWIN_VERSION])
-    WINDOWS_ENV_VENDOR='cygwin'
-    WINDOWS_ENV_VERSION="$CYGWIN_VERSION"
-
-    CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $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_VERSION, but at least cygwin 1.7 is required. Please upgrade.])
-      AC_MSG_ERROR([Cannot continue])
-    fi
-    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_VERSION=`$UNAME -r`
-    AC_MSG_RESULT([$MSYS_VERSION])
-
-    WINDOWS_ENV_VENDOR='msys'
-    WINDOWS_ENV_VERSION="$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 ".*"`
-    BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(MSYS_ROOT_PATH)
-    AC_MSG_RESULT([$MSYS_ROOT_PATH])
-    WINDOWS_ENV_ROOT_PATH="$MSYS_ROOT_PATH"
-  else
-    AC_MSG_ERROR([Unknown Windows environment. Neither cygwin nor msys 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 (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
-    AC_MSG_RESULT([unknown])
-    AC_MSG_WARN([It seems that your find utility is non-standard.])
-  fi
-])
-
-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
-    AC_MSG_CHECKING([if fixpath can be created])
-    FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
-    FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
-    if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
-      FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
-      FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
-      # Important to keep the .exe suffix on Cygwin for Hotspot makefiles
-      FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
-    elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
-      FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
-      FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
-
-      # 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="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
-    fi
-    rm -f $OUTPUT_ROOT/fixpath*
-    cd $OUTPUT_ROOT
-    $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
-    cd $CURDIR
-
-    if test ! -x $OUTPUT_ROOT/fixpath.exe; then
-      AC_MSG_RESULT([no])
-      cat $OUTPUT_ROOT/fixpath1.log
-      AC_MSG_ERROR([Could not create $OUTPUT_ROOT/fixpath.exe])
-    fi
-    AC_MSG_RESULT([yes])
-    AC_MSG_CHECKING([if fixpath.exe works])
-    cd $OUTPUT_ROOT
-    $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
-    cd $CURDIR
-    if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
-      AC_MSG_RESULT([no])
-      cat $OUTPUT_ROOT/fixpath2.log
-      AC_MSG_ERROR([fixpath did not work!])
-    fi
-    AC_MSG_RESULT([yes])
-    rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
-  fi
-
-  AC_SUBST(FIXPATH)
-])
diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4
deleted file mode 100644
index ace6f7d..0000000
--- a/common/autoconf/boot-jdk.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-# Execute the check given as argument, and verify the result
-# If the Boot JDK was previously found, do nothing
-# $1 A command line (typically autoconf macro) to execute
-AC_DEFUN([BOOTJDK_DO_CHECK],
-[
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-    $1
-
-    # 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"; 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"; 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
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring])
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`]
-            if test "x$FOUND_VERSION_78" = 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 must be version 7 or 8)])
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-              BASIC_FIXUP_PATH(BOOT_JDK)
-              AC_MSG_CHECKING([for Boot JDK])
-              AC_MSG_RESULT([$BOOT_JDK])
-              AC_MSG_CHECKING([Boot JDK version])
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              AC_MSG_RESULT([$BOOT_JDK_VERSION])
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-])
-
-# Test: Is bootjdk explicitely set by command line arguments?
-AC_DEFUN([BOOTJDK_CHECK_ARGUMENTS],
-[
-  if test "x$with_boot_jdk" != x; then
-    BOOT_JDK=$with_boot_jdk
-    BOOT_JDK_FOUND=maybe
-    AC_MSG_NOTICE([Found potential Boot JDK using configure arguments])
-  fi
-])
-
-# Test: Is bootjdk available from builddeps?
-AC_DEFUN([BOOTJDK_CHECK_BUILDDEPS],
-[
-  BDEPS_CHECK_MODULE(BOOT_JDK, bootjdk, xxx, [BOOT_JDK_FOUND=maybe], [BOOT_JDK_FOUND=no])
-])
-
-# Test: Is $JAVA_HOME set?
-AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME],
-[
-  if test "x$JAVA_HOME" != x; then
-    JAVA_HOME_PROCESSED="$JAVA_HOME"
-    BASIC_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
-      # let us use that as the Boot JDK.
-      BOOT_JDK="$JAVA_HOME_PROCESSED"
-      BOOT_JDK_FOUND=maybe
-      AC_MSG_NOTICE([Found potential Boot JDK using JAVA_HOME])
-    fi
-  fi
-])
-
-# 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],
-[
-  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"
-  fi
-  if test "x$BINARY" != x; then
-    # So there is a java(c) binary, it might be part of a JDK.
-    # Lets find the JDK/JRE directory by following symbolic links.
-    # Linux/GNU systems often have links from /usr/bin/java to
-    # /etc/alternatives/java to the real JDK binary.
-    BASIC_REMOVE_SYMBOLIC_LINKS(BINARY)
-    BOOT_JDK=`dirname "$BINARY"`
-    BOOT_JDK=`cd "$BOOT_JDK/.."; pwd`
-    if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then
-      # Looks like we found ourselves an JDK
-      BOOT_JDK_FOUND=maybe
-      AC_MSG_NOTICE([Found potential Boot JDK using java(c) in PATH])
-    fi
-  fi
-])
-
-# Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
-AC_DEFUN([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME],
-[
-  if test -x /usr/libexec/java_home; then
-    BOOT_JDK=`/usr/libexec/java_home`
-    BOOT_JDK_FOUND=maybe
-    AC_MSG_NOTICE([Found potential Boot JDK using /usr/libexec/java_home])
-  fi
-])
-
-# Look for a jdk in the given path. If there are multiple, try to select the newest.
-# If found, set BOOT_JDK and BOOT_JDK_FOUND.
-# $1 = Path to directory containing jdk installations.
-# $2 = String to append to the found JDK directory to get the proper JDK home
-AC_DEFUN([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY],
-[
-  BOOT_JDK_PREFIX="$1"
-  BOOT_JDK_SUFFIX="$2"
-  ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
-  if test "x$ALL_JDKS_FOUND" != x; then
-    for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
-      BOOTJDK_DO_CHECK([
-        BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
-        if test -d "$BOOT_JDK"; then
-          BOOT_JDK_FOUND=maybe
-          AC_MSG_NOTICE([Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)])
-        fi
-      ])
-    done
-  fi
-])
-
-# Call BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY, but use the given
-# environmental variable as base for where to look.
-# $1 Name of an environmal variable, assumed to point to the Program Files directory.
-AC_DEFUN([BOOTJDK_FIND_BEST_JDK_IN_WINDOWS_VIRTUAL_DIRECTORY],
-[
-  if test "x[$]$1" != x; then
-    VIRTUAL_DIR="[$]$1/Java"
-    BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VIRTUAL_DIR)
-    BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY($VIRTUAL_DIR)
-  fi
-])
-
-# Test: Is there a JDK installed in default, well-known locations?
-AC_DEFUN([BOOTJDK_CHECK_WELL_KNOWN_LOCATIONS],
-[
-  if test "x$OPENJDK_TARGET_OS" = xwindows; then
-    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_WINDOWS_VIRTUAL_DIRECTORY([ProgramW6432])])
-    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_WINDOWS_VIRTUAL_DIRECTORY([PROGRAMW6432])])
-    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_WINDOWS_VIRTUAL_DIRECTORY([PROGRAMFILES])])
-    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_WINDOWS_VIRTUAL_DIRECTORY([ProgramFiles])])
-    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY([/cygdrive/c/Program Files/Java])])
-  elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY([/Library/Java/JavaVirtualMachines],[/Contents/Home])])
-    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY([/System/Library/Java/JavaVirtualMachines],[/Contents/Home])])
-  elif test "x$OPENJDK_TARGET_OS" = xlinux; then
-    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY([/usr/lib/jvm])])
-  fi
-])
-
-# Check that a command-line tool in the Boot JDK is correct
-# $1 = name of variable to assign
-# $2 = name of binary
-AC_DEFUN([BOOTJDK_CHECK_TOOL_IN_BOOTJDK],
-[
-  AC_MSG_CHECKING([for $2 in Boot JDK])
-  $1=$BOOT_JDK/bin/$2
-  if test ! -x [$]$1; then
-    AC_MSG_RESULT(not found)
-    AC_MSG_NOTICE([Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk])
-    AC_MSG_ERROR([Could not find $2 in the Boot JDK])
-  fi
-  AC_MSG_RESULT(ok)
-])
-
-###############################################################################
-#
-# We need a Boot JDK to bootstrap the build.
-#
-
-AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
-[
-  BOOT_JDK_FOUND=no
-  AC_ARG_WITH(boot-jdk, [AS_HELP_STRING([--with-boot-jdk],
-      [path to Boot JDK (used to bootstrap build) @<:@probed@:>@])])
-
-  # We look for the Boot JDK through various means, going from more certain to
-  # more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if
-  # we detected something (if so, the path to the jdk is in BOOT_JDK). But we
-  # must check if this is indeed valid; otherwise we'll continue looking.
-
-  # Test: Is bootjdk explicitely set by command line arguments?
-  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_ARGUMENTS])
-  if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then
-    # Having specified an argument which is incorrect will produce an instant failure;
-    # we should not go on looking
-    AC_MSG_ERROR([The path given by --with-boot-jdk does not contain a valid Boot JDK])
-  fi
-
-  # Test: Is bootjdk available from builddeps?
-  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_BUILDDEPS])
-
-  # Test: Is $JAVA_HOME set?
-  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_HOME])
-
-  # Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
-  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_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])
-
-  # Test: Is there a JDK installed in default, well-known locations?
-  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_WELL_KNOWN_LOCATIONS])
-
-  # If we haven't found anything yet, we've truly lost. Give up.
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    HELP_MSG_MISSING_DEPENDENCY([openjdk])
-    AC_MSG_NOTICE([Could not find a valid Boot JDK. $HELP_MSG])
-    AC_MSG_NOTICE([This might be fixed by explicitely setting --with-boot-jdk])
-    AC_MSG_ERROR([Cannot continue])
-  fi
-
-  # Setup proper paths for what we found
-  BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
-  if test ! -f "$BOOT_RTJAR"; then
-    # On MacOSX it is called classes.jar
-    BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar"
-    if test -f "$BOOT_RTJAR"; then
-      # Remove the ..
-      BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}"
-    fi
-  fi
-  BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
-  BOOT_JDK="$BOOT_JDK"
-  AC_SUBST(BOOT_RTJAR)
-  AC_SUBST(BOOT_TOOLSJAR)
-  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(JAVAH,javah)
-  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAP,javap)
-  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR,jar)
-  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(RMIC,rmic)
-  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(NATIVE2ASCII,native2ascii)
-
-  # Finally, set some other options...
-
-  # When compiling code to be executed by the Boot JDK, force jdk7 compatibility.
-  BOOT_JDK_SOURCETARGET="-source 7 -target 7"
-  AC_SUBST(BOOT_JDK_SOURCETARGET)
-  AC_SUBST(JAVAC_FLAGS)
-
-  # Check if the boot jdk is 32 or 64 bit
-  if "$JAVA" -d64 -version > /dev/null 2>&1; then
-    BOOT_JDK_BITS="64"
-  else
-    BOOT_JDK_BITS="32"
-  fi
-  AC_MSG_CHECKING([if Boot JDK is 32 or 64 bits])
-  AC_MSG_RESULT([$BOOT_JDK_BITS])
-  AC_SUBST(BOOT_JDK_BITS)
-])
-
-AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
-[
-  ##############################################################################
-  #
-  # Specify options for anything that is run with the Boot JDK.
-  #
-  AC_ARG_WITH(boot-jdk-jvmargs, [AS_HELP_STRING([--with-boot-jdk-jvmargs],
-  [specify JVM arguments to be passed to all invocations of the Boot JDK, overriding the default values,
-  e.g --with-boot-jdk-jvmargs="-Xmx8G -enableassertions"])])
-
-  AC_MSG_CHECKING([flags for boot jdk java command] )
-
-  # Disable special log output when a debug build is used as Boot JDK...
-  ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA])
-
-  # Apply user provided options.
-  ADD_JVM_ARG_IF_OK([$with_boot_jdk_jvmargs],boot_jdk_jvmargs,[$JAVA])
-
-  AC_MSG_RESULT([$boot_jdk_jvmargs])
-
-  # For now, general JAVA_FLAGS are the same as the boot jdk jvmargs
-  JAVA_FLAGS=$boot_jdk_jvmargs
-  AC_SUBST(JAVA_FLAGS)
-
-
-  AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
-
-  # Starting amount of heap memory.
-  ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
-
-  # Maximum amount of heap memory.
-  # Maximum stack size.
-  if test "x$BOOT_JDK_BITS" = x32; then
-    JVM_MAX_HEAP=1100M
-    STACK_SIZE=768
-  else
-    # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
-    # pointers are used. Apparently, we need to increase the heap and stack
-    # space for the jvm. More specifically, when running javac to build huge
-    # jdk batch
-    JVM_MAX_HEAP=1600M
-    STACK_SIZE=1536
-  fi
-  ADD_JVM_ARG_IF_OK([-Xmx$JVM_MAX_HEAP],boot_jdk_jvmargs_big,[$JAVA])
-  ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
-  ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs_big,[$JAVA])
-  ADD_JVM_ARG_IF_OK([-XX:MaxPermSize=160m],boot_jdk_jvmargs_big,[$JAVA])
-
-  AC_MSG_RESULT([$boot_jdk_jvmargs_big])
-
-  JAVA_FLAGS_BIG=$boot_jdk_jvmargs_big
-  AC_SUBST(JAVA_FLAGS_BIG)
-
-
-  AC_MSG_CHECKING([flags for boot jdk java command for small workloads])
-
-  # Use serial gc for small short lived tools if possible
-  ADD_JVM_ARG_IF_OK([-XX:+UseSerialGC],boot_jdk_jvmargs_small,[$JAVA])
-  ADD_JVM_ARG_IF_OK([-Xms32M],boot_jdk_jvmargs_small,[$JAVA])
-  ADD_JVM_ARG_IF_OK([-Xmx512M],boot_jdk_jvmargs_small,[$JAVA])
-
-  AC_MSG_RESULT([$boot_jdk_jvmargs_small])
-
-  JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small
-  AC_SUBST(JAVA_FLAGS_SMALL)
-])
diff --git a/common/autoconf/bootcycle-spec.gmk.in b/common/autoconf/bootcycle-spec.gmk.in
deleted file mode 100644
index cecc647..0000000
--- a/common/autoconf/bootcycle-spec.gmk.in
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-# Support for building boot cycle builds
-
-# 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
-ifneq ($(word $(JAVA_EXEC_POS),$(SJAVAC_SERVER_JAVA)),$(word $(JAVA_EXEC_POS),$(JAVA)))
-  $(error Bootcycle builds are not possible if --with-sjavac-server-java is specified)
-endif
-
-
-# Override specific values to do a boot cycle build
-
-# The bootcycle build has a different output directory
-BUILD_OUTPUT:=@BUILD_OUTPUT@/bootcycle-build
-
-# Use a different Boot JDK
-OLD_BOOT_JDK:=$(BOOT_JDK)
-BOOT_JDK:=@BUILD_OUTPUT@/images/j2sdk-image
-BOOT_RTJAR:=@BUILD_OUTPUT@/images/j2sdk-image/jre/lib/rt.jar
-
-SJAVAC_SERVER_JAVA:=$(subst $(OLD_BOOT_JDK),$(BOOT_JDK),$(SJAVAC_SERVER_JAVA))
diff --git a/common/autoconf/build-aux/autoconf-config.guess b/common/autoconf/build-aux/autoconf-config.guess
deleted file mode 100644
index 15ee438..0000000
--- a/common/autoconf/build-aux/autoconf-config.guess
+++ /dev/null
@@ -1,1555 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2012, 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.
-#
-
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-02-10'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
-	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/common/autoconf/build-aux/autoconf-config.sub b/common/autoconf/build-aux/autoconf-config.sub
deleted file mode 100644
index 1aab2b3..0000000
--- a/common/autoconf/build-aux/autoconf-config.sub
+++ /dev/null
@@ -1,1684 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2012, 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.
-#
-
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2008-01-16'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-        mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/common/autoconf/build-aux/config.guess b/common/autoconf/build-aux/config.guess
deleted file mode 100644
index 355c91e..0000000
--- a/common/autoconf/build-aux/config.guess
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2012, 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 wrapper for the config.guess from autoconf. The latter does not
-# properly detect 64 bit systems on all platforms. Instead of patching the
-# autoconf system (which might easily get lost in a future update), we wrap it
-# and fix the broken property, if needed.
-
-DIR=`dirname $0`
-OUT=`. $DIR/autoconf-config.guess`
-
-# Test and fix solaris on x86_64
-echo $OUT | grep i386-pc-solaris > /dev/null 2> /dev/null
-if test $? = 0; then
-  # isainfo -n returns either i386 or amd64
-  REAL_CPU=`isainfo -n`
-  OUT=$REAL_CPU`echo $OUT | sed -e 's/[^-]*//'`
-fi
-
-# Test and fix solaris on sparcv9
-echo $OUT | grep sparc-sun-solaris > /dev/null 2> /dev/null
-if test $? = 0; then
-  # isainfo -n returns either sparc or sparcv9
-  REAL_CPU=`isainfo -n`
-  OUT=$REAL_CPU`echo $OUT | sed -e 's/[^-]*//'`
-fi
-
-# Test and fix cygwin on x86_64
-echo $OUT | grep 86-pc-cygwin > /dev/null 2> /dev/null
-if test $? != 0; then
-  echo $OUT | grep 86-pc-mingw > /dev/null 2> /dev/null
-fi
-if test $? = 0; then
-  case `echo $PROCESSOR_IDENTIFIER | cut -f1 -d' '` in
-    intel64|Intel64|INTEL64|em64t|EM64T|amd64|AMD64|8664|x86_64)
-      REAL_CPU=x86_64
-      OUT=$REAL_CPU`echo $OUT | sed -e 's/[^-]*//'`
-      ;;
-  esac
-fi
-
-# Test and fix architecture string on AIX
-# On AIX 'config.guess' returns 'powerpc' as architecture but 'powerpc' is
-# implicitely handled as 32-bit architecture in 'platform.m4' so we check
-# for the kernel mode rewrite it to 'powerpc64' if we'Re running in 64-bit mode.
-# The check could also be done with `/usr/sbin/prtconf | grep "Kernel Type" | grep "64-bit"`
-echo $OUT | grep powerpc-ibm-aix > /dev/null 2> /dev/null
-if test $? = 0; then
-  if [ -x /bin/getconf ] ; then
-    KERNEL_BITMODE=`getconf KERNEL_BITMODE`
-    if  [ "$KERNEL_BITMODE" = "32" ]; then
-      KERNEL_BITMODE=""
-    fi
-  fi
-  OUT=powerpc$KERNEL_BITMODE`echo $OUT | sed -e 's/[^-]*//'`
-fi
-
-# Test and fix little endian PowerPC64.
-# TODO: should be handled by autoconf-config.guess. 
-if [ "x$OUT" = x ]; then
-  if [ `uname -m` = ppc64le ]; then
-    if [ `uname -s` = Linux ]; then
-      OUT=powerpc64le-unknown-linux-gnu
-    fi
-  fi
-fi
-
-echo $OUT
diff --git a/common/autoconf/build-aux/config.sub b/common/autoconf/build-aux/config.sub
deleted file mode 100644
index cc958da..0000000
--- a/common/autoconf/build-aux/config.sub
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-#
-# 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
-# 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 wrapper for the config.guess from autoconf. The latter
-# does not know about all of our platforms. Instead of patching the
-# autoconf system (which might easily get lost in a future update), we
-# wrap it and fix the broken property, if needed.
-
-DIR=`dirname $0`
-
-# First, filter out everything that doesn't begin with "aarch64-"
-if ! echo $* | grep '^aarch64-' >/dev/null ; then
-    . $DIR/autoconf-config.sub "$@"
-    # autoconf-config.sub exits, so we never reach here, but just in
-    # case we do:
-    exit
-fi
-
-while test $# -gt 0 ; do
-    case $1 in 
-        -- )   # Stop option processing
-            shift; break ;;
-        aarch64-* )
-            config=`echo $1 | sed 's/^aarch64-/arm-/'`
-            sub_args="$sub_args $config"
-            shift; ;;
-        - )    # Use stdin as input.
-            sub_args="$sub_args $1"
-            shift; break ;;
-        * )
-            sub_args="$sub_args $1"
-            shift; ;;
-    esac
-done
-
-result=`. $DIR/autoconf-config.sub $sub_args "$@"`
-exitcode=$?
-
-result=`echo $result | sed "s/^arm-/aarch64-/"`
-
-echo $result
-exit $exitcode
-
diff --git a/common/autoconf/build-aux/install.sh b/common/autoconf/build-aux/install.sh
deleted file mode 100644
index 02d4328..0000000
--- a/common/autoconf/build-aux/install.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh 
-echo >&2 "No suitable 'install' command found.'" 
-echo >&2 "If automake is installed, running 'automake -fa'" 
-echo >&2 "(and ignoring the errors) might produce one." 
-exit 1 
diff --git a/common/autoconf/build-aux/pkg.m4 b/common/autoconf/build-aux/pkg.m4
deleted file mode 100644
index 5f4b22b..0000000
--- a/common/autoconf/build-aux/pkg.m4
+++ /dev/null
@@ -1,181 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-
-#
-# Copyright (c) 2012, 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.
-#
-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
diff --git a/common/autoconf/build-performance.m4 b/common/autoconf/build-performance.m4
deleted file mode 100644
index 8fc671d..0000000
--- a/common/autoconf/build-performance.m4
+++ /dev/null
@@ -1,336 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-AC_DEFUN([BPERF_CHECK_CORES],
-[
-  AC_MSG_CHECKING([for number of cores])
-  NUM_CORES=1
-  FOUND_CORES=no
-
-  if test -f /proc/cpuinfo; then
-    # Looks like a Linux (or cygwin) system
-    NUM_CORES=`cat /proc/cpuinfo  | grep -c processor`
-    FOUND_CORES=yes
-  elif test -x /usr/sbin/psrinfo; then
-    # Looks like a Solaris system
-    NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line`
-    FOUND_CORES=yes
-  elif test -x /usr/sbin/system_profiler; then
-    # Looks like a MacOSX system
-    NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk  '{print [$]5}'`
-    FOUND_CORES=yes
-  elif test "x$OPENJDK_BUILD_OS" = xaix ; then
-    NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'`
-    FOUND_CORES=yes
-  elif test -n "$NUMBER_OF_PROCESSORS"; then
-    # On windows, look in the env
-    NUM_CORES=$NUMBER_OF_PROCESSORS
-    FOUND_CORES=yes
-  fi
-
-  if test "x$FOUND_CORES" = xyes; then
-    AC_MSG_RESULT([$NUM_CORES])
-  else
-    AC_MSG_RESULT([could not detect number of cores, defaulting to 1])
-    AC_MSG_WARN([This will disable all parallelism from build!])
-  fi
-])
-
-AC_DEFUN([BPERF_CHECK_MEMORY_SIZE],
-[
-  AC_MSG_CHECKING([for memory size])
-  # Default to 1024 MB
-  MEMORY_SIZE=1024
-  FOUND_MEM=no
-
-  if test -f /proc/meminfo; then
-    # Looks like a Linux (or cygwin) system
-    MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print [$]2}'`
-    MEMORY_SIZE=`expr $MEMORY_SIZE / 1024`
-    FOUND_MEM=yes
-  elif test -x /usr/sbin/prtconf; then
-    # Looks like a Solaris or AIX system
-    MEMORY_SIZE=`/usr/sbin/prtconf | grep "^Memory [[Ss]]ize" | awk '{ print [$]3 }'`
-    FOUND_MEM=yes
-  elif test -x /usr/sbin/system_profiler; then
-    # Looks like a MacOSX system
-    MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk  '{print [$]2}'`
-    MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024`
-    FOUND_MEM=yes
-  elif test "x$OPENJDK_BUILD_OS" = xwindows; then
-    # Windows, but without cygwin
-    MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
-    MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
-    FOUND_MEM=yes
-  fi
-
-  if test "x$FOUND_MEM" = xyes; then
-    AC_MSG_RESULT([$MEMORY_SIZE MB])
-  else
-    AC_MSG_RESULT([could not detect memory size, defaulting to 1024 MB])
-    AC_MSG_WARN([This might seriously impact build performance!])
-  fi
-])
-
-AC_DEFUN_ONCE([BPERF_SETUP_BUILD_CORES],
-[
-  # How many cores do we have on this build system?
-  AC_ARG_WITH(num-cores, [AS_HELP_STRING([--with-num-cores],
-      [number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])])
-  if test "x$with_num_cores" = x; then
-    # The number of cores were not specified, try to probe them.
-    BPERF_CHECK_CORES
-  else
-    NUM_CORES=$with_num_cores
-  fi
-  AC_SUBST(NUM_CORES)
-])
-
-AC_DEFUN_ONCE([BPERF_SETUP_BUILD_MEMORY],
-[
-  # How much memory do we have on this build system?
-  AC_ARG_WITH(memory-size, [AS_HELP_STRING([--with-memory-size],
-      [memory (in MB) available in the build system, e.g. --with-memory-size=1024 @<:@probed@:>@])])
-  if test "x$with_memory_size" = x; then
-    # The memory size was not specified, try to probe it.
-    BPERF_CHECK_MEMORY_SIZE
-  else
-    MEMORY_SIZE=$with_memory_size
-  fi
-  AC_SUBST(MEMORY_SIZE)
-])
-
-AC_DEFUN_ONCE([BPERF_SETUP_BUILD_JOBS],
-[
-  # Provide a decent default number of parallel jobs for make depending on
-  # number of cores, amount of memory and machine architecture.
-  AC_ARG_WITH(jobs, [AS_HELP_STRING([--with-jobs],
-      [number of parallel jobs to let make run @<:@calculated based on cores and memory@:>@])])
-  if test "x$with_jobs" = x; then
-    # Number of jobs was not specified, calculate.
-    AC_MSG_CHECKING([for appropriate number of jobs to run in parallel])
-    # Approximate memory in GB, rounding up a bit.
-    memory_gb=`expr $MEMORY_SIZE / 1100`
-    # Pick the lowest of memory in gb and number of cores.
-    if test "$memory_gb" -lt "$NUM_CORES"; then
-      JOBS="$memory_gb"
-    else
-      JOBS="$NUM_CORES"
-      # On bigger machines, leave some room for other processes to run
-      if test "$JOBS" -gt "4"; then
-        JOBS=`expr $JOBS '*' 90 / 100`
-      fi
-    fi
-    # Cap number of jobs to 16
-    if test "$JOBS" -gt "16"; then
-      JOBS=16
-    fi
-    if test "$JOBS" -eq "0"; then
-      JOBS=1
-    fi
-    AC_MSG_RESULT([$JOBS])
-  else
-    JOBS=$with_jobs
-  fi
-  AC_SUBST(JOBS)
-])
-
-AC_DEFUN([BPERF_SETUP_CCACHE],
-[
-  AC_ARG_ENABLE([ccache],
-      [AS_HELP_STRING([--disable-ccache],
-      [disable using ccache to speed up recompilations @<:@enabled@:>@])],
-      [ENABLE_CCACHE=${enable_ccache}], [ENABLE_CCACHE=yes])
-  if test "x$ENABLE_CCACHE" = xyes; then
-    OLD_PATH="$PATH"
-    if test "x$TOOLS_DIR" != x; then
-      PATH=$TOOLS_DIR:$PATH
-    fi
-    AC_PATH_PROG(CCACHE, ccache)
-    PATH="$OLD_PATH"
-  else
-    AC_MSG_CHECKING([for ccache])
-    AC_MSG_RESULT([explicitly disabled])
-    CCACHE=
-  fi
-  AC_SUBST(CCACHE)
-
-  AC_ARG_WITH([ccache-dir],
-      [AS_HELP_STRING([--with-ccache-dir],
-      [where to store ccache files @<:@~/.ccache@:>@])])
-
-  if test "x$with_ccache_dir" != x; then
-    # When using a non home ccache directory, assume the use is to share ccache files
-    # with other users. Thus change the umask.
-    SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002"
-  fi
-  CCACHE_FOUND=""
-  if test "x$CCACHE" != x; then
-    BPERF_SETUP_CCACHE_USAGE
-  fi
-])
-
-AC_DEFUN([BPERF_SETUP_CCACHE_USAGE],
-[
-  if test "x$CCACHE" != x; then
-    CCACHE_FOUND="true"
-    # Only use ccache if it is 3.1.4 or later, which supports
-    # precompiled headers.
-    AC_MSG_CHECKING([if ccache supports precompiled headers])
-    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null`
-    if test "x$HAS_GOOD_CCACHE" = x; then
-      AC_MSG_RESULT([no, disabling ccache])
-      CCACHE=
-    else
-      AC_MSG_RESULT([yes])
-      AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers])
-      PUSHED_FLAGS="$CXXFLAGS"
-      CXXFLAGS="-fpch-preprocess $CXXFLAGS"
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no])
-      CXXFLAGS="$PUSHED_FLAGS"
-      if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then
-        AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no, disabling ccaching of precompiled headers])
-        CCACHE=
-      fi
-    fi
-  fi
-
-  if test "x$CCACHE" != x; then
-    CCACHE_SLOPPINESS=time_macros
-    CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE"
-    CCACHE_FLAGS=-fpch-preprocess
-
-    if test "x$SET_CCACHE_DIR" != x; then
-      mkdir -p $CCACHE_DIR > /dev/null 2>&1
-      chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1
-    fi
-  fi
-])
-
-AC_DEFUN_ONCE([BPERF_SETUP_PRECOMPILED_HEADERS],
-[
-
-  ###############################################################################
-  #
-  # Can the C/C++ compiler use precompiled headers?
-  #
-  AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers],
-      [disable using precompiled headers when compiling C++ @<:@enabled@:>@])],
-      [ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes])
-
-  USE_PRECOMPILED_HEADER=1
-  if test "x$ENABLE_PRECOMPH" = xno; then
-    USE_PRECOMPILED_HEADER=0
-  fi
-
-  if test "x$ENABLE_PRECOMPH" = xyes; then
-    # Check that the compiler actually supports precomp headers.
-    if test "x$GCC" = xyes; then
-      AC_MSG_CHECKING([that precompiled headers work])
-      echo "int alfa();" > conftest.h
-      $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD
-      if test ! -f conftest.hpp.gch; then
-        USE_PRECOMPILED_HEADER=0
-        AC_MSG_RESULT([no])
-      else
-        AC_MSG_RESULT([yes])
-      fi
-      rm -f conftest.h conftest.hpp.gch
-    fi
-  fi
-
-  AC_SUBST(USE_PRECOMPILED_HEADER)
-])
-
-
-AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC],
-[
-  AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java],
-      [use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])])
-
-  if test "x$with_sjavac_server_java" != x; then
-    SJAVAC_SERVER_JAVA="$with_sjavac_server_java"
-    FOUND_VERSION=`$SJAVAC_SERVER_JAVA -version 2>&1 | grep " version \""`
-    if test "x$FOUND_VERSION" = x; then
-      AC_MSG_ERROR([Could not execute server java: $SJAVAC_SERVER_JAVA])
-    fi
-  else
-    SJAVAC_SERVER_JAVA=""
-    # Hotspot specific options.
-    ADD_JVM_ARG_IF_OK([-verbosegc],SJAVAC_SERVER_JAVA,[$JAVA])
-    # JRockit specific options.
-    ADD_JVM_ARG_IF_OK([-Xverbose:gc],SJAVAC_SERVER_JAVA,[$JAVA])
-    SJAVAC_SERVER_JAVA="$JAVA $SJAVAC_SERVER_JAVA"
-  fi
-  AC_SUBST(SJAVAC_SERVER_JAVA)
-
-  if test "$MEMORY_SIZE" -gt "2500"; then
-    ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
-    if test "$JVM_ARG_OK" = true; then
-      JVM_64BIT=true
-      JVM_ARG_OK=false
-    fi
-  fi
-
-  if test "$JVM_64BIT" = true; then
-    if test "$MEMORY_SIZE" -gt "17000"; then
-      ADD_JVM_ARG_IF_OK([-Xms10G -Xmx10G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
-    fi
-    if test "$MEMORY_SIZE" -gt "10000" && test "$JVM_ARG_OK" = false; then
-      ADD_JVM_ARG_IF_OK([-Xms6G -Xmx6G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
-    fi
-    if test "$MEMORY_SIZE" -gt "5000" && test "$JVM_ARG_OK" = false; then
-      ADD_JVM_ARG_IF_OK([-Xms1G -Xmx3G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
-    fi
-    if test "$MEMORY_SIZE" -gt "3800" && test "$JVM_ARG_OK" = false; then
-      ADD_JVM_ARG_IF_OK([-Xms1G -Xmx2500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
-    fi
-  fi
-  if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then
-    ADD_JVM_ARG_IF_OK([-Xms1000M -Xmx1500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
-  fi
-  if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then
-    ADD_JVM_ARG_IF_OK([-Xms400M -Xmx1100M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
-  fi
-  if test "$JVM_ARG_OK" = false; then
-    ADD_JVM_ARG_IF_OK([-Xms256M -Xmx512M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
-  fi
-
-  AC_MSG_CHECKING([whether to use sjavac])
-  AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac],
-      [use sjavac to do fast incremental compiles @<:@disabled@:>@])],
-      [ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC='no'])
-  AC_MSG_RESULT([$ENABLE_SJAVAC])
-  AC_SUBST(ENABLE_SJAVAC)
-
-  if test "x$ENABLE_SJAVAC" = xyes; then
-    SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers"
-  else
-    SJAVAC_SERVER_DIR=
-  fi
-  AC_SUBST(SJAVAC_SERVER_DIR)
-])
diff --git a/common/autoconf/builddeps.conf.example b/common/autoconf/builddeps.conf.example
deleted file mode 100644
index f73bcb1..0000000
--- a/common/autoconf/builddeps.conf.example
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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 configuration example using builddeps
-# that are downloaded from an ftp server.
-# This is how you use it:
-
-#configure --with-builddeps-server=ftp://builddeps.server/adir \
-#          --with-builddeps-conf=..../builddeps.conf.example
-#          --with-builddeps-dir=/localdisk/mybuilddeps
-
-# Translate a configuration triplet/quadruplet into something
-# known by this configuration file.
-# If no rewrite was found, then rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
-REWRITE_i686_pc_linux_gnu=i686-unknown-linux-gnu
-REWRITE_i386_pc_solaris2_10=i686-sun-solaris2_10
-
-# The needed cups builddeps are platform independent header files.
-# I.e. they need not be part of the devkit.
-builddep_cups=lib/cups_1_3_9.zip
-builddep_cups_CFLAGS=-I${depdir}
-
-# The devkit is the cross compiler tools and sys-roots
-# for the build platform.
-builddep_devkit=sdk/sdk-${rewritten_build}-20110921.tar.gz
-
-# The freetype dependency is partly platform dependent.
-# It is stored inside the sys-root.
-builddep_freetype2=sdk/sdk-${rewritten_build}-20110921.tar.gz
-builddep_freetype2_CFLAGS=-I${depdir}/${rewritten_target}/sys-root/usr/include/freetype2
-builddep_freetype2_LIBS=-lfreetype
-
-# There are many other build dependencies, but they are implicitly
-# found inside the devkit sys-root.
-
-# The boot jdk runs on the build system and is used to compile and run
-# Java build tools and of course, the bootstrap javac.
-builddep_bootjdk_BUILD_i386_pc_solaris2=java/jdk-7u2-fcs-bin-b13-solaris-i586-17_nov_2011.zip
-builddep_bootjdk_BUILD_x86_64_pc_solaris2=java/jdk-7u2-fcs-bin-b13-solaris-x64-17_nov_2011.zip
-builddep_bootjdk_BUILD_i686_unknown_linux_gnu=java/jdk-7u2-fcs-bin-b13-linux-i586-17_nov_2011.zip
-builddep_bootjdk_BUILD_x86_64_unknown_linux_gnu=java/jdk-7u2-fcs-bin-b13-linux-x64-17_nov_2011.zip
-builddep_bootjdk_BUILD_sparc_solaris2=java/jdk-7u2-fcs-bin-b13-solaris-sparc-17_nov_2011.zip
-builddep_bootjdk_BUILD_sparcv9_solaris2=java/jdk-7u2-fcs-bin-b13-solaris-sparcv9-17_nov_2011.zip
-builddep_bootjdk_BUILD_i386_pc_windows=java/jdk-7u2-fcs-bin-b13-windows-i586-17_nov_2011.zip
-builddep_bootjdk_BUILD_x86_64_pc_windows=java/jdk-7u2-fcs-bin-b13-windows-x64-17_nov_2011.zip
-builddep_bootjdk_ROOT=${depdir}/jdk7_02/jdk1.7.0_02
diff --git a/common/autoconf/builddeps.conf.nfs.example b/common/autoconf/builddeps.conf.nfs.example
deleted file mode 100644
index 1f9e16e..0000000
--- a/common/autoconf/builddeps.conf.nfs.example
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2012, 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 configuration example using an nfs-mount /java
-# it will use the builddeps directly from the nfs mounted directory.
-# This is how you use it:
-
-#configure --with-builddeps-conf=..../builddeps.conf.nfs.example
-
-REWRITE_i686_pc_linux_gnu=i686-unknown-linux-gnu
-REWRITE_i386_pc_solaris2_10=i686-sun-solaris2_10
-
-DEVTOOLS=/java/devtools
-
-builddep_cups=${DEVTOOLS}/linux/cups/include
-builddep_cups_CFLAGS=-I${depdir}
-
-JDK_ROOT=/java/re/jdk/7u4/latest/binaries
-builddep_bootjdk_BUILD_i386_pc_solaris2=${JDK_ROOT}/solaris-i586
-builddep_bootjdk_BUILD_x86_64_pc_solaris2=${JDK_ROOT}/solaris-amd64
-builddep_bootjdk_BUILD_i686_unknown_linux_gnu=${JDK_ROOT}/linux-i586
-builddep_bootjdk_BUILD_x86_64_unknown_linux_gnu=${JDK_ROOT}/linux-amd64
-builddep_bootjdk_ROOT=
diff --git a/common/autoconf/builddeps.m4 b/common/autoconf/builddeps.m4
deleted file mode 100644
index 199b9e7..0000000
--- a/common/autoconf/builddeps.m4
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-AC_DEFUN_ONCE([BDEPS_SCAN_FOR_BUILDDEPS],
-[
-  define(LIST_OF_BUILD_DEPENDENCIES,)
-  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
-    if test "x$with_builddeps_conf" != x; then
-      AC_MSG_CHECKING([for supplied builddeps configuration file])
-      builddepsfile=$with_builddeps_conf
-      if test -s $builddepsfile; then
-        . $builddepsfile
-        AC_MSG_RESULT([loaded!])
-      else
-        AC_MSG_ERROR([The given builddeps conf file $with_builddeps_conf could not be loaded!])
-      fi
-    else
-      AC_MSG_CHECKING([for builddeps.conf files in sources...])
-      builddepsfile=`mktemp`
-      touch $builddepsfile
-      # Put all found confs into a single file.
-      find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile
-      # Source the file to acquire the variables
-      if test -s $builddepsfile; then
-        . $builddepsfile
-        AC_MSG_RESULT([found at least one!])
-      else
-        AC_MSG_ERROR([Could not find any builddeps.conf at all!])
-      fi
-    fi
-    # Create build and target names that use _ instead of "-" and ".".
-    # This is necessary to use them in variable names.
-    build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
-    target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
-    # Extract rewrite information for build and target
-    eval rewritten_build=\${REWRITE_${build_var}}
-    if test "x$rewritten_build" = x; then
-      rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME}
-      echo Build stays the same $rewritten_build
-    else
-      echo Rewriting build for builddeps into $rewritten_build
-    fi
-    eval rewritten_target=\${REWRITE_${target_var}}
-    if test "x$rewritten_target" = x; then
-      rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
-      echo Target stays the same $rewritten_target
-    else
-      echo Rewriting target for builddeps into $rewritten_target
-    fi
-    rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'`
-    rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'`
-  fi
-  AC_CHECK_PROGS(BDEPS_UNZIP, [7z unzip])
-  if test "x$BDEPS_UNZIP" = x7z; then
-    BDEPS_UNZIP="7z x"
-  fi
-
-  AC_CHECK_PROGS(BDEPS_FTP, [wget lftp ftp])
-])
-
-AC_DEFUN([BDEPS_FTPGET],
-[
-  # $1 is the ftp://abuilddeps.server.com/libs/cups.zip
-  # $2 is the local file name for the downloaded file.
-  VALID_TOOL=no
-  if test "x$BDEPS_FTP" = xwget; then
-    VALID_TOOL=yes
-    wget -O $2 $1
-  fi
-  if test "x$BDEPS_FTP" = xlftp; then
-    VALID_TOOL=yes
-    lftp -c "get $1 -o $2"
-  fi
-  if test "x$BDEPS_FTP" = xftp; then
-    VALID_TOOL=yes
-    FTPSERVER=`echo $1 | cut -f 3 -d '/'`
-    FTPPATH=`echo $1 | cut -f 4- -d '/'`
-    FTPUSERPWD=${FTPSERVER%%@*}
-    if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
-      FTPUSER=${userpwd%%:*}
-      FTPPWD=${userpwd#*@}
-      FTPSERVER=${FTPSERVER#*@}
-    else
-      FTPUSER=ftp
-      FTPPWD=ftp
-    fi
-    # the "pass" command does not work on some
-    # ftp clients (read ftp.exe) but if it works,
-    # passive mode is better!
-    ( \
-        echo "user $FTPUSER $FTPPWD"        ; \
-        echo "pass"                         ; \
-        echo "bin"                          ; \
-        echo "get $FTPPATH $2"              ; \
-    ) | ftp -in $FTPSERVER
-  fi
-  if test "x$VALID_TOOL" != xyes; then
-    AC_MSG_ERROR([I do not know how to use the tool: $BDEPS_FTP])
-  fi
-])
-
-AC_DEFUN([BDEPS_CHECK_MODULE],
-[
-  define([LIST_OF_BUILD_DEPENDENCIES],LIST_OF_BUILD_DEPENDENCIES[$2=$3'\n'])
-  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
-    # Source the builddeps file again, to make sure it uses the latest variables!
-    . $builddepsfile
-    # Look for a target and build machine specific resource!
-    eval resource=\${builddep_$2_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a target specific resource
-      eval resource=\${builddep_$2_TARGET_${rewritten_target_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a build specific resource
-      eval resource=\${builddep_$2_BUILD_${rewritten_build_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a generic resource
-      # (The $2 comes from M4 and not the shell, thus no need for eval here.)
-      resource=${builddep_$2}
-    fi
-    if test "x$resource" != x; then
-      AC_MSG_NOTICE([Using builddeps $resource for $2])
-      # If the resource in the builddeps.conf file is an existing directory,
-      # for example /java/linux/cups
-      if test -d ${resource}; then
-        depdir=${resource}
-      else
-        BDEPS_FETCH($2, $resource, $with_builddeps_server, $with_builddeps_dir, depdir)
-      fi
-      # Source the builddeps file again, because in the previous command, the depdir
-      # was updated to point at the current build dependency install directory.
-      . $builddepsfile
-      # Now extract variables from the builddeps.conf files.
-      theroot=${builddep_$2_ROOT}
-      thecflags=${builddep_$2_CFLAGS}
-      thelibs=${builddep_$2_LIBS}
-      if test "x$depdir" = x; then
-        AC_MSG_ERROR([Could not download build dependency $2])
-      fi
-      $1=$depdir
-      if test "x$theroot" != x; then
-        $1="$theroot"
-      fi
-      if test "x$thecflags" != x; then
-        $1_CFLAGS="$thecflags"
-      fi
-      if test "x$thelibs" != x; then
-        $1_LIBS="$thelibs"
-      fi
-      m4_default([$4], [:])
-      m4_ifvaln([$5], [else $5])
-    fi
-    m4_ifvaln([$5], [else $5])
-  fi
-])
-
-AC_DEFUN([BDEPS_FETCH],
-[
-  # $1 is for example mymodule
-  # $2 is for example libs/general/libmymod_1_2_3.zip
-  # $3 is for example ftp://mybuilddeps.myserver.com/builddeps
-  # $4 is for example /localhome/builddeps
-  # $5 is the name of the variable into which we store the depdir, eg MYMOD
-  # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
-  # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
-  filename=`basename $2`
-  filebase=`echo $filename | sed 's/\.[[^\.]]*$//'`
-  filebase=${filename%%.*}
-  extension=${filename#*.}
-  installdir=$4/$filebase
-  if test ! -f $installdir/$filename.unpacked; then
-    AC_MSG_NOTICE([Downloading build dependency $1 from $3/$2 and installing into $installdir])
-    if test ! -d $installdir; then
-      mkdir -p $installdir
-    fi
-    if test ! -d $installdir; then
-      AC_MSG_ERROR([Could not create directory $installdir])
-    fi
-    tmpfile=`mktemp $installdir/$1.XXXXXXXXX`
-    touch $tmpfile
-    if test ! -f $tmpfile; then
-      AC_MSG_ERROR([Could not create files in directory $installdir])
-    fi
-    BDEPS_FTPGET([$3/$2] , [$tmpfile])
-    mv $tmpfile $installdir/$filename
-    if test ! -s $installdir/$filename; then
-      AC_MSG_ERROR([Could not download $3/$2])
-    fi
-    case "$extension" in
-      zip)  echo "Unzipping $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
-        ;;
-      tar.gz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      tgz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      *) AC_MSG_ERROR([Cannot handle build depency archive with extension $extension])
-        ;;
-    esac
-  fi
-  if test -f $installdir/$filename.unpacked; then
-    $5=$installdir
-  fi
-])
-
-AC_DEFUN_ONCE([BDEPS_CONFIGURE_BUILDDEPS],
-[
-  AC_ARG_WITH(builddeps-conf, [AS_HELP_STRING([--with-builddeps-conf],
-      [use this configuration file for the builddeps])])
-
-  AC_ARG_WITH(builddeps-server, [AS_HELP_STRING([--with-builddeps-server],
-      [download and use build dependencies from this server url])])
-
-  AC_ARG_WITH(builddeps-dir, [AS_HELP_STRING([--with-builddeps-dir],
-      [store downloaded build dependencies here @<:@/localhome/builddeps@:>@])],
-      [],
-      [with_builddeps_dir=/localhome/builddeps])
-
-  AC_ARG_WITH(builddeps-group, [AS_HELP_STRING([--with-builddeps-group],
-      [chgrp the downloaded build dependencies to this group])])
-])
diff --git a/common/autoconf/compare.sh.in b/common/autoconf/compare.sh.in
deleted file mode 100644
index eea3039..0000000
--- a/common/autoconf/compare.sh.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2012, 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.
-#
-
-# This script is processed by configure before it's usable. It is run from
-# the root of the build directory.
-
-
-##########################################################################################
-# Substitutions from autoconf
-
-LEGACY_BUILD_DIR=@OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU_LEGACY@
-
-OPENJDK_TARGET_OS="@OPENJDK_TARGET_OS@"
-OPENJDK_TARGET_CPU="@OPENJDK_TARGET_CPU@"
-
-AWK="@AWK@"
-CAT="@CAT@"
-CMP="@CMP@"
-CP="@CP@"
-CUT="@CUT@"
-DIFF="@DIFF@"
-DUMPBIN="@FIXPATH@ @DUMPBIN@"
-EXPR="@EXPR@"
-FILE="@FILE@"
-FIND="@FIND@"
-GREP="@GREP@"
-JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap"
-LDD="@LDD@"
-MKDIR="@MKDIR@"
-NAWK="@NAWK@"
-NM="@GNM@"
-OBJDUMP="@OBJDUMP@"
-OTOOL="@OTOOL@"
-PRINTF="@PRINTF@"
-READELF="@READELF@"
-RM="@RM@"
-SED="@SED@"
-SORT="@SORT@"
-STAT="@STAT@"
-STRIP="@POST_STRIP_CMD@"
-TEE="@TEE@"
-UNIQ="@UNIQ@"
-UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200"
-UNZIP="@UNZIP@"
-
-SRC_ROOT="@SRC_ROOT@"
-
-if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-  PATH="@VS_PATH@"
-fi
-
-# Now locate the main script and run it.
-REAL_COMPARE_SCRIPT="$SRC_ROOT/common/bin/compare.sh"
-if [ ! -e "$REAL_COMPARE_SCRIPT" ]; then
-  echo "Error: Cannot locate compare script, it should have been in $REAL_COMPARE_SCRIPT"
-  exit 1
-fi
-
-. "$REAL_COMPARE_SCRIPT" "$@"
diff --git a/common/autoconf/config.h.in b/common/autoconf/config.h.in
deleted file mode 100644
index 89f4453..0000000
--- a/common/autoconf/config.h.in
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2011, 2012, 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.
- */
-
-#define PACKAGE_NAME "openjdk"
-#define PACKAGE_TARNAME "openjdk"
-#define PACKAGE_VERSION "version-0.1"
-#define PACKAGE_STRING "openjdk version-0.1"
-#define PACKAGE_BUGREPORT "build-infra-dev@openjdk.java.net"
-#define PACKAGE_URL ""
-#define STDC_HEADERS
-#define HAVE_SYS_TYPES_H
-#define HAVE_SYS_STAT_H
-#define HAVE_STDLIB_H
-#define HAVE_STRING_H
-#define HAVE_MEMORY_H
-#define HAVE_STRINGS_H
-#define HAVE_INTTYPES_H
-#define HAVE_STDINT_H
-#define HAVE_UNISTD_H
-#define SIZEOF_INT_P 8
-#define HAVE_CUPS_CUPS_H
-#define HAVE_CUPS_PPD_H
-#define HAVE_LIBJPEG
-#define HAVE_LIBGIF
-#define HAVE_LIBZ
-#define HAVE_LIBM
-#define HAVE_ALTZONE
diff --git a/common/autoconf/configure b/common/autoconf/configure
deleted file mode 100644
index 6bc421c..0000000
--- a/common/autoconf/configure
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2012, 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.
-#
-
-if test "x$BASH_VERSION" = x; then
-  echo This script needs bash to run.
-  echo It is recommended to use the configure script in the source tree root instead.
-  exit 1
-fi
-
-# Force autoconf to use bash. This also means we must disable autoconf re-exec.
-export CONFIG_SHELL=$BASH
-export _as_can_reexec=no
-
-CONFIGURE_COMMAND_LINE="$@"
-conf_script_dir=`dirname $0`
-
-if [ "$CUSTOM_CONFIG_DIR" = "" ]; then
-  conf_custom_script_dir="$conf_script_dir/../../jdk/make/closed/autoconf"
-else
-  conf_custom_script_dir=$CUSTOM_CONFIG_DIR
-fi
-
-###
-### Test that the generated configure is up-to-date
-###
-
-run_autogen_or_fail() {
-  if test "x`which autoconf 2> /dev/null`" = x; then
-    echo "Cannot locate autoconf, unable to correct situation."
-    echo "Please install autoconf and run 'bash autogen.sh' to update the generated files."
-    echo "Error: Cannot continue" 1>&2
-    exit 1
-  else
-    echo "Running autogen.sh to correct the situation"
-    bash $conf_script_dir/autogen.sh
-  fi
-}
-
-check_autoconf_timestamps() {
-  for file in $conf_script_dir/configure.ac $conf_script_dir/*.m4 ; do
-    if test $file -nt $conf_script_dir/generated-configure.sh; then
-      echo "Warning: The configure source files is newer than the generated files."
-      run_autogen_or_fail
-    fi
-  done
-
-  if test -e $conf_custom_script_dir/generated-configure.sh; then
-    # If custom source configure is available, make sure it is up-to-date as well.
-    for file in $conf_script_dir/configure.ac $conf_script_dir/*.m4 $conf_custom_script_dir/*.m4; do
-      if test $file -nt $conf_custom_script_dir/generated-configure.sh; then
-        echo "Warning: The configure source files is newer than the custom generated files."
-        run_autogen_or_fail
-      fi
-    done
-  fi
-}
-
-check_hg_updates() {
-  if test "x`which hg 2> /dev/null`" != x; then
-    conf_updated_autoconf_files=`cd $conf_script_dir && hg status -mard 2> /dev/null | grep autoconf`
-    if test "x$conf_updated_autoconf_files" != x; then
-      echo "Configure source code has been updated, checking time stamps"
-      check_autoconf_timestamps
-    fi
-
-    if test -e $conf_custom_script_dir; then
-      # If custom source configure is available, make sure it is up-to-date as well.
-      conf_custom_updated_autoconf_files=`cd $conf_custom_script_dir && hg status -mard 2> /dev/null | grep autoconf`
-      if test "x$conf_custom_updated_autoconf_files" != x; then
-        echo "Configure custom source code has been updated, checking time stamps"
-        check_autoconf_timestamps
-      fi
-    fi
-  fi
-}
-
-# Check for local changes
-check_hg_updates
-
-if test -e $conf_custom_script_dir/generated-configure.sh; then
-  # Test if open configure is newer than custom configure, if so, custom needs to
-  # be regenerated. This test is required to ensure consistency with custom source.
-  conf_open_configure_timestamp=`grep DATE_WHEN_GENERATED= $conf_script_dir/generated-configure.sh  | cut -d"=" -f 2`
-  conf_custom_configure_timestamp=`grep DATE_WHEN_GENERATED= $conf_custom_script_dir/generated-configure.sh  | cut -d"=" -f 2`
-  if test $conf_open_configure_timestamp -gt $conf_custom_configure_timestamp; then
-    echo "Warning: The generated configure file contains changes not present in the custom generated file."
-    run_autogen_or_fail
-  fi
-fi
-
-# Autoconf calls the configure script recursively sometimes.
-# Don't start logging twice in that case
-if test "x$conf_debug_configure" = xtrue; then
-  conf_debug_configure=recursive
-fi
-###
-### Process command-line arguments
-###
-conf_processed_arguments=()
-conf_openjdk_target=
-
-for conf_option
-do
-  case $conf_option in
-    --openjdk-target=*)
-      conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'`
-      continue ;;
-    --debug-configure)
-      if test "x$conf_debug_configure" != xrecursive; then
-        conf_debug_configure=true
-        export conf_debug_configure
-      fi
-      continue ;;
-    *)
-      conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option") ;;
-  esac
-
-  case $conf_option in
-    -build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*)
-      conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
-    -target | --target | --targe | --targ | --tar | --ta | --t | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-      conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
-    -host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*)
-      conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
-    -help | --help | --hel | --he | -h)
-      conf_print_help=true ;;
-  esac
-done
-
-if test "x$conf_legacy_crosscompile" != "x"; then
-  if test "x$conf_openjdk_target" != "x"; then
-    echo "Error: Specifying --openjdk-target together with autoconf"
-    echo "legacy cross-compilation flags is not supported."
-    echo "You specified: --openjdk-target=$conf_openjdk_target and $conf_legacy_crosscompile."
-    echo "The recommended use is just --openjdk-target."
-    exit 1
-  else
-    echo "Warning: You are using legacy autoconf cross-compilation flags."
-    echo "It is recommended that you use --openjdk-target instead."
-    echo ""
-  fi
-fi
-
-if test "x$conf_openjdk_target" != "x"; then
-  conf_build_platform=`sh $conf_script_dir/build-aux/config.guess`
-  conf_processed_arguments=("--build=$conf_build_platform" "--host=$conf_openjdk_target" "--target=$conf_openjdk_target" "${conf_processed_arguments[@]}")
-fi
-
-# Make configure exit with error on invalid options as default.
-# Can be overridden by --disable-option-checking, since we prepend our argument
-# and later options override earlier.
-conf_processed_arguments=("--enable-option-checking=fatal" "${conf_processed_arguments[@]}")
-
-###
-### Call the configure script
-###
-if test -e $conf_custom_script_dir/generated-configure.sh; then
-  # Custom source configure available; run that instead
-  echo Running custom generated-configure.sh
-  conf_script_to_run=$conf_custom_script_dir/generated-configure.sh
-else
-  echo Running generated-configure.sh
-  conf_script_to_run=$conf_script_dir/generated-configure.sh
-fi
-
-if test "x$conf_debug_configure" != x; then
-  # Turn on shell debug output if requested (initial or recursive)
-  set -x
-fi
-
-if test "x$conf_debug_configure" = xtrue; then
-  # Turn on logging, but don't turn on twice when called recursive
-  conf_debug_logfile=./debug-configure.log
-  (exec 3>&1 ; (. $conf_script_to_run "${conf_processed_arguments[@]}" 2>&1 1>&3 ) | tee -a $conf_debug_logfile 1>&2 ; exec 3>&-) | tee -a $conf_debug_logfile
-else
-  ( . $conf_script_to_run "${conf_processed_arguments[@]}" )
-fi
-
-conf_result_code=$?
-###
-### Post-processing
-###
-
-if test $conf_result_code -eq 0; then
-  if test "x$conf_print_help" = xtrue; then
-    cat <<EOT
-
-Additional (non-autoconf) OpenJDK Options:
-  --openjdk-target=TARGET cross-compile with TARGET as target platform
-                          (i.e. the one you will run the resulting binary on).
-                          Equivalent to --host=TARGET --target=TARGET
-                          --build=<current platform>
-  --debug-configure       Run the configure script with additional debug
-                          logging enabled.
-
-Please be aware that, when cross-compiling, the OpenJDK configure script will
-generally use 'target' where autoconf traditionally uses 'host'.
-EOT
-  fi
-else
-  echo configure exiting with result code $conf_result_code
-fi
-
-exit $conf_result_code
diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac
deleted file mode 100644
index 385d5ee..0000000
--- a/common/autoconf/configure.ac
+++ /dev/null
@@ -1,252 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-###############################################################################
-#
-# Includes and boilerplate
-#
-###############################################################################
-
-
-AC_PREREQ([2.69])
-AC_INIT(OpenJDK, jdk8, build-dev@openjdk.java.net,,http://openjdk.java.net)
-
-AC_CONFIG_AUX_DIR([build-aux])
-m4_include([build-aux/pkg.m4])
-
-# Include these first...
-m4_include([basics.m4])
-m4_include([basics_windows.m4])
-m4_include([builddeps.m4])
-# ... then the rest
-m4_include([boot-jdk.m4])
-m4_include([build-performance.m4])
-m4_include([help.m4])
-m4_include([jdk-options.m4])
-m4_include([libraries.m4])
-m4_include([platform.m4])
-m4_include([source-dirs.m4])
-m4_include([toolchain.m4])
-m4_include([toolchain_windows.m4])
-
-AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK])
-AC_DEFUN_ONCE([CUSTOM_LATE_HOOK])
-AC_DEFUN_ONCE([CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK])
-
-# This line needs to be here, verbatim, after all includes and the dummy hook
-# definitions. It is replaced with custom functionality when building
-# custom sources.
-#CUSTOM_AUTOCONF_INCLUDE
-
-# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=@DATE_WHEN_GENERATED@
-
-###############################################################################
-#
-# Initialization / Boot-strapping
-#
-# The bootstrapping process needs to solve the "chicken or the egg" problem,
-# thus it jumps back and forth, each time gaining something needed later on.
-#
-###############################################################################
-
-# Basic initialization that must happen first of all
-BASIC_INIT
-BASIC_SETUP_FUNDAMENTAL_TOOLS
-
-# Now we can determine OpenJDK build and target platforms. This is required to
-# have early on.
-PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET
-
-# Continue setting up basic stuff. Most remaining code require fundamental tools.
-BASIC_SETUP_PATHS
-BASIC_SETUP_LOGGING
-
-# Check if it's a pure open build or if custom sources are to be used.
-JDKOPT_SETUP_OPEN_OR_CUSTOM
-
-# These are needed to be able to create a configuration name (and thus the output directory)
-JDKOPT_SETUP_JDK_VARIANT
-JDKOPT_SETUP_JVM_INTERPRETER
-JDKOPT_SETUP_JVM_VARIANTS
-JDKOPT_SETUP_DEBUG_LEVEL
-
-# With basic setup done, call the custom early hook.
-CUSTOM_EARLY_HOOK
-
-# To properly create a configuration name, we need to have the OpenJDK target
-# and options (variants and debug level) parsed.
-BASIC_SETUP_OUTPUT_DIR
-
-# Must be done before we can call HELP_MSG_MISSING_DEPENDENCY.
-HELP_SETUP_DEPENDENCY_HELP
-
-# Setup tools that requires more complex handling, or that is not needed by the configure script.
-BASIC_SETUP_COMPLEX_TOOLS
-
-# Check if pkg-config is available.
-PKG_PROG_PKG_CONFIG
-
-# After basic tools have been setup, we can check build os specific details.
-PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION
-
-# Setup builddeps, for automatic downloading of tools we need.
-# This is needed before we can call BDEPS_CHECK_MODULE, which is done in
-# boot-jdk setup, but we need to have basic tools setup first.
-BDEPS_CONFIGURE_BUILDDEPS
-BDEPS_SCAN_FOR_BUILDDEPS
-
-###############################################################################
-#
-# Determine OpenJDK variants, options and version numbers.
-#
-###############################################################################
-
-# We need build & target for this.
-JDKOPT_SETUP_JDK_OPTIONS
-JDKOPT_SETUP_JDK_VERSION_NUMBERS
-
-###############################################################################
-#
-# Setup BootJDK, used to bootstrap the build.
-#
-###############################################################################
-
-BOOTJDK_SETUP_BOOT_JDK
-BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS
-
-###############################################################################
-#
-# Configure the sources to use. We can add or override individual directories.
-#
-###############################################################################
-
-SRCDIRS_SETUP_TOPDIRS
-SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS
-SRCDIRS_SETUP_OUTPUT_DIRS
-
-###############################################################################
-#
-# Setup the toolchain (compilers etc), i.e. the tools that need to be
-# cross-compilation aware.
-#
-###############################################################################
-
-TOOLCHAIN_SETUP_SYSROOT_AND_OUT_OPTIONS
-# Locate the actual tools
-TOOLCHAIN_SETUP_PATHS
-
-# FIXME: Currently we must test this after paths but before flags. Fix!
-
-# And we can test some aspects on the target using configure macros.
-PLATFORM_SETUP_OPENJDK_TARGET_BITS
-PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS
-
-# Configure flags for the tools
-TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_LIBS
-TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION
-TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK
-TOOLCHAIN_SETUP_COMPILER_FLAGS_MISC
-
-# Setup debug symbols (need objcopy from the toolchain for that)
-JDKOPT_SETUP_DEBUG_SYMBOLS
-
-###############################################################################
-#
-# Check dependencies for external and internal libraries.
-#
-###############################################################################
-
-# After we have toolchain, we can compile fixpath. It's needed by the lib checks.
-BASIC_COMPILE_FIXPATH
-
-LIB_SETUP_INIT
-LIB_SETUP_X11
-LIB_SETUP_CUPS
-LIB_SETUP_FREETYPE
-LIB_SETUP_ALSA
-LIB_SETUP_MISC_LIBS
-LIB_SETUP_STATIC_LINK_LIBSTDCPP
-
-
-###############################################################################
-#
-# We need to do some final tweaking, when everything else is done.
-#
-###############################################################################
-
-JDKOPT_SETUP_BUILD_TWEAKS
-JDKOPT_DETECT_INTREE_EC
-
-###############################################################################
-#
-# Configure parts of the build that only affect the build performance,
-# not the result.
-#
-###############################################################################
-
-BPERF_SETUP_BUILD_CORES
-BPERF_SETUP_BUILD_MEMORY
-BPERF_SETUP_BUILD_JOBS
-
-# Setup smart javac (after cores and memory have been setup)
-BPERF_SETUP_SMART_JAVAC
-
-# Can the C/C++ compiler use precompiled headers?
-BPERF_SETUP_PRECOMPILED_HEADERS
-
-# Setup use of ccache, if available
-BPERF_SETUP_CCACHE
-
-###############################################################################
-#
-# And now the finish...
-#
-###############################################################################
-
-# Check for some common pitfalls
-BASIC_TEST_USABILITY_ISSUES
-
-# At the end, call the custom hook. (Dummy macro if no custom sources available)
-CUSTOM_LATE_HOOK
-
-# We're messing a bit with internal autoconf variables to put the config.status
-# in the output directory instead of the current directory.
-CONFIG_STATUS="$OUTPUT_ROOT/config.status"
-
-# Create the actual output files. Now the main work of configure is done.
-AC_OUTPUT
-CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK
-
-# Try to move the config.log file to the output directory.
-if test -e ./config.log; then
-  $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
-fi
-
-# Make the compare script executable
-$CHMOD +x $OUTPUT_ROOT/compare.sh
-
-# Finally output some useful information to the user
-HELP_PRINT_SUMMARY_AND_WARNINGS
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
deleted file mode 100644
index 8d01e48..0000000
--- a/common/autoconf/generated-configure.sh
+++ /dev/null
@@ -1,38053 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenJDK jdk8.
-#
-# Report bugs to <build-dev@openjdk.java.net>.
-#
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: build-dev@openjdk.java.net about your system, including
-$0: any error possibly output before this message. Then
-$0: install a modern shell, or manually run the script
-$0: under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='OpenJDK'
-PACKAGE_TARNAME='openjdk'
-PACKAGE_VERSION='jdk8'
-PACKAGE_STRING='OpenJDK jdk8'
-PACKAGE_BUGREPORT='build-dev@openjdk.java.net'
-PACKAGE_URL='http://openjdk.java.net'
-
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-CCACHE
-USE_PRECOMPILED_HEADER
-SJAVAC_SERVER_DIR
-ENABLE_SJAVAC
-SJAVAC_SERVER_JAVA
-JOBS
-MEMORY_SIZE
-NUM_CORES
-ENABLE_INTREE_EC
-SALIB_NAME
-HOTSPOT_MAKE_ARGS
-LIBCXX
-LLVM_LIBS
-LLVM_LDFLAGS
-LLVM_CFLAGS
-LLVM_CONFIG
-LIBFFI_LIBS
-LIBFFI_CFLAGS
-STATIC_CXX_SETTING
-LIBDL
-LIBM
-LIBZIP_CAN_USE_MMAP
-USE_EXTERNAL_LIBZ
-USE_EXTERNAL_LIBGIF
-USE_EXTERNAL_LIBJPEG
-ALSA_LIBS
-ALSA_CFLAGS
-FREETYPE_BUNDLE_LIB_PATH
-FREETYPE_LIBS
-FREETYPE_CFLAGS
-CUPS_CFLAGS
-OPENWIN_HOME
-X_EXTRA_LIBS
-X_LIBS
-X_PRE_LIBS
-X_CFLAGS
-XMKMF
-FIXPATH
-CXXFLAGS_DEBUG_SYMBOLS
-CFLAGS_DEBUG_SYMBOLS
-ZIP_DEBUGINFO_FILES
-ENABLE_DEBUG_SYMBOLS
-USING_BROKEN_SUSE_LD
-COMPILER_SUPPORTS_TARGET_BITS_FLAG
-ZERO_ARCHFLAG
-LDFLAGS_CXX_JDK
-LDFLAGS_JDKEXE_SUFFIX
-LDFLAGS_JDKLIB_SUFFIX
-LDFLAGS_JDKEXE
-LDFLAGS_JDKLIB
-CXXFLAGS_JDKEXE
-CXXFLAGS_JDKLIB
-CFLAGS_JDKEXE
-CFLAGS_JDKLIB
-MACOSX_VERSION_MIN
-PACKAGE_PATH
-NO_LIFETIME_DSE_CFLAG
-NO_DELETE_NULL_POINTER_CHECKS_CFLAG
-CXXSTD_CXXFLAG
-LEGACY_EXTRA_LDFLAGS
-LEGACY_EXTRA_CXXFLAGS
-LEGACY_EXTRA_CFLAGS
-CXX_FLAG_DEPS
-C_FLAG_DEPS
-CXX_O_FLAG_NONE
-CXX_O_FLAG_NORM
-CXX_O_FLAG_HI
-CXX_O_FLAG_HIGHEST
-C_O_FLAG_NONE
-C_O_FLAG_NORM
-C_O_FLAG_HI
-C_O_FLAG_HIGHEST
-POST_MCS_CMD
-POST_STRIP_CMD
-SET_EXECUTABLE_ORIGIN
-SET_SHARED_LIBRARY_ORIGIN
-CXX_FLAG_REORDER
-C_FLAG_REORDER
-SET_SHARED_LIBRARY_MAPFILE
-SET_SHARED_LIBRARY_NAME
-SHARED_LIBRARY_FLAGS
-EXE_SUFFIX
-STATIC_LIBRARY_SUFFIX
-SHARED_LIBRARY_SUFFIX
-LIBRARY_PREFIX
-STATIC_LIBRARY
-SHARED_LIBRARY
-OBJ_SUFFIX
-COMPILER_NAME
-JT_HOME
-JTREGEXE
-ac_ct_OBJDUMP
-OBJDUMP
-ac_ct_OBJCOPY
-OBJCOPY
-OTOOL
-MCS
-STRIP
-GNM
-NM
-AS
-CXXCPP
-CPP
-COMPILER_TYPE
-RC_FLAGS
-DUMPBIN
-WINAR
-HOTSPOT_RC
-HOTSPOT_MT
-RC
-MT
-WINLD
-HOTSPOT_LD
-HOTSPOT_CXX
-ARFLAGS
-AR
-LDEXECXX
-LDCXX
-LDEXE
-LD
-ac_ct_OBJC
-OBJCFLAGS
-OBJC
-CXX_VERSION
-CC_VERSION
-ac_ct_CXX
-CXXFLAGS
-CXX
-ac_ct_PROPER_COMPILER_CXX
-PROPER_COMPILER_CXX
-POTENTIAL_CXX
-TOOLS_DIR_CXX
-COMPILER_TARGET_BITS_FLAG
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-ac_ct_PROPER_COMPILER_CC
-PROPER_COMPILER_CC
-POTENTIAL_CC
-TOOLS_DIR_CC
-SDKPATH
-XCODEBUILD
-SET_DEVELOPER_DIR
-BUILD_LD
-BUILD_CXX
-BUILD_CC
-MSVCR_DLL
-VS_PATH
-VS_LIB
-VS_INCLUDE
-CYGWIN_LINK
-AR_OUT_OPTION
-LD_OUT_OPTION
-EXE_OUT_OPTION
-CC_OUT_OPTION
-BUILD_HOTSPOT
-HOTSPOT_DIST
-BUILD_OUTPUT
-OVERRIDE_SRC_ROOT
-ADD_SRC_ROOT
-JDK_TOPDIR
-NASHORN_TOPDIR
-HOTSPOT_TOPDIR
-JAXWS_TOPDIR
-JAXP_TOPDIR
-CORBA_TOPDIR
-LANGTOOLS_TOPDIR
-JAVA_FLAGS_SMALL
-JAVA_FLAGS_BIG
-JAVA_FLAGS
-BOOT_JDK_BITS
-JAVAC_FLAGS
-BOOT_JDK_SOURCETARGET
-BOOT_JDK
-BOOT_TOOLSJAR
-BOOT_RTJAR
-JAVA_CHECK
-JAVAC_CHECK
-COOKED_BUILD_NUMBER
-COOKED_JDK_UPDATE_VERSION
-JDK_VERSION
-COPYRIGHT_YEAR
-MACOSX_BUNDLE_ID_BASE
-MACOSX_BUNDLE_NAME_BASE
-COMPANY_NAME
-JDK_RC_PLATFORM_NAME
-PRODUCT_SUFFIX
-PRODUCT_NAME
-LAUNCHER_NAME
-MILESTONE
-JDK_BUILD_NUMBER
-JDK_UPDATE_VERSION
-JDK_MICRO_VERSION
-JDK_MINOR_VERSION
-JDK_MAJOR_VERSION
-USER_RELEASE_SUFFIX
-COMPRESS_JARS
-UNLIMITED_CRYPTO
-CACERTS_FILE
-TEST_IN_BUILD
-BUILD_HEADLESS
-SUPPORT_HEADFUL
-SUPPORT_HEADLESS
-BDEPS_FTP
-BDEPS_UNZIP
-OS_VERSION_MICRO
-OS_VERSION_MINOR
-OS_VERSION_MAJOR
-PKG_CONFIG
-CODESIGN
-XATTR
-DSYMUTIL
-IS_GNU_TIME
-TIME
-STAT
-HG
-READELF
-LDD
-ZIP
-UNZIP
-FIND_DELETE
-MAKE
-CHECK_TOOLSDIR_MAKE
-CHECK_TOOLSDIR_GMAKE
-CHECK_MAKE
-CHECK_GMAKE
-PKGHANDLER
-OUTPUT_ROOT
-CONF_NAME
-SPEC
-BUILD_VARIANT_RELEASE
-DEBUG_CLASSFILES
-FASTDEBUG
-VARIANT
-DEBUG_LEVEL
-MACOSX_UNIVERSAL
-INCLUDE_SA
-JVM_VARIANT_CORE
-JVM_VARIANT_ZEROSHARK
-JVM_VARIANT_ZERO
-JVM_VARIANT_KERNEL
-JVM_VARIANT_MINIMAL1
-JVM_VARIANT_CLIENT
-JVM_VARIANT_SERVER
-JVM_VARIANTS
-JVM_INTERPRETER
-JDK_VARIANT
-SET_OPENJDK
-BUILD_LOG_WRAPPER
-BUILD_LOG_PREVIOUS
-BUILD_LOG
-SYS_ROOT
-PATH_SEP
-SRC_ROOT
-ZERO_ARCHDEF
-DEFINE_CROSS_COMPILE_ARCH
-LP64
-OPENJDK_TARGET_OS_EXPORT_DIR
-OPENJDK_TARGET_OS_API_DIR
-OPENJDK_TARGET_CPU_JLI_CFLAGS
-OPENJDK_TARGET_CPU_OSARCH
-OPENJDK_TARGET_CPU_ISADIR
-OPENJDK_TARGET_CPU_LIBDIR
-OPENJDK_TARGET_CPU_LEGACY_LIB
-OPENJDK_TARGET_CPU_LEGACY
-REQUIRED_OS_VERSION
-REQUIRED_OS_NAME
-COMPILE_TYPE
-OPENJDK_TARGET_CPU_ENDIAN
-OPENJDK_TARGET_CPU_BITS
-OPENJDK_TARGET_CPU_ARCH
-OPENJDK_TARGET_CPU
-OPENJDK_TARGET_OS_API
-OPENJDK_TARGET_OS
-OPENJDK_BUILD_CPU_ENDIAN
-OPENJDK_BUILD_CPU_BITS
-OPENJDK_BUILD_CPU_ARCH
-OPENJDK_BUILD_CPU
-OPENJDK_BUILD_OS_API
-OPENJDK_BUILD_OS
-OPENJDK_BUILD_AUTOCONF_NAME
-OPENJDK_TARGET_AUTOCONF_NAME
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-SETFILE
-DF
-READLINK
-CYGPATH
-NAWK
-SED
-FGREP
-EGREP
-GREP
-AWK
-XARGS
-WHICH
-WC
-UNIQ
-UNAME
-TR
-TOUCH
-TEE
-TAR
-TAIL
-SORT
-SH
-RM
-PRINTF
-MV
-MKTEMP
-MKDIR
-LS
-LN
-HEAD
-FIND
-FILE
-EXPR
-ECHO
-DIRNAME
-DIFF
-DATE
-CUT
-CPIO
-CP
-COMM
-CMP
-CHMOD
-CAT
-BASH
-BASENAME
-DATE_WHEN_CONFIGURED
-CONFIGURE_COMMAND_LINE
-CUSTOM_MAKE_DIR
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-with_custom_make_dir
-with_target_bits
-with_sys_root
-with_tools_dir
-with_xcode_path
-with_devkit
-enable_openjdk_only
-with_jdk_variant
-with_jvm_interpreter
-with_jvm_variants
-enable_debug
-with_debug_level
-with_conf_name
-with_builddeps_conf
-with_builddeps_server
-with_builddeps_dir
-with_builddeps_group
-enable_headful
-enable_hotspot_test_in_build
-with_cacerts_file
-enable_unlimited_crypto
-with_milestone
-with_update_version
-with_user_release_suffix
-with_build_number
-with_copyright_year
-with_boot_jdk
-with_boot_jdk_jvmargs
-with_add_source_root
-with_override_source_root
-with_adds_and_overrides
-with_override_langtools
-with_override_corba
-with_override_jaxp
-with_override_jaxws
-with_override_hotspot
-with_override_nashorn
-with_override_jdk
-with_import_hotspot
-with_msvcr_dll
-with_dxsdk
-with_dxsdk_lib
-with_dxsdk_include
-with_jtreg
-with_extra_cflags
-with_extra_cxxflags
-with_extra_ldflags
-enable_debug_symbols
-enable_zip_debug_info
-enable_macosx_runtime_support
-with_x
-with_cups
-with_cups_include
-with_freetype
-with_freetype_include
-with_freetype_lib
-enable_freetype_bundling
-with_alsa
-with_alsa_include
-with_alsa_lib
-with_giflib
-with_zlib
-with_stdc__lib
-with_num_cores
-with_memory_size
-with_jobs
-with_sjavac_server_java
-enable_sjavac
-enable_precompiled_headers
-enable_ccache
-with_ccache_dir
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-PKG_CONFIG
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CXX
-CXXFLAGS
-CCC
-OBJC
-OBJCFLAGS
-CPP
-CXXCPP
-XMKMF
-FREETYPE_CFLAGS
-FREETYPE_LIBS
-ALSA_CFLAGS
-ALSA_LIBS
-LIBFFI_CFLAGS
-LIBFFI_LIBS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures OpenJDK jdk8 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/openjdk]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-X features:
-  --x-includes=DIR    X include files are in DIR
-  --x-libraries=DIR   X library files are in DIR
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenJDK jdk8:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-openjdk-only   suppress building custom source even if present
-                          [disabled]
-  --enable-debug          set the debug level to fastdebug (shorthand for
-                          --with-debug-level=fastdebug) [disabled]
-  --disable-headful       disable building headful support (graphical UI
-                          support) [enabled]
-  --enable-hotspot-test-in-build
-                          run the Queens test after Hotspot build [disabled]
-  --enable-unlimited-crypto
-                          Enable unlimited crypto policy [disabled]
-  --disable-debug-symbols disable generation of debug symbols [enabled]
-  --disable-zip-debug-info
-                          disable zipping of debug-info files [enabled]
-  --enable-macosx-runtime-support
-                          Deprecated. Option is kept for backwards
-                          compatibility and is ignored
-  --disable-freetype-bundling
-                          disable bundling of the freetype library with the
-                          build result [enabled on Windows or when using
-                          --with-freetype, disabled otherwise]
-  --enable-sjavac         use sjavac to do fast incremental compiles
-                          [disabled]
-  --disable-precompiled-headers
-                          disable using precompiled headers when compiling C++
-                          [enabled]
-  --disable-ccache        disable using ccache to speed up recompilations
-                          [enabled]
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-custom-make-dir  use this directory for custom build/make files
-  --with-target-bits      build 32-bit or 64-bit binaries (for platforms that
-                          support it), e.g. --with-target-bits=32 [guessed]
-  --with-sys-root         pass this sys-root to the compilers and tools (for
-                          cross-compiling)
-  --with-tools-dir        search this directory for compilers and tools (for
-                          cross-compiling)
-  --with-xcode-path       explicit path to Xcode 4 (generally for building on
-                          10.9 and later)
-  --with-devkit           use this directory as base for tools-dir and
-                          sys-root (for cross-compiling)
-  --with-jdk-variant      JDK variant to build (normal) [normal]
-  --with-jvm-interpreter  JVM interpreter to build (template, cpp) [template]
-  --with-jvm-variants     JVM variants (separated by commas) to build (server,
-                          client, minimal1, kernel, zero, zeroshark, core)
-                          [server]
-  --with-debug-level      set the debug level (release, fastdebug, slowdebug)
-                          [release]
-  --with-conf-name        use this as the name of the configuration [generated
-                          from important configuration options]
-  --with-builddeps-conf   use this configuration file for the builddeps
-  --with-builddeps-server download and use build dependencies from this server
-                          url
-  --with-builddeps-dir    store downloaded build dependencies here
-                          [/localhome/builddeps]
-  --with-builddeps-group  chgrp the downloaded build dependencies to this
-                          group
-  --with-cacerts-file     specify alternative cacerts file
-  --with-milestone        Set milestone value for build [internal]
-  --with-update-version   Set update version value for build [b00]
-  --with-user-release-suffix
-                          Add a custom string to the version string if build
-                          number isn't set.[username_builddateb00]
-  --with-build-number     Set build number value for build [b00]
-  --with-copyright-year   Set copyright year value for build [current year]
-  --with-boot-jdk         path to Boot JDK (used to bootstrap build) [probed]
-  --with-boot-jdk-jvmargs specify JVM arguments to be passed to all
-                          invocations of the Boot JDK, overriding the default
-                          values, e.g --with-boot-jdk-jvmargs="-Xmx8G
-                          -enableassertions"
-  --with-add-source-root  for each and every source directory, look in this
-                          additional source root for the same directory; if it
-                          exists and have files in it, include it in the build
-  --with-override-source-root
-                          for each and every source directory, look in this
-                          override source root for the same directory; if it
-                          exists, use that directory instead and ignore the
-                          directory in the original source root
-  --with-adds-and-overrides
-                          use the subdirs 'adds' and 'overrides' in the
-                          specified directory as add-source-root and
-                          override-source-root
-  --with-override-langtools
-                          use this langtools dir for the build
-  --with-override-corba   use this corba dir for the build
-  --with-override-jaxp    use this jaxp dir for the build
-  --with-override-jaxws   use this jaxws dir for the build
-  --with-override-hotspot use this hotspot dir for the build
-  --with-override-nashorn use this nashorn dir for the build
-  --with-override-jdk     use this jdk dir for the build
-  --with-import-hotspot   import hotspot binaries from this jdk image or
-                          hotspot build dist dir instead of building from
-                          source
-  --with-msvcr-dll        copy this msvcr100.dll into the built JDK (Windows
-                          only) [probed]
-  --with-dxsdk            Deprecated. Option is kept for backwards
-                          compatibility and is ignored
-  --with-dxsdk-lib        Deprecated. Option is kept for backwards
-                          compatibility and is ignored
-  --with-dxsdk-include    Deprecated. Option is kept for backwards
-                          compatibility and is ignored
-  --with-jtreg            Regression Test Harness [probed]
-  --with-extra-cflags     extra flags to be used when compiling jdk c-files
-  --with-extra-cxxflags   extra flags to be used when compiling jdk c++-files
-  --with-extra-ldflags    extra flags to be used when linking jdk
-  --with-x                use the X Window System
-  --with-cups             specify prefix directory for the cups package
-                          (expecting the headers under PATH/include)
-  --with-cups-include     specify directory for the cups include files
-  --with-freetype         specify prefix directory for the freetype package
-                          (expecting the libraries under PATH/lib and the
-                          headers under PATH/include)
-  --with-freetype-include specify directory for the freetype include files
-  --with-freetype-lib     specify directory for the freetype library
-  --with-alsa             specify prefix directory for the alsa package
-                          (expecting the libraries under PATH/lib and the
-                          headers under PATH/include)
-  --with-alsa-include     specify directory for the alsa include files
-  --with-alsa-lib         specify directory for the alsa library
-  --with-giflib           use giflib from build system or OpenJDK source
-                          (system, bundled) [bundled]
-  --with-zlib             use zlib from build system or OpenJDK source
-                          (system, bundled) [bundled]
-  --with-stdc++lib=<static>,<dynamic>,<default>
-                          force linking of the C++ runtime on Linux to either
-                          static or dynamic, default is static with dynamic as
-                          fallback
-  --with-num-cores        number of cores in the build system, e.g.
-                          --with-num-cores=8 [probed]
-  --with-memory-size      memory (in MB) available in the build system, e.g.
-                          --with-memory-size=1024 [probed]
-  --with-jobs             number of parallel jobs to let make run [calculated
-                          based on cores and memory]
-  --with-sjavac-server-java
-                          use this java binary for running the sjavac
-                          background server [Boot JDK java]
-  --with-ccache-dir       where to store ccache files [~/.ccache]
-
-Some influential environment variables:
-  PKG_CONFIG  path to pkg-config utility
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  OBJC        Objective C compiler command
-  OBJCFLAGS   Objective C compiler flags
-  CPP         C preprocessor
-  CXXCPP      C++ preprocessor
-  XMKMF       Path to xmkmf, Makefile generator for X Window System
-  FREETYPE_CFLAGS
-              C compiler flags for FREETYPE, overriding pkg-config
-  FREETYPE_LIBS
-              linker flags for FREETYPE, overriding pkg-config
-  ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
-  ALSA_LIBS   linker flags for ALSA, overriding pkg-config
-  LIBFFI_CFLAGS
-              C compiler flags for LIBFFI, overriding pkg-config
-  LIBFFI_LIBS linker flags for LIBFFI, overriding pkg-config
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <build-dev@openjdk.java.net>.
-OpenJDK home page: <http://openjdk.java.net>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-OpenJDK configure jdk8
-generated by GNU Autoconf 2.69
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_compile
-
-# ac_fn_objc_try_compile LINENO
-# -----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_objc_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_objc_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_objc_try_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_cpp
-
-# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_cxx_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ----------------------------------------- ##
-## Report this to build-dev@openjdk.java.net ##
-## ----------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_cxx_check_header_mongrel
-
-# ac_fn_cxx_try_run LINENO
-# ------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_cxx_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_run
-
-# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_cxx_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_cxx_check_header_compile
-
-# ac_fn_cxx_compute_int LINENO EXPR VAR INCLUDES
-# ----------------------------------------------
-# Tries to find the compile-time value of EXPR in a program that includes
-# INCLUDES, setting VAR accordingly. Returns whether the value could be
-# computed
-ac_fn_cxx_compute_int ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if test "$cross_compiling" = yes; then
-    # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid; break
-else
-  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_lo=$ac_mid; break
-else
-  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid
-else
-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
-  else
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (($2) < 0)
-    {
-      long int i = longval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
-  ac_retval=1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
-
-  fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_compute_int
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
-
-# ac_fn_cxx_check_func LINENO FUNC VAR
-# ------------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_cxx_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_cxx_check_func
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by OpenJDK $as_me jdk8, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_aux_dir=
-for ac_dir in build-aux "$srcdir"/build-aux; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-
-#
-# Copyright (c) 2012, 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.
-#
-
-#
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-# PKG_CHECK_MODULES
-
-
-# Include these first...
-#
-# Copyright (c) 2011, 2015, 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.
-#
-
-# Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
-# If so, then append $1 to $2 \
-# Also set JVM_ARG_OK to true/false depending on outcome.
-
-
-# Appends a string to a path variable, only adding the : when needed.
-
-
-# This will make sure the given variable points to a full and proper
-# path. This means:
-# 1) There will be no spaces in the path. On posix platforms,
-#    spaces in the path will result in an error. On Windows,
-#    the path will be rewritten using short-style to be space-free.
-# 2) The path will be absolute, and it will be in unix-style (on
-#     cygwin).
-# $1: The name of the variable to fix
-
-
-# This will make sure the given variable points to a executable
-# with a full and proper path. This means:
-# 1) There will be no spaces in the path. On posix platforms,
-#    spaces in the path will result in an error. On Windows,
-#    the path will be rewritten using short-style to be space-free.
-# 2) The path will be absolute, and it will be in unix-style (on
-#     cygwin).
-# Any arguments given to the executable is preserved.
-# If the input variable does not have a directory specification, then
-# it need to be in the PATH.
-# $1: The name of the variable to fix
-
-
-
-
-# Register a --with argument but mark it as deprecated
-# $1: The name of the with argument to deprecate, not including --with-
-
-
-# Register a --enable argument but mark it as deprecated
-# $1: The name of the with argument to deprecate, not including --enable-
-# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
-
-
-
-
-# Test that variable $1 denoting a program is not empty. If empty, exit with an error.
-# $1: variable to check
-# $2: executable name to print in warning (optional)
-
-
-# Does AC_PATH_PROG followed by BASIC_CHECK_NONEMPTY.
-# Arguments as AC_PATH_PROG:
-# $1: variable to set
-# $2: executable name to look for
-
-
-# Setup the most fundamental tools that relies on not much else to set up,
-# but is used by much of the early bootstrap code.
-
-
-# Setup basic configuration paths, and platform-specific stuff related to PATHs.
-
-
-
-
-
-
-
-#%%% Simple tools %%%
-
-# Check if we have found a usable version of make
-# $1: the path to a potential make binary (or empty)
-# $2: the description on how we found this
-
-
-# Goes looking for a usable version of GNU make.
-
-
-
-
-
-
-# Check if build directory is on local disk. If not possible to determine,
-# we prefer to claim it's local.
-# Argument 1: directory to test
-# Argument 2: what to do if it is on local disk
-# Argument 3: what to do otherwise (remote disk or failure)
-
-
-# Check that source files have basic read permissions set. This might
-# not be the case in cygwin in certain conditions.
-
-
-
-
-#
-# 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
-# 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.
-#
-
-
-
-
-
-# Helper function which possibly converts a path using DOS-style short mode.
-# If so, the updated path is stored in $new_path.
-# $1: The path to check
-
-
-# Helper function which possibly converts a path using DOS-style short mode.
-# If so, the updated path is stored in $new_path.
-# $1: The path to check
-
-
-# FIXME: The BASIC_FIXUP_*_CYGWIN/MSYS is most likely too convoluted
-# and could probably be heavily simplified. However, all changes in this
-# area tend to need lot of testing in different scenarios, and in lack of
-# proper unit testing, cleaning this up has not been deemed worth the effort
-# at the moment.
-
-
-
-
-
-
-
-
-
-# Setup basic configuration paths, and platform-specific stuff related to PATHs.
-
-
-
-
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-
-
-
-
-
-
-
-
-
-
-# ... then the rest
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-# Execute the check given as argument, and verify the result
-# If the Boot JDK was previously found, do nothing
-# $1 A command line (typically autoconf macro) to execute
-
-
-# Test: Is bootjdk explicitely set by command line arguments?
-
-
-# Test: Is bootjdk available from builddeps?
-
-
-# Test: Is $JAVA_HOME set?
-
-
-# Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
-
-
-# Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
-
-
-# Look for a jdk in the given path. If there are multiple, try to select the newest.
-# If found, set BOOT_JDK and BOOT_JDK_FOUND.
-# $1 = Path to directory containing jdk installations.
-# $2 = String to append to the found JDK directory to get the proper JDK home
-
-
-# Call BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY, but use the given
-# environmental variable as base for where to look.
-# $1 Name of an environmal variable, assumed to point to the Program Files directory.
-
-
-# Test: Is there a JDK installed in default, well-known locations?
-
-
-# Check that a command-line tool in the Boot JDK is correct
-# $1 = name of variable to assign
-# $2 = name of binary
-
-
-###############################################################################
-#
-# We need a Boot JDK to bootstrap the build.
-#
-
-
-
-
-
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-
-
-
-
-cygwin_help() {
-  case $1 in
-    unzip)
-      PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip )"
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-      ;;
-    zip)
-      PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P zip )"
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-      ;;
-    make)
-      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'."
-      ;;
-    freetype)
-      if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-        HELP_MSG="To install freetype, run:
-wget \"http://gnuwin32.sourceforge.net/downlinks/freetype.php\" -O /tmp/freetype-setup.exe
-chmod +x /tmp/freetype-setup.exe
-/tmp/freetype-setup.exe
-Follow GUI prompts, and install to default directory \"C:\Program Files (x86)\GnuWin32\".
-After installation, locate lib/libfreetype.dll.a and make a copy with the name freetype.dll."
-      else
-        HELP_MSG="You need to build a 64-bit version of freetype.
-This is not readily available.
-You can find source code and build instructions on
-http://www.freetype.org/
-If you put the resulting build in \"C:\Program Files\GnuWin32\", it will be found automatically."
-      fi
-      ;;
-  esac
-}
-
-msys_help() {
-  PKGHANDLER_COMMAND=""
-}
-
-apt_help() {
-  case $1 in
-    devkit)
-      PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;;
-    openjdk)
-      PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;;
-    alsa)
-      PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
-    cups)
-      PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
-    freetype)
-      PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
-    pulse)
-      PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
-    x11)
-      PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
-    ccache)
-      PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
-  esac
-}
-
-yum_help() {
-  case $1 in
-    devkit)
-      PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;;
-    openjdk)
-      PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;;
-    alsa)
-      PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
-    cups)
-      PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
-    freetype)
-      PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
-    pulse)
-      PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
-    x11)
-      PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
-    ccache)
-      PKGHANDLER_COMMAND="sudo yum install ccache" ;;
-  esac
-}
-
-port_help() {
-  PKGHANDLER_COMMAND=""
-}
-
-pkgutil_help() {
-  PKGHANDLER_COMMAND=""
-}
-
-pkgadd_help() {
-  PKGHANDLER_COMMAND=""
-}
-
-
-
-#
-# Copyright (c) 2011, 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.
-#
-
-
-
-
-
-
-
-
-
-
-###############################################################################
-#
-# Should we build only OpenJDK even if closed sources are present?
-#
-
-
-
-
-###############################################################################
-#
-# Setup version numbers
-#
-
-
-
-
-
-
-# Support for customization of the build process. Some build files
-# will include counterparts from this location, if they exist. This allows
-# for a degree of customization of the build targets and the rules/recipes
-# to create them
-
-# Check whether --with-custom-make-dir was given.
-if test "${with_custom_make_dir+set}" = set; then :
-  withval=$with_custom_make_dir; CUSTOM_MAKE_DIR=$with_custom_make_dir
-fi
-
-
-
-#
-# Copyright (c) 2011, 2015, 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.
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Copyright (c) 2011, 2015, 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.
-#
-
-# Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD.
-# Converts autoconf style CPU name to OpenJDK style, into
-# VAR_CPU, VAR_CPU_ARCH, VAR_CPU_BITS and VAR_CPU_ENDIAN.
-
-
-# Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD.
-# Converts autoconf style OS name to OpenJDK style, into
-# VAR_OS and VAR_OS_API.
-
-
-# Expects $host_os $host_cpu $build_os and $build_cpu
-# and $with_target_bits to have been setup!
-#
-# Translate the standard triplet(quadruplet) definition
-# of the target/build system into OPENJDK_TARGET_OS, OPENJDK_TARGET_CPU,
-# OPENJDK_BUILD_OS, etc.
-
-
-# Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour
-# accordingly. Must be done after setting up build and target system, but before
-# doing anything else with these values.
-
-
-# Setup the legacy variables, for controlling the old makefiles.
-#
-
-
-
-
-#%%% Build and target systems %%%
-
-
-
-
-# Support macro for PLATFORM_SETUP_OPENJDK_TARGET_BITS.
-# Add -mX to various FLAGS variables.
-
-
-
-
-
-
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-
-
-
-
-
-
-
-#
-# Copyright (c) 2011, 2015, 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.
-#
-
-# Prepare the system so that TOOLCHAIN_CHECK_COMPILER_VERSION can be called.
-# Must have CC_VERSION_NUMBER and CXX_VERSION_NUMBER.
-
-
-# Check if the configured compiler (C and C++) is of a specific version or
-# newer. TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS must have been called before.
-#
-# Arguments:
-#   $1:   The version string to check against the found version
-#   $2:   block to run if the compiler is at least this version (>=)
-#   $3:   block to run if the compiler is older than this version (<)
-
-
-# $1 = compiler to test (CC or CXX)
-# $2 = human readable name of compiler (C or C++)
-
-
-
-
-
-# $1 = compiler to test (CC or CXX)
-# $2 = human readable name of compiler (C or C++)
-# $3 = list of compiler names to search for
-
-
-
-
-
-
-
-
-
-
-
-
-
-# TOOLCHAIN_C_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
-#                                      [RUN-IF-FALSE])
-# ------------------------------------------------------------
-# Check that the C compiler supports an argument
-
-
-# TOOLCHAIN_CXX_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
-#                                        [RUN-IF-FALSE])
-# ------------------------------------------------------------
-# Check that the C++ compiler supports an argument
-
-
-# TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
-#                                    [RUN-IF-FALSE])
-# ------------------------------------------------------------
-# Check that the C and C++ compilers support an argument
-
-
-
-
-# Setup the JTREG paths
-
-
-
-
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-
-
-
-
-
-
-# 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.
-
-
-
-
-
-
-
-
-
-
-
-# This line needs to be here, verbatim, after all includes and the dummy hook
-# definitions. It is replaced with custom functionality when building
-# custom sources.
-#CUSTOM_AUTOCONF_INCLUDE
-
-# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1522743827
-
-###############################################################################
-#
-# Initialization / Boot-strapping
-#
-# The bootstrapping process needs to solve the "chicken or the egg" problem,
-# thus it jumps back and forth, each time gaining something needed later on.
-#
-###############################################################################
-
-# Basic initialization that must happen first of all
-
-  # Save the original command line. This is passed to us by the wrapper configure script.
-
-  DATE_WHEN_CONFIGURED=`LANG=C date`
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Configuration created at $DATE_WHEN_CONFIGURED." >&5
-$as_echo "$as_me: Configuration created at $DATE_WHEN_CONFIGURED." >&6;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: configure script generated at timestamp $DATE_WHEN_GENERATED." >&5
-$as_echo "$as_me: configure script generated at timestamp $DATE_WHEN_GENERATED." >&6;}
-
-
-
-  # 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. Nor are these tools expected to be found in the
-  # devkit from the builddeps server either, since they are
-  # needed to download the devkit.
-
-  # First are all the simple required tools.
-
-  for ac_prog in basename
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BASENAME+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BASENAME in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BASENAME="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-BASENAME=$ac_cv_path_BASENAME
-if test -n "$BASENAME"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASENAME" >&5
-$as_echo "$BASENAME" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$BASENAME" && break
-done
-
-
-  if test "x$BASENAME" = x; then
-    if test "xbasename" = x; then
-      PROG_NAME=basename
-    else
-      PROG_NAME=basename
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in bash
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BASH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BASH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BASH="$BASH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-BASH=$ac_cv_path_BASH
-if test -n "$BASH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5
-$as_echo "$BASH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$BASH" && break
-done
-
-
-  if test "x$BASH" = x; then
-    if test "xbash" = x; then
-      PROG_NAME=bash
-    else
-      PROG_NAME=bash
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in cat
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CAT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CAT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CAT="$CAT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CAT=$ac_cv_path_CAT
-if test -n "$CAT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAT" >&5
-$as_echo "$CAT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$CAT" && break
-done
-
-
-  if test "x$CAT" = x; then
-    if test "xcat" = x; then
-      PROG_NAME=cat
-    else
-      PROG_NAME=cat
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in chmod
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHMOD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CHMOD in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CHMOD=$ac_cv_path_CHMOD
-if test -n "$CHMOD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHMOD" >&5
-$as_echo "$CHMOD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$CHMOD" && break
-done
-
-
-  if test "x$CHMOD" = x; then
-    if test "xchmod" = x; then
-      PROG_NAME=chmod
-    else
-      PROG_NAME=chmod
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in cmp
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CMP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CMP="$CMP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CMP=$ac_cv_path_CMP
-if test -n "$CMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CMP" >&5
-$as_echo "$CMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$CMP" && break
-done
-
-
-  if test "x$CMP" = x; then
-    if test "xcmp" = x; then
-      PROG_NAME=cmp
-    else
-      PROG_NAME=cmp
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in comm
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $COMM in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-COMM=$ac_cv_path_COMM
-if test -n "$COMM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
-$as_echo "$COMM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$COMM" && break
-done
-
-
-  if test "x$COMM" = x; then
-    if test "xcomm" = x; then
-      PROG_NAME=comm
-    else
-      PROG_NAME=comm
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in cp
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CP="$CP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CP=$ac_cv_path_CP
-if test -n "$CP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
-$as_echo "$CP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$CP" && break
-done
-
-
-  if test "x$CP" = x; then
-    if test "xcp" = x; then
-      PROG_NAME=cp
-    else
-      PROG_NAME=cp
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in cpio
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CPIO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CPIO in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CPIO=$ac_cv_path_CPIO
-if test -n "$CPIO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
-$as_echo "$CPIO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$CPIO" && break
-done
-
-
-  if test "x$CPIO" = x; then
-    if test "xcpio" = x; then
-      PROG_NAME=cpio
-    else
-      PROG_NAME=cpio
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in cut
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CUT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CUT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CUT="$CUT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CUT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CUT=$ac_cv_path_CUT
-if test -n "$CUT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUT" >&5
-$as_echo "$CUT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$CUT" && break
-done
-
-
-  if test "x$CUT" = x; then
-    if test "xcut" = x; then
-      PROG_NAME=cut
-    else
-      PROG_NAME=cut
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in date
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DATE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DATE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DATE="$DATE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-DATE=$ac_cv_path_DATE
-if test -n "$DATE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DATE" >&5
-$as_echo "$DATE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$DATE" && break
-done
-
-
-  if test "x$DATE" = x; then
-    if test "xdate" = x; then
-      PROG_NAME=date
-    else
-      PROG_NAME=date
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in gdiff diff
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DIFF+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DIFF in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DIFF="$DIFF" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-DIFF=$ac_cv_path_DIFF
-if test -n "$DIFF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIFF" >&5
-$as_echo "$DIFF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$DIFF" && break
-done
-
-
-  if test "x$DIFF" = x; then
-    if test "xgdiff diff" = x; then
-      PROG_NAME=diff
-    else
-      PROG_NAME=gdiff diff
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in dirname
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DIRNAME+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DIRNAME in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DIRNAME="$DIRNAME" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DIRNAME="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-DIRNAME=$ac_cv_path_DIRNAME
-if test -n "$DIRNAME"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIRNAME" >&5
-$as_echo "$DIRNAME" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$DIRNAME" && break
-done
-
-
-  if test "x$DIRNAME" = x; then
-    if test "xdirname" = x; then
-      PROG_NAME=dirname
-    else
-      PROG_NAME=dirname
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in echo
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ECHO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ECHO in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ECHO="$ECHO" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ECHO="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ECHO=$ac_cv_path_ECHO
-if test -n "$ECHO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ECHO" >&5
-$as_echo "$ECHO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ECHO" && break
-done
-
-
-  if test "x$ECHO" = x; then
-    if test "xecho" = x; then
-      PROG_NAME=echo
-    else
-      PROG_NAME=echo
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in expr
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_EXPR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $EXPR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_EXPR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-EXPR=$ac_cv_path_EXPR
-if test -n "$EXPR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPR" >&5
-$as_echo "$EXPR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$EXPR" && break
-done
-
-
-  if test "x$EXPR" = x; then
-    if test "xexpr" = x; then
-      PROG_NAME=expr
-    else
-      PROG_NAME=expr
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in file
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_FILE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $FILE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_FILE="$FILE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_FILE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-FILE=$ac_cv_path_FILE
-if test -n "$FILE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FILE" >&5
-$as_echo "$FILE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$FILE" && break
-done
-
-
-  if test "x$FILE" = x; then
-    if test "xfile" = x; then
-      PROG_NAME=file
-    else
-      PROG_NAME=file
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in find
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_FIND+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $FIND in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_FIND="$FIND" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-FIND=$ac_cv_path_FIND
-if test -n "$FIND"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIND" >&5
-$as_echo "$FIND" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$FIND" && break
-done
-
-
-  if test "x$FIND" = x; then
-    if test "xfind" = x; then
-      PROG_NAME=find
-    else
-      PROG_NAME=find
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in head
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_HEAD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $HEAD in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_HEAD="$HEAD" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_HEAD="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-HEAD=$ac_cv_path_HEAD
-if test -n "$HEAD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HEAD" >&5
-$as_echo "$HEAD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$HEAD" && break
-done
-
-
-  if test "x$HEAD" = x; then
-    if test "xhead" = x; then
-      PROG_NAME=head
-    else
-      PROG_NAME=head
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in ln
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $LN in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_LN="$LN" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-LN=$ac_cv_path_LN
-if test -n "$LN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5
-$as_echo "$LN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$LN" && break
-done
-
-
-  if test "x$LN" = x; then
-    if test "xln" = x; then
-      PROG_NAME=ln
-    else
-      PROG_NAME=ln
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in ls
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $LS in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_LS="$LS" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LS="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-LS=$ac_cv_path_LS
-if test -n "$LS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LS" >&5
-$as_echo "$LS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$LS" && break
-done
-
-
-  if test "x$LS" = x; then
-    if test "xls" = x; then
-      PROG_NAME=ls
-    else
-      PROG_NAME=ls
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in mkdir
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MKDIR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MKDIR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MKDIR=$ac_cv_path_MKDIR
-if test -n "$MKDIR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR" >&5
-$as_echo "$MKDIR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$MKDIR" && break
-done
-
-
-  if test "x$MKDIR" = x; then
-    if test "xmkdir" = x; then
-      PROG_NAME=mkdir
-    else
-      PROG_NAME=mkdir
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in mktemp
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MKTEMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MKTEMP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MKTEMP="$MKTEMP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MKTEMP=$ac_cv_path_MKTEMP
-if test -n "$MKTEMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKTEMP" >&5
-$as_echo "$MKTEMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$MKTEMP" && break
-done
-
-
-  if test "x$MKTEMP" = x; then
-    if test "xmktemp" = x; then
-      PROG_NAME=mktemp
-    else
-      PROG_NAME=mktemp
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in mv
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MV+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MV in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MV="$MV" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MV=$ac_cv_path_MV
-if test -n "$MV"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5
-$as_echo "$MV" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$MV" && break
-done
-
-
-  if test "x$MV" = x; then
-    if test "xmv" = x; then
-      PROG_NAME=mv
-    else
-      PROG_NAME=mv
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in printf
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PRINTF+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PRINTF in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PRINTF="$PRINTF" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PRINTF="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PRINTF=$ac_cv_path_PRINTF
-if test -n "$PRINTF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRINTF" >&5
-$as_echo "$PRINTF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$PRINTF" && break
-done
-
-
-  if test "x$PRINTF" = x; then
-    if test "xprintf" = x; then
-      PROG_NAME=printf
-    else
-      PROG_NAME=printf
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in rm
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $RM in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_RM="$RM" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-RM=$ac_cv_path_RM
-if test -n "$RM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
-$as_echo "$RM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$RM" && break
-done
-
-
-  if test "x$RM" = x; then
-    if test "xrm" = x; then
-      PROG_NAME=rm
-    else
-      PROG_NAME=rm
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in sh
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $SH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SH="$SH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-SH=$ac_cv_path_SH
-if test -n "$SH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SH" >&5
-$as_echo "$SH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$SH" && break
-done
-
-
-  if test "x$SH" = x; then
-    if test "xsh" = x; then
-      PROG_NAME=sh
-    else
-      PROG_NAME=sh
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in sort
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SORT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $SORT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SORT="$SORT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SORT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-SORT=$ac_cv_path_SORT
-if test -n "$SORT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SORT" >&5
-$as_echo "$SORT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$SORT" && break
-done
-
-
-  if test "x$SORT" = x; then
-    if test "xsort" = x; then
-      PROG_NAME=sort
-    else
-      PROG_NAME=sort
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in tail
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TAIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $TAIL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TAIL="$TAIL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TAIL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-TAIL=$ac_cv_path_TAIL
-if test -n "$TAIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAIL" >&5
-$as_echo "$TAIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$TAIL" && break
-done
-
-
-  if test "x$TAIL" = x; then
-    if test "xtail" = x; then
-      PROG_NAME=tail
-    else
-      PROG_NAME=tail
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in tar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TAR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $TAR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TAR="$TAR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-TAR=$ac_cv_path_TAR
-if test -n "$TAR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
-$as_echo "$TAR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$TAR" && break
-done
-
-
-  if test "x$TAR" = x; then
-    if test "xtar" = x; then
-      PROG_NAME=tar
-    else
-      PROG_NAME=tar
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in tee
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TEE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $TEE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TEE="$TEE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TEE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-TEE=$ac_cv_path_TEE
-if test -n "$TEE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEE" >&5
-$as_echo "$TEE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$TEE" && break
-done
-
-
-  if test "x$TEE" = x; then
-    if test "xtee" = x; then
-      PROG_NAME=tee
-    else
-      PROG_NAME=tee
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in touch
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TOUCH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $TOUCH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TOUCH="$TOUCH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TOUCH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-TOUCH=$ac_cv_path_TOUCH
-if test -n "$TOUCH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOUCH" >&5
-$as_echo "$TOUCH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$TOUCH" && break
-done
-
-
-  if test "x$TOUCH" = x; then
-    if test "xtouch" = x; then
-      PROG_NAME=touch
-    else
-      PROG_NAME=touch
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in tr
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $TR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TR="$TR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-TR=$ac_cv_path_TR
-if test -n "$TR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TR" >&5
-$as_echo "$TR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$TR" && break
-done
-
-
-  if test "x$TR" = x; then
-    if test "xtr" = x; then
-      PROG_NAME=tr
-    else
-      PROG_NAME=tr
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in uname
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_UNAME+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $UNAME in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_UNAME="$UNAME" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_UNAME="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-UNAME=$ac_cv_path_UNAME
-if test -n "$UNAME"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNAME" >&5
-$as_echo "$UNAME" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$UNAME" && break
-done
-
-
-  if test "x$UNAME" = x; then
-    if test "xuname" = x; then
-      PROG_NAME=uname
-    else
-      PROG_NAME=uname
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in uniq
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_UNIQ+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $UNIQ in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_UNIQ="$UNIQ" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_UNIQ="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-UNIQ=$ac_cv_path_UNIQ
-if test -n "$UNIQ"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIQ" >&5
-$as_echo "$UNIQ" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$UNIQ" && break
-done
-
-
-  if test "x$UNIQ" = x; then
-    if test "xuniq" = x; then
-      PROG_NAME=uniq
-    else
-      PROG_NAME=uniq
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in wc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_WC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $WC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_WC="$WC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_WC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-WC=$ac_cv_path_WC
-if test -n "$WC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WC" >&5
-$as_echo "$WC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$WC" && break
-done
-
-
-  if test "x$WC" = x; then
-    if test "xwc" = x; then
-      PROG_NAME=wc
-    else
-      PROG_NAME=wc
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in which
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_WHICH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $WHICH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_WHICH="$WHICH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_WHICH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-WHICH=$ac_cv_path_WHICH
-if test -n "$WHICH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WHICH" >&5
-$as_echo "$WHICH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$WHICH" && break
-done
-
-
-  if test "x$WHICH" = x; then
-    if test "xwhich" = x; then
-      PROG_NAME=which
-    else
-      PROG_NAME=which
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in xargs
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XARGS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XARGS in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XARGS="$XARGS" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XARGS="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-XARGS=$ac_cv_path_XARGS
-if test -n "$XARGS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XARGS" >&5
-$as_echo "$XARGS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$XARGS" && break
-done
-
-
-  if test "x$XARGS" = x; then
-    if test "xxargs" = x; then
-      PROG_NAME=xargs
-    else
-      PROG_NAME=xargs
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  # Then required tools that require some special treatment.
-  for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-
-  if test "x$AWK" = x; then
-    if test "x" = x; then
-      PROG_NAME=awk
-    else
-      PROG_NAME=
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-
-  if test "x$GREP" = x; then
-    if test "x" = x; then
-      PROG_NAME=grep
-    else
-      PROG_NAME=
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-
-  if test "x$EGREP" = x; then
-    if test "x" = x; then
-      PROG_NAME=egrep
-    else
-      PROG_NAME=
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-
-  if test "x$FGREP" = x; then
-    if test "x" = x; then
-      PROG_NAME=fgrep
-    else
-      PROG_NAME=
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-
-  if test "x$SED" = x; then
-    if test "x" = x; then
-      PROG_NAME=sed
-    else
-      PROG_NAME=
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-  for ac_prog in nawk gawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_NAWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $NAWK in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_NAWK="$NAWK" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_NAWK="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-NAWK=$ac_cv_path_NAWK
-if test -n "$NAWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NAWK" >&5
-$as_echo "$NAWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$NAWK" && break
-done
-
-
-  if test "x$NAWK" = x; then
-    if test "x" = x; then
-      PROG_NAME=nawk
-    else
-      PROG_NAME=
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-  # 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
-  # Extract the first word of "cygpath", so it can be a program name with args.
-set dummy cygpath; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CYGPATH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CYGPATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CYGPATH="$CYGPATH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CYGPATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CYGPATH=$ac_cv_path_CYGPATH
-if test -n "$CYGPATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGPATH" >&5
-$as_echo "$CYGPATH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  # Extract the first word of "readlink", so it can be a program name with args.
-set dummy readlink; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_READLINK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $READLINK in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_READLINK="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-READLINK=$ac_cv_path_READLINK
-if test -n "$READLINK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINK" >&5
-$as_echo "$READLINK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  # Extract the first word of "df", so it can be a program name with args.
-set dummy df; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DF+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DF in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DF="$DF" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DF="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-DF=$ac_cv_path_DF
-if test -n "$DF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DF" >&5
-$as_echo "$DF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  # Extract the first word of "SetFile", so it can be a program name with args.
-set dummy SetFile; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SETFILE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $SETFILE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SETFILE="$SETFILE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SETFILE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-SETFILE=$ac_cv_path_SETFILE
-if test -n "$SETFILE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SETFILE" >&5
-$as_echo "$SETFILE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-# Now we can determine OpenJDK build and target platforms. This is required to
-# have early on.
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-  # Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
-  # is confusing; it assumes you are cross-compiling a cross-compiler (!)  and "target" is thus the target of the
-  # product you're building. The target of this build is called "host". Since this is confusing to most people, we
-  # have not adopted that system, but use "target" as the platform we are building for. In some places though we need
-  # to use the configure naming style.
-
-
-
-
-
-  # Copy the autoconf trip/quadruplet verbatim to OPENJDK_TARGET_AUTOCONF_NAME
-  # (from the autoconf "host") and OPENJDK_BUILD_AUTOCONF_NAME
-  # Note that we might later on rewrite e.g. OPENJDK_TARGET_CPU due to reduced build,
-  # but this will not change the value of OPENJDK_TARGET_AUTOCONF_NAME.
-  OPENJDK_TARGET_AUTOCONF_NAME="$host"
-  OPENJDK_BUILD_AUTOCONF_NAME="$build"
-
-
-
-  # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
-
-  case "$build_os" in
-    *linux*)
-      VAR_OS=linux
-      VAR_OS_API=posix
-      VAR_OS_ENV=linux
-      ;;
-    *solaris*)
-      VAR_OS=solaris
-      VAR_OS_API=posix
-      VAR_OS_ENV=solaris
-      ;;
-    *darwin*)
-      VAR_OS=macosx
-      VAR_OS_API=posix
-      VAR_OS_ENV=macosx
-      ;;
-    *bsd*)
-      VAR_OS=bsd
-      VAR_OS_API=posix
-      VAR_OS_ENV=bsd
-      ;;
-    *cygwin*)
-      VAR_OS=windows
-      VAR_OS_API=winapi
-      VAR_OS_ENV=windows.cygwin
-      ;;
-    *mingw*)
-      VAR_OS=windows
-      VAR_OS_API=winapi
-      VAR_OS_ENV=windows.msys
-      ;;
-    *aix*)
-      VAR_OS=aix
-      VAR_OS_API=posix
-      VAR_OS_ENV=aix
-      ;;
-    *)
-      as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5
-      ;;
-  esac
-
-
-  # First argument is the cpu name from the trip/quad
-  case "$build_cpu" in
-    x86_64)
-      VAR_CPU=x86_64
-      VAR_CPU_ARCH=x86
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=little
-      ;;
-    i?86)
-      VAR_CPU=x86
-      VAR_CPU_ARCH=x86
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=little
-      ;;
-    arm*)
-      VAR_CPU=arm
-      VAR_CPU_ARCH=arm
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=little
-      ;;
-    aarch64)
-      VAR_CPU=aarch64
-      VAR_CPU_ARCH=aarch64
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=little
-      ;;
-    powerpc)
-      VAR_CPU=ppc
-      VAR_CPU_ARCH=ppc
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=big
-      ;;
-    powerpc64)
-      VAR_CPU=ppc64
-      VAR_CPU_ARCH=ppc
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=big
-      ;;
-    powerpc64le)
-      VAR_CPU=ppc64
-      VAR_CPU_ARCH=ppc
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=little
-      ;;
-    s390)
-      VAR_CPU=s390
-      VAR_CPU_ARCH=s390
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=big
-      ;;
-    s390x)
-      VAR_CPU=s390x
-      VAR_CPU_ARCH=s390
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=big
-      ;;
-    sparc)
-      VAR_CPU=sparc
-      VAR_CPU_ARCH=sparc
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=big
-      ;;
-    sparcv9|sparc64)
-      VAR_CPU=sparcv9
-      VAR_CPU_ARCH=sparc
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=big
-      ;;
-    *)
-      as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
-      ;;
-  esac
-
-  # ..and setup our own variables. (Do this explicitely to facilitate searching)
-  OPENJDK_BUILD_OS="$VAR_OS"
-  OPENJDK_BUILD_OS_API="$VAR_OS_API"
-  OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV"
-  OPENJDK_BUILD_CPU="$VAR_CPU"
-  OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
-  OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
-  OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build os-cpu" >&5
-$as_echo_n "checking openjdk-build os-cpu... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&5
-$as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; }
-
-  # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
-
-  case "$host_os" in
-    *linux*)
-      VAR_OS=linux
-      VAR_OS_API=posix
-      VAR_OS_ENV=linux
-      ;;
-    *solaris*)
-      VAR_OS=solaris
-      VAR_OS_API=posix
-      VAR_OS_ENV=solaris
-      ;;
-    *darwin*)
-      VAR_OS=macosx
-      VAR_OS_API=posix
-      VAR_OS_ENV=macosx
-      ;;
-    *bsd*)
-      VAR_OS=bsd
-      VAR_OS_API=posix
-      VAR_OS_ENV=bsd
-      ;;
-    *cygwin*)
-      VAR_OS=windows
-      VAR_OS_API=winapi
-      VAR_OS_ENV=windows.cygwin
-      ;;
-    *mingw*)
-      VAR_OS=windows
-      VAR_OS_API=winapi
-      VAR_OS_ENV=windows.msys
-      ;;
-    *aix*)
-      VAR_OS=aix
-      VAR_OS_API=posix
-      VAR_OS_ENV=aix
-      ;;
-    *)
-      as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5
-      ;;
-  esac
-
-
-  # First argument is the cpu name from the trip/quad
-  case "$host_cpu" in
-    x86_64)
-      VAR_CPU=x86_64
-      VAR_CPU_ARCH=x86
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=little
-      ;;
-    i?86)
-      VAR_CPU=x86
-      VAR_CPU_ARCH=x86
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=little
-      ;;
-    arm*)
-      VAR_CPU=arm
-      VAR_CPU_ARCH=arm
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=little
-      ;;
-    aarch64)
-      VAR_CPU=aarch64
-      VAR_CPU_ARCH=aarch64
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=little
-      ;;
-    powerpc)
-      VAR_CPU=ppc
-      VAR_CPU_ARCH=ppc
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=big
-      ;;
-    powerpc64)
-      VAR_CPU=ppc64
-      VAR_CPU_ARCH=ppc
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=big
-      ;;
-    powerpc64le)
-      VAR_CPU=ppc64
-      VAR_CPU_ARCH=ppc
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=little
-      ;;
-    s390)
-      VAR_CPU=s390
-      VAR_CPU_ARCH=s390
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=big
-      ;;
-    s390x)
-      VAR_CPU=s390x
-      VAR_CPU_ARCH=s390
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=big
-      ;;
-    sparc)
-      VAR_CPU=sparc
-      VAR_CPU_ARCH=sparc
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=big
-      ;;
-    sparcv9|sparc64)
-      VAR_CPU=sparcv9
-      VAR_CPU_ARCH=sparc
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=big
-      ;;
-    *)
-      as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
-      ;;
-  esac
-
-  # ... and setup our own variables. (Do this explicitely to facilitate searching)
-  OPENJDK_TARGET_OS="$VAR_OS"
-  OPENJDK_TARGET_OS_API="$VAR_OS_API"
-  OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
-  OPENJDK_TARGET_CPU="$VAR_CPU"
-  OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
-  OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
-  OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5
-$as_echo_n "checking openjdk-target os-cpu... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5
-$as_echo "$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&6; }
-
-
-
-# Check whether --with-target-bits was given.
-if test "${with_target_bits+set}" = set; then :
-  withval=$with_target_bits;
-fi
-
-
-  # We have three types of compiles:
-  # native  == normal compilation, target system == build system
-  # cross   == traditional cross compilation, target system != build system; special toolchain needed
-  # reduced == using native compilers, but with special flags (e.g. -m32) to produce 32-bit builds on 64-bit machines
-  #
-  if test "x$OPENJDK_BUILD_AUTOCONF_NAME" != "x$OPENJDK_TARGET_AUTOCONF_NAME"; then
-    # We're doing a proper cross-compilation
-    COMPILE_TYPE="cross"
-  else
-    COMPILE_TYPE="native"
-  fi
-
-  if test "x$with_target_bits" != x; then
-    if test "x$COMPILE_TYPE" = "xcross"; then
-      as_fn_error $? "It is not possible to combine --with-target-bits=X and proper cross-compilation. Choose either." "$LINENO" 5
-    fi
-
-    if test "x$with_target_bits" = x32 && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-      # A reduced build is requested
-      COMPILE_TYPE="reduced"
-      OPENJDK_TARGET_CPU_BITS=32
-      if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86"; then
-        OPENJDK_TARGET_CPU=x86
-      elif test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then
-        OPENJDK_TARGET_CPU=sparc
-      else
-        as_fn_error $? "Reduced build (--with-target-bits=32) is only supported on x86_64 and sparcv9" "$LINENO" 5
-      fi
-    elif test "x$with_target_bits" = x64 && test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-      as_fn_error $? "It is not possible to use --with-target-bits=64 on a 32 bit system. Use proper cross-compilation instead." "$LINENO" 5
-    elif test "x$with_target_bits" = "x$OPENJDK_TARGET_CPU_BITS"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: --with-target-bits are set to build platform address size; argument has no meaning" >&5
-$as_echo "$as_me: --with-target-bits are set to build platform address size; argument has no meaning" >&6;}
-    else
-      as_fn_error $? "--with-target-bits can only be 32 or 64, you specified $with_target_bits!" "$LINENO" 5
-    fi
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking compilation type" >&5
-$as_echo_n "checking compilation type... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_TYPE" >&5
-$as_echo "$COMPILE_TYPE" >&6; }
-
-
-  if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
-    REQUIRED_OS_NAME=SunOS
-    REQUIRED_OS_VERSION=5.10
-  fi
-  if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
-    REQUIRED_OS_NAME=Linux
-    REQUIRED_OS_VERSION=2.6
-  fi
-  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    REQUIRED_OS_NAME=Windows
-    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
-      REQUIRED_OS_VERSION=5.2
-    else
-      REQUIRED_OS_VERSION=5.1
-    fi
-  fi
-  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-    REQUIRED_OS_NAME=Darwin
-    REQUIRED_OS_VERSION=11.2
-  fi
-
-
-
-
-
-  # Also store the legacy naming of the cpu.
-  # Ie i586 and amd64 instead of x86 and x86_64
-  OPENJDK_TARGET_CPU_LEGACY="$OPENJDK_TARGET_CPU"
-  if test "x$OPENJDK_TARGET_CPU" = xx86; then
-    OPENJDK_TARGET_CPU_LEGACY="i586"
-  elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-    # On all platforms except MacOSX replace x86_64 with amd64.
-    OPENJDK_TARGET_CPU_LEGACY="amd64"
-  fi
-
-
-  # And the second legacy naming of the cpu.
-  # Ie i386 and amd64 instead of x86 and x86_64.
-  OPENJDK_TARGET_CPU_LEGACY_LIB="$OPENJDK_TARGET_CPU"
-  if test "x$OPENJDK_TARGET_CPU" = xx86; then
-    OPENJDK_TARGET_CPU_LEGACY_LIB="i386"
-  elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-    OPENJDK_TARGET_CPU_LEGACY_LIB="amd64"
-  fi
-
-
-  # This is the name of the cpu (but using i386 and amd64 instead of
-  # x86 and x86_64, respectively), preceeded by a /, to be used when
-  # locating libraries. On macosx, it's empty, though.
-  OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB"
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    OPENJDK_TARGET_CPU_LIBDIR=""
-  fi
-
-
-  # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
-  # /amd64 or /sparcv9. This string is appended to some library paths, like this:
-  # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so
-  OPENJDK_TARGET_CPU_ISADIR=""
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-      OPENJDK_TARGET_CPU_ISADIR="/amd64"
-    elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then
-      OPENJDK_TARGET_CPU_ISADIR="/sparcv9"
-    fi
-  fi
-
-
-  # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
-  OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
-  if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then
-    # On linux only, we replace x86 with i386.
-    OPENJDK_TARGET_CPU_OSARCH="i386"
-  elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-    # On all platforms except macosx, we replace x86_64 with amd64.
-    OPENJDK_TARGET_CPU_OSARCH="amd64"
-  fi
-
-
-  OPENJDK_TARGET_CPU_JLI="$OPENJDK_TARGET_CPU"
-  if test "x$OPENJDK_TARGET_CPU" = xx86; then
-    OPENJDK_TARGET_CPU_JLI="i386"
-  elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-    # On all platforms except macosx, we replace x86_64 with amd64.
-    OPENJDK_TARGET_CPU_JLI="amd64"
-  fi
-  # Now setup the -D flags for building libjli.
-  OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
-      OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
-    elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
-      OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
-    fi
-  fi
-
-
-  # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
-  if test "x$OPENJDK_TARGET_OS_API" = xposix; then
-    OPENJDK_TARGET_OS_API_DIR="solaris"
-  fi
-  if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
-    OPENJDK_TARGET_OS_API_DIR="windows"
-  fi
-
-
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-      OPENJDK_TARGET_OS_EXPORT_DIR=macosx
-  else
-      OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_API_DIR}
-  fi
-
-
-  if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-    A_LP64="LP64:="
-    # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
-    # unpack200.exe
-    if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then
-      ADD_LP64="-D_LP64=1"
-    fi
-  fi
-  LP64=$A_LP64
-
-
-  if test "x$COMPILE_TYPE" = "xcross"; then
-    # FIXME: ... or should this include reduced builds..?
-    DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY"
-  else
-    DEFINE_CROSS_COMPILE_ARCH=""
-  fi
-
-
-  # ZERO_ARCHDEF is used to enable architecture-specific code
-  case "${OPENJDK_TARGET_CPU}" in
-    ppc)     ZERO_ARCHDEF=PPC32 ;;
-    ppc64)   ZERO_ARCHDEF=PPC64 ;;
-    s390*)   ZERO_ARCHDEF=S390  ;;
-    sparc*)  ZERO_ARCHDEF=SPARC ;;
-    x86_64*) ZERO_ARCHDEF=AMD64 ;;
-    x86)     ZERO_ARCHDEF=IA32  ;;
-    *)      ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
-  esac
-
-
-
-
-# Continue setting up basic stuff. Most remaining code require fundamental tools.
-
-  # Locate the directory of this script.
-  SCRIPT="$0"
-  AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
-
-  # Where is the source? It is located two levels above the configure script.
-  CURDIR="$PWD"
-  cd "$AUTOCONF_DIR/../.."
-  SRC_ROOT="`$THEPWDCMD -L`"
-
-  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    PATH_SEP=";"
-
-  SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m`
-  if test $SRC_ROOT_LENGTH -gt 100; then
-    as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5
-  fi
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking cygwin release" >&5
-$as_echo_n "checking cygwin release... " >&6; }
-    CYGWIN_VERSION=`$UNAME -r`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGWIN_VERSION" >&5
-$as_echo "$CYGWIN_VERSION" >&6; }
-    WINDOWS_ENV_VENDOR='cygwin'
-    WINDOWS_ENV_VERSION="$CYGWIN_VERSION"
-
-    CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.0-6'`
-    if test "x$CYGWIN_VERSION_OLD" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade." >&5
-$as_echo "$as_me: Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade." >&6;}
-      as_fn_error $? "Cannot continue" "$LINENO" 5
-    fi
-    if test "x$CYGPATH" = x; then
-      as_fn_error $? "Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path" "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking cygwin root directory as unix-style path" >&5
-$as_echo_n "checking cygwin root directory as unix-style path... " >&6; }
-    # 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 " "`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGWIN_ROOT_PATH" >&5
-$as_echo "$CYGWIN_ROOT_PATH" >&6; }
-    WINDOWS_ENV_ROOT_PATH="$CYGWIN_ROOT_PATH"
-    test_cygdrive_prefix=`$ECHO $CYGWIN_ROOT_PATH | $GREP ^/cygdrive/`
-    if test "x$test_cygdrive_prefix" = x; then
-      as_fn_error $? "Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c." "$LINENO" 5
-    fi
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking msys release" >&5
-$as_echo_n "checking msys release... " >&6; }
-    MSYS_VERSION=`$UNAME -r`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSYS_VERSION" >&5
-$as_echo "$MSYS_VERSION" >&6; }
-
-    WINDOWS_ENV_VENDOR='msys'
-    WINDOWS_ENV_VERSION="$MSYS_VERSION"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking msys root directory as unix-style path" >&5
-$as_echo_n "checking msys root directory as unix-style path... " >&6; }
-    # 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 ".*"`
-
-  windows_path="$MSYS_ROOT_PATH"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    MSYS_ROOT_PATH="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    MSYS_ROOT_PATH="$unix_path"
-  fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSYS_ROOT_PATH" >&5
-$as_echo "$MSYS_ROOT_PATH" >&6; }
-    WINDOWS_ENV_ROOT_PATH="$MSYS_ROOT_PATH"
-  else
-    as_fn_error $? "Unknown Windows environment. Neither cygwin nor msys was detected." "$LINENO" 5
-  fi
-
-  # Test if windows or unix (cygwin/msys) find is first in path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking what kind of 'find' is first on the PATH" >&5
-$as_echo_n "checking what kind of 'find' is first on the PATH... " >&6; }
-  FIND_BINARY_OUTPUT=`find --version 2>&1`
-  if test "x`echo $FIND_BINARY_OUTPUT | $GREP GNU`" != x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unix style" >&5
-$as_echo "unix style" >&6; }
-  elif test "x`echo $FIND_BINARY_OUTPUT | $GREP FIND`" != x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows" >&5
-$as_echo "Windows" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Your path contains Windows tools (C:\Windows\system32) before your unix (cygwin or msys) tools." >&5
-$as_echo "$as_me: Your path contains Windows tools (C:\Windows\system32) before your unix (cygwin or msys) tools." >&6;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: This will not work. Please correct and make sure /usr/bin (or similar) is first in path." >&5
-$as_echo "$as_me: This will not work. Please correct and make sure /usr/bin (or similar) is first in path." >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
-$as_echo "unknown" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: It seems that your find utility is non-standard." >&5
-$as_echo "$as_me: WARNING: It seems that your find utility is non-standard." >&2;}
-  fi
-
-  else
-    PATH_SEP=":"
-  fi
-
-
-
-  cd "$CURDIR"
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$SRC_ROOT"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of SRC_ROOT, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of SRC_ROOT, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of SRC_ROOT" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    SRC_ROOT="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting SRC_ROOT to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting SRC_ROOT to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$SRC_ROOT"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    SRC_ROOT="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting SRC_ROOT to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting SRC_ROOT to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$SRC_ROOT"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of SRC_ROOT, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of SRC_ROOT, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    SRC_ROOT="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$CURDIR"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CURDIR, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of CURDIR, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of CURDIR" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    CURDIR="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CURDIR to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting CURDIR to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$CURDIR"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    CURDIR="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CURDIR to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting CURDIR to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$CURDIR"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CURDIR, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of CURDIR, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    CURDIR="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-  if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
-    # Add extra search paths on solaris for utilities like ar and as etc...
-    PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
-  fi
-
-  # You can force the sys-root if the sys-root encoded into the cross compiler tools
-  # is not correct.
-
-# Check whether --with-sys-root was given.
-if test "${with_sys_root+set}" = set; then :
-  withval=$with_sys_root;
-fi
-
-
-  if test "x$with_sys_root" != x; then
-    SYS_ROOT=$with_sys_root
-  else
-    SYS_ROOT=/
-  fi
-
-
-
-# Check whether --with-tools-dir was given.
-if test "${with_tools_dir+set}" = set; then :
-  withval=$with_tools_dir; TOOLS_DIR=$with_tools_dir
-
-fi
-
-
-  # Xcode version will be validated later
-
-# Check whether --with-xcode-path was given.
-if test "${with_xcode_path+set}" = set; then :
-  withval=$with_xcode_path; XCODE_PATH=$with_xcode_path
-
-fi
-
-
-
-# Check whether --with-devkit was given.
-if test "${with_devkit+set}" = set; then :
-  withval=$with_devkit;
-        if test "x$with_sys_root" != x; then
-          as_fn_error $? "Cannot specify both --with-devkit and --with-sys-root at the same time" "$LINENO" 5
-        fi
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$with_devkit"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of with_devkit, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of with_devkit, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of with_devkit" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    with_devkit="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting with_devkit to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting with_devkit to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$with_devkit"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    with_devkit="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting with_devkit to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting with_devkit to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$with_devkit"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of with_devkit, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of with_devkit, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of with_devkit, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    with_devkit="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-  if test "x$TOOLS_DIR" = x; then
-    TOOLS_DIR="$with_devkit/bin"
-  else
-    TOOLS_DIR="$TOOLS_DIR:$with_devkit/bin"
-  fi
-
-        if test -d "$with_devkit/$host_alias/libc"; then
-          SYS_ROOT=$with_devkit/$host_alias/libc
-        elif test -d "$with_devkit/$host/sys-root"; then
-          SYS_ROOT=$with_devkit/$host/sys-root
-        fi
-
-fi
-
-
-
-  # Setup default logging of stdout and stderr to build.log in the output root.
-  BUILD_LOG='$(OUTPUT_ROOT)/build.log'
-  BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
-  BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
-
-
-
-
-
-# Check if it's a pure open build or if custom sources are to be used.
-
-  # Check whether --enable-openjdk-only was given.
-if test "${enable_openjdk_only+set}" = set; then :
-  enableval=$enable_openjdk_only;
-else
-  enable_openjdk_only="no"
-fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for presence of closed sources" >&5
-$as_echo_n "checking for presence of closed sources... " >&6; }
-  if test -d "$SRC_ROOT/jdk/src/closed"; then
-    CLOSED_SOURCE_PRESENT=yes
-  else
-    CLOSED_SOURCE_PRESENT=no
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOSED_SOURCE_PRESENT" >&5
-$as_echo "$CLOSED_SOURCE_PRESENT" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if closed source is suppressed (openjdk-only)" >&5
-$as_echo_n "checking if closed source is suppressed (openjdk-only)... " >&6; }
-  SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUPPRESS_CLOSED_SOURCE" >&5
-$as_echo "$SUPPRESS_CLOSED_SOURCE" >&6; }
-
-  if test "x$CLOSED_SOURCE_PRESENT" = xno; then
-    OPENJDK=true
-    if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&5
-$as_echo "$as_me: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&2;}
-    fi
-  else
-    if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
-      OPENJDK=true
-    else
-      OPENJDK=false
-    fi
-  fi
-
-  if test "x$OPENJDK" = "xtrue"; then
-    SET_OPENJDK="OPENJDK=true"
-  fi
-
-
-
-
-# These are needed to be able to create a configuration name (and thus the output directory)
-
-  ###############################################################################
-  #
-  # Check which variant of the JDK that we want to build.
-  # Currently we have:
-  #    normal:   standard edition
-  # but the custom make system may add other variants
-  #
-  # Effectively the JDK variant gives a name to a specific set of
-  # modules to compile into the JDK. In the future, these modules
-  # might even be Jigsaw modules.
-  #
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of the JDK to build" >&5
-$as_echo_n "checking which variant of the JDK to build... " >&6; }
-
-# Check whether --with-jdk-variant was given.
-if test "${with_jdk_variant+set}" = set; then :
-  withval=$with_jdk_variant;
-fi
-
-
-  if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
-    JDK_VARIANT="normal"
-  else
-    as_fn_error $? "The available JDK variants are: normal" "$LINENO" 5
-  fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JDK_VARIANT" >&5
-$as_echo "$JDK_VARIANT" >&6; }
-
-
-###############################################################################
-#
-# Check which interpreter of the JVM we want to build.
-# Currently we have:
-#    template: Template interpreter (the default)
-#    cpp     : C++ interpreter
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which interpreter of the JVM to build" >&5
-$as_echo_n "checking which interpreter of the JVM to build... " >&6; }
-
-# Check whether --with-jvm-interpreter was given.
-if test "${with_jvm_interpreter+set}" = set; then :
-  withval=$with_jvm_interpreter;
-fi
-
-
-if test "x$with_jvm_interpreter" = x; then
-     with_jvm_interpreter="template"
-fi
-
-JVM_INTERPRETER="$with_jvm_interpreter"
-
-if test "x$JVM_INTERPRETER" != xtemplate && test "x$JVM_INTERPRETER" != xcpp; then
-   as_fn_error $? "The available JVM interpreters are: template, cpp" "$LINENO" 5
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_interpreter" >&5
-$as_echo "$with_jvm_interpreter" >&6; }
-
-
-
-  ###############################################################################
-  #
-  # Check which variants of the JVM that we want to build.
-  # Currently we have:
-  #    server: normal interpreter and a tiered C1/C2 compiler
-  #    client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
-  #    minimal1: reduced form of client with optional VM services and features stripped out
-  #    kernel: kernel footprint JVM that passes the TCK without major performance problems,
-  #             ie normal interpreter and C1, only the serial GC, kernel jvmti etc
-  #    zero: no machine code interpreter, no compiler
-  #    zeroshark: zero interpreter and shark/llvm compiler backend
-#    core: interpreter only, no compiler (only works on some platforms)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variants of the JVM to build" >&5
-$as_echo_n "checking which variants of the JVM to build... " >&6; }
-
-# Check whether --with-jvm-variants was given.
-if test "${with_jvm_variants+set}" = set; then :
-  withval=$with_jvm_variants;
-fi
-
-
-  if test "x$with_jvm_variants" = x; then
-    with_jvm_variants="server"
-  fi
-
-  JVM_VARIANTS=",$with_jvm_variants,"
-  TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//'  -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//' -e 's/core,//'`
-
-  if test "x$TEST_VARIANTS" != "x,"; then
-     as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark, core" "$LINENO" 5
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_variants" >&5
-$as_echo "$with_jvm_variants" >&6; }
-
-  JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
-  JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
-  JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'`
-  JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
-  JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
-  JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
-  JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
-
-  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-      as_fn_error $? "You cannot build a client JVM for a 64-bit machine." "$LINENO" 5
-    fi
-  fi
-  if test "x$JVM_VARIANT_KERNEL" = xtrue; then
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-      as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5
-    fi
-  fi
-  if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-      as_fn_error $? "You cannot build a minimal JVM for a 64-bit machine." "$LINENO" 5
-    fi
-  fi
-
-  # Replace the commas with AND for use in the build directory name.
-  ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/g'`
-  COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/' -e 's/core,/1/'`
-  if test "x$COUNT_VARIANTS" != "x,1"; then
-    BUILDING_MULTIPLE_JVM_VARIANTS=yes
-  else
-    BUILDING_MULTIPLE_JVM_VARIANTS=no
-  fi
-
-
-
-
-
-
-
-
-
-
-  INCLUDE_SA=true
-  if test "x$JVM_VARIANT_ZERO" = xtrue ; then
-    INCLUDE_SA=false
-  fi
-  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
-    INCLUDE_SA=false
-  fi
-  if test "x$VAR_CPU" = xppc64 ; then
-    INCLUDE_SA=false
-  fi
-  if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-    INCLUDE_SA=false
-  fi
-
-
-  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-    MACOSX_UNIVERSAL="false"
-  fi
-
-
-
-
-  ###############################################################################
-  #
-  # Set the debug level
-  #    release: no debug information, all optimizations, no asserts.
-  #    fastdebug: debug information (-g), all optimizations, all asserts
-  #    slowdebug: debug information (-g), no optimizations, all asserts
-  #
-  DEBUG_LEVEL="release"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which debug level to use" >&5
-$as_echo_n "checking which debug level to use... " >&6; }
-  # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug;
-        ENABLE_DEBUG="${enableval}"
-        DEBUG_LEVEL="fastdebug"
-
-else
-  ENABLE_DEBUG="no"
-fi
-
-
-
-# Check whether --with-debug-level was given.
-if test "${with_debug_level+set}" = set; then :
-  withval=$with_debug_level;
-        DEBUG_LEVEL="${withval}"
-        if test "x$ENABLE_DEBUG" = xyes; then
-          as_fn_error $? "You cannot use both --enable-debug and --with-debug-level at the same time." "$LINENO" 5
-        fi
-
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBUG_LEVEL" >&5
-$as_echo "$DEBUG_LEVEL" >&6; }
-
-  if test "x$DEBUG_LEVEL" != xrelease && \
-      test "x$DEBUG_LEVEL" != xfastdebug && \
-      test "x$DEBUG_LEVEL" != xslowdebug; then
-    as_fn_error $? "Allowed debug levels are: release, fastdebug and slowdebug" "$LINENO" 5
-  fi
-
-
-  ###############################################################################
-  #
-  # Setup legacy vars/targets and new vars to deal with different debug levels.
-  #
-
-  case $DEBUG_LEVEL in
-    release )
-      VARIANT="OPT"
-      FASTDEBUG="false"
-      DEBUG_CLASSFILES="false"
-      BUILD_VARIANT_RELEASE=""
-      HOTSPOT_DEBUG_LEVEL="product"
-      HOTSPOT_EXPORT="product"
-      ;;
-    fastdebug )
-      VARIANT="DBG"
-      FASTDEBUG="true"
-      DEBUG_CLASSFILES="true"
-      BUILD_VARIANT_RELEASE="-fastdebug"
-      HOTSPOT_DEBUG_LEVEL="fastdebug"
-      HOTSPOT_EXPORT="fastdebug"
-      ;;
-    slowdebug )
-      VARIANT="DBG"
-      FASTDEBUG="false"
-      DEBUG_CLASSFILES="true"
-      BUILD_VARIANT_RELEASE="-debug"
-      HOTSPOT_DEBUG_LEVEL="jvmg"
-      HOTSPOT_EXPORT="debug"
-      ;;
-  esac
-
-  #####
-  # Generate the legacy makefile targets for hotspot.
-  # The hotspot api for selecting the build artifacts, really, needs to be improved.
-  # JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
-  # determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
-  # But until then ...
-  HOTSPOT_TARGET=""
-
-  if test "x$JVM_VARIANT_SERVER" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
-  fi
-
-  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
-  fi
-
-  if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 "
-  fi
-
-  if test "x$JVM_VARIANT_KERNEL" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel "
-  fi
-
-  if test "x$JVM_VARIANT_ZERO" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
-  fi
-
-  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
-  fi
-
-  if test "x$JVM_VARIANT_CORE" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core "
-  fi
-
-  HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
-
-  # On Macosx universal binaries are produced, but they only contain
-  # 64 bit intel. This invalidates control of which jvms are built
-  # from configure, but only server is valid anyway. Fix this
-  # when hotspot makefiles are rewritten.
-  if test "x$MACOSX_UNIVERSAL" = xtrue; then
-    HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
-  fi
-
-  #####
-
-
-
-
-
-
-
-
-# With basic setup done, call the custom early hook.
-
-
-# To properly create a configuration name, we need to have the OpenJDK target
-# and options (variants and debug level) parsed.
-
-
-
-# Check whether --with-conf-name was given.
-if test "${with_conf_name+set}" = set; then :
-  withval=$with_conf_name;  CONF_NAME=${with_conf_name}
-fi
-
-
-  # Test from where we are running configure, in or outside of src root.
-  if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
-      || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
-      || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
-    # We are running configure from the src root.
-    # Create a default ./build/target-variant-debuglevel output root.
-    if test "x${CONF_NAME}" = x; then
-      CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
-    fi
-    OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
-    $MKDIR -p "$OUTPUT_ROOT"
-    if test ! -d "$OUTPUT_ROOT"; then
-      as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5
-    fi
-  else
-    # We are running configure from outside of the src dir.
-    # Then use the current directory as output dir!
-    # If configuration is situated in normal build directory, just use the build
-    # directory name as configuration name, otherwise use the complete path.
-    if test "x${CONF_NAME}" = x; then
-      CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
-    fi
-    OUTPUT_ROOT="$CURDIR"
-
-    # WARNING: This might be a bad thing to do. You need to be sure you want to
-    # have a configuration in this directory. Do some sanity checks!
-
-    if test ! -e "$OUTPUT_ROOT/spec.gmk"; then
-      # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
-      # other files
-      files_present=`$LS $OUTPUT_ROOT`
-      # Configure has already touched config.log and confdefs.h in the current dir when this check
-      # is performed.
-      filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \
-      | $TR -d '\n'`
-      if test "x$filtered_files" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Current directory is $CURDIR." >&5
-$as_echo "$as_me: Current directory is $CURDIR." >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Since this is not the source root, configure will output the configuration here" >&5
-$as_echo "$as_me: Since this is not the source root, configure will output the configuration here" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: (as opposed to creating a configuration in <src_root>/build/<conf-name>)." >&5
-$as_echo "$as_me: (as opposed to creating a configuration in <src_root>/build/<conf-name>)." >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: However, this directory is not empty. This is not allowed, since it could" >&5
-$as_echo "$as_me: However, this directory is not empty. This is not allowed, since it could" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: seriously mess up just about everything." >&5
-$as_echo "$as_me: seriously mess up just about everything." >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Try 'cd $SRC_ROOT' and restart configure" >&5
-$as_echo "$as_me: Try 'cd $SRC_ROOT' and restart configure" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: (or create a new empty directory and cd to it)." >&5
-$as_echo "$as_me: (or create a new empty directory and cd to it)." >&6;}
-        as_fn_error $? "Will not continue creating configuration in $CURDIR" "$LINENO" 5
-      fi
-    fi
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking what configuration name to use" >&5
-$as_echo_n "checking what configuration name to use... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_NAME" >&5
-$as_echo "$CONF_NAME" >&6; }
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$OUTPUT_ROOT"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OUTPUT_ROOT, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of OUTPUT_ROOT, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of OUTPUT_ROOT" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    OUTPUT_ROOT="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OUTPUT_ROOT to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting OUTPUT_ROOT to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$OUTPUT_ROOT"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    OUTPUT_ROOT="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OUTPUT_ROOT to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting OUTPUT_ROOT to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$OUTPUT_ROOT"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OUTPUT_ROOT, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of OUTPUT_ROOT, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    OUTPUT_ROOT="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-  SPEC=$OUTPUT_ROOT/spec.gmk
-
-  CONF_NAME=$CONF_NAME
-
-  OUTPUT_ROOT=$OUTPUT_ROOT
-
-
-  # Most of the probed defines are put into config.h
-  ac_config_headers="$ac_config_headers $OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in"
-
-  # The spec.gmk file contains all variables for the make system.
-  ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in"
-
-  # The hotspot-spec.gmk file contains legacy variables for the hotspot make system.
-  ac_config_files="$ac_config_files $OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in"
-
-  # The bootcycle-spec.gmk file contains support for boot cycle builds.
-  ac_config_files="$ac_config_files $OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in"
-
-  # The compare.sh is used to compare the build output to other builds.
-  ac_config_files="$ac_config_files $OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in"
-
-  # Spec.sh is currently used by compare-objects.sh
-  ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in"
-
-  # The generated Makefile knows where the spec.gmk is and where the source is.
-  # You can run make from the OUTPUT_ROOT, or from the top-level Makefile
-  # which will look for generated configurations
-  ac_config_files="$ac_config_files $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in"
-
-
-  # Save the arguments given to us
-  echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
-
-
-# Must be done before we can call HELP_MSG_MISSING_DEPENDENCY.
-
-  for ac_prog in apt-get yum port pkgutil pkgadd
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PKGHANDLER+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$PKGHANDLER"; then
-  ac_cv_prog_PKGHANDLER="$PKGHANDLER" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_PKGHANDLER="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-PKGHANDLER=$ac_cv_prog_PKGHANDLER
-if test -n "$PKGHANDLER"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGHANDLER" >&5
-$as_echo "$PKGHANDLER" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$PKGHANDLER" && break
-done
-
-
-
-# Setup tools that requires more complex handling, or that is not needed by the configure script.
-
-
-  # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
-  if test "x$MAKE" != x; then
-    # User has supplied a make, test it.
-    if test ! -f "$MAKE"; then
-      as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5
-    fi
-
-  MAKE_CANDIDATE=""$MAKE""
-  DESCRIPTION="user supplied MAKE=$MAKE"
-  if test "x$MAKE_CANDIDATE" != x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
-$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
-    MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
-    IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
-    if test "x$IS_GNU_MAKE" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
-$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
-    else
-      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[12]' -e '4\.'`
-      if test "x$IS_MODERN_MAKE" = x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
-$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
-      else
-        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.msys"; then
-            MAKE_EXPECTED_ENV='msys'
-          else
-            as_fn_error $? "Unknown Windows environment" "$LINENO" 5
-          fi
-          MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
-          IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
-        else
-          # Not relevant for non-Windows
-          IS_MAKE_CORRECT_ENV=true
-        fi
-        if test "x$IS_MAKE_CORRECT_ENV" = x; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&5
-$as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&6;}
-        else
-          FOUND_MAKE=$MAKE_CANDIDATE
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$FOUND_MAKE"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$FOUND_MAKE"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$FOUND_MAKE"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    FOUND_MAKE="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
-  fi
-
-        fi
-      fi
-    fi
-  fi
-
-    if test "x$FOUND_MAKE" = x; then
-      as_fn_error $? "The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer." "$LINENO" 5
-    fi
-  else
-    # Try our hardest to locate a correct version of GNU make
-    for ac_prog in gmake
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHECK_GMAKE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CHECK_GMAKE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CHECK_GMAKE="$CHECK_GMAKE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CHECK_GMAKE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CHECK_GMAKE=$ac_cv_path_CHECK_GMAKE
-if test -n "$CHECK_GMAKE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_GMAKE" >&5
-$as_echo "$CHECK_GMAKE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$CHECK_GMAKE" && break
-done
-
-
-  MAKE_CANDIDATE=""$CHECK_GMAKE""
-  DESCRIPTION="gmake in PATH"
-  if test "x$MAKE_CANDIDATE" != x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
-$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
-    MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
-    IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
-    if test "x$IS_GNU_MAKE" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
-$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
-    else
-      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[12]' -e '4\.'`
-      if test "x$IS_MODERN_MAKE" = x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
-$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
-      else
-        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.msys"; then
-            MAKE_EXPECTED_ENV='msys'
-          else
-            as_fn_error $? "Unknown Windows environment" "$LINENO" 5
-          fi
-          MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
-          IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
-        else
-          # Not relevant for non-Windows
-          IS_MAKE_CORRECT_ENV=true
-        fi
-        if test "x$IS_MAKE_CORRECT_ENV" = x; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&5
-$as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&6;}
-        else
-          FOUND_MAKE=$MAKE_CANDIDATE
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$FOUND_MAKE"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$FOUND_MAKE"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$FOUND_MAKE"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    FOUND_MAKE="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
-  fi
-
-        fi
-      fi
-    fi
-  fi
-
-
-    if test "x$FOUND_MAKE" = x; then
-      for ac_prog in make
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHECK_MAKE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CHECK_MAKE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CHECK_MAKE="$CHECK_MAKE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CHECK_MAKE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CHECK_MAKE=$ac_cv_path_CHECK_MAKE
-if test -n "$CHECK_MAKE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_MAKE" >&5
-$as_echo "$CHECK_MAKE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$CHECK_MAKE" && break
-done
-
-
-  MAKE_CANDIDATE=""$CHECK_MAKE""
-  DESCRIPTION="make in PATH"
-  if test "x$MAKE_CANDIDATE" != x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
-$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
-    MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
-    IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
-    if test "x$IS_GNU_MAKE" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
-$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
-    else
-      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[12]' -e '4\.'`
-      if test "x$IS_MODERN_MAKE" = x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
-$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
-      else
-        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.msys"; then
-            MAKE_EXPECTED_ENV='msys'
-          else
-            as_fn_error $? "Unknown Windows environment" "$LINENO" 5
-          fi
-          MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
-          IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
-        else
-          # Not relevant for non-Windows
-          IS_MAKE_CORRECT_ENV=true
-        fi
-        if test "x$IS_MAKE_CORRECT_ENV" = x; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&5
-$as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&6;}
-        else
-          FOUND_MAKE=$MAKE_CANDIDATE
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$FOUND_MAKE"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$FOUND_MAKE"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$FOUND_MAKE"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    FOUND_MAKE="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
-  fi
-
-        fi
-      fi
-    fi
-  fi
-
-    fi
-
-    if test "x$FOUND_MAKE" = x; then
-      if test "x$TOOLS_DIR" != x; then
-        # We have a tools-dir, check that as well before giving up.
-        OLD_PATH=$PATH
-        PATH=$TOOLS_DIR:$PATH
-        for ac_prog in gmake
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CHECK_TOOLSDIR_GMAKE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CHECK_TOOLSDIR_GMAKE="$CHECK_TOOLSDIR_GMAKE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CHECK_TOOLSDIR_GMAKE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CHECK_TOOLSDIR_GMAKE=$ac_cv_path_CHECK_TOOLSDIR_GMAKE
-if test -n "$CHECK_TOOLSDIR_GMAKE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_TOOLSDIR_GMAKE" >&5
-$as_echo "$CHECK_TOOLSDIR_GMAKE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$CHECK_TOOLSDIR_GMAKE" && break
-done
-
-
-  MAKE_CANDIDATE=""$CHECK_TOOLSDIR_GMAKE""
-  DESCRIPTION="gmake in tools-dir"
-  if test "x$MAKE_CANDIDATE" != x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
-$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
-    MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
-    IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
-    if test "x$IS_GNU_MAKE" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
-$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
-    else
-      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[12]' -e '4\.'`
-      if test "x$IS_MODERN_MAKE" = x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
-$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
-      else
-        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.msys"; then
-            MAKE_EXPECTED_ENV='msys'
-          else
-            as_fn_error $? "Unknown Windows environment" "$LINENO" 5
-          fi
-          MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
-          IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
-        else
-          # Not relevant for non-Windows
-          IS_MAKE_CORRECT_ENV=true
-        fi
-        if test "x$IS_MAKE_CORRECT_ENV" = x; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&5
-$as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&6;}
-        else
-          FOUND_MAKE=$MAKE_CANDIDATE
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$FOUND_MAKE"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$FOUND_MAKE"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$FOUND_MAKE"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    FOUND_MAKE="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
-  fi
-
-        fi
-      fi
-    fi
-  fi
-
-        if test "x$FOUND_MAKE" = x; then
-          for ac_prog in make
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CHECK_TOOLSDIR_MAKE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CHECK_TOOLSDIR_MAKE="$CHECK_TOOLSDIR_MAKE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CHECK_TOOLSDIR_MAKE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CHECK_TOOLSDIR_MAKE=$ac_cv_path_CHECK_TOOLSDIR_MAKE
-if test -n "$CHECK_TOOLSDIR_MAKE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_TOOLSDIR_MAKE" >&5
-$as_echo "$CHECK_TOOLSDIR_MAKE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$CHECK_TOOLSDIR_MAKE" && break
-done
-
-
-  MAKE_CANDIDATE=""$CHECK_TOOLSDIR_MAKE""
-  DESCRIPTION="make in tools-dir"
-  if test "x$MAKE_CANDIDATE" != x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
-$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
-    MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
-    IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
-    if test "x$IS_GNU_MAKE" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
-$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
-    else
-      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[12]' -e '4\.'`
-      if test "x$IS_MODERN_MAKE" = x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
-$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
-      else
-        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.msys"; then
-            MAKE_EXPECTED_ENV='msys'
-          else
-            as_fn_error $? "Unknown Windows environment" "$LINENO" 5
-          fi
-          MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
-          IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
-        else
-          # Not relevant for non-Windows
-          IS_MAKE_CORRECT_ENV=true
-        fi
-        if test "x$IS_MAKE_CORRECT_ENV" = x; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&5
-$as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&6;}
-        else
-          FOUND_MAKE=$MAKE_CANDIDATE
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$FOUND_MAKE"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$FOUND_MAKE"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$FOUND_MAKE"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    FOUND_MAKE="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
-  fi
-
-        fi
-      fi
-    fi
-  fi
-
-        fi
-        PATH=$OLD_PATH
-      fi
-    fi
-
-    if test "x$FOUND_MAKE" = x; then
-      as_fn_error $? "Cannot find GNU make 3.81 or newer! Please put it in the path, or add e.g. MAKE=/opt/gmake3.81/make as argument to configure." "$LINENO" 5
-    fi
-  fi
-
-  MAKE=$FOUND_MAKE
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)" >&5
-$as_echo "$as_me: Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)" >&6;}
-
-
-
-  # Test if find supports -delete
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5
-$as_echo_n "checking if find supports -delete... " >&6; }
-  FIND_DELETE="-delete"
-
-  DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
-
-  echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
-
-  TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
-  if test -f $DELETEDIR/TestIfFindSupportsDelete; then
-    # No, it does not.
-    rm $DELETEDIR/TestIfFindSupportsDelete
-    FIND_DELETE="-exec rm \{\} \+"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  fi
-  rmdir $DELETEDIR
-
-
-
-  # These tools might not be installed by default,
-  # need hint on how to install them.
-
-  for ac_prog in unzip
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_UNZIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $UNZIP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-UNZIP=$ac_cv_path_UNZIP
-if test -n "$UNZIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5
-$as_echo "$UNZIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$UNZIP" && break
-done
-
-
-  if test "x$UNZIP" = x; then
-    if test "xunzip" = x; then
-      PROG_NAME=unzip
-    else
-      PROG_NAME=unzip
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in zip
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ZIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ZIP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ZIP=$ac_cv_path_ZIP
-if test -n "$ZIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5
-$as_echo "$ZIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ZIP" && break
-done
-
-
-  if test "x$ZIP" = x; then
-    if test "xzip" = x; then
-      PROG_NAME=zip
-    else
-      PROG_NAME=zip
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  # Non-required basic tools
-
-  # Extract the first word of "ldd", so it can be a program name with args.
-set dummy ldd; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LDD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $LDD in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_LDD="$LDD" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LDD="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-LDD=$ac_cv_path_LDD
-if test -n "$LDD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDD" >&5
-$as_echo "$LDD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  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
-  for ac_prog in readelf greadelf
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_READELF+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $READELF in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_READELF="$READELF" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_READELF="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-READELF=$ac_cv_path_READELF
-if test -n "$READELF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
-$as_echo "$READELF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$READELF" && break
-done
-
-  # Extract the first word of "hg", so it can be a program name with args.
-set dummy hg; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_HG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $HG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_HG="$HG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_HG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-HG=$ac_cv_path_HG
-if test -n "$HG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HG" >&5
-$as_echo "$HG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  # Extract the first word of "stat", so it can be a program name with args.
-set dummy stat; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_STAT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $STAT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_STAT="$STAT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_STAT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-STAT=$ac_cv_path_STAT
-if test -n "$STAT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STAT" >&5
-$as_echo "$STAT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  # Extract the first word of "time", so it can be a program name with args.
-set dummy time; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TIME+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $TIME in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TIME="$TIME" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TIME="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-TIME=$ac_cv_path_TIME
-if test -n "$TIME"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TIME" >&5
-$as_echo "$TIME" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  # Check if it's GNU time
-  IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
-  if test "x$IS_GNU_TIME" != x; then
-    IS_GNU_TIME=yes
-  else
-    IS_GNU_TIME=no
-  fi
-
-
-  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-
-  for ac_prog in comm
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $COMM in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-COMM=$ac_cv_path_COMM
-if test -n "$COMM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
-$as_echo "$COMM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$COMM" && break
-done
-
-
-  if test "x$COMM" = x; then
-    if test "xcomm" = x; then
-      PROG_NAME=comm
-    else
-      PROG_NAME=comm
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-
-  for ac_prog in dsymutil
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DSYMUTIL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DSYMUTIL="$DSYMUTIL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DSYMUTIL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-DSYMUTIL=$ac_cv_path_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$DSYMUTIL" && break
-done
-
-
-  if test "x$DSYMUTIL" = x; then
-    if test "xdsymutil" = x; then
-      PROG_NAME=dsymutil
-    else
-      PROG_NAME=dsymutil
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-  for ac_prog in xattr
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XATTR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XATTR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XATTR="$XATTR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XATTR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-XATTR=$ac_cv_path_XATTR
-if test -n "$XATTR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XATTR" >&5
-$as_echo "$XATTR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$XATTR" && break
-done
-
-
-  if test "x$XATTR" = x; then
-    if test "xxattr" = x; then
-      PROG_NAME=xattr
-    else
-      PROG_NAME=xattr
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-    # Extract the first word of "codesign", so it can be a program name with args.
-set dummy codesign; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CODESIGN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CODESIGN in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CODESIGN="$CODESIGN" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CODESIGN="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CODESIGN=$ac_cv_path_CODESIGN
-if test -n "$CODESIGN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CODESIGN" >&5
-$as_echo "$CODESIGN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    if test "x$CODESIGN" != "x"; then
-      # Verify that the openjdk_codesign certificate is present
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openjdk_codesign certificate is present" >&5
-$as_echo_n "checking if openjdk_codesign certificate is present... " >&6; }
-      rm -f codesign-testfile
-      touch codesign-testfile
-      codesign -s openjdk_codesign codesign-testfile 2>&5 >&5 || CODESIGN=
-      rm -f codesign-testfile
-      if test "x$CODESIGN" = x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      fi
-    fi
-  fi
-
-
-# Check if pkg-config is available.
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-
-fi
-
-# After basic tools have been setup, we can check build os specific details.
-
-  ###############################################################################
-
-  # Note that this is the build platform OS version!
-
-  OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`"
-  OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`"
-  OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`"
-  OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`"
-
-
-
-
-
-# Setup builddeps, for automatic downloading of tools we need.
-# This is needed before we can call BDEPS_CHECK_MODULE, which is done in
-# boot-jdk setup, but we need to have basic tools setup first.
-
-
-# Check whether --with-builddeps-conf was given.
-if test "${with_builddeps_conf+set}" = set; then :
-  withval=$with_builddeps_conf;
-fi
-
-
-
-# Check whether --with-builddeps-server was given.
-if test "${with_builddeps_server+set}" = set; then :
-  withval=$with_builddeps_server;
-fi
-
-
-
-# Check whether --with-builddeps-dir was given.
-if test "${with_builddeps_dir+set}" = set; then :
-  withval=$with_builddeps_dir;
-else
-  with_builddeps_dir=/localhome/builddeps
-fi
-
-
-
-# Check whether --with-builddeps-group was given.
-if test "${with_builddeps_group+set}" = set; then :
-  withval=$with_builddeps_group;
-fi
-
-
-
-
-  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
-    if test "x$with_builddeps_conf" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supplied builddeps configuration file" >&5
-$as_echo_n "checking for supplied builddeps configuration file... " >&6; }
-      builddepsfile=$with_builddeps_conf
-      if test -s $builddepsfile; then
-        . $builddepsfile
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loaded!" >&5
-$as_echo "loaded!" >&6; }
-      else
-        as_fn_error $? "The given builddeps conf file $with_builddeps_conf could not be loaded!" "$LINENO" 5
-      fi
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builddeps.conf files in sources..." >&5
-$as_echo_n "checking for builddeps.conf files in sources...... " >&6; }
-      builddepsfile=`mktemp`
-      touch $builddepsfile
-      # Put all found confs into a single file.
-      find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile
-      # Source the file to acquire the variables
-      if test -s $builddepsfile; then
-        . $builddepsfile
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found at least one!" >&5
-$as_echo "found at least one!" >&6; }
-      else
-        as_fn_error $? "Could not find any builddeps.conf at all!" "$LINENO" 5
-      fi
-    fi
-    # Create build and target names that use _ instead of "-" and ".".
-    # This is necessary to use them in variable names.
-    build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
-    target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
-    # Extract rewrite information for build and target
-    eval rewritten_build=\${REWRITE_${build_var}}
-    if test "x$rewritten_build" = x; then
-      rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME}
-      echo Build stays the same $rewritten_build
-    else
-      echo Rewriting build for builddeps into $rewritten_build
-    fi
-    eval rewritten_target=\${REWRITE_${target_var}}
-    if test "x$rewritten_target" = x; then
-      rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
-      echo Target stays the same $rewritten_target
-    else
-      echo Rewriting target for builddeps into $rewritten_target
-    fi
-    rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'`
-    rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'`
-  fi
-  for ac_prog in 7z unzip
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_BDEPS_UNZIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$BDEPS_UNZIP"; then
-  ac_cv_prog_BDEPS_UNZIP="$BDEPS_UNZIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_BDEPS_UNZIP="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-BDEPS_UNZIP=$ac_cv_prog_BDEPS_UNZIP
-if test -n "$BDEPS_UNZIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BDEPS_UNZIP" >&5
-$as_echo "$BDEPS_UNZIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$BDEPS_UNZIP" && break
-done
-
-  if test "x$BDEPS_UNZIP" = x7z; then
-    BDEPS_UNZIP="7z x"
-  fi
-
-  for ac_prog in wget lftp ftp
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_BDEPS_FTP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$BDEPS_FTP"; then
-  ac_cv_prog_BDEPS_FTP="$BDEPS_FTP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_BDEPS_FTP="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-BDEPS_FTP=$ac_cv_prog_BDEPS_FTP
-if test -n "$BDEPS_FTP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BDEPS_FTP" >&5
-$as_echo "$BDEPS_FTP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$BDEPS_FTP" && break
-done
-
-
-
-###############################################################################
-#
-# Determine OpenJDK variants, options and version numbers.
-#
-###############################################################################
-
-# We need build & target for this.
-
-
-  ###############################################################################
-  #
-  # Should we build a JDK/JVM with headful support (ie a graphical ui)?
-  # We always build headless support.
-  #
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking headful support" >&5
-$as_echo_n "checking headful support... " >&6; }
-  # Check whether --enable-headful was given.
-if test "${enable_headful+set}" = set; then :
-  enableval=$enable_headful; SUPPORT_HEADFUL=${enable_headful}
-else
-  SUPPORT_HEADFUL=yes
-fi
-
-
-  SUPPORT_HEADLESS=yes
-  BUILD_HEADLESS="BUILD_HEADLESS:=true"
-
-  if test "x$SUPPORT_HEADFUL" = xyes; then
-    # We are building both headful and headless.
-    headful_msg="include support for both headful and headless"
-  fi
-
-  if test "x$SUPPORT_HEADFUL" = xno; then
-    # Thus we are building headless only.
-    BUILD_HEADLESS="BUILD_HEADLESS:=true"
-    headful_msg="headless only"
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $headful_msg" >&5
-$as_echo "$headful_msg" >&6; }
-
-
-
-
-
-  # Control wether Hotspot runs Queens test after build.
-  # Check whether --enable-hotspot-test-in-build was given.
-if test "${enable_hotspot_test_in_build+set}" = set; then :
-  enableval=$enable_hotspot_test_in_build;
-else
-  enable_hotspot_test_in_build=no
-fi
-
-  if test "x$enable_hotspot_test_in_build" = "xyes"; then
-    TEST_IN_BUILD=true
-  else
-    TEST_IN_BUILD=false
-  fi
-
-
-  ###############################################################################
-  #
-  # Choose cacerts source file
-  #
-
-# Check whether --with-cacerts-file was given.
-if test "${with_cacerts_file+set}" = set; then :
-  withval=$with_cacerts_file;
-fi
-
-  if test "x$with_cacerts_file" != x; then
-    CACERTS_FILE=$with_cacerts_file
-  else
-    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
-  fi
-
-
-  ###############################################################################
-  #
-  # Enable or disable unlimited crypto
-  #
-  # Check whether --enable-unlimited-crypto was given.
-if test "${enable_unlimited_crypto+set}" = set; then :
-  enableval=$enable_unlimited_crypto;
-else
-  enable_unlimited_crypto=no
-fi
-
-  if test "x$enable_unlimited_crypto" = "xyes"; then
-    UNLIMITED_CRYPTO=true
-  else
-    UNLIMITED_CRYPTO=false
-  fi
-
-
-  ###############################################################################
-  #
-  # Enable or disable the elliptic curve crypto implementation
-  #
-
-
-  ###############################################################################
-  #
-  # Compress jars
-  #
-  COMPRESS_JARS=false
-
-
-
-
-  # Source the version numbers
-  . $AUTOCONF_DIR/version-numbers
-
-  # Get the settings from parameters
-
-# Check whether --with-milestone was given.
-if test "${with_milestone+set}" = set; then :
-  withval=$with_milestone;
-fi
-
-  if test "x$with_milestone" = xyes; then
-    as_fn_error $? "Milestone must have a value" "$LINENO" 5
-  elif test "x$with_milestone" != x; then
-    MILESTONE="$with_milestone"
-  fi
-  if test "x$MILESTONE" = x; then
-    MILESTONE=internal
-  fi
-
-
-# Check whether --with-update-version was given.
-if test "${with_update_version+set}" = set; then :
-  withval=$with_update_version;
-fi
-
-  if test "x$with_update_version" = xyes; then
-    as_fn_error $? "Update version must have a value" "$LINENO" 5
-  elif test "x$with_update_version" != x; then
-    JDK_UPDATE_VERSION="$with_update_version"
-    # On macosx 10.7, it's not possible to set --with-update-version=0X due
-    # to a bug in expr (which reduces it to just X). To work around this, we
-    # always add a 0 to one digit update versions.
-    if test "${#JDK_UPDATE_VERSION}" = "1"; then
-      JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}"
-    fi
-  fi
-
-
-# Check whether --with-user-release-suffix was given.
-if test "${with_user_release_suffix+set}" = set; then :
-  withval=$with_user_release_suffix;
-fi
-
-  if test "x$with_user_release_suffix" = xyes; then
-    as_fn_error $? "Release suffix must have a value" "$LINENO" 5
-  elif test "x$with_user_release_suffix" != x; then
-    USER_RELEASE_SUFFIX="$with_user_release_suffix"
-  fi
-
-
-# Check whether --with-build-number was given.
-if test "${with_build_number+set}" = set; then :
-  withval=$with_build_number;
-fi
-
-  if test "x$with_build_number" = xyes; then
-    as_fn_error $? "Build number must have a value" "$LINENO" 5
-  elif test "x$with_build_number" != x; then
-    JDK_BUILD_NUMBER="$with_build_number"
-  fi
-  # Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
-  if test "x$JDK_BUILD_NUMBER" = x; then
-    JDK_BUILD_NUMBER=b00
-    if test "x$USER_RELEASE_SUFFIX" = x; then
-      BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
-      # Avoid [:alnum:] since it depends on the locale.
-      CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
-      USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-    fi
-  fi
-
-  # Now set the JDK version, milestone, build number etc.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-copyright-year was given.
-if test "${with_copyright_year+set}" = set; then :
-  withval=$with_copyright_year;
-fi
-
-  if test "x$with_copyright_year" = xyes; then
-    as_fn_error $? "Copyright year must have a value" "$LINENO" 5
-  elif test "x$with_copyright_year" != x; then
-    COPYRIGHT_YEAR="$with_copyright_year"
-  else
-    COPYRIGHT_YEAR=`date +'%Y'`
-  fi
-
-
-  if test "x$JDK_UPDATE_VERSION" != x; then
-    JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
-  else
-    JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
-  fi
-
-
-  # The cooked update version used to encode trailing letters in the update
-  # version into a trailing number. That is no longer needed, but need to
-  # keep the format in 8u for compatibility.
-  COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0"
-
-
-  COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
-
-
-
-###############################################################################
-#
-# Setup BootJDK, used to bootstrap the build.
-#
-###############################################################################
-
-
-  BOOT_JDK_FOUND=no
-
-# Check whether --with-boot-jdk was given.
-if test "${with_boot_jdk+set}" = set; then :
-  withval=$with_boot_jdk;
-fi
-
-
-  # We look for the Boot JDK through various means, going from more certain to
-  # more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if
-  # we detected something (if so, the path to the jdk is in BOOT_JDK). But we
-  # must check if this is indeed valid; otherwise we'll continue looking.
-
-  # Test: Is bootjdk explicitely set by command line arguments?
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  if test "x$with_boot_jdk" != x; then
-    BOOT_JDK=$with_boot_jdk
-    BOOT_JDK_FOUND=maybe
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using configure arguments" >&5
-$as_echo "$as_me: Found potential Boot JDK using configure arguments" >&6;}
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-  if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then
-    # Having specified an argument which is incorrect will produce an instant failure;
-    # we should not go on looking
-    as_fn_error $? "The path given by --with-boot-jdk does not contain a valid Boot JDK" "$LINENO" 5
-  fi
-
-  # Test: Is bootjdk available from builddeps?
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-
-
-  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
-    # Source the builddeps file again, to make sure it uses the latest variables!
-    . $builddepsfile
-    # Look for a target and build machine specific resource!
-    eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a target specific resource
-      eval resource=\${builddep_bootjdk_TARGET_${rewritten_target_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a build specific resource
-      eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a generic resource
-      # (The bootjdk comes from M4 and not the shell, thus no need for eval here.)
-      resource=${builddep_bootjdk}
-    fi
-    if test "x$resource" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for bootjdk" >&5
-$as_echo "$as_me: Using builddeps $resource for bootjdk" >&6;}
-      # If the resource in the builddeps.conf file is an existing directory,
-      # for example /java/linux/cups
-      if test -d ${resource}; then
-        depdir=${resource}
-      else
-
-  # bootjdk is for example mymodule
-  # $resource is for example libs/general/libmymod_1_2_3.zip
-  # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
-  # $with_builddeps_dir is for example /localhome/builddeps
-  # depdir is the name of the variable into which we store the depdir, eg MYMOD
-  # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
-  # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
-  filename=`basename $resource`
-  filebase=`echo $filename | sed 's/\.[^\.]*$//'`
-  filebase=${filename%%.*}
-  extension=${filename#*.}
-  installdir=$with_builddeps_dir/$filebase
-  if test ! -f $installdir/$filename.unpacked; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&5
-$as_echo "$as_me: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&6;}
-    if test ! -d $installdir; then
-      mkdir -p $installdir
-    fi
-    if test ! -d $installdir; then
-      as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
-    fi
-    tmpfile=`mktemp $installdir/bootjdk.XXXXXXXXX`
-    touch $tmpfile
-    if test ! -f $tmpfile; then
-      as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
-    fi
-
-  # $with_builddeps_server/$resource  is the ftp://abuilddeps.server.com/libs/cups.zip
-  # $tmpfile is the local file name for the downloaded file.
-  VALID_TOOL=no
-  if test "x$BDEPS_FTP" = xwget; then
-    VALID_TOOL=yes
-    wget -O $tmpfile $with_builddeps_server/$resource
-  fi
-  if test "x$BDEPS_FTP" = xlftp; then
-    VALID_TOOL=yes
-    lftp -c "get $with_builddeps_server/$resource  -o $tmpfile"
-  fi
-  if test "x$BDEPS_FTP" = xftp; then
-    VALID_TOOL=yes
-    FTPSERVER=`echo $with_builddeps_server/$resource  | cut -f 3 -d '/'`
-    FTPPATH=`echo $with_builddeps_server/$resource  | cut -f 4- -d '/'`
-    FTPUSERPWD=${FTPSERVER%%@*}
-    if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
-      FTPUSER=${userpwd%%:*}
-      FTPPWD=${userpwd#*@}
-      FTPSERVER=${FTPSERVER#*@}
-    else
-      FTPUSER=ftp
-      FTPPWD=ftp
-    fi
-    # the "pass" command does not work on some
-    # ftp clients (read ftp.exe) but if it works,
-    # passive mode is better!
-    ( \
-        echo "user $FTPUSER $FTPPWD"        ; \
-        echo "pass"                         ; \
-        echo "bin"                          ; \
-        echo "get $FTPPATH $tmpfile"              ; \
-    ) | ftp -in $FTPSERVER
-  fi
-  if test "x$VALID_TOOL" != xyes; then
-    as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
-  fi
-
-    mv $tmpfile $installdir/$filename
-    if test ! -s $installdir/$filename; then
-      as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
-    fi
-    case "$extension" in
-      zip)  echo "Unzipping $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
-        ;;
-      tar.gz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      tgz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
-        ;;
-    esac
-  fi
-  if test -f $installdir/$filename.unpacked; then
-    depdir=$installdir
-  fi
-
-      fi
-      # Source the builddeps file again, because in the previous command, the depdir
-      # was updated to point at the current build dependency install directory.
-      . $builddepsfile
-      # Now extract variables from the builddeps.conf files.
-      theroot=${builddep_bootjdk_ROOT}
-      thecflags=${builddep_bootjdk_CFLAGS}
-      thelibs=${builddep_bootjdk_LIBS}
-      if test "x$depdir" = x; then
-        as_fn_error $? "Could not download build dependency bootjdk" "$LINENO" 5
-      fi
-      BOOT_JDK=$depdir
-      if test "x$theroot" != x; then
-        BOOT_JDK="$theroot"
-      fi
-      if test "x$thecflags" != x; then
-        BOOT_JDK_CFLAGS="$thecflags"
-      fi
-      if test "x$thelibs" != x; then
-        BOOT_JDK_LIBS="$thelibs"
-      fi
-      BOOT_JDK_FOUND=maybe
-      else BOOT_JDK_FOUND=no
-
-    fi
-    else BOOT_JDK_FOUND=no
-
-  fi
-
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-
-  # Test: Is $JAVA_HOME set?
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  if test "x$JAVA_HOME" != x; then
-    JAVA_HOME_PROCESSED="$JAVA_HOME"
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$JAVA_HOME_PROCESSED"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of JAVA_HOME_PROCESSED" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    JAVA_HOME_PROCESSED="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JAVA_HOME_PROCESSED to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting JAVA_HOME_PROCESSED to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$JAVA_HOME_PROCESSED"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    JAVA_HOME_PROCESSED="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JAVA_HOME_PROCESSED to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting JAVA_HOME_PROCESSED to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$JAVA_HOME_PROCESSED"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-    if test ! -d "$JAVA_HOME_PROCESSED"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Your JAVA_HOME points to a non-existing directory!" >&5
-$as_echo "$as_me: Your JAVA_HOME points to a non-existing directory!" >&6;}
-    else
-      # Aha, the user has set a JAVA_HOME
-      # let us use that as the Boot JDK.
-      BOOT_JDK="$JAVA_HOME_PROCESSED"
-      BOOT_JDK_FOUND=maybe
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using JAVA_HOME" >&5
-$as_echo "$as_me: Found potential Boot JDK using JAVA_HOME" >&6;}
-    fi
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-
-  # Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  if test -x /usr/libexec/java_home; then
-    BOOT_JDK=`/usr/libexec/java_home`
-    BOOT_JDK_FOUND=maybe
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using /usr/libexec/java_home" >&5
-$as_echo "$as_me: Found potential Boot JDK using /usr/libexec/java_home" >&6;}
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-
-  # Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  # Extract the first word of "javac", so it can be a program name with args.
-set dummy javac; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAC_CHECK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JAVAC_CHECK in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JAVAC_CHECK="$JAVAC_CHECK" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_JAVAC_CHECK="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-JAVAC_CHECK=$ac_cv_path_JAVAC_CHECK
-if test -n "$JAVAC_CHECK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC_CHECK" >&5
-$as_echo "$JAVAC_CHECK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  # Extract the first word of "java", so it can be a program name with args.
-set dummy java; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVA_CHECK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JAVA_CHECK in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JAVA_CHECK="$JAVA_CHECK" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_JAVA_CHECK="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-JAVA_CHECK=$ac_cv_path_JAVA_CHECK
-if test -n "$JAVA_CHECK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA_CHECK" >&5
-$as_echo "$JAVA_CHECK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  BINARY="$JAVAC_CHECK"
-  if test "x$JAVAC_CHECK" = x; then
-    BINARY="$JAVA_CHECK"
-  fi
-  if test "x$BINARY" != x; then
-    # So there is a java(c) binary, it might be part of a JDK.
-    # Lets find the JDK/JRE directory by following symbolic links.
-    # Linux/GNU systems often have links from /usr/bin/java to
-    # /etc/alternatives/java to the real JDK binary.
-
-  if test "x$OPENJDK_BUILD_OS" != xwindows; then
-    # Follow a chain of symbolic links. Use readlink
-    # where it exists, else fall back to horribly
-    # complicated shell code.
-    if test "x$READLINK_TESTED" != yes; then
-      # On MacOSX there is a readlink tool with a different
-      # purpose than the GNU readlink tool. Check the found readlink.
-      ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
-      if test "x$ISGNU" = x; then
-        # A readlink that we do not know how to use.
-        # Are there other non-GNU readlinks out there?
-        READLINK_TESTED=yes
-        READLINK=
-      fi
-    fi
-
-    if test "x$READLINK" != x; then
-      BINARY=`$READLINK -f $BINARY`
-    else
-      # Save the current directory for restoring afterwards
-      STARTDIR=$PWD
-      COUNTER=0
-      sym_link_dir=`$DIRNAME $BINARY`
-      sym_link_file=`$BASENAME $BINARY`
-      cd $sym_link_dir
-      # Use -P flag to resolve symlinks in directories.
-      cd `$THEPWDCMD -P`
-      sym_link_dir=`$THEPWDCMD -P`
-      # Resolve file symlinks
-      while test $COUNTER -lt 20; do
-        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
-        if test "x$ISLINK" == x; then
-          # This is not a symbolic link! We are done!
-          break
-        fi
-        # Again resolve directory symlinks since the target of the just found
-        # link could be in a different directory
-        cd `$DIRNAME $ISLINK`
-        sym_link_dir=`$THEPWDCMD -P`
-        sym_link_file=`$BASENAME $ISLINK`
-        let COUNTER=COUNTER+1
-      done
-      cd $STARTDIR
-      BINARY=$sym_link_dir/$sym_link_file
-    fi
-  fi
-
-    BOOT_JDK=`dirname "$BINARY"`
-    BOOT_JDK=`cd "$BOOT_JDK/.."; pwd`
-    if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then
-      # Looks like we found ourselves an JDK
-      BOOT_JDK_FOUND=maybe
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using java(c) in PATH" >&5
-$as_echo "$as_me: Found potential Boot JDK using java(c) in PATH" >&6;}
-    fi
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-
-  # Test: Is there a JDK installed in default, well-known locations?
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  if test "x$OPENJDK_TARGET_OS" = xwindows; then
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  if test "x$ProgramW6432" != x; then
-    VIRTUAL_DIR="$ProgramW6432/Java"
-
-  windows_path="$VIRTUAL_DIR"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    VIRTUAL_DIR="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    VIRTUAL_DIR="$unix_path"
-  fi
-
-
-  BOOT_JDK_PREFIX="$VIRTUAL_DIR"
-  BOOT_JDK_SUFFIX=""
-  ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
-  if test "x$ALL_JDKS_FOUND" != x; then
-    for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-        BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
-        if test -d "$BOOT_JDK"; then
-          BOOT_JDK_FOUND=maybe
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
-        fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-    done
-  fi
-
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  if test "x$PROGRAMW6432" != x; then
-    VIRTUAL_DIR="$PROGRAMW6432/Java"
-
-  windows_path="$VIRTUAL_DIR"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    VIRTUAL_DIR="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    VIRTUAL_DIR="$unix_path"
-  fi
-
-
-  BOOT_JDK_PREFIX="$VIRTUAL_DIR"
-  BOOT_JDK_SUFFIX=""
-  ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
-  if test "x$ALL_JDKS_FOUND" != x; then
-    for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-        BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
-        if test -d "$BOOT_JDK"; then
-          BOOT_JDK_FOUND=maybe
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
-        fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-    done
-  fi
-
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  if test "x$PROGRAMFILES" != x; then
-    VIRTUAL_DIR="$PROGRAMFILES/Java"
-
-  windows_path="$VIRTUAL_DIR"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    VIRTUAL_DIR="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    VIRTUAL_DIR="$unix_path"
-  fi
-
-
-  BOOT_JDK_PREFIX="$VIRTUAL_DIR"
-  BOOT_JDK_SUFFIX=""
-  ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
-  if test "x$ALL_JDKS_FOUND" != x; then
-    for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-        BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
-        if test -d "$BOOT_JDK"; then
-          BOOT_JDK_FOUND=maybe
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
-        fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-    done
-  fi
-
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  if test "x$ProgramFiles" != x; then
-    VIRTUAL_DIR="$ProgramFiles/Java"
-
-  windows_path="$VIRTUAL_DIR"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    VIRTUAL_DIR="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    VIRTUAL_DIR="$unix_path"
-  fi
-
-
-  BOOT_JDK_PREFIX="$VIRTUAL_DIR"
-  BOOT_JDK_SUFFIX=""
-  ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
-  if test "x$ALL_JDKS_FOUND" != x; then
-    for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-        BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
-        if test -d "$BOOT_JDK"; then
-          BOOT_JDK_FOUND=maybe
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
-        fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-    done
-  fi
-
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  BOOT_JDK_PREFIX="/cygdrive/c/Program Files/Java"
-  BOOT_JDK_SUFFIX=""
-  ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
-  if test "x$ALL_JDKS_FOUND" != x; then
-    for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-        BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
-        if test -d "$BOOT_JDK"; then
-          BOOT_JDK_FOUND=maybe
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
-        fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-    done
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-  elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  BOOT_JDK_PREFIX="/Library/Java/JavaVirtualMachines"
-  BOOT_JDK_SUFFIX="/Contents/Home"
-  ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
-  if test "x$ALL_JDKS_FOUND" != x; then
-    for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-        BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
-        if test -d "$BOOT_JDK"; then
-          BOOT_JDK_FOUND=maybe
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
-        fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-    done
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  BOOT_JDK_PREFIX="/System/Library/Java/JavaVirtualMachines"
-  BOOT_JDK_SUFFIX="/Contents/Home"
-  ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
-  if test "x$ALL_JDKS_FOUND" != x; then
-    for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-        BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
-        if test -d "$BOOT_JDK"; then
-          BOOT_JDK_FOUND=maybe
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
-        fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-    done
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-  elif test "x$OPENJDK_TARGET_OS" = xlinux; then
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-  BOOT_JDK_PREFIX="/usr/lib/jvm"
-  BOOT_JDK_SUFFIX=""
-  ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
-  if test "x$ALL_JDKS_FOUND" != x; then
-    for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
-
-  if test "x$BOOT_JDK_FOUND" = xno; then
-    # Now execute the test
-
-        BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
-        if test -d "$BOOT_JDK"; then
-          BOOT_JDK_FOUND=maybe
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
-        fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-    done
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-  fi
-
-
-    # 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"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
-        BOOT_JDK_FOUND=no
-      else
-        # Do we have a bin/javac?
-        if test ! -x "$BOOT_JDK/bin/javac"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
-$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
-          BOOT_JDK_FOUND=no
-        else
-          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
-          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
-            BOOT_JDK_FOUND=no
-          else
-            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
-            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
-
-            # Extra M4 quote needed to protect [] in grep expression.
-            FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-            if test "x$FOUND_VERSION_78" = x; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
-$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
-              { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
-$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
-              BOOT_JDK_FOUND=no
-            else
-              # We're done! :-)
-              BOOT_JDK_FOUND=yes
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$BOOT_JDK"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$BOOT_JDK"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    BOOT_JDK="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$BOOT_JDK"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
-$as_echo_n "checking for Boot JDK... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
-$as_echo "$BOOT_JDK" >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
-$as_echo_n "checking Boot JDK version... " >&6; }
-              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
-$as_echo "$BOOT_JDK_VERSION" >&6; }
-            fi # end check jdk version
-          fi # end check rt.jar
-        fi # end check javac
-      fi # end check java
-    fi # end check boot jdk found
-  fi
-
-
-  # If we haven't found anything yet, we've truly lost. Give up.
-  if test "x$BOOT_JDK_FOUND" = xno; then
-
-  # Print a helpful message on how to acquire the necessary build dependency.
-  # openjdk is the help tag: freetype, cups, pulse, alsa etc
-  MISSING_DEPENDENCY=openjdk
-
-  if 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_help     $MISSING_DEPENDENCY ;;
-      yum)
-        yum_help     $MISSING_DEPENDENCY ;;
-      port)
-        port_help    $MISSING_DEPENDENCY ;;
-      pkgutil)
-        pkgutil_help $MISSING_DEPENDENCY ;;
-      pkgadd)
-        pkgadd_help  $MISSING_DEPENDENCY ;;
-    esac
-
-    if test "x$PKGHANDLER_COMMAND" != x; then
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-    fi
-  fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find a valid Boot JDK. $HELP_MSG" >&5
-$as_echo "$as_me: Could not find a valid Boot JDK. $HELP_MSG" >&6;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: This might be fixed by explicitely setting --with-boot-jdk" >&5
-$as_echo "$as_me: This might be fixed by explicitely setting --with-boot-jdk" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-  # Setup proper paths for what we found
-  BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
-  if test ! -f "$BOOT_RTJAR"; then
-    # On MacOSX it is called classes.jar
-    BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar"
-    if test -f "$BOOT_RTJAR"; then
-      # Remove the ..
-      BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}"
-    fi
-  fi
-  BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
-  BOOT_JDK="$BOOT_JDK"
-
-
-
-
-  # Setup tools from the Boot JDK.
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for java in Boot JDK" >&5
-$as_echo_n "checking for java in Boot JDK... " >&6; }
-  JAVA=$BOOT_JDK/bin/java
-  if test ! -x $JAVA; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
-    as_fn_error $? "Could not find java in the Boot JDK" "$LINENO" 5
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for javac in Boot JDK" >&5
-$as_echo_n "checking for javac in Boot JDK... " >&6; }
-  JAVAC=$BOOT_JDK/bin/javac
-  if test ! -x $JAVAC; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
-    as_fn_error $? "Could not find javac in the Boot JDK" "$LINENO" 5
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for javah in Boot JDK" >&5
-$as_echo_n "checking for javah in Boot JDK... " >&6; }
-  JAVAH=$BOOT_JDK/bin/javah
-  if test ! -x $JAVAH; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
-    as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for javap in Boot JDK" >&5
-$as_echo_n "checking for javap in Boot JDK... " >&6; }
-  JAVAP=$BOOT_JDK/bin/javap
-  if test ! -x $JAVAP; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
-    as_fn_error $? "Could not find javap in the Boot JDK" "$LINENO" 5
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jar in Boot JDK" >&5
-$as_echo_n "checking for jar in Boot JDK... " >&6; }
-  JAR=$BOOT_JDK/bin/jar
-  if test ! -x $JAR; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
-    as_fn_error $? "Could not find jar in the Boot JDK" "$LINENO" 5
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rmic in Boot JDK" >&5
-$as_echo_n "checking for rmic in Boot JDK... " >&6; }
-  RMIC=$BOOT_JDK/bin/rmic
-  if test ! -x $RMIC; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
-    as_fn_error $? "Could not find rmic in the Boot JDK" "$LINENO" 5
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native2ascii in Boot JDK" >&5
-$as_echo_n "checking for native2ascii in Boot JDK... " >&6; }
-  NATIVE2ASCII=$BOOT_JDK/bin/native2ascii
-  if test ! -x $NATIVE2ASCII; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
-    as_fn_error $? "Could not find native2ascii in the Boot JDK" "$LINENO" 5
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
-  # Finally, set some other options...
-
-  # When compiling code to be executed by the Boot JDK, force jdk7 compatibility.
-  BOOT_JDK_SOURCETARGET="-source 7 -target 7"
-
-
-
-  # Check if the boot jdk is 32 or 64 bit
-  if "$JAVA" -d64 -version > /dev/null 2>&1; then
-    BOOT_JDK_BITS="64"
-  else
-    BOOT_JDK_BITS="32"
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Boot JDK is 32 or 64 bits" >&5
-$as_echo_n "checking if Boot JDK is 32 or 64 bits... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_BITS" >&5
-$as_echo "$BOOT_JDK_BITS" >&6; }
-
-
-
-  ##############################################################################
-  #
-  # Specify options for anything that is run with the Boot JDK.
-  #
-
-# Check whether --with-boot-jdk-jvmargs was given.
-if test "${with_boot_jdk_jvmargs+set}" = set; then :
-  withval=$with_boot_jdk_jvmargs;
-fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking flags for boot jdk java command " >&5
-$as_echo_n "checking flags for boot jdk java command ... " >&6; }
-
-  # Disable special log output when a debug build is used as Boot JDK...
-
-  $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5
-  $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5
-  OUTPUT=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-
-  # Apply user provided options.
-
-  $ECHO "Check if jvm arg is ok: $with_boot_jdk_jvmargs" >&5
-  $ECHO "Command: $JAVA $with_boot_jdk_jvmargs -version" >&5
-  OUTPUT=`$JAVA $with_boot_jdk_jvmargs -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    boot_jdk_jvmargs="$boot_jdk_jvmargs $with_boot_jdk_jvmargs"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boot_jdk_jvmargs" >&5
-$as_echo "$boot_jdk_jvmargs" >&6; }
-
-  # For now, general JAVA_FLAGS are the same as the boot jdk jvmargs
-  JAVA_FLAGS=$boot_jdk_jvmargs
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking flags for boot jdk java command for big workloads" >&5
-$as_echo_n "checking flags for boot jdk java command for big workloads... " >&6; }
-
-  # Starting amount of heap memory.
-
-  $ECHO "Check if jvm arg is ok: -Xms64M" >&5
-  $ECHO "Command: $JAVA -Xms64M -version" >&5
-  OUTPUT=`$JAVA -Xms64M -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -Xms64M"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-
-  # Maximum amount of heap memory.
-  # Maximum stack size.
-  if test "x$BOOT_JDK_BITS" = x32; then
-    JVM_MAX_HEAP=1100M
-    STACK_SIZE=768
-  else
-    # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
-    # pointers are used. Apparently, we need to increase the heap and stack
-    # space for the jvm. More specifically, when running javac to build huge
-    # jdk batch
-    JVM_MAX_HEAP=1600M
-    STACK_SIZE=1536
-  fi
-
-  $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5
-  $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5
-  OUTPUT=`$JAVA -Xmx$JVM_MAX_HEAP -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -Xmx$JVM_MAX_HEAP"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-
-  $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5
-  $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5
-  OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -XX:ThreadStackSize=$STACK_SIZE"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-
-  $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5
-  $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5
-  OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -XX:PermSize=32m"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-
-  $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5
-  $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5
-  OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -XX:MaxPermSize=160m"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boot_jdk_jvmargs_big" >&5
-$as_echo "$boot_jdk_jvmargs_big" >&6; }
-
-  JAVA_FLAGS_BIG=$boot_jdk_jvmargs_big
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking flags for boot jdk java command for small workloads" >&5
-$as_echo_n "checking flags for boot jdk java command for small workloads... " >&6; }
-
-  # Use serial gc for small short lived tools if possible
-
-  $ECHO "Check if jvm arg is ok: -XX:+UseSerialGC" >&5
-  $ECHO "Command: $JAVA -XX:+UseSerialGC -version" >&5
-  OUTPUT=`$JAVA -XX:+UseSerialGC -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    boot_jdk_jvmargs_small="$boot_jdk_jvmargs_small -XX:+UseSerialGC"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-
-  $ECHO "Check if jvm arg is ok: -Xms32M" >&5
-  $ECHO "Command: $JAVA -Xms32M -version" >&5
-  OUTPUT=`$JAVA -Xms32M -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    boot_jdk_jvmargs_small="$boot_jdk_jvmargs_small -Xms32M"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-
-  $ECHO "Check if jvm arg is ok: -Xmx512M" >&5
-  $ECHO "Command: $JAVA -Xmx512M -version" >&5
-  OUTPUT=`$JAVA -Xmx512M -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    boot_jdk_jvmargs_small="$boot_jdk_jvmargs_small -Xmx512M"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boot_jdk_jvmargs_small" >&5
-$as_echo "$boot_jdk_jvmargs_small" >&6; }
-
-  JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small
-
-
-
-###############################################################################
-#
-# Configure the sources to use. We can add or override individual directories.
-#
-###############################################################################
-
-
-  # Where are the sources. Any of these can be overridden
-  # using --with-override-corba and the likes.
-  LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
-  CORBA_TOPDIR="$SRC_ROOT/corba"
-  JAXP_TOPDIR="$SRC_ROOT/jaxp"
-  JAXWS_TOPDIR="$SRC_ROOT/jaxws"
-  HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
-  NASHORN_TOPDIR="$SRC_ROOT/nashorn"
-  JDK_TOPDIR="$SRC_ROOT/jdk"
-
-
-
-
-
-
-
-
-
-
-  ###############################################################################
-  #
-  # Pickup additional source for a component from outside of the source root
-  # or override source for a component.
-  #
-
-# Check whether --with-add-source-root was given.
-if test "${with_add_source_root+set}" = set; then :
-  withval=$with_add_source_root;
-fi
-
-
-
-# Check whether --with-override-source-root was given.
-if test "${with_override_source_root+set}" = set; then :
-  withval=$with_override_source_root;
-fi
-
-
-
-# Check whether --with-adds-and-overrides was given.
-if test "${with_adds_and_overrides+set}" = set; then :
-  withval=$with_adds_and_overrides;
-fi
-
-
-  if test "x$with_adds_and_overrides" != x; then
-    with_add_source_root="$with_adds_and_overrides/adds"
-    with_override_source_root="$with_adds_and_overrides/overrides"
-  fi
-
-  if test "x$with_add_source_root" != x; then
-    if ! test -d $with_add_source_root; then
-      as_fn_error $? "Trying to use a non-existant add-source-root $with_add_source_root" "$LINENO" 5
-    fi
-    CURDIR="$PWD"
-    cd "$with_add_source_root"
-    ADD_SRC_ROOT="`pwd`"
-    cd "$CURDIR"
-    # Verify that the addon source root does not have any root makefiles.
-    # If it does, then it is usually an error, prevent this.
-    if test -f $with_add_source_root/langtools/make/Makefile; then
-      as_fn_error $? "Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources." "$LINENO" 5
-    fi
-    if test -f $with_add_source_root/corba/make/Makefile; then
-      as_fn_error $? "Your add source root seems to contain a full corba repo! An add source root should only contain additional sources." "$LINENO" 5
-    fi
-    if test -f $with_add_source_root/jaxp/make/Makefile; then
-      as_fn_error $? "Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources." "$LINENO" 5
-    fi
-    if test -f $with_add_source_root/jaxws/make/Makefile; then
-      as_fn_error $? "Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources." "$LINENO" 5
-    fi
-    if test -f $with_add_source_root/hotspot/make/Makefile; then
-      as_fn_error $? "Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources." "$LINENO" 5
-    fi
-    if test -f $with_add_source_root/nashorn/make/Makefile; then
-      as_fn_error $? "Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources." "$LINENO" 5
-    fi
-    if test -f $with_add_source_root/jdk/make/Makefile; then
-      as_fn_error $? "Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources." "$LINENO" 5
-    fi
-  fi
-
-
-  if test "x$with_override_source_root" != x; then
-    if ! test -d $with_override_source_root; then
-      as_fn_error $? "Trying to use a non-existant override-source-root $with_override_source_root" "$LINENO" 5
-    fi
-    CURDIR="$PWD"
-    cd "$with_override_source_root"
-    OVERRIDE_SRC_ROOT="`pwd`"
-    cd "$CURDIR"
-    if test -f $with_override_source_root/langtools/make/Makefile; then
-      as_fn_error $? "Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override." "$LINENO" 5
-    fi
-    if test -f $with_override_source_root/corba/make/Makefile; then
-      as_fn_error $? "Your override source root seems to contain a full corba repo! An override source root should only contain sources that override." "$LINENO" 5
-    fi
-    if test -f $with_override_source_root/jaxp/make/Makefile; then
-      as_fn_error $? "Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override." "$LINENO" 5
-    fi
-    if test -f $with_override_source_root/jaxws/make/Makefile; then
-      as_fn_error $? "Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override." "$LINENO" 5
-    fi
-    if test -f $with_override_source_root/hotspot/make/Makefile; then
-      as_fn_error $? "Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override." "$LINENO" 5
-    fi
-    if test -f $with_override_source_root/nashorn/make/Makefile; then
-      as_fn_error $? "Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override." "$LINENO" 5
-    fi
-    if test -f $with_override_source_root/jdk/make/Makefile; then
-      as_fn_error $? "Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override." "$LINENO" 5
-    fi
-  fi
-
-
-  ###############################################################################
-  #
-  # Override a repo completely, this is used for example when you have 3 small
-  # development sandboxes of the langtools sources and want to avoid having 3 full
-  # OpenJDK sources checked out on disk.
-  #
-  # Assuming that the 3 langtools sandboxes are located here:
-  # /home/fredrik/sandbox1/langtools
-  # /home/fredrik/sandbox2/langtools
-  # /home/fredrik/sandbox3/langtools
-  #
-  # From the source root you create build subdirs manually:
-  #     mkdir -p build1 build2 build3
-  # in each build directory run:
-  #     (cd build1 && ../configure --with-override-langtools=/home/fredrik/sandbox1 && make)
-  #     (cd build2 && ../configure --with-override-langtools=/home/fredrik/sandbox2 && make)
-  #     (cd build3 && ../configure --with-override-langtools=/home/fredrik/sandbox3 && make)
-  #
-
-
-# Check whether --with-override-langtools was given.
-if test "${with_override_langtools+set}" = set; then :
-  withval=$with_override_langtools;
-fi
-
-
-
-# Check whether --with-override-corba was given.
-if test "${with_override_corba+set}" = set; then :
-  withval=$with_override_corba;
-fi
-
-
-
-# Check whether --with-override-jaxp was given.
-if test "${with_override_jaxp+set}" = set; then :
-  withval=$with_override_jaxp;
-fi
-
-
-
-# Check whether --with-override-jaxws was given.
-if test "${with_override_jaxws+set}" = set; then :
-  withval=$with_override_jaxws;
-fi
-
-
-
-# Check whether --with-override-hotspot was given.
-if test "${with_override_hotspot+set}" = set; then :
-  withval=$with_override_hotspot;
-fi
-
-
-
-# Check whether --with-override-nashorn was given.
-if test "${with_override_nashorn+set}" = set; then :
-  withval=$with_override_nashorn;
-fi
-
-
-
-# Check whether --with-override-jdk was given.
-if test "${with_override_jdk+set}" = set; then :
-  withval=$with_override_jdk;
-fi
-
-
-  if test "x$with_override_langtools" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_langtools"
-    LANGTOOLS_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
-      as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if langtools should be overridden" >&5
-$as_echo_n "checking if langtools should be overridden... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $LANGTOOLS_TOPDIR" >&5
-$as_echo "yes with $LANGTOOLS_TOPDIR" >&6; }
-  fi
-  if test "x$with_override_corba" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_corba"
-    CORBA_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $CORBA_TOPDIR/make/Makefile; then
-      as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if corba should be overridden" >&5
-$as_echo_n "checking if corba should be overridden... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $CORBA_TOPDIR" >&5
-$as_echo "yes with $CORBA_TOPDIR" >&6; }
-  fi
-  if test "x$with_override_jaxp" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_jaxp"
-    JAXP_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $JAXP_TOPDIR/make/Makefile; then
-      as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxp should be overridden" >&5
-$as_echo_n "checking if jaxp should be overridden... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $JAXP_TOPDIR" >&5
-$as_echo "yes with $JAXP_TOPDIR" >&6; }
-  fi
-  if test "x$with_override_jaxws" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_jaxws"
-    JAXWS_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $JAXWS_TOPDIR/make/Makefile; then
-      as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxws should be overridden" >&5
-$as_echo_n "checking if jaxws should be overridden... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $JAXWS_TOPDIR" >&5
-$as_echo "yes with $JAXWS_TOPDIR" >&6; }
-  fi
-  if test "x$with_override_hotspot" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_hotspot"
-    HOTSPOT_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
-      as_fn_error $? "You have to override hotspot with a full hotspot repo!" "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5
-$as_echo_n "checking if hotspot should be overridden... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5
-$as_echo "yes with $HOTSPOT_TOPDIR" >&6; }
-  fi
-  if test "x$with_override_nashorn" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_nashorn"
-    NASHORN_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $NASHORN_TOPDIR/make/Makefile; then
-      as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
-$as_echo_n "checking if nashorn should be overridden... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $NASHORN_TOPDIR" >&5
-$as_echo "yes with $NASHORN_TOPDIR" >&6; }
-  fi
-  if test "x$with_override_jdk" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_jdk"
-    JDK_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $JDK_TOPDIR/make/Makefile; then
-      as_fn_error $? "You have to override JDK with a full JDK repo!" "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if JDK should be overridden" >&5
-$as_echo_n "checking if JDK should be overridden... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $JDK_TOPDIR" >&5
-$as_echo "yes with $JDK_TOPDIR" >&6; }
-  fi
-
-
-  BUILD_OUTPUT="$OUTPUT_ROOT"
-
-
-  HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
-  BUILD_HOTSPOT=true
-
-
-
-# Check whether --with-import-hotspot was given.
-if test "${with_import_hotspot+set}" = set; then :
-  withval=$with_import_hotspot;
-fi
-
-  if test "x$with_import_hotspot" != x; then
-    CURDIR="$PWD"
-    cd "$with_import_hotspot"
-    HOTSPOT_DIST="`pwd`"
-    cd "$CURDIR"
-    if ! (test -d $HOTSPOT_DIST/lib && test -d $HOTSPOT_DIST/jre/lib); then
-      as_fn_error $? "You have to import hotspot from a full jdk image or hotspot build dist dir!" "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be imported" >&5
-$as_echo_n "checking if hotspot should be imported... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes from $HOTSPOT_DIST" >&5
-$as_echo "yes from $HOTSPOT_DIST" >&6; }
-    BUILD_HOTSPOT=false
-  fi
-
-  JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
-
-
-###############################################################################
-#
-# Setup the toolchain (compilers etc), i.e. the tools that need to be
-# cross-compilation aware.
-#
-###############################################################################
-
-
-  ###############################################################################
-  #
-  # Configure the development tool paths and potential sysroot.
-  #
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  # The option used to specify the target .o,.a or .so file.
-  # When compiling, how to specify the to be created object file.
-  CC_OUT_OPTION='-o$(SPACE)'
-  # When linking, how to specify the to be created executable.
-  EXE_OUT_OPTION='-o$(SPACE)'
-  # When linking, how to specify the to be created dynamically linkable library.
-  LD_OUT_OPTION='-o$(SPACE)'
-  # When archiving, how to specify the to be create static archive for object files.
-  AR_OUT_OPTION='rcs$(SPACE)'
-
-
-
-
-
-# Locate the actual tools
-
-
-# Check whether --with-jtreg was given.
-if test "${with_jtreg+set}" = set; then :
-  withval=$with_jtreg;
-else
-  with_jtreg=no
-fi
-
-
-  if test "x$with_jtreg" = xno; then
-    # jtreg disabled
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
-$as_echo_n "checking for jtreg... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  else
-    if test "x$with_jtreg" != xyes; then
-      # with path specified.
-      JT_HOME="$with_jtreg"
-    fi
-
-    if test "x$JT_HOME" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
-$as_echo_n "checking for jtreg... " >&6; }
-
-      # use JT_HOME enviroment var.
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$JT_HOME"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JT_HOME, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of JT_HOME, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of JT_HOME" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    JT_HOME="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JT_HOME to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting JT_HOME to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$JT_HOME"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    JT_HOME="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JT_HOME to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting JT_HOME to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$JT_HOME"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JT_HOME, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of JT_HOME, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    JT_HOME="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-      # jtreg win32 script works for everybody
-      JTREGEXE="$JT_HOME/bin/jtreg"
-
-      if test ! -f "$JTREGEXE"; then
-        as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5
-      fi
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
-$as_echo "$JTREGEXE" >&6; }
-    else
-      # try to find jtreg on path
-
-  for ac_prog in jtreg
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JTREGEXE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JTREGEXE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-JTREGEXE=$ac_cv_path_JTREGEXE
-if test -n "$JTREGEXE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
-$as_echo "$JTREGEXE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$JTREGEXE" && break
-done
-
-
-  if test "x$JTREGEXE" = x; then
-    if test "xjtreg" = x; then
-      PROG_NAME=jtregexe
-    else
-      PROG_NAME=jtreg
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-      JT_HOME="`$DIRNAME $JTREGEXE`"
-    fi
-  fi
-
-
-
-
-
-  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-
-  # Store path to cygwin link.exe to help excluding it when searching for
-  # VS linker. This must be done before changing the PATH when looking for VS.
-  # Extract the first word of "link", so it can be a program name with args.
-set dummy link; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CYGWIN_LINK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CYGWIN_LINK in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CYGWIN_LINK="$CYGWIN_LINK" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CYGWIN_LINK="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CYGWIN_LINK=$ac_cv_path_CYGWIN_LINK
-if test -n "$CYGWIN_LINK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGWIN_LINK" >&5
-$as_echo "$CYGWIN_LINK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  if test "x$CYGWIN_LINK" != x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the first found link.exe is actually the Cygwin link tool" >&5
-$as_echo_n "checking if the first found link.exe is actually the Cygwin link tool... " >&6; }
-    "$CYGWIN_LINK" --version > /dev/null
-    if test $? -eq 0 ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      # This might be the VS linker. Don't exclude it later on.
-      CYGWIN_LINK=""
-    fi
-  fi
-
-  # First-hand choice is to locate and run the vsvars bat file.
-
-  if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-    VCVARSFILE="vc/bin/vcvars32.bat"
-  else
-    VCVARSFILE="vc/bin/amd64/vcvars64.bat"
-  fi
-
-  VS_ENV_CMD=""
-  VS_ENV_ARGS=""
-  if test "x$with_toolsdir" != x; then
-
-  if test "x$VS_ENV_CMD" = x; then
-    VS_VERSION="2010"
-    VS100BASE="$with_toolsdir/../.."
-    METHOD="--with-tools-dir"
-
-  windows_path="$VS100BASE"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    VS100BASE="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    VS100BASE="$unix_path"
-  fi
-
-    if test -d "$VS100BASE"; then
-      if test -f "$VS100BASE/$VCVARSFILE"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
-$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
-        VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
-$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5
-$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;}
-      fi
-    fi
-  fi
-
-  fi
-
-  if test "x$with_toolsdir" != x && 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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path given by --with-tools-dir does not contain a valid Visual Studio installation" >&5
-$as_echo "$as_me: The path given by --with-tools-dir does not contain a valid Visual Studio installation" >&6;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Please point to the VC/bin directory within the Visual Studio installation" >&5
-$as_echo "$as_me: Please point to the VC/bin directory within the Visual Studio installation" >&6;}
-    as_fn_error $? "Cannot locate a valid Visual Studio installation" "$LINENO" 5
-  fi
-
-  if test "x$VS100COMNTOOLS" != x; then
-
-  if test "x$VS_ENV_CMD" = x; then
-    VS_VERSION="2010"
-    VS100BASE="$VS100COMNTOOLS/../.."
-    METHOD="VS100COMNTOOLS variable"
-
-  windows_path="$VS100BASE"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    VS100BASE="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    VS100BASE="$unix_path"
-  fi
-
-    if test -d "$VS100BASE"; then
-      if test -f "$VS100BASE/$VCVARSFILE"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
-$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
-        VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
-$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5
-$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;}
-      fi
-    fi
-  fi
-
-  fi
-  if test "x$PROGRAMFILES" != x; then
-
-  if test "x$VS_ENV_CMD" = x; then
-    VS_VERSION="2010"
-    VS100BASE="$PROGRAMFILES/Microsoft Visual Studio 10.0"
-    METHOD="well-known name"
-
-  windows_path="$VS100BASE"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    VS100BASE="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    VS100BASE="$unix_path"
-  fi
-
-    if test -d "$VS100BASE"; then
-      if test -f "$VS100BASE/$VCVARSFILE"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
-$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
-        VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
-$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5
-$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;}
-      fi
-    fi
-  fi
-
-  fi
-
-  if test "x$VS_ENV_CMD" = x; then
-    VS_VERSION="2010"
-    VS100BASE="C:/Program Files/Microsoft Visual Studio 10.0"
-    METHOD="well-known name"
-
-  windows_path="$VS100BASE"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    VS100BASE="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    VS100BASE="$unix_path"
-  fi
-
-    if test -d "$VS100BASE"; then
-      if test -f "$VS100BASE/$VCVARSFILE"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
-$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
-        VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
-$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5
-$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;}
-      fi
-    fi
-  fi
-
-
-  if test "x$VS_ENV_CMD" = x; then
-    VS_VERSION="2010"
-    VS100BASE="C:/Program Files (x86)/Microsoft Visual Studio 10.0"
-    METHOD="well-known name"
-
-  windows_path="$VS100BASE"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    VS100BASE="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    VS100BASE="$unix_path"
-  fi
-
-    if test -d "$VS100BASE"; then
-      if test -f "$VS100BASE/$VCVARSFILE"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
-$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
-        VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
-$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5
-$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;}
-      fi
-    fi
-  fi
-
-
-  if test "x$VS_ENV_CMD" = x; then
-    VS_VERSION="2013"
-    VS100BASE="C:/Program Files (x86)/Microsoft Visual Studio 12.0"
-    METHOD="well-known name"
-
-  windows_path="$VS100BASE"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    VS100BASE="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    VS100BASE="$unix_path"
-  fi
-
-    if test -d "$VS100BASE"; then
-      if test -f "$VS100BASE/$VCVARSFILE"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
-$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
-        VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
-$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5
-$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;}
-      fi
-    fi
-  fi
-
-
-  if test "x$ProgramW6432" != x; then
-
-  if test "x$VS_ENV_CMD" = x; then
-    WIN_SDK_BASE="$ProgramW6432/Microsoft SDKs/Windows/v7.1/Bin"
-    METHOD="well-known name"
-
-  windows_path="$WIN_SDK_BASE"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    WIN_SDK_BASE="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    WIN_SDK_BASE="$unix_path"
-  fi
-
-    if 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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
-$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
-      elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
-        if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-          VS_ENV_ARGS="/x86"
-        else
-          VS_ENV_ARGS="/x64"
-        fi
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&5
-$as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&6;}
-      fi
-    fi
-  fi
-
-  fi
-  if test "x$PROGRAMW6432" != x; then
-
-  if test "x$VS_ENV_CMD" = x; then
-    WIN_SDK_BASE="$PROGRAMW6432/Microsoft SDKs/Windows/v7.1/Bin"
-    METHOD="well-known name"
-
-  windows_path="$WIN_SDK_BASE"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    WIN_SDK_BASE="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    WIN_SDK_BASE="$unix_path"
-  fi
-
-    if 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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
-$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
-      elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
-        if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-          VS_ENV_ARGS="/x86"
-        else
-          VS_ENV_ARGS="/x64"
-        fi
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&5
-$as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&6;}
-      fi
-    fi
-  fi
-
-  fi
-  if test "x$PROGRAMFILES" != x; then
-
-  if test "x$VS_ENV_CMD" = x; then
-    WIN_SDK_BASE="$PROGRAMFILES/Microsoft SDKs/Windows/v7.1/Bin"
-    METHOD="well-known name"
-
-  windows_path="$WIN_SDK_BASE"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    WIN_SDK_BASE="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    WIN_SDK_BASE="$unix_path"
-  fi
-
-    if 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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
-$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
-      elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
-        if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-          VS_ENV_ARGS="/x86"
-        else
-          VS_ENV_ARGS="/x64"
-        fi
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&5
-$as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&6;}
-      fi
-    fi
-  fi
-
-  fi
-
-  if test "x$VS_ENV_CMD" = x; then
-    WIN_SDK_BASE="C:/Program Files/Microsoft SDKs/Windows/v7.1/Bin"
-    METHOD="well-known name"
-
-  windows_path="$WIN_SDK_BASE"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    WIN_SDK_BASE="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    WIN_SDK_BASE="$unix_path"
-  fi
-
-    if 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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
-$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
-      elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
-        if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-          VS_ENV_ARGS="/x86"
-        else
-          VS_ENV_ARGS="/x64"
-        fi
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&5
-$as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&6;}
-      fi
-    fi
-  fi
-
-
-  if test "x$VS_ENV_CMD" = x; then
-    WIN_SDK_BASE="C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1/Bin"
-    METHOD="well-known name"
-
-  windows_path="$WIN_SDK_BASE"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    WIN_SDK_BASE="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    WIN_SDK_BASE="$unix_path"
-  fi
-
-    if 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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
-$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
-      elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
-        if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-          VS_ENV_ARGS="/x86"
-        else
-          VS_ENV_ARGS="/x64"
-        fi
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
-$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&5
-$as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&6;}
-      fi
-    fi
-  fi
-
-
-  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.
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$VS_ENV_CMD"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of VS_ENV_CMD" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of VS_ENV_CMD, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of VS_ENV_CMD" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$VS_ENV_CMD"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of VS_ENV_CMD" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$VS_ENV_CMD"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving VS_ENV_CMD (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving VS_ENV_CMD (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of VS_ENV_CMD" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    VS_ENV_CMD="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting VS_ENV_CMD to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting VS_ENV_CMD to \"$new_complete\"" >&6;}
-  fi
-
-
-    # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Trying to extract Visual Studio environment variables" >&5
-$as_echo "$as_me: Trying to extract Visual Studio environment variables" >&6;}
-    cd $OUTPUT_ROOT
-    # FIXME: The code betweeen ---- was inlined from a separate script and is not properly adapted
-    # to autoconf standards.
-
-    #----
-
-    # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment)
-    # but calculate the difference in Cygwin environment before/after running it and then
-    # apply the diff.
-
-    if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
-      _vs10varsall=`cygpath -a -m -s "$VS_ENV_CMD"`
-      _dosvs10varsall=`cygpath -a -w -s $_vs10varsall`
-      _dosbash=`cygpath -a -w -s \`which bash\`.*`
-    else
-      _dosvs10varsall=`cmd //c echo $VS_ENV_CMD`
-      _dosbash=`cmd //c echo \`which bash\``
-    fi
-
-    # generate the set of exported vars before/after the vs10 setup
-    $ECHO "@echo off"                                           >  localdevenvtmp.bat
-    $ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export0" >> localdevenvtmp.bat
-    $ECHO "call $_dosvs10varsall $VS_ENV_ARGS"                  >> localdevenvtmp.bat
-    $ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export1" >> localdevenvtmp.bat
-
-    # Now execute the newly created bat file.
-    # The | cat is to stop SetEnv.Cmd to mess with system colors on msys
-    cmd /c localdevenvtmp.bat | cat
-
-    # apply the diff (less some non-vs10 vars named by "!")
-    $SORT localdevenvtmp.export0 | $GREP -v "!" > localdevenvtmp.export0.sort
-    $SORT localdevenvtmp.export1 | $GREP -v "!" > localdevenvtmp.export1.sort
-    $COMM -1 -3 localdevenvtmp.export0.sort localdevenvtmp.export1.sort > localdevenv.sh
-
-    # cleanup
-    $RM localdevenvtmp*
-    #----
-    cd $CURDIR
-    if test ! -s $OUTPUT_ROOT/localdevenv.sh; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Could not succesfully extract the envionment variables needed for the VS setup." >&5
-$as_echo "$as_me: Could not succesfully extract the envionment variables needed for the VS setup." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&5
-$as_echo "$as_me: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: or run \"bash.exe -l\" from a VS command prompt and then run configure from there." >&5
-$as_echo "$as_me: or run \"bash.exe -l\" from a VS command prompt and then run configure from there." >&6;}
-      as_fn_error $? "Cannot continue" "$LINENO" 5
-    fi
-
-    # Now set all paths and other env variables. This will allow the rest of
-    # the configure script to find and run the compiler in the proper way.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Setting extracted environment variables" >&5
-$as_echo "$as_me: Setting extracted environment variables" >&6;}
-    . $OUTPUT_ROOT/localdevenv.sh
-  else
-    # We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot locate a valid Visual Studio installation, checking current environment" >&5
-$as_echo "$as_me: Cannot locate a valid Visual Studio installation, checking current environment" >&6;}
-  fi
-
-  # At this point, we should have corrent variables in the environment, or we can't continue.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Visual Studio variables" >&5
-$as_echo_n "checking for Visual Studio variables... " >&6; }
-
-  if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x || test "x$WINDOWSSDKDIR" != x; then
-    if test "x$INCLUDE" = x || test "x$LIB" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: present but broken" >&5
-$as_echo "present but broken" >&6; }
-      as_fn_error $? "Your VC command prompt seems broken, INCLUDE and/or LIB is missing." "$LINENO" 5
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-      # Remove any trailing \ from INCLUDE and LIB to avoid trouble in spec.gmk.
-      VS_INCLUDE=`$ECHO "$INCLUDE" | $SED 's/\\\\$//'`
-      VS_LIB=`$ECHO "$LIB" | $SED 's/\\\\$//'`
-      # Remove any paths containing # (typically F#) as that messes up make
-      PATH=`$ECHO "$PATH" | $SED 's/[^:#]*#[^:]*://g'`
-      VS_PATH="$PATH"
-
-
-
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-
-    if test "x$VS_ENV_CMD" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot locate a valid Visual Studio or Windows SDK installation on disk," >&5
-$as_echo "$as_me: Cannot locate a valid Visual Studio or Windows SDK installation on disk," >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: nor is this script run from a Visual Studio command prompt." >&5
-$as_echo "$as_me: nor is this script run from a Visual Studio command prompt." >&6;}
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Running the extraction script failed." >&5
-$as_echo "$as_me: Running the extraction script failed." >&6;}
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&5
-$as_echo "$as_me: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&6;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: or run \"bash.exe -l\" from a VS command prompt and then run configure from there." >&5
-$as_echo "$as_me: or run \"bash.exe -l\" from a VS command prompt and then run configure from there." >&6;}
-    as_fn_error $? "Cannot continue" "$LINENO" 5
-  fi
-
-
-
-# Check whether --with-msvcr-dll was given.
-if test "${with_msvcr_dll+set}" = set; then :
-  withval=$with_msvcr_dll;
-fi
-
-
-  if test "x$with_msvcr_dll" != x; then
-    # If given explicitely by user, do not probe. If not present, fail directly.
-
-  POSSIBLE_MSVCR_DLL="$with_msvcr_dll"
-  METHOD="--with-msvcr-dll"
-  if test -e "$POSSIBLE_MSVCR_DLL"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
-$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
-
-    # Need to check if the found msvcr is correct architecture
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
-$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
-    MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-      CORRECT_MSVCR_ARCH=386
-    else
-      CORRECT_MSVCR_ARCH=x86-64
-    fi
-    if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-      MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
-$as_echo_n "checking for msvcr100.dll... " >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
-$as_echo "$MSVCR_DLL" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
-$as_echo "incorrect, ignoring" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
-$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
-    fi
-  fi
-
-    if test "x$MSVCR_DLL" = x; then
-      as_fn_error $? "Could not find a proper msvcr100.dll as specified by --with-msvcr-dll" "$LINENO" 5
-    fi
-  fi
-
-  if test "x$MSVCR_DLL" = x; then
-    # Probe: Using well-known location from Visual Studio 10.0
-    if test "x$VCINSTALLDIR" != x; then
-      CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
-
-  windows_path="$CYGWIN_VC_INSTALL_DIR"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    CYGWIN_VC_INSTALL_DIR="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    CYGWIN_VC_INSTALL_DIR="$unix_path"
-  fi
-
-      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-        POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcr100.dll"
-      else
-        POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcr100.dll"
-      fi
-
-  POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
-  METHOD="well-known location in VCINSTALLDIR"
-  if test -e "$POSSIBLE_MSVCR_DLL"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
-$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
-
-    # Need to check if the found msvcr is correct architecture
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
-$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
-    MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-      CORRECT_MSVCR_ARCH=386
-    else
-      CORRECT_MSVCR_ARCH=x86-64
-    fi
-    if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-      MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
-$as_echo_n "checking for msvcr100.dll... " >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
-$as_echo "$MSVCR_DLL" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
-$as_echo "incorrect, ignoring" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
-$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
-    fi
-  fi
-
-    fi
-  fi
-
-  if test "x$MSVCR_DLL" = x; then
-    # Probe: Check in the Boot JDK directory.
-    POSSIBLE_MSVCR_DLL="$BOOT_JDK/bin/msvcr100.dll"
-
-  POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
-  METHOD="well-known location in Boot JDK"
-  if test -e "$POSSIBLE_MSVCR_DLL"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
-$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
-
-    # Need to check if the found msvcr is correct architecture
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
-$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
-    MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-      CORRECT_MSVCR_ARCH=386
-    else
-      CORRECT_MSVCR_ARCH=x86-64
-    fi
-    if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-      MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
-$as_echo_n "checking for msvcr100.dll... " >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
-$as_echo "$MSVCR_DLL" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
-$as_echo "incorrect, ignoring" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
-$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
-    fi
-  fi
-
-  fi
-
-  if test "x$MSVCR_DLL" = x; then
-    # Probe: Look in the Windows system32 directory
-    CYGWIN_SYSTEMROOT="$SYSTEMROOT"
-
-  windows_path="$CYGWIN_SYSTEMROOT"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    CYGWIN_SYSTEMROOT="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    CYGWIN_SYSTEMROOT="$unix_path"
-  fi
-
-    POSSIBLE_MSVCR_DLL="$CYGWIN_SYSTEMROOT/system32/msvcr100.dll"
-
-  POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
-  METHOD="well-known location in SYSTEMROOT"
-  if test -e "$POSSIBLE_MSVCR_DLL"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
-$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
-
-    # Need to check if the found msvcr is correct architecture
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
-$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
-    MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-      CORRECT_MSVCR_ARCH=386
-    else
-      CORRECT_MSVCR_ARCH=x86-64
-    fi
-    if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-      MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
-$as_echo_n "checking for msvcr100.dll... " >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
-$as_echo "$MSVCR_DLL" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
-$as_echo "incorrect, ignoring" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
-$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
-    fi
-  fi
-
-  fi
-
-  if test "x$MSVCR_DLL" = x; then
-    # Probe: If Visual Studio Express is installed, there is usually one with the debugger
-    if test "x$VS100COMNTOOLS" != x; then
-      CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
-
-  windows_path="$CYGWIN_VS_TOOLS_DIR"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    CYGWIN_VS_TOOLS_DIR="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    CYGWIN_VS_TOOLS_DIR="$unix_path"
-  fi
-
-      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-        POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x64/ | $HEAD --lines 1`
-      else
-        POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x86/ | $HEAD --lines 1`
-      fi
-
-  POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
-  METHOD="search of VS100COMNTOOLS"
-  if test -e "$POSSIBLE_MSVCR_DLL"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
-$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
-
-    # Need to check if the found msvcr is correct architecture
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
-$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
-    MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-      CORRECT_MSVCR_ARCH=386
-    else
-      CORRECT_MSVCR_ARCH=x86-64
-    fi
-    if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-      MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
-$as_echo_n "checking for msvcr100.dll... " >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
-$as_echo "$MSVCR_DLL" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
-$as_echo "incorrect, ignoring" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
-$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
-    fi
-  fi
-
-    fi
-  fi
-
-  if test "x$MSVCR_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 up something)
-    if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
-      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-        POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x64 | $HEAD --lines 1`
-      else
-        POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
-        if test "x$POSSIBLE_MSVCR_DLL" = x; then
-          # We're grasping at straws now...
-          POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $HEAD --lines 1`
-        fi
-      fi
-
-
-  POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
-  METHOD="search of VCINSTALLDIR"
-  if test -e "$POSSIBLE_MSVCR_DLL"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
-$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
-
-    # Need to check if the found msvcr is correct architecture
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
-$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
-    MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-      CORRECT_MSVCR_ARCH=386
-    else
-      CORRECT_MSVCR_ARCH=x86-64
-    fi
-    if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-      MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
-$as_echo_n "checking for msvcr100.dll... " >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
-$as_echo "$MSVCR_DLL" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
-$as_echo "incorrect, ignoring" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
-$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
-    fi
-  fi
-
-    fi
-  fi
-
-  if test "x$MSVCR_DLL" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
-$as_echo_n "checking for msvcr100.dll... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    as_fn_error $? "Could not find msvcr100.dll. Please specify using --with-msvcr-dll." "$LINENO" 5
-  fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$MSVCR_DLL"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of MSVCR_DLL" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    MSVCR_DLL="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVCR_DLL to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting MSVCR_DLL to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$MSVCR_DLL"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    MSVCR_DLL="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVCR_DLL to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting MSVCR_DLL to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$MSVCR_DLL"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    MSVCR_DLL="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-
-
-# Check whether --with-dxsdk was given.
-if test "${with_dxsdk+set}" = set; then :
-  withval=$with_dxsdk; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-dxsdk is deprecated and will be ignored." >&5
-$as_echo "$as_me: WARNING: Option --with-dxsdk is deprecated and will be ignored." >&2;}
-fi
-
-
-
-
-# Check whether --with-dxsdk-lib was given.
-if test "${with_dxsdk_lib+set}" = set; then :
-  withval=$with_dxsdk_lib; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-dxsdk-lib is deprecated and will be ignored." >&5
-$as_echo "$as_me: WARNING: Option --with-dxsdk-lib is deprecated and will be ignored." >&2;}
-fi
-
-
-
-
-# Check whether --with-dxsdk-include was given.
-if test "${with_dxsdk_include+set}" = set; then :
-  withval=$with_dxsdk_include; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-dxsdk-include is deprecated and will be ignored." >&5
-$as_echo "$as_me: WARNING: Option --with-dxsdk-include is deprecated and will be ignored." >&2;}
-fi
-
-
-  fi
-
-
-
-  # If --build AND --host is set, then the configure script will find any
-  # cross compilation tools in the PATH. Cross compilation tools
-  # follows the cross compilation standard where they are prefixed with ${host}.
-  # For example the binary i686-sun-solaris2.10-gcc
-  # will cross compile for i686-sun-solaris2.10
-  # If neither of build and host is not set, then build=host and the
-  # default compiler found in the path will be used.
-  # Setting only --host, does not seem to be really supported.
-  # Please set both --build and --host if you want to cross compile.
-
-  if test "x$COMPILE_TYPE" = "xcross"; then
-    # Now we to find a C/C++ compiler that can build executables for the build
-    # platform. We can't use the AC_PROG_CC macro, since it can only be used
-    # once. Also, we need to do this before adding a tools dir to the path,
-    # otherwise we might pick up cross-compilers which don't use standard naming.
-    # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have
-    # to wait until they are properly discovered.
-    for ac_prog in cl cc gcc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BUILD_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BUILD_CC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BUILD_CC="$BUILD_CC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-BUILD_CC=$ac_cv_path_BUILD_CC
-if test -n "$BUILD_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
-$as_echo "$BUILD_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$BUILD_CC" && break
-done
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$BUILD_CC"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$BUILD_CC"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$BUILD_CC"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CC (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving BUILD_CC (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    BUILD_CC="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CC to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting BUILD_CC to \"$new_complete\"" >&6;}
-  fi
-
-    for ac_prog in cl CC g++
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BUILD_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BUILD_CXX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-BUILD_CXX=$ac_cv_path_BUILD_CXX
-if test -n "$BUILD_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
-$as_echo "$BUILD_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$BUILD_CXX" && break
-done
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$BUILD_CXX"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$BUILD_CXX"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$BUILD_CXX"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CXX (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving BUILD_CXX (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    BUILD_CXX="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CXX to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting BUILD_CXX to \"$new_complete\"" >&6;}
-  fi
-
-    # Extract the first word of "ld", so it can be a program name with args.
-set dummy ld; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BUILD_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BUILD_LD in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BUILD_LD="$BUILD_LD" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BUILD_LD="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-BUILD_LD=$ac_cv_path_BUILD_LD
-if test -n "$BUILD_LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_LD" >&5
-$as_echo "$BUILD_LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$BUILD_LD"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$BUILD_LD"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$BUILD_LD"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_LD (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving BUILD_LD (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    BUILD_LD="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_LD to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting BUILD_LD to \"$new_complete\"" >&6;}
-  fi
-
-  fi
-
-
-
-
-  # If a devkit is found on the builddeps server, then prepend its path to the
-  # PATH variable. If there are cross compilers available in the devkit, these
-  # will be found by AC_PROG_CC et al.
-  DEVKIT=
-
-
-  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
-    # Source the builddeps file again, to make sure it uses the latest variables!
-    . $builddepsfile
-    # Look for a target and build machine specific resource!
-    eval resource=\${builddep_devkit_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a target specific resource
-      eval resource=\${builddep_devkit_TARGET_${rewritten_target_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a build specific resource
-      eval resource=\${builddep_devkit_BUILD_${rewritten_build_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a generic resource
-      # (The devkit comes from M4 and not the shell, thus no need for eval here.)
-      resource=${builddep_devkit}
-    fi
-    if test "x$resource" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for devkit" >&5
-$as_echo "$as_me: Using builddeps $resource for devkit" >&6;}
-      # If the resource in the builddeps.conf file is an existing directory,
-      # for example /java/linux/cups
-      if test -d ${resource}; then
-        depdir=${resource}
-      else
-
-  # devkit is for example mymodule
-  # $resource is for example libs/general/libmymod_1_2_3.zip
-  # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
-  # $with_builddeps_dir is for example /localhome/builddeps
-  # depdir is the name of the variable into which we store the depdir, eg MYMOD
-  # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
-  # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
-  filename=`basename $resource`
-  filebase=`echo $filename | sed 's/\.[^\.]*$//'`
-  filebase=${filename%%.*}
-  extension=${filename#*.}
-  installdir=$with_builddeps_dir/$filebase
-  if test ! -f $installdir/$filename.unpacked; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency devkit from $with_builddeps_server/$resource and installing into $installdir" >&5
-$as_echo "$as_me: Downloading build dependency devkit from $with_builddeps_server/$resource and installing into $installdir" >&6;}
-    if test ! -d $installdir; then
-      mkdir -p $installdir
-    fi
-    if test ! -d $installdir; then
-      as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
-    fi
-    tmpfile=`mktemp $installdir/devkit.XXXXXXXXX`
-    touch $tmpfile
-    if test ! -f $tmpfile; then
-      as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
-    fi
-
-  # $with_builddeps_server/$resource  is the ftp://abuilddeps.server.com/libs/cups.zip
-  # $tmpfile is the local file name for the downloaded file.
-  VALID_TOOL=no
-  if test "x$BDEPS_FTP" = xwget; then
-    VALID_TOOL=yes
-    wget -O $tmpfile $with_builddeps_server/$resource
-  fi
-  if test "x$BDEPS_FTP" = xlftp; then
-    VALID_TOOL=yes
-    lftp -c "get $with_builddeps_server/$resource  -o $tmpfile"
-  fi
-  if test "x$BDEPS_FTP" = xftp; then
-    VALID_TOOL=yes
-    FTPSERVER=`echo $with_builddeps_server/$resource  | cut -f 3 -d '/'`
-    FTPPATH=`echo $with_builddeps_server/$resource  | cut -f 4- -d '/'`
-    FTPUSERPWD=${FTPSERVER%%@*}
-    if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
-      FTPUSER=${userpwd%%:*}
-      FTPPWD=${userpwd#*@}
-      FTPSERVER=${FTPSERVER#*@}
-    else
-      FTPUSER=ftp
-      FTPPWD=ftp
-    fi
-    # the "pass" command does not work on some
-    # ftp clients (read ftp.exe) but if it works,
-    # passive mode is better!
-    ( \
-        echo "user $FTPUSER $FTPPWD"        ; \
-        echo "pass"                         ; \
-        echo "bin"                          ; \
-        echo "get $FTPPATH $tmpfile"              ; \
-    ) | ftp -in $FTPSERVER
-  fi
-  if test "x$VALID_TOOL" != xyes; then
-    as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
-  fi
-
-    mv $tmpfile $installdir/$filename
-    if test ! -s $installdir/$filename; then
-      as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
-    fi
-    case "$extension" in
-      zip)  echo "Unzipping $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
-        ;;
-      tar.gz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      tgz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
-        ;;
-    esac
-  fi
-  if test -f $installdir/$filename.unpacked; then
-    depdir=$installdir
-  fi
-
-      fi
-      # Source the builddeps file again, because in the previous command, the depdir
-      # was updated to point at the current build dependency install directory.
-      . $builddepsfile
-      # Now extract variables from the builddeps.conf files.
-      theroot=${builddep_devkit_ROOT}
-      thecflags=${builddep_devkit_CFLAGS}
-      thelibs=${builddep_devkit_LIBS}
-      if test "x$depdir" = x; then
-        as_fn_error $? "Could not download build dependency devkit" "$LINENO" 5
-      fi
-      DEVKIT=$depdir
-      if test "x$theroot" != x; then
-        DEVKIT="$theroot"
-      fi
-      if test "x$thecflags" != x; then
-        DEVKIT_CFLAGS="$thecflags"
-      fi
-      if test "x$thelibs" != x; then
-        DEVKIT_LIBS="$thelibs"
-      fi
-
-        # Found devkit
-        PATH="$DEVKIT/bin:$PATH"
-        SYS_ROOT="$DEVKIT/${rewritten_target}/sys-root"
-        if test "x$x_includes" = "xNONE"; then
-          x_includes="$SYS_ROOT/usr/include/X11"
-        fi
-        if test "x$x_libraries" = "xNONE"; then
-          x_libraries="$SYS_ROOT/usr/lib"
-        fi
-
-
-    fi
-
-  fi
-
-
-  # Store the CFLAGS etal passed to the configure script.
-  ORG_CFLAGS="$CFLAGS"
-  ORG_CXXFLAGS="$CXXFLAGS"
-  ORG_OBJCFLAGS="$OBJCFLAGS"
-
-  # autoconf magic only relies on PATH, so update it if tools dir is specified
-  OLD_PATH="$PATH"
-  if test "x$TOOLS_DIR" != x; then
-    PATH=$TOOLS_DIR:$PATH
-  fi
-
-  # Before we locate the compilers, we need to sanitize the Xcode build environment
-  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-    # determine path to Xcode developer directory
-    # can be empty in which case all the tools will rely on a sane Xcode 4 installation
-    SET_DEVELOPER_DIR=
-
-    if test -n "$XCODE_PATH"; then
-      DEVELOPER_DIR="$XCODE_PATH"/Contents/Developer
-    fi
-
-    # DEVELOPER_DIR could also be provided directly
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Determining if we need to set DEVELOPER_DIR" >&5
-$as_echo_n "checking Determining if we need to set DEVELOPER_DIR... " >&6; }
-    if test -n "$DEVELOPER_DIR"; then
-      if test ! -d "$DEVELOPER_DIR"; then
-        as_fn_error $? "Xcode Developer path does not exist: $DEVELOPER_DIR, please provide a path to the Xcode 4 application bundle using --with-xcode-path" "$LINENO" 5
-      fi
-      if test ! -f "$DEVELOPER_DIR"/usr/bin/xcodebuild; then
-        as_fn_error $? "Xcode Developer path is not valid: $DEVELOPER_DIR, it must point to Contents/Developer inside an Xcode application bundle" "$LINENO" 5
-      fi
-      # make it visible to all the tools immediately
-      export DEVELOPER_DIR
-      SET_DEVELOPER_DIR="export DEVELOPER_DIR := $DEVELOPER_DIR"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEVELOPER_DIR)" >&5
-$as_echo "yes ($DEVELOPER_DIR)" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-
-
-    # Extract the first word of "xcodebuild", so it can be a program name with args.
-set dummy xcodebuild; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XCODEBUILD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XCODEBUILD in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XCODEBUILD="$XCODEBUILD" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XCODEBUILD="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-XCODEBUILD=$ac_cv_path_XCODEBUILD
-if test -n "$XCODEBUILD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCODEBUILD" >&5
-$as_echo "$XCODEBUILD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    if test -z "$XCODEBUILD"; then
-      as_fn_error $? "The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X" "$LINENO" 5
-    fi
-
-    # Fail-fast: verify we're building on Xcode 4, we cannot build with Xcode 5 or later
-    XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
-    XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
-    if test ! ${XC_VERSION_PARTS[0]} -ge 4 ; then
-      as_fn_error $? "Xcode 4 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode 4 or make Xcode 4 active by using xcode-select." "$LINENO" 5
-    fi
-
-    # Some versions of Xcode 5 command line tools install gcc and g++ as symlinks to
-    # clang and clang++, which will break the build. So handle that here if we need to.
-    if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then
-      # use xcrun to find the real gcc and add it's directory to PATH
-      # then autoconf magic will find it
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Found gcc symlinks to clang in /usr/bin, adding path to real gcc to PATH" >&5
-$as_echo "$as_me: Found gcc symlinks to clang in /usr/bin, adding path to real gcc to PATH" >&6;}
-      XCODE_BIN_PATH=$(dirname `xcrun -find gcc`)
-      PATH="$XCODE_BIN_PATH":$PATH
-    fi
-
-    # Determine appropriate SDKPATH, don't use SDKROOT as it interferes with the stub tools
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Determining Xcode SDK path" >&5
-$as_echo_n "checking Determining Xcode SDK path... " >&6; }
-    # allow SDKNAME to be set to override the default SDK selection
-    SDKPATH=`"$XCODEBUILD" -sdk ${SDKNAME:-macosx} -version | grep '^Path: ' | sed 's/Path: //'`
-    if test -n "$SDKPATH"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDKPATH" >&5
-$as_echo "$SDKPATH" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: (none, will use system headers and frameworks)" >&5
-$as_echo "(none, will use system headers and frameworks)" >&6; }
-    fi
-
-
-    # Perform a basic sanity test
-    if test ! -f "$SDKPATH/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
-      as_fn_error $? "Unable to find required framework headers, provide a valid path to Xcode 4 using --with-xcode-path" "$LINENO" 5
-    fi
-
-    # if SDKPATH is non-empty then we need to add -isysroot and -iframework for gcc and g++
-    if test -n "$SDKPATH"; then
-      # We need -isysroot <path> and -iframework<path>/System/Library/Frameworks
-      CFLAGS_JDK="${CFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
-      CXXFLAGS_JDK="${CXXFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
-      LDFLAGS_JDK="${LDFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
-    fi
-
-    # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
-    # setting this here means it doesn't have to be peppered throughout the forest
-    CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
-    CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
-    LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
-  fi
-
-  ### Locate C compiler (CC)
-
-  # On windows, only cl.exe is supported.
-  # On Solaris, cc is preferred to gcc.
-  # Elsewhere, gcc is preferred to cc.
-
-  if test "x$CC" != x; then
-    COMPILER_CHECK_LIST="$CC"
-  elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    COMPILER_CHECK_LIST="cl"
-  elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
-    COMPILER_CHECK_LIST="cc gcc"
-  elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
-    # Do not probe for cc on AIX.
-    COMPILER_CHECK_LIST="xlc_r"
-  else
-    COMPILER_CHECK_LIST="gcc cc"
-  fi
-
-
-  COMPILER_NAME=C
-
-  CC=
-  # If TOOLS_DIR is set, check for all compiler names in there first
-  # before checking the rest of the PATH.
-  if test -n "$TOOLS_DIR"; then
-    PATH_save="$PATH"
-    PATH="$TOOLS_DIR"
-    for ac_prog in $COMPILER_CHECK_LIST
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TOOLS_DIR_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $TOOLS_DIR_CC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TOOLS_DIR_CC="$TOOLS_DIR_CC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TOOLS_DIR_CC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-TOOLS_DIR_CC=$ac_cv_path_TOOLS_DIR_CC
-if test -n "$TOOLS_DIR_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOOLS_DIR_CC" >&5
-$as_echo "$TOOLS_DIR_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$TOOLS_DIR_CC" && break
-done
-
-    CC=$TOOLS_DIR_CC
-    PATH="$PATH_save"
-  fi
-
-  # AC_PATH_PROGS can't be run multiple times with the same variable,
-  # so create a new name for this run.
-  if test "x$CC" = x; then
-    for ac_prog in $COMPILER_CHECK_LIST
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_POTENTIAL_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $POTENTIAL_CC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_POTENTIAL_CC="$POTENTIAL_CC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_POTENTIAL_CC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-POTENTIAL_CC=$ac_cv_path_POTENTIAL_CC
-if test -n "$POTENTIAL_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POTENTIAL_CC" >&5
-$as_echo "$POTENTIAL_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$POTENTIAL_CC" && break
-done
-
-    CC=$POTENTIAL_CC
-  fi
-
-  if test "x$CC" = x; then
-
-  # Print a helpful message on how to acquire the necessary build dependency.
-  # devkit is the help tag: freetype, cups, pulse, alsa etc
-  MISSING_DEPENDENCY=devkit
-
-  if 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_help     $MISSING_DEPENDENCY ;;
-      yum)
-        yum_help     $MISSING_DEPENDENCY ;;
-      port)
-        port_help    $MISSING_DEPENDENCY ;;
-      pkgutil)
-        pkgutil_help $MISSING_DEPENDENCY ;;
-      pkgadd)
-        pkgadd_help  $MISSING_DEPENDENCY ;;
-    esac
-
-    if test "x$PKGHANDLER_COMMAND" != x; then
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-    fi
-  fi
-
-    as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
-  fi
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$CC"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of CC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of CC" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of CC, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of CC" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$CC"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of CC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of CC" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$CC"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CC (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving CC (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of CC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of CC" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    CC="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CC to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting CC to \"$new_complete\"" >&6;}
-  fi
-
-  TEST_COMPILER="$CC"
-  # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
-  # to 'xlc' but it is crucial that we invoke the compiler with the right name!
-  if test "x$OPENJDK_BUILD_OS" != xaix; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5
-$as_echo_n "checking resolved symbolic links for CC... " >&6; }
-
-  if test "x$OPENJDK_BUILD_OS" != xwindows; then
-    # Follow a chain of symbolic links. Use readlink
-    # where it exists, else fall back to horribly
-    # complicated shell code.
-    if test "x$READLINK_TESTED" != yes; then
-      # On MacOSX there is a readlink tool with a different
-      # purpose than the GNU readlink tool. Check the found readlink.
-      ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
-      if test "x$ISGNU" = x; then
-        # A readlink that we do not know how to use.
-        # Are there other non-GNU readlinks out there?
-        READLINK_TESTED=yes
-        READLINK=
-      fi
-    fi
-
-    if test "x$READLINK" != x; then
-      TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
-    else
-      # Save the current directory for restoring afterwards
-      STARTDIR=$PWD
-      COUNTER=0
-      sym_link_dir=`$DIRNAME $TEST_COMPILER`
-      sym_link_file=`$BASENAME $TEST_COMPILER`
-      cd $sym_link_dir
-      # Use -P flag to resolve symlinks in directories.
-      cd `$THEPWDCMD -P`
-      sym_link_dir=`$THEPWDCMD -P`
-      # Resolve file symlinks
-      while test $COUNTER -lt 20; do
-        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
-        if test "x$ISLINK" == x; then
-          # This is not a symbolic link! We are done!
-          break
-        fi
-        # Again resolve directory symlinks since the target of the just found
-        # link could be in a different directory
-        cd `$DIRNAME $ISLINK`
-        sym_link_dir=`$THEPWDCMD -P`
-        sym_link_file=`$BASENAME $ISLINK`
-        let COUNTER=COUNTER+1
-      done
-      cd $STARTDIR
-      TEST_COMPILER=$sym_link_dir/$sym_link_file
-    fi
-  fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
-$as_echo "$TEST_COMPILER" >&6; }
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CC is disguised ccache" >&5
-$as_echo_n "checking if CC is disguised ccache... " >&6; }
-
-  COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
-  if test "x$COMPILER_BASENAME" = "xccache"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, trying to find proper $COMPILER_NAME compiler" >&5
-$as_echo "yes, trying to find proper $COMPILER_NAME compiler" >&6; }
-    # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
-    # We want to control ccache invocation ourselves, so ignore this cc and try
-    # searching again.
-
-    # Remove the path to the fake ccache cc from the PATH
-    RETRY_COMPILER_SAVED_PATH="$PATH"
-    COMPILER_DIRNAME=`$DIRNAME $CC`
-    PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
-
-    # Try again looking for our compiler
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in $COMPILER_CHECK_LIST
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$PROPER_COMPILER_CC"; then
-  ac_cv_prog_PROPER_COMPILER_CC="$PROPER_COMPILER_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_PROPER_COMPILER_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-PROPER_COMPILER_CC=$ac_cv_prog_PROPER_COMPILER_CC
-if test -n "$PROPER_COMPILER_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CC" >&5
-$as_echo "$PROPER_COMPILER_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$PROPER_COMPILER_CC" && break
-  done
-fi
-if test -z "$PROPER_COMPILER_CC"; then
-  ac_ct_PROPER_COMPILER_CC=$PROPER_COMPILER_CC
-  for ac_prog in $COMPILER_CHECK_LIST
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_PROPER_COMPILER_CC"; then
-  ac_cv_prog_ac_ct_PROPER_COMPILER_CC="$ac_ct_PROPER_COMPILER_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_PROPER_COMPILER_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_PROPER_COMPILER_CC=$ac_cv_prog_ac_ct_PROPER_COMPILER_CC
-if test -n "$ac_ct_PROPER_COMPILER_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PROPER_COMPILER_CC" >&5
-$as_echo "$ac_ct_PROPER_COMPILER_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_PROPER_COMPILER_CC" && break
-done
-
-  if test "x$ac_ct_PROPER_COMPILER_CC" = x; then
-    PROPER_COMPILER_CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PROPER_COMPILER_CC=$ac_ct_PROPER_COMPILER_CC
-  fi
-fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$PROPER_COMPILER_CC"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CC" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of PROPER_COMPILER_CC, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CC" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$PROPER_COMPILER_CC"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CC" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$PROPER_COMPILER_CC"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CC (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving PROPER_COMPILER_CC (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CC" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    PROPER_COMPILER_CC="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&6;}
-  fi
-
-    PATH="$RETRY_COMPILER_SAVED_PATH"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolved symbolic links for CC" >&5
-$as_echo_n "checking for resolved symbolic links for CC... " >&6; }
-
-  if test "x$OPENJDK_BUILD_OS" != xwindows; then
-    # Follow a chain of symbolic links. Use readlink
-    # where it exists, else fall back to horribly
-    # complicated shell code.
-    if test "x$READLINK_TESTED" != yes; then
-      # On MacOSX there is a readlink tool with a different
-      # purpose than the GNU readlink tool. Check the found readlink.
-      ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
-      if test "x$ISGNU" = x; then
-        # A readlink that we do not know how to use.
-        # Are there other non-GNU readlinks out there?
-        READLINK_TESTED=yes
-        READLINK=
-      fi
-    fi
-
-    if test "x$READLINK" != x; then
-      PROPER_COMPILER_CC=`$READLINK -f $PROPER_COMPILER_CC`
-    else
-      # Save the current directory for restoring afterwards
-      STARTDIR=$PWD
-      COUNTER=0
-      sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC`
-      sym_link_file=`$BASENAME $PROPER_COMPILER_CC`
-      cd $sym_link_dir
-      # Use -P flag to resolve symlinks in directories.
-      cd `$THEPWDCMD -P`
-      sym_link_dir=`$THEPWDCMD -P`
-      # Resolve file symlinks
-      while test $COUNTER -lt 20; do
-        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
-        if test "x$ISLINK" == x; then
-          # This is not a symbolic link! We are done!
-          break
-        fi
-        # Again resolve directory symlinks since the target of the just found
-        # link could be in a different directory
-        cd `$DIRNAME $ISLINK`
-        sym_link_dir=`$THEPWDCMD -P`
-        sym_link_file=`$BASENAME $ISLINK`
-        let COUNTER=COUNTER+1
-      done
-      cd $STARTDIR
-      PROPER_COMPILER_CC=$sym_link_dir/$sym_link_file
-    fi
-  fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CC" >&5
-$as_echo "$PROPER_COMPILER_CC" >&6; }
-    CC="$PROPER_COMPILER_CC"
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, keeping CC" >&5
-$as_echo "no, keeping CC" >&6; }
-    CC="$TEST_COMPILER"
-  fi
-
-  COMPILER=$CC
-  COMPILER_NAME=$COMPILER_NAME
-
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    # Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
-    COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
-    $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
-    if test $? -ne 0; then
-      GCC_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler." >&5
-$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with -V was: \"$COMPILER_VERSION_TEST\" and with --version: \"$GCC_VERSION_TEST\"" >&5
-$as_echo "$as_me: The result from running with -V was: \"$COMPILER_VERSION_TEST\" and with --version: \"$GCC_VERSION_TEST\"" >&6;}
-      as_fn_error $? "Sun Studio compiler is required. Try setting --with-tools-dir." "$LINENO" 5
-    else
-      COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"`
-      COMPILER_VENDOR="Sun Studio"
-    fi
-  elif test  "x$OPENJDK_TARGET_OS" = xaix; then
-      COMPILER_VERSION_TEST=`$COMPILER -qversion  2>&1 | $TAIL -n 1`
-      $ECHO $COMPILER_VERSION_TEST | $GREP "^Version: " > /dev/null
-      if test $? -ne 0; then
-        as_fn_error $? "Failed to detect the compiler version of $COMPILER ...." "$LINENO" 5
-      else
-        COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \(0-90-9\.0-90-9*\).*/\1/p'`
-        COMPILER_VENDOR='IBM'
-      fi
-  elif test  "x$OPENJDK_TARGET_OS" = xwindows; then
-    # First line typically looks something like:
-    # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
-    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
-    COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
-    COMPILER_VENDOR="Microsoft CL.EXE"
-    COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
-    if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
-      if test "x$COMPILER_CPU_TEST" != "x80x86"; then
-        as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"80x86\"." "$LINENO" 5
-      fi
-    elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
-      if test "x$COMPILER_CPU_TEST" != "xx64"; then
-        as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"x64\"." "$LINENO" 5
-      fi
-    fi
-  else
-    COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
-    # Check that this is likely to be GCC.
-    $COMPILER --version 2>&1 | $GREP -E "clang version|Apple LLVM version|Free Software Foundation" > /dev/null
-    if test $? -ne 0; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required compiler." >&5
-$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required compiler." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION_TEST\"" >&5
-$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION_TEST\"" >&6;}
-      as_fn_error $? "clang or GCC compiler is required. Try setting --with-tools-dir." "$LINENO" 5
-    fi
-
-    # First line typically looks something like:
-    # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
-    COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | \
-        $SED -e 's/^.* \([1-9]\.[0-9.]*\)[^0-9.].*$/\1/'`
-    COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^\(.*\) [1-9][0-9.]*/\1/p"`
-  fi
-  # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker)
-  CC_VERSION="$COMPILER_VERSION"
-  # This sets CC_VENDOR or CXX_VENDOR. (This comment is a grep marker)
-  CC_VENDOR="$COMPILER_VENDOR"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5
-$as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
-
-
-  # Now that we have resolved CC ourself, let autoconf have its go at it
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in $CC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  # Option used to tell the compiler whether to create 32- or 64-bit executables
-  # Notice that CC contains the full compiler path at this point.
-  case $CC in
-    *xlc_r) COMPILER_TARGET_BITS_FLAG="-q";;
-    *)      COMPILER_TARGET_BITS_FLAG="-m";;
-  esac
-
-
-  ### Locate C++ compiler (CXX)
-
-  if test "x$CXX" != x; then
-    COMPILER_CHECK_LIST="$CXX"
-  elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    COMPILER_CHECK_LIST="cl"
-  elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
-    COMPILER_CHECK_LIST="CC g++"
-  elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
-    # Do not probe for CC on AIX .
-    COMPILER_CHECK_LIST="xlC_r"
-  else
-    COMPILER_CHECK_LIST="g++ CC"
-  fi
-
-
-  COMPILER_NAME=C++
-
-  CXX=
-  # If TOOLS_DIR is set, check for all compiler names in there first
-  # before checking the rest of the PATH.
-  if test -n "$TOOLS_DIR"; then
-    PATH_save="$PATH"
-    PATH="$TOOLS_DIR"
-    for ac_prog in $COMPILER_CHECK_LIST
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $TOOLS_DIR_CXX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TOOLS_DIR_CXX="$TOOLS_DIR_CXX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TOOLS_DIR_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-TOOLS_DIR_CXX=$ac_cv_path_TOOLS_DIR_CXX
-if test -n "$TOOLS_DIR_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOOLS_DIR_CXX" >&5
-$as_echo "$TOOLS_DIR_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$TOOLS_DIR_CXX" && break
-done
-
-    CXX=$TOOLS_DIR_CXX
-    PATH="$PATH_save"
-  fi
-
-  # AC_PATH_PROGS can't be run multiple times with the same variable,
-  # so create a new name for this run.
-  if test "x$CXX" = x; then
-    for ac_prog in $COMPILER_CHECK_LIST
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $POTENTIAL_CXX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_POTENTIAL_CXX="$POTENTIAL_CXX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_POTENTIAL_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-POTENTIAL_CXX=$ac_cv_path_POTENTIAL_CXX
-if test -n "$POTENTIAL_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POTENTIAL_CXX" >&5
-$as_echo "$POTENTIAL_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$POTENTIAL_CXX" && break
-done
-
-    CXX=$POTENTIAL_CXX
-  fi
-
-  if test "x$CXX" = x; then
-
-  # Print a helpful message on how to acquire the necessary build dependency.
-  # devkit is the help tag: freetype, cups, pulse, alsa etc
-  MISSING_DEPENDENCY=devkit
-
-  if 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_help     $MISSING_DEPENDENCY ;;
-      yum)
-        yum_help     $MISSING_DEPENDENCY ;;
-      port)
-        port_help    $MISSING_DEPENDENCY ;;
-      pkgutil)
-        pkgutil_help $MISSING_DEPENDENCY ;;
-      pkgadd)
-        pkgadd_help  $MISSING_DEPENDENCY ;;
-    esac
-
-    if test "x$PKGHANDLER_COMMAND" != x; then
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-    fi
-  fi
-
-    as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
-  fi
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$CXX"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of CXX, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of CXX" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of CXX, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of CXX" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$CXX"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of CXX, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of CXX" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$CXX"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXX (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving CXX (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of CXX, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of CXX" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    CXX="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXX to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting CXX to \"$new_complete\"" >&6;}
-  fi
-
-  TEST_COMPILER="$CXX"
-  # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
-  # to 'xlc' but it is crucial that we invoke the compiler with the right name!
-  if test "x$OPENJDK_BUILD_OS" != xaix; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5
-$as_echo_n "checking resolved symbolic links for CXX... " >&6; }
-
-  if test "x$OPENJDK_BUILD_OS" != xwindows; then
-    # Follow a chain of symbolic links. Use readlink
-    # where it exists, else fall back to horribly
-    # complicated shell code.
-    if test "x$READLINK_TESTED" != yes; then
-      # On MacOSX there is a readlink tool with a different
-      # purpose than the GNU readlink tool. Check the found readlink.
-      ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
-      if test "x$ISGNU" = x; then
-        # A readlink that we do not know how to use.
-        # Are there other non-GNU readlinks out there?
-        READLINK_TESTED=yes
-        READLINK=
-      fi
-    fi
-
-    if test "x$READLINK" != x; then
-      TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
-    else
-      # Save the current directory for restoring afterwards
-      STARTDIR=$PWD
-      COUNTER=0
-      sym_link_dir=`$DIRNAME $TEST_COMPILER`
-      sym_link_file=`$BASENAME $TEST_COMPILER`
-      cd $sym_link_dir
-      # Use -P flag to resolve symlinks in directories.
-      cd `$THEPWDCMD -P`
-      sym_link_dir=`$THEPWDCMD -P`
-      # Resolve file symlinks
-      while test $COUNTER -lt 20; do
-        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
-        if test "x$ISLINK" == x; then
-          # This is not a symbolic link! We are done!
-          break
-        fi
-        # Again resolve directory symlinks since the target of the just found
-        # link could be in a different directory
-        cd `$DIRNAME $ISLINK`
-        sym_link_dir=`$THEPWDCMD -P`
-        sym_link_file=`$BASENAME $ISLINK`
-        let COUNTER=COUNTER+1
-      done
-      cd $STARTDIR
-      TEST_COMPILER=$sym_link_dir/$sym_link_file
-    fi
-  fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
-$as_echo "$TEST_COMPILER" >&6; }
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CXX is disguised ccache" >&5
-$as_echo_n "checking if CXX is disguised ccache... " >&6; }
-
-  COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
-  if test "x$COMPILER_BASENAME" = "xccache"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, trying to find proper $COMPILER_NAME compiler" >&5
-$as_echo "yes, trying to find proper $COMPILER_NAME compiler" >&6; }
-    # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
-    # We want to control ccache invocation ourselves, so ignore this cc and try
-    # searching again.
-
-    # Remove the path to the fake ccache cc from the PATH
-    RETRY_COMPILER_SAVED_PATH="$PATH"
-    COMPILER_DIRNAME=`$DIRNAME $CXX`
-    PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
-
-    # Try again looking for our compiler
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in $COMPILER_CHECK_LIST
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$PROPER_COMPILER_CXX"; then
-  ac_cv_prog_PROPER_COMPILER_CXX="$PROPER_COMPILER_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_PROPER_COMPILER_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-PROPER_COMPILER_CXX=$ac_cv_prog_PROPER_COMPILER_CXX
-if test -n "$PROPER_COMPILER_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CXX" >&5
-$as_echo "$PROPER_COMPILER_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$PROPER_COMPILER_CXX" && break
-  done
-fi
-if test -z "$PROPER_COMPILER_CXX"; then
-  ac_ct_PROPER_COMPILER_CXX=$PROPER_COMPILER_CXX
-  for ac_prog in $COMPILER_CHECK_LIST
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
-  ac_cv_prog_ac_ct_PROPER_COMPILER_CXX="$ac_ct_PROPER_COMPILER_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_PROPER_COMPILER_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_PROPER_COMPILER_CXX=$ac_cv_prog_ac_ct_PROPER_COMPILER_CXX
-if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PROPER_COMPILER_CXX" >&5
-$as_echo "$ac_ct_PROPER_COMPILER_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_PROPER_COMPILER_CXX" && break
-done
-
-  if test "x$ac_ct_PROPER_COMPILER_CXX" = x; then
-    PROPER_COMPILER_CXX=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PROPER_COMPILER_CXX=$ac_ct_PROPER_COMPILER_CXX
-  fi
-fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$PROPER_COMPILER_CXX"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CXX" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of PROPER_COMPILER_CXX, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CXX" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$PROPER_COMPILER_CXX"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CXX" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$PROPER_COMPILER_CXX"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CXX (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving PROPER_COMPILER_CXX (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CXX" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    PROPER_COMPILER_CXX="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&6;}
-  fi
-
-    PATH="$RETRY_COMPILER_SAVED_PATH"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolved symbolic links for CXX" >&5
-$as_echo_n "checking for resolved symbolic links for CXX... " >&6; }
-
-  if test "x$OPENJDK_BUILD_OS" != xwindows; then
-    # Follow a chain of symbolic links. Use readlink
-    # where it exists, else fall back to horribly
-    # complicated shell code.
-    if test "x$READLINK_TESTED" != yes; then
-      # On MacOSX there is a readlink tool with a different
-      # purpose than the GNU readlink tool. Check the found readlink.
-      ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
-      if test "x$ISGNU" = x; then
-        # A readlink that we do not know how to use.
-        # Are there other non-GNU readlinks out there?
-        READLINK_TESTED=yes
-        READLINK=
-      fi
-    fi
-
-    if test "x$READLINK" != x; then
-      PROPER_COMPILER_CXX=`$READLINK -f $PROPER_COMPILER_CXX`
-    else
-      # Save the current directory for restoring afterwards
-      STARTDIR=$PWD
-      COUNTER=0
-      sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX`
-      sym_link_file=`$BASENAME $PROPER_COMPILER_CXX`
-      cd $sym_link_dir
-      # Use -P flag to resolve symlinks in directories.
-      cd `$THEPWDCMD -P`
-      sym_link_dir=`$THEPWDCMD -P`
-      # Resolve file symlinks
-      while test $COUNTER -lt 20; do
-        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
-        if test "x$ISLINK" == x; then
-          # This is not a symbolic link! We are done!
-          break
-        fi
-        # Again resolve directory symlinks since the target of the just found
-        # link could be in a different directory
-        cd `$DIRNAME $ISLINK`
-        sym_link_dir=`$THEPWDCMD -P`
-        sym_link_file=`$BASENAME $ISLINK`
-        let COUNTER=COUNTER+1
-      done
-      cd $STARTDIR
-      PROPER_COMPILER_CXX=$sym_link_dir/$sym_link_file
-    fi
-  fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CXX" >&5
-$as_echo "$PROPER_COMPILER_CXX" >&6; }
-    CXX="$PROPER_COMPILER_CXX"
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, keeping CXX" >&5
-$as_echo "no, keeping CXX" >&6; }
-    CXX="$TEST_COMPILER"
-  fi
-
-  COMPILER=$CXX
-  COMPILER_NAME=$COMPILER_NAME
-
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    # Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
-    COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
-    $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
-    if test $? -ne 0; then
-      GCC_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler." >&5
-$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with -V was: \"$COMPILER_VERSION_TEST\" and with --version: \"$GCC_VERSION_TEST\"" >&5
-$as_echo "$as_me: The result from running with -V was: \"$COMPILER_VERSION_TEST\" and with --version: \"$GCC_VERSION_TEST\"" >&6;}
-      as_fn_error $? "Sun Studio compiler is required. Try setting --with-tools-dir." "$LINENO" 5
-    else
-      COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"`
-      COMPILER_VENDOR="Sun Studio"
-    fi
-  elif test  "x$OPENJDK_TARGET_OS" = xaix; then
-      COMPILER_VERSION_TEST=`$COMPILER -qversion  2>&1 | $TAIL -n 1`
-      $ECHO $COMPILER_VERSION_TEST | $GREP "^Version: " > /dev/null
-      if test $? -ne 0; then
-        as_fn_error $? "Failed to detect the compiler version of $COMPILER ...." "$LINENO" 5
-      else
-        COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \(0-90-9\.0-90-9*\).*/\1/p'`
-        COMPILER_VENDOR='IBM'
-      fi
-  elif test  "x$OPENJDK_TARGET_OS" = xwindows; then
-    # First line typically looks something like:
-    # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
-    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
-    COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
-    COMPILER_VENDOR="Microsoft CL.EXE"
-    COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
-    if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
-      if test "x$COMPILER_CPU_TEST" != "x80x86"; then
-        as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"80x86\"." "$LINENO" 5
-      fi
-    elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
-      if test "x$COMPILER_CPU_TEST" != "xx64"; then
-        as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"x64\"." "$LINENO" 5
-      fi
-    fi
-  else
-    COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
-    # Check that this is likely to be GCC.
-    $COMPILER --version 2>&1 | $GREP -E "clang version|Apple LLVM version|Free Software Foundation" > /dev/null
-    if test $? -ne 0; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required compiler." >&5
-$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required compiler." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION_TEST\"" >&5
-$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION_TEST\"" >&6;}
-      as_fn_error $? "clang or GCC compiler is required. Try setting --with-tools-dir." "$LINENO" 5
-    fi
-
-    # First line typically looks something like:
-    # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
-    COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | \
-        $SED -e 's/^.* \([1-9]\.[0-9.]*\)[^0-9.].*$/\1/'`
-    COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^\(.*\) [1-9][0-9.]*/\1/p"`
-  fi
-  # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker)
-  CXX_VERSION="$COMPILER_VERSION"
-  # This sets CC_VENDOR or CXX_VENDOR. (This comment is a grep marker)
-  CXX_VENDOR="$COMPILER_VENDOR"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5
-$as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
-
-
-  # Now that we have resolved CXX ourself, let autoconf have its go at it
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CXX
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in $CXX
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  # This is the compiler version number on the form X.Y[.Z]
-
-
-
-
-  if test "x$CC_VERSION" != "x$CXX_VERSION"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C and C++ compiler has different version numbers, $CC_VERSION vs $CXX_VERSION." >&5
-$as_echo "$as_me: WARNING: C and C++ compiler has different version numbers, $CC_VERSION vs $CXX_VERSION." >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This typically indicates a broken setup, and is not supported" >&5
-$as_echo "$as_me: WARNING: This typically indicates a broken setup, and is not supported" >&2;}
-  fi
-
-  # We only check CC_VERSION since we assume CXX_VERSION is equal.
-  if  [[ "$CC_VERSION" =~ (.*\.){3} ]] ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C compiler version number has more than three parts (X.Y.Z): $CC_VERSION. Comparisons might be wrong." >&5
-$as_echo "$as_me: WARNING: C compiler version number has more than three parts (X.Y.Z): $CC_VERSION. Comparisons might be wrong." >&2;}
-  fi
-
-  if  [[  "$CC_VERSION" =~ [0-9]{6} ]] ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C compiler version number has a part larger than 99999: $CC_VERSION. Comparisons might be wrong." >&5
-$as_echo "$as_me: WARNING: C compiler version number has a part larger than 99999: $CC_VERSION. Comparisons might be wrong." >&2;}
-  fi
-
-  COMPARABLE_ACTUAL_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", $1, $2, $3) }' <<< "$CC_VERSION"`
-
-
-  ### Locate other tools
-
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    ac_ext=m
-ac_cpp='$OBJCPP $CPPFLAGS'
-ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_objc_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in gcc objcc objc cc CC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJC"; then
-  ac_cv_prog_OBJC="$OBJC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJC=$ac_cv_prog_OBJC
-if test -n "$OBJC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJC" >&5
-$as_echo "$OBJC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$OBJC" && break
-  done
-fi
-if test -z "$OBJC"; then
-  ac_ct_OBJC=$OBJC
-  for ac_prog in gcc objcc objc cc CC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJC"; then
-  ac_cv_prog_ac_ct_OBJC="$ac_ct_OBJC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJC=$ac_cv_prog_ac_ct_OBJC
-if test -n "$ac_ct_OBJC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJC" >&5
-$as_echo "$ac_ct_OBJC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_OBJC" && break
-done
-
-  if test "x$ac_ct_OBJC" = x; then
-    OBJC="gcc"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJC=$ac_ct_OBJC
-  fi
-fi
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for Objective C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
-$as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
-if ${ac_cv_objc_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_objc_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_objc_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objc_compiler_gnu" >&5
-$as_echo "$ac_cv_objc_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GOBJC=yes
-else
-  GOBJC=
-fi
-ac_test_OBJCFLAGS=${OBJCFLAGS+set}
-ac_save_OBJCFLAGS=$OBJCFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
-$as_echo_n "checking whether $OBJC accepts -g... " >&6; }
-if ${ac_cv_prog_objc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_objc_werror_flag=$ac_objc_werror_flag
-   ac_objc_werror_flag=yes
-   ac_cv_prog_objc_g=no
-   OBJCFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_objc_try_compile "$LINENO"; then :
-  ac_cv_prog_objc_g=yes
-else
-  OBJCFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_objc_try_compile "$LINENO"; then :
-
-else
-  ac_objc_werror_flag=$ac_save_objc_werror_flag
-	 OBJCFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_objc_try_compile "$LINENO"; then :
-  ac_cv_prog_objc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_objc_werror_flag=$ac_save_objc_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objc_g" >&5
-$as_echo "$ac_cv_prog_objc_g" >&6; }
-if test "$ac_test_OBJCFLAGS" = set; then
-  OBJCFLAGS=$ac_save_OBJCFLAGS
-elif test $ac_cv_prog_objc_g = yes; then
-  if test "$GOBJC" = yes; then
-    OBJCFLAGS="-g -O2"
-  else
-    OBJCFLAGS="-g"
-  fi
-else
-  if test "$GOBJC" = yes; then
-    OBJCFLAGS="-O2"
-  else
-    OBJCFLAGS=
-  fi
-fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$OBJC"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of OBJC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of OBJC" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of OBJC, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of OBJC" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$OBJC"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of OBJC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of OBJC" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$OBJC"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJC (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving OBJC (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of OBJC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of OBJC" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    OBJC="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJC to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting OBJC to \"$new_complete\"" >&6;}
-  fi
-
-  else
-    OBJC=
-  fi
-
-  # Restore the flags to the user specified values.
-  # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
-  CFLAGS="$ORG_CFLAGS"
-  CXXFLAGS="$ORG_CXXFLAGS"
-  OBJCFLAGS="$ORG_OBJCFLAGS"
-
-  LD="$CC"
-  LDEXE="$CC"
-  LDCXX="$CXX"
-  LDEXECXX="$CXX"
-
-  # LDEXE is the linker to use, when creating executables.
-
-  # Linking C++ libraries.
-
-  # Linking C++ executables.
-
-
-  if test "x$OPENJDK_TARGET_OS" != xwindows; then
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$AR"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of AR, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$AR"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$AR"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AR (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving AR (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    AR="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AR to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting AR to \"$new_complete\"" >&6;}
-  fi
-
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    ARFLAGS="-r"
-  elif test "x$OPENJDK_TARGET_OS" = xaix; then
-    ARFLAGS="-X64"
-  else
-    ARFLAGS=""
-  fi
-
-
-  # For hotspot, we need these in Windows mixed path; other platforms keep them the same
-  HOTSPOT_CXX="$CXX"
-  HOTSPOT_LD="$LD"
-
-
-
-  COMPILER_NAME=gcc
-  COMPILER_TYPE=CC
-  if test "x$OPENJDK_TARGET_OS" = xwindows; then :
-
-    # For now, assume that we are always compiling using cl.exe.
-    CC_OUT_OPTION=-Fo
-    EXE_OUT_OPTION=-out:
-    LD_OUT_OPTION=-out:
-    AR_OUT_OPTION=-out:
-    # On Windows, reject /usr/bin/link (as determined in CYGWIN_LINK), which is a cygwin
-    # program for something completely different.
-    # Extract the first word of "link", so it can be a program name with args.
-set dummy link; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_WINLD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$WINLD"; then
-  ac_cv_prog_WINLD="$WINLD" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "$CYGWIN_LINK"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_WINLD="link"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_WINLD
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set WINLD to just the basename; use the full file name.
-    shift
-    ac_cv_prog_WINLD="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-WINLD=$ac_cv_prog_WINLD
-if test -n "$WINLD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINLD" >&5
-$as_echo "$WINLD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    # Since we must ignore the first found link, WINLD will contain
-    # the full path to the link.exe program.
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$WINLD"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of WINLD, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of WINLD, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$WINLD"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of WINLD, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$WINLD"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINLD (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving WINLD (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of WINLD, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    WINLD="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINLD to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting WINLD to \"$new_complete\"" >&6;}
-  fi
-
-    printf "Windows linker was found at $WINLD\n"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the found link.exe is actually the Visual Studio linker" >&5
-$as_echo_n "checking if the found link.exe is actually the Visual Studio linker... " >&6; }
-    "$WINLD" --version > /dev/null
-    if test $? -eq 0 ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      as_fn_error $? "This is the Cygwin link tool. Please check your PATH and rerun configure." "$LINENO" 5
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    fi
-    LD="$WINLD"
-    LDEXE="$WINLD"
-    LDCXX="$WINLD"
-    LDEXECXX="$WINLD"
-
-    # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MT"; then
-  ac_cv_prog_MT="$MT" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/mt"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_MT="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_MT
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set MT to just the basename; use the full file name.
-    shift
-    ac_cv_prog_MT="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-MT=$ac_cv_prog_MT
-if test -n "$MT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MT" >&5
-$as_echo "$MT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$MT"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of MT, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$MT"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$MT"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MT (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving MT (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    MT="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MT to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting MT to \"$new_complete\"" >&6;}
-  fi
-
-    # The resource compiler
-    # Extract the first word of "rc", so it can be a program name with args.
-set dummy rc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RC"; then
-  ac_cv_prog_RC="$RC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/rc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_RC="rc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_RC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set RC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_RC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-RC=$ac_cv_prog_RC
-if test -n "$RC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
-$as_echo "$RC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$RC"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of RC, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$RC"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$RC"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving RC (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving RC (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    RC="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting RC to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting RC to \"$new_complete\"" >&6;}
-  fi
-
-
-    # For hotspot, we need these in Windows mixed path,
-    # so rewrite them all. Need added .exe suffix.
-    HOTSPOT_CXX="$CXX.exe"
-    HOTSPOT_LD="$LD.exe"
-    HOTSPOT_MT="$MT.exe"
-    HOTSPOT_RC="$RC.exe"
-
-  unix_path="$HOTSPOT_CXX"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    windows_path=`$CYGPATH -m "$unix_path"`
-    HOTSPOT_CXX="$windows_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    windows_path=`cmd //c echo $unix_path`
-    HOTSPOT_CXX="$windows_path"
-  fi
-
-
-  unix_path="$HOTSPOT_LD"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    windows_path=`$CYGPATH -m "$unix_path"`
-    HOTSPOT_LD="$windows_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    windows_path=`cmd //c echo $unix_path`
-    HOTSPOT_LD="$windows_path"
-  fi
-
-
-  unix_path="$HOTSPOT_MT"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    windows_path=`$CYGPATH -m "$unix_path"`
-    HOTSPOT_MT="$windows_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    windows_path=`cmd //c echo $unix_path`
-    HOTSPOT_MT="$windows_path"
-  fi
-
-
-  unix_path="$HOTSPOT_RC"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    windows_path=`$CYGPATH -m "$unix_path"`
-    HOTSPOT_RC="$windows_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    windows_path=`cmd //c echo $unix_path`
-    HOTSPOT_RC="$windows_path"
-  fi
-
-
-
-
-    RC_FLAGS="-nologo -l 0x409 -r"
-    if test "x$VARIANT" = xOPT; then :
-
-    RC_FLAGS="$RC_FLAGS -d NDEBUG"
-
-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_BUILD_ID=\$(FULL_VERSION)\" \
-      -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
-      -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
-      -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
-      -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
-      -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
-      -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\""
-
-  # lib.exe is used to create static libraries.
-  # Extract the first word of "lib", so it can be a program name with args.
-set dummy lib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_WINAR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$WINAR"; then
-  ac_cv_prog_WINAR="$WINAR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WINAR="lib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WINAR=$ac_cv_prog_WINAR
-if test -n "$WINAR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINAR" >&5
-$as_echo "$WINAR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$WINAR"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of WINAR, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of WINAR, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$WINAR"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of WINAR, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$WINAR"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINAR (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving WINAR (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of WINAR, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    WINAR="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINAR to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting WINAR to \"$new_complete\"" >&6;}
-  fi
-
-  AR="$WINAR"
-  ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
-
-  # Extract the first word of "dumpbin", so it can be a program name with args.
-set dummy dumpbin; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DUMPBIN="dumpbin"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$DUMPBIN"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$DUMPBIN"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$DUMPBIN"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving DUMPBIN (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving DUMPBIN (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    DUMPBIN="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DUMPBIN to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting DUMPBIN to \"$new_complete\"" >&6;}
-  fi
-
-
-      COMPILER_TYPE=CL
-      # silence copyright notice and other headers.
-      COMMON_CCXXFLAGS="$COMMON_CCXXFLAGS -nologo"
-
-fi
-
-
-
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$CPP"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of CPP, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$CPP"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$CPP"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CPP (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving CPP (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    CPP="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CPP to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting CPP to \"$new_complete\"" >&6;}
-  fi
-
-
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$CXXCPP"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of CXXCPP, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$CXXCPP"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$CXXCPP"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXXCPP (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving CXXCPP (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    CXXCPP="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXXCPP to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting CXXCPP to \"$new_complete\"" >&6;}
-  fi
-
-
-  if test "x$COMPILE_TYPE" != "xcross"; then
-    # If we are not cross compiling, use the same compilers for
-    # building the build platform executables. The cross-compilation
-    # case needed to be done earlier, but this can only be done after
-    # the native tools have been localized.
-    BUILD_CC="$CC"
-    BUILD_CXX="$CXX"
-    BUILD_LD="$LD"
-  fi
-
-  # for solaris we really need solaris tools, and not gnu equivalent
-  #   these seems to normally reside in /usr/ccs/bin so add that to path before
-  #   starting to probe
-  #
-  #   NOTE: I add this /usr/ccs/bin after TOOLS but before OLD_PATH
-  #         so that it can be overriden --with-tools-dir
-  if test "x$OPENJDK_BUILD_OS" = xsolaris; then
-    PATH="${TOOLS_DIR}:/usr/ccs/bin:${OLD_PATH}"
-  fi
-
-  # Find the right assembler.
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_AS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $AS in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_AS="$AS" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_AS="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-AS=$ac_cv_path_AS
-if test -n "$AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-$as_echo "$AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$AS"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of AS, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$AS"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$AS"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AS (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving AS (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    AS="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AS to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting AS to \"$new_complete\"" >&6;}
-  fi
-
-  else
-    AS="$CC -c"
-  fi
-
-
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    # Extract the first word of "nm", so it can be a program name with args.
-set dummy nm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $NM in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_NM="$NM" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-NM=$ac_cv_path_NM
-if test -n "$NM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
-$as_echo "$NM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$NM"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of NM, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$NM"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$NM"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving NM (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    NM="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;}
-  fi
-
-    # Extract the first word of "gnm", so it can be a program name with args.
-set dummy gnm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GNM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GNM in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GNM="$GNM" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-GNM=$ac_cv_path_GNM
-if test -n "$GNM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNM" >&5
-$as_echo "$GNM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$GNM"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of GNM, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$GNM"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$GNM"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving GNM (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving GNM (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    GNM="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting GNM to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting GNM to \"$new_complete\"" >&6;}
-  fi
-
-    # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $STRIP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-STRIP=$ac_cv_path_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$STRIP"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of STRIP, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$STRIP"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$STRIP"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving STRIP (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    STRIP="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
-  fi
-
-    # Extract the first word of "mcs", so it can be a program name with args.
-set dummy mcs; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MCS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MCS in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MCS=$ac_cv_path_MCS
-if test -n "$MCS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
-$as_echo "$MCS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$MCS"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of MCS, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$MCS"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$MCS"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MCS (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving MCS (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    MCS="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting MCS to \"$new_complete\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_TARGET_OS" != xwindows; then
-    # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $OTOOL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_OTOOL="$OTOOL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_OTOOL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-OTOOL=$ac_cv_path_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    if test "x$OTOOL" = "x"; then
-      OTOOL="true"
-    fi
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NM="${ac_tool_prefix}nm"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NM=$ac_cv_prog_NM
-if test -n "$NM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
-$as_echo "$NM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NM"; then
-  ac_ct_NM=$NM
-  # Extract the first word of "nm", so it can be a program name with args.
-set dummy nm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NM"; then
-  ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_NM="nm"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NM=$ac_cv_prog_ac_ct_NM
-if test -n "$ac_ct_NM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5
-$as_echo "$ac_ct_NM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NM" = x; then
-    NM=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NM=$ac_ct_NM
-  fi
-else
-  NM="$ac_cv_prog_NM"
-fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$NM"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of NM, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$NM"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$NM"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving NM (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    NM="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;}
-  fi
-
-    GNM="$NM"
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$STRIP"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of STRIP, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$STRIP"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$STRIP"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving STRIP (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    STRIP="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
-  fi
-
-  fi
-
-  # objcopy is used for moving debug symbols to separate files when
-  # full debug symbols are enabled.
-  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in gobjcopy objcopy
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJCOPY+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJCOPY"; then
-  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJCOPY=$ac_cv_prog_OBJCOPY
-if test -n "$OBJCOPY"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
-$as_echo "$OBJCOPY" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$OBJCOPY" && break
-  done
-fi
-if test -z "$OBJCOPY"; then
-  ac_ct_OBJCOPY=$OBJCOPY
-  for ac_prog in gobjcopy objcopy
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJCOPY"; then
-  ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
-if test -n "$ac_ct_OBJCOPY"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCOPY" >&5
-$as_echo "$ac_ct_OBJCOPY" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_OBJCOPY" && break
-done
-
-  if test "x$ac_ct_OBJCOPY" = x; then
-    OBJCOPY=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJCOPY=$ac_ct_OBJCOPY
-  fi
-fi
-
-    # Only call fixup if objcopy was found.
-    if test -n "$OBJCOPY"; then
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$OBJCOPY"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$OBJCOPY"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$OBJCOPY"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJCOPY (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving OBJCOPY (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    OBJCOPY="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJCOPY to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting OBJCOPY to \"$new_complete\"" >&6;}
-  fi
-
-    fi
-  fi
-
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in gobjdump objdump
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$OBJDUMP" && break
-  done
-fi
-if test -z "$OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  for ac_prog in gobjdump objdump
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_OBJDUMP" && break
-done
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-fi
-
-  if test "x$OBJDUMP" != x; then
-    # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$OBJDUMP"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$OBJDUMP"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-  else
-    # We're on a posix platform. Hooray! :)
-    # First separate the path from the arguments. This will split at the first
-    # space.
-    complete="$OBJDUMP"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJDUMP (as $path) failed, using $path directly." >&5
-$as_echo "$as_me: Resolving OBJDUMP (as $path) failed, using $path directly." >&6;}
-      new_path="$path"
-    fi
-
-    if test "x$new_path" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
-    fi
-  fi
-
-  # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
-  else
-    new_complete="$new_path"
-  fi
-
-  if test "x$complete" != "x$new_complete"; then
-    OBJDUMP="$new_complete"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJDUMP to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting OBJDUMP to \"$new_complete\"" >&6;}
-  fi
-
-  fi
-
-
-
-  # Restore old path without tools dir
-  PATH="$OLD_PATH"
-
-
-# FIXME: Currently we must test this after paths but before flags. Fix!
-
-# And we can test some aspects on the target using configure macros.
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-  ###############################################################################
-  #
-  # Now we check if libjvm.so will use 32 or 64 bit pointers for the C/C++ code.
-  # (The JVM can use 32 or 64 bit Java pointers but that decision
-  # is made at runtime.)
-  #
-
-  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xaix; then
-    # Always specify -m flag on Solaris
-    # And -q on AIX because otherwise the compiler produces 32-bit objects by default
-
-  # When we add flags to the "official" CFLAGS etc, we need to
-  # keep track of these additions in ADDED_CFLAGS etc. These
-  # will later be checked to make sure only controlled additions
-  # have been made to CFLAGS etc.
-  ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-
-  CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
-  CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
-  LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
-
-  CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
-  CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
-  LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
-
-  elif test "x$COMPILE_TYPE" = xreduced; then
-    if test "x$OPENJDK_TARGET_OS" != xwindows; then
-      # Specify -m if running reduced on other Posix platforms
-
-  # When we add flags to the "official" CFLAGS etc, we need to
-  # keep track of these additions in ADDED_CFLAGS etc. These
-  # will later be checked to make sure only controlled additions
-  # have been made to CFLAGS etc.
-  ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-
-  CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
-  CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
-  LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
-
-  CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
-  CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
-  LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
-
-    fi
-  fi
-
-  # Make compilation sanity check
-  for ac_header in stdio.h
-do :
-  ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdio_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDIO_H 1
-_ACEOF
-
-else
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to compile stdio.h. This likely implies missing compile dependencies." >&5
-$as_echo "$as_me: Failed to compile stdio.h. This likely implies missing compile dependencies." >&6;}
-    if test "x$COMPILE_TYPE" = xreduced; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: You are doing a reduced build. Check that you have 32-bit libraries installed." >&5
-$as_echo "$as_me: You are doing a reduced build. Check that you have 32-bit libraries installed." >&6;}
-    elif test "x$COMPILE_TYPE" = xcross; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: You are doing a cross-compilation. Check that you have all target platform libraries installed." >&5
-$as_echo "$as_me: You are doing a cross-compilation. Check that you have all target platform libraries installed." >&6;}
-    fi
-    as_fn_error $? "Cannot continue." "$LINENO" 5
-
-fi
-
-done
-
-
-  # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
-$as_echo_n "checking size of int *... " >&6; }
-if ${ac_cv_sizeof_int_p+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int_p" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int *)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int_p=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_p" >&5
-$as_echo "$ac_cv_sizeof_int_p" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT_P $ac_cv_sizeof_int_p
-_ACEOF
-
-
-
-  # AC_CHECK_SIZEOF defines 'ac_cv_sizeof_int_p' to hold the number of bytes used by an 'int*'
-  if test "x$ac_cv_sizeof_int_p" = x; then
-    # The test failed, lets stick to the assumed value.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The number of bits in the target could not be determined, using $OPENJDK_TARGET_CPU_BITS." >&5
-$as_echo "$as_me: WARNING: The number of bits in the target could not be determined, using $OPENJDK_TARGET_CPU_BITS." >&2;}
-  else
-    TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p`
-
-    if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then
-      # This situation may happen on 64-bit platforms where the compiler by default only generates 32-bit objects
-      # Let's try to implicitely set the compilers target architecture and retry the test
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)." >&5
-$as_echo "$as_me: The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: I'll retry after setting the platforms compiler target bits flag to ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" >&5
-$as_echo "$as_me: I'll retry after setting the platforms compiler target bits flag to ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" >&6;}
-
-  # When we add flags to the "official" CFLAGS etc, we need to
-  # keep track of these additions in ADDED_CFLAGS etc. These
-  # will later be checked to make sure only controlled additions
-  # have been made to CFLAGS etc.
-  ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-
-  CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
-  CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
-  LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
-
-  CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
-  CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
-  LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
-
-
-      # We have to unset 'ac_cv_sizeof_int_p' first, otherwise AC_CHECK_SIZEOF will use the previously cached value!
-      unset ac_cv_sizeof_int_p
-      # And we have to undef the definition of SIZEOF_INT_P in confdefs.h by the previous invocation of AC_CHECK_SIZEOF
-      cat >>confdefs.h <<_ACEOF
-#undef SIZEOF_INT_P
-_ACEOF
-
-      # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
-$as_echo_n "checking size of int *... " >&6; }
-if ${ac_cv_sizeof_int_p+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int_p" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int *)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int_p=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_p" >&5
-$as_echo "$ac_cv_sizeof_int_p" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT_P $ac_cv_sizeof_int_p
-_ACEOF
-
-
-
-      TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p`
-
-      if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then
-        as_fn_error $? "The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)" "$LINENO" 5
-      fi
-    fi
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for target address size" >&5
-$as_echo_n "checking for target address size... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_CPU_BITS bits" >&5
-$as_echo "$OPENJDK_TARGET_CPU_BITS bits" >&6; }
-
-
-  ###############################################################################
-  #
-  # Is the target little of big endian?
-  #
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-	# Check for potential -arch flags.  It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	       else
-		 ac_cv_c_bigendian=universal
-		 break
-	       fi
-	       ;;
-	   esac
-	   ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	   ac_prev=arch
-	 fi
-       done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-	     #include <sys/param.h>
-
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-		#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then :
-  # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	      else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  ac_cv_c_bigendian=no
-else
-  ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     ENDIAN="big";; #(
-   no)
-     ENDIAN="little" ;; #(
-   universal)
-     ENDIAN="universal_endianness"
-     ;; #(
-   *)
-     ENDIAN="unknown" ;;
- esac
-
-
-  if test "x$ENDIAN" = xuniversal_endianness; then
-    as_fn_error $? "Building with both big and little endianness is not supported" "$LINENO" 5
-  fi
-  if test "x$ENDIAN" != "x$OPENJDK_TARGET_CPU_ENDIAN"; then
-    as_fn_error $? "The tested endian in the target ($ENDIAN) differs from the endian expected to be found in the target ($OPENJDK_TARGET_CPU_ENDIAN)" "$LINENO" 5
-  fi
-
-
-# Configure flags for the tools
-
-
-  ###############################################################################
-  #
-  # How to compile shared libraries.
-  #
-
-  if test "x$GCC" = xyes; then
-    COMPILER_NAME=gcc
-    PICFLAG="-fPIC"
-    LIBRARY_PREFIX=lib
-    SHARED_LIBRARY='lib$1.so'
-    STATIC_LIBRARY='lib$1.a'
-    SHARED_LIBRARY_FLAGS="-shared"
-    SHARED_LIBRARY_SUFFIX='.so'
-    STATIC_LIBRARY_SUFFIX='.a'
-    OBJ_SUFFIX='.o'
-    EXE_SUFFIX=''
-    SET_SHARED_LIBRARY_NAME='-Xlinker -soname=$1'
-    SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=$1'
-    C_FLAG_REORDER=''
-    CXX_FLAG_REORDER=''
-    SET_SHARED_LIBRARY_ORIGIN='-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$$$ORIGIN$1'
-    SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker \$$$$ORIGIN$1'
-    LD="$CC"
-    LDEXE="$CC"
-    LDCXX="$CXX"
-    LDEXECXX="$CXX"
-    POST_STRIP_CMD="$STRIP -g"
-
-    # Linking is different on MacOSX
-    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-      # Might change in the future to clang.
-      COMPILER_NAME=gcc
-      SHARED_LIBRARY='lib$1.dylib'
-      SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
-      SHARED_LIBRARY_SUFFIX='.dylib'
-      EXE_SUFFIX=''
-      SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
-      SET_SHARED_LIBRARY_MAPFILE=''
-      SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
-      SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
-      POST_STRIP_CMD="$STRIP -S"
-    fi
-  else
-    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-      # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
-      COMPILER_NAME=ossc
-      PICFLAG="-KPIC"
-      LIBRARY_PREFIX=lib
-      SHARED_LIBRARY='lib$1.so'
-      STATIC_LIBRARY='lib$1.a'
-      SHARED_LIBRARY_FLAGS="-G"
-      SHARED_LIBRARY_SUFFIX='.so'
-      STATIC_LIBRARY_SUFFIX='.a'
-      OBJ_SUFFIX='.o'
-      EXE_SUFFIX=''
-      SET_SHARED_LIBRARY_NAME=''
-      SET_SHARED_LIBRARY_MAPFILE='-M$1'
-      C_FLAG_REORDER='-xF'
-      CXX_FLAG_REORDER='-xF'
-      SET_SHARED_LIBRARY_ORIGIN='-R\$$$$ORIGIN$1'
-      SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
-      CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
-      CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
-      CFLAGS_JDKLIB_EXTRA='-xstrconst'
-      POST_STRIP_CMD="$STRIP -x"
-      POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
-    fi
-    if test "x$OPENJDK_TARGET_OS" = xaix; then
-        COMPILER_NAME=xlc
-        PICFLAG="-qpic=large"
-        LIBRARY_PREFIX=lib
-        SHARED_LIBRARY='lib$1.so'
-        STATIC_LIBRARY='lib$1.a'
-        SHARED_LIBRARY_FLAGS="-qmkshrobj"
-        SHARED_LIBRARY_SUFFIX='.so'
-        STATIC_LIBRARY_SUFFIX='.a'
-        OBJ_SUFFIX='.o'
-        EXE_SUFFIX=''
-        SET_SHARED_LIBRARY_NAME=''
-        SET_SHARED_LIBRARY_MAPFILE=''
-        C_FLAG_REORDER=''
-        CXX_FLAG_REORDER=''
-        SET_SHARED_LIBRARY_ORIGIN=''
-        SET_EXECUTABLE_ORIGIN=""
-        CFLAGS_JDK=""
-        CXXFLAGS_JDK=""
-        CFLAGS_JDKLIB_EXTRA=''
-        POST_STRIP_CMD="$STRIP -X32_64"
-        POST_MCS_CMD=""
-    fi
-    if test "x$OPENJDK_TARGET_OS" = xwindows; then
-      # If it is not gcc, then assume it is the MS Visual Studio compiler
-      COMPILER_NAME=cl
-      PICFLAG=""
-      LIBRARY_PREFIX=
-      SHARED_LIBRARY='$1.dll'
-      STATIC_LIBRARY='$1.lib'
-      SHARED_LIBRARY_FLAGS="-LD"
-      SHARED_LIBRARY_SUFFIX='.dll'
-      STATIC_LIBRARY_SUFFIX='.lib'
-      OBJ_SUFFIX='.obj'
-      EXE_SUFFIX='.exe'
-      SET_SHARED_LIBRARY_NAME=''
-      SET_SHARED_LIBRARY_MAPFILE=''
-      SET_SHARED_LIBRARY_ORIGIN=''
-      SET_EXECUTABLE_ORIGIN=''
-    fi
-  fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  # The (cross) compiler is now configured, we can now test capabilities
-  # of the target platform.
-
-
-
-  ###############################################################################
-  #
-  # Setup the opt flags for different compilers
-  # and different operating systems.
-  #
-
-  #
-  # NOTE: check for -mstackrealign needs to be below potential addition of -m32
-  #
-  if test "x$OPENJDK_TARGET_CPU_BITS" = x32 && test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
-    # While waiting for a better solution, the current workaround is to use -mstackrealign.
-    CFLAGS="$CFLAGS -mstackrealign"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 32-bit compiler supports -mstackrealign" >&5
-$as_echo_n "checking if 32-bit compiler supports -mstackrealign... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int main() { return 0; }
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-else
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-          as_fn_error $? "The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path." "$LINENO" 5
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  fi
-
-  C_FLAG_DEPS="-MMD -MF"
-  CXX_FLAG_DEPS="-MMD -MF"
-
-  case $COMPILER_TYPE in
-    CC )
-      case $COMPILER_NAME in
-        gcc )
-          case $OPENJDK_TARGET_OS in
-            macosx )
-              # On MacOSX we optimize for size, something
-              # we should do for all platforms?
-              C_O_FLAG_HI="-Os"
-              C_O_FLAG_NORM="-Os"
-              C_O_FLAG_NONE=""
-              ;;
-            *)
-              C_O_FLAG_HI="-O3"
-              C_O_FLAG_NORM="-O2"
-              C_O_FLAG_NONE="-O0"
-              ;;
-          esac
-          CXX_O_FLAG_HI="$C_O_FLAG_HI"
-          CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
-          CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
-          CFLAGS_DEBUG_SYMBOLS="-g"
-          CXXFLAGS_DEBUG_SYMBOLS="-g"
-          if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
-            CFLAGS_DEBUG_SYMBOLS="-g1"
-            CXXFLAGS_DEBUG_SYMBOLS="-g1"
-          fi
-          ;;
-        ossc )
-          #
-          # Forte has different names for this with their C++ compiler...
-          #
-          C_FLAG_DEPS="-xMMD -xMF"
-          CXX_FLAG_DEPS="-xMMD -xMF"
-
-          # Extra options used with HIGHEST
-          #
-          # WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be
-          #          done with care, there are some assumptions below that need to
-          #          be understood about the use of pointers, and IEEE behavior.
-          #
-          # Use non-standard floating point mode (not IEEE 754)
-          CC_HIGHEST="$CC_HIGHEST -fns"
-          # Do some simplification of floating point arithmetic (not IEEE 754)
-          CC_HIGHEST="$CC_HIGHEST -fsimple"
-          # Use single precision floating point with 'float'
-          CC_HIGHEST="$CC_HIGHEST -fsingle"
-          # Assume memory references via basic pointer types do not alias
-          #   (Source with excessing pointer casting and data access with mixed
-          #    pointer types are not recommended)
-          CC_HIGHEST="$CC_HIGHEST -xalias_level=basic"
-          # Use intrinsic or inline versions for math/std functions
-          #   (If you expect perfect errno behavior, do not use this)
-          CC_HIGHEST="$CC_HIGHEST -xbuiltin=%all"
-          # Loop data dependency optimizations (need -xO3 or higher)
-          CC_HIGHEST="$CC_HIGHEST -xdepend"
-          # Pointer parameters to functions do not overlap
-          #   (Similar to -xalias_level=basic usage, but less obvious sometimes.
-          #    If you pass in multiple pointers to the same data, do not use this)
-          CC_HIGHEST="$CC_HIGHEST -xrestrict"
-          # Inline some library routines
-          #   (If you expect perfect errno behavior, do not use this)
-          CC_HIGHEST="$CC_HIGHEST -xlibmil"
-          # Use optimized math routines
-          #   (If you expect perfect errno behavior, do not use this)
-          #  Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
-          #CC_HIGHEST="$CC_HIGHEST -xlibmopt"
-
-          if test "x$OPENJDK_TARGET_CPU" = xsparc; then
-            CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
-            CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
-          fi
-
-          case $OPENJDK_TARGET_CPU_ARCH in
-            x86)
-              C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xregs=no%frameptr"
-              C_O_FLAG_HI="-xO4 -Wu,-O4~yz -xregs=no%frameptr"
-              C_O_FLAG_NORM="-xO2 -Wu,-O2~yz -xregs=no%frameptr"
-              C_O_FLAG_NONE="-xregs=no%frameptr"
-              CXX_O_FLAG_HIGHEST="-xO4 -Qoption ube -O4~yz $CC_HIGHEST -xregs=no%frameptr"
-              CXX_O_FLAG_HI="-xO4 -Qoption ube -O4~yz -xregs=no%frameptr"
-              CXX_O_FLAG_NORM="-xO2 -Qoption ube -O2~yz -xregs=no%frameptr"
-              CXX_O_FLAG_NONE="-xregs=no%frameptr"
-              if test "x$OPENJDK_TARGET_CPU" = xx86; then
-                C_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST -xchip=pentium"
-                CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HIGHEST -xchip=pentium"
-              fi
-              ;;
-            sparc)
-              CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
-              CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
-              C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
-              C_O_FLAG_HI="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0"
-              C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0"
-              C_O_FLAG_NONE=""
-              CXX_O_FLAG_HIGHEST="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
-              CXX_O_FLAG_HI="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
-              CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
-              CXX_O_FLAG_NONE=""
-              ;;
-          esac
-
-          CFLAGS_DEBUG_SYMBOLS="-g -xs"
-          CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
-          ;;
-        xlc )
-          C_FLAG_DEPS="-qmakedep=gcc -MF"
-          CXX_FLAG_DEPS="-qmakedep=gcc -MF"
-          C_O_FLAG_HIGHEST="-O3"
-          C_O_FLAG_HI="-O3 -qstrict"
-          C_O_FLAG_NORM="-O2"
-          C_O_FLAG_NONE=""
-          CXX_O_FLAG_HIGHEST="-O3"
-          CXX_O_FLAG_HI="-O3 -qstrict"
-          CXX_O_FLAG_NORM="-O2"
-          CXX_O_FLAG_NONE=""
-          CFLAGS_DEBUG_SYMBOLS="-g"
-          CXXFLAGS_DEBUG_SYMBOLS="-g"
-          LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall"
-          CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
-          CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
-          ;;
-      esac
-      ;;
-    CL )
-      C_O_FLAG_HIGHEST="-O2"
-      C_O_FLAG_HI="-O1"
-      C_O_FLAG_NORM="-O1"
-      C_O_FLAG_NONE="-Od"
-      CXX_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST"
-      CXX_O_FLAG_HI="$C_O_FLAG_HI"
-      CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
-      CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
-      ;;
-  esac
-
-  if test -z "$C_O_FLAG_HIGHEST"; then
-    C_O_FLAG_HIGHEST="$C_O_FLAG_HI"
-  fi
-
-  if test -z "$CXX_O_FLAG_HIGHEST"; then
-    CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HI"
-  fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags" >&5
-$as_echo "$as_me: WARNING: Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags" >&2;}
-  fi
-
-  if test "x$CXXFLAGS" != "x${ADDED_CXXFLAGS}"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags" >&5
-$as_echo "$as_me: WARNING: Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags" >&2;}
-  fi
-
-  if test "x$LDFLAGS" != "x${ADDED_LDFLAGS}"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags" >&5
-$as_echo "$as_me: WARNING: Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags" >&2;}
-  fi
-
-
-# Check whether --with-extra-cflags was given.
-if test "${with_extra_cflags+set}" = set; then :
-  withval=$with_extra_cflags;
-fi
-
-
-
-# Check whether --with-extra-cxxflags was given.
-if test "${with_extra_cxxflags+set}" = set; then :
-  withval=$with_extra_cxxflags;
-fi
-
-
-
-# Check whether --with-extra-ldflags was given.
-if test "${with_extra_ldflags+set}" = set; then :
-  withval=$with_extra_ldflags;
-fi
-
-
-  CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
-  CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
-  LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
-
-  # Hotspot needs these set in their legacy form
-  LEGACY_EXTRA_CFLAGS=$with_extra_cflags
-  LEGACY_EXTRA_CXXFLAGS=$with_extra_cxxflags
-  LEGACY_EXTRA_LDFLAGS=$with_extra_ldflags
-
-
-
-
-
-  ###############################################################################
-  #
-  # Now setup the CFLAGS and LDFLAGS for the JDK build.
-  # Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build.
-  #    CFLAGS_JDK    - C Compiler flags
-  #    CXXFLAGS_JDK  - C++ Compiler flags
-  #    COMMON_CCXXFLAGS_JDK - common to C and C++
-  #
-  case $COMPILER_NAME in
-    gcc )
-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
-      -pipe \
-      -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$CXXSTD_CXXFLAG $CFLAGS_WARNINGS_ARE_ERRORS\"" >&5
-$as_echo_n "checking if the C++ compiler supports \"$CXXSTD_CXXFLAG $CFLAGS_WARNINGS_ARE_ERRORS\"... " >&6; }
-  supports=yes
-
-  saved_cxxflags="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAG $CXXSTD_CXXFLAG $CFLAGS_WARNINGS_ARE_ERRORS"
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  supports=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  CXXFLAGS="$saved_cxxflags"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    :
-  else
-    CXXSTD_CXXFLAG=""
-  fi
-
-      CXXFLAGS_JDK="${CXXFLAGS_JDK} ${CXXSTD_CXXFLAG}"
-
-      case $OPENJDK_TARGET_CPU_ARCH in
-        arm )
-          # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
-          CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
-          ;;
-        ppc )
-          # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
-          ;;
-        * )
-          COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer"
-          CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
-          ;;
-      esac
-
-  REFERENCE_VERSION=6
-
-  if  [[ "$REFERENCE_VERSION" =~ (.*\.){3} ]] ; then
-    as_fn_error $? "Internal error: Cannot compare to $REFERENCE_VERSION, only three parts (X.Y.Z) is supported" "$LINENO" 5
-  fi
-
-  if  [[ "$REFERENCE_VERSION" =~ [0-9]{6} ]] ; then
-    as_fn_error $? "Internal error: Cannot compare to $REFERENCE_VERSION, only parts < 99999 is supported" "$LINENO" 5
-  fi
-
-  # Version comparison method inspired by http://stackoverflow.com/a/24067243
-  COMPARABLE_REFERENCE_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", $1, $2, $3) }' <<< "$REFERENCE_VERSION"`
-
-  if test $COMPARABLE_ACTUAL_VERSION -ge $COMPARABLE_REFERENCE_VERSION ; then
-
-  # These flags are required for GCC 6 builds as undefined behaviour in OpenJDK code
-  # runs afoul of the more aggressive versions of these optimisations.
-  # Notably, value range propagation now assumes that the this pointer of C++
-  # member functions is non-null.
-  NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler supports \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror\"" >&5
-$as_echo_n "checking if the C compiler supports \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror\"... " >&6; }
-  supports=yes
-
-  saved_cflags="$CFLAGS"
-  CFLAGS="$CFLAGS $NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror"
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  supports=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  CFLAGS="$saved_cflags"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    C_COMP_SUPPORTS="yes"
-  else
-    C_COMP_SUPPORTS="no"
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror\"" >&5
-$as_echo_n "checking if the C++ compiler supports \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror\"... " >&6; }
-  supports=yes
-
-  saved_cxxflags="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAG $NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror"
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  supports=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  CXXFLAGS="$saved_cxxflags"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    CXX_COMP_SUPPORTS="yes"
-  else
-    CXX_COMP_SUPPORTS="no"
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if both compilers support \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror\"" >&5
-$as_echo_n "checking if both compilers support \"$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror\"... " >&6; }
-  supports=no
-  if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    :
-  else
-    NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""
-  fi
-
-
-  NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse"
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler supports \"$NO_LIFETIME_DSE_CFLAG -Werror\"" >&5
-$as_echo_n "checking if the C compiler supports \"$NO_LIFETIME_DSE_CFLAG -Werror\"... " >&6; }
-  supports=yes
-
-  saved_cflags="$CFLAGS"
-  CFLAGS="$CFLAGS $NO_LIFETIME_DSE_CFLAG -Werror"
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  supports=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  CFLAGS="$saved_cflags"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    C_COMP_SUPPORTS="yes"
-  else
-    C_COMP_SUPPORTS="no"
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$NO_LIFETIME_DSE_CFLAG -Werror\"" >&5
-$as_echo_n "checking if the C++ compiler supports \"$NO_LIFETIME_DSE_CFLAG -Werror\"... " >&6; }
-  supports=yes
-
-  saved_cxxflags="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAG $NO_LIFETIME_DSE_CFLAG -Werror"
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  supports=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  CXXFLAGS="$saved_cxxflags"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    CXX_COMP_SUPPORTS="yes"
-  else
-    CXX_COMP_SUPPORTS="no"
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if both compilers support \"$NO_LIFETIME_DSE_CFLAG -Werror\"" >&5
-$as_echo_n "checking if both compilers support \"$NO_LIFETIME_DSE_CFLAG -Werror\"... " >&6; }
-  supports=no
-  if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    :
-  else
-    NO_LIFETIME_DSE_CFLAG=""
-  fi
-
-  CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
-
-
-
-  else
-    :
-  fi
-
-      ;;
-    ossc )
-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS"
-      case $OPENJDK_TARGET_CPU_ARCH in
-        x86 )
-          COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DcpuIntel -Di586 -D$OPENJDK_TARGET_CPU_LEGACY_LIB"
-          CFLAGS_JDK="$CFLAGS_JDK -erroff=E_BAD_PRAGMA_PACK_VALUE"
-          ;;
-      esac
-
-      CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa -v -mt -W0,-noglobal"
-      CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib"
-
-      LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext"
-      LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib"
-      ;;
-    xlc )
-      CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
-      CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
-
-      LDFLAGS_JDK="$LDFLAGS_JDK"
-      LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK"
-      ;;
-    cl )
-      # If building with Visual Studio 2010, we can still use _STATIC_CPPLIB to
-      # avoid bundling msvcpNNN.dll. Doesn't work with newer versions of visual
-      # studio.
-      STATIC_CPPLIB_FLAGS=""
-      if test "x$VS_VERSION" = "x2010"; then
-        STATIC_CPPLIB_FLAGS="-D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB"
-      fi
-
-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
-      $STATIC_CPPLIB_FLAGS -DWIN32_LEAN_AND_MEAN \
-      -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
-      -DWIN32 -DIAL"
-      case $OPENJDK_TARGET_CPU in
-        x86 )
-          COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_X86_ -Dx86"
-          ;;
-        x86_64 )
-          COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_AMD64_ -Damd64"
-          ;;
-      esac
-      ;;
-  esac
-
-  ###############################################################################
-
-  # Adjust flags according to debug level.
-  case $DEBUG_LEVEL in
-    fastdebug )
-      CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
-      CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
-      C_O_FLAG_HI="$C_O_FLAG_NORM"
-      C_O_FLAG_NORM="$C_O_FLAG_NORM"
-      CXX_O_FLAG_HI="$CXX_O_FLAG_NORM"
-      CXX_O_FLAG_NORM="$CXX_O_FLAG_NORM"
-      JAVAC_FLAGS="$JAVAC_FLAGS -g"
-      ;;
-    slowdebug )
-      CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
-      CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
-      C_O_FLAG_HI="$C_O_FLAG_NONE"
-      C_O_FLAG_NORM="$C_O_FLAG_NONE"
-      CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
-      CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
-      JAVAC_FLAGS="$JAVAC_FLAGS -g"
-      ;;
-  esac
-
-  COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK $ADD_LP64"
-
-  # The package path is used only on macosx?
-  PACKAGE_PATH=/opt/local
-
-
-  if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
-    # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
-    #   Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
-    #   (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h).
-    #   Note: -Dmacro         is the same as    #define macro 1
-    #         -Dmacro=        is the same as    #define macro
-    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
-    else
-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
-    fi
-  else
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN"
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX"
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xwindows; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DWINDOWS"
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DSOLARIS"
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xaix; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DAIX -DPPC64"
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
-    # Setting these parameters makes it an error to link to macosx APIs that are
-    # newer than the given OS version and makes the linked binaries compatible even
-    # if built on a newer version of the OS.
-    # The expected format is X.Y.Z
-    MACOSX_VERSION_MIN=10.7.0
-
-    # The macro takes the version with no dots, ex: 1070
-    # Let the flags variables get resolved in make for easier override on make
-    # command line.
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
-    LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xbsd; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
-  fi
-  if test "x$DEBUG_LEVEL" = xrelease; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG"
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DTRIMMED"
-  fi
-  else
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DDEBUG"
-  fi
-
-  COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
-  COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
-
-  COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
-      -I${JDK_OUTPUTDIR}/include \
-      -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
-      -I${JDK_TOPDIR}/src/share/javavm/export \
-      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
-      -I${JDK_TOPDIR}/src/share/native/common \
-      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
-
-  # The shared libraries are compiled using the picflag.
-  CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
-  CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
-
-  # Executable flags
-  CFLAGS_JDKEXE="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK"
-  CXXFLAGS_JDKEXE="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK"
-
-  # Now this is odd. The JDK native libraries have to link against libjvm.so
-  # On 32-bit machines there is normally two distinct libjvm.so:s, client and server.
-  # Which should we link to? Are we lucky enough that the binary api to the libjvm.so library
-  # is identical for client and server? Yes. Which is picked at runtime (client or server)?
-  # Neither, since the chosen libjvm.so has already been loaded by the launcher, all the following
-  # libraries will link to whatever is in memory. Yuck.
-  #
-  # Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh.
-  if test "x$COMPILER_NAME" = xcl; then
-    LDFLAGS_JDK="$LDFLAGS_JDK -nologo -opt:ref -incremental:no"
-    if test "x$OPENJDK_TARGET_CPU" = xx86; then
-      LDFLAGS_JDK="$LDFLAGS_JDK -safeseh"
-    fi
-    # TODO: make -debug optional "--disable-full-debug-symbols"
-    LDFLAGS_JDK="$LDFLAGS_JDK -debug"
-    LDFLAGS_JDKLIB="${LDFLAGS_JDK} -dll -libpath:${JDK_OUTPUTDIR}/lib"
-    LDFLAGS_JDKLIB_SUFFIX=""
-    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
-      LDFLAGS_STACK_SIZE=1048576
-    else
-      LDFLAGS_STACK_SIZE=327680
-    fi
-    LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
-  else
-    if test "x$COMPILER_NAME" = xgcc; then
-      # If this is a --hash-style=gnu system, use --hash-style=both, why?
-      HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
-      if test -n "$HAS_GNU_HASH"; then
-        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
-      fi
-      if test "x$OPENJDK_TARGET_OS" = xlinux; then
-        # And since we now know that the linker is gnu, then add -z defs, to forbid
-        # undefined symbols in object files.
-        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
-        if test "x$DEBUG_LEVEL" = "xrelease"; then
-          # When building release libraries, tell the linker optimize them.
-          # Should this be supplied to the OSS linker as well?
-          LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
-        fi
-      fi
-    fi
-    LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
-        -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}"
-
-    # On some platforms (mac) the linker warns about non existing -L dirs.
-    # Add server first if available. Linking aginst client does not always produce the same results.
-    # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1.
-    # Default to server for other variants.
-    if test "x$JVM_VARIANT_SERVER" = xtrue; then
-      LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
-    elif test "x$JVM_VARIANT_CLIENT" = xtrue; then
-      LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client"
-    elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
-      LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal"
-    else
-      LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
-    fi
-
-    LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm"
-    if test "x$COMPILER_NAME" = xossc; then
-      LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc"
-    fi
-
-    LDFLAGS_JDKEXE="${LDFLAGS_JDK}"
-    if test "x$OPENJDK_TARGET_OS" = xlinux; then
-      LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
-    fi
-  fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  # Some Zero and Shark settings.
-  # ZERO_ARCHFLAG tells the compiler which mode to build for
-  case "${OPENJDK_TARGET_CPU}" in
-    s390)
-      ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
-      ;;
-    *)
-      ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  esac
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler supports \"$ZERO_ARCHFLAG\"" >&5
-$as_echo_n "checking if the C compiler supports \"$ZERO_ARCHFLAG\"... " >&6; }
-  supports=yes
-
-  saved_cflags="$CFLAGS"
-  CFLAGS="$CFLAGS $ZERO_ARCHFLAG"
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  supports=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  CFLAGS="$saved_cflags"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    C_COMP_SUPPORTS="yes"
-  else
-    C_COMP_SUPPORTS="no"
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$ZERO_ARCHFLAG\"" >&5
-$as_echo_n "checking if the C++ compiler supports \"$ZERO_ARCHFLAG\"... " >&6; }
-  supports=yes
-
-  saved_cxxflags="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAG $ZERO_ARCHFLAG"
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  supports=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  CXXFLAGS="$saved_cxxflags"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    CXX_COMP_SUPPORTS="yes"
-  else
-    CXX_COMP_SUPPORTS="no"
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if both compilers support \"$ZERO_ARCHFLAG\"" >&5
-$as_echo_n "checking if both compilers support \"$ZERO_ARCHFLAG\"... " >&6; }
-  supports=no
-  if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    :
-  else
-    ZERO_ARCHFLAG=""
-  fi
-
-
-
-  # Check that the compiler supports -mX (or -qX on AIX) flags
-  # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler supports \"${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}\"" >&5
-$as_echo_n "checking if the C compiler supports \"${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}\"... " >&6; }
-  supports=yes
-
-  saved_cflags="$CFLAGS"
-  CFLAGS="$CFLAGS ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  supports=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  CFLAGS="$saved_cflags"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    C_COMP_SUPPORTS="yes"
-  else
-    C_COMP_SUPPORTS="no"
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}\"" >&5
-$as_echo_n "checking if the C++ compiler supports \"${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}\"... " >&6; }
-  supports=yes
-
-  saved_cxxflags="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAG ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  supports=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  CXXFLAGS="$saved_cxxflags"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    CXX_COMP_SUPPORTS="yes"
-  else
-    CXX_COMP_SUPPORTS="no"
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if both compilers support \"${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}\"" >&5
-$as_echo_n "checking if both compilers support \"${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}\"... " >&6; }
-  supports=no
-  if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
-$as_echo "$supports" >&6; }
-  if test "x$supports" = "xyes" ; then
-    COMPILER_SUPPORTS_TARGET_BITS_FLAG=true
-  else
-    COMPILER_SUPPORTS_TARGET_BITS_FLAG=false
-  fi
-
-
-
-
-  # Check for broken SuSE 'ld' for which 'Only anonymous version tag is allowed in executable.'
-  USING_BROKEN_SUSE_LD=no
-  if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$GCC" = xyes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken SuSE 'ld' which only understands anonymous version tags in executables" >&5
-$as_echo_n "checking for broken SuSE 'ld' which only understands anonymous version tags in executables... " >&6; }
-    echo "SUNWprivate_1.1 { local: *; };" > version-script.map
-    echo "int main() { }" > main.c
-    if $CXX -Xlinker -version-script=version-script.map main.c 2>&5 >&5; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      USING_BROKEN_SUSE_LD=no
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      USING_BROKEN_SUSE_LD=yes
-    fi
-    rm -rf version-script.map main.c
-  fi
-
-
-
-# Setup debug symbols (need objcopy from the toolchain for that)
-
-  #
-  # ENABLE_DEBUG_SYMBOLS
-  # This must be done after the toolchain is setup, since we're looking at objcopy.
-  #
-  # Check whether --enable-debug-symbols was given.
-if test "${enable_debug_symbols+set}" = set; then :
-  enableval=$enable_debug_symbols;
-fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should generate debug symbols" >&5
-$as_echo_n "checking if we should generate debug symbols... " >&6; }
-
-  if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
-    # explicit enabling of enable-debug-symbols and can't find objcopy
-    #   this is an error
-    as_fn_error $? "Unable to find objcopy, cannot enable debug-symbols" "$LINENO" 5
-  fi
-
-  if test "x$enable_debug_symbols" = "xyes"; then
-    ENABLE_DEBUG_SYMBOLS=true
-  elif test "x$enable_debug_symbols" = "xno"; then
-    ENABLE_DEBUG_SYMBOLS=false
-  else
-    # Default is on if objcopy is found
-    if test "x$OBJCOPY" != x; then
-      ENABLE_DEBUG_SYMBOLS=true
-    # MacOS X and Windows don't use objcopy but default is on for those OSes
-    elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
-      ENABLE_DEBUG_SYMBOLS=true
-    else
-      ENABLE_DEBUG_SYMBOLS=false
-    fi
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_DEBUG_SYMBOLS" >&5
-$as_echo "$ENABLE_DEBUG_SYMBOLS" >&6; }
-
-  #
-  # ZIP_DEBUGINFO_FILES
-  #
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5
-$as_echo_n "checking if we should zip debug-info files... " >&6; }
-  # Check whether --enable-zip-debug-info was given.
-if test "${enable_zip_debug_info+set}" = set; then :
-  enableval=$enable_zip_debug_info; enable_zip_debug_info="${enableval}"
-else
-  enable_zip_debug_info="yes"
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_zip_debug_info}" >&5
-$as_echo "${enable_zip_debug_info}" >&6; }
-
-  if test "x${enable_zip_debug_info}" = "xno"; then
-    ZIP_DEBUGINFO_FILES=false
-  else
-    ZIP_DEBUGINFO_FILES=true
-  fi
-
-
-
-
-
-
-
-###############################################################################
-#
-# Check dependencies for external and internal libraries.
-#
-###############################################################################
-
-# After we have toolchain, we can compile fixpath. It's needed by the lib checks.
-
-  # 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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath can be created" >&5
-$as_echo_n "checking if fixpath can be created... " >&6; }
-    FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
-    FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
-    if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
-      FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
-      FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
-      # Important to keep the .exe suffix on Cygwin for Hotspot makefiles
-      FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
-    elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
-      FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
-      FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
-
-      # 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="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
-    fi
-    rm -f $OUTPUT_ROOT/fixpath*
-    cd $OUTPUT_ROOT
-    $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
-    cd $CURDIR
-
-    if test ! -x $OUTPUT_ROOT/fixpath.exe; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      cat $OUTPUT_ROOT/fixpath1.log
-      as_fn_error $? "Could not create $OUTPUT_ROOT/fixpath.exe" "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath.exe works" >&5
-$as_echo_n "checking if fixpath.exe works... " >&6; }
-    cd $OUTPUT_ROOT
-    $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
-    cd $CURDIR
-    if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      cat $OUTPUT_ROOT/fixpath2.log
-      as_fn_error $? "fixpath did not work!" "$LINENO" 5
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
-  fi
-
-
-
-
-
-
-  ###############################################################################
-  #
-  # OS specific settings that we never will need to probe.
-  #
-  if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on Linux?" >&5
-$as_echo_n "checking what is not needed on Linux?... " >&6; }
-    PULSE_NOT_NEEDED=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pulse" >&5
-$as_echo "pulse" >&6; }
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on Solaris?" >&5
-$as_echo_n "checking what is not needed on Solaris?... " >&6; }
-    ALSA_NOT_NEEDED=yes
-    PULSE_NOT_NEEDED=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-$as_echo "alsa pulse" >&6; }
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = xaix; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on AIX?" >&5
-$as_echo_n "checking what is not needed on AIX?... " >&6; }
-    ALSA_NOT_NEEDED=yes
-    PULSE_NOT_NEEDED=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-$as_echo "alsa pulse" >&6; }
-  fi
-
-
-  if test "x$OPENJDK_TARGET_OS" = xwindows; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on Windows?" >&5
-$as_echo_n "checking what is not needed on Windows?... " >&6; }
-    CUPS_NOT_NEEDED=yes
-    ALSA_NOT_NEEDED=yes
-    PULSE_NOT_NEEDED=yes
-    X11_NOT_NEEDED=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa cups pulse x11" >&5
-$as_echo "alsa cups pulse x11" >&6; }
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on MacOSX?" >&5
-$as_echo_n "checking what is not needed on MacOSX?... " >&6; }
-    ALSA_NOT_NEEDED=yes
-    PULSE_NOT_NEEDED=yes
-    X11_NOT_NEEDED=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5
-$as_echo "alsa pulse x11" >&6; }
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = xbsd; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on bsd?" >&5
-$as_echo_n "checking what is not needed on bsd?... " >&6; }
-    ALSA_NOT_NEEDED=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa" >&5
-$as_echo "alsa" >&6; }
-  fi
-
-  if test "x$OPENJDK" = "xfalse"; then
-    FREETYPE_NOT_NEEDED=yes
-  fi
-
-  if test "x$SUPPORT_HEADFUL" = xno; then
-    X11_NOT_NEEDED=yes
-  fi
-
-  # Deprecated and now ignored
-
-  # Check whether --enable-macosx-runtime-support was given.
-if test "${enable_macosx_runtime_support+set}" = set; then :
-  enableval=$enable_macosx_runtime_support;
-fi
-
-  if test "x$enable_macosx_runtime_support" != x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&5
-$as_echo "$as_me: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&2;}
-  fi
-
-
-
-
-  ###############################################################################
-  #
-  # Check for X Windows
-  #
-
-  # Check if the user has specified sysroot, but not --x-includes or --x-libraries.
-  # Make a simple check for the libraries at the sysroot, and setup --x-includes and
-  # --x-libraries for the sysroot, if that seems to be correct.
-  if test "x$SYS_ROOT" != "x/"; then
-    if test "x$x_includes" = xNONE; then
-      if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
-        x_includes="$SYS_ROOT/usr/X11R6/include"
-      elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
-        x_includes="$SYS_ROOT/usr/include"
-      fi
-    fi
-    if test "x$x_libraries" = xNONE; then
-      if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
-        x_libraries="$SYS_ROOT/usr/X11R6/lib"
-      elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-        x_libraries="$SYS_ROOT/usr/lib64"
-      elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then
-        x_libraries="$SYS_ROOT/usr/lib"
-      fi
-    fi
-  fi
-
-  # Now let autoconf do it's magic
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
-$as_echo_n "checking for X... " >&6; }
-
-
-# Check whether --with-x was given.
-if test "${with_x+set}" = set; then :
-  withval=$with_x;
-fi
-
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
-  # The user explicitly disabled X.
-  have_x=disabled
-else
-  case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
-    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-rm -f -r conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
-  cat >Imakefile <<'_ACEOF'
-incroot:
-	@echo incroot='${INCROOT}'
-usrlibdir:
-	@echo usrlibdir='${USRLIBDIR}'
-libdir:
-	@echo libdir='${LIBDIR}'
-_ACEOF
-  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-    for ac_var in incroot usrlibdir libdir; do
-      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-    done
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl dylib la dll; do
-      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
-	ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case $ac_im_incroot in
-	/usr/include) ac_x_includes= ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -f -r conftest.dir
-fi
-
-# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/X11R7/include
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-
-/usr/include/X11
-/usr/include/X11R7
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
-
-/usr/local/X11/include
-/usr/local/X11R7/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-
-/usr/local/include/X11
-/usr/local/include/X11R7
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
-
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-
-/usr/include
-/usr/local/include
-/usr/unsupported/include
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
-
-/usr/openwin/include
-/usr/openwin/share/include'
-
-if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
-  # First, try using that file with no special directory specified.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
-    ac_x_includes=$ac_dir
-    break
-  fi
-done
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi # $ac_x_includes = no
-
-if test "$ac_x_libraries" = no; then
-  # Check for the libraries.
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS=$LIBS
-  LIBS="-lX11 $LIBS"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-int
-main ()
-{
-XrmInitialize ()
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  LIBS=$ac_save_LIBS
-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-do
-  # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl dylib la dll; do
-    if test -r "$ac_dir/libX11.$ac_extension"; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = no
-
-case $ac_x_includes,$ac_x_libraries in #(
-  no,* | *,no | *\'*)
-    # Didn't find X, or a directory has "'" in its name.
-    ac_cv_have_x="have_x=no";; #(
-  *)
-    # Record where we found X for the cache.
-    ac_cv_have_x="have_x=yes\
-	ac_x_includes='$ac_x_includes'\
-	ac_x_libraries='$ac_x_libraries'"
-esac
-fi
-;; #(
-    *) have_x=yes;;
-  esac
-  eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
-$as_echo "$have_x" >&6; }
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes\
-	ac_x_includes='$x_includes'\
-	ac_x_libraries='$x_libraries'"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
-$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
-fi
-
-  if test "$no_x" = yes; then
-  # Not all programs may use this symbol, but it does not hurt to define it.
-
-$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
-
-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
-  if test -n "$x_includes"; then
-    X_CFLAGS="$X_CFLAGS -I$x_includes"
-  fi
-
-  # It would also be nice to do this for all -L options, not just this one.
-  if test -n "$x_libraries"; then
-    X_LIBS="$X_LIBS -L$x_libraries"
-    # For Solaris; some versions of Sun CC require a space after -R and
-    # others require no space.  Words are not sufficient . . . .
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
-$as_echo_n "checking whether -R must be followed by a space... " >&6; }
-    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-    ac_xsave_cxx_werror_flag=$ac_cxx_werror_flag
-    ac_cxx_werror_flag=yes
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       X_LIBS="$X_LIBS -R$x_libraries"
-else
-  LIBS="$ac_xsave_LIBS -R $x_libraries"
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	  X_LIBS="$X_LIBS -R $x_libraries"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
-$as_echo "neither works" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    ac_cxx_werror_flag=$ac_xsave_cxx_werror_flag
-    LIBS=$ac_xsave_LIBS
-  fi
-
-  # Check for system-dependent libraries X programs must link with.
-  # Do this before checking for the system-independent R6 libraries
-  # (-lICE), since we may need -lsocket or whatever for X linking.
-
-  if test "$ISC" = yes; then
-    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-  else
-    # Martyn Johnson says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And Karl Berry says
-    # the Alpha needs dnet_stub (dnet does not exist).
-    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XOpenDisplay ();
-int
-main ()
-{
-return XOpenDisplay ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dnet_ntoa ();
-int
-main ()
-{
-return dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_dnet_dnet_ntoa=yes
-else
-  ac_cv_lib_dnet_dnet_ntoa=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-fi
-
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet_stub  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dnet_ntoa ();
-int
-main ()
-{
-return dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_dnet_stub_dnet_ntoa=yes
-else
-  ac_cv_lib_dnet_stub_dnet_ntoa=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-fi
-
-    fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LIBS="$ac_xsave_LIBS"
-
-    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-    # needs -lnsl.
-    # The nsl library prevents programs from opening the X display
-    # on Irix 5.2, according to T.E. Dickey.
-    # The functions gethostbyname, getservbyname, and inet_addr are
-    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = xyes; then :
-
-fi
-
-    if test $ac_cv_func_gethostbyname = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_nsl_gethostbyname=yes
-else
-  ac_cv_lib_nsl_gethostbyname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-fi
-
-      if test $ac_cv_lib_nsl_gethostbyname = no; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_bsd_gethostbyname=yes
-else
-  ac_cv_lib_bsd_gethostbyname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
-fi
-
-      fi
-    fi
-
-    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT
-    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-    # on later versions), says Simon Leinen: it contains gethostby*
-    # variants that don't use the name server (or something).  -lsocket
-    # must be given before -lnsl if both are needed.  We assume that
-    # if connect needs -lnsl, so does gethostbyname.
-    ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = xyes; then :
-
-fi
-
-    if test $ac_cv_func_connect = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_connect+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
-int
-main ()
-{
-return connect ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_socket_connect=yes
-else
-  ac_cv_lib_socket_connect=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = xyes; then :
-  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-fi
-
-    fi
-
-    # Guillermo Gomez says -lposix is necessary on A/UX.
-    ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = xyes; then :
-
-fi
-
-    if test $ac_cv_func_remove = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
-$as_echo_n "checking for remove in -lposix... " >&6; }
-if ${ac_cv_lib_posix_remove+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char remove ();
-int
-main ()
-{
-return remove ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_posix_remove=yes
-else
-  ac_cv_lib_posix_remove=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
-$as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = xyes; then :
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-fi
-
-    fi
-
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = xyes; then :
-
-fi
-
-    if test $ac_cv_func_shmat = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
-$as_echo_n "checking for shmat in -lipc... " >&6; }
-if ${ac_cv_lib_ipc_shmat+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lipc  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shmat ();
-int
-main ()
-{
-return shmat ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_ipc_shmat=yes
-else
-  ac_cv_lib_ipc_shmat=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
-$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-fi
-
-    fi
-  fi
-
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-  ac_save_LDFLAGS=$LDFLAGS
-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # These have to be linked with before -lX11, unlike the other
-  # libraries we check for below, so use a different variable.
-  # John Interrante, Karl Berry
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char IceConnectionNumber ();
-int
-main ()
-{
-return IceConnectionNumber ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_ICE_IceConnectionNumber=yes
-else
-  ac_cv_lib_ICE_IceConnectionNumber=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
-  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-fi
-
-  LDFLAGS=$ac_save_LDFLAGS
-
-fi
-
-
-  # AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
-  # this doesn't make sense so we remove it.
-  if test "x$COMPILE_TYPE" = xcross; then
-    X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'`
-  fi
-
-  if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
-
-  # Print a helpful message on how to acquire the necessary build dependency.
-  # x11 is the help tag: freetype, cups, pulse, alsa etc
-  MISSING_DEPENDENCY=x11
-
-  if 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_help     $MISSING_DEPENDENCY ;;
-      yum)
-        yum_help     $MISSING_DEPENDENCY ;;
-      port)
-        port_help    $MISSING_DEPENDENCY ;;
-      pkgutil)
-        pkgutil_help $MISSING_DEPENDENCY ;;
-      pkgadd)
-        pkgadd_help  $MISSING_DEPENDENCY ;;
-    esac
-
-    if test "x$PKGHANDLER_COMMAND" != x; then
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-    fi
-  fi
-
-    as_fn_error $? "Could not find X11 libraries. $HELP_MSG" "$LINENO" 5
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    OPENWIN_HOME="/usr/openwin"
-  fi
-
-
-
-  #
-  # Weird Sol10 something check...TODO change to try compile
-  #
-  if test "x${OPENJDK_TARGET_OS}" = xsolaris; then
-    if test "`uname -r`" = "5.10"; then
-      if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then
-        X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS"
-      fi
-    fi
-  fi
-
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-  OLD_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $X_CFLAGS"
-
-  # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
-  for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-        # include <X11/Xlib.h>
-        # include <X11/Xutil.h>
-
-
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- X11_A_OK=yes
-else
-  X11_A_OK=no; break
-fi
-
-done
-
-
-  CFLAGS="$OLD_CFLAGS"
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
-
-  # Print a helpful message on how to acquire the necessary build dependency.
-  # x11 is the help tag: freetype, cups, pulse, alsa etc
-  MISSING_DEPENDENCY=x11
-
-  if 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_help     $MISSING_DEPENDENCY ;;
-      yum)
-        yum_help     $MISSING_DEPENDENCY ;;
-      port)
-        port_help    $MISSING_DEPENDENCY ;;
-      pkgutil)
-        pkgutil_help $MISSING_DEPENDENCY ;;
-      pkgadd)
-        pkgadd_help  $MISSING_DEPENDENCY ;;
-    esac
-
-    if test "x$PKGHANDLER_COMMAND" != x; then
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-    fi
-  fi
-
-    as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG" "$LINENO" 5
-  fi
-
-
-
-
-
-
-  ###############################################################################
-  #
-  # The common unix printing system cups is used to print from java.
-  #
-
-# Check whether --with-cups was given.
-if test "${with_cups+set}" = set; then :
-  withval=$with_cups;
-fi
-
-
-# Check whether --with-cups-include was given.
-if test "${with_cups_include+set}" = set; then :
-  withval=$with_cups_include;
-fi
-
-
-  if test "x$CUPS_NOT_NEEDED" = xyes; then
-    if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cups not used, so --with-cups is ignored" >&5
-$as_echo "$as_me: WARNING: cups not used, so --with-cups is ignored" >&2;}
-    fi
-    CUPS_CFLAGS=
-  else
-    CUPS_FOUND=no
-
-    if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then
-      as_fn_error $? "It is not possible to disable the use of cups. Remove the --without-cups option." "$LINENO" 5
-    fi
-
-    if test "x${with_cups}" != x; then
-      CUPS_CFLAGS="-I${with_cups}/include"
-      CUPS_FOUND=yes
-    fi
-    if test "x${with_cups_include}" != x; then
-      CUPS_CFLAGS="-I${with_cups_include}"
-      CUPS_FOUND=yes
-    fi
-    if test "x$CUPS_FOUND" = xno; then
-
-
-  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
-    # Source the builddeps file again, to make sure it uses the latest variables!
-    . $builddepsfile
-    # Look for a target and build machine specific resource!
-    eval resource=\${builddep_cups_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a target specific resource
-      eval resource=\${builddep_cups_TARGET_${rewritten_target_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a build specific resource
-      eval resource=\${builddep_cups_BUILD_${rewritten_build_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a generic resource
-      # (The cups comes from M4 and not the shell, thus no need for eval here.)
-      resource=${builddep_cups}
-    fi
-    if test "x$resource" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for cups" >&5
-$as_echo "$as_me: Using builddeps $resource for cups" >&6;}
-      # If the resource in the builddeps.conf file is an existing directory,
-      # for example /java/linux/cups
-      if test -d ${resource}; then
-        depdir=${resource}
-      else
-
-  # cups is for example mymodule
-  # $resource is for example libs/general/libmymod_1_2_3.zip
-  # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
-  # $with_builddeps_dir is for example /localhome/builddeps
-  # depdir is the name of the variable into which we store the depdir, eg MYMOD
-  # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
-  # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
-  filename=`basename $resource`
-  filebase=`echo $filename | sed 's/\.[^\.]*$//'`
-  filebase=${filename%%.*}
-  extension=${filename#*.}
-  installdir=$with_builddeps_dir/$filebase
-  if test ! -f $installdir/$filename.unpacked; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency cups from $with_builddeps_server/$resource and installing into $installdir" >&5
-$as_echo "$as_me: Downloading build dependency cups from $with_builddeps_server/$resource and installing into $installdir" >&6;}
-    if test ! -d $installdir; then
-      mkdir -p $installdir
-    fi
-    if test ! -d $installdir; then
-      as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
-    fi
-    tmpfile=`mktemp $installdir/cups.XXXXXXXXX`
-    touch $tmpfile
-    if test ! -f $tmpfile; then
-      as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
-    fi
-
-  # $with_builddeps_server/$resource  is the ftp://abuilddeps.server.com/libs/cups.zip
-  # $tmpfile is the local file name for the downloaded file.
-  VALID_TOOL=no
-  if test "x$BDEPS_FTP" = xwget; then
-    VALID_TOOL=yes
-    wget -O $tmpfile $with_builddeps_server/$resource
-  fi
-  if test "x$BDEPS_FTP" = xlftp; then
-    VALID_TOOL=yes
-    lftp -c "get $with_builddeps_server/$resource  -o $tmpfile"
-  fi
-  if test "x$BDEPS_FTP" = xftp; then
-    VALID_TOOL=yes
-    FTPSERVER=`echo $with_builddeps_server/$resource  | cut -f 3 -d '/'`
-    FTPPATH=`echo $with_builddeps_server/$resource  | cut -f 4- -d '/'`
-    FTPUSERPWD=${FTPSERVER%%@*}
-    if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
-      FTPUSER=${userpwd%%:*}
-      FTPPWD=${userpwd#*@}
-      FTPSERVER=${FTPSERVER#*@}
-    else
-      FTPUSER=ftp
-      FTPPWD=ftp
-    fi
-    # the "pass" command does not work on some
-    # ftp clients (read ftp.exe) but if it works,
-    # passive mode is better!
-    ( \
-        echo "user $FTPUSER $FTPPWD"        ; \
-        echo "pass"                         ; \
-        echo "bin"                          ; \
-        echo "get $FTPPATH $tmpfile"              ; \
-    ) | ftp -in $FTPSERVER
-  fi
-  if test "x$VALID_TOOL" != xyes; then
-    as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
-  fi
-
-    mv $tmpfile $installdir/$filename
-    if test ! -s $installdir/$filename; then
-      as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
-    fi
-    case "$extension" in
-      zip)  echo "Unzipping $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
-        ;;
-      tar.gz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      tgz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
-        ;;
-    esac
-  fi
-  if test -f $installdir/$filename.unpacked; then
-    depdir=$installdir
-  fi
-
-      fi
-      # Source the builddeps file again, because in the previous command, the depdir
-      # was updated to point at the current build dependency install directory.
-      . $builddepsfile
-      # Now extract variables from the builddeps.conf files.
-      theroot=${builddep_cups_ROOT}
-      thecflags=${builddep_cups_CFLAGS}
-      thelibs=${builddep_cups_LIBS}
-      if test "x$depdir" = x; then
-        as_fn_error $? "Could not download build dependency cups" "$LINENO" 5
-      fi
-      CUPS=$depdir
-      if test "x$theroot" != x; then
-        CUPS="$theroot"
-      fi
-      if test "x$thecflags" != x; then
-        CUPS_CFLAGS="$thecflags"
-      fi
-      if test "x$thelibs" != x; then
-        CUPS_LIBS="$thelibs"
-      fi
-      CUPS_FOUND=yes
-
-    fi
-
-  fi
-
-    fi
-    if test "x$CUPS_FOUND" = xno; then
-      # Are the cups headers installed in the default /usr/include location?
-      for ac_header in cups/cups.h cups/ppd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-            CUPS_FOUND=yes
-            CUPS_CFLAGS=
-            DEFAULT_CUPS=yes
-
-
-fi
-
-done
-
-    fi
-    if test "x$CUPS_FOUND" = xno; then
-      # Getting nervous now? Lets poke around for standard Solaris third-party
-      # package installation locations.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cups headers" >&5
-$as_echo_n "checking for cups headers... " >&6; }
-      if test -s /opt/sfw/cups/include/cups/cups.h; then
-        # An SFW package seems to be installed!
-        CUPS_FOUND=yes
-        CUPS_CFLAGS="-I/opt/sfw/cups/include"
-      elif test -s /opt/csw/include/cups/cups.h; then
-        # A CSW package seems to be installed!
-        CUPS_FOUND=yes
-        CUPS_CFLAGS="-I/opt/csw/include"
-      fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5
-$as_echo "$CUPS_FOUND" >&6; }
-    fi
-    if test "x$CUPS_FOUND" = xno; then
-
-  # Print a helpful message on how to acquire the necessary build dependency.
-  # cups is the help tag: freetype, cups, pulse, alsa etc
-  MISSING_DEPENDENCY=cups
-
-  if 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_help     $MISSING_DEPENDENCY ;;
-      yum)
-        yum_help     $MISSING_DEPENDENCY ;;
-      port)
-        port_help    $MISSING_DEPENDENCY ;;
-      pkgutil)
-        pkgutil_help $MISSING_DEPENDENCY ;;
-      pkgadd)
-        pkgadd_help  $MISSING_DEPENDENCY ;;
-    esac
-
-    if test "x$PKGHANDLER_COMMAND" != x; then
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-    fi
-  fi
-
-      as_fn_error $? "Could not find cups! $HELP_MSG " "$LINENO" 5
-    fi
-  fi
-
-
-
-
-
-
-  ###############################################################################
-  #
-  # The ubiquitous freetype library is used to render fonts.
-  #
-
-# Check whether --with-freetype was given.
-if test "${with_freetype+set}" = set; then :
-  withval=$with_freetype;
-fi
-
-
-# Check whether --with-freetype-include was given.
-if test "${with_freetype_include+set}" = set; then :
-  withval=$with_freetype_include;
-fi
-
-
-# Check whether --with-freetype-lib was given.
-if test "${with_freetype_lib+set}" = set; then :
-  withval=$with_freetype_lib;
-fi
-
-  # Check whether --enable-freetype-bundling was given.
-if test "${enable_freetype_bundling+set}" = set; then :
-  enableval=$enable_freetype_bundling;
-fi
-
-
-  FREETYPE_CFLAGS=
-  FREETYPE_LIBS=
-  FREETYPE_BUNDLE_LIB_PATH=
-
-  if test "x$FREETYPE_NOT_NEEDED" = xyes; then
-    if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetype not used, so --with-freetype is ignored" >&5
-$as_echo "$as_me: WARNING: freetype not used, so --with-freetype is ignored" >&2;}
-    fi
-    if test "x$enable_freetype_bundling" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetype not used, so --enable-freetype-bundling is ignored" >&5
-$as_echo "$as_me: WARNING: freetype not used, so --enable-freetype-bundling is ignored" >&2;}
-    fi
-  else
-    # freetype is needed to build; go get it!
-
-    BUNDLE_FREETYPE="$enable_freetype_bundling"
-
-    if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
-      # User has specified settings
-
-      if test "x$BUNDLE_FREETYPE" = x; then
-        # If not specified, default is to bundle freetype
-        BUNDLE_FREETYPE=yes
-      fi
-
-      if test "x$with_freetype" != x; then
-        POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype/include"
-        POTENTIAL_FREETYPE_LIB_PATH="$with_freetype/lib"
-      fi
-
-      # Allow --with-freetype-lib and --with-freetype-include to override
-      if test "x$with_freetype_include" != x; then
-        POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
-      fi
-      if test "x$with_freetype_lib" != x; then
-        POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
-      fi
-
-      if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" != x && test "x$POTENTIAL_FREETYPE_LIB_PATH" != x; then
-        # Okay, we got it. Check that it works.
-
-  POTENTIAL_FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
-  METHOD="--with-freetype"
-
-  # First check if the files exists.
-  if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
-    # We found an arbitrary include file. That's a good sign.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
-$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
-    FOUND_FREETYPE=yes
-
-    FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
-    if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
-      FOUND_FREETYPE=no
-    else
-      if test "x$OPENJDK_TARGET_OS" = xwindows; then
-        # On Windows, we will need both .lib and .dll file.
-        if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
-          FOUND_FREETYPE=no
-        fi
-      elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
-        # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
-        POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
-      fi
-    fi
-  fi
-
-  if test "x$FOUND_FREETYPE" = xyes; then
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_LIB_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-    FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
-$as_echo_n "checking for freetype includes... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
-$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
-    FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
-$as_echo_n "checking for freetype libraries... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
-$as_echo "$FREETYPE_LIB_PATH" >&6; }
-  fi
-
-        if test "x$FOUND_FREETYPE" != xyes; then
-          as_fn_error $? "Can not find or use freetype at location given by --with-freetype" "$LINENO" 5
-        fi
-      else
-        # User specified only one of lib or include. This is an error.
-        if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" = x ; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: User specified --with-freetype-lib but not --with-freetype-include" >&5
-$as_echo "$as_me: User specified --with-freetype-lib but not --with-freetype-include" >&6;}
-          as_fn_error $? "Need both freetype lib and include paths. Consider using --with-freetype instead." "$LINENO" 5
-        else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: User specified --with-freetype-include but not --with-freetype-lib" >&5
-$as_echo "$as_me: User specified --with-freetype-include but not --with-freetype-lib" >&6;}
-          as_fn_error $? "Need both freetype lib and include paths. Consider using --with-freetype instead." "$LINENO" 5
-        fi
-      fi
-    else
-      # User did not specify settings, but we need freetype. Try to locate it.
-
-      if test "x$BUNDLE_FREETYPE" = x; then
-        # If not specified, default is to bundle freetype only on windows
-        if test "x$OPENJDK_TARGET_OS" = xwindows; then
-          BUNDLE_FREETYPE=yes
-        else
-          BUNDLE_FREETYPE=no
-        fi
-      fi
-
-      if test "x$FOUND_FREETYPE" != xyes; then
-        # Check builddeps
-
-
-  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
-    # Source the builddeps file again, to make sure it uses the latest variables!
-    . $builddepsfile
-    # Look for a target and build machine specific resource!
-    eval resource=\${builddep_freetype2_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a target specific resource
-      eval resource=\${builddep_freetype2_TARGET_${rewritten_target_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a build specific resource
-      eval resource=\${builddep_freetype2_BUILD_${rewritten_build_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a generic resource
-      # (The freetype2 comes from M4 and not the shell, thus no need for eval here.)
-      resource=${builddep_freetype2}
-    fi
-    if test "x$resource" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for freetype2" >&5
-$as_echo "$as_me: Using builddeps $resource for freetype2" >&6;}
-      # If the resource in the builddeps.conf file is an existing directory,
-      # for example /java/linux/cups
-      if test -d ${resource}; then
-        depdir=${resource}
-      else
-
-  # freetype2 is for example mymodule
-  # $resource is for example libs/general/libmymod_1_2_3.zip
-  # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
-  # $with_builddeps_dir is for example /localhome/builddeps
-  # depdir is the name of the variable into which we store the depdir, eg MYMOD
-  # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
-  # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
-  filename=`basename $resource`
-  filebase=`echo $filename | sed 's/\.[^\.]*$//'`
-  filebase=${filename%%.*}
-  extension=${filename#*.}
-  installdir=$with_builddeps_dir/$filebase
-  if test ! -f $installdir/$filename.unpacked; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency freetype2 from $with_builddeps_server/$resource and installing into $installdir" >&5
-$as_echo "$as_me: Downloading build dependency freetype2 from $with_builddeps_server/$resource and installing into $installdir" >&6;}
-    if test ! -d $installdir; then
-      mkdir -p $installdir
-    fi
-    if test ! -d $installdir; then
-      as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
-    fi
-    tmpfile=`mktemp $installdir/freetype2.XXXXXXXXX`
-    touch $tmpfile
-    if test ! -f $tmpfile; then
-      as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
-    fi
-
-  # $with_builddeps_server/$resource  is the ftp://abuilddeps.server.com/libs/cups.zip
-  # $tmpfile is the local file name for the downloaded file.
-  VALID_TOOL=no
-  if test "x$BDEPS_FTP" = xwget; then
-    VALID_TOOL=yes
-    wget -O $tmpfile $with_builddeps_server/$resource
-  fi
-  if test "x$BDEPS_FTP" = xlftp; then
-    VALID_TOOL=yes
-    lftp -c "get $with_builddeps_server/$resource  -o $tmpfile"
-  fi
-  if test "x$BDEPS_FTP" = xftp; then
-    VALID_TOOL=yes
-    FTPSERVER=`echo $with_builddeps_server/$resource  | cut -f 3 -d '/'`
-    FTPPATH=`echo $with_builddeps_server/$resource  | cut -f 4- -d '/'`
-    FTPUSERPWD=${FTPSERVER%%@*}
-    if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
-      FTPUSER=${userpwd%%:*}
-      FTPPWD=${userpwd#*@}
-      FTPSERVER=${FTPSERVER#*@}
-    else
-      FTPUSER=ftp
-      FTPPWD=ftp
-    fi
-    # the "pass" command does not work on some
-    # ftp clients (read ftp.exe) but if it works,
-    # passive mode is better!
-    ( \
-        echo "user $FTPUSER $FTPPWD"        ; \
-        echo "pass"                         ; \
-        echo "bin"                          ; \
-        echo "get $FTPPATH $tmpfile"              ; \
-    ) | ftp -in $FTPSERVER
-  fi
-  if test "x$VALID_TOOL" != xyes; then
-    as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
-  fi
-
-    mv $tmpfile $installdir/$filename
-    if test ! -s $installdir/$filename; then
-      as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
-    fi
-    case "$extension" in
-      zip)  echo "Unzipping $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
-        ;;
-      tar.gz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      tgz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
-        ;;
-    esac
-  fi
-  if test -f $installdir/$filename.unpacked; then
-    depdir=$installdir
-  fi
-
-      fi
-      # Source the builddeps file again, because in the previous command, the depdir
-      # was updated to point at the current build dependency install directory.
-      . $builddepsfile
-      # Now extract variables from the builddeps.conf files.
-      theroot=${builddep_freetype2_ROOT}
-      thecflags=${builddep_freetype2_CFLAGS}
-      thelibs=${builddep_freetype2_LIBS}
-      if test "x$depdir" = x; then
-        as_fn_error $? "Could not download build dependency freetype2" "$LINENO" 5
-      fi
-      FREETYPE=$depdir
-      if test "x$theroot" != x; then
-        FREETYPE="$theroot"
-      fi
-      if test "x$thecflags" != x; then
-        FREETYPE_CFLAGS="$thecflags"
-      fi
-      if test "x$thelibs" != x; then
-        FREETYPE_LIBS="$thelibs"
-      fi
-      FOUND_FREETYPE=yes
-      else FOUND_FREETYPE=no
-
-    fi
-    else FOUND_FREETYPE=no
-
-  fi
-
-        # BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
-        if test "x$FOUND_FREETYPE" = xyes; then
-          if test "x$BUNDLE_FREETYPE" = xyes; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype using builddeps, but ignoring since we can not bundle that" >&5
-$as_echo "$as_me: Found freetype using builddeps, but ignoring since we can not bundle that" >&6;}
-            FOUND_FREETYPE=no
-          else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype" >&5
-$as_echo_n "checking for freetype... " >&6; }
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (using builddeps)" >&5
-$as_echo "yes (using builddeps)" >&6; }
-          fi
-        fi
-      fi
-
-      if test "x$FOUND_FREETYPE" != xyes; then
-        # Check modules using pkg-config, but only if we have it (ugly output results otherwise)
-        if test "x$PKG_CONFIG" != x; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
-$as_echo_n "checking for FREETYPE... " >&6; }
-
-if test -n "$FREETYPE_CFLAGS"; then
-    pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$FREETYPE_LIBS"; then
-    pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2" 2>&1`
-        else
-	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$FREETYPE_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                FOUND_FREETYPE=no
-elif test $pkg_failed = untried; then
-	FOUND_FREETYPE=no
-else
-	FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS
-	FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	FOUND_FREETYPE=yes
-fi
-          if test "x$FOUND_FREETYPE" = xyes; then
-            # On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
-            FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's/-lz//g'`
-            # 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
-            if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-              FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's?/lib?/lib/amd64?g'`
-            fi
-            # BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
-            if test "x$BUNDLE_FREETYPE" = xyes; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype using pkg-config, but ignoring since we can not bundle that" >&5
-$as_echo "$as_me: Found freetype using pkg-config, but ignoring since we can not bundle that" >&6;}
-              FOUND_FREETYPE=no
-            else
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype" >&5
-$as_echo_n "checking for freetype... " >&6; }
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (using pkg-config)" >&5
-$as_echo "yes (using pkg-config)" >&6; }
-            fi
-          fi
-        fi
-      fi
-
-      if test "x$FOUND_FREETYPE" != xyes; then
-        # Check in well-known locations
-        if test "x$OPENJDK_TARGET_OS" = xwindows; then
-          FREETYPE_BASE_DIR="$PROGRAMFILES/GnuWin32"
-
-  windows_path="$FREETYPE_BASE_DIR"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    FREETYPE_BASE_DIR="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    FREETYPE_BASE_DIR="$unix_path"
-  fi
-
-
-  POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
-  POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib"
-  METHOD="well-known location"
-
-  # First check if the files exists.
-  if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
-    # We found an arbitrary include file. That's a good sign.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
-$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
-    FOUND_FREETYPE=yes
-
-    FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
-    if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
-      FOUND_FREETYPE=no
-    else
-      if test "x$OPENJDK_TARGET_OS" = xwindows; then
-        # On Windows, we will need both .lib and .dll file.
-        if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
-          FOUND_FREETYPE=no
-        fi
-      elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
-        # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
-        POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
-      fi
-    fi
-  fi
-
-  if test "x$FOUND_FREETYPE" = xyes; then
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_LIB_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-    FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
-$as_echo_n "checking for freetype includes... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
-$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
-    FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
-$as_echo_n "checking for freetype libraries... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
-$as_echo "$FREETYPE_LIB_PATH" >&6; }
-  fi
-
-          if test "x$FOUND_FREETYPE" != xyes; then
-            FREETYPE_BASE_DIR="$ProgramW6432/GnuWin32"
-
-  windows_path="$FREETYPE_BASE_DIR"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    FREETYPE_BASE_DIR="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    FREETYPE_BASE_DIR="$unix_path"
-  fi
-
-
-  POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
-  POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib"
-  METHOD="well-known location"
-
-  # First check if the files exists.
-  if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
-    # We found an arbitrary include file. That's a good sign.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
-$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
-    FOUND_FREETYPE=yes
-
-    FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
-    if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
-      FOUND_FREETYPE=no
-    else
-      if test "x$OPENJDK_TARGET_OS" = xwindows; then
-        # On Windows, we will need both .lib and .dll file.
-        if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
-          FOUND_FREETYPE=no
-        fi
-      elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
-        # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
-        POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
-      fi
-    fi
-  fi
-
-  if test "x$FOUND_FREETYPE" = xyes; then
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_LIB_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-    FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
-$as_echo_n "checking for freetype includes... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
-$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
-    FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
-$as_echo_n "checking for freetype libraries... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
-$as_echo "$FREETYPE_LIB_PATH" >&6; }
-  fi
-
-          fi
-        else
-          if test "x$SYS_ROOT" = "x/"; then
-            FREETYPE_ROOT=
-          else
-            FREETYPE_ROOT="$SYS_ROOT"
-          fi
-          FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr"
-
-  POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
-  POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib"
-  METHOD="well-known location"
-
-  # First check if the files exists.
-  if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
-    # We found an arbitrary include file. That's a good sign.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
-$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
-    FOUND_FREETYPE=yes
-
-    FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
-    if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
-      FOUND_FREETYPE=no
-    else
-      if test "x$OPENJDK_TARGET_OS" = xwindows; then
-        # On Windows, we will need both .lib and .dll file.
-        if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
-          FOUND_FREETYPE=no
-        fi
-      elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
-        # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
-        POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
-      fi
-    fi
-  fi
-
-  if test "x$FOUND_FREETYPE" = xyes; then
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_LIB_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-    FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
-$as_echo_n "checking for freetype includes... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
-$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
-    FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
-$as_echo_n "checking for freetype libraries... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
-$as_echo "$FREETYPE_LIB_PATH" >&6; }
-  fi
-
-
-          if test "x$FOUND_FREETYPE" != xyes; then
-            FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr/X11"
-
-  POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
-  POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib"
-  METHOD="well-known location"
-
-  # First check if the files exists.
-  if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
-    # We found an arbitrary include file. That's a good sign.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
-$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
-    FOUND_FREETYPE=yes
-
-    FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
-    if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
-      FOUND_FREETYPE=no
-    else
-      if test "x$OPENJDK_TARGET_OS" = xwindows; then
-        # On Windows, we will need both .lib and .dll file.
-        if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
-          FOUND_FREETYPE=no
-        fi
-      elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
-        # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
-        POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
-      fi
-    fi
-  fi
-
-  if test "x$FOUND_FREETYPE" = xyes; then
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_LIB_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-    FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
-$as_echo_n "checking for freetype includes... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
-$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
-    FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
-$as_echo_n "checking for freetype libraries... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
-$as_echo "$FREETYPE_LIB_PATH" >&6; }
-  fi
-
-          fi
-
-          if test "x$FOUND_FREETYPE" != xyes; then
-            FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr"
-            if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-
-  POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
-  POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu"
-  METHOD="well-known location"
-
-  # First check if the files exists.
-  if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
-    # We found an arbitrary include file. That's a good sign.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
-$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
-    FOUND_FREETYPE=yes
-
-    FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
-    if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
-      FOUND_FREETYPE=no
-    else
-      if test "x$OPENJDK_TARGET_OS" = xwindows; then
-        # On Windows, we will need both .lib and .dll file.
-        if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
-          FOUND_FREETYPE=no
-        fi
-      elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
-        # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
-        POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
-      fi
-    fi
-  fi
-
-  if test "x$FOUND_FREETYPE" = xyes; then
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_LIB_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-    FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
-$as_echo_n "checking for freetype includes... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
-$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
-    FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
-$as_echo_n "checking for freetype libraries... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
-$as_echo "$FREETYPE_LIB_PATH" >&6; }
-  fi
-
-            else
-
-  POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
-  POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib/i386-linux-gnu"
-  METHOD="well-known location"
-
-  # First check if the files exists.
-  if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
-    # We found an arbitrary include file. That's a good sign.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
-$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
-    FOUND_FREETYPE=yes
-
-    FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
-    if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
-      FOUND_FREETYPE=no
-    else
-      if test "x$OPENJDK_TARGET_OS" = xwindows; then
-        # On Windows, we will need both .lib and .dll file.
-        if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
-          FOUND_FREETYPE=no
-        fi
-      elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
-        # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
-        POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
-      fi
-    fi
-  fi
-
-  if test "x$FOUND_FREETYPE" = xyes; then
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_LIB_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-    FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
-$as_echo_n "checking for freetype includes... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
-$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
-    FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
-$as_echo_n "checking for freetype libraries... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
-$as_echo "$FREETYPE_LIB_PATH" >&6; }
-  fi
-
-              if test "x$FOUND_FREETYPE" != xyes; then
-
-  POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
-  POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib32"
-  METHOD="well-known location"
-
-  # First check if the files exists.
-  if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
-    # We found an arbitrary include file. That's a good sign.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
-$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
-    FOUND_FREETYPE=yes
-
-    FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
-    if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
-      FOUND_FREETYPE=no
-    else
-      if test "x$OPENJDK_TARGET_OS" = xwindows; then
-        # On Windows, we will need both .lib and .dll file.
-        if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
-$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
-          FOUND_FREETYPE=no
-        fi
-      elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
-        # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
-        POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
-      fi
-    fi
-  fi
-
-  if test "x$FOUND_FREETYPE" = xyes; then
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$POTENTIAL_FREETYPE_LIB_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$POTENTIAL_FREETYPE_LIB_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-
-    FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
-$as_echo_n "checking for freetype includes... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
-$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
-    FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
-$as_echo_n "checking for freetype libraries... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
-$as_echo "$FREETYPE_LIB_PATH" >&6; }
-  fi
-
-              fi
-            fi
-          fi
-        fi
-      fi # end check in well-known locations
-
-      if test "x$FOUND_FREETYPE" != xyes; then
-
-  # Print a helpful message on how to acquire the necessary build dependency.
-  # freetype is the help tag: freetype, cups, pulse, alsa etc
-  MISSING_DEPENDENCY=freetype
-
-  if 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_help     $MISSING_DEPENDENCY ;;
-      yum)
-        yum_help     $MISSING_DEPENDENCY ;;
-      port)
-        port_help    $MISSING_DEPENDENCY ;;
-      pkgutil)
-        pkgutil_help $MISSING_DEPENDENCY ;;
-      pkgadd)
-        pkgadd_help  $MISSING_DEPENDENCY ;;
-    esac
-
-    if test "x$PKGHANDLER_COMMAND" != x; then
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-    fi
-  fi
-
-        as_fn_error $? "Could not find freetype! $HELP_MSG " "$LINENO" 5
-      fi
-    fi # end user specified settings
-
-    # Set FREETYPE_CFLAGS, _LIBS and _LIB_PATH from include and lib dir.
-    if test "x$FREETYPE_CFLAGS" = x; then
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$FREETYPE_INCLUDE_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of FREETYPE_INCLUDE_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$FREETYPE_INCLUDE_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    FREETYPE_INCLUDE_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$FREETYPE_INCLUDE_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-      if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then
-        FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
-      else
-        FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
-      fi
-    fi
-
-    if test "x$FREETYPE_LIBS" = x; then
-
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  path="$FREETYPE_LIB_PATH"
-  new_path=`$CYGPATH -u "$path"`
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file precense.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-    as_fn_error $? "Cannot locate the the path of FREETYPE_LIB_PATH" "$LINENO" 5
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-stile (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-
-  if test "x$path" != "x$new_path"; then
-    FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  path="$FREETYPE_LIB_PATH"
-  has_colon=`$ECHO $path | $GREP ^.:`
-  new_path="$path"
-  if test "x$has_colon" = x; then
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $path`
-  fi
-
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-  if test "x$path" != "x$new_path"; then
-    FREETYPE_LIB_PATH="$new_path"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPE_LIB_PATH to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
-  fi
-
-  # Save the first 10 bytes of this path to the storage, so fixpath can work.
-  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-
-  else
-    # We're on a posix platform. Hooray! :)
-    path="$FREETYPE_LIB_PATH"
-    has_space=`$ECHO "$path" | $GREP " "`
-    if test "x$has_space" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
-      as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
-    fi
-
-    # Use eval to expand a potential ~
-    eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
-      as_fn_error $? "The path of FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
-    fi
-
-    FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
-  fi
-
-      if test "x$OPENJDK_TARGET_OS" = xwindows; then
-        FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
-      else
-        FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype"
-      fi
-    fi
-
-    # Try to compile it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can compile and link with freetype" >&5
-$as_echo_n "checking if we can compile and link with freetype... " >&6; }
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-    PREV_CXXCFLAGS="$CXXFLAGS"
-    PREV_LIBS="$LIBS"
-    PREV_CXX="$CXX"
-    CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"
-    LIBS="$LIBS $FREETYPE_LIBS"
-    CXX="$FIXPATH $CXX"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-          #include<ft2build.h>
-          #include FT_FREETYPE_H
-          int main () {
-            FT_Init_FreeType(NULL);
-            return 0;
-          }
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-else
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Could not compile and link with freetype. This might be a 32/64-bit mismatch." >&5
-$as_echo "$as_me: Could not compile and link with freetype. This might be a 32/64-bit mismatch." >&6;}
-          { $as_echo "$as_me:${as_lineno-$LINENO}: Using FREETYPE_CFLAGS=$FREETYPE_CFLAGS and FREETYPE_LIBS=$FREETYPE_LIBS" >&5
-$as_echo "$as_me: Using FREETYPE_CFLAGS=$FREETYPE_CFLAGS and FREETYPE_LIBS=$FREETYPE_LIBS" >&6;}
-
-
-  # Print a helpful message on how to acquire the necessary build dependency.
-  # freetype is the help tag: freetype, cups, pulse, alsa etc
-  MISSING_DEPENDENCY=freetype
-
-  if 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_help     $MISSING_DEPENDENCY ;;
-      yum)
-        yum_help     $MISSING_DEPENDENCY ;;
-      port)
-        port_help    $MISSING_DEPENDENCY ;;
-      pkgutil)
-        pkgutil_help $MISSING_DEPENDENCY ;;
-      pkgadd)
-        pkgadd_help  $MISSING_DEPENDENCY ;;
-    esac
-
-    if test "x$PKGHANDLER_COMMAND" != x; then
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-    fi
-  fi
-
-
-          as_fn_error $? "Can not continue without freetype. $HELP_MSG" "$LINENO" 5
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    CXXCFLAGS="$PREV_CXXFLAGS"
-    LIBS="$PREV_LIBS"
-    CXX="$PREV_CXX"
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should bundle freetype" >&5
-$as_echo_n "checking if we should bundle freetype... " >&6; }
-    if test "x$BUNDLE_FREETYPE" = xyes; then
-      FREETYPE_BUNDLE_LIB_PATH="$FREETYPE_LIB_PATH"
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUNDLE_FREETYPE" >&5
-$as_echo "$BUNDLE_FREETYPE" >&6; }
-
-  fi # end freetype needed
-
-
-
-
-
-
-
-  ###############################################################################
-  #
-  # Check for alsa headers and libraries. Used on Linux/GNU systems.
-  #
-
-# Check whether --with-alsa was given.
-if test "${with_alsa+set}" = set; then :
-  withval=$with_alsa;
-fi
-
-
-# Check whether --with-alsa-include was given.
-if test "${with_alsa_include+set}" = set; then :
-  withval=$with_alsa_include;
-fi
-
-
-# Check whether --with-alsa-lib was given.
-if test "${with_alsa_lib+set}" = set; then :
-  withval=$with_alsa_lib;
-fi
-
-
-  if test "x$ALSA_NOT_NEEDED" = xyes; then
-    if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: alsa not used, so --with-alsa is ignored" >&5
-$as_echo "$as_me: WARNING: alsa not used, so --with-alsa is ignored" >&2;}
-    fi
-    ALSA_CFLAGS=
-    ALSA_LIBS=
-  else
-    ALSA_FOUND=no
-
-    if test "x${with_alsa}" = xno || test "x${with_alsa_include}" = xno || test "x${with_alsa_lib}" = xno; then
-      as_fn_error $? "It is not possible to disable the use of alsa. Remove the --without-alsa option." "$LINENO" 5
-    fi
-
-    if test "x${with_alsa}" != x; then
-      ALSA_LIBS="-L${with_alsa}/lib -lasound"
-      ALSA_CFLAGS="-I${with_alsa}/include"
-      ALSA_FOUND=yes
-    fi
-    if test "x${with_alsa_include}" != x; then
-      ALSA_CFLAGS="-I${with_alsa_include}"
-      ALSA_FOUND=yes
-    fi
-    if test "x${with_alsa_lib}" != x; then
-      ALSA_LIBS="-L${with_alsa_lib} -lasound"
-      ALSA_FOUND=yes
-    fi
-    if test "x$ALSA_FOUND" = xno; then
-
-
-  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
-    # Source the builddeps file again, to make sure it uses the latest variables!
-    . $builddepsfile
-    # Look for a target and build machine specific resource!
-    eval resource=\${builddep_alsa_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a target specific resource
-      eval resource=\${builddep_alsa_TARGET_${rewritten_target_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a build specific resource
-      eval resource=\${builddep_alsa_BUILD_${rewritten_build_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a generic resource
-      # (The alsa comes from M4 and not the shell, thus no need for eval here.)
-      resource=${builddep_alsa}
-    fi
-    if test "x$resource" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for alsa" >&5
-$as_echo "$as_me: Using builddeps $resource for alsa" >&6;}
-      # If the resource in the builddeps.conf file is an existing directory,
-      # for example /java/linux/cups
-      if test -d ${resource}; then
-        depdir=${resource}
-      else
-
-  # alsa is for example mymodule
-  # $resource is for example libs/general/libmymod_1_2_3.zip
-  # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
-  # $with_builddeps_dir is for example /localhome/builddeps
-  # depdir is the name of the variable into which we store the depdir, eg MYMOD
-  # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
-  # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
-  filename=`basename $resource`
-  filebase=`echo $filename | sed 's/\.[^\.]*$//'`
-  filebase=${filename%%.*}
-  extension=${filename#*.}
-  installdir=$with_builddeps_dir/$filebase
-  if test ! -f $installdir/$filename.unpacked; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency alsa from $with_builddeps_server/$resource and installing into $installdir" >&5
-$as_echo "$as_me: Downloading build dependency alsa from $with_builddeps_server/$resource and installing into $installdir" >&6;}
-    if test ! -d $installdir; then
-      mkdir -p $installdir
-    fi
-    if test ! -d $installdir; then
-      as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
-    fi
-    tmpfile=`mktemp $installdir/alsa.XXXXXXXXX`
-    touch $tmpfile
-    if test ! -f $tmpfile; then
-      as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
-    fi
-
-  # $with_builddeps_server/$resource  is the ftp://abuilddeps.server.com/libs/cups.zip
-  # $tmpfile is the local file name for the downloaded file.
-  VALID_TOOL=no
-  if test "x$BDEPS_FTP" = xwget; then
-    VALID_TOOL=yes
-    wget -O $tmpfile $with_builddeps_server/$resource
-  fi
-  if test "x$BDEPS_FTP" = xlftp; then
-    VALID_TOOL=yes
-    lftp -c "get $with_builddeps_server/$resource  -o $tmpfile"
-  fi
-  if test "x$BDEPS_FTP" = xftp; then
-    VALID_TOOL=yes
-    FTPSERVER=`echo $with_builddeps_server/$resource  | cut -f 3 -d '/'`
-    FTPPATH=`echo $with_builddeps_server/$resource  | cut -f 4- -d '/'`
-    FTPUSERPWD=${FTPSERVER%%@*}
-    if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
-      FTPUSER=${userpwd%%:*}
-      FTPPWD=${userpwd#*@}
-      FTPSERVER=${FTPSERVER#*@}
-    else
-      FTPUSER=ftp
-      FTPPWD=ftp
-    fi
-    # the "pass" command does not work on some
-    # ftp clients (read ftp.exe) but if it works,
-    # passive mode is better!
-    ( \
-        echo "user $FTPUSER $FTPPWD"        ; \
-        echo "pass"                         ; \
-        echo "bin"                          ; \
-        echo "get $FTPPATH $tmpfile"              ; \
-    ) | ftp -in $FTPSERVER
-  fi
-  if test "x$VALID_TOOL" != xyes; then
-    as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
-  fi
-
-    mv $tmpfile $installdir/$filename
-    if test ! -s $installdir/$filename; then
-      as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
-    fi
-    case "$extension" in
-      zip)  echo "Unzipping $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
-        ;;
-      tar.gz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      tgz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
-        ;;
-    esac
-  fi
-  if test -f $installdir/$filename.unpacked; then
-    depdir=$installdir
-  fi
-
-      fi
-      # Source the builddeps file again, because in the previous command, the depdir
-      # was updated to point at the current build dependency install directory.
-      . $builddepsfile
-      # Now extract variables from the builddeps.conf files.
-      theroot=${builddep_alsa_ROOT}
-      thecflags=${builddep_alsa_CFLAGS}
-      thelibs=${builddep_alsa_LIBS}
-      if test "x$depdir" = x; then
-        as_fn_error $? "Could not download build dependency alsa" "$LINENO" 5
-      fi
-      ALSA=$depdir
-      if test "x$theroot" != x; then
-        ALSA="$theroot"
-      fi
-      if test "x$thecflags" != x; then
-        ALSA_CFLAGS="$thecflags"
-      fi
-      if test "x$thelibs" != x; then
-        ALSA_LIBS="$thelibs"
-      fi
-      ALSA_FOUND=yes
-      else ALSA_FOUND=no
-
-    fi
-    else ALSA_FOUND=no
-
-  fi
-
-    fi
-    if test "x$ALSA_FOUND" = xno; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
-$as_echo_n "checking for ALSA... " >&6; }
-
-if test -n "$ALSA_CFLAGS"; then
-    pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$ALSA_LIBS"; then
-    pkg_cv_ALSA_LIBS="$ALSA_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa" 2>&1`
-        else
-	        ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$ALSA_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                ALSA_FOUND=no
-elif test $pkg_failed = untried; then
-	ALSA_FOUND=no
-else
-	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
-	ALSA_LIBS=$pkg_cv_ALSA_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	ALSA_FOUND=yes
-fi
-    fi
-    if test "x$ALSA_FOUND" = xno; then
-      for ac_header in alsa/asoundlib.h
-do :
-  ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ALSA_ASOUNDLIB_H 1
-_ACEOF
-
-            ALSA_FOUND=yes
-            ALSA_CFLAGS=-Iignoreme
-            ALSA_LIBS=-lasound
-            DEFAULT_ALSA=yes
-
-else
-  ALSA_FOUND=no
-fi
-
-done
-
-    fi
-    if test "x$ALSA_FOUND" = xno; then
-
-  # Print a helpful message on how to acquire the necessary build dependency.
-  # alsa is the help tag: freetype, cups, pulse, alsa etc
-  MISSING_DEPENDENCY=alsa
-
-  if 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_help     $MISSING_DEPENDENCY ;;
-      yum)
-        yum_help     $MISSING_DEPENDENCY ;;
-      port)
-        port_help    $MISSING_DEPENDENCY ;;
-      pkgutil)
-        pkgutil_help $MISSING_DEPENDENCY ;;
-      pkgadd)
-        pkgadd_help  $MISSING_DEPENDENCY ;;
-    esac
-
-    if test "x$PKGHANDLER_COMMAND" != x; then
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-    fi
-  fi
-
-      as_fn_error $? "Could not find alsa! $HELP_MSG " "$LINENO" 5
-    fi
-  fi
-
-
-
-
-
-
-  ###############################################################################
-  #
-  # Check for the jpeg library
-  #
-
-  USE_EXTERNAL_LIBJPEG=true
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
-$as_echo_n "checking for main in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_main+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljpeg  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_jpeg_main=yes
-else
-  ac_cv_lib_jpeg_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
-$as_echo "$ac_cv_lib_jpeg_main" >&6; }
-if test "x$ac_cv_lib_jpeg_main" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBJPEG 1
-_ACEOF
-
-  LIBS="-ljpeg $LIBS"
-
-else
-   USE_EXTERNAL_LIBJPEG=false
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Will use jpeg decoder bundled with the OpenJDK source" >&5
-$as_echo "$as_me: Will use jpeg decoder bundled with the OpenJDK source" >&6;}
-
-fi
-
-
-
-  ###############################################################################
-  #
-  # Check for the gif library
-  #
-
-
-# Check whether --with-giflib was given.
-if test "${with_giflib+set}" = set; then :
-  withval=$with_giflib;
-fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for which giflib to use" >&5
-$as_echo_n "checking for which giflib to use... " >&6; }
-
-  # default is bundled
-  DEFAULT_GIFLIB=bundled
-
-  #
-  # if user didn't specify, use DEFAULT_GIFLIB
-  #
-  if test "x${with_giflib}" = "x"; then
-    with_giflib=${DEFAULT_GIFLIB}
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_giflib}" >&5
-$as_echo "${with_giflib}" >&6; }
-
-  if test "x${with_giflib}" = "xbundled"; then
-    USE_EXTERNAL_LIBGIF=false
-  elif test "x${with_giflib}" = "xsystem"; then
-    ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
-if test "x$ac_cv_header_gif_lib_h" = xyes; then :
-
-else
-   as_fn_error $? "--with-giflib=system specified, but gif_lib.h not found!" "$LINENO" 5
-fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5
-$as_echo_n "checking for DGifGetCode in -lgif... " >&6; }
-if ${ac_cv_lib_gif_DGifGetCode+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgif  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char DGifGetCode ();
-int
-main ()
-{
-return DGifGetCode ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_gif_DGifGetCode=yes
-else
-  ac_cv_lib_gif_DGifGetCode=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5
-$as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; }
-if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGIF 1
-_ACEOF
-
-  LIBS="-lgif $LIBS"
-
-else
-   as_fn_error $? "--with-giflib=system specified, but no giflib found!" "$LINENO" 5
-fi
-
-
-    USE_EXTERNAL_LIBGIF=true
-  else
-    as_fn_error $? "Invalid value of --with-giflib: ${with_giflib}, use 'system' or 'bundled'" "$LINENO" 5
-  fi
-
-
-  ###############################################################################
-  #
-  # Check for the zlib library
-  #
-
-
-# Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then :
-  withval=$with_zlib;
-fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
-$as_echo_n "checking for compress in -lz... " >&6; }
-if ${ac_cv_lib_z_compress+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char compress ();
-int
-main ()
-{
-return compress ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_z_compress=yes
-else
-  ac_cv_lib_z_compress=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
-$as_echo "$ac_cv_lib_z_compress" >&6; }
-if test "x$ac_cv_lib_z_compress" = xyes; then :
-   ZLIB_FOUND=yes
-else
-   ZLIB_FOUND=no
-fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for which zlib to use" >&5
-$as_echo_n "checking for which zlib to use... " >&6; }
-
-  DEFAULT_ZLIB=bundled
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    #
-    # On macosx default is system...on others default is
-    #
-    DEFAULT_ZLIB=system
-  fi
-
-  if test "x${ZLIB_FOUND}" != "xyes"; then
-    #
-    # If we don't find any system...set default to bundled
-    #
-    DEFAULT_ZLIB=bundled
-  fi
-
-  #
-  # If user didn't specify, use DEFAULT_ZLIB
-  #
-  if test "x${with_zlib}" = "x"; then
-    with_zlib=${DEFAULT_ZLIB}
-  fi
-
-  if test "x${with_zlib}" = "xbundled"; then
-    USE_EXTERNAL_LIBZ=false
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: bundled" >&5
-$as_echo "bundled" >&6; }
-  elif test "x${with_zlib}" = "xsystem"; then
-    if test "x${ZLIB_FOUND}" = "xyes"; then
-      USE_EXTERNAL_LIBZ=true
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
-$as_echo "system" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: system not found" >&5
-$as_echo "system not found" >&6; }
-      as_fn_error $? "--with-zlib=system specified, but no zlib found!" "$LINENO" 5
-    fi
-  else
-    as_fn_error $? "Invalid value for --with-zlib: ${with_zlib}, use 'system' or 'bundled'" "$LINENO" 5
-  fi
-
-
-
-  ###############################################################################
-  LIBZIP_CAN_USE_MMAP=true
-
-
-
-  ###############################################################################
-  #
-  # Check if altzone exists in time.h
-  #
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <time.h>
-int
-main ()
-{
-return (int)altzone;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  has_altzone=yes
-else
-  has_altzone=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test "x$has_altzone" = xyes; then
-
-$as_echo "#define HAVE_ALTZONE 1" >>confdefs.h
-
-  fi
-
-  ###############################################################################
-  #
-  # Check the maths library
-  #
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-$as_echo_n "checking for cos in -lm... " >&6; }
-if ${ac_cv_lib_m_cos+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cos ();
-int
-main ()
-{
-return cos ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_m_cos=yes
-else
-  ac_cv_lib_m_cos=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
-$as_echo "$ac_cv_lib_m_cos" >&6; }
-if test "x$ac_cv_lib_m_cos" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
-
-  LIBS="-lm $LIBS"
-
-else
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Maths library was not found" >&5
-$as_echo "$as_me: Maths library was not found" >&6;}
-
-
-fi
-
-
-
-  ###############################################################################
-  #
-  # Check for libdl.so
-
-  save_LIBS="$LIBS"
-  LIBS=""
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
-  LIBS="-ldl $LIBS"
-
-fi
-
-  LIBDL="$LIBS"
-
-  LIBS="$save_LIBS"
-
-
-  ###############################################################################
-  #
-  # statically link libstdc++ before C++ ABI is stablized on Linux unless
-  # dynamic build is configured on command line.
-  #
-
-# Check whether --with-stdc++lib was given.
-if test "${with_stdc__lib+set}" = set; then :
-  withval=$with_stdc__lib;
-        if test "x$with_stdc__lib" != xdynamic && test "x$with_stdc__lib" != xstatic \
-                && test "x$with_stdc__lib" != xdefault; then
-          as_fn_error $? "Bad parameter value --with-stdc++lib=$with_stdc__lib!" "$LINENO" 5
-        fi
-
-else
-  with_stdc__lib=default
-
-fi
-
-
-  if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    # Test if -lstdc++ works.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dynamic link of stdc++ is possible" >&5
-$as_echo_n "checking if dynamic link of stdc++ is possible... " >&6; }
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-    OLD_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="$CXXFLAGS -lstdc++"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  has_dynamic_libstdcxx=yes
-else
-  has_dynamic_libstdcxx=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    CXXFLAGS="$OLD_CXXFLAGS"
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_dynamic_libstdcxx" >&5
-$as_echo "$has_dynamic_libstdcxx" >&6; }
-
-    # Test if stdc++ can be linked statically.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if static link of stdc++ is possible" >&5
-$as_echo_n "checking if static link of stdc++ is possible... " >&6; }
-    STATIC_STDCXX_FLAGS="-Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic"
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-    OLD_LIBS="$LIBS"
-    OLD_CXX="$CXX"
-    LIBS="$STATIC_STDCXX_FLAGS"
-    CXX="$CC"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  has_static_libstdcxx=yes
-else
-  has_static_libstdcxx=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LIBS="$OLD_LIBS"
-    CXX="$OLD_CXX"
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_static_libstdcxx" >&5
-$as_echo "$has_static_libstdcxx" >&6; }
-
-    if test "x$has_static_libstdcxx" = xno && test "x$has_dynamic_libstdcxx" = xno; then
-      as_fn_error $? "Cannot link to stdc++, neither dynamically nor statically!" "$LINENO" 5
-    fi
-
-    if test "x$with_stdc__lib" = xstatic && test "x$has_static_libstdcxx" = xno; then
-      as_fn_error $? "Static linking of libstdc++ was not possible!" "$LINENO" 5
-    fi
-
-    if test "x$with_stdc__lib" = xdynamic && test "x$has_dynamic_libstdcxx" = xno; then
-      as_fn_error $? "Dynamic linking of libstdc++ was not possible!" "$LINENO" 5
-    fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libstdc++" >&5
-$as_echo_n "checking how to link with libstdc++... " >&6; }
-    # If dynamic was requested, it's available since it would fail above otherwise.
-    # If dynamic wasn't requested, go with static unless it isn't available.
-    if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
-      LIBCXX="$LIBCXX -lstdc++"
-      LDCXX="$CXX"
-      STATIC_CXX_SETTING="STATIC_CXX=false"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: dynamic" >&5
-$as_echo "dynamic" >&6; }
-    else
-      LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
-      LDCXX="$CC"
-      STATIC_CXX_SETTING="STATIC_CXX=true"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
-$as_echo "static" >&6; }
-    fi
-  fi
-
-
-  if test "x$JVM_VARIANT_ZERO" = xtrue || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
-    # Figure out LIBFFI_CFLAGS and LIBFFI_LIBS
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFFI" >&5
-$as_echo_n "checking for LIBFFI... " >&6; }
-
-if test -n "$LIBFFI_CFLAGS"; then
-    pkg_cv_LIBFFI_CFLAGS="$LIBFFI_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libffi") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBFFI_CFLAGS=`$PKG_CONFIG --cflags "libffi" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBFFI_LIBS"; then
-    pkg_cv_LIBFFI_LIBS="$LIBFFI_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libffi") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBFFI_LIBS=`$PKG_CONFIG --libs "libffi" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libffi" 2>&1`
-        else
-	        LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libffi" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBFFI_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (libffi) were not met:
-
-$LIBFFI_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables LIBFFI_CFLAGS
-and LIBFFI_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables LIBFFI_CFLAGS
-and LIBFFI_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS
-	LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-
-  fi
-
-  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
-    # Extract the first word of "llvm-config", so it can be a program name with args.
-set dummy llvm-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LLVM_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LLVM_CONFIG"; then
-  ac_cv_prog_LLVM_CONFIG="$LLVM_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LLVM_CONFIG="llvm-config"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LLVM_CONFIG=$ac_cv_prog_LLVM_CONFIG
-if test -n "$LLVM_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_CONFIG" >&5
-$as_echo "$LLVM_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-    if test "x$LLVM_CONFIG" != xllvm-config; then
-      as_fn_error $? "llvm-config not found in $PATH." "$LINENO" 5
-    fi
-
-    llvm_components="jit mcjit engine nativecodegen native"
-    unset LLVM_CFLAGS
-    for flag in $("$LLVM_CONFIG" --cxxflags); do
-      if echo "${flag}" | grep -q '^-[ID]'; then
-        if test "${flag}" != "-D_DEBUG" ; then
-          if test "${LLVM_CFLAGS}" != "" ; then
-            LLVM_CFLAGS="${LLVM_CFLAGS} "
-          fi
-          LLVM_CFLAGS="${LLVM_CFLAGS}${flag}"
-        fi
-      fi
-    done
-    llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//')
-    LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}"
-
-    unset LLVM_LDFLAGS
-    for flag in $("${LLVM_CONFIG}" --ldflags); do
-      if echo "${flag}" | grep -q '^-L'; then
-        if test "${LLVM_LDFLAGS}" != ""; then
-          LLVM_LDFLAGS="${LLVM_LDFLAGS} "
-        fi
-        LLVM_LDFLAGS="${LLVM_LDFLAGS}${flag}"
-      fi
-    done
-
-    unset LLVM_LIBS
-    for flag in $("${LLVM_CONFIG}" --libs ${llvm_components}); do
-      if echo "${flag}" | grep -q '^-l'; then
-        if test "${LLVM_LIBS}" != ""; then
-          LLVM_LIBS="${LLVM_LIBS} "
-        fi
-        LLVM_LIBS="${LLVM_LIBS}${flag}"
-      fi
-    done
-
-
-
-
-  fi
-
-  # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
-  if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x; then
-    LIBCXX="/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
-  fi
-
-  # TODO better (platform agnostic) test
-  if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$GCC" = xyes; then
-    LIBCXX="-lstdc++"
-  fi
-
-
-
-
-
-###############################################################################
-#
-# We need to do some final tweaking, when everything else is done.
-#
-###############################################################################
-
-
-  HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
-
-
-  # The name of the Service Agent jar.
-  SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
-  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
-  fi
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
-$as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; }
-
-    if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
-      ENABLE_INTREE_EC=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      ENABLE_INTREE_EC=no
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-
-
-
-
-###############################################################################
-#
-# Configure parts of the build that only affect the build performance,
-# not the result.
-#
-###############################################################################
-
-
-  # How many cores do we have on this build system?
-
-# Check whether --with-num-cores was given.
-if test "${with_num_cores+set}" = set; then :
-  withval=$with_num_cores;
-fi
-
-  if test "x$with_num_cores" = x; then
-    # The number of cores were not specified, try to probe them.
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for number of cores" >&5
-$as_echo_n "checking for number of cores... " >&6; }
-  NUM_CORES=1
-  FOUND_CORES=no
-
-  if test -f /proc/cpuinfo; then
-    # Looks like a Linux (or cygwin) system
-    NUM_CORES=`cat /proc/cpuinfo  | grep -c processor`
-    FOUND_CORES=yes
-  elif test -x /usr/sbin/psrinfo; then
-    # Looks like a Solaris system
-    NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line`
-    FOUND_CORES=yes
-  elif test -x /usr/sbin/system_profiler; then
-    # Looks like a MacOSX system
-    NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk  '{print $5}'`
-    FOUND_CORES=yes
-  elif test "x$OPENJDK_BUILD_OS" = xaix ; then
-    NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'`
-    FOUND_CORES=yes
-  elif test -n "$NUMBER_OF_PROCESSORS"; then
-    # On windows, look in the env
-    NUM_CORES=$NUMBER_OF_PROCESSORS
-    FOUND_CORES=yes
-  fi
-
-  if test "x$FOUND_CORES" = xyes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NUM_CORES" >&5
-$as_echo "$NUM_CORES" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect number of cores, defaulting to 1" >&5
-$as_echo "could not detect number of cores, defaulting to 1" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This will disable all parallelism from build!" >&5
-$as_echo "$as_me: WARNING: This will disable all parallelism from build!" >&2;}
-  fi
-
-  else
-    NUM_CORES=$with_num_cores
-  fi
-
-
-
-  # How much memory do we have on this build system?
-
-# Check whether --with-memory-size was given.
-if test "${with_memory_size+set}" = set; then :
-  withval=$with_memory_size;
-fi
-
-  if test "x$with_memory_size" = x; then
-    # The memory size was not specified, try to probe it.
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for memory size" >&5
-$as_echo_n "checking for memory size... " >&6; }
-  # Default to 1024 MB
-  MEMORY_SIZE=1024
-  FOUND_MEM=no
-
-  if test -f /proc/meminfo; then
-    # Looks like a Linux (or cygwin) system
-    MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print $2}'`
-    MEMORY_SIZE=`expr $MEMORY_SIZE / 1024`
-    FOUND_MEM=yes
-  elif test -x /usr/sbin/prtconf; then
-    # Looks like a Solaris or AIX system
-    MEMORY_SIZE=`/usr/sbin/prtconf | grep "^Memory [Ss]ize" | awk '{ print $3 }'`
-    FOUND_MEM=yes
-  elif test -x /usr/sbin/system_profiler; then
-    # Looks like a MacOSX system
-    MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk  '{print $2}'`
-    MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024`
-    FOUND_MEM=yes
-  elif test "x$OPENJDK_BUILD_OS" = xwindows; then
-    # Windows, but without cygwin
-    MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
-    MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
-    FOUND_MEM=yes
-  fi
-
-  if test "x$FOUND_MEM" = xyes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MEMORY_SIZE MB" >&5
-$as_echo "$MEMORY_SIZE MB" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect memory size, defaulting to 1024 MB" >&5
-$as_echo "could not detect memory size, defaulting to 1024 MB" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This might seriously impact build performance!" >&5
-$as_echo "$as_me: WARNING: This might seriously impact build performance!" >&2;}
-  fi
-
-  else
-    MEMORY_SIZE=$with_memory_size
-  fi
-
-
-
-  # Provide a decent default number of parallel jobs for make depending on
-  # number of cores, amount of memory and machine architecture.
-
-# Check whether --with-jobs was given.
-if test "${with_jobs+set}" = set; then :
-  withval=$with_jobs;
-fi
-
-  if test "x$with_jobs" = x; then
-    # Number of jobs was not specified, calculate.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for appropriate number of jobs to run in parallel" >&5
-$as_echo_n "checking for appropriate number of jobs to run in parallel... " >&6; }
-    # Approximate memory in GB, rounding up a bit.
-    memory_gb=`expr $MEMORY_SIZE / 1100`
-    # Pick the lowest of memory in gb and number of cores.
-    if test "$memory_gb" -lt "$NUM_CORES"; then
-      JOBS="$memory_gb"
-    else
-      JOBS="$NUM_CORES"
-      # On bigger machines, leave some room for other processes to run
-      if test "$JOBS" -gt "4"; then
-        JOBS=`expr $JOBS '*' 90 / 100`
-      fi
-    fi
-    # Cap number of jobs to 16
-    if test "$JOBS" -gt "16"; then
-      JOBS=16
-    fi
-    if test "$JOBS" -eq "0"; then
-      JOBS=1
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JOBS" >&5
-$as_echo "$JOBS" >&6; }
-  else
-    JOBS=$with_jobs
-  fi
-
-
-
-# Setup smart javac (after cores and memory have been setup)
-
-
-# Check whether --with-sjavac-server-java was given.
-if test "${with_sjavac_server_java+set}" = set; then :
-  withval=$with_sjavac_server_java;
-fi
-
-
-  if test "x$with_sjavac_server_java" != x; then
-    SJAVAC_SERVER_JAVA="$with_sjavac_server_java"
-    FOUND_VERSION=`$SJAVAC_SERVER_JAVA -version 2>&1 | grep " version \""`
-    if test "x$FOUND_VERSION" = x; then
-      as_fn_error $? "Could not execute server java: $SJAVAC_SERVER_JAVA" "$LINENO" 5
-    fi
-  else
-    SJAVAC_SERVER_JAVA=""
-    # Hotspot specific options.
-
-  $ECHO "Check if jvm arg is ok: -verbosegc" >&5
-  $ECHO "Command: $JAVA -verbosegc -version" >&5
-  OUTPUT=`$JAVA -verbosegc -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -verbosegc"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-    # JRockit specific options.
-
-  $ECHO "Check if jvm arg is ok: -Xverbose:gc" >&5
-  $ECHO "Command: $JAVA -Xverbose:gc -version" >&5
-  OUTPUT=`$JAVA -Xverbose:gc -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xverbose:gc"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-    SJAVAC_SERVER_JAVA="$JAVA $SJAVAC_SERVER_JAVA"
-  fi
-
-
-  if test "$MEMORY_SIZE" -gt "2500"; then
-
-  $ECHO "Check if jvm arg is ok: -d64" >&5
-  $ECHO "Command: $SJAVAC_SERVER_JAVA -d64 -version" >&5
-  OUTPUT=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -d64"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-    if test "$JVM_ARG_OK" = true; then
-      JVM_64BIT=true
-      JVM_ARG_OK=false
-    fi
-  fi
-
-  if test "$JVM_64BIT" = true; then
-    if test "$MEMORY_SIZE" -gt "17000"; then
-
-  $ECHO "Check if jvm arg is ok: -Xms10G -Xmx10G" >&5
-  $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version" >&5
-  OUTPUT=`$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-    fi
-    if test "$MEMORY_SIZE" -gt "10000" && test "$JVM_ARG_OK" = false; then
-
-  $ECHO "Check if jvm arg is ok: -Xms6G -Xmx6G" >&5
-  $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version" >&5
-  OUTPUT=`$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-    fi
-    if test "$MEMORY_SIZE" -gt "5000" && test "$JVM_ARG_OK" = false; then
-
-  $ECHO "Check if jvm arg is ok: -Xms1G -Xmx3G" >&5
-  $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version" >&5
-  OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-    fi
-    if test "$MEMORY_SIZE" -gt "3800" && test "$JVM_ARG_OK" = false; then
-
-  $ECHO "Check if jvm arg is ok: -Xms1G -Xmx2500M" >&5
-  $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version" >&5
-  OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-    fi
-  fi
-  if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then
-
-  $ECHO "Check if jvm arg is ok: -Xms1000M -Xmx1500M" >&5
-  $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M -version" >&5
-  OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-  fi
-  if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then
-
-  $ECHO "Check if jvm arg is ok: -Xms400M -Xmx1100M" >&5
-  $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version" >&5
-  OUTPUT=`$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-  fi
-  if test "$JVM_ARG_OK" = false; then
-
-  $ECHO "Check if jvm arg is ok: -Xms256M -Xmx512M" >&5
-  $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version" >&5
-  OUTPUT=`$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&5
-    $ECHO "$OUTPUT" >&5
-    JVM_ARG_OK=false
-  fi
-
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use sjavac" >&5
-$as_echo_n "checking whether to use sjavac... " >&6; }
-  # Check whether --enable-sjavac was given.
-if test "${enable_sjavac+set}" = set; then :
-  enableval=$enable_sjavac; ENABLE_SJAVAC="${enableval}"
-else
-  ENABLE_SJAVAC='no'
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_SJAVAC" >&5
-$as_echo "$ENABLE_SJAVAC" >&6; }
-
-
-  if test "x$ENABLE_SJAVAC" = xyes; then
-    SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers"
-  else
-    SJAVAC_SERVER_DIR=
-  fi
-
-
-
-# Can the C/C++ compiler use precompiled headers?
-
-
-  ###############################################################################
-  #
-  # Can the C/C++ compiler use precompiled headers?
-  #
-  # Check whether --enable-precompiled-headers was given.
-if test "${enable_precompiled_headers+set}" = set; then :
-  enableval=$enable_precompiled_headers; ENABLE_PRECOMPH=${enable_precompiled_headers}
-else
-  ENABLE_PRECOMPH=yes
-fi
-
-
-  USE_PRECOMPILED_HEADER=1
-  if test "x$ENABLE_PRECOMPH" = xno; then
-    USE_PRECOMPILED_HEADER=0
-  fi
-
-  if test "x$ENABLE_PRECOMPH" = xyes; then
-    # Check that the compiler actually supports precomp headers.
-    if test "x$GCC" = xyes; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking that precompiled headers work" >&5
-$as_echo_n "checking that precompiled headers work... " >&6; }
-      echo "int alfa();" > conftest.h
-      $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&5 >&5
-      if test ! -f conftest.hpp.gch; then
-        USE_PRECOMPILED_HEADER=0
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      fi
-      rm -f conftest.h conftest.hpp.gch
-    fi
-  fi
-
-
-
-
-# Setup use of ccache, if available
-
-  # Check whether --enable-ccache was given.
-if test "${enable_ccache+set}" = set; then :
-  enableval=$enable_ccache; ENABLE_CCACHE=${enable_ccache}
-else
-  ENABLE_CCACHE=yes
-fi
-
-  if test "x$ENABLE_CCACHE" = xyes; then
-    OLD_PATH="$PATH"
-    if test "x$TOOLS_DIR" != x; then
-      PATH=$TOOLS_DIR:$PATH
-    fi
-    # Extract the first word of "ccache", so it can be a program name with args.
-set dummy ccache; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CCACHE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CCACHE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CCACHE="$CCACHE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CCACHE=$ac_cv_path_CCACHE
-if test -n "$CCACHE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCACHE" >&5
-$as_echo "$CCACHE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    PATH="$OLD_PATH"
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ccache" >&5
-$as_echo_n "checking for ccache... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: explicitly disabled" >&5
-$as_echo "explicitly disabled" >&6; }
-    CCACHE=
-  fi
-
-
-
-# Check whether --with-ccache-dir was given.
-if test "${with_ccache_dir+set}" = set; then :
-  withval=$with_ccache_dir;
-fi
-
-
-  if test "x$with_ccache_dir" != x; then
-    # When using a non home ccache directory, assume the use is to share ccache files
-    # with other users. Thus change the umask.
-    SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002"
-  fi
-  CCACHE_FOUND=""
-  if test "x$CCACHE" != x; then
-
-  if test "x$CCACHE" != x; then
-    CCACHE_FOUND="true"
-    # Only use ccache if it is 3.1.4 or later, which supports
-    # precompiled headers.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
-$as_echo_n "checking if ccache supports precompiled headers... " >&6; }
-    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null`
-    if test "x$HAS_GOOD_CCACHE" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
-$as_echo "no, disabling ccache" >&6; }
-      CCACHE=
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C-compiler supports ccache precompiled headers" >&5
-$as_echo_n "checking if C-compiler supports ccache precompiled headers... " >&6; }
-      PUSHED_FLAGS="$CXXFLAGS"
-      CXXFLAGS="-fpch-preprocess $CXXFLAGS"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  CC_KNOWS_CCACHE_TRICK=yes
-else
-  CC_KNOWS_CCACHE_TRICK=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      CXXFLAGS="$PUSHED_FLAGS"
-      if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccaching of precompiled headers" >&5
-$as_echo "no, disabling ccaching of precompiled headers" >&6; }
-        CCACHE=
-      fi
-    fi
-  fi
-
-  if test "x$CCACHE" != x; then
-    CCACHE_SLOPPINESS=time_macros
-    CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE"
-    CCACHE_FLAGS=-fpch-preprocess
-
-    if test "x$SET_CCACHE_DIR" != x; then
-      mkdir -p $CCACHE_DIR > /dev/null 2>&1
-      chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1
-    fi
-  fi
-
-  fi
-
-
-###############################################################################
-#
-# And now the finish...
-#
-###############################################################################
-
-# Check for some common pitfalls
-
-  if test x"$OPENJDK_BUILD_OS" = xwindows; then
-    file_to_test="$SRC_ROOT/LICENSE"
-    if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
-      as_fn_error $? "Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin." "$LINENO" 5
-    fi
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if build directory is on local disk" >&5
-$as_echo_n "checking if build directory is on local disk... " >&6; }
-
-  # 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
-    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
-        OUTPUT_DIR_IS_LOCAL="yes"
-      else
-        OUTPUT_DIR_IS_LOCAL="no"
-      fi
-    else
-      # No df here, say it's local
-      OUTPUT_DIR_IS_LOCAL="yes"
-    fi
-  else
-    if $DF -l $OUTPUT_ROOT > /dev/null 2>&1; then
-      OUTPUT_DIR_IS_LOCAL="yes"
-    else
-      OUTPUT_DIR_IS_LOCAL="no"
-    fi
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_DIR_IS_LOCAL" >&5
-$as_echo "$OUTPUT_DIR_IS_LOCAL" >&6; }
-
-
-
-  # Check if the user has any old-style ALT_ variables set.
-  FOUND_ALT_VARIABLES=`env | grep ^ALT_`
-
-  # Before generating output files, test if they exist. If they do, this is a reconfigure.
-  # Since we can't properly handle the dependencies for this, warn the user about the situation
-  if test -e $OUTPUT_ROOT/spec.gmk; then
-    IS_RECONFIGURE=yes
-  else
-    IS_RECONFIGURE=no
-  fi
-
-  if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then
-    HIDE_PERFORMANCE_HINTS=yes
-  else
-    HIDE_PERFORMANCE_HINTS=no
-    # Hide it the next time around...
-    $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1
-  fi
-
-
-# At the end, call the custom hook. (Dummy macro if no custom sources available)
-
-
-# We're messing a bit with internal autoconf variables to put the config.status
-# in the output directory instead of the current directory.
-CONFIG_STATUS="$OUTPUT_ROOT/config.status"
-
-# Create the actual output files. Now the main work of configure is done.
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by OpenJDK $as_me jdk8, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Report bugs to <build-dev@openjdk.java.net>.
-OpenJDK home page: <http://openjdk.java.net>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-OpenJDK config.status jdk8
-configured by $0, generated by GNU Autoconf 2.69,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "$OUTPUT_ROOT/config.h") CONFIG_HEADERS="$CONFIG_HEADERS $OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in" ;;
-    "$OUTPUT_ROOT/spec.gmk") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in" ;;
-    "$OUTPUT_ROOT/hotspot-spec.gmk") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in" ;;
-    "$OUTPUT_ROOT/bootcycle-spec.gmk") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in" ;;
-    "$OUTPUT_ROOT/compare.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in" ;;
-    "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;;
-    "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
- ;;
-
-
-  esac
-
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
-
-# Try to move the config.log file to the output directory.
-if test -e ./config.log; then
-  $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
-fi
-
-# Make the compare script executable
-$CHMOD +x $OUTPUT_ROOT/compare.sh
-
-# Finally output some useful information to the user
-
-  # Finally output some useful information to the user
-
-  if test "x$CCACHE_FOUND" != x; then
-    if  test "x$HAS_GOOD_CCACHE" = x; then
-      CCACHE_STATUS="installed, but disabled (version older than 3.1.4)"
-      CCACHE_HELP_MSG="You have ccache installed, but it is a version prior to 3.1.4. Try upgrading."
-    else
-      CCACHE_STATUS="installed and in use"
-    fi
-  else
-    if test "x$GCC" = xyes; then
-      CCACHE_STATUS="not installed (consider installing)"
-      CCACHE_HELP_MSG="You do not have ccache installed. Try installing it."
-    else
-      CCACHE_STATUS="not available for your system"
-    fi
-  fi
-
-  printf "\n"
-  printf "====================================================\n"
-  printf "A new configuration has been successfully created in\n"
-  printf "$OUTPUT_ROOT\n"
-  if test "x$CONFIGURE_COMMAND_LINE" != x; then
-    printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
-  else
-    printf "using default settings.\n"
-  fi
-
-  printf "\n"
-  printf "Configuration summary:\n"
-  printf "* Debug level:    $DEBUG_LEVEL\n"
-  printf "* JDK variant:    $JDK_VARIANT\n"
-  printf "* JVM variants:   $with_jvm_variants\n"
-  printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n"
-
-  printf "\n"
-  printf "Tools summary:\n"
-  if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
-    printf "* Environment:    $WINDOWS_ENV_VENDOR version $WINDOWS_ENV_VERSION (root at $WINDOWS_ENV_ROOT_PATH)\n"
-  fi
-  printf "* Boot JDK:       $BOOT_JDK_VERSION (at $BOOT_JDK)\n"
-  printf "* C Compiler:     $CC_VENDOR version $CC_VERSION (at $CC)\n"
-  printf "* C++ Compiler:   $CXX_VENDOR version $CXX_VERSION (at $CXX)\n"
-
-  printf "\n"
-  printf "Build performance summary:\n"
-  printf "* Cores to use:   $JOBS\n"
-  printf "* Memory limit:   $MEMORY_SIZE MB\n"
-  printf "* ccache status:  $CCACHE_STATUS\n"
-  printf "\n"
-
-  if test "x$CCACHE_HELP_MSG" != x && test "x$HIDE_PERFORMANCE_HINTS" = "xno"; then
-    printf "Build performance tip: ccache gives a tremendous speedup for C++ recompilations.\n"
-    printf "$CCACHE_HELP_MSG\n"
-
-  # Print a helpful message on how to acquire the necessary build dependency.
-  # ccache is the help tag: freetype, cups, pulse, alsa etc
-  MISSING_DEPENDENCY=ccache
-
-  if 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_help     $MISSING_DEPENDENCY ;;
-      yum)
-        yum_help     $MISSING_DEPENDENCY ;;
-      port)
-        port_help    $MISSING_DEPENDENCY ;;
-      pkgutil)
-        pkgutil_help $MISSING_DEPENDENCY ;;
-      pkgadd)
-        pkgadd_help  $MISSING_DEPENDENCY ;;
-    esac
-
-    if test "x$PKGHANDLER_COMMAND" != x; then
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-    fi
-  fi
-
-    printf "$HELP_MSG\n"
-    printf "\n"
-  fi
-
-  if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xyes"; then
-    printf "NOTE: You have requested to build more than one version of the JVM, which\n"
-    printf "will result in longer build times.\n"
-    printf "\n"
-  fi
-
-  if test "x$FOUND_ALT_VARIABLES" != "x"; then
-    printf "WARNING: You have old-style ALT_ environment variables set.\n"
-    printf "These are not respected, and will be ignored. It is recommended\n"
-    printf "that you clean your environment. The following variables are set:\n"
-    printf "$FOUND_ALT_VARIABLES\n"
-    printf "\n"
-  fi
-
-  if test "x$OUTPUT_DIR_IS_LOCAL" != "xyes"; then
-    printf "WARNING: Your build output directory is not on a local disk.\n"
-    printf "This will severely degrade build performance!\n"
-    printf "It is recommended that you create an output directory on a local disk,\n"
-    printf "and run the configure script again from that directory.\n"
-    printf "\n"
-  fi
-
-  if test "x$IS_RECONFIGURE" = "xyes"; then
-    printf "WARNING: The result of this configuration has overridden an older\n"
-    printf "configuration. You *should* run 'make clean' to make sure you get a\n"
-    printf "proper build. Failure to do so might result in strange build problems.\n"
-    printf "\n"
-  fi
-
diff --git a/common/autoconf/help.m4 b/common/autoconf/help.m4
deleted file mode 100644
index 0b33e50..0000000
--- a/common/autoconf/help.m4
+++ /dev/null
@@ -1,243 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-AC_DEFUN_ONCE([HELP_SETUP_DEPENDENCY_HELP],
-[
-  AC_CHECK_PROGS(PKGHANDLER, apt-get yum port pkgutil pkgadd)
-])
-
-AC_DEFUN([HELP_MSG_MISSING_DEPENDENCY],
-[
-  # Print a helpful message on how to acquire the necessary build dependency.
-  # $1 is the help tag: freetype, cups, pulse, alsa etc
-  MISSING_DEPENDENCY=$1
-
-  if 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_help     $MISSING_DEPENDENCY ;;
-      yum)
-        yum_help     $MISSING_DEPENDENCY ;;
-      port)
-        port_help    $MISSING_DEPENDENCY ;;
-      pkgutil)
-        pkgutil_help $MISSING_DEPENDENCY ;;
-      pkgadd)
-        pkgadd_help  $MISSING_DEPENDENCY ;;
-    esac
-
-    if test "x$PKGHANDLER_COMMAND" != x; then
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-    fi
-  fi
-])
-
-cygwin_help() {
-  case $1 in
-    unzip)
-      PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip )"
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-      ;;
-    zip)
-      PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P zip )"
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-      ;;
-    make)
-      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'."
-      ;;
-    freetype)
-      if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-        HELP_MSG="To install freetype, run:
-wget \"http://gnuwin32.sourceforge.net/downlinks/freetype.php\" -O /tmp/freetype-setup.exe
-chmod +x /tmp/freetype-setup.exe
-/tmp/freetype-setup.exe
-Follow GUI prompts, and install to default directory \"C:\Program Files (x86)\GnuWin32\".
-After installation, locate lib/libfreetype.dll.a and make a copy with the name freetype.dll."
-      else
-        HELP_MSG="You need to build a 64-bit version of freetype.
-This is not readily available.
-You can find source code and build instructions on
-http://www.freetype.org/
-If you put the resulting build in \"C:\Program Files\GnuWin32\", it will be found automatically."
-      fi
-      ;;
-  esac
-}
-
-msys_help() {
-  PKGHANDLER_COMMAND=""
-}
-
-apt_help() {
-  case $1 in
-    devkit)
-      PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;;
-    openjdk)
-      PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;;
-    alsa)
-      PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
-    cups)
-      PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
-    freetype)
-      PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
-    pulse)
-      PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
-    x11)
-      PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
-    ccache)
-      PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
-  esac
-}
-
-yum_help() {
-  case $1 in
-    devkit)
-      PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;;
-    openjdk)
-      PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;;
-    alsa)
-      PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
-    cups)
-      PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
-    freetype)
-      PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
-    pulse)
-      PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
-    x11)
-      PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
-    ccache)
-      PKGHANDLER_COMMAND="sudo yum install ccache" ;;
-  esac
-}
-
-port_help() {
-  PKGHANDLER_COMMAND=""
-}
-
-pkgutil_help() {
-  PKGHANDLER_COMMAND=""
-}
-
-pkgadd_help() {
-  PKGHANDLER_COMMAND=""
-}
-
-AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
-[
-  # Finally output some useful information to the user
-
-  if test "x$CCACHE_FOUND" != x; then
-    if  test "x$HAS_GOOD_CCACHE" = x; then
-      CCACHE_STATUS="installed, but disabled (version older than 3.1.4)"
-      CCACHE_HELP_MSG="You have ccache installed, but it is a version prior to 3.1.4. Try upgrading."
-    else
-      CCACHE_STATUS="installed and in use"
-    fi
-  else
-    if test "x$GCC" = xyes; then
-      CCACHE_STATUS="not installed (consider installing)"
-      CCACHE_HELP_MSG="You do not have ccache installed. Try installing it."
-    else
-      CCACHE_STATUS="not available for your system"
-    fi
-  fi
-
-  printf "\n"
-  printf "====================================================\n"
-  printf "A new configuration has been successfully created in\n"
-  printf "$OUTPUT_ROOT\n"
-  if test "x$CONFIGURE_COMMAND_LINE" != x; then
-    printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
-  else
-    printf "using default settings.\n"
-  fi
-
-  printf "\n"
-  printf "Configuration summary:\n"
-  printf "* Debug level:    $DEBUG_LEVEL\n"
-  printf "* JDK variant:    $JDK_VARIANT\n"
-  printf "* JVM variants:   $with_jvm_variants\n"
-  printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n"
-
-  printf "\n"
-  printf "Tools summary:\n"
-  if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
-    printf "* Environment:    $WINDOWS_ENV_VENDOR version $WINDOWS_ENV_VERSION (root at $WINDOWS_ENV_ROOT_PATH)\n"
-  fi
-  printf "* Boot JDK:       $BOOT_JDK_VERSION (at $BOOT_JDK)\n"
-  printf "* C Compiler:     $CC_VENDOR version $CC_VERSION (at $CC)\n"
-  printf "* C++ Compiler:   $CXX_VENDOR version $CXX_VERSION (at $CXX)\n"
-
-  printf "\n"
-  printf "Build performance summary:\n"
-  printf "* Cores to use:   $JOBS\n"
-  printf "* Memory limit:   $MEMORY_SIZE MB\n"
-  printf "* ccache status:  $CCACHE_STATUS\n"
-  printf "\n"
-
-  if test "x$CCACHE_HELP_MSG" != x && test "x$HIDE_PERFORMANCE_HINTS" = "xno"; then
-    printf "Build performance tip: ccache gives a tremendous speedup for C++ recompilations.\n"
-    printf "$CCACHE_HELP_MSG\n"
-    HELP_MSG_MISSING_DEPENDENCY([ccache])
-    printf "$HELP_MSG\n"
-    printf "\n"
-  fi
-
-  if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xyes"; then
-    printf "NOTE: You have requested to build more than one version of the JVM, which\n"
-    printf "will result in longer build times.\n"
-    printf "\n"
-  fi
-
-  if test "x$FOUND_ALT_VARIABLES" != "x"; then
-    printf "WARNING: You have old-style ALT_ environment variables set.\n"
-    printf "These are not respected, and will be ignored. It is recommended\n"
-    printf "that you clean your environment. The following variables are set:\n"
-    printf "$FOUND_ALT_VARIABLES\n"
-    printf "\n"
-  fi
-
-  if test "x$OUTPUT_DIR_IS_LOCAL" != "xyes"; then
-    printf "WARNING: Your build output directory is not on a local disk.\n"
-    printf "This will severely degrade build performance!\n"
-    printf "It is recommended that you create an output directory on a local disk,\n"
-    printf "and run the configure script again from that directory.\n"
-    printf "\n"
-  fi
-
-  if test "x$IS_RECONFIGURE" = "xyes"; then
-    printf "WARNING: The result of this configuration has overridden an older\n"
-    printf "configuration. You *should* run 'make clean' to make sure you get a\n"
-    printf "proper build. Failure to do so might result in strange build problems.\n"
-    printf "\n"
-  fi
-])
diff --git a/common/autoconf/hotspot-spec.gmk.in b/common/autoconf/hotspot-spec.gmk.in
deleted file mode 100644
index 8146fe5..0000000
--- a/common/autoconf/hotspot-spec.gmk.in
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# 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
-# 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.
-#
-
-
-# Chaining of spec files
-HOTSPOT_SPEC:=$(dir $(SPEC))hotspot-spec.gmk
-override SPEC=$(HOTSPOT_SPEC)
-# Now include the base spec.gmk file
-include $(BASE_SPEC)
-
-# Additional legacy variables defined for Hotspot
-
-@SET_OPENJDK@
-
-# Legacy defines controlled by the SUPPORT_HEADLESS and SUPPORT_HEADFUL options.
-@BUILD_HEADLESS@
-
-# Legacy setting: OPT or DBG
-VARIANT:=@VARIANT@
-# Legacy setting: true or false
-FASTDEBUG:=@FASTDEBUG@
-# Legacy setting: debugging the class files?
-DEBUG_CLASSFILES:=@DEBUG_CLASSFILES@
-
-ALT_CUPS_HEADERS_PATH:=$(patsubst -I%,%,$(filter -I%,@CUPS_CFLAGS@))
-
-# The HOSTCC/HOSTCXX is Hotspot terminology for the BUILD_CC/BUILD_CXX, i.e. the
-# compiler that produces code that can be run on the build platform.
-HOSTCC:=@FIXPATH@ @BUILD_CC@
-HOSTCXX:=@FIXPATH@ @BUILD_CXX@
-
-####################################################
-#
-# Legacy Hotspot support
-
-# If cross compiling, then define CROSS_COMPILE_ARCH:=cpu_name here.
-@DEFINE_CROSS_COMPILE_ARCH@
-
-# Old name for OPENJDK_TARGET_OS (aix,bsd,hpux,linux,macosx,solaris,windows etc)
-PLATFORM=$(OPENJDK_TARGET_OS)
-# 32 or 64 bit
-ARCH_DATA_MODEL=$(OPENJDK_TARGET_CPU_BITS)
-
-ALT_BOOTDIR=$(BOOT_JDK)
-# Can be /sparcv9 or /amd64 on Solaris
-ISA_DIR=$(OPENJDK_TARGET_CPU_ISADIR)
-# Yet another name for arch used for an extra subdir below the jvm lib.
-# Uses i386 and amd64, instead of x86 and x86_64.
-LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB)
-# Set the cpu architecture
-ARCH=$(OPENJDK_TARGET_CPU_ARCH)
-# Legacy setting for building for a 64 bit machine.
-# If yes then this expands to _LP64:=1
-@LP64@
-
-# Legacy settings for zero
-ZERO_ENDIANNESS=$(OPENJDK_TARGET_CPU_ENDIAN)
-ZERO_LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB)
-ZERO_ARCHDEF=@ZERO_ARCHDEF@
-ZERO_ARCHFLAG=@ZERO_ARCHFLAG@
-LIBFFI_CFLAGS=@LIBFFI_CFLAGS@
-LIBFFI_LIBS=@LIBFFI_LIBS@
-
-# Legacy settings for zeroshark
-LLVM_CFLAGS=@LLVM_CFLAGS@
-LLVM_LIBS=@LLVM_LIBS@
-LLVM_LDFLAGS=@LLVM_LDFLAGS@
-
-ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
-ALT_EXPORT_PATH=$(HOTSPOT_DIST)
-
-JVM_INTERPRETER:=@JVM_INTERPRETER@
-ifeq ($(JVM_INTERPRETER), cpp)
-  CC_INTERP=true
-endif
-
-HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@ @STATIC_CXX_SETTING@
-# This is used from the libjvm build for C/C++ code.
-HOTSPOT_BUILD_JOBS:=$(JOBS)
-# Control wether Hotspot runs Queens test after building
-TEST_IN_BUILD=@TEST_IN_BUILD@
-
-# For hotspot, override compiler/tools definition to not include FIXPATH prefix.
-# Hotspot has its own handling on the Windows path situation.
-CXX:=@CCACHE@ @HOTSPOT_CXX@
-LD:=@HOTSPOT_LD@
-MT:=@HOTSPOT_MT@
-RC:=@HOTSPOT_RC@
-
-EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
-				   $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
-EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
-EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
-
-USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@
-
-# Universal binaries on macosx, mirror MACOSX_UNIVERSAL
-ALT_MACOSX_UNIVERSAL=@MACOSX_UNIVERSAL@
-
-# Hotspot expects the variable FULL_DEBUG_SYMBOLS=1/0 to control debug symbols
-# creation.
-ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
-  FULL_DEBUG_SYMBOLS=1
-  # Ensure hotspot uses the objcopy that configure located
-  ALT_OBJCOPY:=$(OBJCOPY)
-else
-  FULL_DEBUG_SYMBOLS=0
-endif
-
-# Hotspot expects the variable ZIP_DEBUGINFO_FILES=1/0 and not true/false.
-ifeq ($(ZIP_DEBUGINFO_FILES)$(ENABLE_DEBUG_SYMBOLS), truetrue)
-  ZIP_DEBUGINFO_FILES:=1
-else
-  ZIP_DEBUGINFO_FILES:=0
-endif
-
-# Sneak this in via the spec.gmk file, since we don't want to mess around too much with the Hotspot make files.
-# This is needed to get the LOG setting to work properly.
-include $(SRC_ROOT)/make/common/MakeBase.gmk
diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
deleted file mode 100644
index a8f7170..0000000
--- a/common/autoconf/jdk-options.m4
+++ /dev/null
@@ -1,619 +0,0 @@
-#
-# Copyright (c) 2011, 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.
-#
-
-AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VARIANT],
-[
-  ###############################################################################
-  #
-  # Check which variant of the JDK that we want to build.
-  # Currently we have:
-  #    normal:   standard edition
-  # but the custom make system may add other variants
-  #
-  # Effectively the JDK variant gives a name to a specific set of
-  # modules to compile into the JDK. In the future, these modules
-  # might even be Jigsaw modules.
-  #
-  AC_MSG_CHECKING([which variant of the JDK to build])
-  AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant],
-      [JDK variant to build (normal) @<:@normal@:>@])])
-
-  if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
-    JDK_VARIANT="normal"
-  else
-    AC_MSG_ERROR([The available JDK variants are: normal])
-  fi
-
-  AC_SUBST(JDK_VARIANT)
-
-  AC_MSG_RESULT([$JDK_VARIANT])
-])
-
-AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_INTERPRETER],
-[
-###############################################################################
-#
-# Check which interpreter of the JVM we want to build.
-# Currently we have:
-#    template: Template interpreter (the default)
-#    cpp     : C++ interpreter
-AC_MSG_CHECKING([which interpreter of the JVM to build])
-AC_ARG_WITH([jvm-interpreter], [AS_HELP_STRING([--with-jvm-interpreter],
-	[JVM interpreter to build (template, cpp) @<:@template@:>@])])
-
-if test "x$with_jvm_interpreter" = x; then
-     with_jvm_interpreter="template"
-fi
-
-JVM_INTERPRETER="$with_jvm_interpreter"
-
-if test "x$JVM_INTERPRETER" != xtemplate && test "x$JVM_INTERPRETER" != xcpp; then
-   AC_MSG_ERROR([The available JVM interpreters are: template, cpp])
-fi
-
-AC_SUBST(JVM_INTERPRETER)
-
-AC_MSG_RESULT([$with_jvm_interpreter])
-])
-
-AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS],
-[
-
-  ###############################################################################
-  #
-  # Check which variants of the JVM that we want to build.
-  # Currently we have:
-  #    server: normal interpreter and a tiered C1/C2 compiler
-  #    client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
-  #    minimal1: reduced form of client with optional VM services and features stripped out
-  #    kernel: kernel footprint JVM that passes the TCK without major performance problems,
-  #             ie normal interpreter and C1, only the serial GC, kernel jvmti etc
-  #    zero: no machine code interpreter, no compiler
-  #    zeroshark: zero interpreter and shark/llvm compiler backend
-#    core: interpreter only, no compiler (only works on some platforms)
-  AC_MSG_CHECKING([which variants of the JVM to build])
-  AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
-	[JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark, core) @<:@server@:>@])])
-
-  if test "x$with_jvm_variants" = x; then
-    with_jvm_variants="server"
-  fi
-
-  JVM_VARIANTS=",$with_jvm_variants,"
-  TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//'  -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//' -e 's/core,//'`
-
-  if test "x$TEST_VARIANTS" != "x,"; then
-     AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark, core])
-  fi
-  AC_MSG_RESULT([$with_jvm_variants])
-
-  JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
-  JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
-  JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'`
-  JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
-  JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
-  JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
-  JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
-
-  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-      AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
-    fi
-  fi
-  if test "x$JVM_VARIANT_KERNEL" = xtrue; then
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-      AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.])
-    fi
-  fi
-  if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-      AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.])
-    fi
-  fi
-
-  # Replace the commas with AND for use in the build directory name.
-  ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/g'`
-  COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/' -e 's/core,/1/'`
-  if test "x$COUNT_VARIANTS" != "x,1"; then
-    BUILDING_MULTIPLE_JVM_VARIANTS=yes
-  else
-    BUILDING_MULTIPLE_JVM_VARIANTS=no
-  fi
-
-  AC_SUBST(JVM_VARIANTS)
-  AC_SUBST(JVM_VARIANT_SERVER)
-  AC_SUBST(JVM_VARIANT_CLIENT)
-  AC_SUBST(JVM_VARIANT_MINIMAL1)
-  AC_SUBST(JVM_VARIANT_KERNEL)
-  AC_SUBST(JVM_VARIANT_ZERO)
-  AC_SUBST(JVM_VARIANT_ZEROSHARK)
-  AC_SUBST(JVM_VARIANT_CORE)
-
-  INCLUDE_SA=true
-  if test "x$JVM_VARIANT_ZERO" = xtrue ; then
-    INCLUDE_SA=false
-  fi
-  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
-    INCLUDE_SA=false
-  fi
-  if test "x$VAR_CPU" = xppc64 ; then
-    INCLUDE_SA=false
-  fi
-  if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-    INCLUDE_SA=false
-  fi
-  AC_SUBST(INCLUDE_SA)
-
-  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-    MACOSX_UNIVERSAL="false"
-  fi
-
-  AC_SUBST(MACOSX_UNIVERSAL)
-])
-
-AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_LEVEL],
-[
-  ###############################################################################
-  #
-  # Set the debug level
-  #    release: no debug information, all optimizations, no asserts.
-  #    fastdebug: debug information (-g), all optimizations, all asserts
-  #    slowdebug: debug information (-g), no optimizations, all asserts
-  #
-  DEBUG_LEVEL="release"
-  AC_MSG_CHECKING([which debug level to use])
-  AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],
-      [set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) @<:@disabled@:>@])],
-      [
-        ENABLE_DEBUG="${enableval}"
-        DEBUG_LEVEL="fastdebug"
-      ], [ENABLE_DEBUG="no"])
-
-  AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level],
-      [set the debug level (release, fastdebug, slowdebug) @<:@release@:>@])],
-      [
-        DEBUG_LEVEL="${withval}"
-        if test "x$ENABLE_DEBUG" = xyes; then
-          AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.])
-        fi
-      ])
-  AC_MSG_RESULT([$DEBUG_LEVEL])
-
-  if test "x$DEBUG_LEVEL" != xrelease && \
-      test "x$DEBUG_LEVEL" != xfastdebug && \
-      test "x$DEBUG_LEVEL" != xslowdebug; then
-    AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug])
-  fi
-
-
-  ###############################################################################
-  #
-  # Setup legacy vars/targets and new vars to deal with different debug levels.
-  #
-
-  case $DEBUG_LEVEL in
-    release )
-      VARIANT="OPT"
-      FASTDEBUG="false"
-      DEBUG_CLASSFILES="false"
-      BUILD_VARIANT_RELEASE=""
-      HOTSPOT_DEBUG_LEVEL="product"
-      HOTSPOT_EXPORT="product"
-      ;;
-    fastdebug )
-      VARIANT="DBG"
-      FASTDEBUG="true"
-      DEBUG_CLASSFILES="true"
-      BUILD_VARIANT_RELEASE="-fastdebug"
-      HOTSPOT_DEBUG_LEVEL="fastdebug"
-      HOTSPOT_EXPORT="fastdebug"
-      ;;
-    slowdebug )
-      VARIANT="DBG"
-      FASTDEBUG="false"
-      DEBUG_CLASSFILES="true"
-      BUILD_VARIANT_RELEASE="-debug"
-      HOTSPOT_DEBUG_LEVEL="jvmg"
-      HOTSPOT_EXPORT="debug"
-      ;;
-  esac
-
-  #####
-  # Generate the legacy makefile targets for hotspot.
-  # The hotspot api for selecting the build artifacts, really, needs to be improved.
-  # JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
-  # determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
-  # But until then ...
-  HOTSPOT_TARGET=""
-
-  if test "x$JVM_VARIANT_SERVER" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
-  fi
-
-  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
-  fi
-
-  if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 "
-  fi
-
-  if test "x$JVM_VARIANT_KERNEL" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel "
-  fi
-
-  if test "x$JVM_VARIANT_ZERO" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
-  fi
-
-  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
-  fi
-
-  if test "x$JVM_VARIANT_CORE" = xtrue; then
-    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core "
-  fi
-
-  HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
-
-  # On Macosx universal binaries are produced, but they only contain
-  # 64 bit intel. This invalidates control of which jvms are built
-  # from configure, but only server is valid anyway. Fix this
-  # when hotspot makefiles are rewritten.
-  if test "x$MACOSX_UNIVERSAL" = xtrue; then
-    HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
-  fi
-
-  #####
-
-  AC_SUBST(DEBUG_LEVEL)
-  AC_SUBST(VARIANT)
-  AC_SUBST(FASTDEBUG)
-  AC_SUBST(DEBUG_CLASSFILES)
-  AC_SUBST(BUILD_VARIANT_RELEASE)
-])
-
-
-###############################################################################
-#
-# Should we build only OpenJDK even if closed sources are present?
-#
-AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM],
-[
-  AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
-      [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
-
-  AC_MSG_CHECKING([for presence of closed sources])
-  if test -d "$SRC_ROOT/jdk/src/closed"; then
-    CLOSED_SOURCE_PRESENT=yes
-  else
-    CLOSED_SOURCE_PRESENT=no
-  fi
-  AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
-
-  AC_MSG_CHECKING([if closed source is suppressed (openjdk-only)])
-  SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only"
-  AC_MSG_RESULT([$SUPPRESS_CLOSED_SOURCE])
-
-  if test "x$CLOSED_SOURCE_PRESENT" = xno; then
-    OPENJDK=true
-    if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
-      AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
-    fi
-  else
-    if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
-      OPENJDK=true
-    else
-      OPENJDK=false
-    fi
-  fi
-
-  if test "x$OPENJDK" = "xtrue"; then
-    SET_OPENJDK="OPENJDK=true"
-  fi
-
-  AC_SUBST(SET_OPENJDK)
-])
-
-AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
-[
-
-  ###############################################################################
-  #
-  # Should we build a JDK/JVM with headful support (ie a graphical ui)?
-  # We always build headless support.
-  #
-  AC_MSG_CHECKING([headful support])
-  AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful],
-      [disable building headful support (graphical UI support) @<:@enabled@:>@])],
-      [SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes])
-
-  SUPPORT_HEADLESS=yes
-  BUILD_HEADLESS="BUILD_HEADLESS:=true"
-
-  if test "x$SUPPORT_HEADFUL" = xyes; then
-    # We are building both headful and headless.
-    headful_msg="include support for both headful and headless"
-  fi
-
-  if test "x$SUPPORT_HEADFUL" = xno; then
-    # Thus we are building headless only.
-    BUILD_HEADLESS="BUILD_HEADLESS:=true"
-    headful_msg="headless only"
-  fi
-
-  AC_MSG_RESULT([$headful_msg])
-
-  AC_SUBST(SUPPORT_HEADLESS)
-  AC_SUBST(SUPPORT_HEADFUL)
-  AC_SUBST(BUILD_HEADLESS)
-
-  # Control wether Hotspot runs Queens test after build.
-  AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
-      [run the Queens test after Hotspot build @<:@disabled@:>@])],,
-      [enable_hotspot_test_in_build=no])
-  if test "x$enable_hotspot_test_in_build" = "xyes"; then
-    TEST_IN_BUILD=true
-  else
-    TEST_IN_BUILD=false
-  fi
-  AC_SUBST(TEST_IN_BUILD)
-
-  ###############################################################################
-  #
-  # Choose cacerts source file
-  #
-  AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file],
-      [specify alternative cacerts file])])
-  if test "x$with_cacerts_file" != x; then
-    CACERTS_FILE=$with_cacerts_file
-  else
-    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
-  fi
-  AC_SUBST(CACERTS_FILE)
-
-  ###############################################################################
-  #
-  # Enable or disable unlimited crypto
-  #
-  AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto],
-      [Enable unlimited crypto policy @<:@disabled@:>@])],,
-      [enable_unlimited_crypto=no])
-  if test "x$enable_unlimited_crypto" = "xyes"; then
-    UNLIMITED_CRYPTO=true
-  else
-    UNLIMITED_CRYPTO=false
-  fi
-  AC_SUBST(UNLIMITED_CRYPTO)
-
-  ###############################################################################
-  #
-  # 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 "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
-      ENABLE_INTREE_EC=yes
-      AC_MSG_RESULT([yes])
-    else
-      ENABLE_INTREE_EC=no
-      AC_MSG_RESULT([no])
-    fi
-
-    AC_SUBST(ENABLE_INTREE_EC)
-  ])
-
-  ###############################################################################
-  #
-  # Compress jars
-  #
-  COMPRESS_JARS=false
-
-  AC_SUBST(COMPRESS_JARS)
-])
-
-###############################################################################
-#
-# Setup version numbers
-#
-AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
-[
-  # Source the version numbers
-  . $AUTOCONF_DIR/version-numbers
-
-  # Get the settings from parameters
-  AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone],
-      [Set milestone value for build @<:@internal@:>@])])
-  if test "x$with_milestone" = xyes; then
-    AC_MSG_ERROR([Milestone must have a value])
-  elif test "x$with_milestone" != x; then
-    MILESTONE="$with_milestone"
-  fi
-  if test "x$MILESTONE" = x; then
-    MILESTONE=internal
-  fi
-
-  AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version],
-      [Set update version value for build @<:@b00@:>@])])
-  if test "x$with_update_version" = xyes; then
-    AC_MSG_ERROR([Update version must have a value])
-  elif test "x$with_update_version" != x; then
-    JDK_UPDATE_VERSION="$with_update_version"
-    # On macosx 10.7, it's not possible to set --with-update-version=0X due
-    # to a bug in expr (which reduces it to just X). To work around this, we
-    # always add a 0 to one digit update versions.
-    if test "${#JDK_UPDATE_VERSION}" = "1"; then
-      JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}"
-    fi
-  fi
-
-  AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
-      [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
-  if test "x$with_user_release_suffix" = xyes; then
-    AC_MSG_ERROR([Release suffix must have a value])
-  elif test "x$with_user_release_suffix" != x; then
-    USER_RELEASE_SUFFIX="$with_user_release_suffix"
-  fi
-
-  AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
-      [Set build number value for build @<:@b00@:>@])])
-  if test "x$with_build_number" = xyes; then
-    AC_MSG_ERROR([Build number must have a value])
-  elif test "x$with_build_number" != x; then
-    JDK_BUILD_NUMBER="$with_build_number"
-  fi
-  # Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
-  if test "x$JDK_BUILD_NUMBER" = x; then
-    JDK_BUILD_NUMBER=b00
-    if test "x$USER_RELEASE_SUFFIX" = x; then
-      BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
-      # Avoid [:alnum:] since it depends on the locale.
-      CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
-      USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-    fi
-  fi
-
-  # Now set the JDK version, milestone, build number etc.
-  AC_SUBST(USER_RELEASE_SUFFIX)
-  AC_SUBST(JDK_MAJOR_VERSION)
-  AC_SUBST(JDK_MINOR_VERSION)
-  AC_SUBST(JDK_MICRO_VERSION)
-  AC_SUBST(JDK_UPDATE_VERSION)
-  AC_SUBST(JDK_BUILD_NUMBER)
-  AC_SUBST(MILESTONE)
-  AC_SUBST(LAUNCHER_NAME)
-  AC_SUBST(PRODUCT_NAME)
-  AC_SUBST(PRODUCT_SUFFIX)
-  AC_SUBST(JDK_RC_PLATFORM_NAME)
-  AC_SUBST(COMPANY_NAME)
-  AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
-  AC_SUBST(MACOSX_BUNDLE_ID_BASE)
-
-  AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year],
-      [Set copyright year value for build @<:@current year@:>@])])
-  if test "x$with_copyright_year" = xyes; then
-    AC_MSG_ERROR([Copyright year must have a value])
-  elif test "x$with_copyright_year" != x; then
-    COPYRIGHT_YEAR="$with_copyright_year"
-  else
-    COPYRIGHT_YEAR=`date +'%Y'`
-  fi
-  AC_SUBST(COPYRIGHT_YEAR)
-
-  if test "x$JDK_UPDATE_VERSION" != x; then
-    JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
-  else
-    JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
-  fi
-  AC_SUBST(JDK_VERSION)
-
-  # The cooked update version used to encode trailing letters in the update
-  # version into a trailing number. That is no longer needed, but need to
-  # keep the format in 8u for compatibility.
-  COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0"
-  AC_SUBST(COOKED_JDK_UPDATE_VERSION)
-
-  COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
-  AC_SUBST(COOKED_BUILD_NUMBER)
-])
-
-AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS],
-[
-  HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
-  AC_SUBST(HOTSPOT_MAKE_ARGS)
-
-  # The name of the Service Agent jar.
-  SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
-  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
-  fi
-  AC_SUBST(SALIB_NAME)
-])
-
-AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
-[
-  #
-  # ENABLE_DEBUG_SYMBOLS
-  # This must be done after the toolchain is setup, since we're looking at objcopy.
-  #
-  AC_ARG_ENABLE([debug-symbols],
-      [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])])
-
-  AC_MSG_CHECKING([if we should generate debug symbols])
-
-  if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
-    # explicit enabling of enable-debug-symbols and can't find objcopy
-    #   this is an error
-    AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols])
-  fi
-
-  if test "x$enable_debug_symbols" = "xyes"; then
-    ENABLE_DEBUG_SYMBOLS=true
-  elif test "x$enable_debug_symbols" = "xno"; then
-    ENABLE_DEBUG_SYMBOLS=false
-  else
-    # Default is on if objcopy is found
-    if test "x$OBJCOPY" != x; then
-      ENABLE_DEBUG_SYMBOLS=true
-    # MacOS X and Windows don't use objcopy but default is on for those OSes
-    elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
-      ENABLE_DEBUG_SYMBOLS=true
-    else
-      ENABLE_DEBUG_SYMBOLS=false
-    fi
-  fi
-
-  AC_MSG_RESULT([$ENABLE_DEBUG_SYMBOLS])
-
-  #
-  # ZIP_DEBUGINFO_FILES
-  #
-  AC_MSG_CHECKING([if we should zip debug-info files])
-  AC_ARG_ENABLE([zip-debug-info],
-      [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
-      [enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"])
-  AC_MSG_RESULT([${enable_zip_debug_info}])
-
-  if test "x${enable_zip_debug_info}" = "xno"; then
-    ZIP_DEBUGINFO_FILES=false
-  else
-    ZIP_DEBUGINFO_FILES=true
-  fi
-
-  AC_SUBST(ENABLE_DEBUG_SYMBOLS)
-  AC_SUBST(ZIP_DEBUGINFO_FILES)
-  AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
-  AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
-])
-
-# Support for customization of the build process. Some build files
-# will include counterparts from this location, if they exist. This allows
-# for a degree of customization of the build targets and the rules/recipes
-# to create them
-AC_ARG_WITH([custom-make-dir], [AS_HELP_STRING([--with-custom-make-dir],
-[use this directory for custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir])
-AC_SUBST(CUSTOM_MAKE_DIR)
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
deleted file mode 100644
index 91b8ed7..0000000
--- a/common/autoconf/libraries.m4
+++ /dev/null
@@ -1,876 +0,0 @@
-#
-# Copyright (c) 2011, 2015, 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.
-#
-
-AC_DEFUN_ONCE([LIB_SETUP_INIT],
-[
-
-  ###############################################################################
-  #
-  # OS specific settings that we never will need to probe.
-  #
-  if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    AC_MSG_CHECKING([what is not needed on Linux?])
-    PULSE_NOT_NEEDED=yes
-    AC_MSG_RESULT([pulse])
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    AC_MSG_CHECKING([what is not needed on Solaris?])
-    ALSA_NOT_NEEDED=yes
-    PULSE_NOT_NEEDED=yes
-    AC_MSG_RESULT([alsa pulse])
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = xaix; then
-    AC_MSG_CHECKING([what is not needed on AIX?])
-    ALSA_NOT_NEEDED=yes
-    PULSE_NOT_NEEDED=yes
-    AC_MSG_RESULT([alsa pulse])
-  fi
-
-
-  if test "x$OPENJDK_TARGET_OS" = xwindows; then
-    AC_MSG_CHECKING([what is not needed on Windows?])
-    CUPS_NOT_NEEDED=yes
-    ALSA_NOT_NEEDED=yes
-    PULSE_NOT_NEEDED=yes
-    X11_NOT_NEEDED=yes
-    AC_MSG_RESULT([alsa cups pulse x11])
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    AC_MSG_CHECKING([what is not needed on MacOSX?])
-    ALSA_NOT_NEEDED=yes
-    PULSE_NOT_NEEDED=yes
-    X11_NOT_NEEDED=yes
-    AC_MSG_RESULT([alsa pulse x11])
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = xbsd; then
-    AC_MSG_CHECKING([what is not needed on bsd?])
-    ALSA_NOT_NEEDED=yes
-    AC_MSG_RESULT([alsa])
-  fi
-
-  if test "x$OPENJDK" = "xfalse"; then
-    FREETYPE_NOT_NEEDED=yes
-  fi
-
-  if test "x$SUPPORT_HEADFUL" = xno; then
-    X11_NOT_NEEDED=yes
-  fi
-
-  # Deprecated and now ignored
-  BASIC_DEPRECATED_ARG_ENABLE(macosx-runtime-support, macosx_runtime_support)
-])
-
-AC_DEFUN_ONCE([LIB_SETUP_X11],
-[
-
-  ###############################################################################
-  #
-  # Check for X Windows
-  #
-
-  # Check if the user has specified sysroot, but not --x-includes or --x-libraries.
-  # Make a simple check for the libraries at the sysroot, and setup --x-includes and
-  # --x-libraries for the sysroot, if that seems to be correct.
-  if test "x$SYS_ROOT" != "x/"; then
-    if test "x$x_includes" = xNONE; then
-      if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
-        x_includes="$SYS_ROOT/usr/X11R6/include"
-      elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
-        x_includes="$SYS_ROOT/usr/include"
-      fi
-    fi
-    if test "x$x_libraries" = xNONE; then
-      if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
-        x_libraries="$SYS_ROOT/usr/X11R6/lib"
-      elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-        x_libraries="$SYS_ROOT/usr/lib64"
-      elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then
-        x_libraries="$SYS_ROOT/usr/lib"
-      fi
-    fi
-  fi
-
-  # Now let autoconf do it's magic
-  AC_PATH_X
-  AC_PATH_XTRA
-
-  # AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
-  # this doesn't make sense so we remove it.
-  if test "x$COMPILE_TYPE" = xcross; then
-    X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
-  fi
-
-  if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
-    HELP_MSG_MISSING_DEPENDENCY([x11])
-    AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    OPENWIN_HOME="/usr/openwin"
-  fi
-  AC_SUBST(OPENWIN_HOME)
-
-
-  #
-  # Weird Sol10 something check...TODO change to try compile
-  #
-  if test "x${OPENJDK_TARGET_OS}" = xsolaris; then
-    if test "`uname -r`" = "5.10"; then
-      if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then
-        X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS"
-      fi
-    fi
-  fi
-
-  AC_LANG_PUSH(C)
-  OLD_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $X_CFLAGS"
-
-  # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
-  AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
-      [X11_A_OK=yes],
-      [X11_A_OK=no; break],
-      [
-        # include <X11/Xlib.h>
-        # include <X11/Xutil.h>
-      ]
-  )
-
-  CFLAGS="$OLD_CFLAGS"
-  AC_LANG_POP(C)
-
-  if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
-    HELP_MSG_MISSING_DEPENDENCY([x11])
-    AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
-  fi
-
-  AC_SUBST(X_CFLAGS)
-  AC_SUBST(X_LIBS)
-])
-
-AC_DEFUN_ONCE([LIB_SETUP_CUPS],
-[
-
-  ###############################################################################
-  #
-  # The common unix printing system cups is used to print from java.
-  #
-  AC_ARG_WITH(cups, [AS_HELP_STRING([--with-cups],
-      [specify prefix directory for the cups package
-      (expecting the headers under PATH/include)])])
-  AC_ARG_WITH(cups-include, [AS_HELP_STRING([--with-cups-include],
-      [specify directory for the cups include files])])
-
-  if test "x$CUPS_NOT_NEEDED" = xyes; then
-    if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then
-      AC_MSG_WARN([cups not used, so --with-cups is ignored])
-    fi
-    CUPS_CFLAGS=
-  else
-    CUPS_FOUND=no
-
-    if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then
-      AC_MSG_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.])
-    fi
-
-    if test "x${with_cups}" != x; then
-      CUPS_CFLAGS="-I${with_cups}/include"
-      CUPS_FOUND=yes
-    fi
-    if test "x${with_cups_include}" != x; then
-      CUPS_CFLAGS="-I${with_cups_include}"
-      CUPS_FOUND=yes
-    fi
-    if test "x$CUPS_FOUND" = xno; then
-      BDEPS_CHECK_MODULE(CUPS, cups, xxx, [CUPS_FOUND=yes])
-    fi
-    if test "x$CUPS_FOUND" = xno; then
-      # Are the cups headers installed in the default /usr/include location?
-      AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],
-          [
-            CUPS_FOUND=yes
-            CUPS_CFLAGS=
-            DEFAULT_CUPS=yes
-          ]
-      )
-    fi
-    if test "x$CUPS_FOUND" = xno; then
-      # Getting nervous now? Lets poke around for standard Solaris third-party
-      # package installation locations.
-      AC_MSG_CHECKING([for cups headers])
-      if test -s /opt/sfw/cups/include/cups/cups.h; then
-        # An SFW package seems to be installed!
-        CUPS_FOUND=yes
-        CUPS_CFLAGS="-I/opt/sfw/cups/include"
-      elif test -s /opt/csw/include/cups/cups.h; then
-        # A CSW package seems to be installed!
-        CUPS_FOUND=yes
-        CUPS_CFLAGS="-I/opt/csw/include"
-      fi
-      AC_MSG_RESULT([$CUPS_FOUND])
-    fi
-    if test "x$CUPS_FOUND" = xno; then
-      HELP_MSG_MISSING_DEPENDENCY([cups])
-      AC_MSG_ERROR([Could not find cups! $HELP_MSG ])
-    fi
-  fi
-
-  AC_SUBST(CUPS_CFLAGS)
-
-])
-
-AC_DEFUN([LIB_CHECK_POTENTIAL_FREETYPE],
-[
-  POTENTIAL_FREETYPE_INCLUDE_PATH="$1"
-  POTENTIAL_FREETYPE_LIB_PATH="$2"
-  METHOD="$3"
-  
-  # First check if the files exists.
-  if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
-    # We found an arbitrary include file. That's a good sign.
-    AC_MSG_NOTICE([Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD])
-    FOUND_FREETYPE=yes
-
-    FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
-    if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
-      AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location.])
-      FOUND_FREETYPE=no
-    else
-      if test "x$OPENJDK_TARGET_OS" = xwindows; then
-        # On Windows, we will need both .lib and .dll file.
-        if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
-          AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location.])
-          FOUND_FREETYPE=no
-        fi
-      elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
-        # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
-        POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
-      fi
-    fi
-  fi
-
-  if test "x$FOUND_FREETYPE" = xyes; then
-    BASIC_FIXUP_PATH(POTENTIAL_FREETYPE_INCLUDE_PATH)
-    BASIC_FIXUP_PATH(POTENTIAL_FREETYPE_LIB_PATH)
-
-    FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
-    AC_MSG_CHECKING([for freetype includes])
-    AC_MSG_RESULT([$FREETYPE_INCLUDE_PATH])
-    FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
-    AC_MSG_CHECKING([for freetype libraries])
-    AC_MSG_RESULT([$FREETYPE_LIB_PATH])
-  fi
-])
-
-AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
-[
-
-  ###############################################################################
-  #
-  # The ubiquitous freetype library is used to render fonts.
-  #
-  AC_ARG_WITH(freetype, [AS_HELP_STRING([--with-freetype],
-      [specify prefix directory for the freetype package
-      (expecting the libraries under PATH/lib and the headers under PATH/include)])])
-  AC_ARG_WITH(freetype-include, [AS_HELP_STRING([--with-freetype-include],
-      [specify directory for the freetype include files])])
-  AC_ARG_WITH(freetype-lib, [AS_HELP_STRING([--with-freetype-lib],
-      [specify directory for the freetype library])])
-  AC_ARG_ENABLE(freetype-bundling, [AS_HELP_STRING([--disable-freetype-bundling],
-      [disable bundling of the freetype library with the build result @<:@enabled on Windows or when using --with-freetype, disabled otherwise@:>@])])
-
-  FREETYPE_CFLAGS=
-  FREETYPE_LIBS=
-  FREETYPE_BUNDLE_LIB_PATH=
-
-  if test "x$FREETYPE_NOT_NEEDED" = xyes; then
-    if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
-      AC_MSG_WARN([freetype not used, so --with-freetype is ignored])
-    fi
-    if test "x$enable_freetype_bundling" != x; then
-      AC_MSG_WARN([freetype not used, so --enable-freetype-bundling is ignored])
-    fi
-  else
-    # freetype is needed to build; go get it!
-
-    BUNDLE_FREETYPE="$enable_freetype_bundling"
-
-    if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
-      # User has specified settings
-
-      if test "x$BUNDLE_FREETYPE" = x; then
-        # If not specified, default is to bundle freetype
-        BUNDLE_FREETYPE=yes
-      fi
-      
-      if test "x$with_freetype" != x; then
-        POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype/include"
-        POTENTIAL_FREETYPE_LIB_PATH="$with_freetype/lib"
-      fi
-      
-      # Allow --with-freetype-lib and --with-freetype-include to override
-      if test "x$with_freetype_include" != x; then
-        POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
-      fi
-      if test "x$with_freetype_lib" != x; then
-        POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
-      fi
-
-      if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" != x && test "x$POTENTIAL_FREETYPE_LIB_PATH" != x; then
-        # Okay, we got it. Check that it works.
-        LIB_CHECK_POTENTIAL_FREETYPE($POTENTIAL_FREETYPE_INCLUDE_PATH, $POTENTIAL_FREETYPE_LIB_PATH, [--with-freetype])
-        if test "x$FOUND_FREETYPE" != xyes; then
-          AC_MSG_ERROR([Can not find or use freetype at location given by --with-freetype])
-        fi
-      else
-        # User specified only one of lib or include. This is an error.
-        if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" = x ; then
-          AC_MSG_NOTICE([User specified --with-freetype-lib but not --with-freetype-include])
-          AC_MSG_ERROR([Need both freetype lib and include paths. Consider using --with-freetype instead.])
-        else
-          AC_MSG_NOTICE([User specified --with-freetype-include but not --with-freetype-lib])
-          AC_MSG_ERROR([Need both freetype lib and include paths. Consider using --with-freetype instead.])
-        fi
-      fi
-    else
-      # User did not specify settings, but we need freetype. Try to locate it.
-
-      if test "x$BUNDLE_FREETYPE" = x; then
-        # If not specified, default is to bundle freetype only on windows
-        if test "x$OPENJDK_TARGET_OS" = xwindows; then
-          BUNDLE_FREETYPE=yes
-        else
-          BUNDLE_FREETYPE=no
-        fi
-      fi
-
-      if test "x$FOUND_FREETYPE" != xyes; then
-        # Check builddeps
-        BDEPS_CHECK_MODULE(FREETYPE, freetype2, xxx, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no])
-        # BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
-        if test "x$FOUND_FREETYPE" = xyes; then
-          if test "x$BUNDLE_FREETYPE" = xyes; then
-            AC_MSG_NOTICE([Found freetype using builddeps, but ignoring since we can not bundle that])
-            FOUND_FREETYPE=no
-          else
-            AC_MSG_CHECKING([for freetype])
-            AC_MSG_RESULT([yes (using builddeps)])
-          fi
-        fi
-      fi
-
-      if test "x$FOUND_FREETYPE" != xyes; then
-        # Check modules using pkg-config, but only if we have it (ugly output results otherwise)
-        if test "x$PKG_CONFIG" != x; then
-          PKG_CHECK_MODULES(FREETYPE, freetype2, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no])
-          if test "x$FOUND_FREETYPE" = xyes; then
-            # On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
-            FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's/-lz//g'`
-            # 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
-            if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-              FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's?/lib?/lib/amd64?g'`
-            fi
-            # BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
-            if test "x$BUNDLE_FREETYPE" = xyes; then
-              AC_MSG_NOTICE([Found freetype using pkg-config, but ignoring since we can not bundle that])
-              FOUND_FREETYPE=no
-            else
-              AC_MSG_CHECKING([for freetype])
-              AC_MSG_RESULT([yes (using pkg-config)])
-            fi
-          fi
-        fi
-      fi
-
-      if test "x$FOUND_FREETYPE" != xyes; then
-        # Check in well-known locations
-        if test "x$OPENJDK_TARGET_OS" = xwindows; then
-          FREETYPE_BASE_DIR="$PROGRAMFILES/GnuWin32"
-          BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR)
-          LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
-          if test "x$FOUND_FREETYPE" != xyes; then
-            FREETYPE_BASE_DIR="$ProgramW6432/GnuWin32"
-            BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR)
-            LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
-          fi
-        else
-          if test "x$SYS_ROOT" = "x/"; then
-            FREETYPE_ROOT=
-          else
-            FREETYPE_ROOT="$SYS_ROOT"
-          fi
-          FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr"
-          LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
-
-          if test "x$FOUND_FREETYPE" != xyes; then
-            FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr/X11"
-            LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
-          fi
-
-          if test "x$FOUND_FREETYPE" != xyes; then
-            FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr"
-            if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-              LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu], [well-known location])
-            else
-              LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location])
-              if test "x$FOUND_FREETYPE" != xyes; then
-                LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib32], [well-known location])
-              fi
-            fi
-          fi
-        fi
-      fi # end check in well-known locations
-
-      if test "x$FOUND_FREETYPE" != xyes; then
-        HELP_MSG_MISSING_DEPENDENCY([freetype])
-        AC_MSG_ERROR([Could not find freetype! $HELP_MSG ])
-      fi
-    fi # end user specified settings
-
-    # Set FREETYPE_CFLAGS, _LIBS and _LIB_PATH from include and lib dir.
-    if test "x$FREETYPE_CFLAGS" = x; then
-      BASIC_FIXUP_PATH(FREETYPE_INCLUDE_PATH)
-      if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then
-        FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
-      else
-        FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
-      fi
-    fi
-    
-    if test "x$FREETYPE_LIBS" = x; then
-      BASIC_FIXUP_PATH(FREETYPE_LIB_PATH)
-      if test "x$OPENJDK_TARGET_OS" = xwindows; then
-        FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
-      else
-        FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype"
-      fi
-    fi
-
-    # Try to compile it
-    AC_MSG_CHECKING([if we can compile and link with freetype])
-    AC_LANG_PUSH(C++)
-    PREV_CXXCFLAGS="$CXXFLAGS"
-    PREV_LIBS="$LIBS"
-    PREV_CXX="$CXX"
-    CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" 
-    LIBS="$LIBS $FREETYPE_LIBS"
-    CXX="$FIXPATH $CXX"
-    AC_LINK_IFELSE([AC_LANG_SOURCE([[
-          #include<ft2build.h>
-          #include FT_FREETYPE_H
-          int main () {
-            FT_Init_FreeType(NULL);
-            return 0;
-          }
-        ]])],
-        [
-          AC_MSG_RESULT([yes])
-        ],
-        [
-          AC_MSG_RESULT([no])
-          AC_MSG_NOTICE([Could not compile and link with freetype. This might be a 32/64-bit mismatch.])
-          AC_MSG_NOTICE([Using FREETYPE_CFLAGS=$FREETYPE_CFLAGS and FREETYPE_LIBS=$FREETYPE_LIBS])
-          
-          HELP_MSG_MISSING_DEPENDENCY([freetype])
-          
-          AC_MSG_ERROR([Can not continue without freetype. $HELP_MSG])
-        ]
-    )
-    CXXCFLAGS="$PREV_CXXFLAGS"
-    LIBS="$PREV_LIBS"
-    CXX="$PREV_CXX"
-    AC_LANG_POP(C++)
-
-    AC_MSG_CHECKING([if we should bundle freetype])
-    if test "x$BUNDLE_FREETYPE" = xyes; then
-      FREETYPE_BUNDLE_LIB_PATH="$FREETYPE_LIB_PATH"
-    fi
-    AC_MSG_RESULT([$BUNDLE_FREETYPE])
-
-  fi # end freetype needed
-
-  AC_SUBST(FREETYPE_BUNDLE_LIB_PATH)
-  AC_SUBST(FREETYPE_CFLAGS)
-  AC_SUBST(FREETYPE_LIBS)
-])
-
-AC_DEFUN_ONCE([LIB_SETUP_ALSA],
-[
-
-  ###############################################################################
-  #
-  # Check for alsa headers and libraries. Used on Linux/GNU systems.
-  #
-  AC_ARG_WITH(alsa, [AS_HELP_STRING([--with-alsa],
-      [specify prefix directory for the alsa package
-      (expecting the libraries under PATH/lib and the headers under PATH/include)])])
-  AC_ARG_WITH(alsa-include, [AS_HELP_STRING([--with-alsa-include],
-      [specify directory for the alsa include files])])
-  AC_ARG_WITH(alsa-lib, [AS_HELP_STRING([--with-alsa-lib],
-      [specify directory for the alsa library])])
-
-  if test "x$ALSA_NOT_NEEDED" = xyes; then
-    if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then
-      AC_MSG_WARN([alsa not used, so --with-alsa is ignored])
-    fi
-    ALSA_CFLAGS=
-    ALSA_LIBS=
-  else
-    ALSA_FOUND=no
-
-    if test "x${with_alsa}" = xno || test "x${with_alsa_include}" = xno || test "x${with_alsa_lib}" = xno; then
-      AC_MSG_ERROR([It is not possible to disable the use of alsa. Remove the --without-alsa option.])
-    fi
-
-    if test "x${with_alsa}" != x; then
-      ALSA_LIBS="-L${with_alsa}/lib -lasound"
-      ALSA_CFLAGS="-I${with_alsa}/include"
-      ALSA_FOUND=yes
-    fi
-    if test "x${with_alsa_include}" != x; then
-      ALSA_CFLAGS="-I${with_alsa_include}"
-      ALSA_FOUND=yes
-    fi
-    if test "x${with_alsa_lib}" != x; then
-      ALSA_LIBS="-L${with_alsa_lib} -lasound"
-      ALSA_FOUND=yes
-    fi
-    if test "x$ALSA_FOUND" = xno; then
-      BDEPS_CHECK_MODULE(ALSA, alsa, xxx, [ALSA_FOUND=yes], [ALSA_FOUND=no])
-    fi
-    if test "x$ALSA_FOUND" = xno; then
-      PKG_CHECK_MODULES(ALSA, alsa, [ALSA_FOUND=yes], [ALSA_FOUND=no])
-    fi
-    if test "x$ALSA_FOUND" = xno; then
-      AC_CHECK_HEADERS([alsa/asoundlib.h],
-          [
-            ALSA_FOUND=yes
-            ALSA_CFLAGS=-Iignoreme
-            ALSA_LIBS=-lasound
-            DEFAULT_ALSA=yes
-          ],
-          [ALSA_FOUND=no])
-    fi
-    if test "x$ALSA_FOUND" = xno; then
-      HELP_MSG_MISSING_DEPENDENCY([alsa])
-      AC_MSG_ERROR([Could not find alsa! $HELP_MSG ])
-    fi
-  fi
-
-  AC_SUBST(ALSA_CFLAGS)
-  AC_SUBST(ALSA_LIBS)
-])
-
-AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
-[
-
-  ###############################################################################
-  #
-  # Check for the jpeg library
-  #
-
-  USE_EXTERNAL_LIBJPEG=true
-  AC_CHECK_LIB(jpeg, main, [],
-      [ USE_EXTERNAL_LIBJPEG=false
-      AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])
-  ])
-  AC_SUBST(USE_EXTERNAL_LIBJPEG)
-
-  ###############################################################################
-  #
-  # Check for the gif library
-  #
-
-  AC_ARG_WITH(giflib, [AS_HELP_STRING([--with-giflib],
-      [use giflib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
-
-
-  AC_MSG_CHECKING([for which giflib to use])
-
-  # default is bundled
-  DEFAULT_GIFLIB=bundled
-
-  #
-  # if user didn't specify, use DEFAULT_GIFLIB
-  #
-  if test "x${with_giflib}" = "x"; then
-    with_giflib=${DEFAULT_GIFLIB}
-  fi
-
-  AC_MSG_RESULT(${with_giflib})
-
-  if test "x${with_giflib}" = "xbundled"; then
-    USE_EXTERNAL_LIBGIF=false
-  elif test "x${with_giflib}" = "xsystem"; then
-    AC_CHECK_HEADER(gif_lib.h, [],
-        [ AC_MSG_ERROR([--with-giflib=system specified, but gif_lib.h not found!])])
-    AC_CHECK_LIB(gif, DGifGetCode, [],
-        [ AC_MSG_ERROR([--with-giflib=system specified, but no giflib found!])])
-
-    USE_EXTERNAL_LIBGIF=true
-  else
-    AC_MSG_ERROR([Invalid value of --with-giflib: ${with_giflib}, use 'system' or 'bundled'])
-  fi
-  AC_SUBST(USE_EXTERNAL_LIBGIF)
-
-  ###############################################################################
-  #
-  # Check for the zlib library
-  #
-
-  AC_ARG_WITH(zlib, [AS_HELP_STRING([--with-zlib],
-      [use zlib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
-
-  AC_CHECK_LIB(z, compress,
-      [ ZLIB_FOUND=yes ],
-      [ ZLIB_FOUND=no ])
-
-  AC_MSG_CHECKING([for which zlib to use])
-
-  DEFAULT_ZLIB=bundled
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    #
-    # On macosx default is system...on others default is
-    #
-    DEFAULT_ZLIB=system
-  fi
-
-  if test "x${ZLIB_FOUND}" != "xyes"; then
-    #
-    # If we don't find any system...set default to bundled
-    #
-    DEFAULT_ZLIB=bundled
-  fi
-
-  #
-  # If user didn't specify, use DEFAULT_ZLIB
-  #
-  if test "x${with_zlib}" = "x"; then
-    with_zlib=${DEFAULT_ZLIB}
-  fi
-
-  if test "x${with_zlib}" = "xbundled"; then
-    USE_EXTERNAL_LIBZ=false
-    AC_MSG_RESULT([bundled])
-  elif test "x${with_zlib}" = "xsystem"; then
-    if test "x${ZLIB_FOUND}" = "xyes"; then
-      USE_EXTERNAL_LIBZ=true
-      AC_MSG_RESULT([system])
-    else
-      AC_MSG_RESULT([system not found])
-      AC_MSG_ERROR([--with-zlib=system specified, but no zlib found!])
-    fi
-  else
-    AC_MSG_ERROR([Invalid value for --with-zlib: ${with_zlib}, use 'system' or 'bundled'])
-  fi
-
-  AC_SUBST(USE_EXTERNAL_LIBZ)
-
-  ###############################################################################
-  LIBZIP_CAN_USE_MMAP=true
-
-  AC_SUBST(LIBZIP_CAN_USE_MMAP)
-
-  ###############################################################################
-  #
-  # Check if altzone exists in time.h
-  #
-
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <time.h>], [return (int)altzone;])],
-      [has_altzone=yes],
-      [has_altzone=no])
-  if test "x$has_altzone" = xyes; then
-    AC_DEFINE([HAVE_ALTZONE], 1, [Define if you have the external 'altzone' variable in time.h])
-  fi
-
-  ###############################################################################
-  #
-  # Check the maths library
-  #
-
-  AC_CHECK_LIB(m, cos, [],
-      [
-        AC_MSG_NOTICE([Maths library was not found])
-      ]
-  )
-  AC_SUBST(LIBM)
-
-  ###############################################################################
-  #
-  # Check for libdl.so
-
-  save_LIBS="$LIBS"
-  LIBS=""
-  AC_CHECK_LIB(dl,dlopen)
-  LIBDL="$LIBS"
-  AC_SUBST(LIBDL)
-  LIBS="$save_LIBS"
-])
-
-AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
-[
-  ###############################################################################
-  #
-  # statically link libstdc++ before C++ ABI is stablized on Linux unless
-  # dynamic build is configured on command line.
-  #
-  AC_ARG_WITH([stdc++lib], [AS_HELP_STRING([--with-stdc++lib=<static>,<dynamic>,<default>],
-      [force linking of the C++ runtime on Linux to either static or dynamic, default is static with dynamic as fallback])],
-      [
-        if test "x$with_stdc__lib" != xdynamic && test "x$with_stdc__lib" != xstatic \
-                && test "x$with_stdc__lib" != xdefault; then
-          AC_MSG_ERROR([Bad parameter value --with-stdc++lib=$with_stdc__lib!])
-        fi
-      ],
-      [with_stdc__lib=default]
-  )
-
-  if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    # Test if -lstdc++ works.
-    AC_MSG_CHECKING([if dynamic link of stdc++ is possible])
-    AC_LANG_PUSH(C++)
-    OLD_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="$CXXFLAGS -lstdc++"
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
-        [has_dynamic_libstdcxx=yes],
-        [has_dynamic_libstdcxx=no])
-    CXXFLAGS="$OLD_CXXFLAGS"
-    AC_LANG_POP(C++)
-    AC_MSG_RESULT([$has_dynamic_libstdcxx])
-
-    # Test if stdc++ can be linked statically.
-    AC_MSG_CHECKING([if static link of stdc++ is possible])
-    STATIC_STDCXX_FLAGS="-Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic"
-    AC_LANG_PUSH(C++)
-    OLD_LIBS="$LIBS"
-    OLD_CXX="$CXX"
-    LIBS="$STATIC_STDCXX_FLAGS"
-    CXX="$CC"
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
-        [has_static_libstdcxx=yes],
-        [has_static_libstdcxx=no])
-    LIBS="$OLD_LIBS"
-    CXX="$OLD_CXX"
-    AC_LANG_POP(C++)
-    AC_MSG_RESULT([$has_static_libstdcxx])
-
-    if test "x$has_static_libstdcxx" = xno && test "x$has_dynamic_libstdcxx" = xno; then
-      AC_MSG_ERROR([Cannot link to stdc++, neither dynamically nor statically!])
-    fi
-
-    if test "x$with_stdc__lib" = xstatic && test "x$has_static_libstdcxx" = xno; then
-      AC_MSG_ERROR([Static linking of libstdc++ was not possible!])
-    fi
-
-    if test "x$with_stdc__lib" = xdynamic && test "x$has_dynamic_libstdcxx" = xno; then
-      AC_MSG_ERROR([Dynamic linking of libstdc++ was not possible!])
-    fi
-
-    AC_MSG_CHECKING([how to link with libstdc++])
-    # If dynamic was requested, it's available since it would fail above otherwise.
-    # If dynamic wasn't requested, go with static unless it isn't available.
-    if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
-      LIBCXX="$LIBCXX -lstdc++"
-      LDCXX="$CXX"
-      STATIC_CXX_SETTING="STATIC_CXX=false"
-      AC_MSG_RESULT([dynamic])
-    else
-      LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
-      LDCXX="$CC"
-      STATIC_CXX_SETTING="STATIC_CXX=true"
-      AC_MSG_RESULT([static])
-    fi
-  fi
-  AC_SUBST(STATIC_CXX_SETTING)
-
-  if test "x$JVM_VARIANT_ZERO" = xtrue || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
-    # Figure out LIBFFI_CFLAGS and LIBFFI_LIBS
-    PKG_CHECK_MODULES([LIBFFI], [libffi])
-
-  fi
-
-  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
-    AC_CHECK_PROG([LLVM_CONFIG], [llvm-config], [llvm-config])
-
-    if test "x$LLVM_CONFIG" != xllvm-config; then
-      AC_MSG_ERROR([llvm-config not found in $PATH.])
-    fi
-
-    llvm_components="jit mcjit engine nativecodegen native"
-    unset LLVM_CFLAGS
-    for flag in $("$LLVM_CONFIG" --cxxflags); do
-      if echo "${flag}" | grep -q '^-@<:@ID@:>@'; then
-        if test "${flag}" != "-D_DEBUG" ; then
-          if test "${LLVM_CFLAGS}" != "" ; then
-            LLVM_CFLAGS="${LLVM_CFLAGS} "
-          fi
-          LLVM_CFLAGS="${LLVM_CFLAGS}${flag}"
-        fi
-      fi
-    done
-    llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//')
-    LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}"
-
-    unset LLVM_LDFLAGS
-    for flag in $("${LLVM_CONFIG}" --ldflags); do
-      if echo "${flag}" | grep -q '^-L'; then
-        if test "${LLVM_LDFLAGS}" != ""; then
-          LLVM_LDFLAGS="${LLVM_LDFLAGS} "
-        fi
-        LLVM_LDFLAGS="${LLVM_LDFLAGS}${flag}"
-      fi
-    done
-
-    unset LLVM_LIBS
-    for flag in $("${LLVM_CONFIG}" --libs ${llvm_components}); do
-      if echo "${flag}" | grep -q '^-l'; then
-        if test "${LLVM_LIBS}" != ""; then
-          LLVM_LIBS="${LLVM_LIBS} "
-        fi
-        LLVM_LIBS="${LLVM_LIBS}${flag}"
-      fi
-    done
-
-    AC_SUBST(LLVM_CFLAGS)
-    AC_SUBST(LLVM_LDFLAGS)
-    AC_SUBST(LLVM_LIBS)
-  fi
-
-  # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
-  if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x; then
-    LIBCXX="/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
-  fi
-
-  # TODO better (platform agnostic) test
-  if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$GCC" = xyes; then
-    LIBCXX="-lstdc++"
-  fi
-
-  AC_SUBST(LIBCXX)
-])
diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4
deleted file mode 100644
index 344dbfb..0000000
--- a/common/autoconf/platform.m4
+++ /dev/null
@@ -1,548 +0,0 @@
-#
-# Copyright (c) 2011, 2015, 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.
-#
-
-# Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD.
-# Converts autoconf style CPU name to OpenJDK style, into
-# VAR_CPU, VAR_CPU_ARCH, VAR_CPU_BITS and VAR_CPU_ENDIAN.
-AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
-[
-  # First argument is the cpu name from the trip/quad
-  case "$1" in
-    x86_64)
-      VAR_CPU=x86_64
-      VAR_CPU_ARCH=x86
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=little
-      ;;
-    i?86)
-      VAR_CPU=x86
-      VAR_CPU_ARCH=x86
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=little
-      ;;
-    arm*)
-      VAR_CPU=arm
-      VAR_CPU_ARCH=arm
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=little
-      ;;
-    aarch64)
-      VAR_CPU=aarch64
-      VAR_CPU_ARCH=aarch64
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=little
-      ;;
-    powerpc)
-      VAR_CPU=ppc
-      VAR_CPU_ARCH=ppc
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=big
-      ;;
-    powerpc64)
-      VAR_CPU=ppc64
-      VAR_CPU_ARCH=ppc
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=big
-      ;;
-    powerpc64le)
-      VAR_CPU=ppc64
-      VAR_CPU_ARCH=ppc
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=little
-      ;;
-    s390)
-      VAR_CPU=s390
-      VAR_CPU_ARCH=s390
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=big
-      ;;
-    s390x)
-      VAR_CPU=s390x
-      VAR_CPU_ARCH=s390
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=big
-      ;;
-    sparc)
-      VAR_CPU=sparc
-      VAR_CPU_ARCH=sparc
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=big
-      ;;
-    sparcv9|sparc64)
-      VAR_CPU=sparcv9
-      VAR_CPU_ARCH=sparc
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=big
-      ;;
-    *)
-      AC_MSG_ERROR([unsupported cpu $1])
-      ;;
-  esac
-])
-
-# Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD.
-# Converts autoconf style OS name to OpenJDK style, into
-# VAR_OS and VAR_OS_API.
-AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_OS],
-[
-  case "$1" in
-    *linux*)
-      VAR_OS=linux
-      VAR_OS_API=posix
-      VAR_OS_ENV=linux
-      ;;
-    *solaris*)
-      VAR_OS=solaris
-      VAR_OS_API=posix
-      VAR_OS_ENV=solaris
-      ;;
-    *darwin*)
-      VAR_OS=macosx
-      VAR_OS_API=posix
-      VAR_OS_ENV=macosx
-      ;;
-    *bsd*)
-      VAR_OS=bsd
-      VAR_OS_API=posix
-      VAR_OS_ENV=bsd
-      ;;
-    *cygwin*)
-      VAR_OS=windows
-      VAR_OS_API=winapi
-      VAR_OS_ENV=windows.cygwin
-      ;;
-    *mingw*)
-      VAR_OS=windows
-      VAR_OS_API=winapi
-      VAR_OS_ENV=windows.msys
-      ;;
-    *aix*)
-      VAR_OS=aix
-      VAR_OS_API=posix
-      VAR_OS_ENV=aix
-      ;;
-    *)
-      AC_MSG_ERROR([unsupported operating system $1])
-      ;;
-  esac
-])
-
-# Expects $host_os $host_cpu $build_os and $build_cpu
-# and $with_target_bits to have been setup!
-#
-# Translate the standard triplet(quadruplet) definition
-# of the target/build system into OPENJDK_TARGET_OS, OPENJDK_TARGET_CPU,
-# OPENJDK_BUILD_OS, etc.
-AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
-[
-  # Copy the autoconf trip/quadruplet verbatim to OPENJDK_TARGET_AUTOCONF_NAME
-  # (from the autoconf "host") and OPENJDK_BUILD_AUTOCONF_NAME
-  # Note that we might later on rewrite e.g. OPENJDK_TARGET_CPU due to reduced build,
-  # but this will not change the value of OPENJDK_TARGET_AUTOCONF_NAME.
-  OPENJDK_TARGET_AUTOCONF_NAME="$host"
-  OPENJDK_BUILD_AUTOCONF_NAME="$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 variables.
-  PLATFORM_EXTRACT_VARS_FROM_OS($build_os)
-  PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu)
-  # ..and setup our own variables. (Do this explicitely to facilitate searching)
-  OPENJDK_BUILD_OS="$VAR_OS"
-  OPENJDK_BUILD_OS_API="$VAR_OS_API"
-  OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV"
-  OPENJDK_BUILD_CPU="$VAR_CPU"
-  OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
-  OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
-  OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
-  AC_SUBST(OPENJDK_BUILD_OS)
-  AC_SUBST(OPENJDK_BUILD_OS_API)
-  AC_SUBST(OPENJDK_BUILD_CPU)
-  AC_SUBST(OPENJDK_BUILD_CPU_ARCH)
-  AC_SUBST(OPENJDK_BUILD_CPU_BITS)
-  AC_SUBST(OPENJDK_BUILD_CPU_ENDIAN)
-
-  AC_MSG_CHECKING([openjdk-build os-cpu])
-  AC_MSG_RESULT([$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU])
-
-  # 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)
-  # ... and setup our own variables. (Do this explicitely to facilitate searching)
-  OPENJDK_TARGET_OS="$VAR_OS"
-  OPENJDK_TARGET_OS_API="$VAR_OS_API"
-  OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
-  OPENJDK_TARGET_CPU="$VAR_CPU"
-  OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
-  OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
-  OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
-  AC_SUBST(OPENJDK_TARGET_OS)
-  AC_SUBST(OPENJDK_TARGET_OS_API)
-  AC_SUBST(OPENJDK_TARGET_CPU)
-  AC_SUBST(OPENJDK_TARGET_CPU_ARCH)
-  AC_SUBST(OPENJDK_TARGET_CPU_BITS)
-  AC_SUBST(OPENJDK_TARGET_CPU_ENDIAN)
-
-  AC_MSG_CHECKING([openjdk-target os-cpu])
-  AC_MSG_RESULT([$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
-])
-
-# Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour
-# accordingly. Must be done after setting up build and target system, but before
-# doing anything else with these values.
-AC_DEFUN([PLATFORM_SETUP_TARGET_CPU_BITS],
-[
-  AC_ARG_WITH(target-bits, [AS_HELP_STRING([--with-target-bits],
-       [build 32-bit or 64-bit binaries (for platforms that support it), e.g. --with-target-bits=32 @<:@guessed@:>@])])
-
-  # We have three types of compiles:
-  # native  == normal compilation, target system == build system
-  # cross   == traditional cross compilation, target system != build system; special toolchain needed
-  # reduced == using native compilers, but with special flags (e.g. -m32) to produce 32-bit builds on 64-bit machines
-  #
-  if test "x$OPENJDK_BUILD_AUTOCONF_NAME" != "x$OPENJDK_TARGET_AUTOCONF_NAME"; then
-    # We're doing a proper cross-compilation
-    COMPILE_TYPE="cross"
-  else
-    COMPILE_TYPE="native"
-  fi
-
-  if test "x$with_target_bits" != x; then
-    if test "x$COMPILE_TYPE" = "xcross"; then
-      AC_MSG_ERROR([It is not possible to combine --with-target-bits=X and proper cross-compilation. Choose either.])
-    fi
-
-    if test "x$with_target_bits" = x32 && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-      # A reduced build is requested
-      COMPILE_TYPE="reduced"
-      OPENJDK_TARGET_CPU_BITS=32
-      if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86"; then
-        OPENJDK_TARGET_CPU=x86
-      elif test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then
-        OPENJDK_TARGET_CPU=sparc
-      else
-        AC_MSG_ERROR([Reduced build (--with-target-bits=32) is only supported on x86_64 and sparcv9])
-      fi
-    elif test "x$with_target_bits" = x64 && test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-      AC_MSG_ERROR([It is not possible to use --with-target-bits=64 on a 32 bit system. Use proper cross-compilation instead.])
-    elif test "x$with_target_bits" = "x$OPENJDK_TARGET_CPU_BITS"; then
-      AC_MSG_NOTICE([--with-target-bits are set to build platform address size; argument has no meaning])
-    else
-      AC_MSG_ERROR([--with-target-bits can only be 32 or 64, you specified $with_target_bits!])
-    fi
-  fi
-  AC_SUBST(COMPILE_TYPE)
-
-  AC_MSG_CHECKING([compilation type])
-  AC_MSG_RESULT([$COMPILE_TYPE])
-])
-
-# Setup the legacy variables, for controlling the old makefiles.
-#
-AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS],
-[
-  # Also store the legacy naming of the cpu.
-  # Ie i586 and amd64 instead of x86 and x86_64
-  OPENJDK_TARGET_CPU_LEGACY="$OPENJDK_TARGET_CPU"
-  if test "x$OPENJDK_TARGET_CPU" = xx86; then
-    OPENJDK_TARGET_CPU_LEGACY="i586"
-  elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-    # On all platforms except MacOSX replace x86_64 with amd64.
-    OPENJDK_TARGET_CPU_LEGACY="amd64"
-  fi
-  AC_SUBST(OPENJDK_TARGET_CPU_LEGACY)
-
-  # And the second legacy naming of the cpu.
-  # Ie i386 and amd64 instead of x86 and x86_64.
-  OPENJDK_TARGET_CPU_LEGACY_LIB="$OPENJDK_TARGET_CPU"
-  if test "x$OPENJDK_TARGET_CPU" = xx86; then
-    OPENJDK_TARGET_CPU_LEGACY_LIB="i386"
-  elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-    OPENJDK_TARGET_CPU_LEGACY_LIB="amd64"
-  fi
-  AC_SUBST(OPENJDK_TARGET_CPU_LEGACY_LIB)
-
-  # This is the name of the cpu (but using i386 and amd64 instead of
-  # x86 and x86_64, respectively), preceeded by a /, to be used when
-  # locating libraries. On macosx, it's empty, though.
-  OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB"
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    OPENJDK_TARGET_CPU_LIBDIR=""
-  fi
-  AC_SUBST(OPENJDK_TARGET_CPU_LIBDIR)
-
-  # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
-  # /amd64 or /sparcv9. This string is appended to some library paths, like this:
-  # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so
-  OPENJDK_TARGET_CPU_ISADIR=""
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-      OPENJDK_TARGET_CPU_ISADIR="/amd64"
-    elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then
-      OPENJDK_TARGET_CPU_ISADIR="/sparcv9"
-    fi
-  fi
-  AC_SUBST(OPENJDK_TARGET_CPU_ISADIR)
-
-  # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
-  OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
-  if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then
-    # On linux only, we replace x86 with i386.
-    OPENJDK_TARGET_CPU_OSARCH="i386"
-  elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-    # On all platforms except macosx, we replace x86_64 with amd64.
-    OPENJDK_TARGET_CPU_OSARCH="amd64"
-  fi
-  AC_SUBST(OPENJDK_TARGET_CPU_OSARCH)
-
-  OPENJDK_TARGET_CPU_JLI="$OPENJDK_TARGET_CPU"
-  if test "x$OPENJDK_TARGET_CPU" = xx86; then
-    OPENJDK_TARGET_CPU_JLI="i386"
-  elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-    # On all platforms except macosx, we replace x86_64 with amd64.
-    OPENJDK_TARGET_CPU_JLI="amd64"
-  fi
-  # Now setup the -D flags for building libjli.
-  OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
-      OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
-    elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
-      OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
-    fi
-  fi
-  AC_SUBST(OPENJDK_TARGET_CPU_JLI_CFLAGS)
-
-  # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
-  if test "x$OPENJDK_TARGET_OS_API" = xposix; then
-    OPENJDK_TARGET_OS_API_DIR="solaris"
-  fi
-  if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
-    OPENJDK_TARGET_OS_API_DIR="windows"
-  fi
-  AC_SUBST(OPENJDK_TARGET_OS_API_DIR)
-
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-      OPENJDK_TARGET_OS_EXPORT_DIR=macosx
-  else
-      OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_API_DIR}
-  fi
-  AC_SUBST(OPENJDK_TARGET_OS_EXPORT_DIR)
-
-  if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-    A_LP64="LP64:="
-    # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
-    # unpack200.exe
-    if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then
-      ADD_LP64="-D_LP64=1"
-    fi
-  fi
-  AC_SUBST(LP64,$A_LP64)
-
-  if test "x$COMPILE_TYPE" = "xcross"; then
-    # FIXME: ... or should this include reduced builds..?
-    DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY"
-  else
-    DEFINE_CROSS_COMPILE_ARCH=""
-  fi
-  AC_SUBST(DEFINE_CROSS_COMPILE_ARCH)
-
-  # ZERO_ARCHDEF is used to enable architecture-specific code
-  case "${OPENJDK_TARGET_CPU}" in
-    ppc)     ZERO_ARCHDEF=PPC32 ;;
-    ppc64)   ZERO_ARCHDEF=PPC64 ;;
-    s390*)   ZERO_ARCHDEF=S390  ;;
-    sparc*)  ZERO_ARCHDEF=SPARC ;;
-    x86_64*) ZERO_ARCHDEF=AMD64 ;;
-    x86)     ZERO_ARCHDEF=IA32  ;;
-    *)      ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
-  esac
-  AC_SUBST(ZERO_ARCHDEF)
-])
-
-AC_DEFUN([PLATFORM_SET_RELEASE_FILE_OS_VALUES],
-[
-  if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
-    REQUIRED_OS_NAME=SunOS
-    REQUIRED_OS_VERSION=5.10
-  fi
-  if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
-    REQUIRED_OS_NAME=Linux
-    REQUIRED_OS_VERSION=2.6
-  fi
-  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    REQUIRED_OS_NAME=Windows
-    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
-      REQUIRED_OS_VERSION=5.2
-    else
-      REQUIRED_OS_VERSION=5.1
-    fi
-  fi
-  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-    REQUIRED_OS_NAME=Darwin
-    REQUIRED_OS_VERSION=11.2
-  fi
-
-  AC_SUBST(REQUIRED_OS_NAME)
-  AC_SUBST(REQUIRED_OS_VERSION)
-])
-
-#%%% Build and target systems %%%
-AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET],
-[
-  # Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
-  # is confusing; it assumes you are cross-compiling a cross-compiler (!)  and "target" is thus the target of the
-  # product you're building. The target of this build is called "host". Since this is confusing to most people, we
-  # have not adopted that system, but use "target" as the platform we are building for. In some places though we need
-  # to use the configure naming style.
-  AC_CANONICAL_BUILD
-  AC_CANONICAL_HOST
-  AC_CANONICAL_TARGET
-
-  PLATFORM_EXTRACT_TARGET_AND_BUILD
-  PLATFORM_SETUP_TARGET_CPU_BITS
-  PLATFORM_SET_RELEASE_FILE_OS_VALUES
-  PLATFORM_SETUP_LEGACY_VARS
-])
-
-AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],
-[
-  ###############################################################################
-
-  # Note that this is the build platform OS version!
-
-  OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`"
-  OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`"
-  OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`"
-  OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`"
-  AC_SUBST(OS_VERSION_MAJOR)
-  AC_SUBST(OS_VERSION_MINOR)
-  AC_SUBST(OS_VERSION_MICRO)
-])
-
-# Support macro for PLATFORM_SETUP_OPENJDK_TARGET_BITS.
-# Add -mX to various FLAGS variables.
-AC_DEFUN([PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS],
-[
-  # When we add flags to the "official" CFLAGS etc, we need to
-  # keep track of these additions in ADDED_CFLAGS etc. These
-  # will later be checked to make sure only controlled additions
-  # have been made to CFLAGS etc.
-  ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-
-  CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
-  CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
-  LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
-
-  CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
-  CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
-  LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
-])
-
-AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_BITS],
-[
-  ###############################################################################
-  #
-  # Now we check if libjvm.so will use 32 or 64 bit pointers for the C/C++ code.
-  # (The JVM can use 32 or 64 bit Java pointers but that decision
-  # is made at runtime.)
-  #
-
-  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xaix; then
-    # Always specify -m flag on Solaris
-    # And -q on AIX because otherwise the compiler produces 32-bit objects by default
-    PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS
-  elif test "x$COMPILE_TYPE" = xreduced; then
-    if test "x$OPENJDK_TARGET_OS" != xwindows; then
-      # Specify -m if running reduced on other Posix platforms
-      PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS
-    fi
-  fi
-
-  # Make compilation sanity check
-  AC_CHECK_HEADERS([stdio.h], , [
-    AC_MSG_NOTICE([Failed to compile stdio.h. This likely implies missing compile dependencies.])
-    if test "x$COMPILE_TYPE" = xreduced; then
-      AC_MSG_NOTICE([You are doing a reduced build. Check that you have 32-bit libraries installed.])
-    elif test "x$COMPILE_TYPE" = xcross; then
-      AC_MSG_NOTICE([You are doing a cross-compilation. Check that you have all target platform libraries installed.])
-    fi
-    AC_MSG_ERROR([Cannot continue.])
-  ])
-
-  AC_CHECK_SIZEOF([int *], [1111])
-
-  # AC_CHECK_SIZEOF defines 'ac_cv_sizeof_int_p' to hold the number of bytes used by an 'int*'
-  if test "x$ac_cv_sizeof_int_p" = x; then
-    # The test failed, lets stick to the assumed value.
-    AC_MSG_WARN([The number of bits in the target could not be determined, using $OPENJDK_TARGET_CPU_BITS.])
-  else
-    TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p`
-
-    if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then
-      # This situation may happen on 64-bit platforms where the compiler by default only generates 32-bit objects
-      # Let's try to implicitely set the compilers target architecture and retry the test
-      AC_MSG_NOTICE([The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS).])
-      AC_MSG_NOTICE([I'll retry after setting the platforms compiler target bits flag to ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}])
-      PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS
-
-      # We have to unset 'ac_cv_sizeof_int_p' first, otherwise AC_CHECK_SIZEOF will use the previously cached value!
-      unset ac_cv_sizeof_int_p
-      # And we have to undef the definition of SIZEOF_INT_P in confdefs.h by the previous invocation of AC_CHECK_SIZEOF
-      cat >>confdefs.h <<_ACEOF
-#undef SIZEOF_INT_P
-_ACEOF
-
-      AC_CHECK_SIZEOF([int *], [1111])
-
-      TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p`
-
-      if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then
-        AC_MSG_ERROR([The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)])
-      fi
-    fi
-  fi
-
-  AC_MSG_CHECKING([for target address size])
-  AC_MSG_RESULT([$OPENJDK_TARGET_CPU_BITS bits])
-])
-
-AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS],
-[
-  ###############################################################################
-  #
-  # Is the target little of big endian?
-  #
-  AC_C_BIGENDIAN([ENDIAN="big"],[ENDIAN="little"],[ENDIAN="unknown"],[ENDIAN="universal_endianness"])
-
-  if test "x$ENDIAN" = xuniversal_endianness; then
-    AC_MSG_ERROR([Building with both big and little endianness is not supported])
-  fi
-  if test "x$ENDIAN" != "x$OPENJDK_TARGET_CPU_ENDIAN"; then
-    AC_MSG_ERROR([The tested endian in the target ($ENDIAN) differs from the endian expected to be found in the target ($OPENJDK_TARGET_CPU_ENDIAN)])
-  fi
-])
diff --git a/common/autoconf/source-dirs.m4 b/common/autoconf/source-dirs.m4
deleted file mode 100644
index bd1d4f4..0000000
--- a/common/autoconf/source-dirs.m4
+++ /dev/null
@@ -1,283 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-AC_DEFUN_ONCE([SRCDIRS_SETUP_TOPDIRS],
-[
-  # Where are the sources. Any of these can be overridden
-  # using --with-override-corba and the likes.
-  LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
-  CORBA_TOPDIR="$SRC_ROOT/corba"
-  JAXP_TOPDIR="$SRC_ROOT/jaxp"
-  JAXWS_TOPDIR="$SRC_ROOT/jaxws"
-  HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
-  NASHORN_TOPDIR="$SRC_ROOT/nashorn"
-  JDK_TOPDIR="$SRC_ROOT/jdk"
-  AC_SUBST(LANGTOOLS_TOPDIR)
-  AC_SUBST(CORBA_TOPDIR)
-  AC_SUBST(JAXP_TOPDIR)
-  AC_SUBST(JAXWS_TOPDIR)
-  AC_SUBST(HOTSPOT_TOPDIR)
-  AC_SUBST(NASHORN_TOPDIR)
-  AC_SUBST(JDK_TOPDIR)
-])
-
-
-AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
-[
-
-  ###############################################################################
-  #
-  # Pickup additional source for a component from outside of the source root
-  # or override source for a component.
-  #
-  AC_ARG_WITH(add-source-root, [AS_HELP_STRING([--with-add-source-root],
-      [for each and every source directory, look in this additional source root for
-      the same directory; if it exists and have files in it, include it in the build])])
-
-  AC_ARG_WITH(override-source-root, [AS_HELP_STRING([--with-override-source-root],
-      [for each and every source directory, look in this override source root for
-      the same directory; if it exists, use that directory instead and
-      ignore the directory in the original source root])])
-
-  AC_ARG_WITH(adds-and-overrides, [AS_HELP_STRING([--with-adds-and-overrides],
-      [use the subdirs 'adds' and 'overrides' in the specified directory as
-      add-source-root and override-source-root])])
-
-  if test "x$with_adds_and_overrides" != x; then
-    with_add_source_root="$with_adds_and_overrides/adds"
-    with_override_source_root="$with_adds_and_overrides/overrides"
-  fi
-
-  if test "x$with_add_source_root" != x; then
-    if ! test -d $with_add_source_root; then
-      AC_MSG_ERROR([Trying to use a non-existant add-source-root $with_add_source_root])
-    fi
-    CURDIR="$PWD"
-    cd "$with_add_source_root"
-    ADD_SRC_ROOT="`pwd`"
-    cd "$CURDIR"
-    # Verify that the addon source root does not have any root makefiles.
-    # If it does, then it is usually an error, prevent this.
-    if test -f $with_add_source_root/langtools/make/Makefile; then
-      AC_MSG_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.])
-    fi
-    if test -f $with_add_source_root/corba/make/Makefile; then
-      AC_MSG_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.])
-    fi
-    if test -f $with_add_source_root/jaxp/make/Makefile; then
-      AC_MSG_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.])
-    fi
-    if test -f $with_add_source_root/jaxws/make/Makefile; then
-      AC_MSG_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.])
-    fi
-    if test -f $with_add_source_root/hotspot/make/Makefile; then
-      AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.])
-    fi
-    if test -f $with_add_source_root/nashorn/make/Makefile; then
-      AC_MSG_ERROR([Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources.])
-    fi
-    if test -f $with_add_source_root/jdk/make/Makefile; then
-      AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.])
-    fi
-  fi
-  AC_SUBST(ADD_SRC_ROOT)
-
-  if test "x$with_override_source_root" != x; then
-    if ! test -d $with_override_source_root; then
-      AC_MSG_ERROR([Trying to use a non-existant override-source-root $with_override_source_root])
-    fi
-    CURDIR="$PWD"
-    cd "$with_override_source_root"
-    OVERRIDE_SRC_ROOT="`pwd`"
-    cd "$CURDIR"
-    if test -f $with_override_source_root/langtools/make/Makefile; then
-      AC_MSG_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.])
-    fi
-    if test -f $with_override_source_root/corba/make/Makefile; then
-      AC_MSG_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.])
-    fi
-    if test -f $with_override_source_root/jaxp/make/Makefile; then
-      AC_MSG_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.])
-    fi
-    if test -f $with_override_source_root/jaxws/make/Makefile; then
-      AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.])
-    fi
-    if test -f $with_override_source_root/hotspot/make/Makefile; then
-      AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.])
-    fi
-    if test -f $with_override_source_root/nashorn/make/Makefile; then
-      AC_MSG_ERROR([Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override.])
-    fi
-    if test -f $with_override_source_root/jdk/make/Makefile; then
-      AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.])
-    fi
-  fi
-  AC_SUBST(OVERRIDE_SRC_ROOT)
-
-  ###############################################################################
-  #
-  # Override a repo completely, this is used for example when you have 3 small
-  # development sandboxes of the langtools sources and want to avoid having 3 full
-  # OpenJDK sources checked out on disk.
-  #
-  # Assuming that the 3 langtools sandboxes are located here:
-  # /home/fredrik/sandbox1/langtools
-  # /home/fredrik/sandbox2/langtools
-  # /home/fredrik/sandbox3/langtools
-  #
-  # From the source root you create build subdirs manually:
-  #     mkdir -p build1 build2 build3
-  # in each build directory run:
-  #     (cd build1 && ../configure --with-override-langtools=/home/fredrik/sandbox1 && make)
-  #     (cd build2 && ../configure --with-override-langtools=/home/fredrik/sandbox2 && make)
-  #     (cd build3 && ../configure --with-override-langtools=/home/fredrik/sandbox3 && make)
-  #
-
-  AC_ARG_WITH(override-langtools, [AS_HELP_STRING([--with-override-langtools],
-      [use this langtools dir for the build])])
-
-  AC_ARG_WITH(override-corba, [AS_HELP_STRING([--with-override-corba],
-      [use this corba dir for the build])])
-
-  AC_ARG_WITH(override-jaxp, [AS_HELP_STRING([--with-override-jaxp],
-      [use this jaxp dir for the build])])
-
-  AC_ARG_WITH(override-jaxws, [AS_HELP_STRING([--with-override-jaxws],
-      [use this jaxws dir for the build])])
-
-  AC_ARG_WITH(override-hotspot, [AS_HELP_STRING([--with-override-hotspot],
-      [use this hotspot dir for the build])])
-
-  AC_ARG_WITH(override-nashorn, [AS_HELP_STRING([--with-override-nashorn],
-      [use this nashorn dir for the build])])
-
-  AC_ARG_WITH(override-jdk, [AS_HELP_STRING([--with-override-jdk],
-      [use this jdk dir for the build])])
-
-  if test "x$with_override_langtools" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_langtools"
-    LANGTOOLS_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
-      AC_MSG_ERROR([You have to override langtools with a full langtools repo!])
-    fi
-    AC_MSG_CHECKING([if langtools should be overridden])
-    AC_MSG_RESULT([yes with $LANGTOOLS_TOPDIR])
-  fi
-  if test "x$with_override_corba" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_corba"
-    CORBA_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $CORBA_TOPDIR/make/Makefile; then
-      AC_MSG_ERROR([You have to override corba with a full corba repo!])
-    fi
-    AC_MSG_CHECKING([if corba should be overridden])
-    AC_MSG_RESULT([yes with $CORBA_TOPDIR])
-  fi
-  if test "x$with_override_jaxp" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_jaxp"
-    JAXP_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $JAXP_TOPDIR/make/Makefile; then
-      AC_MSG_ERROR([You have to override jaxp with a full jaxp repo!])
-    fi
-    AC_MSG_CHECKING([if jaxp should be overridden])
-    AC_MSG_RESULT([yes with $JAXP_TOPDIR])
-  fi
-  if test "x$with_override_jaxws" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_jaxws"
-    JAXWS_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $JAXWS_TOPDIR/make/Makefile; then
-      AC_MSG_ERROR([You have to override jaxws with a full jaxws repo!])
-    fi
-    AC_MSG_CHECKING([if jaxws should be overridden])
-    AC_MSG_RESULT([yes with $JAXWS_TOPDIR])
-  fi
-  if test "x$with_override_hotspot" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_hotspot"
-    HOTSPOT_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
-      AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!])
-    fi
-    AC_MSG_CHECKING([if hotspot should be overridden])
-    AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR])
-  fi
-  if test "x$with_override_nashorn" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_nashorn"
-    NASHORN_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $NASHORN_TOPDIR/make/Makefile; then
-      AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!])
-    fi
-    AC_MSG_CHECKING([if nashorn should be overridden])
-    AC_MSG_RESULT([yes with $NASHORN_TOPDIR])
-  fi
-  if test "x$with_override_jdk" != x; then
-    CURDIR="$PWD"
-    cd "$with_override_jdk"
-    JDK_TOPDIR="`pwd`"
-    cd "$CURDIR"
-    if ! test -f $JDK_TOPDIR/make/Makefile; then
-      AC_MSG_ERROR([You have to override JDK with a full JDK repo!])
-    fi
-    AC_MSG_CHECKING([if JDK should be overridden])
-    AC_MSG_RESULT([yes with $JDK_TOPDIR])
-  fi
-])
-
-AC_DEFUN_ONCE([SRCDIRS_SETUP_OUTPUT_DIRS],
-[
-  BUILD_OUTPUT="$OUTPUT_ROOT"
-  AC_SUBST(BUILD_OUTPUT)
-
-  HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
-  BUILD_HOTSPOT=true
-  AC_SUBST(HOTSPOT_DIST)
-  AC_SUBST(BUILD_HOTSPOT)
-  AC_ARG_WITH(import-hotspot, [AS_HELP_STRING([--with-import-hotspot],
-  [import hotspot binaries from this jdk image or hotspot build dist dir instead of building from source])])
-  if test "x$with_import_hotspot" != x; then
-    CURDIR="$PWD"
-    cd "$with_import_hotspot"
-    HOTSPOT_DIST="`pwd`"
-    cd "$CURDIR"
-    if ! (test -d $HOTSPOT_DIST/lib && test -d $HOTSPOT_DIST/jre/lib); then
-      AC_MSG_ERROR([You have to import hotspot from a full jdk image or hotspot build dist dir!])
-    fi
-    AC_MSG_CHECKING([if hotspot should be imported])
-    AC_MSG_RESULT([yes from $HOTSPOT_DIST])
-    BUILD_HOTSPOT=false
-  fi
-
-  JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
-])
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
deleted file mode 100644
index 1c418f2..0000000
--- a/common/autoconf/spec.gmk.in
+++ /dev/null
@@ -1,687 +0,0 @@
-#
-# Copyright (c) 2011, 2015, 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.
-#
-
-# Configured @DATE_WHEN_CONFIGURED@ to build
-# for target system @OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU@
-#   (called @OPENJDK_TARGET_AUTOCONF_NAME@ by autoconf)
-# on build system @OPENJDK_BUILD_OS@-@OPENJDK_BUILD_CPU@
-#   (called @OPENJDK_BUILD_AUTOCONF_NAME@ by autoconf)
-# using 'configure @CONFIGURE_COMMAND_LINE@'
-
-# When calling macros, the spaces between arguments are
-# often semantically important! Sometimes we need to subst
-# spaces and commas, therefore we need the following macros.
-X:=
-SPACE:=$(X) $(X)
-COMMA:=,
-HASH:=\#
-SQUOTE:='
-#'
-DQUOTE:="
-#"
-define NEWLINE
-
-
-endef
-
-# A self-referential reference to this file.
-SPEC:=@SPEC@
-
-# Specify where the spec file is.
-MAKE_ARGS="SPEC=$(SPEC)"
-
-MAKE:=@MAKE@
-
-# Pass along the verbosity and log level settings.
-ifeq (,$(findstring VERBOSE=,$(MAKE)))
-  MAKE:=$(MAKE) $(VERBOSE) VERBOSE="$(VERBOSE)" LOG_LEVEL="$(LOG_LEVEL)"
-endif
-
-# No implicit variables or rules!
-ifeq (,$(findstring -R,$(MAKE)))
-  MAKE:=$(MAKE) -R
-endif
-
-# Specify where the common include directory for makefiles is.
-ifeq (,$(findstring -I @SRC_ROOT@/make/common,$(MAKE)))
-  MAKE:=$(MAKE) -I @SRC_ROOT@/make/common
-endif
-
-# The "human readable" name of this configuration
-CONF_NAME:=@CONF_NAME@
-
-# The built jdk will run in this target system.
-OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
-OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@
-OPENJDK_TARGET_OS_ENV:=@OPENJDK_TARGET_OS_ENV@
-
-OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@
-OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@
-OPENJDK_TARGET_CPU_BITS:=@OPENJDK_TARGET_CPU_BITS@
-OPENJDK_TARGET_CPU_ENDIAN:=@OPENJDK_TARGET_CPU_ENDIAN@
-
-COMPILE_TYPE:=@COMPILE_TYPE@
-
-# Legacy support
-OPENJDK_TARGET_CPU_ISADIR:=@OPENJDK_TARGET_CPU_ISADIR@
-OPENJDK_TARGET_CPU_LIBDIR:=@OPENJDK_TARGET_CPU_LIBDIR@
-OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
-OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
-OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
-OPENJDK_TARGET_CPU_JLI_CFLAGS:=@OPENJDK_TARGET_CPU_JLI_CFLAGS@
-OPENJDK_TARGET_OS_API_DIR:=@OPENJDK_TARGET_OS_API_DIR@
-OPENJDK_TARGET_OS_EXPORT_DIR:=@OPENJDK_TARGET_OS_EXPORT_DIR@
-
-# We are building on this build system.
-# When not cross-compiling, it is the same as the target.
-OPENJDK_BUILD_OS:=@OPENJDK_BUILD_OS@
-OPENJDK_BUILD_OS_API:=@OPENJDK_BUILD_OS_API@
-
-OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@
-OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
-OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
-OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
-
-# Legacy OS values for use in release file.
-REQUIRED_OS_NAME:=@REQUIRED_OS_NAME@
-REQUIRED_OS_VERSION:=@REQUIRED_OS_VERSION@
-
-@SET_OPENJDK@
-LIBM:=-lm
-LIBDL:=@LIBDL@
-
-# colon or semicolon
-PATH_SEP:=@PATH_SEP@
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  # On Windows, the Visual Studio toolchain needs the LIB and INCLUDE
-  # environment variables (in Windows path style), and the PATH needs to
-  # be adjusted to include Visual Studio tools (but this needs to be in
-  # cygwin/msys style).
-  export PATH:=@VS_PATH@
-  export INCLUDE:=@VS_INCLUDE@
-  export LIB:=@VS_LIB@
-endif
-
-# The sys root where standard headers and libraries are found.
-# Usually not needed since the configure script should have
-# taken it into account already when setting CFLAGS et al.
-SYS_ROOT:=@SYS_ROOT@
-
-# Paths to the source code
-SRC_ROOT:=@SRC_ROOT@
-ADD_SRC_ROOT:=@ADD_SRC_ROOT@
-OVERRIDE_SRC_ROOT:=@OVERRIDE_SRC_ROOT@
-TOPDIR:=@SRC_ROOT@
-OUTPUT_ROOT:=@OUTPUT_ROOT@
-JDK_TOPDIR:=@JDK_TOPDIR@
-LANGTOOLS_TOPDIR:=@LANGTOOLS_TOPDIR@
-CORBA_TOPDIR:=@CORBA_TOPDIR@
-JAXP_TOPDIR:=@JAXP_TOPDIR@
-JAXWS_TOPDIR:=@JAXWS_TOPDIR@
-HOTSPOT_TOPDIR:=@HOTSPOT_TOPDIR@
-NASHORN_TOPDIR:=@NASHORN_TOPDIR@
-COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@
-
-# Location where build customization files may be found
-CUSTOM_MAKE_DIR:=@CUSTOM_MAKE_DIR@
-
-# Information gathered from the version.numbers file.
-JDK_MAJOR_VERSION:=@JDK_MAJOR_VERSION@
-JDK_MINOR_VERSION:=@JDK_MINOR_VERSION@
-JDK_MICRO_VERSION:=@JDK_MICRO_VERSION@
-JDK_UPDATE_VERSION:=@JDK_UPDATE_VERSION@
-JDK_BUILD_NUMBER:=@JDK_BUILD_NUMBER@
-MILESTONE:=@MILESTONE@
-LAUNCHER_NAME:=@LAUNCHER_NAME@
-PRODUCT_NAME:=@PRODUCT_NAME@
-PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
-JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
-COMPANY_NAME:=@COMPANY_NAME@
-MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
-MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
-USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@
-
-# Different version strings generated from the above information.
-JDK_VERSION:=@JDK_VERSION@
-RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
-COOKED_JDK_UPDATE_VERSION:=@COOKED_JDK_UPDATE_VERSION@
-COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
-# These variables need to be generated here so that MILESTONE and
-# JDK_BUILD_NUMBER can be overridden on the make command line.
-ifeq ($(MILESTONE), fcs)
-  RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
-else
-  RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
-endif
-
-ifneq ($(USER_RELEASE_SUFFIX), )
-  FULL_VERSION=$(RELEASE)-$(USER_RELEASE_SUFFIX)-$(JDK_BUILD_NUMBER)
-else
-  FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER)
-endif
-JRE_RELEASE_VERSION:=$(FULL_VERSION)
-
-# How to compile the code: release, fastdebug or slowdebug
-DEBUG_LEVEL:=@DEBUG_LEVEL@
-
-# This is the JDK variant to build.
-# The JDK variant is a name for a specific set of modules to be compiled for the JDK.
-JDK_VARIANT:=@JDK_VARIANT@
-
-# Should we compile support for running with a graphical UI? (ie headful)
-# Should we compile support for running without? (ie headless)
-SUPPORT_HEADFUL:=@SUPPORT_HEADFUL@
-SUPPORT_HEADLESS:=@SUPPORT_HEADLESS@
-# Legacy defines controlled by the SUPPORT_HEADLESS and SUPPORT_HEADFUL options.
-@BUILD_HEADLESS@
-
-# These are the libjvms that we want to build.
-# The java launcher uses the default.
-# The others can be selected by specifying -client -server -minimal1 -kernel -zero or -zeroshark
-# on the java launcher command line.
-JVM_VARIANTS:=@JVM_VARIANTS@
-JVM_VARIANT_SERVER:=@JVM_VARIANT_SERVER@
-JVM_VARIANT_CLIENT:=@JVM_VARIANT_CLIENT@
-JVM_VARIANT_MINIMAL1:=@JVM_VARIANT_MINIMAL1@
-JVM_VARIANT_KERNEL:=@JVM_VARIANT_KERNEL@
-JVM_VARIANT_ZERO:=@JVM_VARIANT_ZERO@
-JVM_VARIANT_ZEROSHARK:=@JVM_VARIANT_ZEROSHARK@
-JVM_VARIANT_CORE:=@JVM_VARIANT_CORE@
-
-# Universal binaries on macosx
-MACOSX_UNIVERSAL=@MACOSX_UNIVERSAL@
-
-# Legacy setting: -debug or -fastdebug
-# Still used in version string...
-BUILD_VARIANT_RELEASE:=@BUILD_VARIANT_RELEASE@
-
-# JDK_OUTPUTDIR specifies where a working jvm is built.
-# You can run $(JDK_OUTPUTDIR)/bin/java
-# Though the layout of the contents of $(JDK_OUTPUTDIR) is not
-# yet the same as a default installation.
-#
-# When you run "make install" it will create the standardized
-# layout for the jdk and the jre inside the IMAGES_OUTPUTDIR subdir.
-# Then it will copy the contents of the jdk into the installation
-# directory.
-
-BUILD_OUTPUT:=@BUILD_OUTPUT@
-# Colon left out to be able to override IMAGES_OUTPUTDIR for bootcycle-images
-LANGTOOLS_OUTPUTDIR=$(BUILD_OUTPUT)/langtools
-CORBA_OUTPUTDIR=$(BUILD_OUTPUT)/corba
-JAXP_OUTPUTDIR=$(BUILD_OUTPUT)/jaxp
-JAXWS_OUTPUTDIR=$(BUILD_OUTPUT)/jaxws
-HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot
-JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
-NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn
-IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
-
-LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist
-CORBA_DIST=$(CORBA_OUTPUTDIR)/dist
-JAXP_DIST=$(JAXP_OUTPUTDIR)/dist
-JAXWS_DIST=$(JAXWS_OUTPUTDIR)/dist
-HOTSPOT_DIST=@HOTSPOT_DIST@
-NASHORN_DIST=$(NASHORN_OUTPUTDIR)/dist
-
-BUILD_HOTSPOT=@BUILD_HOTSPOT@
-
-# The boot jdk to use
-BOOT_JDK:=@BOOT_JDK@
-BOOT_RTJAR:=@BOOT_RTJAR@
-BOOT_TOOLSJAR=$(BOOT_JDK)/lib/tools.jar
-
-# When compiling Java source to be run by the boot jdk
-# use these extra flags, eg -source 6 -target 6
-BOOT_JDK_SOURCETARGET:=@BOOT_JDK_SOURCETARGET@
-
-# Information about the build system
-NUM_CORES:=@NUM_CORES@
-# Enable sjavac support = use a javac server,
-# multi core javac compilation and dependency tracking.
-ENABLE_SJAVAC:=@ENABLE_SJAVAC@
-# Store sjavac server synchronization files here, and
-# the sjavac server log files.
-SJAVAC_SERVER_DIR:=@SJAVAC_SERVER_DIR@
-
-# Number of parallel jobs to use for compilation
-JOBS?=@JOBS@
-
-FREETYPE_LIBS:=@FREETYPE_LIBS@
-FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
-FREETYPE_BUNDLE_LIB_PATH=@FREETYPE_BUNDLE_LIB_PATH@
-CUPS_CFLAGS:=@CUPS_CFLAGS@
-ALSA_LIBS:=@ALSA_LIBS@
-ALSA_CFLAGS:=@ALSA_CFLAGS@
-
-PACKAGE_PATH=@PACKAGE_PATH@
-
-# Source file for cacerts
-CACERTS_FILE=@CACERTS_FILE@
-
-# Enable unlimited crypto policy
-UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
-
-# Necessary additional compiler flags to compile X11
-X_CFLAGS:=@X_CFLAGS@
-X_LIBS:=@X_LIBS@
-OPENWIN_HOME:=@OPENWIN_HOME@
-
-# The lowest required version of macosx to enforce compatiblity for
-MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
-
-# There are two types: CC or CL
-# CC is gcc and others behaving reasonably similar.
-# CL is cl.exe only.
-COMPILER_TYPE:=@COMPILER_TYPE@
-COMPILER_NAME:=@COMPILER_NAME@
-
-# Option used to tell the compiler whether to create 32- or 64-bit executables
-COMPILER_TARGET_BITS_FLAG:=@COMPILER_TARGET_BITS_FLAG@
-COMPILER_SUPPORTS_TARGET_BITS_FLAG=@COMPILER_SUPPORTS_TARGET_BITS_FLAG@
-
-CC_OUT_OPTION:=@CC_OUT_OPTION@
-EXE_OUT_OPTION:=@EXE_OUT_OPTION@
-LD_OUT_OPTION:=@LD_OUT_OPTION@
-AR_OUT_OPTION:=@AR_OUT_OPTION@
-
-# Flags used for overriding the default opt setting for a C/C++ source file.
-C_O_FLAG_HIGHEST:=@C_O_FLAG_HIGHEST@
-C_O_FLAG_HI:=@C_O_FLAG_HI@
-C_O_FLAG_NORM:=@C_O_FLAG_NORM@
-C_O_FLAG_NONE:=@C_O_FLAG_NONE@
-CXX_O_FLAG_HIGHEST:=@CXX_O_FLAG_HIGHEST@
-CXX_O_FLAG_HI:=@CXX_O_FLAG_HI@
-CXX_O_FLAG_NORM:=@CXX_O_FLAG_NORM@
-CXX_O_FLAG_NONE:=@CXX_O_FLAG_NONE@
-
-C_FLAG_DEPS:=@C_FLAG_DEPS@
-CXX_FLAG_DEPS:=@CXX_FLAG_DEPS@
-
-# Tools that potentially need to be cross compilation aware.
-CC:=@FIXPATH@ @CCACHE@ @CC@
-
-# CFLAGS used to compile the jdk native libraries (C-code)
-CFLAGS_JDKLIB:=@CFLAGS_JDKLIB@
-CXXFLAGS_JDKLIB:=@CXXFLAGS_JDKLIB@
-
-# CFLAGS used to compile the jdk native launchers (C-code)
-CFLAGS_JDKEXE:=@CFLAGS_JDKEXE@
-CXXFLAGS_JDKEXE:=@CXXFLAGS_JDKEXE@
-
-NO_DELETE_NULL_POINTER_CHECKS_CFLAG=@NO_DELETE_NULL_POINTER_CHECKS_CFLAG@
-NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@
-CXXSTD_CXXFLAG=@CXXSTD_CXXFLAG@
-
-CXX:=@FIXPATH@ @CCACHE@ @CXX@
-#CXXFLAGS:=@CXXFLAGS@
-
-OBJC:=@CCACHE@ @OBJC@
-#OBJCFLAGS:=@OBJCFLAGS@
-
-CPP:=@FIXPATH@ @CPP@
-#CPPFLAGS:=@CPPFLAGS@
-
-# The linker can be gcc or ld on posix systems, or link.exe on windows systems.
-LD:=@FIXPATH@ @LD@
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-  # Xcode SDK and tools path
-  SDKPATH:=@SDKPATH@
-  @SET_DEVELOPER_DIR@
-endif
-
-# The linker on older SuSE distros (e.g. on SLES 10) complains with:
-# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
-# if feeded with a version script which contains named tags.
-USING_BROKEN_SUSE_LD:=@USING_BROKEN_SUSE_LD@
-
-# LDFLAGS used to link the jdk native libraries (C-code)
-LDFLAGS_JDKLIB:=@LDFLAGS_JDKLIB@
-LDFLAGS_JDKLIB_SUFFIX:=@LDFLAGS_JDKLIB_SUFFIX@
-
-# On some platforms the linker cannot be used to create executables, thus
-# the need for a separate LDEXE command.
-LDEXE:=@FIXPATH@ @LDEXE@
-
-# LDFLAGS used to link the jdk native launchers (C-code)
-LDFLAGS_JDKEXE:=@LDFLAGS_JDKEXE@
-LDFLAGS_JDKEXE_SUFFIX:=@LDFLAGS_JDKEXE_SUFFIX@
-
-# LDFLAGS specific to C++ linking.
-LDFLAGS_CXX_JDK:=@LDFLAGS_CXX_JDK@
-
-# Sometimes a different linker is needed for c++ libs
-LDCXX:=@FIXPATH@ @LDCXX@
-# The flags for linking libstdc++ linker.
-LIBCXX:=@LIBCXX@
-
-# Sometimes a different linker is needed for c++ executables
-LDEXECXX:=@FIXPATH@ @LDEXECXX@
-
-# BUILD_CC/BUILD_LD is a compiler/linker that generates code that is runnable on the
-# build platform.
-BUILD_CC:=@FIXPATH@ @BUILD_CC@
-BUILD_LD:=@FIXPATH@ @BUILD_LD@
-
-AS:=@FIXPATH@ @AS@
-
-# AR is used to create a static library (is ar in posix, lib.exe in windows)
-AR:=@FIXPATH@ @AR@
-ARFLAGS:=@ARFLAGS@
-
-NM:=@NM@
-GNM:=@GNM@
-STRIP:=@STRIP@
-MCS:=@MCS@
-
-# Command to create a shared library
-SHARED_LIBRARY_FLAGS:=@SHARED_LIBRARY_FLAGS@
-
-# Options to linker to specify a mapfile.
-# (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SET_SHARED_LIBRARY_MAPFILE=@SET_SHARED_LIBRARY_MAPFILE@
-
-# Options for C/CXX compiler to be used if linking is performed
-#   using reorder file
-C_FLAG_REORDER:=@C_FLAG_REORDER@
-CXX_FLAG_REORDER:=@CXX_FLAG_REORDER@
-
-#
-# Options for generating debug symbols
-ENABLE_DEBUG_SYMBOLS:=@ENABLE_DEBUG_SYMBOLS@
-CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
-CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
-ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
-
-#
-# Compress (or not) jars
-COMPRESS_JARS=@COMPRESS_JARS@
-
-# Options to linker to specify the library name.
-# (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SET_SHARED_LIBRARY_NAME=@SET_SHARED_LIBRARY_NAME@
-
-# Set origin using the linker, ie use the relative path to the dependent library to find the dependees.
-# (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SET_SHARED_LIBRARY_ORIGIN=@SET_SHARED_LIBRARY_ORIGIN@
-SET_EXECUTABLE_ORIGIN=@SET_EXECUTABLE_ORIGIN@
-
-# Different OS:es have different ways of naming shared libraries.
-# The SHARED_LIBRARY macro takes "verify" as and argument and returns:
-#    "libverify.so" or "libverify.dylib" or "verify.dll" depending on platform.
-# (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SHARED_LIBRARY=@SHARED_LIBRARY@
-STATIC_LIBRARY=@STATIC_LIBRARY@
-LIBRARY_PREFIX:=@LIBRARY_PREFIX@
-SHARED_LIBRARY_SUFFIX:=@SHARED_LIBRARY_SUFFIX@
-STATIC_LIBRARY_SUFFIX:=@STATIC_LIBRARY_SUFFIX@
-EXE_SUFFIX:=@EXE_SUFFIX@
-OBJ_SUFFIX:=@OBJ_SUFFIX@
-
-POST_STRIP_CMD:=@POST_STRIP_CMD@
-POST_MCS_CMD:=@POST_MCS_CMD@
-
-JAVA_FLAGS:=@JAVA_FLAGS@
-JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@
-JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@
-
-JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
-JAVA_SMALL=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
-
-JAVAC=@FIXPATH@ $(BOOT_JDK)/bin/javac
-# Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
-# overriding that value by using ?=.
-JAVAC_FLAGS?=@JAVAC_FLAGS@
-
-JAVAH=@FIXPATH@ $(BOOT_JDK)/bin/javah
-
-JAR=@FIXPATH@ $(BOOT_JDK)/bin/jar
-
-RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic
-
-NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii $(addprefix -J, $(JAVA_FLAGS_SMALL))
-
-JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner
-
-# You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
-BOOTSTRAP_JAVAC_JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
-BOOTSTRAP_JAVAC_ARGS:="-Xbootclasspath/p:$(BOOTSTRAP_JAVAC_JAR)" -cp $(BOOTSTRAP_JAVAC_JAR)
-NEW_JAVAC   = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javac.Main
-NEW_JAVADOC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javadoc.Main
-
-# Base flags for RC
-# Guarding this against resetting value. Legacy make files include spec multiple
-# times.
-ifndef RC_FLAGS
-  RC_FLAGS:=@RC_FLAGS@
-endif
-
-# A specific java binary with specific options can be used to run
-# the long running background sjavac servers and other long running tasks.
-SJAVAC_SERVER_JAVA:=@FIXPATH@ @SJAVAC_SERVER_JAVA@
-
-# Tools adhering to a minimal and common standard of posix compliance.
-AWK:=@AWK@
-BASENAME:=@BASENAME@
-BASH:=@BASH@
-CAT:=@CAT@
-CCACHE:=@CCACHE@
-# CD is going away, but remains to cater for legacy makefiles.
-CD:=cd
-CHMOD:=@CHMOD@
-CODESIGN:=@CODESIGN@
-COMM:=@COMM@
-CP:=@CP@
-CPIO:=@CPIO@
-CUT:=@CUT@
-DATE:=@DATE@
-DIFF:=@DIFF@
-DIRNAME:=@DIRNAME@
-DSYMUTIL:=@DSYMUTIL@
-FIND:=@FIND@
-FIND_DELETE:=@FIND_DELETE@
-ECHO:=@ECHO@
-EGREP:=@EGREP@
-FGREP:=@FGREP@
-GREP:=@GREP@
-HEAD:=@HEAD@
-LS:=@LS@
-LN:=@LN@
-MKDIR:=@MKDIR@
-MV:=@MV@
-NAWK:=@NAWK@
-PRINTF:=@PRINTF@
-PWD:=@THEPWDCMD@
-RM:=@RM@
-SED:=@SED@
-SH:=@SH@
-SORT:=@SORT@
-TAR:=@TAR@
-TAIL:=@TAIL@
-TEE:=@TEE@
-TIME:=@TIME@
-IS_GNU_TIME:=@IS_GNU_TIME@
-TR:=@TR@
-TOUCH:=@TOUCH@
-UNIQ:=@UNIQ@
-WC:=@WC@
-XARGS:=@XARGS@
-ZIPEXE:=@ZIP@
-ZIP:=@ZIP@
-UNZIP:=@UNZIP@
-MT:=@FIXPATH@ @MT@
-RC:=@FIXPATH@ @RC@
-DUMPBIN:=@FIXPATH@ @DUMPBIN@
-CYGPATH:=@CYGPATH@
-LDD:=@LDD@
-OTOOL:=@OTOOL@
-READELF:=@READELF@
-EXPR:=@EXPR@
-FILE:=@FILE@
-HG:=@HG@
-OBJCOPY:=@OBJCOPY@
-SETFILE:=@SETFILE@
-XATTR:=@XATTR@
-JT_HOME:=@JT_HOME@
-JTREGEXE:=@JTREGEXE@
-
-XCODEBUILD=@XCODEBUILD@
-FIXPATH:=@FIXPATH@
-
-# Where the build output is stored for your convenience.
-BUILD_LOG:=@BUILD_LOG@
-BUILD_LOG_PREVIOUS:=@BUILD_LOG_PREVIOUS@
-# Disable the build log wrapper on sjavac+winapi until
-# we have solved how to prevent the log wrapper to wait
-# for the background sjavac server process.
-ifeq (@ENABLE_SJAVAC@X@OPENJDK_BUILD_OS_API@,yesXwinapi)
-  BUILD_LOG_WRAPPER:=
-else
-  BUILD_LOG_WRAPPER:=@BUILD_LOG_WRAPPER@
-endif
-
-# Build setup
-ENABLE_JFR=@ENABLE_JFR@
-ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
-USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
-USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
-USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
-LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
-MSVCR_DLL:=@MSVCR_DLL@
-
-
-# ADD_SRCS takes a single argument with source roots
-# and appends any corresponding source roots found
-# below --with-add-source-root and below
-# --with-override-source-root. It is the responsibility
-# of the next macro to get rid of superfluous files.
-ADD_SRCS=$1
-ifneq (,$(ADD_SRC_ROOT))
-  # Append wildcard rule to pickup any matching source roots found below ADD_SRC_ROOT
-  ADD_SRCS+=$(wildcard $(subst $(SRC_ROOT),$(ADD_SRC_ROOT),$1))
-endif
-ifneq (,$(OVERRIDE_SRC_ROOT))
-  # Append wildcard rule to pickup any matching source roots found below OVERRIDE_SRC_ROOT
-  ADD_SRCS+=$(wildcard $(subst $(SRC_ROOT),$(OVERRIDE_SRC_ROOT),$1))
-endif
-
-# OVR_SRCS creates a filter expression to filter out sources in
-# the original source directory that lie inside directories below
-# --with-override-source-root.
-# Use := here since we want to scan for these files here. To avoid recomputation later.
-# We cannot do the scan in configure, since that would force us to rerun configure when
-# we add overridden sources.
-ifneq (,$(OVERRIDE_SRC_ROOT))
-  OVR_SRCS:=$(addsuffix %,$(subst $(OVERRIDE_SRC_ROOT),$(SRC_ROOT),$(sort $(dir $(shell $(FIND) $(OVERRIDE_SRC_ROOT) -type f)))))
-else
-  OVR_SRCS:=
-endif
-
-####################################################
-#
-# INSTALLATION
-#
-
-# Common prefix for all installed files. Defaults to /usr/local,
-# but /opt/myjdk is another common version.
-INSTALL_PREFIX=@prefix@
-
-# Directories containing architecture-dependent files should be relative to exec_prefix
-INSTALL_EXECPREFIX=@exec_prefix@
-
-# java,javac,javah,javap etc are installed here.
-INSTALL_BINDIR=@bindir@
-
-# Read only architecture-independent data
-INSTALL_DATADIR=@datadir@
-
-# Root of above.
-INSTALL_DATAROOTDIR=@datarootdir@
-
-# Doc files, other than info and man.
-INSTALL_DOCDIR=@docdir@
-
-# Html documentation
-INSTALL_HTMLDIR=@htmldir@
-
-# Installing C header files, JNI headers for example.
-INSTALL_INCLUDEDIR=@includedir@
-
-# Installing library files....
-INSTALL_INCLUDEDIR=@libdir@
-
-# Executables that other programs run.
-INSTALL_LIBEXECDIR=@libexecdir@
-
-# Locale-dependent but architecture-independent data, such as message catalogs.
-INSTALL_LOCALEDIR=@localedir@
-
-# Modifiable single-machine data
-INSTALL_LOCALSTATEDIR=@localstatedir@
-
-# Man pages
-INSTALL_MANDIR=@mandir@
-
-# Modifiable architecture-independent data.
-INSTALL_SHAREDSTATEDIR=@sharedstatedir@
-
-# Read-only single-machine data
-INSTALL_SYSCONFDIR=@sysconfdir@
-
-
-####################################################
-#
-# Misc
-#
-
-# Name of Service Agent library
-SALIB_NAME=@SALIB_NAME@
-
-INCLUDE_SA=@INCLUDE_SA@
-
-OS_VERSION_MAJOR:=@OS_VERSION_MAJOR@
-OS_VERSION_MINOR:=@OS_VERSION_MINOR@
-OS_VERSION_MICRO:=@OS_VERSION_MICRO@
-
-# Images directory definitions
-JDK_IMAGE_SUBDIR:=j2sdk-image
-JRE_IMAGE_SUBDIR:=j2re-image
-JDK_OVERLAY_IMAGE_SUBDIR:=j2sdk-overlay-image
-JRE_OVERLAY_IMAGE_SUBDIR:=j2re-overlay-image
-# Colon left out to be able to override output dir for bootcycle-images
-JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
-JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
-JDK_OVERLAY_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_OVERLAY_IMAGE_SUBDIR)
-JRE_OVERLAY_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_OVERLAY_IMAGE_SUBDIR)
-
-# Macosx bundles directory definitions
-JDK_BUNDLE_SUBDIR=j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents
-JRE_BUNDLE_SUBDIR=j2re-bundle/jre$(JDK_VERSION).jre/Contents
-JDK_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_BUNDLE_SUBDIR)
-JRE_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR)
-
-# Include the custom-spec.gmk file if it exists
--include $(dir @SPEC@)/custom-spec.gmk
diff --git a/common/autoconf/spec.sh.in b/common/autoconf/spec.sh.in
deleted file mode 100644
index 41588df..0000000
--- a/common/autoconf/spec.sh.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-CAT="@CAT@"
-CD=cd
-CP="@CP@"
-DIFF="@DIFF@"
-ECHO="@ECHO@"
-FIND="@FIND@"
-GREP="@GREP@"
-RM="@RM@"
-SED="@SED@"
-
-POST_STRIP_CMD="@POST_STRIP_CMD@"
diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
deleted file mode 100644
index e8c034f..0000000
--- a/common/autoconf/toolchain.m4
+++ /dev/null
@@ -1,1447 +0,0 @@
-#
-# Copyright (c) 2011, 2015, 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.
-#
-
-# Prepare the system so that TOOLCHAIN_CHECK_COMPILER_VERSION can be called.
-# Must have CC_VERSION_NUMBER and CXX_VERSION_NUMBER.
-AC_DEFUN([TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS],
-[
-  if test "x$CC_VERSION" != "x$CXX_VERSION"; then
-    AC_MSG_WARN([C and C++ compiler has different version numbers, $CC_VERSION vs $CXX_VERSION.])
-    AC_MSG_WARN([This typically indicates a broken setup, and is not supported])
-  fi
-
-  # We only check CC_VERSION since we assume CXX_VERSION is equal.
-  if [ [[ "$CC_VERSION" =~ (.*\.){3} ]] ]; then
-    AC_MSG_WARN([C compiler version number has more than three parts (X.Y.Z): $CC_VERSION. Comparisons might be wrong.])
-  fi
-
-  if [ [[  "$CC_VERSION" =~ [0-9]{6} ]] ]; then
-    AC_MSG_WARN([C compiler version number has a part larger than 99999: $CC_VERSION. Comparisons might be wrong.])
-  fi
-
-  COMPARABLE_ACTUAL_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", [$]1, [$]2, [$]3) }' <<< "$CC_VERSION"`
-])
-
-# Check if the configured compiler (C and C++) is of a specific version or
-# newer. TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS must have been called before.
-#
-# Arguments:
-#   $1:   The version string to check against the found version
-#   $2:   block to run if the compiler is at least this version (>=)
-#   $3:   block to run if the compiler is older than this version (<)
-AC_DEFUN([TOOLCHAIN_CHECK_COMPILER_VERSION],
-[
-  REFERENCE_VERSION=$1
-
-  if [ [[ "$REFERENCE_VERSION" =~ (.*\.){3} ]] ]; then
-    AC_MSG_ERROR([Internal error: Cannot compare to $REFERENCE_VERSION, only three parts (X.Y.Z) is supported])
-  fi
-
-  if [ [[ "$REFERENCE_VERSION" =~ [0-9]{6} ]] ]; then
-    AC_MSG_ERROR([Internal error: Cannot compare to $REFERENCE_VERSION, only parts < 99999 is supported])
-  fi
-
-  # Version comparison method inspired by http://stackoverflow.com/a/24067243
-  COMPARABLE_REFERENCE_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", [$]1, [$]2, [$]3) }' <<< "$REFERENCE_VERSION"`
-
-  if test $COMPARABLE_ACTUAL_VERSION -ge $COMPARABLE_REFERENCE_VERSION ; then
-    m4_ifval([$2], [$2], [:])
-  else
-    m4_ifval([$3], [$3], [:])
-  fi
-])
-
-# $1 = compiler to test (CC or CXX)
-# $2 = human readable name of compiler (C or C++)
-AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
-[
-  COMPILER=[$]$1
-  COMPILER_NAME=$2
-
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    # Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
-    COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
-    $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
-    if test $? -ne 0; then
-      GCC_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
-
-      AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler.])
-      AC_MSG_NOTICE([The result from running with -V was: "$COMPILER_VERSION_TEST" and with --version: "$GCC_VERSION_TEST"])
-      AC_MSG_ERROR([Sun Studio compiler is required. Try setting --with-tools-dir.])
-    else
-      COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*@<:@ ,\t@:>@$COMPILER_NAME@<:@ ,\t@:>@\(@<:@1-9@:>@\.@<:@0-9@:>@@<:@0-9@:>@*\).*/\1/p"`
-      COMPILER_VENDOR="Sun Studio"
-    fi
-  elif test  "x$OPENJDK_TARGET_OS" = xaix; then
-      COMPILER_VERSION_TEST=`$COMPILER -qversion  2>&1 | $TAIL -n 1`
-      $ECHO $COMPILER_VERSION_TEST | $GREP "^Version: " > /dev/null
-      if test $? -ne 0; then
-        AC_MSG_ERROR([Failed to detect the compiler version of $COMPILER ....])
-      else
-        COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \([0-9][0-9]\.[0-9][0-9]*\).*/\1/p'`
-        COMPILER_VENDOR='IBM'
-      fi
-  elif test  "x$OPENJDK_TARGET_OS" = xwindows; then
-    # First line typically looks something like:
-    # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
-    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
-    COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \(@<:@1-9@:>@@<:@0-9.@:>@*\) .*/\1/p"`
-    COMPILER_VENDOR="Microsoft CL.EXE"
-    COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
-    if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
-      if test "x$COMPILER_CPU_TEST" != "x80x86"; then
-        AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "80x86".])
-      fi
-    elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
-      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
-    fi
-  else
-    COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
-    # Check that this is likely to be GCC.
-    $COMPILER --version 2>&1 | $GREP -E "Apple LLVM version|Free Software Foundation" > /dev/null
-    if test $? -ne 0; then
-      AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required compiler.])
-      AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_TEST"])
-      AC_MSG_ERROR([clang or GCC compiler is required. Try setting --with-tools-dir.])
-    fi
-
-    # First line typically looks something like:
-    # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
-    COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | \
-        $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'`
-    COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^\(.*\) @<:@1-9@:>@@<:@0-9.@:>@*/\1/p"`
-  fi
-  # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker)
-  $1_VERSION="$COMPILER_VERSION"
-  # This sets CC_VENDOR or CXX_VENDOR. (This comment is a grep marker)
-  $1_VENDOR="$COMPILER_VENDOR"
-
-  AC_MSG_NOTICE([Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)])
-])
-
-
-AC_DEFUN_ONCE([TOOLCHAIN_SETUP_SYSROOT_AND_OUT_OPTIONS],
-[
-  ###############################################################################
-  #
-  # Configure the development tool paths and potential sysroot.
-  #
-  AC_LANG(C++)
-
-  # The option used to specify the target .o,.a or .so file.
-  # When compiling, how to specify the to be created object file.
-  CC_OUT_OPTION='-o$(SPACE)'
-  # When linking, how to specify the to be created executable.
-  EXE_OUT_OPTION='-o$(SPACE)'
-  # When linking, how to specify the to be created dynamically linkable library.
-  LD_OUT_OPTION='-o$(SPACE)'
-  # When archiving, how to specify the to be create static archive for object files.
-  AR_OUT_OPTION='rcs$(SPACE)'
-  AC_SUBST(CC_OUT_OPTION)
-  AC_SUBST(EXE_OUT_OPTION)
-  AC_SUBST(LD_OUT_OPTION)
-  AC_SUBST(AR_OUT_OPTION)
-])
-
-# $1 = compiler to test (CC or CXX)
-# $2 = human readable name of compiler (C or C++)
-# $3 = list of compiler names to search for
-AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
-[
-  COMPILER_NAME=$2
-
-  $1=
-  # If TOOLS_DIR is set, check for all compiler names in there first
-  # before checking the rest of the PATH.
-  if test -n "$TOOLS_DIR"; then
-    PATH_save="$PATH"
-    PATH="$TOOLS_DIR"
-    AC_PATH_PROGS(TOOLS_DIR_$1, $3)
-    $1=$TOOLS_DIR_$1
-    PATH="$PATH_save"
-  fi
-
-  # AC_PATH_PROGS 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_PROGS(POTENTIAL_$1, $3)
-    $1=$POTENTIAL_$1
-  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
-  BASIC_FIXUP_EXECUTABLE($1)
-  TEST_COMPILER="[$]$1"
-  # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
-  # to 'xlc' but it is crucial that we invoke the compiler with the right name!
-  if test "x$OPENJDK_BUILD_OS" != xaix; then
-    AC_MSG_CHECKING([resolved symbolic links for $1])
-    BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
-    AC_MSG_RESULT([$TEST_COMPILER])
-  fi
-  AC_MSG_CHECKING([if $1 is disguised ccache])
-
-  COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
-  if test "x$COMPILER_BASENAME" = "xccache"; then
-    AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler])
-    # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
-    # We want to control ccache invocation ourselves, so ignore this cc and try
-    # searching again.
-
-    # Remove the path to the fake ccache cc from the PATH
-    RETRY_COMPILER_SAVED_PATH="$PATH"
-    COMPILER_DIRNAME=`$DIRNAME [$]$1`
-    PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
-
-    # Try again looking for our compiler
-    AC_CHECK_TOOLS(PROPER_COMPILER_$1, $3)
-    BASIC_FIXUP_EXECUTABLE(PROPER_COMPILER_$1)
-    PATH="$RETRY_COMPILER_SAVED_PATH"
-
-    AC_MSG_CHECKING([for resolved symbolic links for $1])
-    BASIC_REMOVE_SYMBOLIC_LINKS(PROPER_COMPILER_$1)
-    AC_MSG_RESULT([$PROPER_COMPILER_$1])
-    $1="$PROPER_COMPILER_$1"
-  else
-    AC_MSG_RESULT([no, keeping $1])
-    $1="$TEST_COMPILER"
-  fi
-  TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
-])
-
-
-AC_DEFUN([TOOLCHAIN_SETUP_PATHS],
-[
-  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
-    TOOLCHAIN_SETUP_MSVCR_DLL
-    BASIC_DEPRECATED_ARG_WITH([dxsdk])
-    BASIC_DEPRECATED_ARG_WITH([dxsdk-lib])
-    BASIC_DEPRECATED_ARG_WITH([dxsdk-include])
-  fi
-
-  AC_SUBST(MSVCR_DLL)
-
-  # If --build AND --host is set, then the configure script will find any
-  # cross compilation tools in the PATH. Cross compilation tools
-  # follows the cross compilation standard where they are prefixed with ${host}.
-  # For example the binary i686-sun-solaris2.10-gcc
-  # will cross compile for i686-sun-solaris2.10
-  # If neither of build and host is not set, then build=host and the
-  # default compiler found in the path will be used.
-  # Setting only --host, does not seem to be really supported.
-  # Please set both --build and --host if you want to cross compile.
-
-  if test "x$COMPILE_TYPE" = "xcross"; then
-    # Now we to find a C/C++ compiler that can build executables for the build
-    # platform. We can't use the AC_PROG_CC macro, since it can only be used
-    # once. Also, we need to do this before adding a tools dir to the path,
-    # otherwise we might pick up cross-compilers which don't use standard naming.
-    # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have
-    # to wait until they are properly discovered.
-    AC_PATH_PROGS(BUILD_CC, [cl cc gcc])
-    BASIC_FIXUP_EXECUTABLE(BUILD_CC)
-    AC_PATH_PROGS(BUILD_CXX, [cl CC g++])
-    BASIC_FIXUP_EXECUTABLE(BUILD_CXX)
-    AC_PATH_PROG(BUILD_LD, ld)
-    BASIC_FIXUP_EXECUTABLE(BUILD_LD)
-  fi
-  AC_SUBST(BUILD_CC)
-  AC_SUBST(BUILD_CXX)
-  AC_SUBST(BUILD_LD)
-
-  # If a devkit is found on the builddeps server, then prepend its path to the
-  # PATH variable. If there are cross compilers available in the devkit, these
-  # will be found by AC_PROG_CC et al.
-  DEVKIT=
-  BDEPS_CHECK_MODULE(DEVKIT, devkit, xxx,
-      [
-        # Found devkit
-        PATH="$DEVKIT/bin:$PATH"
-        SYS_ROOT="$DEVKIT/${rewritten_target}/sys-root"
-        if test "x$x_includes" = "xNONE"; then
-          x_includes="$SYS_ROOT/usr/include/X11"
-        fi
-        if test "x$x_libraries" = "xNONE"; then
-          x_libraries="$SYS_ROOT/usr/lib"
-        fi
-      ],
-      [])
-
-  # Store the CFLAGS etal passed to the configure script.
-  ORG_CFLAGS="$CFLAGS"
-  ORG_CXXFLAGS="$CXXFLAGS"
-  ORG_OBJCFLAGS="$OBJCFLAGS"
-
-  # autoconf magic only relies on PATH, so update it if tools dir is specified
-  OLD_PATH="$PATH"
-  if test "x$TOOLS_DIR" != x; then
-    PATH=$TOOLS_DIR:$PATH
-  fi
-
-  # Before we locate the compilers, we need to sanitize the Xcode build environment
-  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-    # determine path to Xcode developer directory
-    # can be empty in which case all the tools will rely on a sane Xcode 4 installation
-    SET_DEVELOPER_DIR=
-
-    if test -n "$XCODE_PATH"; then
-      DEVELOPER_DIR="$XCODE_PATH"/Contents/Developer
-    fi
-
-    # DEVELOPER_DIR could also be provided directly
-    AC_MSG_CHECKING([Determining if we need to set DEVELOPER_DIR])
-    if test -n "$DEVELOPER_DIR"; then
-      if test ! -d "$DEVELOPER_DIR"; then
-        AC_MSG_ERROR([Xcode Developer path does not exist: $DEVELOPER_DIR, please provide a path to the Xcode 4 application bundle using --with-xcode-path])
-      fi
-      if test ! -f "$DEVELOPER_DIR"/usr/bin/xcodebuild; then
-        AC_MSG_ERROR([Xcode Developer path is not valid: $DEVELOPER_DIR, it must point to Contents/Developer inside an Xcode application bundle])
-      fi
-      # make it visible to all the tools immediately
-      export DEVELOPER_DIR
-      SET_DEVELOPER_DIR="export DEVELOPER_DIR := $DEVELOPER_DIR"
-      AC_MSG_RESULT([yes ($DEVELOPER_DIR)])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    AC_SUBST(SET_DEVELOPER_DIR)
-
-    AC_PATH_PROG(XCODEBUILD, xcodebuild)
-    if test -z "$XCODEBUILD"; then
-      AC_MSG_ERROR([The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X])
-    fi
-
-    # Fail-fast: verify we're building on Xcode 4, we cannot build with Xcode 5 or later
-    XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
-    XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
-    if test ! ${XC_VERSION_PARTS[[0]]} -ge 4 ; then
-      AC_MSG_ERROR([Xcode 4 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode 4 or make Xcode 4 active by using xcode-select.])
-    fi
-
-    # Some versions of Xcode 5 command line tools install gcc and g++ as symlinks to
-    # clang and clang++, which will break the build. So handle that here if we need to.
-    if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then
-      # use xcrun to find the real gcc and add it's directory to PATH
-      # then autoconf magic will find it
-      AC_MSG_NOTICE([Found gcc symlinks to clang in /usr/bin, adding path to real gcc to PATH])
-      XCODE_BIN_PATH=$(dirname `xcrun -find gcc`)
-      PATH="$XCODE_BIN_PATH":$PATH
-    fi
-
-    # Determine appropriate SDKPATH, don't use SDKROOT as it interferes with the stub tools
-    AC_MSG_CHECKING([Determining Xcode SDK path])
-    # allow SDKNAME to be set to override the default SDK selection
-    SDKPATH=`"$XCODEBUILD" -sdk ${SDKNAME:-macosx} -version | grep '^Path: ' | sed 's/Path: //'`
-    if test -n "$SDKPATH"; then
-      AC_MSG_RESULT([$SDKPATH])
-    else
-      AC_MSG_RESULT([(none, will use system headers and frameworks)])
-    fi
-    AC_SUBST(SDKPATH)
-
-    # Perform a basic sanity test
-    if test ! -f "$SDKPATH/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
-      AC_MSG_ERROR([Unable to find required framework headers, provide a valid path to Xcode 4 using --with-xcode-path])
-    fi
-
-    # if SDKPATH is non-empty then we need to add -isysroot and -iframework for gcc and g++
-    if test -n "$SDKPATH"; then
-      # We need -isysroot <path> and -iframework<path>/System/Library/Frameworks
-      CFLAGS_JDK="${CFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
-      CXXFLAGS_JDK="${CXXFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
-      LDFLAGS_JDK="${LDFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
-    fi
-    
-    # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
-    # setting this here means it doesn't have to be peppered throughout the forest
-    CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
-    CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
-    LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
-  fi
-
-  ### Locate C compiler (CC)
-
-  # On windows, only cl.exe is supported.
-  # On Solaris, cc is preferred to gcc.
-  # Elsewhere, gcc is preferred to cc.
-
-  if test "x$CC" != x; then
-    COMPILER_CHECK_LIST="$CC"
-  elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    COMPILER_CHECK_LIST="cl"
-  elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
-    COMPILER_CHECK_LIST="cc gcc"
-  elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
-    # Do not probe for cc on AIX.
-    COMPILER_CHECK_LIST="xlc_r"
-  else
-    COMPILER_CHECK_LIST="gcc cc"
-  fi
-
-  TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST])
-  # Now that we have resolved CC ourself, let autoconf have its go at it
-  AC_PROG_CC([$CC])
-
-  # Option used to tell the compiler whether to create 32- or 64-bit executables
-  # Notice that CC contains the full compiler path at this point.
-  case $CC in
-    *xlc_r) COMPILER_TARGET_BITS_FLAG="-q";;
-    *)      COMPILER_TARGET_BITS_FLAG="-m";;
-  esac
-  AC_SUBST(COMPILER_TARGET_BITS_FLAG)
-
-  ### Locate C++ compiler (CXX)
-
-  if test "x$CXX" != x; then
-    COMPILER_CHECK_LIST="$CXX"
-  elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    COMPILER_CHECK_LIST="cl"
-  elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
-    COMPILER_CHECK_LIST="CC g++"
-  elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
-    # Do not probe for CC on AIX .
-    COMPILER_CHECK_LIST="xlC_r"
-  else
-    COMPILER_CHECK_LIST="g++ CC"
-  fi
-
-  TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST])
-  # Now that we have resolved CXX ourself, let autoconf have its go at it
-  AC_PROG_CXX([$CXX])
-
-  # This is the compiler version number on the form X.Y[.Z]
-  AC_SUBST(CC_VERSION)
-  AC_SUBST(CXX_VERSION)
-
-  TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS
-
-  ### Locate other tools
-
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    AC_PROG_OBJC
-    BASIC_FIXUP_EXECUTABLE(OBJC)
-  else
-    OBJC=
-  fi
-
-  # Restore the flags to the user specified values.
-  # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
-  CFLAGS="$ORG_CFLAGS"
-  CXXFLAGS="$ORG_CXXFLAGS"
-  OBJCFLAGS="$ORG_OBJCFLAGS"
-
-  LD="$CC"
-  LDEXE="$CC"
-  LDCXX="$CXX"
-  LDEXECXX="$CXX"
-  AC_SUBST(LD)
-  # LDEXE is the linker to use, when creating executables.
-  AC_SUBST(LDEXE)
-  # Linking C++ libraries.
-  AC_SUBST(LDCXX)
-  # Linking C++ executables.
-  AC_SUBST(LDEXECXX)
-
-  if test "x$OPENJDK_TARGET_OS" != xwindows; then
-    AC_CHECK_TOOL(AR, ar)
-    BASIC_FIXUP_EXECUTABLE(AR)
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    ARFLAGS="-r"
-  elif test "x$OPENJDK_TARGET_OS" = xaix; then
-    ARFLAGS="-X64"
-  else
-    ARFLAGS=""
-  fi
-  AC_SUBST(ARFLAGS)
-
-  # For hotspot, we need these in Windows mixed path; other platforms keep them the same
-  HOTSPOT_CXX="$CXX"
-  HOTSPOT_LD="$LD"
-  AC_SUBST(HOTSPOT_CXX)
-  AC_SUBST(HOTSPOT_LD)
-
-  COMPILER_NAME=gcc
-  COMPILER_TYPE=CC
-  AS_IF([test "x$OPENJDK_TARGET_OS" = xwindows], [
-    # For now, assume that we are always compiling using cl.exe.
-    CC_OUT_OPTION=-Fo
-    EXE_OUT_OPTION=-out:
-    LD_OUT_OPTION=-out:
-    AR_OUT_OPTION=-out:
-    # On Windows, reject /usr/bin/link (as determined in CYGWIN_LINK), which is a cygwin
-    # program for something completely different.
-    AC_CHECK_PROG([WINLD], [link],[link],,, [$CYGWIN_LINK])
-    # Since we must ignore the first found link, WINLD will contain
-    # the full path to the link.exe program.
-    BASIC_FIXUP_EXECUTABLE(WINLD)
-    printf "Windows linker was found at $WINLD\n"
-    AC_MSG_CHECKING([if the found link.exe is actually the Visual Studio linker])
-    "$WINLD" --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
-    LD="$WINLD"
-    LDEXE="$WINLD"
-    LDCXX="$WINLD"
-    LDEXECXX="$WINLD"
-
-    AC_CHECK_PROG([MT], [mt], [mt],,, [/usr/bin/mt])
-    BASIC_FIXUP_EXECUTABLE(MT)
-    # The resource compiler
-    AC_CHECK_PROG([RC], [rc], [rc],,, [/usr/bin/rc])
-    BASIC_FIXUP_EXECUTABLE(RC)
-
-    # For hotspot, we need these in Windows mixed path,
-    # so rewrite them all. Need added .exe suffix.
-    HOTSPOT_CXX="$CXX.exe"
-    HOTSPOT_LD="$LD.exe"
-    HOTSPOT_MT="$MT.exe"
-    HOTSPOT_RC="$RC.exe"
-    BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_CXX)
-    BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_LD)
-    BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_MT)
-    BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_RC)
-    AC_SUBST(HOTSPOT_MT)
-    AC_SUBST(HOTSPOT_RC)
-
-    RC_FLAGS="-nologo -l 0x409 -r"
-    AS_IF([test "x$VARIANT" = xOPT], [
-    RC_FLAGS="$RC_FLAGS -d NDEBUG"
-  ])
-
-  # 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_BUILD_ID=\$(FULL_VERSION)\" \
-      -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
-      -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
-      -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
-      -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
-      -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
-      -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\""
-
-  # lib.exe is used to create static libraries.
-  AC_CHECK_PROG([WINAR], [lib],[lib],,,)
-  BASIC_FIXUP_EXECUTABLE(WINAR)
-  AR="$WINAR"
-  ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
-
-  AC_CHECK_PROG([DUMPBIN], [dumpbin], [dumpbin],,,)
-      BASIC_FIXUP_EXECUTABLE(DUMPBIN)
-
-      COMPILER_TYPE=CL
-      # silence copyright notice and other headers.
-      COMMON_CCXXFLAGS="$COMMON_CCXXFLAGS -nologo"
-  ])
-  AC_SUBST(RC_FLAGS)
-  AC_SUBST(COMPILER_TYPE)
-
-  AC_PROG_CPP
-  BASIC_FIXUP_EXECUTABLE(CPP)
-
-  AC_PROG_CXXCPP
-  BASIC_FIXUP_EXECUTABLE(CXXCPP)
-
-  if test "x$COMPILE_TYPE" != "xcross"; then
-    # If we are not cross compiling, use the same compilers for
-    # building the build platform executables. The cross-compilation
-    # case needed to be done earlier, but this can only be done after
-    # the native tools have been localized.
-    BUILD_CC="$CC"
-    BUILD_CXX="$CXX"
-    BUILD_LD="$LD"
-  fi
-
-  # for solaris we really need solaris tools, and not gnu equivalent
-  #   these seems to normally reside in /usr/ccs/bin so add that to path before
-  #   starting to probe
-  #
-  #   NOTE: I add this /usr/ccs/bin after TOOLS but before OLD_PATH
-  #         so that it can be overriden --with-tools-dir
-  if test "x$OPENJDK_BUILD_OS" = xsolaris; then
-    PATH="${TOOLS_DIR}:/usr/ccs/bin:${OLD_PATH}"
-  fi
-
-  # Find the right assembler.
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    AC_PATH_PROG(AS, as)
-    BASIC_FIXUP_EXECUTABLE(AS)
-  else
-    AS="$CC -c"
-  fi
-  AC_SUBST(AS)
-
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    AC_PATH_PROG(NM, nm)
-    BASIC_FIXUP_EXECUTABLE(NM)
-    AC_PATH_PROG(GNM, gnm)
-    BASIC_FIXUP_EXECUTABLE(GNM)
-    AC_PATH_PROG(STRIP, strip)
-    BASIC_FIXUP_EXECUTABLE(STRIP)
-    AC_PATH_PROG(MCS, mcs)
-    BASIC_FIXUP_EXECUTABLE(MCS)
-  elif test "x$OPENJDK_TARGET_OS" != xwindows; then
-    AC_PATH_PROG(OTOOL, otool)
-    if test "x$OTOOL" = "x"; then
-      OTOOL="true"
-    fi
-    AC_CHECK_TOOL(NM, nm)
-    BASIC_FIXUP_EXECUTABLE(NM)
-    GNM="$NM"
-    AC_SUBST(GNM)
-    AC_CHECK_TOOL(STRIP, strip)
-    BASIC_FIXUP_EXECUTABLE(STRIP)
-  fi
-
-  # objcopy is used for moving debug symbols to separate files when
-  # full debug symbols are enabled.
-  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
-    AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
-    # Only call fixup if objcopy was found.
-    if test -n "$OBJCOPY"; then
-      BASIC_FIXUP_EXECUTABLE(OBJCOPY)
-    fi
-  fi
-
-  AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
-  if test "x$OBJDUMP" != x; then
-    # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
-    BASIC_FIXUP_EXECUTABLE(OBJDUMP)
-  fi
-
-  TOOLCHAIN_SETUP_JTREG
-
-  # Restore old path without tools dir
-  PATH="$OLD_PATH"
-])
-
-
-AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_LIBS],
-[
-
-  ###############################################################################
-  #
-  # How to compile shared libraries.
-  #
-
-  if test "x$GCC" = xyes; then
-    COMPILER_NAME=gcc
-    PICFLAG="-fPIC"
-    LIBRARY_PREFIX=lib
-    SHARED_LIBRARY='lib[$]1.so'
-    STATIC_LIBRARY='lib[$]1.a'
-    SHARED_LIBRARY_FLAGS="-shared"
-    SHARED_LIBRARY_SUFFIX='.so'
-    STATIC_LIBRARY_SUFFIX='.a'
-    OBJ_SUFFIX='.o'
-    EXE_SUFFIX=''
-    SET_SHARED_LIBRARY_NAME='-Xlinker -soname=[$]1'
-    SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=[$]1'
-    C_FLAG_REORDER=''
-    CXX_FLAG_REORDER=''
-    SET_SHARED_LIBRARY_ORIGIN='-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$$$ORIGIN[$]1'
-    SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker \$$$$ORIGIN[$]1'
-    LD="$CC"
-    LDEXE="$CC"
-    LDCXX="$CXX"
-    LDEXECXX="$CXX"
-    POST_STRIP_CMD="$STRIP -g"
-
-    # Linking is different on MacOSX
-    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-      # Might change in the future to clang.
-      COMPILER_NAME=gcc
-      SHARED_LIBRARY='lib[$]1.dylib'
-      SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
-      SHARED_LIBRARY_SUFFIX='.dylib'
-      EXE_SUFFIX=''
-      SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1'
-      SET_SHARED_LIBRARY_MAPFILE=''
-      SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
-      SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
-      POST_STRIP_CMD="$STRIP -S"
-    fi
-  else
-    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-      # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
-      COMPILER_NAME=ossc
-      PICFLAG="-KPIC"
-      LIBRARY_PREFIX=lib
-      SHARED_LIBRARY='lib[$]1.so'
-      STATIC_LIBRARY='lib[$]1.a'
-      SHARED_LIBRARY_FLAGS="-G"
-      SHARED_LIBRARY_SUFFIX='.so'
-      STATIC_LIBRARY_SUFFIX='.a'
-      OBJ_SUFFIX='.o'
-      EXE_SUFFIX=''
-      SET_SHARED_LIBRARY_NAME=''
-      SET_SHARED_LIBRARY_MAPFILE='-M[$]1'
-      C_FLAG_REORDER='-xF'
-      CXX_FLAG_REORDER='-xF'
-      SET_SHARED_LIBRARY_ORIGIN='-R\$$$$ORIGIN[$]1'
-      SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
-      CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
-      CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
-      CFLAGS_JDKLIB_EXTRA='-xstrconst'
-      POST_STRIP_CMD="$STRIP -x"
-      POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
-    fi
-    if test "x$OPENJDK_TARGET_OS" = xaix; then
-        COMPILER_NAME=xlc
-        PICFLAG="-qpic=large"
-        LIBRARY_PREFIX=lib
-        SHARED_LIBRARY='lib[$]1.so'
-        STATIC_LIBRARY='lib[$]1.a'
-        SHARED_LIBRARY_FLAGS="-qmkshrobj"
-        SHARED_LIBRARY_SUFFIX='.so'
-        STATIC_LIBRARY_SUFFIX='.a'
-        OBJ_SUFFIX='.o'
-        EXE_SUFFIX=''
-        SET_SHARED_LIBRARY_NAME=''
-        SET_SHARED_LIBRARY_MAPFILE=''
-        C_FLAG_REORDER=''
-        CXX_FLAG_REORDER=''
-        SET_SHARED_LIBRARY_ORIGIN=''
-        SET_EXECUTABLE_ORIGIN=""
-        CFLAGS_JDK=""
-        CXXFLAGS_JDK=""
-        CFLAGS_JDKLIB_EXTRA=''
-        POST_STRIP_CMD="$STRIP -X32_64"
-        POST_MCS_CMD=""
-    fi
-    if test "x$OPENJDK_TARGET_OS" = xwindows; then
-      # If it is not gcc, then assume it is the MS Visual Studio compiler
-      COMPILER_NAME=cl
-      PICFLAG=""
-      LIBRARY_PREFIX=
-      SHARED_LIBRARY='[$]1.dll'
-      STATIC_LIBRARY='[$]1.lib'
-      SHARED_LIBRARY_FLAGS="-LD"
-      SHARED_LIBRARY_SUFFIX='.dll'
-      STATIC_LIBRARY_SUFFIX='.lib'
-      OBJ_SUFFIX='.obj'
-      EXE_SUFFIX='.exe'
-      SET_SHARED_LIBRARY_NAME=''
-      SET_SHARED_LIBRARY_MAPFILE=''
-      SET_SHARED_LIBRARY_ORIGIN=''
-      SET_EXECUTABLE_ORIGIN=''
-    fi
-  fi
-
-  AC_SUBST(COMPILER_NAME)
-  AC_SUBST(OBJ_SUFFIX)
-  AC_SUBST(SHARED_LIBRARY)
-  AC_SUBST(STATIC_LIBRARY)
-  AC_SUBST(LIBRARY_PREFIX)
-  AC_SUBST(SHARED_LIBRARY_SUFFIX)
-  AC_SUBST(STATIC_LIBRARY_SUFFIX)
-  AC_SUBST(EXE_SUFFIX)
-  AC_SUBST(SHARED_LIBRARY_FLAGS)
-  AC_SUBST(SET_SHARED_LIBRARY_NAME)
-  AC_SUBST(SET_SHARED_LIBRARY_MAPFILE)
-  AC_SUBST(C_FLAG_REORDER)
-  AC_SUBST(CXX_FLAG_REORDER)
-  AC_SUBST(SET_SHARED_LIBRARY_ORIGIN)
-  AC_SUBST(SET_EXECUTABLE_ORIGIN)
-  AC_SUBST(POST_STRIP_CMD)
-  AC_SUBST(POST_MCS_CMD)
-
-  # The (cross) compiler is now configured, we can now test capabilities
-  # of the target platform.
-])
-
-AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
-[
-
-  ###############################################################################
-  #
-  # Setup the opt flags for different compilers
-  # and different operating systems.
-  #
-
-  #
-  # NOTE: check for -mstackrealign needs to be below potential addition of -m32
-  #
-  if test "x$OPENJDK_TARGET_CPU_BITS" = x32 && test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
-    # While waiting for a better solution, the current workaround is to use -mstackrealign.
-    CFLAGS="$CFLAGS -mstackrealign"
-    AC_MSG_CHECKING([if 32-bit compiler supports -mstackrealign])
-    AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
-        [
-          AC_MSG_RESULT([yes])
-        ],
-        [
-          AC_MSG_RESULT([no])
-          AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
-        ]
-    )
-  fi
-
-  C_FLAG_DEPS="-MMD -MF"
-  CXX_FLAG_DEPS="-MMD -MF"
-
-  case $COMPILER_TYPE in
-    CC )
-      case $COMPILER_NAME in
-        gcc )
-          case $OPENJDK_TARGET_OS in
-            macosx )
-              # On MacOSX we optimize for size, something
-              # we should do for all platforms?
-              C_O_FLAG_HI="-Os"
-              C_O_FLAG_NORM="-Os"
-              C_O_FLAG_NONE=""
-              ;;
-            *)
-              C_O_FLAG_HI="-O3"
-              C_O_FLAG_NORM="-O2"
-              C_O_FLAG_NONE="-O0"
-              ;;
-          esac
-          CXX_O_FLAG_HI="$C_O_FLAG_HI"
-          CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
-          CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
-          CFLAGS_DEBUG_SYMBOLS="-g"
-          CXXFLAGS_DEBUG_SYMBOLS="-g"
-          if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
-            CFLAGS_DEBUG_SYMBOLS="-g1"
-            CXXFLAGS_DEBUG_SYMBOLS="-g1"
-          fi
-          ;;
-        ossc )
-          #
-          # Forte has different names for this with their C++ compiler...
-          #
-          C_FLAG_DEPS="-xMMD -xMF"
-          CXX_FLAG_DEPS="-xMMD -xMF"
-
-          # Extra options used with HIGHEST
-          #
-          # WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be
-          #          done with care, there are some assumptions below that need to
-          #          be understood about the use of pointers, and IEEE behavior.
-          #
-          # Use non-standard floating point mode (not IEEE 754)
-          CC_HIGHEST="$CC_HIGHEST -fns"
-          # Do some simplification of floating point arithmetic (not IEEE 754)
-          CC_HIGHEST="$CC_HIGHEST -fsimple"
-          # Use single precision floating point with 'float'
-          CC_HIGHEST="$CC_HIGHEST -fsingle"
-          # Assume memory references via basic pointer types do not alias
-          #   (Source with excessing pointer casting and data access with mixed
-          #    pointer types are not recommended)
-          CC_HIGHEST="$CC_HIGHEST -xalias_level=basic"
-          # Use intrinsic or inline versions for math/std functions
-          #   (If you expect perfect errno behavior, do not use this)
-          CC_HIGHEST="$CC_HIGHEST -xbuiltin=%all"
-          # Loop data dependency optimizations (need -xO3 or higher)
-          CC_HIGHEST="$CC_HIGHEST -xdepend"
-          # Pointer parameters to functions do not overlap
-          #   (Similar to -xalias_level=basic usage, but less obvious sometimes.
-          #    If you pass in multiple pointers to the same data, do not use this)
-          CC_HIGHEST="$CC_HIGHEST -xrestrict"
-          # Inline some library routines
-          #   (If you expect perfect errno behavior, do not use this)
-          CC_HIGHEST="$CC_HIGHEST -xlibmil"
-          # Use optimized math routines
-          #   (If you expect perfect errno behavior, do not use this)
-          #  Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
-          #CC_HIGHEST="$CC_HIGHEST -xlibmopt"
-
-          if test "x$OPENJDK_TARGET_CPU" = xsparc; then
-            CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
-            CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
-          fi
-
-          case $OPENJDK_TARGET_CPU_ARCH in
-            x86)
-              C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xregs=no%frameptr"
-              C_O_FLAG_HI="-xO4 -Wu,-O4~yz -xregs=no%frameptr"
-              C_O_FLAG_NORM="-xO2 -Wu,-O2~yz -xregs=no%frameptr"
-              C_O_FLAG_NONE="-xregs=no%frameptr"
-              CXX_O_FLAG_HIGHEST="-xO4 -Qoption ube -O4~yz $CC_HIGHEST -xregs=no%frameptr"
-              CXX_O_FLAG_HI="-xO4 -Qoption ube -O4~yz -xregs=no%frameptr"
-              CXX_O_FLAG_NORM="-xO2 -Qoption ube -O2~yz -xregs=no%frameptr"
-              CXX_O_FLAG_NONE="-xregs=no%frameptr"
-              if test "x$OPENJDK_TARGET_CPU" = xx86; then
-                C_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST -xchip=pentium"
-                CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HIGHEST -xchip=pentium"
-              fi
-              ;;
-            sparc)
-              CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
-              CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
-              C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
-              C_O_FLAG_HI="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0"
-              C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0"
-              C_O_FLAG_NONE=""
-              CXX_O_FLAG_HIGHEST="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
-              CXX_O_FLAG_HI="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
-              CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
-              CXX_O_FLAG_NONE=""
-              ;;
-          esac
-
-          CFLAGS_DEBUG_SYMBOLS="-g -xs"
-          CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
-          ;;
-        xlc )
-          C_FLAG_DEPS="-qmakedep=gcc -MF"
-          CXX_FLAG_DEPS="-qmakedep=gcc -MF"
-          C_O_FLAG_HIGHEST="-O3"
-          C_O_FLAG_HI="-O3 -qstrict"
-          C_O_FLAG_NORM="-O2"
-          C_O_FLAG_NONE=""
-          CXX_O_FLAG_HIGHEST="-O3"
-          CXX_O_FLAG_HI="-O3 -qstrict"
-          CXX_O_FLAG_NORM="-O2"
-          CXX_O_FLAG_NONE=""
-          CFLAGS_DEBUG_SYMBOLS="-g"
-          CXXFLAGS_DEBUG_SYMBOLS="-g"
-          LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall"
-          CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
-          CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
-          ;;
-      esac
-      ;;
-    CL )
-      C_O_FLAG_HIGHEST="-O2"
-      C_O_FLAG_HI="-O1"
-      C_O_FLAG_NORM="-O1"
-      C_O_FLAG_NONE="-Od"
-      CXX_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST"
-      CXX_O_FLAG_HI="$C_O_FLAG_HI"
-      CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
-      CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
-      ;;
-  esac
-
-  if test -z "$C_O_FLAG_HIGHEST"; then
-    C_O_FLAG_HIGHEST="$C_O_FLAG_HI"
-  fi
-
-  if test -z "$CXX_O_FLAG_HIGHEST"; then
-    CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HI"
-  fi
-
-  AC_SUBST(C_O_FLAG_HIGHEST)
-  AC_SUBST(C_O_FLAG_HI)
-  AC_SUBST(C_O_FLAG_NORM)
-  AC_SUBST(C_O_FLAG_NONE)
-  AC_SUBST(CXX_O_FLAG_HIGHEST)
-  AC_SUBST(CXX_O_FLAG_HI)
-  AC_SUBST(CXX_O_FLAG_NORM)
-  AC_SUBST(CXX_O_FLAG_NONE)
-  AC_SUBST(C_FLAG_DEPS)
-  AC_SUBST(CXX_FLAG_DEPS)
-])
-
-AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK],
-[
-
-  if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
-    AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags])
-  fi
-
-  if test "x$CXXFLAGS" != "x${ADDED_CXXFLAGS}"; then
-    AC_MSG_WARN([Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags])
-  fi
-
-  if test "x$LDFLAGS" != "x${ADDED_LDFLAGS}"; then
-    AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags])
-  fi
-
-  AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags],
-      [extra flags to be used when compiling jdk c-files])])
-
-  AC_ARG_WITH(extra-cxxflags, [AS_HELP_STRING([--with-extra-cxxflags],
-      [extra flags to be used when compiling jdk c++-files])])
-
-  AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags],
-      [extra flags to be used when linking jdk])])
-
-  CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
-  CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
-  LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
-
-  # Hotspot needs these set in their legacy form
-  LEGACY_EXTRA_CFLAGS=$with_extra_cflags
-  LEGACY_EXTRA_CXXFLAGS=$with_extra_cxxflags
-  LEGACY_EXTRA_LDFLAGS=$with_extra_ldflags
-
-  AC_SUBST(LEGACY_EXTRA_CFLAGS)
-  AC_SUBST(LEGACY_EXTRA_CXXFLAGS)
-  AC_SUBST(LEGACY_EXTRA_LDFLAGS)
-
-  ###############################################################################
-  #
-  # Now setup the CFLAGS and LDFLAGS for the JDK build.
-  # Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build.
-  #    CFLAGS_JDK    - C Compiler flags
-  #    CXXFLAGS_JDK  - C++ Compiler flags
-  #    COMMON_CCXXFLAGS_JDK - common to C and C++
-  #
-  case $COMPILER_NAME in
-    gcc )
-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
-      -pipe \
-      -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
-      CXXSTD_CXXFLAG="-std=gnu++98"
-      TOOLCHAIN_CXX_COMPILER_CHECK_ARGUMENTS([$CXXSTD_CXXFLAG $CFLAGS_WARNINGS_ARE_ERRORS],
-    					     [], [CXXSTD_CXXFLAG=""])
-      CXXFLAGS_JDK="${CXXFLAGS_JDK} ${CXXSTD_CXXFLAG}"
-      AC_SUBST([CXXSTD_CXXFLAG])
-      case $OPENJDK_TARGET_CPU_ARCH in
-        arm )
-          # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
-          CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
-          ;;
-        ppc )
-          # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
-          ;;
-        * )
-          COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer"
-          CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
-          ;;
-      esac
-      TOOLCHAIN_CHECK_COMPILER_VERSION(6, TOOLCHAIN_SETUP_GCC6_COMPILER_FLAGS)
-      ;;
-    ossc )
-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS"
-      case $OPENJDK_TARGET_CPU_ARCH in
-        x86 )
-          COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DcpuIntel -Di586 -D$OPENJDK_TARGET_CPU_LEGACY_LIB"
-          CFLAGS_JDK="$CFLAGS_JDK -erroff=E_BAD_PRAGMA_PACK_VALUE"
-          ;;
-      esac
-
-      CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa -v -mt -W0,-noglobal"
-      CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib"
-
-      LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext"
-      LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib"
-      ;;
-    xlc )
-      CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
-      CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
-
-      LDFLAGS_JDK="$LDFLAGS_JDK"
-      LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK"
-      ;;
-    cl )
-      # If building with Visual Studio 2010, we can still use _STATIC_CPPLIB to
-      # avoid bundling msvcpNNN.dll. Doesn't work with newer versions of visual
-      # studio.
-      STATIC_CPPLIB_FLAGS=""
-      if test "x$VS_VERSION" = "x2010"; then
-        STATIC_CPPLIB_FLAGS="-D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB"
-      fi
-
-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
-      $STATIC_CPPLIB_FLAGS -DWIN32_LEAN_AND_MEAN \
-      -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
-      -DWIN32 -DIAL"
-      case $OPENJDK_TARGET_CPU in
-        x86 )
-          COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_X86_ -Dx86"
-          ;;
-        x86_64 )
-          COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_AMD64_ -Damd64"
-          ;;
-      esac
-      ;;
-  esac
-
-  ###############################################################################
-
-  # Adjust flags according to debug level.
-  case $DEBUG_LEVEL in
-    fastdebug )
-      CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
-      CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
-      C_O_FLAG_HI="$C_O_FLAG_NORM"
-      C_O_FLAG_NORM="$C_O_FLAG_NORM"
-      CXX_O_FLAG_HI="$CXX_O_FLAG_NORM"
-      CXX_O_FLAG_NORM="$CXX_O_FLAG_NORM"
-      JAVAC_FLAGS="$JAVAC_FLAGS -g"
-      ;;
-    slowdebug )
-      CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
-      CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
-      C_O_FLAG_HI="$C_O_FLAG_NONE"
-      C_O_FLAG_NORM="$C_O_FLAG_NONE"
-      CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
-      CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
-      JAVAC_FLAGS="$JAVAC_FLAGS -g"
-      ;;
-  esac
-
-  COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK $ADD_LP64"
-
-  # The package path is used only on macosx?
-  PACKAGE_PATH=/opt/local
-  AC_SUBST(PACKAGE_PATH)
-
-  if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
-    # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
-    #   Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
-    #   (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h).
-    #   Note: -Dmacro         is the same as    #define macro 1
-    #         -Dmacro=        is the same as    #define macro
-    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
-    else
-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
-    fi
-  else
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN"
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX"
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xwindows; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DWINDOWS"
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DSOLARIS"
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xaix; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DAIX -DPPC64"
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
-    # Setting these parameters makes it an error to link to macosx APIs that are
-    # newer than the given OS version and makes the linked binaries compatible even
-    # if built on a newer version of the OS.
-    # The expected format is X.Y.Z
-    MACOSX_VERSION_MIN=10.7.0
-    AC_SUBST(MACOSX_VERSION_MIN)
-    # The macro takes the version with no dots, ex: 1070
-    # Let the flags variables get resolved in make for easier override on make
-    # command line.
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
-    LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
-  fi
-  if test "x$OPENJDK_TARGET_OS" = xbsd; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
-  fi
-  if test "x$DEBUG_LEVEL" = xrelease; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG"
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DTRIMMED"
-  fi
-  else
-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DDEBUG"
-  fi
-
-  COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
-  COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
-
-  COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
-      -I${JDK_OUTPUTDIR}/include \
-      -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
-      -I${JDK_TOPDIR}/src/share/javavm/export \
-      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
-      -I${JDK_TOPDIR}/src/share/native/common \
-      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
-
-  # The shared libraries are compiled using the picflag.
-  CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
-  CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
-
-  # Executable flags
-  CFLAGS_JDKEXE="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK"
-  CXXFLAGS_JDKEXE="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK"
-
-  # Now this is odd. The JDK native libraries have to link against libjvm.so
-  # On 32-bit machines there is normally two distinct libjvm.so:s, client and server.
-  # Which should we link to? Are we lucky enough that the binary api to the libjvm.so library
-  # is identical for client and server? Yes. Which is picked at runtime (client or server)?
-  # Neither, since the chosen libjvm.so has already been loaded by the launcher, all the following
-  # libraries will link to whatever is in memory. Yuck.
-  #
-  # Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh.
-  if test "x$COMPILER_NAME" = xcl; then
-    LDFLAGS_JDK="$LDFLAGS_JDK -nologo -opt:ref -incremental:no"
-    if test "x$OPENJDK_TARGET_CPU" = xx86; then
-      LDFLAGS_JDK="$LDFLAGS_JDK -safeseh"
-    fi
-    # TODO: make -debug optional "--disable-full-debug-symbols"
-    LDFLAGS_JDK="$LDFLAGS_JDK -debug"
-    LDFLAGS_JDKLIB="${LDFLAGS_JDK} -dll -libpath:${JDK_OUTPUTDIR}/lib"
-    LDFLAGS_JDKLIB_SUFFIX=""
-    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
-      LDFLAGS_STACK_SIZE=1048576
-    else
-      LDFLAGS_STACK_SIZE=327680
-    fi
-    LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
-  else
-    if test "x$COMPILER_NAME" = xgcc; then
-      # If this is a --hash-style=gnu system, use --hash-style=both, why?
-      HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
-      if test -n "$HAS_GNU_HASH"; then
-        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
-      fi
-      if test "x$OPENJDK_TARGET_OS" = xlinux; then
-        # And since we now know that the linker is gnu, then add -z defs, to forbid
-        # undefined symbols in object files.
-        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
-        if test "x$DEBUG_LEVEL" = "xrelease"; then
-          # When building release libraries, tell the linker optimize them.
-          # Should this be supplied to the OSS linker as well?
-          LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
-        fi
-      fi
-    fi
-    LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
-        -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}"
-
-    # On some platforms (mac) the linker warns about non existing -L dirs.
-    # Add server first if available. Linking aginst client does not always produce the same results.
-    # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1.
-    # Default to server for other variants.
-    if test "x$JVM_VARIANT_SERVER" = xtrue; then
-      LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
-    elif test "x$JVM_VARIANT_CLIENT" = xtrue; then
-      LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client"
-    elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
-      LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal"
-    else
-      LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
-    fi
-
-    LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm"
-    if test "x$COMPILER_NAME" = xossc; then
-      LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc"
-    fi
-
-    LDFLAGS_JDKEXE="${LDFLAGS_JDK}"
-    if test "x$OPENJDK_TARGET_OS" = xlinux; then
-      LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
-    fi
-  fi
-
-  AC_SUBST(CFLAGS_JDKLIB)
-  AC_SUBST(CFLAGS_JDKEXE)
-
-  AC_SUBST(CXXFLAGS_JDKLIB)
-  AC_SUBST(CXXFLAGS_JDKEXE)
-
-  AC_SUBST(LDFLAGS_JDKLIB)
-  AC_SUBST(LDFLAGS_JDKEXE)
-  AC_SUBST(LDFLAGS_JDKLIB_SUFFIX)
-  AC_SUBST(LDFLAGS_JDKEXE_SUFFIX)
-  AC_SUBST(LDFLAGS_CXX_JDK)
-])
-
-
-# TOOLCHAIN_C_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
-#                                      [RUN-IF-FALSE])
-# ------------------------------------------------------------
-# Check that the C compiler supports an argument
-AC_DEFUN([TOOLCHAIN_C_COMPILER_CHECK_ARGUMENTS],
-[
-  AC_MSG_CHECKING([if the C compiler supports "$1"])
-  supports=yes
-
-  saved_cflags="$CFLAGS"
-  CFLAGS="$CFLAGS $1"
-  AC_LANG_PUSH([C])
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [], 
-      [supports=no])
-  AC_LANG_POP([C])
-  CFLAGS="$saved_cflags"
-
-  AC_MSG_RESULT([$supports])
-  if test "x$supports" = "xyes" ; then
-    m4_ifval([$2], [$2], [:])
-  else
-    m4_ifval([$3], [$3], [:])
-  fi
-])
-
-# TOOLCHAIN_CXX_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
-#                                        [RUN-IF-FALSE])
-# ------------------------------------------------------------
-# Check that the C++ compiler supports an argument
-AC_DEFUN([TOOLCHAIN_CXX_COMPILER_CHECK_ARGUMENTS],
-[
-  AC_MSG_CHECKING([if the C++ compiler supports "$1"])
-  supports=yes
-
-  saved_cxxflags="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAG $1"
-  AC_LANG_PUSH([C++])
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [], 
-      [supports=no])
-  AC_LANG_POP([C++])
-  CXXFLAGS="$saved_cxxflags"
-  
-  AC_MSG_RESULT([$supports])
-  if test "x$supports" = "xyes" ; then
-    m4_ifval([$2], [$2], [:])
-  else
-    m4_ifval([$3], [$3], [:])
-  fi
-])
-
-# TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
-#                                    [RUN-IF-FALSE])
-# ------------------------------------------------------------
-# Check that the C and C++ compilers support an argument
-AC_DEFUN([TOOLCHAIN_COMPILER_CHECK_ARGUMENTS],
-[
-  TOOLCHAIN_C_COMPILER_CHECK_ARGUMENTS([$1],
-  				       [C_COMP_SUPPORTS="yes"],
-				       [C_COMP_SUPPORTS="no"])
-  TOOLCHAIN_CXX_COMPILER_CHECK_ARGUMENTS([$1],
-  					 [CXX_COMP_SUPPORTS="yes"],
-					 [CXX_COMP_SUPPORTS="no"])
-
-  AC_MSG_CHECKING([if both compilers support "$1"])
-  supports=no
-  if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
-  
-  AC_MSG_RESULT([$supports])
-  if test "x$supports" = "xyes" ; then
-    m4_ifval([$2], [$2], [:])
-  else
-    m4_ifval([$3], [$3], [:])
-  fi
-])
-
-AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_MISC],
-[
-  # Some Zero and Shark settings.
-  # ZERO_ARCHFLAG tells the compiler which mode to build for
-  case "${OPENJDK_TARGET_CPU}" in
-    s390)
-      ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
-      ;;
-    *)
-      ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-  esac
-  TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$ZERO_ARCHFLAG], [], [ZERO_ARCHFLAG=""])
-  AC_SUBST(ZERO_ARCHFLAG)
-
-  # Check that the compiler supports -mX (or -qX on AIX) flags
-  # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does
-  TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}],
-      [COMPILER_SUPPORTS_TARGET_BITS_FLAG=true],
-      [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false])
-  AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
-
-
-  # Check for broken SuSE 'ld' for which 'Only anonymous version tag is allowed in executable.'
-  USING_BROKEN_SUSE_LD=no
-  if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$GCC" = xyes; then
-    AC_MSG_CHECKING([for broken SuSE 'ld' which only understands anonymous version tags in executables])
-    echo "SUNWprivate_1.1 { local: *; };" > version-script.map
-    echo "int main() { }" > main.c
-    if $CXX -Xlinker -version-script=version-script.map main.c 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then
-      AC_MSG_RESULT(no)
-      USING_BROKEN_SUSE_LD=no
-    else
-      AC_MSG_RESULT(yes)
-      USING_BROKEN_SUSE_LD=yes
-    fi
-    rm -rf version-script.map main.c
-  fi
-  AC_SUBST(USING_BROKEN_SUSE_LD)
-])
-
-# Setup the JTREG paths
-AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
-[
-  AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg],
-      [Regression Test Harness @<:@probed@:>@])],
-      [],
-      [with_jtreg=no])
-
-  if test "x$with_jtreg" = xno; then
-    # jtreg disabled
-    AC_MSG_CHECKING([for jtreg])
-    AC_MSG_RESULT(no)
-  else
-    if test "x$with_jtreg" != xyes; then
-      # with path specified.
-      JT_HOME="$with_jtreg"
-    fi
-
-    if test "x$JT_HOME" != x; then
-      AC_MSG_CHECKING([for jtreg])
-
-      # use JT_HOME enviroment var.
-      BASIC_FIXUP_PATH([JT_HOME])
-
-      # jtreg win32 script works for everybody
-      JTREGEXE="$JT_HOME/bin/jtreg"
-
-      if test ! -f "$JTREGEXE"; then
-        AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE])
-      fi
-
-      AC_MSG_RESULT($JTREGEXE)
-    else
-      # try to find jtreg on path
-      BASIC_REQUIRE_PROG(JTREGEXE, jtreg)
-      JT_HOME="`$DIRNAME $JTREGEXE`"
-    fi
-  fi
-
-  AC_SUBST(JT_HOME)
-  AC_SUBST(JTREGEXE)
-])
-
-AC_DEFUN_ONCE([TOOLCHAIN_SETUP_GCC6_COMPILER_FLAGS],
-[
-  # These flags are required for GCC 6 builds as undefined behaviour in OpenJDK code
-  # runs afoul of the more aggressive versions of these optimisations.
-  # Notably, value range propagation now assumes that the this pointer of C++
-  # member functions is non-null.
-  NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
-  TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror],
-  				     [], [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""])
-  AC_SUBST([NO_DELETE_NULL_POINTER_CHECKS_CFLAG])
-  NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse"
-  TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$NO_LIFETIME_DSE_CFLAG -Werror],
-  				     [], [NO_LIFETIME_DSE_CFLAG=""])
-  CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
-  AC_SUBST([NO_LIFETIME_DSE_CFLAG])
-])
diff --git a/common/autoconf/toolchain_windows.m4 b/common/autoconf/toolchain_windows.m4
deleted file mode 100644
index df050ba..0000000
--- a/common/autoconf/toolchain_windows.m4
+++ /dev/null
@@ -1,342 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
-[
-  if test "x$VS_ENV_CMD" = x; then
-    VS_VERSION="$1"
-    VS100BASE="$2"
-    METHOD="$3"
-    BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS100BASE)
-    if test -d "$VS100BASE"; then
-      if test -f "$VS100BASE/$VCVARSFILE"; then
-        AC_MSG_NOTICE([Found Visual Studio installation at $VS100BASE using $METHOD])
-        VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
-      else
-        AC_MSG_NOTICE([Found Visual Studio installation at $VS100BASE using $METHOD])
-        AC_MSG_NOTICE([Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring])
-      fi
-    fi
-  fi
-])
-
-AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT],
-[
-  if test "x$VS_ENV_CMD" = x; then
-    WIN_SDK_BASE="$1"
-    METHOD="$2"
-    BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(WIN_SDK_BASE)
-    if 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/SetEnv.Cmd"; then
-        AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
-        VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
-        if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-          VS_ENV_ARGS="/x86"
-        else
-          VS_ENV_ARGS="/x64"
-        fi
-      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
-])
-
-AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
-[
-  if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-    VCVARSFILE="vc/bin/vcvars32.bat"
-  else
-    VCVARSFILE="vc/bin/amd64/vcvars64.bat"
-  fi
-
-  VS_ENV_CMD=""
-  VS_ENV_ARGS=""
-  if test "x$with_toolsdir" != x; then
-    TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([2010], [$with_toolsdir/../..], [--with-tools-dir])
-  fi
-
-  if test "x$with_toolsdir" != x && 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 Visual Studio installation])
-    AC_MSG_NOTICE([Please point to the VC/bin directory within the Visual Studio installation])
-    AC_MSG_ERROR([Cannot locate a valid Visual Studio installation])
-  fi
-
-  if test "x$VS100COMNTOOLS" != x; then
-    TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([2010], [$VS100COMNTOOLS/../..], [VS100COMNTOOLS variable])
-  fi
-  if test "x$PROGRAMFILES" != x; then
-    TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([2010], [$PROGRAMFILES/Microsoft Visual Studio 10.0], [well-known name])
-  fi
-  TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([2010], [C:/Program Files/Microsoft Visual Studio 10.0], [well-known name])
-  TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([2010], [C:/Program Files (x86)/Microsoft Visual Studio 10.0], [well-known name])
-  TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([2013], [C:/Program Files (x86)/Microsoft Visual Studio 12.0], [well-known name])
-
-  if test "x$ProgramW6432" != x; then
-    TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$ProgramW6432/Microsoft SDKs/Windows/v7.1/Bin], [well-known name])
-  fi
-  if test "x$PROGRAMW6432" != x; then
-    TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$PROGRAMW6432/Microsoft SDKs/Windows/v7.1/Bin], [well-known name])
-  fi
-  if test "x$PROGRAMFILES" != x; then
-    TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$PROGRAMFILES/Microsoft SDKs/Windows/v7.1/Bin], [well-known name])
-  fi
-  TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([C:/Program Files/Microsoft SDKs/Windows/v7.1/Bin], [well-known name])
-  TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1/Bin], [well-known name])
-])
-
-# 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],
-[
-  # Store path to cygwin link.exe to help excluding it when searching for
-  # VS linker. This must be done before changing the PATH when looking for VS.
-  AC_PATH_PROG(CYGWIN_LINK, link)
-  if test "x$CYGWIN_LINK" != x; then
-    AC_MSG_CHECKING([if the first found link.exe is actually the Cygwin link tool])
-    "$CYGWIN_LINK" --version > /dev/null
-    if test $? -eq 0 ; then
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-      # This might be the VS linker. Don't exclude it later on.
-      CYGWIN_LINK=""
-    fi
-  fi
-
-  # First-hand choice is to locate and run the vsvars bat file.
-  TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE
-  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.
-    BASIC_FIXUP_EXECUTABLE(VS_ENV_CMD)
-
-    # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
-    AC_MSG_NOTICE([Trying to extract Visual Studio environment variables])
-    cd $OUTPUT_ROOT
-    # FIXME: The code betweeen ---- was inlined from a separate script and is not properly adapted
-    # to autoconf standards.
-
-    #----
-
-    # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment)
-    # but calculate the difference in Cygwin environment before/after running it and then
-    # apply the diff.
-
-    if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
-      _vs10varsall=`cygpath -a -m -s "$VS_ENV_CMD"`
-      _dosvs10varsall=`cygpath -a -w -s $_vs10varsall`
-      _dosbash=`cygpath -a -w -s \`which bash\`.*`
-    else
-      _dosvs10varsall=`cmd //c echo $VS_ENV_CMD`
-      _dosbash=`cmd //c echo \`which bash\``
-    fi
-
-    # generate the set of exported vars before/after the vs10 setup
-    $ECHO "@echo off"                                           >  localdevenvtmp.bat
-    $ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export0" >> localdevenvtmp.bat
-    $ECHO "call $_dosvs10varsall $VS_ENV_ARGS"                  >> localdevenvtmp.bat
-    $ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export1" >> localdevenvtmp.bat
-
-    # Now execute the newly created bat file.
-    # The | cat is to stop SetEnv.Cmd to mess with system colors on msys
-    cmd /c localdevenvtmp.bat | cat
-
-    # apply the diff (less some non-vs10 vars named by "!")
-    $SORT localdevenvtmp.export0 | $GREP -v "!" > localdevenvtmp.export0.sort
-    $SORT localdevenvtmp.export1 | $GREP -v "!" > localdevenvtmp.export1.sort
-    $COMM -1 -3 localdevenvtmp.export0.sort localdevenvtmp.export1.sort > localdevenv.sh
-
-    # cleanup
-    $RM localdevenvtmp*
-    #----
-    cd $CURDIR
-    if test ! -s $OUTPUT_ROOT/localdevenv.sh; then
-      AC_MSG_RESULT([no])
-      AC_MSG_NOTICE([Could not succesfully extract the envionment 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([or run "bash.exe -l" from a VS command prompt and then run configure from there.])
-      AC_MSG_ERROR([Cannot continue])
-    fi
-
-    # Now set all paths and other env variables. 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])
-    . $OUTPUT_ROOT/localdevenv.sh
-  else
-    # We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
-    AC_MSG_NOTICE([Cannot locate a valid Visual Studio installation, checking current environment])
-  fi
-
-  # At this point, we should have corrent variables in the environment, or we can't continue.
-  AC_MSG_CHECKING([for Visual Studio variables])
-
-  if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x || test "x$WINDOWSSDKDIR" != x; then
-    if test "x$INCLUDE" = x || test "x$LIB" = x; then
-      AC_MSG_RESULT([present but broken])
-      AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.])
-    else
-      AC_MSG_RESULT([ok])
-      # Remove any trailing \ from INCLUDE and LIB to avoid trouble in spec.gmk.
-      VS_INCLUDE=`$ECHO "$INCLUDE" | $SED 's/\\\\$//'`
-      VS_LIB=`$ECHO "$LIB" | $SED 's/\\\\$//'`
-      # Remove any paths containing # (typically F#) as that messes up make
-      PATH=`$ECHO "$PATH" | $SED 's/[[^:#]]*#[^:]*://g'`
-      VS_PATH="$PATH"
-      AC_SUBST(VS_INCLUDE)
-      AC_SUBST(VS_LIB)
-      AC_SUBST(VS_PATH)
-    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,])
-      AC_MSG_NOTICE([nor is this script run from a Visual Studio command prompt.])
-    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([or run "bash.exe -l" from a VS command prompt and then run configure from there.])
-    AC_MSG_ERROR([Cannot continue])
-  fi
-])
-
-AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL],
-[
-  POSSIBLE_MSVCR_DLL="$1"
-  METHOD="$2"
-  if test -e "$POSSIBLE_MSVCR_DLL"; then
-    AC_MSG_NOTICE([Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD])
-    
-    # Need to check if the found msvcr is correct architecture
-    AC_MSG_CHECKING([found msvcr100.dll architecture])
-    MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
-    if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
-      CORRECT_MSVCR_ARCH=386
-    else
-      CORRECT_MSVCR_ARCH=x86-64
-    fi
-    if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
-      AC_MSG_RESULT([ok])
-      MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
-      AC_MSG_CHECKING([for msvcr100.dll])
-      AC_MSG_RESULT([$MSVCR_DLL])
-    else
-      AC_MSG_RESULT([incorrect, ignoring])
-      AC_MSG_NOTICE([The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE])
-    fi
-  fi
-])
-
-AC_DEFUN([TOOLCHAIN_SETUP_MSVCR_DLL],
-[
-  AC_ARG_WITH(msvcr-dll, [AS_HELP_STRING([--with-msvcr-dll],
-      [copy this msvcr100.dll into the built JDK (Windows only) @<:@probed@:>@])])
-
-  if test "x$with_msvcr_dll" != x; then
-    # If given explicitely by user, do not probe. If not present, fail directly.
-    TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$with_msvcr_dll], [--with-msvcr-dll])
-    if test "x$MSVCR_DLL" = x; then
-      AC_MSG_ERROR([Could not find a proper msvcr100.dll as specified by --with-msvcr-dll])
-    fi
-  fi
-  
-  if test "x$MSVCR_DLL" = x; then
-    # Probe: Using well-known location from Visual Studio 10.0
-    if test "x$VCINSTALLDIR" != x; then
-      CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
-      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VC_INSTALL_DIR)
-      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-        POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcr100.dll"
-      else
-        POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcr100.dll"
-      fi
-      TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in VCINSTALLDIR])
-    fi
-  fi
-
-  if test "x$MSVCR_DLL" = x; then
-    # Probe: Check in the Boot JDK directory.
-    POSSIBLE_MSVCR_DLL="$BOOT_JDK/bin/msvcr100.dll"
-    TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in Boot JDK])
-  fi
-  
-  if test "x$MSVCR_DLL" = x; then
-    # Probe: Look in the Windows system32 directory 
-    CYGWIN_SYSTEMROOT="$SYSTEMROOT"
-    BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_SYSTEMROOT)
-    POSSIBLE_MSVCR_DLL="$CYGWIN_SYSTEMROOT/system32/msvcr100.dll"
-    TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in SYSTEMROOT])
-  fi
-
-  if test "x$MSVCR_DLL" = x; then
-    # Probe: If Visual Studio Express is installed, there is usually one with the debugger
-    if test "x$VS100COMNTOOLS" != x; then
-      CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
-      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR)
-      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-        POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x64/ | $HEAD --lines 1`
-      else
-        POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x86/ | $HEAD --lines 1`
-      fi
-      TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [search of VS100COMNTOOLS])
-    fi
-  fi
-      
-  if test "x$MSVCR_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 up something)
-    if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
-      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-        POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x64 | $HEAD --lines 1`
-      else
-        POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
-        if test "x$POSSIBLE_MSVCR_DLL" = x; then
-          # We're grasping at straws now...
-          POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $HEAD --lines 1`
-        fi
-      fi
-      
-      TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [search of VCINSTALLDIR])
-    fi
-  fi
-  
-  if test "x$MSVCR_DLL" = x; then
-    AC_MSG_CHECKING([for msvcr100.dll])
-    AC_MSG_RESULT([no])
-    AC_MSG_ERROR([Could not find msvcr100.dll. Please specify using --with-msvcr-dll.])
-  fi
-
-  BASIC_FIXUP_PATH(MSVCR_DLL)
-])
diff --git a/common/autoconf/version-numbers b/common/autoconf/version-numbers
deleted file mode 100644
index f567f31..0000000
--- a/common/autoconf/version-numbers
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2011, 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.
-#
-
-JDK_MAJOR_VERSION=1
-JDK_MINOR_VERSION=8
-JDK_MICRO_VERSION=0
-JDK_UPDATE_VERSION=
-LAUNCHER_NAME=openjdk
-PRODUCT_NAME=OpenJDK
-PRODUCT_SUFFIX="Runtime Environment"
-JDK_RC_PLATFORM_NAME=Platform
-COMPANY_NAME=N/A
-
-# Might need better names for these
-MACOSX_BUNDLE_NAME_BASE="OpenJDK"
-MACOSX_BUNDLE_ID_BASE="net.java.openjdk"
diff --git a/common/bin/boot_cycle.sh b/common/bin/boot_cycle.sh
deleted file mode 100644
index 180c39c..0000000
--- a/common/bin/boot_cycle.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2012, 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.
-#
-
-# The boot_cycle.sh script performs two complete image builds (no javadoc though....)
-# where the second build uses the first build as the boot jdk.
-#
-# This is useful to verify that the build is self hoisting and assists
-# in flushing out bugs. You can follow up with compare_objects.sh to check
-# that the two boot_cycle_?/images/j2sdk are identical. They should be.
-#
-# Usage:
-# Specify the configure arguments to boot_cycle.sh, for example:
-#
-#    sh common/bin/boot_cycle.sh --enable-debug --with-jvm-variants=server
-#
-# The same arguments will be used for both builds, except of course --with-boot-jdk
-# that will be adjusted to boot_cycle_1 for the second build.
-
-SCRIPT_DIR=`pwd`/`dirname $0`
-ROOT_DIR=`(cd $SCRIPT_DIR/../.. ; pwd)`
-BUILD_DIR=$ROOT_DIR/build
-mkdir -p $BUILD_DIR
-AUTOCONF_DIR=`(cd $SCRIPT_DIR/../autoconf ; pwd)`
-BOOT_CYCLE_1_DIR=$BUILD_DIR/boot_cycle_1
-BOOT_CYCLE_2_DIR=$BUILD_DIR/boot_cycle_2
-
-# Create the boot cycle dirs in the build directory.
-mkdir -p $BOOT_CYCLE_1_DIR
-mkdir -p $BOOT_CYCLE_2_DIR
-
-cd $BOOT_CYCLE_1_DIR
-# Configure!
-sh $AUTOCONF_DIR/configure "$@"
-# Now build!
-make images
-
-if ! test -x $BOOT_CYCLE_1_DIR/images/j2sdk-image/bin/java ; then
-    echo Failed to build the executable $BOOT_CYCLE_1_DIR/images/j2sdk-image/bin/java
-    exit 1
-fi
-
-cd $BOOT_CYCLE_2_DIR
-# Pickup the configure arguments, but drop any --with-boot-jdk=....
-# and add the correct --with-boot-jdk=...boot_cycle_1... at the end.
-ARGUMENTS="`cat $BOOT_CYCLE_1_DIR/configure-arguments|sed 's/--with-boot-jdk=[^ ]*//'` --with-boot-jdk=$BOOT_CYCLE_1_DIR/images/j2sdk-image"
-# Configure using these adjusted arguments.
-sh $AUTOCONF_DIR/configure $ARGUMENTS
-# Now build!
-make images
-
-if ! test -x $BOOT_CYCLE_2_DIR/images/j2sdk-image/bin/java ; then
-    echo Failed to build the final executable $BOOT_CYCLE_2_DIR/images/j2sdk-image/bin/java
-    exit 1
-fi
-
-
diff --git a/common/bin/compare-objects.sh b/common/bin/compare-objects.sh
deleted file mode 100644
index 7701a67..0000000
--- a/common/bin/compare-objects.sh
+++ /dev/null
@@ -1,235 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2012, 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.
-#
-
-# MANUAL
-#
-# ./common/bin/compare-objects.sh old_jdk_build_dir new_jdk_build_dir
-#
-# Compares object files
-#
-
-if [ "x$1" = "x-h" ] || [ "x$1" = "x--help" ] || [ "x$1" == "x" ]; then
-    echo "bash ./common/bin/compare-objects.sh old_jdk_build_dir new_jdk_build_dir <pattern>"
-    echo ""
-    echo "Compare object files"
-    echo ""
-    exit 10
-fi
-
-#######
-#
-# List of files (grep patterns) that are ignored
-# 
-# 1) hotspot object files
-IGNORE="-e hotspot"
-
-# 2) various build artifacts: sizer.32.o sizer.64.o dummyodbc.o
-#    these are produced during build and then e.g run to produce other data
-#    i.e not directly put into build => safe to ignore
-IGNORE="${IGNORE} -e sizer.32.o -e sizer.64.o"
-IGNORE="${IGNORE} -e dummyodbc.o"
-IGNORE="${IGNORE} -e genSolarisConstants.o"
-IGNORE="${IGNORE} -e genUnixConstants.o"
-
-OLD="$1"
-NEW="$2"
-shift; shift
-PATTERN="$*"
-
-if [ -f $NEW/spec.sh ]; then
-    . $NEW/spec.sh
-elif [ -f $NEW/../../spec.sh ]; then
-    . $NEW/../../spec.sh
-elif [ -f $OLD/spec.sh ]; then
-    . $OLD/spec.sh
-elif [ -f $OLD/../../spec.sh ]; then
-    . $OLD/../../spec.sh
-else
-    echo "Unable to find spec.sh"
-    echo "Giving up"
-    exit 1
-fi
-
-export COMPARE_ROOT=/tmp/cimages.$USER/objects
-mkdir -p $COMPARE_ROOT
-
-(${CD} $OLD && ${FIND} . -name '*.o') > $COMPARE_ROOT/list.old
-(${CD} $NEW && ${FIND} . -name '*.o') > $COMPARE_ROOT/list.new
-
-# On macosx JobjC is build in both i386 and x86_64 variant (universial binary)
-#   but new build only builds the x86_64
-# Remove the 386 variants from comparison...to avoid "false" positives
-${GREP} -v 'JObjC.dst/Objects-normal/i386' $COMPARE_ROOT/list.old > $COMPARE_ROOT/list.old.new
-${CP} $COMPARE_ROOT/list.old $COMPARE_ROOT/list.old.full
-${CP} $COMPARE_ROOT/list.old.new $COMPARE_ROOT/list.old
-
-findnew() {
-    arg_1=$1
-    arg_2=$2
-
-    # special case 1 unpack-cmd => unpackexe
-    arg_1=`${ECHO} $arg_1 | ${SED} 's!unpack-cmd!unpackexe!g'`
-    arg_2=`${ECHO} $arg_2 | ${SED} 's!unpack-cmd!unpackexe!g'`
-
-    # special case 2 /JObjC.dst/ => /libjobjc/
-    arg_1=`${ECHO} $arg_1 | ${SED} 's!/JObjC.dst/!/libjobjc/!g'`
-    arg_2=`${ECHO} $arg_2 | ${SED} 's!/JObjC.dst/!/libjobjc/!g'`
-
-    full=`${ECHO} $arg_1 | ${SED} 's!\.!\\\.!g'`
-    medium=`${ECHO} $arg_1 | ${SED} 's!.*/\([^/]*/[^/]*\)!\1!'`
-    short=`${ECHO} $arg_2 | ${SED} 's!\.!\\\.!g'`
-    if [ "`${GREP} -c "/$full" $COMPARE_ROOT/list.new`" -eq 1 ]
-    then
-	${ECHO} $NEW/$arg_1
-	return
-    fi
-
-    if [ "`${GREP} -c "$medium" $COMPARE_ROOT/list.new`" -eq 1 ]
-    then
-	${GREP} "$medium" $COMPARE_ROOT/list.new
-	return
-    fi
-
-    if [ "`${GREP} -c "/$short" $COMPARE_ROOT/list.new`" -eq 1 ]
-    then
-	${GREP} "/$short" $COMPARE_ROOT/list.new
-	return
-    fi
-
-    # old style has "dir" before obj{64}
-    dir=`${ECHO} $arg_1 | ${SED} 's!.*/\([^/]*\)/obj[64]*.*!\1!g'`
-    if [ -n "$dir" -a "$dir" != "$arg_1" ]
-    then
-	if [ "`${GREP} $dir $COMPARE_ROOT/list.new | ${GREP} -c "/$short"`" -eq 1 ]
-	then
-	    ${GREP} $dir $COMPARE_ROOT/list.new | ${GREP} "/$short"
-	    return
-	fi
-
-	# Try with lib$dir/
-	if [ "`${GREP} "lib$dir/" $COMPARE_ROOT/list.new | ${GREP} -c "/$short"`" -eq 1 ]
-	then
-	    ${GREP} "lib$dir/" $COMPARE_ROOT/list.new | ${GREP} "/$short"
-	    return
-	fi
-
-	# Try with $dir_objs
-	if [ "`${GREP} "${dir}_objs" $COMPARE_ROOT/list.new | ${GREP} -c "/$short"`" -eq 1 ]
-	then
-	    ${GREP} "${dir}_objs" $COMPARE_ROOT/list.new | ${GREP} "/$short"
-	    return
-	fi
-    fi
-
-    # check for some specifics...
-    for i in demo hotspot jobjc
-    do
-	if [ "`${ECHO} $full | ${GREP} -c $i`" -gt 0 ]
-	then
-	    if [ "`${GREP} $i $COMPARE_ROOT/list.new | ${GREP} -c "/$short"`" -eq 1 ]
-	    then
-		${GREP} $i $COMPARE_ROOT/list.new | ${GREP} "/$short"
-		return
-	    fi
-	fi
-    done
-
-    # check for specific demo
-    demo=`${ECHO} $arg_1 | ${SED} 's!.*/demo/jvmti/\([^/]*\)/.*!\1!g'`
-    if [ -n "$demo" -a "$dir" != "$demo" ]
-    then
-	if [ "`${GREP} $demo $COMPARE_ROOT/list.new | ${GREP} -c "/$short"`" -eq 1 ]
-	then
-	    ${GREP} $demo $COMPARE_ROOT/list.new | ${GREP} "/$short"
-	    return
-	fi
-    fi
-
-    return
-}
-
-compare() {
-    old=$1
-    new=$2
-    ${DIFF} $old $new > /dev/null
-    res=$?
-    if [ $res -eq 0 ]
-    then
-	${ECHO} 0
-	return
-    fi
-
-    # check if stripped objects gives equality
-    ${CP} $old $COMPARE_ROOT/`basename $old`.old
-    ${CP} $new $COMPARE_ROOT/`basename $old`.new
-    ${POST_STRIP_CMD} $COMPARE_ROOT/`basename $old`.old $COMPARE_ROOT/`basename $old`.new > /dev/null 2>&1
-    ${DIFF} $COMPARE_ROOT/`basename $old`.old $COMPARE_ROOT/`basename $old`.new > /dev/null
-    res=$?
-    ${RM} $COMPARE_ROOT/`basename $old`.old $COMPARE_ROOT/`basename $old`.new
-    if [ $res -eq 0 ]
-    then
-	${ECHO} S
-	return
-    fi
-
-    name=`basename $1 | ${SED} 's!\.o!!'`
-    cntold=`strings $old | ${GREP} -c $name`
-    cntnew=`strings $new | ${GREP} -c $name`
-    
-    if [ $cntold -gt 0 -a $cntnew -gt 0 ]
-    then
-	${ECHO} F
-	return
-    fi
-
-    ${ECHO} 1
-}
-
-for F in `${CAT} $COMPARE_ROOT/list.old`
-do
-    if [ "${IGNORE}" ] && [ "`${ECHO} $F | ${GREP} ${IGNORE}`" ]
-    then
-	#
-	# skip ignored files
-        #
-	continue;
-    fi
-
-    if [ "$PATTERN" ] && [ `${ECHO} $F | ${GREP} -c $PATTERN` -eq 0 ]
-    then
-	continue;
-    fi
-
-    f=`basename $F`
-    o=$OLD/$F
-    n=`findnew $F $f`
-
-    if [ "$n" ]
-    then	
-	n="$NEW/$n"
-	${ECHO} `compare $o $n` : $f : $o : $n
-    else
-	${ECHO} "- : $f : $o "
-    fi
-done
diff --git a/common/bin/compare.sh b/common/bin/compare.sh
deleted file mode 100644
index 08c0d6b..0000000
--- a/common/bin/compare.sh
+++ /dev/null
@@ -1,1411 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2012, 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.
-#
-
-# This script is processed by configure before it's usable. It is run from 
-# the root of the build directory.
-
-
-##########################################################################################
-
-# Check that we are run via the wrapper generated by configure
-if [ -z "$SRC_ROOT" ]; then
-    echo "Error: You must run this script using build/[conf]/compare.sh"
-    exit 1
-fi
-
-if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
-    FULLDUMP_CMD="$OTOOL -v -V -h -X -t -d"
-    LDD_CMD="$OTOOL -L"
-    DIS_CMD="$OTOOL -v -t"
-    STAT_PRINT_SIZE="-f %z"
-elif [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-    FULLDUMP_CMD="$DUMPBIN -all"
-    LDD_CMD="$DUMPBIN -dependants | $GREP .dll"
-    DIS_CMD="$DUMPBIN -disasm:nobytes"
-    STAT_PRINT_SIZE="-c %s"
-else
-    FULLDUMP_CMD="$READELF -a"
-    LDD_CMD="$LDD"
-    DIS_CMD="$OBJDUMP -d"
-    STAT_PRINT_SIZE="-c %s"
-fi
-
-UNARCHIVE="$UNZIP -q"
-
-COMPARE_EXCEPTIONS_INCLUDE="$SRC_ROOT/common/bin/compare_exceptions.sh.incl"
-if [ ! -e "$COMPARE_EXCEPTIONS_INCLUDE" ]; then
-    echo "Error: Cannot locate the exceptions file, it should have been here: $COMPARE_EXCEPTIONS_INCLUDE"
-    exit 1
-fi
-# Include exception definitions
-. "$COMPARE_EXCEPTIONS_INCLUDE"
-
-##########################################################################################
-# Compare text files and ignore specific differences:
-#
-#  * Timestamps in Java sources generated by idl2java
-#  * Sorting order and cleanup style in .properties files
-
-diff_text() {
-    OTHER_FILE=$1
-    THIS_FILE=$2
-
-    SUFFIX="${THIS_FILE##*.}"
-
-    TMP=1
-
-    if [[ "$THIS_FILE" = *"META-INF/MANIFEST.MF" ]]; then
-        TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
-            $GREP '^[<>]' | \
-            $SED -e '/[<>] Ant-Version: Apache Ant .*/d' \
-	         -e '/[<>] Created-By: .* (Oracle Corporation).*/d')
-    fi
-    if test "x$SUFFIX" = "xjava"; then
-        TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
-            $GREP '^[<>]' | \
-            $SED -e '/[<>] \* from.*\.idl/d' \
-                 -e '/[<>] \*.*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
-                 -e '/[<>] \*.*[0-9]\{4\} [0-9][0-9]*:[0-9]\{2\}:[0-9]\{2\}.*/d' \
-                 -e '/\/\/ Generated from input file.*/d' \
-                 -e '/\/\/ This file was generated AUTOMATICALLY from a template file.*/d' \
-                 -e '/\/\/ java GenerateCharacter.*/d')
-    fi
-    # Ignore date strings in class files.
-    # On Macosx the system sources for generated java classes produce different output on 
-    # consequtive invokations seemingly randomly.
-    # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this.
-    if test "x$SUFFIX" = "xclass"; then
-        # To improve performance when large diffs are found, do a rough filtering of classes
-        # elibeble for these exceptions
-        if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \
-	        -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \
-	        -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then
-            $JAVAP -c -constants -l -p ${OTHER_FILE} >  ${OTHER_FILE}.javap
-            $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap
-            TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
-                $GREP '^[<>]' | \
-                $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
-		     -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \
- 	             -e '/[<>].*Point   Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \
-	             -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \
-	             -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d')
-        fi
-    fi
-    if test "x$SUFFIX" = "xproperties"; then
-        # Run through nawk to add possibly missing newline at end of file.
-        $CAT $OTHER_FILE | $NAWK '{ print }' > $OTHER_FILE.cleaned
-# Disable this exception since we aren't changing the properties cleaning method yet.
-#        $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e  's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
-#            | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
-#  	    | $SED -e '/^#/d' -e '/^$/d' \
-#            -e :a -e '/\\$/N; s/\\\n//; ta' \
-#  	    -e 's/^[ \t]*//;s/[ \t]*$//' \
-#	    -e 's/\\=/=/' | LC_ALL=C $SORT > $OTHER_FILE.cleaned
-        TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
-    fi
-    if test -n "$TMP"; then
-        echo Files $OTHER_FILE and $THIS_FILE differ
-        return 1
-    fi
-
-    return 0
-}
-
-##########################################################################################
-# Compare directory structure
-
-compare_dirs() {
-    THIS_DIR=$1
-    OTHER_DIR=$2
-    WORK_DIR=$3
-
-    mkdir -p $WORK_DIR
-
-    (cd $OTHER_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_other)
-    (cd $THIS_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_this)
-
-    $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_other > $WORK_DIR/dirs_diff
-    
-    echo -n Directory structure...
-    if [ -s $WORK_DIR/dirs_diff ]; then
-        echo Differences found.
-        REGRESSIONS=true
-        # Differences in directories found.
-        ONLY_OTHER=$($GREP '<' $WORK_DIR/dirs_diff)
-        if [ "$ONLY_OTHER" ]; then
-            echo Only in $OTHER
-            $GREP '<' $WORK_DIR/dirs_diff | $SED 's|< ./|    |g'
-        fi
-        ONLY_THIS=$($GREP '>' $WORK_DIR/dirs_diff)
-        if [ "$ONLY_THIS" ]; then
-            echo Only in $THIS
-            $GREP '>' $WORK_DIR/dirs_diff | $SED 's|> ./|    |g'
-        fi
-    else
-        echo Identical!
-    fi
-}
-
-
-##########################################################################################
-# Compare file structure
-
-compare_files() {
-    THIS_DIR=$1
-    OTHER_DIR=$2
-    WORK_DIR=$3
-
-    $MKDIR -p $WORK_DIR
-
-    (cd $OTHER_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_other)
-    (cd $THIS_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_this)
-    
-    $DIFF $WORK_DIR/files_other $WORK_DIR/files_this > $WORK_DIR/files_diff
-
-    echo -n File names...
-    if [ -s $WORK_DIR/files_diff ]; then
-        echo Differences found.
-        REGRESSIONS=true
-        # Differences in files found.
-        ONLY_OTHER=$($GREP '<' $WORK_DIR/files_diff)
-        if [ "$ONLY_OTHER" ]; then
-            echo Only in $OTHER
-            $GREP '<' $WORK_DIR/files_diff | $SED 's|< ./|    |g'
-        fi
-        ONLY_THIS=$($GREP '>' $WORK_DIR/files_diff)
-        if [ "$ONLY_THIS" ]; then
-            echo Only in $THIS
-            $GREP '>' $WORK_DIR/files_diff | $SED 's|> ./|    |g'
-        fi
-    else
-        echo Identical!
-    fi
-}
-
-
-##########################################################################################
-# Compare permissions
-
-compare_permissions() {
-    THIS_DIR=$1
-    OTHER_DIR=$2
-    WORK_DIR=$3
-
-    mkdir -p $WORK_DIR
-
-    echo -n Permissions...
-    found=""
-    for f in `cd $OTHER_DIR && $FIND . -type f`
-    do
-        if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
-        if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
-        OP=`ls -l ${OTHER_DIR}/$f | awk '{printf("%.10s\n", $1);}'`
-        TP=`ls -l ${THIS_DIR}/$f | awk '{printf("%.10s\n", $1);}'`
-        if [ "$OP" != "$TP" ]
-        then
-	    if [ -z "$found" ]; then echo ; found="yes"; fi
-	    $PRINTF "\told: ${OP} new: ${TP}\t$f\n"
-        fi
-    done
-    if [ -z "$found" ]; then 
-        echo "Identical!"
-    else
-        REGRESSIONS=true
-    fi
-}
-
-##########################################################################################
-# Compare file command output
-
-compare_file_types() {
-    THIS_DIR=$1
-    OTHER_DIR=$2
-    WORK_DIR=$3
-
-    $MKDIR -p $WORK_DIR
-
-    echo -n File types...
-    found=""
-    for f in `cd $OTHER_DIR && $FIND . ! -type d`
-    do
-        if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
-        if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
-        OF=`cd ${OTHER_DIR} && $FILE -h $f`
-        TF=`cd ${THIS_DIR} && $FILE -h $f`
-        if [ "$f" = "./src.zip" ] || [[ "$f" = *"/Home/src.zip" ]] || [[ "$f" = *"/lib/JObjC.jar" ]]
-        then
-	    if [ "`echo $OF | $GREP -ic zip`" -gt 0 -a "`echo $TF | $GREP -ic zip`" -gt 0 ]
-	    then
-	        # the way we produces zip-files make it so that directories are stored in old file
-	        # but not in new (only files with full-path)
-	        # this makes file-5.09 report them as different
-	        continue;
-	    fi
-        fi
-        
-        if [ "$OF" != "$TF" ]
-        then
-	    if [ -z "$found" ]; then echo ; found="yes"; fi
-	    $PRINTF "\tother: ${OF}\n\tthis : ${TF}\n"
-        fi
-    done
-    if [ -z "$found" ]; then 
-        echo "Identical!"
-    else
-        REGRESSIONS=true
-    fi
-}
-
-##########################################################################################
-# Compare the rest of the files
-
-compare_general_files() {
-    THIS_DIR=$1
-    OTHER_DIR=$2
-    WORK_DIR=$3
-    
-    GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" ! -name "*.zip" \
-        ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \
-        ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \
-        ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \
-        ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" \
-        | $GREP -v "./bin/"  | $SORT | $FILTER)
-
-    echo General files...
-    for f in $GENERAL_FILES
-    do
-        if [ -e $OTHER_DIR/$f ]; then
-            SUFFIX="${f##*.}"
-            if [ "$(basename $f)" = "release" ]; then
-                # Ignore differences in change numbers in release file.
-                OTHER_FILE=$WORK_DIR/$f.other
-                THIS_FILE=$WORK_DIR/$f.this
-                $MKDIR -p $(dirname $OTHER_FILE)
-                $MKDIR -p $(dirname $THIS_FILE)
-                $CAT $OTHER_DIR/$f | $SED 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' > $OTHER_FILE
-                $CAT $THIS_DIR/$f  | $SED 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' > $THIS_FILE
-            elif [ "x$SUFFIX" = "xhtml" ]; then
-                # Ignore time stamps in docs files
-                OTHER_FILE=$WORK_DIR/$f.other
-                THIS_FILE=$WORK_DIR/$f.this
-                $MKDIR -p $(dirname $OTHER_FILE)
-                $MKDIR -p $(dirname $THIS_FILE)
-                #Note that | doesn't work on mac sed.
-                $CAT $OTHER_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
-                                          -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \
-                                          -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \
-                                          -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \
-                                          -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \
-                    > $OTHER_FILE
-                $CAT $THIS_DIR/$f  | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
-                                          -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \
-                                          -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \
-                                          -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \
-                                          -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \
-                    > $THIS_FILE
-            else
-                OTHER_FILE=$OTHER_DIR/$f
-                THIS_FILE=$THIS_DIR/$f
-            fi
-            DIFF_OUT=$($DIFF $OTHER_FILE $THIS_FILE 2>&1)
-            if [ -n "$DIFF_OUT" ]; then
-                echo $f
-                REGRESSIONS=true
-                if [ "$SHOW_DIFFS" = "true" ]; then
-                    echo "$DIFF_OUT"
-                fi
-            fi
-        fi
-    done
-
-
-}
-
-##########################################################################################
-# Compare zip file
-
-compare_zip_file() {
-    THIS_DIR=$1
-    OTHER_DIR=$2
-    WORK_DIR=$3
-    ZIP_FILE=$4
-    # Optionally provide different name for other zipfile
-    OTHER_ZIP_FILE=$5
-
-    THIS_ZIP=$THIS_DIR/$ZIP_FILE
-    if [ -n "$OTHER_ZIP_FILE" ]; then
-        OTHER_ZIP=$OTHER_DIR/$OTHER_ZIP_FILE
-    else
-        OTHER_ZIP=$OTHER_DIR/$ZIP_FILE
-    fi
-
-    THIS_SUFFIX="${THIS_ZIP##*.}"
-    OTHER_SUFFIX="${OTHER_ZIP##*.}"
-    if [ "$THIS_SUFFIX" != "$OTHER_SUFFIX" ]; then
-        echo The files do not have the same suffix type!
-        return 2
-    fi
-
-    TYPE="$THIS_SUFFIX"
-
-    if $CMP $OTHER_ZIP $THIS_ZIP > /dev/null
-    then
-        return 0
-    fi
-    # Not quite identical, the might still contain the same data.
-    # Unpack the jar/zip files in temp dirs
-    
-    THIS_UNZIPDIR=$WORK_DIR/$ZIP_FILE.this
-    OTHER_UNZIPDIR=$WORK_DIR/$ZIP_FILE.other
-    $RM -rf $THIS_UNZIPDIR $OTHER_UNZIPDIR
-    $MKDIR -p $THIS_UNZIPDIR
-    $MKDIR -p $OTHER_UNZIPDIR
-    (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP)
-    (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP)
-
-    # Find all archives inside and unzip them as well to compare the contents rather than
-    # the archives. pie.jar.pack.gz i app3.war is corrupt, skip it.
-    EXCEPTIONS="pie.jar.pack.gz"
-    for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
-        ($UNPACK200 $pack $pack.jar)
-        # Filter out the unzipped archives from the diff below.
-        EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
-    done
-    for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
-        ($UNPACK200 $pack $pack.jar)
-        EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
-    done
-    for zip in $($FIND $THIS_UNZIPDIR -name "*.jar" -o -name "*.zip"); do
-        $MKDIR $zip.unzip
-        (cd $zip.unzip && $UNARCHIVE $zip)
-        EXCEPTIONS="$EXCEPTIONS $zip"
-    done
-    for zip in $($FIND $OTHER_UNZIPDIR -name "*.jar" -o -name "*.zip"); do
-        $MKDIR $zip.unzip
-        (cd $zip.unzip && $UNARCHIVE $zip)
-        EXCEPTIONS="$EXCEPTIONS $zip"
-    done
-
-    CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff
-    # On solaris, there is no -q option.
-    if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
-        LC_ALL=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \
-            | $GREP -v -e "^<" -e "^>" -e "^Common subdirectories:" \
-            > $CONTENTS_DIFF_FILE
-    else
-        LC_ALL=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE
-    fi
-
-    ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE)
-    ONLY_THIS=$($GREP "^Only in $THIS_UNZIPDIR" $CONTENTS_DIFF_FILE)
-
-    return_value=0
-
-    if [ -n "$ONLY_OTHER" ]; then
-        echo "        Only OTHER $ZIP_FILE contains:"
-        echo "$ONLY_OTHER" | sed "s|Only in $OTHER_UNZIPDIR|            |"g | sed 's|: |/|g'
-        return_value=1
-    fi
-
-    if [ -n "$ONLY_THIS" ]; then
-        echo "        Only THIS $ZIP_FILE contains:"
-        echo "$ONLY_THIS" | sed "s|Only in $THIS_UNZIPDIR|            |"g | sed 's|: |/|g'
-        return_value=1
-    fi
-
-    if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
-        DIFFING_FILES=$($GREP -e "differ$" -e "^diff " $CONTENTS_DIFF_FILE \
-            | $CUT -f 3 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g")
-    else
-        DIFFING_FILES=$($GREP -e "differ$" $CONTENTS_DIFF_FILE \
-            | $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g")
-    fi
-
-    $RM -f $WORK_DIR/$ZIP_FILE.diffs
-    for file in $DIFFING_FILES; do
-	if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then
-            diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs
-	fi
-    done
-
-    if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then
-        return_value=1
-        echo "        Differing files in $ZIP_FILE"
-        $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP differ | cut -f 2 -d ' ' | \
-            $SED "s|$OTHER_UNZIPDIR|            |g" > $WORK_DIR/$ZIP_FILE.difflist
-        $CAT $WORK_DIR/$ZIP_FILE.difflist
-
-        if [ -n "$SHOW_DIFFS" ]; then
-            for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do
-                if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then
-                    LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap
-                elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then
-                    LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i
-                else
-                    LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i
-                fi
-            done
-        fi
-    fi
-
-    return $return_value
-}
-
-
-##########################################################################################
-# Compare all zip files
-
-compare_all_zip_files() {
-    THIS_DIR=$1
-    OTHER_DIR=$2
-    WORK_DIR=$3
-
-    ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.zip" | $SORT | $FILTER )
-
-    if [ -n "$ZIPS" ]; then
-        echo Zip files...
-
-        return_value=0
-        for f in $ZIPS; do
-            if [ -f "$OTHER_DIR/$f" ]; then
-                compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
-                if [ "$?" != "0" ]; then
-                    return_value=1
-                    REGRESSIONS=true
-                fi
-            fi
-        done
-    fi
-
-    return $return_value
-}
-
-##########################################################################################
-# Compare all jar files
-
-compare_all_jar_files() {
-    THIS_DIR=$1
-    OTHER_DIR=$2
-    WORK_DIR=$3
-
-    # TODO filter?
-    ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" | $SORT | $FILTER)
-
-    if [ -n "$ZIPS" ]; then
-        echo Jar files...
-
-        return_value=0
-        for f in $ZIPS; do
-            if [ -f "$OTHER_DIR/$f" ]; then
-                compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
-                if [ "$?" != "0" ]; then
-                    return_value=1
-                    REGRESSIONS=true
-                fi
-            fi
-        done
-    fi
-
-    return $return_value
-}
-
-##########################################################################################
-# Compare binary (executable/library) file
-
-compare_bin_file() {
-    THIS_DIR=$1
-    OTHER_DIR=$2
-    WORK_DIR=$3
-    BIN_FILE=$4
-
-    THIS_FILE=$THIS_DIR/$BIN_FILE
-    OTHER_FILE=$OTHER_DIR/$BIN_FILE
-    NAME=$(basename $BIN_FILE)
-    WORK_FILE_BASE=$WORK_DIR/$BIN_FILE
-    FILE_WORK_DIR=$(dirname $WORK_FILE_BASE)
-
-    $MKDIR -p $FILE_WORK_DIR
-
-    ORIG_THIS_FILE="$THIS_FILE"
-    ORIG_OTHER_FILE="$OTHER_FILE"
-
-    if [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then
-        THIS_STRIPPED_FILE=$FILE_WORK_DIR/this/$NAME
-        OTHER_STRIPPED_FILE=$FILE_WORK_DIR/other/$NAME
-        $MKDIR -p $FILE_WORK_DIR/this $FILE_WORK_DIR/other
-        $CP $THIS_FILE $THIS_STRIPPED_FILE
-        $CP $OTHER_FILE $OTHER_STRIPPED_FILE
-        $STRIP $THIS_STRIPPED_FILE
-        $STRIP $OTHER_STRIPPED_FILE
-        THIS_FILE="$THIS_STRIPPED_FILE"
-        OTHER_FILE="$OTHER_STRIPPED_FILE"
-    fi
-
-    if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-	unset _NT_SYMBOL_PATH
-	# On windows we need to unzip the debug symbols, if present
-	OTHER_FILE_BASE=${OTHER_FILE/.dll/}
-	OTHER_FILE_BASE=${OTHER_FILE_BASE/.exe/}
-	DIZ_NAME=$(basename $OTHER_FILE_BASE).diz
-        # java.exe and java.dll diz files will have the same name. Have to
-	# make sure java.exe gets the right one. This is only needed for 
-	# OTHER since in the new build, all pdb files are left around.
-	if [ "$NAME" = "java.exe" ] && [ -f "$OTHER/tmp/java/java/obj64/java.diz" ]; then
-	    OTHER_DIZ_FILE="$OTHER/tmp/java/java/obj64/java.diz"
-	elif [ -f "${OTHER_FILE_BASE}.diz" ]; then
-	    OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz
-	else
-            # Some files, jli.dll, appears twice in the image but only one of
-	    # thme has a diz file next to it.
-	    OTHER_DIZ_FILE="$($FIND $OTHER_DIR -name $DIZ_NAME | $SED 1q)"
-	    if [ ! -f "$OTHER_DIZ_FILE" ]; then
-		# As a last resort, look for diz file in the whole build output
-		# dir.
-		OTHER_DIZ_FILE="$($FIND $OTHER -name $DIZ_NAME | $SED 1q)"
-	    fi
-	fi
-	if [ -n "$OTHER_DIZ_FILE" ]; then
-	    $MKDIR -p $FILE_WORK_DIR/other
-	    (cd $FILE_WORK_DIR/other ; $UNARCHIVE -o $OTHER_DIZ_FILE)
-	    export _NT_SYMBOL_PATH="$FILE_WORK_DIR/other"
-	fi
-	THIS_FILE_BASE=${THIS_FILE/.dll/}
-	THIS_FILE_BASE=${THIS_FILE_BASE/.exe/}
-	if [ -f "${THIS_FILE/.dll/}.diz" ]; then
-	    THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz
-	else
-	    THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)"
-	    if [ ! -f "$THIS_DIZ_FILE" ]; then
-		# As a last resort, look for diz file in the whole build output
-		# dir.
-		THIS_DIZ_FILE="$($FIND $THIS -name $DIZ_NAME | $SED 1q)"
-	    fi
-	fi
-	if [ -n "$THIS_DIZ_FILE" ]; then
-	    $MKDIR -p $FILE_WORK_DIR/this
-	    (cd $FILE_WORK_DIR/this ; $UNARCHIVE -o $THIS_DIZ_FILE)
-	    export _NT_SYMBOL_PATH="$_NT_SYMBOL_PATH;$FILE_WORK_DIR/this"
-	fi
-    fi
-
-    if [ -z "$SKIP_BIN_DIFF" ]; then
-        if cmp $OTHER_FILE $THIS_FILE > /dev/null; then
-        # The files were bytewise identical.
-            if [ -n "$VERBOSE" ]; then
-                echo "        :           :         :         :          : $BIN_FILE"
-            fi
-            return 0
-        fi
-        BIN_MSG=" diff "
-        if [[ "$ACCEPTED_BIN_DIFF" != *"$BIN_FILE"* ]]; then
-            DIFF_BIN=true
-            if [[ "$KNOWN_BIN_DIFF" != *"$BIN_FILE"* ]]; then
-                BIN_MSG="*$BIN_MSG*"
-                REGRESSIONS=true
-            else
-                BIN_MSG=" $BIN_MSG "
-            fi
-        else
-            BIN_MSG="($BIN_MSG)"
-            DIFF_BIN=
-        fi
-    fi
-
-    if [ -n "$STAT" ]; then
-        THIS_SIZE=$($STAT $STAT_PRINT_SIZE "$THIS_FILE")
-        OTHER_SIZE=$($STAT $STAT_PRINT_SIZE "$OTHER_FILE")
-    else
-        THIS_SIZE=$(ls -l "$THIS_FILE" | awk '{ print $5 }')
-        OTHER_SIZE=$(ls -l "$OTHER_FILE" | awk '{ print $5 }')
-    fi
-    if [ $THIS_SIZE -ne $OTHER_SIZE ]; then
-        DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE)
-        DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE)
-        SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM)
-        if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] \
-	    && [ "$DIFF_SIZE_REL" -lt 102 ]; then
-            SIZE_MSG="($SIZE_MSG)"
-            DIFF_SIZE=
-        elif [ "$OPENJDK_TARGET_OS" = "windows" ] \
-	    && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \
-	    && [ "$DIFF_SIZE_NUM" = 512 ]; then
-	    # On windows, size of binaries increase in 512 increments.
-            SIZE_MSG="($SIZE_MSG)"
-            DIFF_SIZE=
-        elif [ "$OPENJDK_TARGET_OS" = "windows" ] \
-	    && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \
-	    && [ "$DIFF_SIZE_NUM" = -512 ]; then
-	    # On windows, size of binaries increase in 512 increments.
-            SIZE_MSG="($SIZE_MSG)"
-            DIFF_SIZE=
-        else
-            if [[ "$ACCEPTED_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
-                DIFF_SIZE=true
-                if [[ "$KNOWN_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
-                    SIZE_MSG="*$SIZE_MSG*"
-                    REGRESSIONS=true
-                else
-                    SIZE_MSG=" $SIZE_MSG "
-                fi
-            else
-                SIZE_MSG="($SIZE_MSG)"
-                DIFF_SIZE=
-            fi
-        fi
-    else
-        SIZE_MSG="           "
-        DIFF_SIZE=
-        if [[ "$KNOWN_SIZE_DIFF $ACCEPTED_SIZE_DIFF" = *"$BIN_FILE"* ]]; then
-            SIZE_MSG="     !     "
-        fi
-    fi
-
-    if [[ "$SORT_SYMBOLS" = *"$BIN_FILE"* ]]; then
-        SYM_SORT_CMD="sort"
-    else
-        SYM_SORT_CMD="cat"
-    fi
-
-    # Check symbols
-    if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-        # The output from dumpbin on windows differs depending on if the debug symbol
-        # files are still around at the location the binary is pointing too. Need
-	# to filter out that extra information.
-	$DUMPBIN -exports $OTHER_FILE | $GREP  -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
-	$DUMPBIN -exports $THIS_FILE  | $GREP  -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
-    elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
-        # Some symbols get seemingly random 15 character prefixes. Filter them out.
-        $NM -a $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SED 's/^\([a-zA-Z] [\.\$]\)[a-zA-Z0-9_\$]\{15,15\}\./\1./g' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
-	$NM -a $ORIG_THIS_FILE  2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SED 's/^\([a-zA-Z] [\.\$]\)[a-zA-Z0-9_\$]\{15,15\}\./\1./g' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
-    else
-	$NM -a $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
-	$NM -a $ORIG_THIS_FILE  2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
-    fi
-    
-    LC_ALL=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff
-    if [ -s $WORK_FILE_BASE.symbols.diff ]; then
-        SYM_MSG=" diff  "
-        if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then
-            DIFF_SYM=true
-            if [[ "$KNOWN_SYM_DIFF" != *"$BIN_FILE"* ]]; then
-                SYM_MSG="*$SYM_MSG*"
-                REGRESSIONS=true
-            else
-                SYM_MSG=" $SYM_MSG "
-            fi
-        else
-            SYM_MSG="($SYM_MSG)"            
-            DIFF_SYM=
-        fi
-    else
-        SYM_MSG="         "
-        DIFF_SYM=
-        if [[ "$KNOWN_SYM_DIFF $ACCEPTED_SYM_DIFF" = *"$BIN_FILE"* ]]; then
-            SYM_MSG="    !    "
-        fi
-    fi
-
-    # Check dependencies
-    if [ -n "$LDD_CMD" ]; then
-	(cd $FILE_WORK_DIR && $CP $OTHER_FILE . && $LDD_CMD $NAME 2>/dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.other | $UNIQ > $WORK_FILE_BASE.deps.other.uniq)
-	(cd $FILE_WORK_DIR && $CP $THIS_FILE . && $LDD_CMD $NAME 2</dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.this | $UNIQ > $WORK_FILE_BASE.deps.this.uniq)
-	(cd $FILE_WORK_DIR && $RM -f $NAME)
-	
-	LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff
-	LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq
-	
-	if [ -s $WORK_FILE_BASE.deps.diff ]; then
-            if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then
-		DEP_MSG=" diff  "
-            else
-		DEP_MSG=" redun "
-            fi
-            if [[ "$ACCEPTED_DEP_DIFF" != *"$BIN_FILE"* ]]; then
-		DIFF_DEP=true
-		if [[ "$KNOWN_DEP_DIFF" != *"$BIN_FILE"* ]]; then
-                    DEP_MSG="*$DEP_MSG*"
-                    REGRESSIONS=true
-		else
-                    DEP_MSG=" $DEP_MSG "
-		fi
-            else
-		DEP_MSG="($DEP_MSG)"
-		DIFF_DEP=
-            fi
-	else
-	    DEP_MSG="         "
-	    DIFF_DEP=
-            if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
-                DEP_MSG="     !      "
-            fi
-	fi
-    else
-	DEP_MSG="    -    "
-    fi
-    
-    # Compare fulldump output
-    if [ -n "$FULLDUMP_CMD" ] && [ -z "$SKIP_FULLDUMP_DIFF" ]; then
-        $FULLDUMP_CMD $OTHER_FILE > $WORK_FILE_BASE.fulldump.other 2>&1
-        $FULLDUMP_CMD $THIS_FILE > $WORK_FILE_BASE.fulldump.this 2>&1
-        LC_ALL=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff
-        
-        if [ -s $WORK_FILE_BASE.fulldump.diff ]; then
-            ELF_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}')
-            ELF_MSG=$($PRINTF "%8d" $ELF_DIFF_SIZE)
-            if [[ "$ACCEPTED_ELF_DIFF" != *"$BIN_FILE"* ]]; then
-                DIFF_ELF=true
-                if [[ "$KNOWN_ELF_DIFF" != *"$BIN_FILE"* ]]; then
-                    ELF_MSG="*$ELF_MSG*"
-                    REGRESSIONS=true
-                else
-                    ELF_MSG=" $ELF_MSG "
-                fi
-            else
-                ELF_MSG="($ELF_MSG)"
-                DIFF_ELF=
-            fi
-        else
-            ELF_MSG="          "
-            DIFF_ELF=
-            if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
-                ELF_MSG="    !    "
-            fi
-        fi
-    fi
-
-    # Compare disassemble output
-    if [ -n "$DIS_CMD" ] && [ -z "$SKIP_DIS_DIFF" ]; then
-	if [ -z "$DIS_DIFF_FILTER" ]; then
-	    DIS_DIFF_FILTER="$CAT"
-	fi
-        $DIS_CMD $OTHER_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.other 2>&1
-        $DIS_CMD $THIS_FILE  | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.this  2>&1
-        
-        LC_ALL=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff
-        
-        if [ -s $WORK_FILE_BASE.dis.diff ]; then
-            DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}')
-            DIS_MSG=$($PRINTF "%8d" $DIS_DIFF_SIZE)
-            if [[ "$ACCEPTED_DIS_DIFF" != *"$BIN_FILE"* ]]; then
-                DIFF_DIS=true
-                if [[ "$KNOWN_DIS_DIFF" != *"$BIN_FILE"* ]]; then
-                    DIS_MSG="*$DIS_MSG*"
-                    REGRESSIONS=true
-                else
-                    DIS_MSG=" $DIS_MSG "
-                fi
-            else
-                DIS_MSG="($DIS_MSG)"
-                DIFF_DIS=
-            fi
-        else
-            DIS_MSG="          "
-            DIFF_DIS=
-            if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
-                DIS_MSG="    !    "
-            fi
-        fi
-    fi
-
-
-    if [ -n "$DIFF_BIN$DIFF_SIZE$DIFF_SYM$DIFF_DEP$DIFF_ELF$DIFF_DIS" ] || [ -n "$VERBOSE" ]; then
-        if [ -n "$BIN_MSG" ]; then echo -n "$BIN_MSG:"; fi
-        if [ -n "$SIZE_MSG" ]; then echo -n "$SIZE_MSG:"; fi
-        if [ -n "$SYM_MSG" ]; then echo -n "$SYM_MSG:"; fi
-        if [ -n "$DEP_MSG" ]; then echo -n "$DEP_MSG:"; fi
-        if [ -n "$ELF_MSG" ]; then echo -n "$ELF_MSG:"; fi
-        if [ -n "$DIS_MSG" ]; then echo -n "$DIS_MSG:"; fi
-        echo " $BIN_FILE"
-        if [ "$SHOW_DIFFS" = "true" ]; then
-            if [ -s "$WORK_FILE_BASE.symbols.diff" ]; then
-                echo "Symbols diff:"
-                $CAT $WORK_FILE_BASE.symbols.diff
-            fi
-            if [ -s "$WORK_FILE_BASE.deps.diff" ]; then
-                echo "Deps diff:"
-                $CAT $WORK_FILE_BASE.deps.diff
-            fi
-            if [ -s "$WORK_FILE_BASE.fulldump.diff" ]; then
-                echo "Fulldump diff:"
-                $CAT $WORK_FILE_BASE.fulldump.diff
-            fi
-            if [ -s "$WORK_FILE_BASE.dis.diff" ]; then
-                echo "Disassembly diff:"
-                $CAT $WORK_FILE_BASE.dis.diff
-            fi
-        fi
-        return 1
-    fi
-    return 0
-}
-
-##########################################################################################
-# Print binary diff header
-
-print_binary_diff_header() {
-    if [ -z "$SKIP_BIN_DIFF" ]; then echo -n " Binary :"; fi
-    if [ -z "$SKIP_SIZE_DIFF" ]; then echo -n "   Size    :"; fi
-    if [ -z "$SKIP_SYM_DIFF" ]; then echo -n " Symbols :"; fi
-    if [ -z "$SKIP_DEP_DIFF" ]; then echo -n "  Deps   :"; fi
-    if [ -z "$SKIP_FULLDUMP_DIFF" ]; then echo -n " Fulldump :"; fi
-    if [ -z "$SKIP_DIS_DIFF" ]; then echo -n " Disass   :"; fi
-    echo
-}
-
-##########################################################################################
-# Compare all libraries
-
-compare_all_libs() {
-    THIS_DIR=$1
-    OTHER_DIR=$2
-    WORK_DIR=$3
-
-    LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' -o -name 'JavaControlPanel' \) | $SORT | $FILTER)
-
-    if [ -n "$LIBS" ]; then
-        echo Libraries...
-        print_binary_diff_header
-        for l in $LIBS; do
-            if [ -f "$OTHER_DIR/$l" ]; then
-                compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $l
-                if [ "$?" != "0" ]; then
-                    return_value=1
-                fi
-            fi
-        done
-    fi
-
-    return $return_value
-}
-
-##########################################################################################
-# Compare all executables
-
-compare_all_execs() {
-    THIS_DIR=$1
-    OTHER_DIR=$2
-    WORK_DIR=$3
-
-    if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-        EXECS=$(cd $THIS_DIR && $FIND . -type f -name '*.exe' | $SORT | $FILTER)
-    else
-        EXECS=$(cd $THIS_DIR && $FIND . -name db -prune -o -type f -perm -100 \! \
-            \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' -o -name '*.cgi' \
-            -o -name '*.jar' -o -name '*.diz' -o -name 'jcontrol' -o -name '*.properties' \
-            -o -name '*.data' -o -name '*.bfc' -o -name '*.src' -o -name '*.txt' \
-            -o -name '*.cfg' -o -name 'meta-index' -o -name '*.properties.ja' \
-            -o -name 'classlist' \) | $SORT | $FILTER)
-    fi
-
-    if [ -n "$EXECS" ]; then
-        echo Executables...
-        print_binary_diff_header
-        for e in $EXECS; do
-            if [ -f "$OTHER_DIR/$e" ]; then
-                compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $e
-                if [ "$?" != "0" ]; then
-                    return_value=1
-                fi
-            fi
-        done
-    fi
-
-    return $return_value
-}
-
-##########################################################################################
-# Initiate configuration
-
-COMPARE_ROOT=/tmp/cimages.$USER
-$MKDIR -p $COMPARE_ROOT
-if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-    if [ "$(uname -o)" = "Cygwin" ]; then
-	COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT)
-    fi
-fi
-
-THIS="$( cd "$( dirname "$0" )" && pwd )"
-echo "$THIS"
-THIS_SCRIPT="$0"
-
-if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1" = "/?" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ]; then
-    echo "bash ./compare.sh [OPTIONS] [FILTER]"
-    echo ""
-    echo "-all                Compare all files in all known ways"
-    echo "-names              Compare the file names and directory structure"
-    echo "-perms              Compare the permission bits on all files and directories"
-    echo "-types              Compare the output of the file command on all files"
-    echo "-general            Compare the files not convered by the specialized comparisons"
-    echo "-zips               Compare the contents of all zip files"
-    echo "-jars               Compare the contents of all jar files"
-    echo "-libs               Compare all native libraries"
-    echo "-execs              Compare all executables"
-    echo "-v                  Verbose output, does not hide known differences"
-    echo "-vv                 More verbose output, shows diff output of all comparisons"
-    echo "-o [OTHER]          Compare with build in other directory. Will default to the old build directory"
-    echo ""
-    echo "[FILTER]            List filenames in the image to compare, works for jars, zips, libs and execs"
-    echo "Example:"
-    echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
-    echo ""
-    echo "-2zips <file1> <file2> Compare two zip files only"
-    echo ""
-    exit 10
-fi
-
-CMP_NAMES=false
-CMP_PERMS=false
-CMP_TYPES=false
-CMP_GENERAL=false
-CMP_ZIPS=false
-CMP_JARS=false
-CMP_LIBS=false
-CMP_EXECS=false
-
-while [ -n "$1" ]; do
-    case "$1" in
-        -v)
-            VERBOSE=true
-            ;;
-        -vv)
-            VERBOSE=true
-            SHOW_DIFFS=true
-            ;;
-        -o)
-            OTHER="$2"
-            shift
-            ;;
-        -all)
-            CMP_NAMES=true
-            if [ "$OPENJDK_TARGET_OS" != "windows" ]; then
-                CMP_PERMS=true
-            fi
-            CMP_TYPES=true
-            CMP_GENERAL=true
-            CMP_ZIPS=true
-            CMP_JARS=true
-            CMP_LIBS=true
-            CMP_EXECS=true
-            ;;
-        -names)
-            CMP_NAMES=true
-            ;;
-        -perms)
-            CMP_PERMS=true
-            ;;
-        -types)
-            CMP_TYPES=true
-            ;;
-        -general)
-            CMP_GENERAL=true
-            ;;
-        -zips)
-            CMP_ZIPS=true
-            ;;
-        -jars)
-            CMP_JARS=true
-            ;;
-        -libs)
-            CMP_LIBS=true
-            ;;
-        -execs)
-            CMP_EXECS=true
-            ;;
-        -2zips)
-            CMP_2_ZIPS=true
-            THIS_FILE=$2
-            OTHER_FILE=$3
-            shift
-            shift
-            ;;
-        *)
-            CMP_NAMES=false
-            CMP_PERMS=false
-            CMP_TYPES=false
-            CMP_ZIPS=true
-            CMP_JARS=true
-            CMP_LIBS=true
-            CMP_EXECS=true
-            
-            if [ -z "$FILTER" ]; then
-                FILTER="$GREP"
-            fi
-            FILTER="$FILTER -e $1"
-            ;;
-    esac
-    shift
-done
-
-if [ "$CMP_2_ZIPS" = "true" ]; then
-    THIS_DIR="$(dirname $THIS_FILE)"
-    THIS_DIR="$(cd "$THIS_DIR" && pwd )"
-    OTHER_DIR="$(dirname $OTHER_FILE)"
-    OTHER_DIR="$(cd "$OTHER_DIR" && pwd )"
-    THIS_FILE_NAME="$(basename $THIS_FILE)"
-    OTHER_FILE_NAME="$(basename $OTHER_FILE)"
-    echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME
-    compare_zip_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2zips $THIS_FILE_NAME $OTHER_FILE_NAME
-    exit
-fi
-
-if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then
-    CMP_NAMES=true
-    CMP_PERMS=true
-    CMP_TYPES=true
-    CMP_GENERAL=true
-    CMP_ZIPS=true
-    CMP_JARS=true
-    CMP_LIBS=true
-    CMP_EXECS=true
-fi
-
-if [ -z "$FILTER" ]; then
-    FILTER="$CAT"
-fi
-
-if [ -z "$OTHER" ]; then
-    OTHER="$THIS/../$LEGACY_BUILD_DIR"
-    if [ -d "$OTHER" ]; then
-        OTHER="$( cd "$OTHER" && pwd )"
-    else
-        echo "Default old build directory does not exist:"
-        echo "$OTHER"
-        exit 1
-    fi
-    echo "Comparing to default old build:"
-    echo "$OTHER"
-    echo
-else
-    if [ ! -d "$OTHER" ]; then
-        echo "Other build directory does not exist:"
-        echo "$OTHER"
-        exit 1
-    fi
-    OTHER="$( cd "$OTHER" && pwd )"
-    echo "Comparing to:"
-    echo "$OTHER"
-    echo
-fi
-
-
-# Figure out the layout of the this build. Which kinds of images have been produced
-if [ -d "$THIS/install/j2sdk-image" ]; then
-    THIS_J2SDK="$THIS/install/j2sdk-image"
-    THIS_J2RE="$THIS/install/j2re-image"
-    echo "Selecting install images in this build"
-elif [ -d "$THIS/deploy/j2sdk-image" ]; then
-    THIS_J2SDK="$THIS/deploy/j2sdk-image"
-    THIS_J2RE="$THIS/deploy/j2re-image"
-    echo "Selecting deploy images in this build"
-elif [ -d "$THIS/images/j2sdk-image" ]; then
-    THIS_J2SDK="$THIS/images/j2sdk-image"
-    THIS_J2RE="$THIS/images/j2re-image"
-    echo "Selecting jdk images in this build"
-fi
-
-if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
-    if [ -d "$THIS/install/j2sdk-image" ]; then
-        # If there is an install image, prefer that, it's also overlay
-        THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
-        THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
-        echo "Selecting install overlay images in this build"
-    else
-        THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
-        THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
-        echo "Selecting jdk overlay images in this build"
-    fi
-fi
-
-if [ -d "$THIS/images/j2sdk-bundle" ]; then
-    THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
-    THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
-    echo "Selecting bundles in this build"
-fi
-
-# Figure out the layout of the other build (old or new, normal or overlay image)
-if [ -d "$OTHER/j2sdk-image" ]; then
-    if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
-        OTHER_J2SDK="$OTHER/j2sdk-image"
-        OTHER_J2RE="$OTHER/j2re-image"
-        echo "Selecting old-style images in other build"
-    else
-        OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
-        OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
-        echo "Selecting overlay images in other build"
-    fi
-elif [ -d "$OTHER/install/j2sdk-image" ]; then
-    OTHER_J2SDK="$OTHER/install/j2sdk-image"
-    OTHER_J2RE="$OTHER/install/j2re-image"
-    echo "Selecting install images in other build"
-elif [ -d "$OTHER/deploy/j2sdk-image" ]; then
-    OTHER_J2SDK="$OTHER/deploy/j2sdk-image"
-    OTHER_J2RE="$OTHER/deploy/j2re-image"
-    echo "Selecting deploy images in other build"
-elif [ -d "$OTHER/images/j2sdk-image" ]; then
-    OTHER_J2SDK="$OTHER/images/j2sdk-image"
-    OTHER_J2RE="$OTHER/images/j2re-image"
-    echo "Selecting jdk images in other build"
-fi
-
-if [ -d "$OTHER/j2sdk-bundle" ]; then
-    OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
-    OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
-    echo "Selecting bundles in other build"
-elif [ -d "$OTHER/images/j2sdk-bundle" ]; then
-    OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle"
-    OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle"
-    echo "Selecting jdk bundles in other build"
-fi
-
-if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then
-    if [ -z "$THIS_J2SDK_OVERLAY" ]; then
-        echo "Cannot locate images for this build. Are you sure you have run 'make images'?"
-        exit 1
-    fi
-fi
-
-if [ -z "$OTHER_J2SDK" ] && [ -n "$OTHER_J2SDK_OVERLAY" ] && [ -z "$THIS_J2SDK_OVERLAY" ]; then
-    echo "OTHER build only has an overlay image while this build does not. Nothing to compare!"
-    exit 1
-fi
-
-if [ -z "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
-    echo "WARNING! OTHER build has bundles built while this build does not."
-    echo "Skipping bundle compare!"
-fi
-
-if [ -d "$THIS/docs" ]; then
-    THIS_DOCS="$THIS/docs"
-fi
-
-if [ -d "$OTHER/docs" ]; then
-    OTHER_DOCS="$OTHER/docs"
-fi
-
-if [ -z "$THIS_DOCS" ]; then
-    echo "WARNING! Docs haven't been built and won't be compared."
-fi
-
-if [ -z "$OTHER_DOCS" ]; then
-    echo "WARNING! Other build doesn't contain docs, skipping doc compare."
-fi
-
-if [ -d "$OTHER/images" ]; then
-    OTHER_SEC_DIR="$OTHER/images"
-else
-    OTHER_SEC_DIR="$OTHER/tmp"
-fi
-OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
-THIS_SEC_DIR="$THIS/images"
-THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
-if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-    if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
-        JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
-    else
-        JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
-    fi
-    OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
-    OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
-    THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
-    THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
-fi
-
-##########################################################################################
-# Do the work
-
-if [ "$CMP_NAMES" = "true" ]; then
-    if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
-        echo -n "J2SDK "
-        compare_dirs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
-        echo -n "J2RE  "
-        compare_dirs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
-        
-        echo -n "J2SDK "
-        compare_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
-        echo -n "J2RE  "
-        compare_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
-    fi
-    if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
-        echo -n "J2SDK Overlay "
-        compare_dirs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
-        echo -n "J2RE  Overlay "
-        compare_dirs $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
-        
-        echo -n "J2SDK Overlay "
-        compare_files $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
-        echo -n "J2RE  Overlay "
-        compare_files $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
-    fi
-    if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
-        echo -n "J2SDK Bundle "
-        compare_dirs $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
-        echo -n "J2RE  Bundle "
-        compare_dirs $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
-        
-        echo -n "J2SDK Bundle "
-        compare_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
-        echo -n "J2RE  Bundle "
-        compare_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
-    fi
-    if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then
-        echo -n "Docs "
-        compare_dirs $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
-        echo -n "Docs "
-        compare_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
-    fi
-fi
-
-if [ "$CMP_PERMS" = "true" ]; then
-    if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
-        echo -n "J2SDK "
-        compare_permissions $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
-        echo -n "J2RE  "
-        compare_permissions $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
-    fi
-    if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
-        echo -n "J2SDK Overlay "
-        compare_permissions $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
-        echo -n "J2RE  Overlay "
-        compare_permissions $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
-    fi
-    if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
-        echo -n "J2SDK Bundle "
-        compare_permissions $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
-        echo -n "J2RE  Bundle "
-        compare_permissions $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
-    fi
-fi
-
-if [ "$CMP_TYPES" = "true" ]; then
-    if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
-        echo -n "J2SDK "
-        compare_file_types $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
-        echo -n "J2RE  "
-        compare_file_types $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
-    fi
-    if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
-        echo -n "J2SDK Overlay "
-        compare_file_types $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
-        echo -n "J2RE  Overlay "
-        compare_file_types $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
-    fi
-    if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
-        echo -n "J2SDK Bundle "
-        compare_file_types $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
-        echo -n "J2RE  Bundle "
-        compare_file_types $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
-    fi
-fi
-
-if [ "$CMP_GENERAL" = "true" ]; then
-    if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
-        echo -n "J2SDK "
-        compare_general_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
-        echo -n "J2RE  "
-        compare_general_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
-    fi
-    if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
-        echo -n "J2SDK Overlay "
-        compare_general_files $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
-        echo -n "J2RE  Overlay "
-        compare_general_files $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
-    fi
-    if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
-        echo -n "J2SDK Bundle "
-        compare_general_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
-        echo -n "J2RE  Bundle "
-        compare_general_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
-    fi
-    if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then
-        echo -n "Docs "
-        compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
-    fi
-fi
-
-if [ "$CMP_ZIPS" = "true" ]; then
-    if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
-        compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
-    fi
-    if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then
-        if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then
-            echo "sec-bin.zip..."
-            compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-bin.zip
-        fi
-    fi
-    if [ -n "$THIS_SEC_WINDOWS_BIN" ] && [ -n "$OTHER_SEC_WINDOWS_BIN" ]; then
-        if [ -n "$(echo $THIS_SEC_WINDOWS_BIN | $FILTER)" ]; then
-            echo "sec-windows-bin.zip..."
-            compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-windows-bin.zip
-        fi
-    fi
-    if [ -n "$THIS_JGSS_WINDOWS_BIN" ] && [ -n "$OTHER_JGSS_WINDOWS_BIN" ]; then
-        if [ -n "$(echo $THIS_JGSS_WINDOWS_BIN | $FILTER)" ]; then
-            echo "$JGSS_WINDOWS_BIN..."
-            compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN
-        fi
-    fi
-fi
-
-if [ "$CMP_JARS" = "true" ]; then
-    if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
-        compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
-    fi
-fi
-
-if [ "$CMP_LIBS" = "true" ]; then
-    if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
-        echo -n "J2SDK "
-        compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
-        if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
-            echo -n "J2RE  "
-            compare_all_libs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
-        fi
-    fi
-    if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
-        echo -n "Bundle   "
-        compare_all_libs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
-    fi
-fi
-
-if [ "$CMP_EXECS" = "true" ]; then
-    if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
-        compare_all_execs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
-    fi
-    if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
-        echo -n "Overlay "
-        compare_all_execs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
-    fi
-fi
-
-echo
-
-if [ -n "$REGRESSIONS" ]; then
-    echo "REGRESSIONS FOUND!"
-    echo
-    exit 1
-else
-    echo "No regressions found"
-    echo
-    exit 0
-fi
diff --git a/common/bin/compare_exceptions.sh.incl b/common/bin/compare_exceptions.sh.incl
deleted file mode 100644
index 3b79a52..0000000
--- a/common/bin/compare_exceptions.sh.incl
+++ /dev/null
@@ -1,1005 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2012, 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 script is not to be run as stand-alone, it should be included from
-# compare.sh.
-
-##########################################################################################
-# Check that we are run via inclusion from compare.sh and not as stand-alone.
-if [ -z "$COMPARE_EXCEPTIONS_INCLUDE" ]; then
-    echo "Error: This script should not be run as stand-alone. It is included by compare.sh"
-    exit 1
-fi
-
-##########################################################################################
-# Diff exceptions
-
-if [ "$OPENJDK_TARGET_OS" = "linux" ] && [ "$OPENJDK_TARGET_CPU" = "x86" ]; then
-
-STRIP_BEFORE_COMPARE="
-./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/libgctest.so
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/minst/lib/libminst.so
-./demo/jvmti/mtrace/lib/libmtrace.so
-./demo/jvmti/versionCheck/lib/libversionCheck.so
-./demo/jvmti/waiters/lib/libwaiters.so
-"
-
-ACCEPTED_BIN_DIFF="
-./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/libgctest.so
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/minst/lib/libminst.so
-./demo/jvmti/mtrace/lib/libmtrace.so
-./demo/jvmti/versionCheck/lib/libversionCheck.so
-./demo/jvmti/waiters/lib/libwaiters.so
-./jre/lib/i386/client/libjvm.so
-./jre/lib/i386/libattach.so
-./jre/lib/i386/libdt_socket.so
-./jre/lib/i386/libhprof.so
-./jre/lib/i386/libinstrument.so
-./jre/lib/i386/libjava_crw_demo.so
-./jre/lib/i386/libjsdt.so
-./jre/lib/i386/libmanagement.so
-./jre/lib/i386/libnpt.so
-./jre/lib/i386/libverify.so
-./jre/lib/i386/server/libjvm.so
-./bin/appletviewer
-./bin/extcheck
-./bin/idlj
-./bin/jar
-./bin/jarsigner
-./bin/java
-./bin/javac
-./bin/javadoc
-./bin/javah
-./bin/javap
-./bin/jdeps
-./bin/jcmd
-./bin/jconsole
-./bin/jdb
-./bin/jhat
-./bin/jinfo
-./bin/jmap
-./bin/jps
-./bin/jrunscript
-./bin/jsadebugd
-./bin/jstack
-./bin/jstat
-./bin/jstatd
-./bin/keytool
-./bin/native2ascii
-./bin/orbd
-./bin/pack200
-./bin/policytool
-./bin/rmic
-./bin/rmid
-./bin/rmiregistry
-./bin/schemagen
-./bin/serialver
-./bin/servertool
-./bin/tnameserv
-./bin/wsgen
-./bin/wsimport
-./bin/xjc
-./jre/bin/java
-./jre/bin/keytool
-./jre/bin/orbd
-./jre/bin/pack200
-./jre/bin/policytool
-./jre/bin/rmid
-./jre/bin/rmiregistry
-./jre/bin/servertool
-./jre/bin/tnameserv
-"
-
-fi
-
-if [ "$OPENJDK_TARGET_OS" = "linux" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
-
-STRIP_BEFORE_COMPARE="
-./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/libgctest.so
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/minst/lib/libminst.so
-./demo/jvmti/mtrace/lib/libmtrace.so
-./demo/jvmti/versionCheck/lib/libversionCheck.so
-./demo/jvmti/waiters/lib/libwaiters.so
-"
-
-ACCEPTED_BIN_DIFF="
-./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/libgctest.so
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/minst/lib/libminst.so
-./demo/jvmti/mtrace/lib/libmtrace.so
-./demo/jvmti/versionCheck/lib/libversionCheck.so
-./demo/jvmti/waiters/lib/libwaiters.so
-./jre/lib/amd64/libattach.so
-./jre/lib/amd64/libdt_socket.so
-./jre/lib/amd64/libhprof.so
-./jre/lib/amd64/libinstrument.so
-./jre/lib/amd64/libjava_crw_demo.so
-./jre/lib/amd64/libjsdt.so
-./jre/lib/amd64/libjsig.so
-./jre/lib/amd64/libmanagement.so
-./jre/lib/amd64/libnpt.so
-./jre/lib/amd64/libsaproc.so
-./jre/lib/amd64/libverify.so
-./jre/lib/amd64/server/libjsig.so
-./jre/lib/amd64/server/libjvm.so
-./bin/appletviewer
-./bin/extcheck
-./bin/idlj
-./bin/jar
-./bin/jarsigner
-./bin/java
-./bin/javac
-./bin/javadoc
-./bin/javah
-./bin/javap
-./bin/jdeps
-./bin/jcmd
-./bin/jconsole
-./bin/jdb
-./bin/jhat
-./bin/jinfo
-./bin/jmap
-./bin/jps
-./bin/jrunscript
-./bin/jsadebugd
-./bin/jstack
-./bin/jstat
-./bin/jstatd
-./bin/keytool
-./bin/native2ascii
-./bin/orbd
-./bin/pack200
-./bin/policytool
-./bin/rmic
-./bin/rmid
-./bin/rmiregistry
-./bin/schemagen
-./bin/serialver
-./bin/servertool
-./bin/tnameserv
-./bin/wsgen
-./bin/wsimport
-./bin/xjc
-./jre/bin/java
-./jre/bin/keytool
-./jre/bin/orbd
-./jre/bin/pack200
-./jre/bin/policytool
-./jre/bin/rmid
-./jre/bin/rmiregistry
-./jre/bin/servertool
-./jre/bin/tnameserv
-"
-
-fi
-
-if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86" ]; then
-
-STRIP_BEFORE_COMPARE="
-./demo/jni/Poller/lib/libPoller.so
-./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/libgctest.so
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/minst/lib/libminst.so
-./demo/jvmti/mtrace/lib/libmtrace.so
-./demo/jvmti/versionCheck/lib/libversionCheck.so
-./demo/jvmti/waiters/lib/libwaiters.so
-./jre/lib/i386/jexec
-"
-
-SORT_SYMBOLS="
-./jre/lib/i386/client/libjvm.so
-./jre/lib/i386/libsaproc.so
-./jre/lib/i386/server/libjvm.so
-"
-
-SKIP_BIN_DIFF="true"
-
-ACCEPTED_SMALL_SIZE_DIFF="
-./demo/jni/Poller/lib/libPoller.so
-./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/libgctest.so
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/minst/lib/libminst.so
-./demo/jvmti/mtrace/lib/libmtrace.so
-./demo/jvmti/versionCheck/lib/libversionCheck.so
-./demo/jvmti/waiters/lib/libwaiters.so
-./jre/lib/i386/client/libjvm.so
-./jre/lib/i386/jli/libjli.so
-./jre/lib/i386/libJdbcOdbc.so
-./jre/lib/i386/libattach.so
-./jre/lib/i386/libawt.so
-./jre/lib/i386/libawt_headless.so
-./jre/lib/i386/libawt_xawt.so
-./jre/lib/i386/libdcpr.so
-./jre/lib/i386/libdt_socket.so
-./jre/lib/i386/libfontmanager.so
-./jre/lib/i386/libhprof.so
-./jre/lib/i386/libinstrument.so
-./jre/lib/i386/libj2gss.so
-./jre/lib/i386/libj2pcsc.so
-./jre/lib/i386/libj2pkcs11.so
-./jre/lib/i386/libj2ucrypto.so
-./jre/lib/i386/libjaas_unix.so
-./jre/lib/i386/libjava.so
-./jre/lib/i386/libjava_crw_demo.so
-./jre/lib/i386/libjawt.so
-./jre/lib/i386/libjdwp.so
-./jre/lib/i386/libjfr.so
-./jre/lib/i386/libjpeg.so
-./jre/lib/i386/libjsdt.so
-./jre/lib/i386/libjsound.so
-./jre/lib/i386/libkcms.so
-./jre/lib/i386/liblcms.so
-./jre/lib/i386/libmanagement.so
-./jre/lib/i386/libmlib_image.so
-./jre/lib/i386/libnet.so
-./jre/lib/i386/libnio.so
-./jre/lib/i386/libnpt.so
-./jre/lib/i386/libsctp.so
-./jre/lib/i386/libsplashscreen.so
-./jre/lib/i386/libsunec.so
-./jre/lib/i386/libsunwjdga.so
-./jre/lib/i386/libt2k.so
-./jre/lib/i386/libunpack.so
-./jre/lib/i386/libverify.so
-./jre/lib/i386/libzip.so
-./jre/lib/i386/libdeploy.so
-./jre/lib/i386/libjavaplugin.so
-./jre/lib/i386/libjavaplugin_jni.so
-./jre/lib/i386/libjavaplugin_nscp.so
-./jre/lib/i386/libjavaplugin_oji.so
-./jre/lib/i386/libnpjp2.so
-./jre/plugin/i386/ns4/libjavaplugin.so
-./jre/plugin/i386/ns7/libjavaplugin_oji.so
-./jre/lib/i386/server/libjvm.so
-./jre/lib/i386/client/64/libjvm_db.so
-./jre/lib/i386/client/64/libjvm_dtrace.so
-./jre/lib/i386/client/libjvm_db.so
-./jre/lib/i386/client/libjvm_dtrace.so
-./jre/lib/i386/server/64/libjvm_db.so
-./jre/lib/i386/server/64/libjvm_dtrace.so
-./jre/lib/i386/server/libjvm_db.so
-./jre/lib/i386/server/libjvm_dtrace.so
-./bin/appletviewer
-./bin/extcheck
-./bin/idlj
-./bin/jar
-./bin/jarsigner
-./bin/java
-./bin/javac
-./bin/javadoc
-./bin/javah
-./bin/javap
-./bin/jdeps
-./bin/javaws
-./bin/jcmd
-./bin/jconsole
-./bin/jdb
-./bin/jhat
-./bin/jinfo
-./bin/jmap
-./bin/jps
-./bin/jrunscript
-./bin/jsadebugd
-./bin/jstack
-./bin/jstat
-./bin/jstatd
-./bin/keytool
-./bin/native2ascii
-./bin/orbd
-./bin/pack200
-./bin/policytool
-./bin/rmic
-./bin/rmid
-./bin/rmiregistry
-./bin/schemagen
-./bin/serialver
-./bin/servertool
-./bin/tnameserv
-./bin/unpack200
-./bin/wsgen
-./bin/wsimport
-./bin/xjc
-./jre/bin/java
-./jre/bin/java_vm
-./jre/bin/javaws
-./jre/bin/keytool
-./jre/bin/orbd
-./jre/bin/pack200
-./jre/bin/policytool
-./jre/bin/rmid
-./jre/bin/rmiregistry
-./jre/bin/servertool
-./jre/bin/tnameserv
-./jre/bin/unpack200
-./jre/lib/i386/jexec
-"
-
-SKIP_FULLDUMP_DIFF="true"
-
-# Filter random C++ symbol strings.
-# Some numbers differ randomly.
-# Can't use space in these expressions as the shell will mess with them.
-DIS_DIFF_FILTER="$SED -e s/\.[a-zA-Z0-9_\$]\{15,15\}/<SYM>/g -e s/\([0-9a-f][0-9a-f].\)\{2,8\}[0-9a-f][0-9a-f]/<NUMS>/g -e s/\(0x\)[0-9a-f]*\([,(>]\)/\1<HEX>\2/g -e s/\(0x\)[0-9a-f]*$/\1<HEX>/g -e s/\(\#.\)[0-9a-f]*\(.<\)/\1<HEX>\2/g -e s/[\.A-Za-z0-9%]\{16,16\}$/<BIN>/g"
-
-fi
-
-if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
-
-STRIP_BEFORE_COMPARE="
-./demo/jni/Poller/lib/amd64/libPoller.so
-./demo/jvmti/compiledMethodLoad/lib/amd64/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/amd64/libgctest.so
-./demo/jvmti/heapTracker/lib/amd64/libheapTracker.so
-./demo/jvmti/heapViewer/lib/amd64/libheapViewer.so
-./demo/jvmti/hprof/lib/amd64/libhprof.so
-./demo/jvmti/minst/lib/amd64/libminst.so
-./demo/jvmti/mtrace/lib/amd64/libmtrace.so
-./demo/jvmti/versionCheck/lib/amd64/libversionCheck.so
-./demo/jvmti/waiters/lib/amd64/libwaiters.so
-"
-
-SORT_SYMBOLS="
-./jre/lib/amd64/server/libjvm.so
-./jre/lib/amd64/libsaproc.so
-"
-
-SKIP_BIN_DIFF="true"
-
-ACCEPTED_SMALL_SIZE_DIFF="
-./demo/jni/Poller/lib/amd64/libPoller.so
-./demo/jvmti/compiledMethodLoad/lib/amd64/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/amd64/libgctest.so
-./demo/jvmti/heapTracker/lib/amd64/libheapTracker.so
-./demo/jvmti/heapViewer/lib/amd64/libheapViewer.so
-./demo/jvmti/hprof/lib/amd64/libhprof.so
-./demo/jvmti/minst/lib/amd64/libminst.so
-./demo/jvmti/mtrace/lib/amd64/libmtrace.so
-./demo/jvmti/versionCheck/lib/amd64/libversionCheck.so
-./demo/jvmti/waiters/lib/amd64/libwaiters.so
-./jre/lib/amd64/jli/libjli.so
-./jre/lib/amd64/libJdbcOdbc.so
-./jre/lib/amd64/libattach.so
-./jre/lib/amd64/libawt.so
-./jre/lib/amd64/libawt_headless.so
-./jre/lib/amd64/libawt_xawt.so
-./jre/lib/amd64/libdcpr.so
-./jre/lib/amd64/libdt_socket.so
-./jre/lib/amd64/libfontmanager.so
-./jre/lib/amd64/libhprof.so
-./jre/lib/amd64/libinstrument.so
-./jre/lib/amd64/libj2gss.so
-./jre/lib/amd64/libj2pcsc.so
-./jre/lib/amd64/libj2pkcs11.so
-./jre/lib/amd64/libj2ucrypto.so
-./jre/lib/amd64/libjaas_unix.so
-./jre/lib/amd64/libjava.so
-./jre/lib/amd64/libjava_crw_demo.so
-./jre/lib/amd64/libjawt.so
-./jre/lib/amd64/libjdwp.so
-./jre/lib/amd64/libjfr.so
-./jre/lib/amd64/libjpeg.so
-./jre/lib/amd64/libjsdt.so
-./jre/lib/amd64/libjsound.so
-./jre/lib/amd64/libkcms.so
-./jre/lib/amd64/liblcms.so
-./jre/lib/amd64/libmanagement.so
-./jre/lib/amd64/libmlib_image.so
-./jre/lib/amd64/libnet.so
-./jre/lib/amd64/libnio.so
-./jre/lib/amd64/libnpt.so
-./jre/lib/amd64/libsctp.so
-./jre/lib/amd64/libsplashscreen.so
-./jre/lib/amd64/libsunec.so
-./jre/lib/amd64/libsunwjdga.so
-./jre/lib/amd64/libt2k.so
-./jre/lib/amd64/libunpack.so
-./jre/lib/amd64/libverify.so
-./jre/lib/amd64/libzip.so
-./jre/lib/amd64/server/64/libjvm_db.so
-./jre/lib/amd64/server/64/libjvm_dtrace.so
-./jre/lib/amd64/server/libjvm.so
-./jre/lib/amd64/server/libjvm_db.so
-./jre/lib/amd64/server/libjvm_dtrace.so
-./bin/amd64/appletviewer
-./bin/amd64/extcheck
-./bin/amd64/idlj
-./bin/amd64/jar
-./bin/amd64/jarsigner
-./bin/amd64/java
-./bin/amd64/javac
-./bin/amd64/javadoc
-./bin/amd64/javah
-./bin/amd64/javap
-./bin/amd64/jdeps
-./bin/amd64/jcmd
-./bin/amd64/jconsole
-./bin/amd64/jdb
-./bin/amd64/jhat
-./bin/amd64/jinfo
-./bin/amd64/jmap
-./bin/amd64/jps
-./bin/amd64/jrunscript
-./bin/amd64/jsadebugd
-./bin/amd64/jstack
-./bin/amd64/jstat
-./bin/amd64/jstatd
-./bin/amd64/keytool
-./bin/amd64/native2ascii
-./bin/amd64/orbd
-./bin/amd64/pack200
-./bin/amd64/policytool
-./bin/amd64/rmic
-./bin/amd64/rmid
-./bin/amd64/rmiregistry
-./bin/amd64/schemagen
-./bin/amd64/serialver
-./bin/amd64/servertool
-./bin/amd64/tnameserv
-./bin/amd64/unpack200
-./bin/amd64/wsgen
-./bin/amd64/wsimport
-./bin/amd64/xjc
-./jre/bin/amd64/java
-./jre/bin/amd64/keytool
-./jre/bin/amd64/orbd
-./jre/bin/amd64/pack200
-./jre/bin/amd64/policytool
-./jre/bin/amd64/rmid
-./jre/bin/amd64/rmiregistry
-./jre/bin/amd64/servertool
-./jre/bin/amd64/tnameserv
-./jre/bin/amd64/unpack200
-./jre/lib/amd64/jexec
-"
-
-SKIP_FULLDUMP_DIFF="true"
-
-# Filter random C++ symbol strings.
-# Some numbers differ randomly.
-# Can't use space in these expressions as the shell will mess with them.
-DIS_DIFF_FILTER="$SED -e s/\.[a-zA-Z0-9_\$]\{15,15\}/<SYM>/g -e s/\([0-9a-f][0-9a-f].\)\{2,8\}[0-9a-f][0-9a-f]/<NUMS>/g -e s/\(0x\)[0-9a-f]*\([,(>]\)/\1<HEX>\2/g -e s/\(0x\)[0-9a-f]*$/\1<HEX>/g -e s/\(\#.\)[0-9a-f]*\(.<\)/\1<HEX>\2/g -e s/[\.A-Za-z0-9%]\{16,16\}$/<BIN>/g"
-
-fi
-
-if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparc" ]; then
-
-STRIP_BEFORE_COMPARE="
-./demo/jni/Poller/lib/libPoller.so
-./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/libgctest.so
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/minst/lib/libminst.so
-./demo/jvmti/mtrace/lib/libmtrace.so
-./demo/jvmti/versionCheck/lib/libversionCheck.so
-./demo/jvmti/waiters/lib/libwaiters.so
-./jre/lib/sparc/jexec
-"
-
-SORT_SYMBOLS="
-./demo/jvmti/waiters/lib/libwaiters.so
-./jre/lib/sparc/client/64/libjvm_db.so
-./jre/lib/sparc/client/64/libjvm_dtrace.so
-./jre/lib/sparc/client/libjsig.so
-./jre/lib/sparc/client/libjvm.so
-./jre/lib/sparc/client/libjvm_db.so
-./jre/lib/sparc/client/libjvm_dtrace.so
-./jre/lib/sparc/libjsig.so
-./jre/lib/sparc/libsaproc.so
-./jre/lib/sparc/server/64/libjvm_db.so
-./jre/lib/sparc/server/64/libjvm_dtrace.so
-./jre/lib/sparc/server/libjsig.so
-./jre/lib/sparc/server/libjvm.so
-./jre/lib/sparc/server/libjvm_db.so
-./jre/lib/sparc/server/libjvm_dtrace.so
-"
-
-SKIP_BIN_DIFF="true"
-
-ACCEPTED_SMALL_SIZE_DIFF="
-./demo/jni/Poller/lib/libPoller.so
-./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/libgctest.so
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/minst/lib/libminst.so
-./demo/jvmti/mtrace/lib/libmtrace.so
-./demo/jvmti/versionCheck/lib/libversionCheck.so
-./demo/jvmti/waiters/lib/libwaiters.so
-./jre/lib/sparc/client/libjvm.so
-./jre/lib/sparc/jli/libjli.so
-./jre/lib/sparc/libJdbcOdbc.so
-./jre/lib/sparc/libattach.so
-./jre/lib/sparc/libawt.so
-./jre/lib/sparc/libawt_headless.so
-./jre/lib/sparc/libawt_xawt.so
-./jre/lib/sparc/libdcpr.so
-./jre/lib/sparc/libdt_socket.so
-./jre/lib/sparc/libfontmanager.so
-./jre/lib/sparc/libhprof.so
-./jre/lib/sparc/libinstrument.so
-./jre/lib/sparc/libj2gss.so
-./jre/lib/sparc/libj2pcsc.so
-./jre/lib/sparc/libj2pkcs11.so
-./jre/lib/sparc/libj2ucrypto.so
-./jre/lib/sparc/libjaas_unix.so
-./jre/lib/sparc/libjava.so
-./jre/lib/sparc/libjava_crw_demo.so
-./jre/lib/sparc/libjawt.so
-./jre/lib/sparc/libjdwp.so
-./jre/lib/sparc/libjfr.so
-./jre/lib/sparc/libjpeg.so
-./jre/lib/sparc/libjsdt.so
-./jre/lib/sparc/libjsound.so
-./jre/lib/sparc/libkcms.so
-./jre/lib/sparc/liblcms.so
-./jre/lib/sparc/libmanagement.so
-./jre/lib/sparc/libmlib_image.so
-./jre/lib/sparc/libmlib_image_v.so
-./jre/lib/sparc/libnet.so
-./jre/lib/sparc/libnio.so
-./jre/lib/sparc/libnpt.so
-./jre/lib/sparc/libsctp.so
-./jre/lib/sparc/libsplashscreen.so
-./jre/lib/sparc/libsunec.so
-./jre/lib/sparc/libsunwjdga.so
-./jre/lib/sparc/libt2k.so
-./jre/lib/sparc/libunpack.so
-./jre/lib/sparc/libverify.so
-./jre/lib/sparc/libzip.so
-./jre/lib/sparc/libdeploy.so
-./jre/lib/sparc/libjavaplugin.so
-./jre/lib/sparc/libjavaplugin_jni.so
-./jre/lib/sparc/libjavaplugin_nscp.so
-./jre/lib/sparc/libjavaplugin_oji.so
-./jre/lib/sparc/libnpjp2.so
-./jre/plugin/sparc/ns4/libjavaplugin.so
-./jre/plugin/sparc/ns7/libjavaplugin_oji.so
-./jre/lib/sparc/server/libjvm.so
-./bin/appletviewer
-./bin/extcheck
-./bin/idlj
-./bin/jar
-./bin/jarsigner
-./bin/java
-./bin/javac
-./bin/javadoc
-./bin/javah
-./bin/javap
-./bin/jdeps
-./bin/javaws
-./bin/jcmd
-./bin/jconsole
-./bin/jdb
-./bin/jhat
-./bin/jinfo
-./bin/jmap
-./bin/jps
-./bin/jrunscript
-./bin/jsadebugd
-./bin/jstack
-./bin/jstat
-./bin/jstatd
-./bin/keytool
-./bin/native2ascii
-./bin/orbd
-./bin/pack200
-./bin/policytool
-./bin/rmic
-./bin/rmid
-./bin/rmiregistry
-./bin/schemagen
-./bin/serialver
-./bin/servertool
-./bin/tnameserv
-./bin/unpack200
-./bin/wsgen
-./bin/wsimport
-./bin/xjc
-./jre/bin/java
-./jre/bin/java_vm
-./jre/bin/javaws
-./jre/bin/keytool
-./jre/bin/orbd
-./jre/bin/pack200
-./jre/bin/policytool
-./jre/bin/rmid
-./jre/bin/rmiregistry
-./jre/bin/servertool
-./jre/bin/tnameserv
-./jre/bin/unpack200
-./jre/lib/sparc/jexec
-"
-
-# Filter random C++ symbol strings.
-# Some numbers differ randomly.
-DIS_DIFF_FILTER="$SED -e s/\$[a-zA-Z0-9_\$]\{15,15\}/<SYM>/g -e s/\([0-9a-f][0-9a-f].[0-9a-f][0-9a-f].[0-9a-f][0-9a-f].\)[0-9a-f][0-9a-f]/\1<NUM>/g -e s/\(%g1,.0x\)[0-9a-f]*\(,.%g1\)/\1<HEX>\2/g -e s/\(!.\)[0-9a-f]*\(.<SUNWprivate_1.1+0x\)[0-9a-f]*/\1<NUM>\2<HEX>/g"
-
-# Some xor instructions end up with different args in the lib but not in the object files.
-ACCEPTED_DIS_DIFF="
-./demo/jvmti/waiters/lib/libwaiters.so
-"
-
-SKIP_FULLDUMP_DIFF="true"
-
-fi
-
-if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparcv9" ]; then
-
-STRIP_BEFORE_COMPARE="
-./demo/jni/Poller/lib/sparcv9/libPoller.so
-./demo/jvmti/compiledMethodLoad/lib/sparcv9/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/sparcv9/libgctest.so
-./demo/jvmti/heapTracker/lib/sparcv9/libheapTracker.so
-./demo/jvmti/heapViewer/lib/sparcv9/libheapViewer.so
-./demo/jvmti/hprof/lib/sparcv9/libhprof.so
-./demo/jvmti/minst/lib/sparcv9/libminst.so
-./demo/jvmti/mtrace/lib/sparcv9/libmtrace.so
-./demo/jvmti/versionCheck/lib/sparcv9/libversionCheck.so
-./demo/jvmti/waiters/lib/sparcv9/libwaiters.so
-"
-
-SORT_SYMBOLS="
-./demo/jvmti/waiters/lib/sparcv9/libwaiters.so
-./jre/lib/sparcv9/libjsig.so
-./jre/lib/sparcv9/libsaproc.so
-./jre/lib/sparcv9/server/libjvm.so
-./jre/lib/sparcv9/server/libjvm_dtrace.so
-"
-
-SKIP_BIN_DIFF="true"
-
-ACCEPTED_SMALL_SIZE_DIFF="
-./demo/jni/Poller/lib/sparcv9/libPoller.so
-./demo/jvmti/compiledMethodLoad/lib/sparcv9/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/sparcv9/libgctest.so
-./demo/jvmti/heapTracker/lib/sparcv9/libheapTracker.so
-./demo/jvmti/heapViewer/lib/sparcv9/libheapViewer.so
-./demo/jvmti/hprof/lib/sparcv9/libhprof.so
-./demo/jvmti/minst/lib/sparcv9/libminst.so
-./demo/jvmti/mtrace/lib/sparcv9/libmtrace.so
-./demo/jvmti/versionCheck/lib/sparcv9/libversionCheck.so
-./demo/jvmti/waiters/lib/sparcv9/libwaiters.so
-./jre/lib/sparcv9/client/libjvm.so
-./jre/lib/sparcv9/jli/libjli.so
-./jre/lib/sparcv9/libJdbcOdbc.so
-./jre/lib/sparcv9/libattach.so
-./jre/lib/sparcv9/libawt.so
-./jre/lib/sparcv9/libawt_headless.so
-./jre/lib/sparcv9/libawt_xawt.so
-./jre/lib/sparcv9/libdcpr.so
-./jre/lib/sparcv9/libdt_socket.so
-./jre/lib/sparcv9/libfontmanager.so
-./jre/lib/sparcv9/libhprof.so
-./jre/lib/sparcv9/libinstrument.so
-./jre/lib/sparcv9/libj2gss.so
-./jre/lib/sparcv9/libj2pcsc.so
-./jre/lib/sparcv9/libj2pkcs11.so
-./jre/lib/sparcv9/libj2ucrypto.so
-./jre/lib/sparcv9/libjaas_unix.so
-./jre/lib/sparcv9/libjava.so
-./jre/lib/sparcv9/libjava_crw_demo.so
-./jre/lib/sparcv9/libjawt.so
-./jre/lib/sparcv9/libjdwp.so
-./jre/lib/sparcv9/libjfr.so
-./jre/lib/sparcv9/libjpeg.so
-./jre/lib/sparcv9/libjsdt.so
-./jre/lib/sparcv9/libjsound.so
-./jre/lib/sparcv9/libkcms.so
-./jre/lib/sparcv9/liblcms.so
-./jre/lib/sparcv9/libmanagement.so
-./jre/lib/sparcv9/libmlib_image.so
-./jre/lib/sparcv9/libmlib_image_v.so
-./jre/lib/sparcv9/libnet.so
-./jre/lib/sparcv9/libnio.so
-./jre/lib/sparcv9/libnpt.so
-./jre/lib/sparcv9/libsctp.so
-./jre/lib/sparcv9/libsplashscreen.so
-./jre/lib/sparcv9/libsunec.so
-./jre/lib/sparcv9/libsunwjdga.so
-./jre/lib/sparcv9/libt2k.so
-./jre/lib/sparcv9/libunpack.so
-./jre/lib/sparcv9/libverify.so
-./jre/lib/sparcv9/libzip.so
-./jre/lib/sparcv9/server/libjvm.so
-./bin/sparcv9/appletviewer
-./bin/sparcv9/extcheck
-./bin/sparcv9/idlj
-./bin/sparcv9/jar
-./bin/sparcv9/jarsigner
-./bin/sparcv9/java
-./bin/sparcv9/javac
-./bin/sparcv9/javadoc
-./bin/sparcv9/javah
-./bin/sparcv9/javap
-./bin/sparcv9/jdeps
-./bin/sparcv9/jcmd
-./bin/sparcv9/jconsole
-./bin/sparcv9/jdb
-./bin/sparcv9/jhat
-./bin/sparcv9/jinfo
-./bin/sparcv9/jmap
-./bin/sparcv9/jps
-./bin/sparcv9/jrunscript
-./bin/sparcv9/jsadebugd
-./bin/sparcv9/jstack
-./bin/sparcv9/jstat
-./bin/sparcv9/jstatd
-./bin/sparcv9/keytool
-./bin/sparcv9/native2ascii
-./bin/sparcv9/orbd
-./bin/sparcv9/pack200
-./bin/sparcv9/policytool
-./bin/sparcv9/rmic
-./bin/sparcv9/rmid
-./bin/sparcv9/rmiregistry
-./bin/sparcv9/schemagen
-./bin/sparcv9/serialver
-./bin/sparcv9/servertool
-./bin/sparcv9/tnameserv
-./bin/sparcv9/unpack200
-./bin/sparcv9/wsgen
-./bin/sparcv9/wsimport
-./bin/sparcv9/xjc
-./jre/bin/sparcv9/java
-./jre/bin/sparcv9/keytool
-./jre/bin/sparcv9/orbd
-./jre/bin/sparcv9/pack200
-./jre/bin/sparcv9/policytool
-./jre/bin/sparcv9/rmid
-./jre/bin/sparcv9/rmiregistry
-./jre/bin/sparcv9/servertool
-./jre/bin/sparcv9/tnameserv
-./jre/bin/sparcv9/unpack200
-"
-
-# Filter random C++ symbol strings.
-# Some numbers differ randomly.
-DIS_DIFF_FILTER="$SED -e s/\$[a-zA-Z0-9_\$]\{15,15\}/<SYM>/g -e s/[0-9a-f][0-9a-f].[0-9a-f][0-9a-f].[0-9a-f][0-9a-f].[0-9a-f][0-9a-f]/<NUMS>/g -e s/\(%g1,.0x\)[0-9a-f]*\(,.%g1\)/\1<HEX>\2/g -e s/\(!.\)[0-9a-f]*\(.<SUNWprivate_1.1+0x\)[0-9a-f]*/\1<NUM>\2<HEX>/g"
-
-# Some xor instructions end up with different args in the lib but not in the object files.
-ACCEPTED_DIS_DIFF="
-./demo/jvmti/waiters/lib/sparcv9/libwaiters.so
-"
-
-SKIP_FULLDUMP_DIFF="true"
-
-fi
-
-
-if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-
-ACCEPTED_JARZIP_CONTENTS="
-/bin/w2k_lsa_auth.dll
-"
-
-# Probably should add all libs here
-ACCEPTED_SMALL_SIZE_DIFF="
-./demo/jvmti/gctest/lib/gctest.dll
-./demo/jvmti/heapTracker/lib/heapTracker.dll
-./demo/jvmti/minst/lib/minst.dll
-./jre/bin/attach.dll
-./jre/bin/java_crw_demo.dll
-./jre/bin/jsoundds.dll
-./jre/bin/server/jvm.dll
-./bin/appletviewer.exe
-./bin/extcheck.exe
-./bin/idlj.exe
-./bin/jar.exe
-./bin/jarsigner.exe
-./bin/java-rmi.exe
-./bin/java.exe
-./bin/javac.exe
-./bin/javadoc.exe
-./bin/javah.exe
-./bin/javap.exe
-./bin/jdeps.exe
-./bin/javaw.exe
-./bin/jcmd.exe
-./bin/jconsole.exe
-./bin/jdb.exe
-./bin/jhat.exe
-./bin/jinfo.exe
-./bin/jmap.exe
-./bin/jps.exe
-./bin/jrunscript.exe
-./bin/jsadebugd.exe
-./bin/jstack.exe
-./bin/jstat.exe
-./bin/jstatd.exe
-./bin/keytool.exe
-./bin/kinit.exe
-./bin/klist.exe
-./bin/ktab.exe
-./bin/native2ascii.exe
-./bin/orbd.exe
-./bin/pack200.exe
-./bin/policytool.exe
-./bin/rmic.exe
-./bin/rmid.exe
-./bin/rmiregistry.exe
-./bin/schemagen.exe
-./bin/serialver.exe
-./bin/servertool.exe
-./bin/tnameserv.exe
-./bin/unpack200.exe
-./bin/wsgen.exe
-./bin/wsimport.exe
-./bin/xjc.exe
-./jre/bin/java-rmi.exe
-./jre/bin/java.exe
-./jre/bin/javaw.exe
-./jre/bin/keytool.exe
-./jre/bin/kinit.exe
-./jre/bin/klist.exe
-./jre/bin/ktab.exe
-./jre/bin/orbd.exe
-./jre/bin/pack200.exe
-./jre/bin/policytool.exe
-./jre/bin/rmid.exe
-./jre/bin/rmiregistry.exe
-./jre/bin/servertool.exe
-./jre/bin/tnameserv.exe
-./jre/bin/unpack200.exe
-"
-
-# jabswitch.exe is compiled and linked with incremental turned on in the old
-# build. This makes no sense, so it's turned off in the new build.
-ACCEPTED_SIZE_DIFF="
-./bin/jabswitch.exe
-./jre/bin/jabswitch.exe
-"
-ACCEPTED_DIS_DIFF="
-./bin/jabswitch.exe
-./jre/bin/jabswitch.exe
-"
-
-# On windows, there are unavoidable allignment issues making
-# a perfect disasm diff impossible. Filter out the following:
-# * Random parts of C++ symbols (this is a bit greedy, but does the trick)
-#   @XXXXX
-# * Hexadecimal addresses that are sometimes alligned differently.
-# * Dates in version strings XXXX_XX_XX.
-DIS_DIFF_FILTER="$SED -e s/[@?][A-Z0-9_]\{1,25\}/<SYM>/g -e s/^.\{2,2\}[0-9A-F]\{16,16\}.\{2,2\}//g -e s/[0-9A-F]\{4,16\}h/<HEXSTR>/g -e s/_[0-9]\{4,4\}_[0-9][0-9]_[0-9][0-9]/<DATE>/g"
-
-SKIP_BIN_DIFF="true"
-SKIP_FULLDUMP_DIFF="true"
-
-fi
-
-
-if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
-ACCEPTED_JARZIP_CONTENTS="
-/META-INF/INDEX.LIST
-"
-
-KNOWN_BIN_DIFF="
-./jre/lib/libJObjC.dylib
-./lib/libJObjC.dylib
-"
-
-ACCEPTED_BIN_DIFF="
-./bin/appletviewer
-./bin/extcheck
-./bin/idlj
-./bin/jar
-./bin/jarsigner
-./bin/java
-./bin/javac
-./bin/javadoc
-./bin/javah
-./bin/javap
-./bin/jdeps
-./bin/jcmd
-./bin/jconsole
-./bin/jdb
-./bin/jhat
-./bin/jinfo
-./bin/jmap
-./bin/jps
-./bin/jrunscript
-./bin/jsadebugd
-./bin/jstack
-./bin/jstat
-./bin/jstatd
-./bin/keytool
-./bin/native2ascii
-./bin/orbd
-./bin/pack200
-./bin/policytool
-./bin/rmic
-./bin/rmid
-./bin/rmiregistry
-./bin/schemagen
-./bin/serialver
-./bin/servertool
-./bin/tnameserv
-./bin/wsgen
-./bin/wsimport
-./bin/xjc
-./jre/bin/java
-./jre/bin/keytool
-./jre/bin/orbd
-./jre/bin/pack200
-./jre/bin/policytool
-./jre/bin/rmid
-./jre/bin/rmiregistry
-./jre/bin/servertool
-./jre/bin/tnameserv
-./jre/lib/libsaproc.dylib
-./jre/lib/server/libjvm.dylib
-./lib/libsaproc.dylib
-./lib/server/libjvm.dylib
-./lib/deploy/JavaControlPanel.prefPane/Contents/MacOS/JavaControlPanel
-"
-
-KNOWN_SIZE_DIFF="
-./jre/lib/libJObjC.dylib
-./lib/libJObjC.dylib
-"
-
-SORT_SYMBOLS="
-./jre/lib/libJObjC.dylib
-./lib/libJObjC.dylib
-"
-
-KNOWN_SYM_DIFF="
-./jre/lib/libJObjC.dylib
-./lib/libJObjC.dylib
-"
-
-KNOWN_ELF_DIFF="
-./jre/lib/libJObjC.dylib
-./lib/libJObjC.dylib
-"
-
-KNOWN_DIS_DIFF="
-./jre/lib/libJObjC.dylib
-./lib/libJObjC.dylib
-"
-
-fi
diff --git a/common/bin/hgforest.sh b/common/bin/hgforest.sh
deleted file mode 100644
index 13e9142..0000000
--- a/common/bin/hgforest.sh
+++ /dev/null
@@ -1,398 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2009, 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
-# 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.
-#
-
-# Shell script for a fast parallel forest/trees command
-
-usage() {
-      echo "usage: $0 [-h|--help] [-q|--quiet] [-v|--verbose] [-s|--sequential] [--] <command> [commands...]" > ${status_output}
-      echo "Environment variables which modify behaviour:"
-      echo "   HGFOREST_QUIET      : (boolean) If 'true' then standard output is redirected to /dev/null"
-      echo "   HGFOREST_VERBOSE    : (boolean) If 'true' then Mercurial asked to produce verbose output"
-      echo "   HGFOREST_SEQUENTIAL : (boolean) If 'true' then repos are processed sequentially. Disables concurrency"
-      echo "   HGFOREST_GLOBALOPTS : (string, must begin with space) Additional Mercurial global options"
-      echo "   HGFOREST_REDIRECT   : (file path) Redirect standard output to specified file"
-      echo "   HGFOREST_FIFOS      : (boolean) Default behaviour for FIFO detection. Does not override FIFOs disabled"
-      echo "   HGFOREST_CONCURRENCY: (positive integer) Number of repos to process concurrently"
-      echo "   HGFOREST_DEBUG      : (boolean) If 'true' then temp files are retained"
-      exit 1
-}
-
-global_opts="${HGFOREST_GLOBALOPTS:-}"
-status_output="${HGFOREST_REDIRECT:-/dev/stdout}"
-qflag="${HGFOREST_QUIET:-false}"
-vflag="${HGFOREST_VERBOSE:-false}"
-sflag="${HGFOREST_SEQUENTIAL:-false}"
-while [ $# -gt 0 ]
-do
-  case $1 in
-    -h | --help )
-      usage
-      ;;
-
-    -q | --quiet )
-      qflag="true"
-      ;;
-
-    -v | --verbose )
-      vflag="true"
-      ;;
-
-    -s | --sequential )
-      sflag="true"
-      ;;
-
-    '--' ) # no more options
-      shift; break
-      ;;
-
-    -*)  # bad option
-      usage
-      ;;
-
-     * )  # non option
-      break
-      ;;
-  esac
-  shift
-done
-
-# silence standard output?
-if [ ${qflag} = "true" ] ; then
-  global_opts="${global_opts} -q"
-  status_output="/dev/null"
-fi
-
-# verbose output?
-if [ ${vflag} = "true" ] ; then
-  global_opts="${global_opts} -v"
-fi
-
-# Make sure we have a command.
-if [ $# -lt 1 -o -z "${1:-}" ] ; then
-  echo "ERROR: No command to hg supplied!"
-  usage
-fi
-
-command="$1"; shift
-command_args="${@:-}"
-
-# Clean out the temporary directory that stores the pid files.
-tmp=/tmp/forest.$$
-rm -f -r ${tmp}
-mkdir -p ${tmp}
-
-
-if [ "${HGFOREST_DEBUG:-false}" = "true" ] ; then
-  echo "DEBUG: temp files are in: ${tmp}"
-fi
-
-# Check if we can use fifos for monitoring sub-process completion.
-echo "1" > ${tmp}/read
-while_subshell=1
-while read line; do
-  while_subshell=0
-  break;
-done < ${tmp}/read
-rm ${tmp}/read
-
-on_windows=`uname -s | egrep -ic -e 'cygwin|msys'`
-
-if [ ${while_subshell} = "1" -o ${on_windows} = "1" ]; then
-  # cygwin has (2014-04-18) broken (single writer only) FIFOs
-  # msys has (2014-04-18) no FIFOs.
-  # older shells create a sub-shell for redirect to while
-  have_fifos="false"
-else
-  have_fifos="${HGFOREST_FIFOS:-true}"
-fi
-
-safe_interrupt () {
-  if [ -d ${tmp} ]; then
-    if [ "`ls ${tmp}/*.pid`" != "" ]; then
-      echo "Waiting for processes ( `cat ${tmp}/.*.pid ${tmp}/*.pid 2> /dev/null | tr '\n' ' '`) to terminate nicely!" > ${status_output}
-      sleep 1
-      # Pipe stderr to dev/null to silence kill, that complains when trying to kill
-      # a subprocess that has already exited.
-      kill -TERM `cat ${tmp}/*.pid | tr '\n' ' '` 2> /dev/null
-      wait
-      echo "Interrupt complete!" > ${status_output}
-    fi
-    rm -f -r ${tmp}
-  fi
-  exit 130
-}
-
-nice_exit () {
-  if [ -d ${tmp} ]; then
-    if [ "`ls -A ${tmp} 2> /dev/null`" != "" ]; then
-      wait
-    fi
-    if [ "${HGFOREST_DEBUG:-false}" != "true" ] ; then
-      rm -f -r ${tmp}
-    fi
-  fi
-}
-
-trap 'safe_interrupt' INT QUIT
-trap 'nice_exit' EXIT
-
-subrepos="corba jaxp jaxws langtools jdk hotspot nashorn"
-subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/make/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs"
-
-# Only look in specific locations for possible forests (avoids long searches)
-pull_default=""
-repos=""
-repos_extra=""
-if [ "${command}" = "clone" -o "${command}" = "fclone" -o "${command}" = "tclone" ] ; then
-  # we must be a clone
-  if [ ! -f .hg/hgrc ] ; then
-    echo "ERROR: Need initial repository to use this script" > ${status_output}
-    exit 1
-  fi
-
-  # the clone must know where it came from (have a default pull path).
-  pull_default=`hg paths default`
-  if [ "${pull_default}" = "" ] ; then
-    echo "ERROR: Need initial clone with 'hg paths default' defined" > ${status_output}
-    exit 1
-  fi
-
-  # determine which sub repos need to be cloned.
-  for i in ${subrepos} ; do
-    if [ ! -f ${i}/.hg/hgrc ] ; then
-      repos="${repos} ${i}"
-    fi
-  done
-
-  pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'`
-
-  if [ -n "${command_args}" ] ; then
-    # if there is an "extra sources" path then reparent "extra" repos to that path
-    if [ "x${pull_default}" = "x${pull_default_tail}" ] ; then
-      echo "ERROR: Need initial clone from non-local source" > ${status_output}
-      exit 1
-    fi
-    pull_extra="${command_args}/${pull_default_tail}"
-
-    # determine which extra subrepos need to be cloned.
-    for i in ${subrepos_extra} ; do
-      if [ ! -f ${i}/.hg/hgrc ] ; then
-        repos_extra="${repos_extra} ${i}"
-      fi
-    done
-  else
-    if [ "x${pull_default}" = "x${pull_default_tail}" ] ; then
-      # local source repo. Clone the "extra" subrepos that exist there.
-      for i in ${subrepos_extra} ; do
-        if [ -f ${pull_default}/${i}/.hg/hgrc -a ! -f ${i}/.hg/hgrc ] ; then
-          # sub-repo there in source but not here
-          repos_extra="${repos_extra} ${i}"
-        fi
-      done
-    fi
-  fi
-
-  # Any repos to deal with?
-  if [ "${repos}" = "" -a "${repos_extra}" = "" ] ; then
-    echo "No repositories to process." > ${status_output}
-    exit
-  fi
-
-  # Repos to process concurrently. Clone does better with low concurrency.
-  at_a_time="${HGFOREST_CONCURRENCY:-2}"
-else
-  # Process command for all of the present repos
-  for i in . ${subrepos} ${subrepos_extra} ; do
-    if [ -d ${i}/.hg ] ; then
-      repos="${repos} ${i}"
-    fi
-  done
-
-  # Any repos to deal with?
-  if [ "${repos}" = "" ] ; then
-    echo "No repositories to process." > ${status_output}
-    exit
-  fi
-
-  # any of the repos locked?
-  locked=""
-  for i in ${repos} ; do
-    if [ -h ${i}/.hg/store/lock -o -f ${i}/.hg/store/lock ] ; then
-      locked="${i} ${locked}"
-    fi
-  done
-  if [ "${locked}" != "" ] ; then
-    echo "ERROR: These repositories are locked: ${locked}" > ${status_output}
-    exit 1
-  fi
-
-  # Repos to process concurrently.
-  at_a_time="${HGFOREST_CONCURRENCY:-8}"
-fi
-
-# Echo out what repositories we do a command on.
-echo "# Repositories: ${repos} ${repos_extra}" > ${status_output}
-
-if [ "${command}" = "serve" ] ; then
-  # "serve" is run for all the repos as one command.
-  (
-    (
-      cwd=`pwd`
-      serving=`basename ${cwd}`
-      (
-        echo "[web]"
-        echo "description = ${serving}"
-        echo "allow_push = *"
-        echo "push_ssl = False"
-
-        echo "[paths]"
-        for i in ${repos} ; do
-          if [ "${i}" != "." ] ; then
-            echo "/${serving}/${i} = ${i}"
-          else
-            echo "/${serving} = ${cwd}"
-          fi
-        done
-      ) > ${tmp}/serve.web-conf
-
-      echo "serving root repo ${serving}" > ${status_output}
-
-      echo "hg${global_opts} serve" > ${status_output}
-      (PYTHONUNBUFFERED=true hg${global_opts} serve -A ${status_output} -E ${status_output} --pid-file ${tmp}/serve.pid --web-conf ${tmp}/serve.web-conf; echo "$?" > ${tmp}/serve.pid.rc ) 2>&1 &
-    ) 2>&1 | sed -e "s@^@serve:   @" > ${status_output}
-  ) &
-else
-  # Run the supplied command on all repos in parallel.
-
-  # n is the number of subprocess started or which might still be running.
-  n=0
-  if [ ${have_fifos} = "true" ]; then
-    # if we have fifos use them to detect command completion.
-    mkfifo ${tmp}/fifo
-    exec 3<>${tmp}/fifo
-  fi
-
-  # iterate over all of the subrepos.
-  for i in ${repos} ${repos_extra} ; do
-    n=`expr ${n} '+' 1`
-    repopidfile=`echo ${i} | sed -e 's@./@@' -e 's@/@_@g'`
-    reponame=`echo ${i} | sed -e :a -e 's/^.\{1,20\}$/ &/;ta'`
-    pull_base="${pull_default}"
-
-    # regular repo or "extra" repo?
-    for j in ${repos_extra} ; do
-      if [ "${i}" = "${j}" ] ; then
-        # it's an "extra"
-        pull_base="${pull_extra}"
-      fi
-    done
-
-    # remove trailing slash
-    pull_base="`echo ${pull_base} | sed -e 's@[/]*$@@'`"
-
-    # execute the command on the subrepo
-    (
-      (
-        if [ "${command}" = "clone" -o "${command}" = "fclone" -o "${command}" = "tclone" ] ; then
-          # some form of clone
-          clone_newrepo="${pull_base}/${i}"
-          parent_path="`dirname ${i}`"
-          if [ "${parent_path}" != "." ] ; then
-            times=0
-            while [ ! -d "${parent_path}" ] ; do  ## nested repo, ensure containing dir exists
-              if [ "${sflag}" = "true" ] ; then
-                # Missing parent is fatal during sequential operation.
-                echo "ERROR: Missing parent path: ${parent_path}" > ${status_output}
-                exit 1
-              fi
-              times=`expr ${times} '+' 1`
-              if [ `expr ${times} '%' 10` -eq 0 ] ; then
-                echo "${parent_path} still not created, waiting..." > ${status_output}
-              fi
-              sleep 5
-            done
-          fi
-          # run the clone command.
-          echo "hg${global_opts} clone ${clone_newrepo} ${i}" > ${status_output}
-          (PYTHONUNBUFFERED=true hg${global_opts} clone ${clone_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc ) 2>&1 &
-        else
-          # run the command.
-          echo "cd ${i} && hg${global_opts} ${command} ${command_args}" > ${status_output}
-          cd ${i} && (PYTHONUNBUFFERED=true hg${global_opts} ${command} ${command_args}; echo "$?" > ${tmp}/${repopidfile}.pid.rc ) 2>&1 &
-        fi
-
-        echo $! > ${tmp}/${repopidfile}.pid
-      ) 2>&1 | sed -e "s@^@${reponame}:   @" > ${status_output}
-      # tell the fifo waiter that this subprocess is done.
-      if [ ${have_fifos} = "true" ]; then
-        echo "${i}" >&3
-      fi
-    ) &
-
-    if [ "${sflag}" = "true" ] ; then
-      # complete this task before starting another.
-      wait
-    else
-      if [ "${have_fifos}" = "true" ]; then
-        # check on count of running subprocesses and possibly wait for completion
-        if [ ${n} -ge ${at_a_time} ] ; then
-          # read will block until there are completed subprocesses
-          while read repo_done; do
-            n=`expr ${n} '-' 1`
-            if [ ${n} -lt ${at_a_time} ] ; then
-              # we should start more subprocesses
-              break;
-            fi
-          done <&3
-        fi
-      else
-        # Compare completions to starts
-        completed="`(ls -a1 ${tmp}/*.pid.rc 2> /dev/null | wc -l) || echo 0`"
-        while [ `expr ${n} '-' ${completed}` -ge ${at_a_time} ] ; do
-          # sleep a short time to give time for something to complete
-          sleep 1
-          completed="`(ls -a1 ${tmp}/*.pid.rc 2> /dev/null | wc -l) || echo 0`"
-        done
-      fi
-    fi
-  done
-fi
-
-# Wait for all subprocesses to complete
-wait
-
-# Terminate with exit 0 only if all subprocesses were successful
-ec=0
-if [ -d ${tmp} ]; then
-  rcfiles="`(ls -a ${tmp}/*.pid.rc 2> /dev/null) || echo ''`"
-  for rc in ${rcfiles} ; do
-    exit_code=`cat ${rc} | tr -d ' \n\r'`
-    if [ "${exit_code}" != "0" ] ; then
-      repo="`echo ${rc} | sed -e 's@^'${tmp}'@@' -e 's@/*\([^/]*\)\.pid\.rc$@\1@' -e 's@_@/@g'`"
-      echo "WARNING: ${repo} exited abnormally (${exit_code})" > ${status_output}
-      ec=1
-    fi
-  done
-fi
-exit ${ec}
diff --git a/common/bin/hide_important_warnings_from_javac.sh b/common/bin/hide_important_warnings_from_javac.sh
deleted file mode 100644
index 0433635..0000000
--- a/common/bin/hide_important_warnings_from_javac.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2012, 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.
-#
-
-if [ -x /usr/bin/ggrep ] ; then
-    # Gnu grep on Solaris
-    # (reference configure and build/solaris-i586-clientANDserver-release/spec.gmk
-    GREP=/usr/bin/ggrep
-else
-    GREP=grep
-fi
-#
-EXP="Note: Some input files use or override a deprecated API."
-EXP="${EXP}|Note: Recompile with -Xlint:deprecation for details."
-EXP="${EXP}|Note: Some input files use unchecked or unsafe operations."
-EXP="${EXP}|Note: Recompile with -Xlint:unchecked for details."
-EXP="${EXP}| warning"
-EXP="${EXP}|uses or overrides a deprecated API."
-EXP="${EXP}|uses unchecked or unsafe operations."
-#
-${GREP} --line-buffered -v -E "${EXP}"
diff --git a/common/bin/logger.sh b/common/bin/logger.sh
deleted file mode 100644
index 46ab48a..0000000
--- a/common/bin/logger.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2012, 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.
-#
-
-# Usage: ./logger.sh theloggfile acommand arg1 arg2 
-#
-# Execute acommand with args, in such a way that
-# both stdout and stderr from acommand are appended to 
-# theloggfile.
-#
-# Preserve stdout and stderr, so that the stdout
-# from logger.sh is the same from acommand and equally
-# for stderr.
-#
-# Propagate the result code from acommand so that
-# ./logger.sh exits with the same result code.
-
-# Create a temporary directory to store the result code from
-# the wrapped command.
-RCDIR=`mktemp -dt jdk-build-logger.tmp.XXXXXX` || exit $?
-trap "rm -rf \"$RCDIR\"" EXIT
-LOGFILE=$1
-shift
-(exec 3>&1 ; ("$@" 2>&1 1>&3; echo $? > "$RCDIR/rc") | tee -a $LOGFILE 1>&2 ; exec 3>&-) | tee -a $LOGFILE
-exit `cat "$RCDIR/rc"`
diff --git a/common/bin/shell-tracer.sh b/common/bin/shell-tracer.sh
deleted file mode 100644
index 27a964c..0000000
--- a/common/bin/shell-tracer.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2012, 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.
-#
-
-# Usage: sh shell-tracer.sh <TIME_CMD> <OUTPUT_FILE> <OLD_SHELL> <shell command line>
-#
-# This shell script is supposed to be set as a replacement for SHELL in make,
-# causing it to be called whenever make wants to execute shell commands.
-# The <shell command line> is suitable for passing on to the old shell, 
-# typically beginning with -c.
-#
-# This script will make sure the shell command line is executed with 
-# OLD_SHELL -x, and it will also store a simple log of the the time it takes to
-# execute the command in the OUTPUT_FILE, using the "time" utility as pointed 
-# to by TIME_CMD. If TIME_CMD is "-", no timestamp will be stored.
-
-TIME_CMD="$1"
-OUTPUT_FILE="$2"
-OLD_SHELL="$3"
-shift
-shift
-shift
-if [ "$TIME_CMD" != "-" ]; then
-"$TIME_CMD" -f "[TIME:%E] $*" -a -o "$OUTPUT_FILE" "$OLD_SHELL" -x "$@"
-else
-"$OLD_SHELL" -x "$@"
-fi
diff --git a/common/bin/test_builds.sh b/common/bin/test_builds.sh
deleted file mode 100644
index 9110080..0000000
--- a/common/bin/test_builds.sh
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/bin/bash
-
-set -x
-set -e
-
-options="$*"
-option="$1"
-
-tmp=/tmp/test_builds.$$
-rm -f -r ${tmp}
-mkdir -p ${tmp}
-
-errMessages=${tmp}/error_messages.txt
-
-#######
-# Error function
-error() # message
-{
-   echo "ERROR: $1" | tee -a ${errMessages}
-}
-# Check errors
-checkErrors()
-{
-    if [ -s ${errMessages} ] ; then
-        cat ${errMessages}
-	exit 1
-    fi
-}
-#######
-
-os="`uname -s`"
-arch="`uname -p`"
-make=make
-
-if [ "${os}" = "SunOS" ] ; then
-  make=gmake
-  export J7="/opt/java/jdk1.7.0"
-elif [ "${os}" = "Darwin" ] ; then
-  export J7="/Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home"
-elif [ "${os}" = "Linux" -a "${arch}" = "x86_64" ] ; then
-  export J7="/usr/lib/jvm/java-7-openjdk-amd64/"
-else
-  echo "What os/arch is this: ${os}/${arch}"
-  exit 1
-fi
-
-# Must have a jdk7
-if [ ! -d ${J7} ] ; then
-  echo "No JDK7 found at: ${J7}"
-  exit 1
-fi
-
-# What sources we use
-fromroot="http://hg.openjdk.java.net/build-infra/jdk8"
-
-# Where we do it
-root="testbuilds"
-mkdir -p ${root}
-
-# Three areas, last three are cloned from first to insure sameness
-t0=${root}/t0
-t1=${root}/t1
-t2=${root}/t2
-t3=${root}/t3
-repolist="${t0} ${t1} ${t2} ${t3}"
-
-# Optional complete clobber
-if [ "${option}" = "clobber" ] ; then
-  for i in ${repolist} ; do
-    rm -f -r ${i}
-  done
-fi
-
-# Get top repos
-if [ ! -d ${t0}/.hg ] ; then
-  rm -f -r ${t0}
-  hg clone ${fromroot} ${t0}
-fi
-for i in ${t1} ${t2} ${t3} ; do
-  if [ ! -d ${i}/.hg ] ; then
-    hg clone ${t0} ${i}
-  fi
-done
-
-# Get repos updated
-for i in ${repolist} ; do
-  ( \
-    set -e \
-    && cd ${i} \
-    && sh ./get_source.sh \
-    || error "Cannot get source" \
-  ) 2>&1 | tee ${i}.get_source.txt
-  checkErrors
-done
-
-# Optional clean
-if [ "${option}" = "clean" ] ; then
-  for i in ${repolist} ; do
-    rm -f -r ${i}/build
-    rm -f -r ${i}/*/build
-    rm -f -r ${i}/*/dist
-  done
-fi
-
-# Check changes on working set files
-for i in ${repolist} ; do
-  ( \
-    set -e \
-    && cd ${i} \
-    && sh ./make/scripts/hgforest.sh status \
-    || error "Cannot check status" \
-  ) 2>&1 | tee ${i}.hg.status.txt
-  checkErrors
-done
-
-# Configure for build-infra building
-for i in ${t1} ${t2} ; do
-  ( \
-    set -e \
-    && cd ${i}/common/makefiles \
-    && sh ../autoconf/configure --with-boot-jdk=${J7} \
-    || error "Cannot configure" \
-  ) 2>&1 | tee ${i}.config.txt
-  checkErrors
-done
-
-# Do build-infra builds
-for i in ${t1} ${t2} ; do
-  ( \
-    set -e \
-    && cd ${i}/common/makefiles \
-    && ${make}  \
-      FULL_VERSION:=1.8.0-internal-b00 \
-      JRE_RELEASE_VERSION:=1.8.0-internal-b00 \
-      USER_RELEASE_SUFFIX:=compare \
-      RELEASE:=1.8.0-internal \
-      VERBOSE= \
-      LIBARCH= \
-         all images \
-    || error "Cannot build" \
-  ) 2>&1 | tee ${i}.build.txt
-  checkErrors
-done
-
-# Compare build-infra builds
-( \
-  sh ${t0}/common/bin/compareimage.sh \
-    ${t1}/build/*/images/j2sdk-image \
-    ${t2}/build/*/images/j2sdk-image \
-    || error "Cannot compare" \
-) 2>&1 | tee ${root}/build-infra-comparison.txt
-checkErrors
-
-# Do old build
-unset JAVA_HOME
-export ALT_BOOTDIR="${J7}"
-( \
-  cd ${t3} \
-  && ${make} FULL_VERSION='"1.8.0-internal" sanity \
-  || error "Cannot sanity" \
-) 2>&1 | tee ${t3}.sanity.txt
-checkErrors
-( \
-  cd ${t3} \
-  && ${make} \
-      FULL_VERSION='"1.8.0-internal" \
-      JRE_RELEASE_VERSION:=1.8.0-internal-b00 \
-      USER_RELEASE_SUFFIX:=compare \
-      RELEASE:=1.8.0-internal \
-  || error "Cannot build old way" \
-) 2>&1 | tee ${t3}.build.txt
-checkErrors
-
-# Compare old build to build-infra build 
-( \
-  sh ${t0}/common/bin/compareimage.sh \
-    ${t3}/build/*/j2sdk-image \
-    ${t1}/build/*/images/j2sdk-image \
-    || error "Cannot compare" \
-) 2>&1 | tee ${root}/build-comparison.txt
-checkErrors
-
-exit 0
-
diff --git a/common/nb_native/nbproject/configurations.xml b/common/nb_native/nbproject/configurations.xml
deleted file mode 100644
index d2beed0..0000000
--- a/common/nb_native/nbproject/configurations.xml
+++ /dev/null
@@ -1,41671 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="88">
-  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
-    <df root="../.." name="$SRC">
-      <df name="build">
-        <df name="linux-x86_64-normal-server-release">
-          <df name="hotspot">
-            <df name="linux_amd64_compiler2">
-              <df name="generated">
-                <df name="adfiles">
-                  <in>ad_x86_64.cpp</in>
-                  <in>ad_x86_64_clone.cpp</in>
-                  <in>ad_x86_64_expand.cpp</in>
-                  <in>ad_x86_64_format.cpp</in>
-                  <in>ad_x86_64_gen.cpp</in>
-                  <in>ad_x86_64_misc.cpp</in>
-                  <in>ad_x86_64_peephole.cpp</in>
-                  <in>ad_x86_64_pipeline.cpp</in>
-                  <in>dfa_x86_64.cpp</in>
-                </df>
-                <df name="jvmtifiles">
-                  <in>bytecodeInterpreterWithChecks.cpp</in>
-                  <in>jvmtiEnter.cpp</in>
-                  <in>jvmtiEnterTrace.cpp</in>
-                </df>
-              </df>
-            </df>
-          </df>
-          <df name="jdk">
-            <df name="gensrc_x11wrappers">
-              <in>sizer.64.c</in>
-            </df>
-          </df>
-        </df>
-        <df name="macosx-x86_64-normal-server-release">
-          <df name="hotspot">
-            <df name="bsd_amd64_compiler2">
-              <df name="generated">
-                <df name="adfiles">
-                  <in>ad_x86_64.cpp</in>
-                  <in>ad_x86_64_clone.cpp</in>
-                  <in>ad_x86_64_expand.cpp</in>
-                  <in>ad_x86_64_format.cpp</in>
-                  <in>ad_x86_64_gen.cpp</in>
-                  <in>ad_x86_64_misc.cpp</in>
-                  <in>ad_x86_64_peephole.cpp</in>
-                  <in>ad_x86_64_pipeline.cpp</in>
-                  <in>dfa_x86_64.cpp</in>
-                </df>
-                <df name="jvmtifiles">
-                  <in>bytecodeInterpreterWithChecks.cpp</in>
-                  <in>jvmtiEnter.cpp</in>
-                  <in>jvmtiEnterTrace.cpp</in>
-                </df>
-              </df>
-            </df>
-          </df>
-          <df name="jdk">
-            <df name="gensrc_x11wrappers">
-              <in>sizer.64.c</in>
-            </df>
-          </df>
-        </df>
-        <df name="solaris-x86_64-normal-server-release">
-          <df name="hotspot">
-            <df name="solaris_amd64_compiler2">
-              <df name="generated">
-                <df name="adfiles">
-                  <in>ad_x86_64.cpp</in>
-                  <in>ad_x86_64_clone.cpp</in>
-                  <in>ad_x86_64_expand.cpp</in>
-                  <in>ad_x86_64_format.cpp</in>
-                  <in>ad_x86_64_gen.cpp</in>
-                  <in>ad_x86_64_misc.cpp</in>
-                  <in>ad_x86_64_peephole.cpp</in>
-                  <in>ad_x86_64_pipeline.cpp</in>
-                  <in>dfa_x86_64.cpp</in>
-                </df>
-                <df name="jvmtifiles">
-                  <in>bytecodeInterpreterWithChecks.cpp</in>
-                  <in>jvmtiEnter.cpp</in>
-                  <in>jvmtiEnterTrace.cpp</in>
-                </df>
-              </df>
-              <df name="product">
-                <in>JvmOffsets.cpp</in>
-              </df>
-            </df>
-          </df>
-          <df name="jdk">
-            <df name="gensrc_x11wrappers">
-              <in>sizer.64.c</in>
-            </df>
-          </df>
-        </df>
-      </df>
-      <df name="hotspot">
-        <df name="agent">
-          <df name="src">
-            <df name="os">
-              <df name="linux">
-                <in>LinuxDebuggerLocal.c</in>
-                <in>libproc_impl.c</in>
-                <in>ps_core.c</in>
-                <in>ps_proc.c</in>
-                <in>salibelf.c</in>
-                <in>symtab.c</in>
-              </df>
-              <df name="solaris">
-                <df name="proc">
-                  <in>saproc.cpp</in>
-                </df>
-              </df>
-            </df>
-            <df name="share">
-              <df name="native">
-                <in>sadis.c</in>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="src">
-          <df name="cpu">
-            <df name="x86">
-              <df name="vm">
-                <in>assembler_x86.cpp</in>
-                <in>bytecodeInterpreter_x86.cpp</in>
-                <in>bytecodes_x86.cpp</in>
-                <in>c1_CodeStubs_x86.cpp</in>
-                <in>c1_FpuStackSim_x86.cpp</in>
-                <in>c1_FrameMap_x86.cpp</in>
-                <in>c1_LIRAssembler_x86.cpp</in>
-                <in>c1_LIRGenerator_x86.cpp</in>
-                <in>c1_LinearScan_x86.cpp</in>
-                <in>c1_MacroAssembler_x86.cpp</in>
-                <in>c1_Runtime1_x86.cpp</in>
-                <in>c2_init_x86.cpp</in>
-                <in>cppInterpreter_x86.cpp</in>
-                <in>debug_x86.cpp</in>
-                <in>depChecker_x86.cpp</in>
-                <in>frame_x86.cpp</in>
-                <in>icBuffer_x86.cpp</in>
-                <in>icache_x86.cpp</in>
-                <in>interp_masm_x86_64.cpp</in>
-                <in>interpreterRT_x86_64.cpp</in>
-                <in>interpreter_x86_64.cpp</in>
-                <in>jniFastGetField_x86_64.cpp</in>
-                <in>macroAssembler_x86.cpp</in>
-                <in>metaspaceShared_x86_64.cpp</in>
-                <in>methodHandles_x86.cpp</in>
-                <in>nativeInst_x86.cpp</in>
-                <in>register_definitions_x86.cpp</in>
-                <in>register_x86.cpp</in>
-                <in>relocInfo_x86.cpp</in>
-                <in>runtime_x86_64.cpp</in>
-                <in>sharedRuntime_x86_64.cpp</in>
-                <in>stubGenerator_x86_64.cpp</in>
-                <in>stubRoutines_x86_64.cpp</in>
-                <in>templateInterpreter_x86_64.cpp</in>
-                <in>templateTable_x86_64.cpp</in>
-                <in>vm_version_x86.cpp</in>
-                <in>vmreg_x86.cpp</in>
-                <in>vtableStubs_x86_64.cpp</in>
-              </df>
-            </df>
-          </df>
-          <df name="os">
-            <df name="bsd">
-              <df name="vm">
-                <in>attachListener_bsd.cpp</in>
-                <in>chaitin_bsd.cpp</in>
-                <in>decoder_machO.cpp</in>
-                <in>dtraceJSDT_bsd.cpp</in>
-                <in>jvm_bsd.cpp</in>
-                <in>mutex_bsd.cpp</in>
-                <in>osThread_bsd.cpp</in>
-                <in>os_bsd.cpp</in>
-                <in>perfMemory_bsd.cpp</in>
-                <in>stubRoutines_bsd.cpp</in>
-                <in>threadCritical_bsd.cpp</in>
-                <in>vmError_bsd.cpp</in>
-              </df>
-            </df>
-            <df name="linux">
-              <df name="vm">
-                <in>attachListener_linux.cpp</in>
-                <in>chaitin_linux.cpp</in>
-                <in>decoder_linux.cpp</in>
-                <in>dtraceJSDT_linux.cpp</in>
-                <in>jsig.c</in>
-                <in>jvm_linux.cpp</in>
-                <in>mutex_linux.cpp</in>
-                <in>osThread_linux.cpp</in>
-                <in>os_linux.cpp</in>
-                <in>perfMemory_linux.cpp</in>
-                <in>stubRoutines_linux.cpp</in>
-                <in>threadCritical_linux.cpp</in>
-                <in>vmError_linux.cpp</in>
-              </df>
-            </df>
-            <df name="posix">
-              <df name="launcher">
-                <in>java_md.c</in>
-              </df>
-              <df name="vm">
-                <in>os_posix.cpp</in>
-              </df>
-            </df>
-            <df name="solaris">
-              <df name="add_gnu_debuglink">
-                <in>add_gnu_debuglink.c</in>
-              </df>
-              <df name="dtrace">
-                <in>generateJvmOffsets.cpp</in>
-                <in>generateJvmOffsetsMain.c</in>
-                <in>jvm_dtrace.c</in>
-                <in>libjvm_db.c</in>
-              </df>
-              <df name="fix_empty_sec_hdr_flags">
-                <in>fix_empty_sec_hdr_flags.c</in>
-              </df>
-              <df name="vm">
-                <in>attachListener_solaris.cpp</in>
-                <in>chaitin_solaris.cpp</in>
-                <in>decoder_solaris.cpp</in>
-                <in>dtraceJSDT_solaris.cpp</in>
-                <in>jsig.c</in>
-                <in>jvm_solaris.cpp</in>
-                <in>mutex_solaris.cpp</in>
-                <in>osThread_solaris.cpp</in>
-                <in>os_solaris.cpp</in>
-                <in>perfMemory_solaris.cpp</in>
-                <in>stubRoutines_solaris.cpp</in>
-                <in>threadCritical_solaris.cpp</in>
-                <in>vmError_solaris.cpp</in>
-              </df>
-            </df>
-          </df>
-          <df name="os_cpu">
-            <df name="bsd_x86">
-              <df name="vm">
-                <in>assembler_bsd_x86.cpp</in>
-                <in>os_bsd_x86.cpp</in>
-                <in>threadLS_bsd_x86.cpp</in>
-                <in>thread_bsd_x86.cpp</in>
-                <in>vm_version_bsd_x86.cpp</in>
-              </df>
-            </df>
-            <df name="linux_x86">
-              <df name="vm">
-                <in>assembler_linux_x86.cpp</in>
-                <in>os_linux_x86.cpp</in>
-                <in>threadLS_linux_x86.cpp</in>
-                <in>thread_linux_x86.cpp</in>
-                <in>vm_version_linux_x86.cpp</in>
-              </df>
-            </df>
-            <df name="solaris_x86">
-              <df name="vm">
-                <in>assembler_solaris_x86.cpp</in>
-                <in>os_solaris_x86.cpp</in>
-                <in>threadLS_solaris_x86.cpp</in>
-                <in>thread_solaris_x86.cpp</in>
-                <in>vm_version_solaris_x86.cpp</in>
-              </df>
-            </df>
-          </df>
-          <df name="share">
-            <df name="tools">
-              <df name="launcher">
-                <in>java.c</in>
-                <in>jli_util.c</in>
-                <in>wildcard.c</in>
-              </df>
-            </df>
-            <df name="vm">
-              <df name="adlc">
-                <in>adlparse.cpp</in>
-                <in>archDesc.cpp</in>
-                <in>arena.cpp</in>
-                <in>dfa.cpp</in>
-                <in>dict2.cpp</in>
-                <in>filebuff.cpp</in>
-                <in>forms.cpp</in>
-                <in>formsopt.cpp</in>
-                <in>formssel.cpp</in>
-                <in>main.cpp</in>
-                <in>output_c.cpp</in>
-                <in>output_h.cpp</in>
-              </df>
-              <df name="asm">
-                <in>assembler.cpp</in>
-                <in>codeBuffer.cpp</in>
-                <in>register.cpp</in>
-              </df>
-              <df name="c1">
-                <in>c1_CFGPrinter.cpp</in>
-                <in>c1_Canonicalizer.cpp</in>
-                <in>c1_Compilation.cpp</in>
-                <in>c1_Compiler.cpp</in>
-                <in>c1_Defs.cpp</in>
-                <in>c1_FrameMap.cpp</in>
-                <in>c1_GraphBuilder.cpp</in>
-                <in>c1_IR.cpp</in>
-                <in>c1_Instruction.cpp</in>
-                <in>c1_InstructionPrinter.cpp</in>
-                <in>c1_LIR.cpp</in>
-                <in>c1_LIRAssembler.cpp</in>
-                <in>c1_LIRGenerator.cpp</in>
-                <in>c1_LinearScan.cpp</in>
-                <in>c1_Optimizer.cpp</in>
-                <in>c1_RangeCheckElimination.cpp</in>
-                <in>c1_Runtime1.cpp</in>
-                <in>c1_ValueMap.cpp</in>
-                <in>c1_ValueSet.cpp</in>
-                <in>c1_ValueStack.cpp</in>
-                <in>c1_ValueType.cpp</in>
-                <in>c1_globals.cpp</in>
-              </df>
-              <df name="ci">
-                <in>bcEscapeAnalyzer.cpp</in>
-                <in>ciArray.cpp</in>
-                <in>ciArrayKlass.cpp</in>
-                <in>ciBaseObject.cpp</in>
-                <in>ciCallSite.cpp</in>
-                <in>ciConstant.cpp</in>
-                <in>ciConstantPoolCache.cpp</in>
-                <in>ciEnv.cpp</in>
-                <in>ciExceptionHandler.cpp</in>
-                <in>ciField.cpp</in>
-                <in>ciFlags.cpp</in>
-                <in>ciInstance.cpp</in>
-                <in>ciInstanceKlass.cpp</in>
-                <in>ciKlass.cpp</in>
-                <in>ciMemberName.cpp</in>
-                <in>ciMetadata.cpp</in>
-                <in>ciMethod.cpp</in>
-                <in>ciMethodBlocks.cpp</in>
-                <in>ciMethodData.cpp</in>
-                <in>ciMethodHandle.cpp</in>
-                <in>ciNullObject.cpp</in>
-                <in>ciObjArray.cpp</in>
-                <in>ciObjArrayKlass.cpp</in>
-                <in>ciObject.cpp</in>
-                <in>ciObjectFactory.cpp</in>
-                <in>ciReplay.cpp</in>
-                <in>ciSignature.cpp</in>
-                <in>ciStreams.cpp</in>
-                <in>ciSymbol.cpp</in>
-                <in>ciType.cpp</in>
-                <in>ciTypeArray.cpp</in>
-                <in>ciTypeArrayKlass.cpp</in>
-                <in>ciTypeFlow.cpp</in>
-                <in>ciUtilities.cpp</in>
-              </df>
-              <df name="classfile">
-                <in>altHashing.cpp</in>
-                <in>bytecodeAssembler.cpp</in>
-                <in>classFileError.cpp</in>
-                <in>classFileParser.cpp</in>
-                <in>classFileStream.cpp</in>
-                <in>classLoader.cpp</in>
-                <in>classLoaderData.cpp</in>
-                <in>defaultMethods.cpp</in>
-                <in>dictionary.cpp</in>
-                <in>genericSignatures.cpp</in>
-                <in>javaAssertions.cpp</in>
-                <in>javaClasses.cpp</in>
-                <in>loaderConstraints.cpp</in>
-                <in>metadataOnStackMark.cpp</in>
-                <in>placeholders.cpp</in>
-                <in>resolutionErrors.cpp</in>
-                <in>stackMapFrame.cpp</in>
-                <in>stackMapTable.cpp</in>
-                <in>symbolTable.cpp</in>
-                <in>systemDictionary.cpp</in>
-                <in>verificationType.cpp</in>
-                <in>verifier.cpp</in>
-                <in>vmSymbols.cpp</in>
-              </df>
-              <df name="code">
-                <in>codeBlob.cpp</in>
-                <in>codeCache.cpp</in>
-                <in>compiledIC.cpp</in>
-                <in>compressedStream.cpp</in>
-                <in>debugInfo.cpp</in>
-                <in>debugInfoRec.cpp</in>
-                <in>dependencies.cpp</in>
-                <in>exceptionHandlerTable.cpp</in>
-                <in>icBuffer.cpp</in>
-                <in>location.cpp</in>
-                <in>nmethod.cpp</in>
-                <in>oopRecorder.cpp</in>
-                <in>pcDesc.cpp</in>
-                <in>relocInfo.cpp</in>
-                <in>scopeDesc.cpp</in>
-                <in>stubs.cpp</in>
-                <in>vmreg.cpp</in>
-                <in>vtableStubs.cpp</in>
-              </df>
-              <df name="compiler">
-                <in>abstractCompiler.cpp</in>
-                <in>compileBroker.cpp</in>
-                <in>compileLog.cpp</in>
-                <in>compilerOracle.cpp</in>
-                <in>disassembler.cpp</in>
-                <in>methodLiveness.cpp</in>
-                <in>oopMap.cpp</in>
-              </df>
-              <df name="gc_implementation">
-                <df name="concurrentMarkSweep">
-                  <in>adaptiveFreeList.cpp</in>
-                  <in>cmsAdaptiveSizePolicy.cpp</in>
-                  <in>cmsCollectorPolicy.cpp</in>
-                  <in>cmsGCAdaptivePolicyCounters.cpp</in>
-                  <in>cmsLockVerifier.cpp</in>
-                  <in>compactibleFreeListSpace.cpp</in>
-                  <in>concurrentMarkSweepGeneration.cpp</in>
-                  <in>concurrentMarkSweepThread.cpp</in>
-                  <in>freeChunk.cpp</in>
-                  <in>promotionInfo.cpp</in>
-                  <in>vmCMSOperations.cpp</in>
-                </df>
-                <df name="g1">
-                  <in>collectionSetChooser.cpp</in>
-                  <in>concurrentG1Refine.cpp</in>
-                  <in>concurrentG1RefineThread.cpp</in>
-                  <in>concurrentMark.cpp</in>
-                  <in>concurrentMarkThread.cpp</in>
-                  <in>dirtyCardQueue.cpp</in>
-                  <in>g1AllocRegion.cpp</in>
-                  <in>g1BlockOffsetTable.cpp</in>
-                  <in>g1CollectedHeap.cpp</in>
-                  <in>g1CollectorPolicy.cpp</in>
-                  <in>g1ErgoVerbose.cpp</in>
-                  <in>g1GCPhaseTimes.cpp</in>
-                  <in>g1HRPrinter.cpp</in>
-                  <in>g1Log.cpp</in>
-                  <in>g1MMUTracker.cpp</in>
-                  <in>g1MarkSweep.cpp</in>
-                  <in>g1MonitoringSupport.cpp</in>
-                  <in>g1RemSet.cpp</in>
-                  <in>g1SATBCardTableModRefBS.cpp</in>
-                  <in>g1_globals.cpp</in>
-                  <in>heapRegion.cpp</in>
-                  <in>heapRegionRemSet.cpp</in>
-                  <in>heapRegionSeq.cpp</in>
-                  <in>heapRegionSet.cpp</in>
-                  <in>heapRegionSets.cpp</in>
-                  <in>ptrQueue.cpp</in>
-                  <in>satbQueue.cpp</in>
-                  <in>sparsePRT.cpp</in>
-                  <in>survRateGroup.cpp</in>
-                  <in>vm_operations_g1.cpp</in>
-                </df>
-                <df name="parallelScavenge">
-                  <in>adjoiningGenerations.cpp</in>
-                  <in>adjoiningVirtualSpaces.cpp</in>
-                  <in>asPSOldGen.cpp</in>
-                  <in>asPSYoungGen.cpp</in>
-                  <in>cardTableExtension.cpp</in>
-                  <in>gcTaskManager.cpp</in>
-                  <in>gcTaskThread.cpp</in>
-                  <in>objectStartArray.cpp</in>
-                  <in>parMarkBitMap.cpp</in>
-                  <in>parallelScavengeHeap.cpp</in>
-                  <in>pcTasks.cpp</in>
-                  <in>psAdaptiveSizePolicy.cpp</in>
-                  <in>psCompactionManager.cpp</in>
-                  <in>psGCAdaptivePolicyCounters.cpp</in>
-                  <in>psGenerationCounters.cpp</in>
-                  <in>psMarkSweep.cpp</in>
-                  <in>psMarkSweepDecorator.cpp</in>
-                  <in>psOldGen.cpp</in>
-                  <in>psParallelCompact.cpp</in>
-                  <in>psPromotionLAB.cpp</in>
-                  <in>psPromotionManager.cpp</in>
-                  <in>psScavenge.cpp</in>
-                  <in>psTasks.cpp</in>
-                  <in>psVirtualspace.cpp</in>
-                  <in>psYoungGen.cpp</in>
-                  <in>vmPSOperations.cpp</in>
-                </df>
-                <df name="parNew">
-                  <in>asParNewGeneration.cpp</in>
-                  <in>parCardTableModRefBS.cpp</in>
-                  <in>parNewGeneration.cpp</in>
-                </df>
-                <df name="shared">
-                  <in>adaptiveSizePolicy.cpp</in>
-                  <in>ageTable.cpp</in>
-                  <in>allocationStats.cpp</in>
-                  <in>cSpaceCounters.cpp</in>
-                  <in>collectorCounters.cpp</in>
-                  <in>concurrentGCThread.cpp</in>
-                  <in>gSpaceCounters.cpp</in>
-                  <in>gcAdaptivePolicyCounters.cpp</in>
-                  <in>gcPolicyCounters.cpp</in>
-                  <in>gcStats.cpp</in>
-                  <in>gcUtil.cpp</in>
-                  <in>generationCounters.cpp</in>
-                  <in>hSpaceCounters.cpp</in>
-                  <in>immutableSpace.cpp</in>
-                  <in>markSweep.cpp</in>
-                  <in>mutableNUMASpace.cpp</in>
-                  <in>mutableSpace.cpp</in>
-                  <in>parGCAllocBuffer.cpp</in>
-                  <in>spaceCounters.cpp</in>
-                  <in>spaceDecorator.cpp</in>
-                  <in>vmGCOperations.cpp</in>
-                </df>
-              </df>
-              <df name="gc_interface">
-                <in>collectedHeap.cpp</in>
-                <in>gcCause.cpp</in>
-              </df>
-              <df name="interpreter">
-                <in>bytecode.cpp</in>
-                <in>bytecodeHistogram.cpp</in>
-                <in>bytecodeInterpreter.cpp</in>
-                <in>bytecodeStream.cpp</in>
-                <in>bytecodeTracer.cpp</in>
-                <in>bytecodes.cpp</in>
-                <in>cppInterpreter.cpp</in>
-                <in>interpreter.cpp</in>
-                <in>interpreterRuntime.cpp</in>
-                <in>invocationCounter.cpp</in>
-                <in>linkResolver.cpp</in>
-                <in>oopMapCache.cpp</in>
-                <in>rewriter.cpp</in>
-                <in>templateInterpreter.cpp</in>
-                <in>templateTable.cpp</in>
-              </df>
-              <df name="libadt">
-                <in>dict.cpp</in>
-                <in>port.cpp</in>
-                <in>set.cpp</in>
-                <in>vectset.cpp</in>
-              </df>
-              <df name="memory">
-                <in>allocation.cpp</in>
-                <in>barrierSet.cpp</in>
-                <in>binaryTreeDictionary.cpp</in>
-                <in>blockOffsetTable.cpp</in>
-                <in>cardTableModRefBS.cpp</in>
-                <in>cardTableRS.cpp</in>
-                <in>collectorPolicy.cpp</in>
-                <in>defNewGeneration.cpp</in>
-                <in>filemap.cpp</in>
-                <in>freeBlockDictionary.cpp</in>
-                <in>freeList.cpp</in>
-                <in>gcLocker.cpp</in>
-                <in>genCollectedHeap.cpp</in>
-                <in>genMarkSweep.cpp</in>
-                <in>genRemSet.cpp</in>
-                <in>generation.cpp</in>
-                <in>generationSpec.cpp</in>
-                <in>heap.cpp</in>
-                <in>heapInspection.cpp</in>
-                <in>iterator.cpp</in>
-                <in>memRegion.cpp</in>
-                <in>metablock.cpp</in>
-                <in>metachunk.cpp</in>
-                <in>metaspace.cpp</in>
-                <in>metaspaceCounters.cpp</in>
-                <in>metaspaceShared.cpp</in>
-                <in>oopFactory.cpp</in>
-                <in>referencePolicy.cpp</in>
-                <in>referenceProcessor.cpp</in>
-                <in>resourceArea.cpp</in>
-                <in>sharedHeap.cpp</in>
-                <in>space.cpp</in>
-                <in>specialized_oop_closures.cpp</in>
-                <in>tenuredGeneration.cpp</in>
-                <in>threadLocalAllocBuffer.cpp</in>
-                <in>universe.cpp</in>
-              </df>
-              <df name="oops">
-                <in>annotations.cpp</in>
-                <in>arrayKlass.cpp</in>
-                <in>arrayOop.cpp</in>
-                <in>compiledICHolder.cpp</in>
-                <in>constMethod.cpp</in>
-                <in>constantPool.cpp</in>
-                <in>cpCache.cpp</in>
-                <in>generateOopMap.cpp</in>
-                <in>instanceClassLoaderKlass.cpp</in>
-                <in>instanceKlass.cpp</in>
-                <in>instanceMirrorKlass.cpp</in>
-                <in>instanceOop.cpp</in>
-                <in>instanceRefKlass.cpp</in>
-                <in>klass.cpp</in>
-                <in>klassVtable.cpp</in>
-                <in>markOop.cpp</in>
-                <in>metadata.cpp</in>
-                <in>method.cpp</in>
-                <in>methodData.cpp</in>
-                <in>objArrayKlass.cpp</in>
-                <in>objArrayOop.cpp</in>
-                <in>oop.cpp</in>
-                <in>oopsHierarchy.cpp</in>
-                <in>symbol.cpp</in>
-                <in>typeArrayKlass.cpp</in>
-                <in>typeArrayOop.cpp</in>
-              </df>
-              <df name="opto">
-                <in>addnode.cpp</in>
-                <in>block.cpp</in>
-                <in>buildOopMap.cpp</in>
-                <in>bytecodeInfo.cpp</in>
-                <in>c2_globals.cpp</in>
-                <in>c2compiler.cpp</in>
-                <in>callGenerator.cpp</in>
-                <in>callnode.cpp</in>
-                <in>cfgnode.cpp</in>
-                <in>chaitin.cpp</in>
-                <in>classes.cpp</in>
-                <in>coalesce.cpp</in>
-                <in>compile.cpp</in>
-                <in>connode.cpp</in>
-                <in>divnode.cpp</in>
-                <in>doCall.cpp</in>
-                <in>domgraph.cpp</in>
-                <in>escape.cpp</in>
-                <in>gcm.cpp</in>
-                <in>generateOptoStub.cpp</in>
-                <in>graphKit.cpp</in>
-                <in>idealGraphPrinter.cpp</in>
-                <in>idealKit.cpp</in>
-                <in>ifg.cpp</in>
-                <in>ifnode.cpp</in>
-                <in>indexSet.cpp</in>
-                <in>lcm.cpp</in>
-                <in>library_call.cpp</in>
-                <in>live.cpp</in>
-                <in>locknode.cpp</in>
-                <in>loopPredicate.cpp</in>
-                <in>loopTransform.cpp</in>
-                <in>loopUnswitch.cpp</in>
-                <in>loopnode.cpp</in>
-                <in>loopopts.cpp</in>
-                <in>machnode.cpp</in>
-                <in>macro.cpp</in>
-                <in>matcher.cpp</in>
-                <in>memnode.cpp</in>
-                <in>mulnode.cpp</in>
-                <in>multnode.cpp</in>
-                <in>node.cpp</in>
-                <in>opcodes.cpp</in>
-                <in>output.cpp</in>
-                <in>parse1.cpp</in>
-                <in>parse2.cpp</in>
-                <in>parse3.cpp</in>
-                <in>parseHelper.cpp</in>
-                <in>phase.cpp</in>
-                <in>phaseX.cpp</in>
-                <in>postaloc.cpp</in>
-                <in>reg_split.cpp</in>
-                <in>regalloc.cpp</in>
-                <in>regmask.cpp</in>
-                <in>rootnode.cpp</in>
-                <in>runtime.cpp</in>
-                <in>split_if.cpp</in>
-                <in>stringopts.cpp</in>
-                <in>subnode.cpp</in>
-                <in>superword.cpp</in>
-                <in>type.cpp</in>
-                <in>vectornode.cpp</in>
-              </df>
-              <df name="precompiled">
-                <in>precompiled.hpp</in>
-              </df>
-              <df name="prims">
-                <df name="wbtestmethods">
-                  <in>parserTests.cpp</in>
-                </df>
-                <in>evmCompat.cpp</in>
-                <in>forte.cpp</in>
-                <in>jni.cpp</in>
-                <in>jniCheck.cpp</in>
-                <in>jniFastGetField.cpp</in>
-                <in>jvm.cpp</in>
-                <in>jvmtiClassFileReconstituter.cpp</in>
-                <in>jvmtiCodeBlobEvents.cpp</in>
-                <in>jvmtiEnv.cpp</in>
-                <in>jvmtiEnvBase.cpp</in>
-                <in>jvmtiEnvThreadState.cpp</in>
-                <in>jvmtiEventController.cpp</in>
-                <in>jvmtiExport.cpp</in>
-                <in>jvmtiExtensions.cpp</in>
-                <in>jvmtiGetLoadedClasses.cpp</in>
-                <in>jvmtiImpl.cpp</in>
-                <in>jvmtiManageCapabilities.cpp</in>
-                <in>jvmtiRawMonitor.cpp</in>
-                <in>jvmtiRedefineClasses.cpp</in>
-                <in>jvmtiTagMap.cpp</in>
-                <in>jvmtiThreadState.cpp</in>
-                <in>jvmtiTrace.cpp</in>
-                <in>jvmtiUtil.cpp</in>
-                <in>methodComparator.cpp</in>
-                <in>methodHandles.cpp</in>
-                <in>nativeLookup.cpp</in>
-                <in>perf.cpp</in>
-                <in>privilegedStack.cpp</in>
-                <in>unsafe.cpp</in>
-                <in>whitebox.cpp</in>
-              </df>
-              <df name="runtime">
-                <in>advancedThresholdPolicy.cpp</in>
-                <in>aprofiler.cpp</in>
-                <in>arguments.cpp</in>
-                <in>atomic.cpp</in>
-                <in>basicLock.cpp</in>
-                <in>biasedLocking.cpp</in>
-                <in>compilationPolicy.cpp</in>
-                <in>deoptimization.cpp</in>
-                <in>dtraceJSDT.cpp</in>
-                <in>fieldDescriptor.cpp</in>
-                <in>fieldType.cpp</in>
-                <in>fprofiler.cpp</in>
-                <in>frame.cpp</in>
-                <in>globals.cpp</in>
-                <in>handles.cpp</in>
-                <in>icache.cpp</in>
-                <in>init.cpp</in>
-                <in>interfaceSupport.cpp</in>
-                <in>java.cpp</in>
-                <in>javaCalls.cpp</in>
-                <in>jniHandles.cpp</in>
-                <in>jniPeriodicChecker.cpp</in>
-                <in>memprofiler.cpp</in>
-                <in>monitorChunk.cpp</in>
-                <in>mutex.cpp</in>
-                <in>mutexLocker.cpp</in>
-                <in>objectMonitor.cpp</in>
-                <in>orderAccess.cpp</in>
-                <in>os.cpp</in>
-                <in>osThread.cpp</in>
-                <in>park.cpp</in>
-                <in>perfData.cpp</in>
-                <in>perfMemory.cpp</in>
-                <in>reflection.cpp</in>
-                <in>reflectionUtils.cpp</in>
-                <in>relocator.cpp</in>
-                <in>rframe.cpp</in>
-                <in>safepoint.cpp</in>
-                <in>serviceThread.cpp</in>
-                <in>sharedRuntime.cpp</in>
-                <in>sharedRuntimeTrans.cpp</in>
-                <in>sharedRuntimeTrig.cpp</in>
-                <in>signature.cpp</in>
-                <in>simpleThresholdPolicy.cpp</in>
-                <in>stackValue.cpp</in>
-                <in>stackValueCollection.cpp</in>
-                <in>statSampler.cpp</in>
-                <in>stubCodeGenerator.cpp</in>
-                <in>stubRoutines.cpp</in>
-                <in>sweeper.cpp</in>
-                <in>synchronizer.cpp</in>
-                <in>task.cpp</in>
-                <in>thread.cpp</in>
-                <in>threadLocalStorage.cpp</in>
-                <in>timer.cpp</in>
-                <in>unhandledOops.cpp</in>
-                <in>vframe.cpp</in>
-                <in>vframeArray.cpp</in>
-                <in>vframe_hp.cpp</in>
-                <in>virtualspace.cpp</in>
-                <in>vmStructs.cpp</in>
-                <in>vmThread.cpp</in>
-                <in>vm_operations.cpp</in>
-                <in>vm_version.cpp</in>
-              </df>
-              <df name="services">
-                <in>attachListener.cpp</in>
-                <in>classLoadingService.cpp</in>
-                <in>diagnosticArgument.cpp</in>
-                <in>diagnosticCommand.cpp</in>
-                <in>diagnosticFramework.cpp</in>
-                <in>dtraceAttacher.cpp</in>
-                <in>g1MemoryPool.cpp</in>
-                <in>gcNotifier.cpp</in>
-                <in>heapDumper.cpp</in>
-                <in>lowMemoryDetector.cpp</in>
-                <in>management.cpp</in>
-                <in>memBaseline.cpp</in>
-                <in>memPtr.cpp</in>
-                <in>memRecorder.cpp</in>
-                <in>memReporter.cpp</in>
-                <in>memSnapshot.cpp</in>
-                <in>memTrackWorker.cpp</in>
-                <in>memTracker.cpp</in>
-                <in>memoryManager.cpp</in>
-                <in>memoryPool.cpp</in>
-                <in>memoryService.cpp</in>
-                <in>nmtDCmd.cpp</in>
-                <in>psMemoryPool.cpp</in>
-                <in>runtimeService.cpp</in>
-                <in>threadService.cpp</in>
-              </df>
-              <df name="utilities">
-                <in>accessFlags.cpp</in>
-                <in>array.cpp</in>
-                <in>bitMap.cpp</in>
-                <in>constantTag.cpp</in>
-                <in>copy.cpp</in>
-                <in>debug.cpp</in>
-                <in>decoder.cpp</in>
-                <in>decoder_elf.cpp</in>
-                <in>elfFile.cpp</in>
-                <in>elfStringTable.cpp</in>
-                <in>elfSymbolTable.cpp</in>
-                <in>errorReporter.cpp</in>
-                <in>events.cpp</in>
-                <in>exceptions.cpp</in>
-                <in>globalDefinitions.cpp</in>
-                <in>growableArray.cpp</in>
-                <in>hashtable.cpp</in>
-                <in>histogram.cpp</in>
-                <in>intHisto.cpp</in>
-                <in>numberSeq.cpp</in>
-                <in>ostream.cpp</in>
-                <in>preserveException.cpp</in>
-                <in>quickSort.cpp</in>
-                <in>sizes.cpp</in>
-                <in>taskqueue.cpp</in>
-                <in>utf8.cpp</in>
-                <in>vmError.cpp</in>
-                <in>workgroup.cpp</in>
-                <in>xmlstream.cpp</in>
-                <in>yieldingWorkgroup.cpp</in>
-              </df>
-            </df>
-          </df>
-        </df>
-      </df>
-      <df name="jdk">
-        <df name="make">
-          <df name="tools">
-            <df name="add_gnu_debuglink">
-              <in>add_gnu_debuglink.c</in>
-            </df>
-            <df name="fix_empty_sec_hdr_flags">
-              <in>fix_empty_sec_hdr_flags.c</in>
-            </df>
-          </df>
-        </df>
-        <df name="src">
-          <df name="share">
-            <df name="back">
-              <in>ArrayReferenceImpl.c</in>
-              <in>ArrayTypeImpl.c</in>
-              <in>ClassLoaderReferenceImpl.c</in>
-              <in>ClassObjectReferenceImpl.c</in>
-              <in>ClassTypeImpl.c</in>
-              <in>EventRequestImpl.c</in>
-              <in>FieldImpl.c</in>
-              <in>FrameID.c</in>
-              <in>MethodImpl.c</in>
-              <in>ObjectReferenceImpl.c</in>
-              <in>ReferenceTypeImpl.c</in>
-              <in>SDE.c</in>
-              <in>StackFrameImpl.c</in>
-              <in>StringReferenceImpl.c</in>
-              <in>ThreadGroupReferenceImpl.c</in>
-              <in>ThreadReferenceImpl.c</in>
-              <in>VirtualMachineImpl.c</in>
-              <in>bag.c</in>
-              <in>classTrack.c</in>
-              <in>commonRef.c</in>
-              <in>debugDispatch.c</in>
-              <in>debugInit.c</in>
-              <in>debugLoop.c</in>
-              <in>error_messages.c</in>
-              <in>eventFilter.c</in>
-              <in>eventHandler.c</in>
-              <in>eventHelper.c</in>
-              <in>inStream.c</in>
-              <in>invoker.c</in>
-              <in>log_messages.c</in>
-              <in>outStream.c</in>
-              <in>standardHandlers.c</in>
-              <in>stepControl.c</in>
-              <in>stream.c</in>
-              <in>threadControl.c</in>
-              <in>transport.c</in>
-              <in>util.c</in>
-            </df>
-            <df name="bin">
-              <in>java.c</in>
-              <in>jli_util.c</in>
-              <in>main.c</in>
-              <in>parse_manifest.c</in>
-              <in>splashscreen_stubs.c</in>
-              <in>version_comp.c</in>
-              <in>wildcard.c</in>
-            </df>
-            <df name="demo">
-              <df name="jvmti">
-                <df name="agent_util">
-                  <in>agent_util.c</in>
-                </df>
-                <df name="compiledMethodLoad">
-                  <in>compiledMethodLoad.c</in>
-                </df>
-                <df name="gctest">
-                  <in>gctest.c</in>
-                </df>
-                <df name="heapTracker">
-                  <in>heapTracker.c</in>
-                </df>
-                <df name="heapViewer">
-                  <in>heapViewer.c</in>
-                </df>
-                <df name="hprof">
-                  <in>debug_malloc.c</in>
-                  <in>hprof_blocks.c</in>
-                  <in>hprof_check.c</in>
-                  <in>hprof_class.c</in>
-                  <in>hprof_cpu.c</in>
-                  <in>hprof_error.c</in>
-                  <in>hprof_event.c</in>
-                  <in>hprof_frame.c</in>
-                  <in>hprof_init.c</in>
-                  <in>hprof_io.c</in>
-                  <in>hprof_ioname.c</in>
-                  <in>hprof_listener.c</in>
-                  <in>hprof_loader.c</in>
-                  <in>hprof_monitor.c</in>
-                  <in>hprof_object.c</in>
-                  <in>hprof_reference.c</in>
-                  <in>hprof_site.c</in>
-                  <in>hprof_stack.c</in>
-                  <in>hprof_string.c</in>
-                  <in>hprof_table.c</in>
-                  <in>hprof_tag.c</in>
-                  <in>hprof_tls.c</in>
-                  <in>hprof_trace.c</in>
-                  <in>hprof_tracker.c</in>
-                  <in>hprof_util.c</in>
-                </df>
-                <df name="java_crw_demo">
-                  <in>java_crw_demo.c</in>
-                </df>
-                <df name="minst">
-                  <in>minst.c</in>
-                </df>
-                <df name="mtrace">
-                  <in>mtrace.c</in>
-                </df>
-                <df name="versionCheck">
-                  <in>versionCheck.c</in>
-                </df>
-                <df name="waiters">
-                  <in>Agent.cpp</in>
-                  <in>Monitor.cpp</in>
-                  <in>Thread.cpp</in>
-                  <in>waiters.cpp</in>
-                </df>
-              </df>
-            </df>
-            <df name="instrument">
-              <in>EncodingSupport.c</in>
-              <in>InstrumentationImplNativeMethods.c</in>
-              <in>InvocationAdapter.c</in>
-              <in>JPLISAgent.c</in>
-              <in>JPLISAssert.c</in>
-              <in>JarFacade.c</in>
-              <in>JavaExceptions.c</in>
-              <in>PathCharsValidator.c</in>
-              <in>Reentrancy.c</in>
-              <in>Utilities.c</in>
-            </df>
-            <df name="native">
-              <df name="com">
-                <df name="sun">
-                  <df name="java">
-                    <df name="util">
-                      <df name="jar">
-                        <df name="pack">
-                          <in>bands.cpp</in>
-                          <in>bytes.cpp</in>
-                          <in>coding.cpp</in>
-                          <in>jni.cpp</in>
-                          <in>main.cpp</in>
-                          <in>unpack.cpp</in>
-                          <in>utils.cpp</in>
-                          <in>zip.cpp</in>
-                        </df>
-                      </df>
-                    </df>
-                  </df>
-                  <df name="media">
-                    <df name="sound">
-                      <in>DirectAudioDevice.c</in>
-                      <in>DirectAudioDeviceProvider.c</in>
-                      <in>MidiInDevice.c</in>
-                      <in>MidiInDeviceProvider.c</in>
-                      <in>MidiOutDevice.c</in>
-                      <in>MidiOutDeviceProvider.c</in>
-                      <in>Platform.c</in>
-                      <in>PlatformMidi.c</in>
-                      <in>PortMixer.c</in>
-                      <in>PortMixerProvider.c</in>
-                      <in>Utilities.c</in>
-                    </df>
-                  </df>
-                </df>
-              </df>
-              <df name="common">
-                <in>check_code.c</in>
-                <in>check_format.c</in>
-                <in>check_version.c</in>
-                <in>jdk_util.c</in>
-                <in>jio.c</in>
-                <in>jni_util.c</in>
-                <in>verify_stub.c</in>
-              </df>
-              <df name="java">
-                <df name="io">
-                  <in>FileInputStream.c</in>
-                  <in>ObjectInputStream.c</in>
-                  <in>ObjectOutputStream.c</in>
-                  <in>ObjectStreamClass.c</in>
-                  <in>RandomAccessFile.c</in>
-                  <in>io_util.c</in>
-                </df>
-                <df name="lang">
-                  <df name="fdlibm">
-                    <df name="src">
-                      <in>e_acos.c</in>
-                      <in>e_asin.c</in>
-                      <in>e_atan2.c</in>
-                      <in>e_atanh.c</in>
-                      <in>e_cosh.c</in>
-                      <in>e_exp.c</in>
-                      <in>e_fmod.c</in>
-                      <in>e_hypot.c</in>
-                      <in>e_log.c</in>
-                      <in>e_log10.c</in>
-                      <in>e_pow.c</in>
-                      <in>e_rem_pio2.c</in>
-                      <in>e_remainder.c</in>
-                      <in>e_scalb.c</in>
-                      <in>e_sinh.c</in>
-                      <in>e_sqrt.c</in>
-                      <in>k_cos.c</in>
-                      <in>k_rem_pio2.c</in>
-                      <in>k_sin.c</in>
-                      <in>k_standard.c</in>
-                      <in>k_tan.c</in>
-                      <in>s_atan.c</in>
-                      <in>s_cbrt.c</in>
-                      <in>s_ceil.c</in>
-                      <in>s_copysign.c</in>
-                      <in>s_cos.c</in>
-                      <in>s_expm1.c</in>
-                      <in>s_fabs.c</in>
-                      <in>s_finite.c</in>
-                      <in>s_floor.c</in>
-                      <in>s_frexp.c</in>
-                      <in>s_ilogb.c</in>
-                      <in>s_isnan.c</in>
-                      <in>s_ldexp.c</in>
-                      <in>s_lib_version.c</in>
-                      <in>s_log1p.c</in>
-                      <in>s_logb.c</in>
-                      <in>s_matherr.c</in>
-                      <in>s_modf.c</in>
-                      <in>s_nextafter.c</in>
-                      <in>s_rint.c</in>
-                      <in>s_scalbn.c</in>
-                      <in>s_signgam.c</in>
-                      <in>s_significand.c</in>
-                      <in>s_sin.c</in>
-                      <in>s_tan.c</in>
-                      <in>s_tanh.c</in>
-                      <in>w_acos.c</in>
-                      <in>w_asin.c</in>
-                      <in>w_atan2.c</in>
-                      <in>w_atanh.c</in>
-                      <in>w_cosh.c</in>
-                      <in>w_exp.c</in>
-                      <in>w_fmod.c</in>
-                      <in>w_hypot.c</in>
-                      <in>w_log.c</in>
-                      <in>w_log10.c</in>
-                      <in>w_pow.c</in>
-                      <in>w_remainder.c</in>
-                      <in>w_scalb.c</in>
-                      <in>w_sinh.c</in>
-                      <in>w_sqrt.c</in>
-                    </df>
-                  </df>
-                  <df name="ref">
-                    <in>Finalizer.c</in>
-                  </df>
-                  <df name="reflect">
-                    <in>Array.c</in>
-                    <in>Executable.c</in>
-                    <in>Proxy.c</in>
-                  </df>
-                  <in>Class.c</in>
-                  <in>ClassLoader.c</in>
-                  <in>Compiler.c</in>
-                  <in>Double.c</in>
-                  <in>Float.c</in>
-                  <in>Object.c</in>
-                  <in>Package.c</in>
-                  <in>ResourceBundle.c</in>
-                  <in>Runtime.c</in>
-                  <in>SecurityManager.c</in>
-                  <in>Shutdown.c</in>
-                  <in>StrictMath.c</in>
-                  <in>String.c</in>
-                  <in>System.c</in>
-                  <in>Thread.c</in>
-                  <in>Throwable.c</in>
-                </df>
-                <df name="net">
-                  <in>DatagramPacket.c</in>
-                  <in>Inet4Address.c</in>
-                  <in>Inet6Address.c</in>
-                  <in>InetAddress.c</in>
-                  <in>net_util.c</in>
-                </df>
-                <df name="nio">
-                  <in>Bits.c</in>
-                </df>
-                <df name="security">
-                  <in>AccessController.c</in>
-                </df>
-                <df name="util">
-                  <df name="concurrent">
-                    <df name="atomic">
-                      <in>AtomicLong.c</in>
-                    </df>
-                  </df>
-                  <df name="zip">
-                    <df name="zlib-1.2.5">
-                      <in>compress.c</in>
-                      <in>deflate.c</in>
-                      <in>gzclose.c</in>
-                      <in>gzlib.c</in>
-                      <in>gzread.c</in>
-                      <in>gzwrite.c</in>
-                      <in>infback.c</in>
-                      <in>inffast.c</in>
-                      <in>inflate.c</in>
-                      <in>inftrees.c</in>
-                      <in>trees.c</in>
-                      <in>uncompr.c</in>
-                      <in>zadler32.c</in>
-                      <in>zcrc32.c</in>
-                      <in>zutil.c</in>
-                    </df>
-                    <in>Adler32.c</in>
-                    <in>CRC32.c</in>
-                    <in>Deflater.c</in>
-                    <in>Inflater.c</in>
-                    <in>ZipFile.c</in>
-                    <in>zip_util.c</in>
-                  </df>
-                  <in>TimeZone.c</in>
-                </df>
-              </df>
-              <df name="sun">
-                <df name="awt">
-                  <df name="debug">
-                    <in>debug_assert.c</in>
-                    <in>debug_mem.c</in>
-                    <in>debug_trace.c</in>
-                    <in>debug_util.c</in>
-                  </df>
-                  <df name="giflib">
-                    <in>dgif_lib.c</in>
-                    <in>gif_err.c</in>
-                    <in>gifalloc.c</in>
-                  </df>
-                  <df name="image">
-                    <df name="cvutils">
-                      <in>img_colors.c</in>
-                      <in>img_globals.c</in>
-                    </df>
-                    <df name="gif">
-                      <in>gifdecoder.c</in>
-                    </df>
-                    <df name="jpeg">
-                      <in>imageioJPEG.c</in>
-                      <in>jcapimin.c</in>
-                      <in>jcapistd.c</in>
-                      <in>jccoefct.c</in>
-                      <in>jccolor.c</in>
-                      <in>jcdctmgr.c</in>
-                      <in>jchuff.c</in>
-                      <in>jcinit.c</in>
-                      <in>jcmainct.c</in>
-                      <in>jcmarker.c</in>
-                      <in>jcmaster.c</in>
-                      <in>jcomapi.c</in>
-                      <in>jcparam.c</in>
-                      <in>jcphuff.c</in>
-                      <in>jcprepct.c</in>
-                      <in>jcsample.c</in>
-                      <in>jctrans.c</in>
-                      <in>jdapimin.c</in>
-                      <in>jdapistd.c</in>
-                      <in>jdcoefct.c</in>
-                      <in>jdcolor.c</in>
-                      <in>jddctmgr.c</in>
-                      <in>jdhuff.c</in>
-                      <in>jdinput.c</in>
-                      <in>jdmainct.c</in>
-                      <in>jdmarker.c</in>
-                      <in>jdmaster.c</in>
-                      <in>jdmerge.c</in>
-                      <in>jdphuff.c</in>
-                      <in>jdpostct.c</in>
-                      <in>jdsample.c</in>
-                      <in>jdtrans.c</in>
-                      <in>jerror.c</in>
-                      <in>jfdctflt.c</in>
-                      <in>jfdctfst.c</in>
-                      <in>jfdctint.c</in>
-                      <in>jidctflt.c</in>
-                      <in>jidctfst.c</in>
-                      <in>jidctint.c</in>
-                      <in>jidctred.c</in>
-                      <in>jmemmgr.c</in>
-                      <in>jmemnobs.c</in>
-                      <in>jpegdecoder.c</in>
-                      <in>jquant1.c</in>
-                      <in>jquant2.c</in>
-                      <in>jutils.c</in>
-                    </df>
-                    <in>BufImgSurfaceData.c</in>
-                    <in>DataBufferNative.c</in>
-                    <in>awt_ImageRep.c</in>
-                    <in>awt_parseImage.c</in>
-                    <in>dither.c</in>
-                    <in>imageInitIDs.c</in>
-                  </df>
-                  <df name="libpng">
-                    <in>png.c</in>
-                    <in>pngerror.c</in>
-                    <in>pngget.c</in>
-                    <in>pngmem.c</in>
-                    <in>pngpread.c</in>
-                    <in>pngread.c</in>
-                    <in>pngrio.c</in>
-                    <in>pngrtran.c</in>
-                    <in>pngrutil.c</in>
-                    <in>pngset.c</in>
-                    <in>pngtrans.c</in>
-                    <in>pngwio.c</in>
-                    <in>pngwrite.c</in>
-                    <in>pngwtran.c</in>
-                    <in>pngwutil.c</in>
-                  </df>
-                  <df name="medialib">
-                    <in>awt_ImagingLib.c</in>
-                    <in>mlib_ImageAffine.c</in>
-                    <in>mlib_ImageAffineEdge.c</in>
-                    <in>mlib_ImageAffine_BC_D64.c</in>
-                    <in>mlib_ImageAffine_BC_F32.c</in>
-                    <in>mlib_ImageAffine_BC_S32.c</in>
-                    <in>mlib_ImageAffine_BL_D64.c</in>
-                    <in>mlib_ImageAffine_BL_F32.c</in>
-                    <in>mlib_ImageAffine_BL_S32.c</in>
-                    <in>mlib_ImageAffine_NN.c</in>
-                    <in>mlib_ImageAffine_NN_Bit.c</in>
-                    <in>mlib_ImageClipping.c</in>
-                    <in>mlib_ImageColorTrue2Index.c</in>
-                    <in>mlib_ImageConv2x2_f.c</in>
-                    <in>mlib_ImageConvClearEdge_Bit.c</in>
-                    <in>mlib_ImageConvClearEdge_Fp.c</in>
-                    <in>mlib_ImageConvCopyEdge_Bit.c</in>
-                    <in>mlib_ImageConvKernelConvert.c</in>
-                    <in>mlib_ImageConvMxN.c</in>
-                    <in>mlib_ImageConvMxN_Fp.c</in>
-                    <in>mlib_ImageConvMxN_ext.c</in>
-                    <in>mlib_ImageConv_16ext.c</in>
-                    <in>mlib_ImageConv_16nw.c</in>
-                    <in>mlib_ImageConv_32nw.c</in>
-                    <in>mlib_ImageConv_8ext.c</in>
-                    <in>mlib_ImageConv_8nw.c</in>
-                    <in>mlib_ImageConv_D64nw.c</in>
-                    <in>mlib_ImageConv_F32nw.c</in>
-                    <in>mlib_ImageConv_u16ext.c</in>
-                    <in>mlib_ImageConv_u16nw.c</in>
-                    <in>mlib_ImageCopy_Bit.c</in>
-                    <in>mlib_ImageCreate.c</in>
-                    <in>mlib_ImageDivTables.c</in>
-                    <in>mlib_ImageFilters.c</in>
-                    <in>mlib_ImageLookUp_64.c</in>
-                    <in>mlib_ImageLookUp_Bit.c</in>
-                    <in>mlib_ImageScanPoly.c</in>
-                    <in>mlib_ImageUtils.c</in>
-                    <in>mlib_c_ImageAffineIndex_BC.c</in>
-                    <in>mlib_c_ImageAffineIndex_BL.c</in>
-                    <in>mlib_c_ImageAffine_BC.c</in>
-                    <in>mlib_c_ImageAffine_BC_S16.c</in>
-                    <in>mlib_c_ImageAffine_BC_U16.c</in>
-                    <in>mlib_c_ImageAffine_BL.c</in>
-                    <in>mlib_c_ImageAffine_BL_S16.c</in>
-                    <in>mlib_c_ImageAffine_BL_U16.c</in>
-                    <in>mlib_c_ImageAffine_NN.c</in>
-                    <in>mlib_c_ImageConvClearEdge.c</in>
-                    <in>mlib_c_ImageConvCopyEdge.c</in>
-                    <in>mlib_c_ImageConvVersion.c</in>
-                    <in>mlib_c_ImageConv_f.c</in>
-                    <in>mlib_c_ImageCopy.c</in>
-                    <in>mlib_c_ImageLookUp.c</in>
-                    <in>mlib_c_ImageLookUp_f.c</in>
-                    <in>mlib_c_ImageThresh1_U8.c</in>
-                    <in>mlib_sys.c</in>
-                  </df>
-                  <df name="splashscreen">
-                    <in>java_awt_SplashScreen.c</in>
-                    <in>splashscreen_gfx_impl.c</in>
-                    <in>splashscreen_gif.c</in>
-                    <in>splashscreen_impl.c</in>
-                    <in>splashscreen_jpeg.c</in>
-                    <in>splashscreen_png.c</in>
-                  </df>
-                  <df name="utility">
-                    <in>rect.c</in>
-                  </df>
-                </df>
-                <df name="font">
-                  <df name="layout">
-                    <in>AlternateSubstSubtables.cpp</in>
-                    <in>AnchorTables.cpp</in>
-                    <in>ArabicLayoutEngine.cpp</in>
-                    <in>ArabicShaping.cpp</in>
-                    <in>CanonData.cpp</in>
-                    <in>CanonShaping.cpp</in>
-                    <in>ClassDefinitionTables.cpp</in>
-                    <in>ContextualGlyphSubstProc.cpp</in>
-                    <in>ContextualSubstSubtables.cpp</in>
-                    <in>CoverageTables.cpp</in>
-                    <in>CursiveAttachmentSubtables.cpp</in>
-                    <in>DeviceTables.cpp</in>
-                    <in>ExtensionSubtables.cpp</in>
-                    <in>Features.cpp</in>
-                    <in>GDEFMarkFilter.cpp</in>
-                    <in>GXLayoutEngine.cpp</in>
-                    <in>GlyphDefinitionTables.cpp</in>
-                    <in>GlyphIterator.cpp</in>
-                    <in>GlyphLookupTables.cpp</in>
-                    <in>GlyphPositionAdjustments.cpp</in>
-                    <in>GlyphPositioningTables.cpp</in>
-                    <in>GlyphPosnLookupProc.cpp</in>
-                    <in>GlyphSubstLookupProc.cpp</in>
-                    <in>GlyphSubstitutionTables.cpp</in>
-                    <in>HanLayoutEngine.cpp</in>
-                    <in>HangulLayoutEngine.cpp</in>
-                    <in>IndicClassTables.cpp</in>
-                    <in>IndicLayoutEngine.cpp</in>
-                    <in>IndicRearrangementProcessor.cpp</in>
-                    <in>IndicReordering.cpp</in>
-                    <in>KernTable.cpp</in>
-                    <in>KhmerLayoutEngine.cpp</in>
-                    <in>KhmerReordering.cpp</in>
-                    <in>LEFontInstance.cpp</in>
-                    <in>LEGlyphStorage.cpp</in>
-                    <in>LEInsertionList.cpp</in>
-                    <in>LayoutEngine.cpp</in>
-                    <in>LigatureSubstProc.cpp</in>
-                    <in>LigatureSubstSubtables.cpp</in>
-                    <in>LookupProcessor.cpp</in>
-                    <in>LookupTables.cpp</in>
-                    <in>Lookups.cpp</in>
-                    <in>MPreFixups.cpp</in>
-                    <in>MarkArrays.cpp</in>
-                    <in>MarkToBasePosnSubtables.cpp</in>
-                    <in>MarkToLigaturePosnSubtables.cpp</in>
-                    <in>MarkToMarkPosnSubtables.cpp</in>
-                    <in>MirroredCharData.cpp</in>
-                    <in>MorphTables.cpp</in>
-                    <in>MultipleSubstSubtables.cpp</in>
-                    <in>NonContextualGlyphSubstProc.cpp</in>
-                    <in>OpenTypeLayoutEngine.cpp</in>
-                    <in>OpenTypeUtilities.cpp</in>
-                    <in>PairPositioningSubtables.cpp</in>
-                    <in>ScriptAndLanguage.cpp</in>
-                    <in>ScriptAndLanguageTags.cpp</in>
-                    <in>SegmentArrayProcessor.cpp</in>
-                    <in>SegmentSingleProcessor.cpp</in>
-                    <in>ShapingTypeData.cpp</in>
-                    <in>SimpleArrayProcessor.cpp</in>
-                    <in>SinglePositioningSubtables.cpp</in>
-                    <in>SingleSubstitutionSubtables.cpp</in>
-                    <in>SingleTableProcessor.cpp</in>
-                    <in>StateTableProcessor.cpp</in>
-                    <in>SubstitutionLookups.cpp</in>
-                    <in>SubtableProcessor.cpp</in>
-                    <in>SunLayoutEngine.cpp</in>
-                    <in>ThaiLayoutEngine.cpp</in>
-                    <in>ThaiShaping.cpp</in>
-                    <in>ThaiStateTables.cpp</in>
-                    <in>TibetanLayoutEngine.cpp</in>
-                    <in>TibetanReordering.cpp</in>
-                    <in>TrimmedArrayProcessor.cpp</in>
-                    <in>ValueRecords.cpp</in>
-                  </df>
-                  <in>AccelGlyphCache.c</in>
-                  <in>DrawGlyphList.c</in>
-                  <in>FontInstanceAdapter.cpp</in>
-                  <in>freetypeScaler.c</in>
-                  <in>sunFont.c</in>
-                </df>
-                <df name="java2d">
-                  <df name="cmm">
-                    <df name="lcms">
-                      <in>LCMS.c</in>
-                      <in>cmscam02.c</in>
-                      <in>cmscgats.c</in>
-                      <in>cmscnvrt.c</in>
-                      <in>cmserr.c</in>
-                      <in>cmsgamma.c</in>
-                      <in>cmsgmt.c</in>
-                      <in>cmshalf.c</in>
-                      <in>cmsintrp.c</in>
-                      <in>cmsio0.c</in>
-                      <in>cmsio1.c</in>
-                      <in>cmslut.c</in>
-                      <in>cmsmd5.c</in>
-                      <in>cmsmtrx.c</in>
-                      <in>cmsnamed.c</in>
-                      <in>cmsopt.c</in>
-                      <in>cmspack.c</in>
-                      <in>cmspcs.c</in>
-                      <in>cmsplugin.c</in>
-                      <in>cmsps2.c</in>
-                      <in>cmssamp.c</in>
-                      <in>cmssm.c</in>
-                      <in>cmstypes.c</in>
-                      <in>cmsvirt.c</in>
-                      <in>cmswtpnt.c</in>
-                      <in>cmsxform.c</in>
-                    </df>
-                  </df>
-                  <df name="loops">
-                    <in>AlphaMacros.c</in>
-                    <in>AlphaMath.c</in>
-                    <in>Any3Byte.c</in>
-                    <in>Any4Byte.c</in>
-                    <in>AnyByte.c</in>
-                    <in>AnyInt.c</in>
-                    <in>AnyShort.c</in>
-                    <in>Blit.c</in>
-                    <in>BlitBg.c</in>
-                    <in>ByteBinary1Bit.c</in>
-                    <in>ByteBinary2Bit.c</in>
-                    <in>ByteBinary4Bit.c</in>
-                    <in>ByteGray.c</in>
-                    <in>ByteIndexed.c</in>
-                    <in>DrawLine.c</in>
-                    <in>DrawParallelogram.c</in>
-                    <in>DrawPath.c</in>
-                    <in>DrawPolygons.c</in>
-                    <in>DrawRect.c</in>
-                    <in>FillParallelogram.c</in>
-                    <in>FillPath.c</in>
-                    <in>FillRect.c</in>
-                    <in>FillSpans.c</in>
-                    <in>FourByteAbgr.c</in>
-                    <in>FourByteAbgrPre.c</in>
-                    <in>GraphicsPrimitiveMgr.c</in>
-                    <in>Index12Gray.c</in>
-                    <in>Index8Gray.c</in>
-                    <in>IntArgb.c</in>
-                    <in>IntArgbBm.c</in>
-                    <in>IntArgbPre.c</in>
-                    <in>IntBgr.c</in>
-                    <in>IntRgb.c</in>
-                    <in>IntRgbx.c</in>
-                    <in>MapAccelFunc.c</in>
-                    <in>MaskBlit.c</in>
-                    <in>MaskFill.c</in>
-                    <in>ProcessPath.c</in>
-                    <in>ScaledBlit.c</in>
-                    <in>ThreeByteBgr.c</in>
-                    <in>TransformHelper.c</in>
-                    <in>Ushort4444Argb.c</in>
-                    <in>Ushort555Rgb.c</in>
-                    <in>Ushort555Rgbx.c</in>
-                    <in>Ushort565Rgb.c</in>
-                    <in>UshortGray.c</in>
-                    <in>UshortIndexed.c</in>
-                  </df>
-                  <df name="opengl">
-                    <in>OGLBlitLoops.c</in>
-                    <in>OGLBufImgOps.c</in>
-                    <in>OGLContext.c</in>
-                    <in>OGLFuncs.c</in>
-                    <in>OGLMaskBlit.c</in>
-                    <in>OGLMaskFill.c</in>
-                    <in>OGLPaints.c</in>
-                    <in>OGLRenderQueue.c</in>
-                    <in>OGLRenderer.c</in>
-                    <in>OGLSurfaceData.c</in>
-                    <in>OGLTextRenderer.c</in>
-                    <in>OGLVertexCache.c</in>
-                  </df>
-                  <df name="pipe">
-                    <in>BufferedMaskBlit.c</in>
-                    <in>BufferedRenderPipe.c</in>
-                    <in>Region.c</in>
-                    <in>ShapeSpanIterator.c</in>
-                    <in>SpanClipRenderer.c</in>
-                  </df>
-                  <in>Disposer.c</in>
-                  <in>SurfaceData.c</in>
-                  <in>Trace.c</in>
-                </df>
-                <df name="management">
-                  <in>ClassLoadingImpl.c</in>
-                  <in>Flag.c</in>
-                  <in>GarbageCollectorImpl.c</in>
-                  <in>GcInfoBuilder.c</in>
-                  <in>HotSpotDiagnostic.c</in>
-                  <in>HotspotThread.c</in>
-                  <in>MemoryImpl.c</in>
-                  <in>MemoryManagerImpl.c</in>
-                  <in>MemoryPoolImpl.c</in>
-                  <in>ThreadImpl.c</in>
-                  <in>VMManagementImpl.c</in>
-                  <in>management.c</in>
-                </df>
-                <df name="misc">
-                  <in>GC.c</in>
-                  <in>MessageUtils.c</in>
-                  <in>NativeSignalHandler.c</in>
-                  <in>Signal.c</in>
-                  <in>VM.c</in>
-                  <in>VMSupport.c</in>
-                  <in>Version.c</in>
-                </df>
-                <df name="nio">
-                  <df name="ch">
-                    <in>genSocketOptionRegistry.c</in>
-                  </df>
-                </df>
-                <df name="reflect">
-                  <in>ConstantPool.c</in>
-                  <in>NativeAccessors.c</in>
-                  <in>Reflection.c</in>
-                </df>
-                <df name="security">
-                  <df name="ec">
-                    <df name="impl">
-                      <in>ec.c</in>
-                      <in>ec2_163.c</in>
-                      <in>ec2_193.c</in>
-                      <in>ec2_233.c</in>
-                      <in>ec2_aff.c</in>
-                      <in>ec2_mont.c</in>
-                      <in>ec_naf.c</in>
-                      <in>ecdecode.c</in>
-                      <in>ecl.c</in>
-                      <in>ecl_curve.c</in>
-                      <in>ecl_gf.c</in>
-                      <in>ecl_mult.c</in>
-                      <in>ecp_192.c</in>
-                      <in>ecp_224.c</in>
-                      <in>ecp_256.c</in>
-                      <in>ecp_384.c</in>
-                      <in>ecp_521.c</in>
-                      <in>ecp_aff.c</in>
-                      <in>ecp_jac.c</in>
-                      <in>ecp_jm.c</in>
-                      <in>ecp_mont.c</in>
-                      <in>mp_gf2m.c</in>
-                      <in>mpi.c</in>
-                      <in>mplogic.c</in>
-                      <in>mpmontg.c</in>
-                      <in>oid.c</in>
-                      <in>secitem.c</in>
-                    </df>
-                    <in>ECC_JNI.cpp</in>
-                  </df>
-                  <df name="jgss">
-                    <df name="wrapper">
-                      <in>GSSLibStub.c</in>
-                      <in>NativeUtil.c</in>
-                    </df>
-                  </df>
-                  <df name="pkcs11">
-                    <df name="wrapper">
-                      <in>p11_convert.c</in>
-                      <in>p11_crypt.c</in>
-                      <in>p11_digest.c</in>
-                      <in>p11_dual.c</in>
-                      <in>p11_general.c</in>
-                      <in>p11_keymgmt.c</in>
-                      <in>p11_mutex.c</in>
-                      <in>p11_objmgmt.c</in>
-                      <in>p11_sessmgmt.c</in>
-                      <in>p11_sign.c</in>
-                      <in>p11_util.c</in>
-                    </df>
-                    <in>j2secmod.c</in>
-                  </df>
-                  <df name="smartcardio">
-                    <in>pcsc.c</in>
-                  </df>
-                </df>
-                <df name="tracing">
-                  <df name="dtrace">
-                    <in>JVM.c</in>
-                  </df>
-                </df>
-              </df>
-            </df>
-            <df name="npt">
-              <in>npt.c</in>
-              <in>utf.c</in>
-            </df>
-            <df name="transport">
-              <df name="socket">
-                <in>socketTransport.c</in>
-              </df>
-            </df>
-          </df>
-          <df name="solaris">
-            <df name="back">
-              <in>exec_md.c</in>
-              <in>linker_md.c</in>
-            </df>
-            <df name="bin">
-              <in>ergo.c</in>
-              <in>ergo_i586.c</in>
-              <in>java_md_common.c</in>
-              <in>java_md_solinux.c</in>
-              <in>jexec.c</in>
-            </df>
-            <df name="demo">
-              <df name="jni">
-                <df name="Poller">
-                  <in>Poller.c</in>
-                </df>
-              </df>
-              <df name="jvmti">
-                <df name="hprof">
-                  <in>hprof_md.c</in>
-                </df>
-              </df>
-            </df>
-            <df name="instrument">
-              <in>EncodingSupport_md.c</in>
-              <in>FileSystemSupport_md.c</in>
-            </df>
-            <df name="native">
-              <df name="com">
-                <df name="sun">
-                  <df name="management">
-                    <in>LinuxOperatingSystem.c</in>
-                    <in>SolarisOperatingSystem.c</in>
-                    <in>UnixOperatingSystem_md.c</in>
-                  </df>
-                  <df name="media">
-                    <df name="sound">
-                      <in>PLATFORM_API_LinuxOS_ALSA_CommonUtils.c</in>
-                      <in>PLATFORM_API_LinuxOS_ALSA_MidiIn.c</in>
-                      <in>PLATFORM_API_LinuxOS_ALSA_MidiOut.c</in>
-                      <in>PLATFORM_API_LinuxOS_ALSA_MidiUtils.c</in>
-                      <in>PLATFORM_API_LinuxOS_ALSA_PCM.c</in>
-                      <in>PLATFORM_API_LinuxOS_ALSA_PCMUtils.c</in>
-                      <in>PLATFORM_API_LinuxOS_ALSA_Ports.c</in>
-                      <in>PLATFORM_API_SolarisOS_PCM.c</in>
-                      <in>PLATFORM_API_SolarisOS_Ports.c</in>
-                      <in>PLATFORM_API_SolarisOS_Utils.c</in>
-                    </df>
-                  </df>
-                  <df name="security">
-                    <df name="auth">
-                      <df name="module">
-                        <in>Solaris.c</in>
-                        <in>Unix.c</in>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-              </df>
-              <df name="common">
-                <in>jdk_util_md.c</in>
-                <in>jni_util_md.c</in>
-              </df>
-              <df name="java">
-                <df name="io">
-                  <in>Console_md.c</in>
-                  <in>FileDescriptor_md.c</in>
-                  <in>FileInputStream_md.c</in>
-                  <in>FileOutputStream_md.c</in>
-                  <in>RandomAccessFile_md.c</in>
-                  <in>UnixFileSystem_md.c</in>
-                  <in>canonicalize_md.c</in>
-                  <in>io_util_md.c</in>
-                </df>
-                <df name="lang">
-                  <in>ProcessEnvironment_md.c</in>
-                  <in>UNIXProcess_md.c</in>
-                  <in>java_props_md.c</in>
-                </df>
-                <df name="net">
-                  <in>Inet4AddressImpl.c</in>
-                  <in>Inet6AddressImpl.c</in>
-                  <in>InetAddressImplFactory.c</in>
-                  <in>NetworkInterface.c</in>
-                  <in>PlainDatagramSocketImpl.c</in>
-                  <in>PlainSocketImpl.c</in>
-                  <in>SocketInputStream.c</in>
-                  <in>SocketOutputStream.c</in>
-                  <in>linux_close.c</in>
-                  <in>net_util_md.c</in>
-                </df>
-                <df name="nio">
-                  <in>MappedByteBuffer.c</in>
-                </df>
-                <df name="util">
-                  <in>FileSystemPreferences.c</in>
-                  <in>TimeZone_md.c</in>
-                  <in>logging.c</in>
-                </df>
-              </df>
-              <df name="sun">
-                <df name="awt">
-                  <df name="splashscreen">
-                    <in>splashscreen_sys.c</in>
-                  </df>
-                  <in>CUPSfuncs.c</in>
-                  <in>HeadlessToolkit.c</in>
-                  <in>VDrawingArea.c</in>
-                  <in>X11Color.c</in>
-                  <in>awt_AWTEvent.c</in>
-                  <in>awt_DrawingSurface.c</in>
-                  <in>awt_Event.c</in>
-                  <in>awt_Font.c</in>
-                  <in>awt_GraphicsEnv.c</in>
-                  <in>awt_InputMethod.c</in>
-                  <in>awt_Insets.c</in>
-                  <in>awt_LoadLibrary.c</in>
-                  <in>awt_Mlib.c</in>
-                  <in>awt_Plugin.c</in>
-                  <in>awt_Robot.c</in>
-                  <in>awt_UNIXToolkit.c</in>
-                  <in>awt_util.c</in>
-                  <in>fontpath.c</in>
-                  <in>gtk2_interface.c</in>
-                  <in>initIDs.c</in>
-                  <in>jawt.c</in>
-                  <in>list.c</in>
-                  <in>multiVis.c</in>
-                  <in>multi_font.c</in>
-                  <in>robot_common.c</in>
-                  <in>sun_awt_X11_GtkFileDialogPeer.c</in>
-                  <in>swing_GTKEngine.c</in>
-                  <in>swing_GTKStyle.c</in>
-                </df>
-                <df name="font">
-                  <in>X11FontScaler.c</in>
-                  <in>X11TextRenderer.c</in>
-                </df>
-                <df name="java2d">
-                  <df name="opengl">
-                    <in>GLXGraphicsConfig.c</in>
-                    <in>GLXSurfaceData.c</in>
-                  </df>
-                  <df name="x11">
-                    <in>X11FontScaler_md.c</in>
-                    <in>X11PMBlitLoops.c</in>
-                    <in>X11Renderer.c</in>
-                    <in>X11SurfaceData.c</in>
-                    <in>X11TextRenderer_md.c</in>
-                    <in>XRBackendNative.c</in>
-                    <in>XRSurfaceData.c</in>
-                  </df>
-                </df>
-                <df name="management">
-                  <in>FileSystemImpl.c</in>
-                </df>
-                <df name="net">
-                  <df name="dns">
-                    <in>ResolverConfigurationImpl.c</in>
-                  </df>
-                  <df name="sdp">
-                    <in>SdpSupport.c</in>
-                  </df>
-                  <df name="spi">
-                    <in>DefaultProxySelector.c</in>
-                  </df>
-                </df>
-                <df name="nio">
-                  <df name="ch">
-                    <df name="sctp">
-                      <in>SctpChannelImpl.c</in>
-                      <in>SctpNet.c</in>
-                      <in>SctpServerChannelImpl.c</in>
-                    </df>
-                    <in>DatagramChannelImpl.c</in>
-                    <in>DatagramDispatcher.c</in>
-                    <in>DevPollArrayWrapper.c</in>
-                    <in>EPoll.c</in>
-                    <in>EPollArrayWrapper.c</in>
-                    <in>EPollPort.c</in>
-                    <in>FileChannelImpl.c</in>
-                    <in>FileDispatcherImpl.c</in>
-                    <in>FileKey.c</in>
-                    <in>IOUtil.c</in>
-                    <in>InheritedChannel.c</in>
-                    <in>NativeThread.c</in>
-                    <in>Net.c</in>
-                    <in>PollArrayWrapper.c</in>
-                    <in>ServerSocketChannelImpl.c</in>
-                    <in>SocketChannelImpl.c</in>
-                    <in>SocketDispatcher.c</in>
-                    <in>SolarisEventPort.c</in>
-                    <in>UnixAsynchronousServerSocketChannelImpl.c</in>
-                    <in>UnixAsynchronousSocketChannelImpl.c</in>
-                  </df>
-                  <df name="fs">
-                    <in>GnomeFileTypeDetector.c</in>
-                    <in>LinuxNativeDispatcher.c</in>
-                    <in>LinuxWatchService.c</in>
-                    <in>MagicFileTypeDetector.c</in>
-                    <in>SolarisNativeDispatcher.c</in>
-                    <in>SolarisWatchService.c</in>
-                    <in>UnixCopyFile.c</in>
-                    <in>UnixNativeDispatcher.c</in>
-                    <in>genSolarisConstants.c</in>
-                    <in>genUnixConstants.c</in>
-                  </df>
-                </df>
-                <df name="security">
-                  <df name="jgss">
-                    <df name="wrapper">
-                      <in>NativeFunc.c</in>
-                    </df>
-                  </df>
-                  <df name="pkcs11">
-                    <df name="wrapper">
-                      <in>p11_md.c</in>
-                    </df>
-                    <in>j2secmod_md.c</in>
-                  </df>
-                  <df name="smartcardio">
-                    <in>pcsc_md.c</in>
-                  </df>
-                </df>
-                <df name="tools">
-                  <df name="attach">
-                    <in>LinuxVirtualMachine.c</in>
-                    <in>SolarisVirtualMachine.c</in>
-                  </df>
-                </df>
-                <df name="tracing">
-                  <df name="dtrace">
-                    <in>jvm_symbols_md.c</in>
-                  </df>
-                </df>
-                <df name="util">
-                  <df name="locale">
-                    <df name="provider">
-                      <in>HostLocaleProviderAdapter_md.c</in>
-                    </df>
-                  </df>
-                </df>
-                <df name="xawt">
-                  <in>XToolkit.c</in>
-                  <in>XWindow.c</in>
-                  <in>XlibWrapper.c</in>
-                  <in>awt_Desktop.c</in>
-                  <in>gnome_interface.c</in>
-                </df>
-              </df>
-            </df>
-            <df name="npt">
-              <in>utf_md.c</in>
-            </df>
-            <df name="transport">
-              <df name="socket">
-                <in>socket_md.c</in>
-              </df>
-            </df>
-          </df>
-        </df>
-      </df>
-    </df>
-    <logicalFolder name="ExternalFiles"
-                   displayName="Important Files"
-                   projectFiles="false"
-                   kind="IMPORTANT_FILES_FOLDER">
-      <itemPath>../../Makefile</itemPath>
-    </logicalFolder>
-  </logicalFolder>
-  <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>
-  <sourceRootList>
-    <Elem>../..</Elem>
-  </sourceRootList>
-  <projectmakefile>../../Makefile</projectmakefile>
-  <confs>
-    <conf name="Mac_64" type="0">
-      <toolsSet>
-        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
-        <compilerSet>default</compilerSet>
-      </toolsSet>
-      <codeAssistance>
-        <envVariables>
-          <Elem>IDE_ALT_BOOTDIR</Elem>
-        </envVariables>
-        <transientMacros>
-          <Elem>FULL_VERSION="version"</Elem>
-          <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-          <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-          <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-          <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-          <Elem>JDK_MAJOR_VERSION="version"</Elem>
-          <Elem>JDK_MICRO_VERSION="version"</Elem>
-          <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          <Elem>JRE_RELEASE_VERSION="version"</Elem>
-        </transientMacros>
-      </codeAssistance>
-      <makefileType>
-        <makeTool>
-          <buildCommandWorkingDir>../..</buildCommandWorkingDir>
-          <buildCommand>${MAKE} -f Makefile LOG=debug images</buildCommand>
-          <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
-          <executablePath></executablePath>
-          <ccTool>
-            <incDir>
-              <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/product</pElem>
-              <pElem>../../hotspot/src/share/vm/prims</pElem>
-              <pElem>../../hotspot/src/share/vm</pElem>
-              <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-              <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-              <pElem>../../hotspot/src/os_cpu/bsd_x86/vm</pElem>
-              <pElem>../../hotspot/src/os/bsd/vm</pElem>
-              <pElem>../../hotspot/src/os/posix/vm</pElem>
-              <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated</pElem>
-            </incDir>
-            <preprocessorList>
-              <Elem>AMD64</Elem>
-              <Elem>COMPILER1</Elem>
-              <Elem>COMPILER2</Elem>
-              <Elem>DTRACE_ENABLED</Elem>
-              <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-              <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-              <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-              <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-              <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-              <Elem>INCLUDE_TRACE</Elem>
-              <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
-              <Elem>PRODUCT</Elem>
-              <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-              <Elem>TARGET_ARCH_x86</Elem>
-              <Elem>TARGET_COMPILER_gcc</Elem>
-              <Elem>TARGET_OS_ARCH_MODEL_bsd_x86_64</Elem>
-              <Elem>TARGET_OS_ARCH_bsd_x86</Elem>
-              <Elem>TARGET_OS_FAMILY_bsd</Elem>
-              <Elem>VM_LITTLE_ENDIAN</Elem>
-              <Elem>_ALLBSD_SOURCE</Elem>
-              <Elem>_DARWIN_C_SOURCE</Elem>
-              <Elem>_GNU_SOURCE</Elem>
-              <Elem>_LP64=1</Elem>
-              <Elem>_XOPEN_SOURCE</Elem>
-            </preprocessorList>
-            <undefinedList>
-              <Elem>__EXCEPTIONS</Elem>
-              <Elem>__GXX_RTTI</Elem>
-            </undefinedList>
-          </ccTool>
-        </makeTool>
-      </makefileType>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_clone.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_expand.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_format.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_gen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_misc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_peephole.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_pipeline.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/dfa_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/jvmtifiles/bytecodeInterpreterWithChecks.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/jvmtifiles/jvmtiEnter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/jvmtifiles/jvmtiEnterTrace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/jdk/gensrc_x11wrappers/sizer.64.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/assembler_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/bytecodes_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_FrameMap_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_LinearScan_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c2_init_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/debug_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/depChecker_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/frame_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/icBuffer_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/icache_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/interpreter_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/jniFastGetField_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/metaspaceShared_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/methodHandles_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/nativeInst_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/register_definitions_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/register_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/relocInfo_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/runtime_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/vm_version_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/vmreg_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/vtableStubs_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/bsd/vm/attachListener_bsd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/bsd/vm/chaitin_bsd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/bsd/vm/decoder_machO.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/bsd/vm/jvm_bsd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/bsd/vm/mutex_bsd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/bsd/vm/osThread_bsd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/bsd/vm/os_bsd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/bsd/vm/perfMemory_bsd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/bsd/vm/stubRoutines_bsd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/bsd/vm/threadCritical_bsd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/bsd/vm/vmError_bsd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/posix/launcher/java_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/posix/vm/os_posix.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/tools/launcher/java.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/tools/launcher/jli_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/tools/launcher/wildcard.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/asm/assembler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/asm/codeBuffer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/asm/register.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_CFGPrinter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Canonicalizer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Compilation.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Compiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Defs.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_FrameMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_GraphBuilder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_IR.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Instruction.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_LIR.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_LIRAssembler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_LIRGenerator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_LinearScan.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Optimizer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_RangeCheckElimination.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Runtime1.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_ValueMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_ValueSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_ValueStack.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_ValueType.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_globals.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciBaseObject.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciCallSite.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciConstant.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciConstantPoolCache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciEnv.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciExceptionHandler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciField.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciFlags.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciInstance.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciInstanceKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMemberName.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMetadata.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMethod.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMethodBlocks.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMethodData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMethodHandle.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciNullObject.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciObjArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciObjArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciObject.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciObjectFactory.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciReplay.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciSignature.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciStreams.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciSymbol.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciType.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciTypeArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciTypeFlow.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciUtilities.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/altHashing.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/bytecodeAssembler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classFileError.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classFileParser.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classFileStream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classLoader.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classLoaderData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/defaultMethods.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/dictionary.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/genericSignatures.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/javaAssertions.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/javaClasses.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/loaderConstraints.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/metadataOnStackMark.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/placeholders.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/resolutionErrors.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/stackMapFrame.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/stackMapTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/symbolTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/systemDictionary.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/verificationType.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/verifier.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/vmSymbols.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/codeBlob.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/codeCache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/compiledIC.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/compressedStream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/debugInfo.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/debugInfoRec.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/dependencies.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/exceptionHandlerTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/icBuffer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/location.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/nmethod.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/oopRecorder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/pcDesc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/relocInfo.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/scopeDesc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/stubs.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/vmreg.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/vtableStubs.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/abstractCompiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/compileBroker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/compileLog.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/compilerOracle.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/disassembler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/methodLiveness.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/oopMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1Log.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1_globals.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/allocationStats.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_interface/collectedHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_interface/gcCause.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodeStream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodeTracer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/cppInterpreter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/interpreter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/interpreterRuntime.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/invocationCounter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/linkResolver.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/oopMapCache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/rewriter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/templateInterpreter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/templateTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/libadt/dict.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/libadt/port.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/libadt/set.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/libadt/vectset.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/allocation.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/barrierSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/binaryTreeDictionary.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/blockOffsetTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/cardTableModRefBS.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/cardTableRS.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/collectorPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/defNewGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/filemap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/freeBlockDictionary.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/freeList.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/gcLocker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/genCollectedHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/genMarkSweep.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/genRemSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/generation.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/generationSpec.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/heap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/heapInspection.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/iterator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/memRegion.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metablock.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metachunk.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metaspace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metaspaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metaspaceShared.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/oopFactory.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/referencePolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/referenceProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/resourceArea.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/sharedHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/space.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/specialized_oop_closures.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/tenuredGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/universe.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/annotations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/arrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/arrayOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/compiledICHolder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/constMethod.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/constantPool.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/cpCache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/generateOopMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceClassLoaderKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceMirrorKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceRefKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/klass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/klassVtable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/markOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/metadata.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/method.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/methodData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/objArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/objArrayOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/oop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/oopsHierarchy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/symbol.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/typeArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/typeArrayOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/addnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/block.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/buildOopMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/bytecodeInfo.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/c2_globals.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/c2compiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/callGenerator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/callnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/cfgnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/chaitin.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/classes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/coalesce.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/compile.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/connode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/divnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/doCall.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/domgraph.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/escape.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/gcm.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/generateOptoStub.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/graphKit.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/idealGraphPrinter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/idealKit.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/ifg.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/ifnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/indexSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/lcm.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/library_call.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/live.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/locknode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopPredicate.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopTransform.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopUnswitch.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopopts.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/machnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/macro.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/matcher.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/memnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/mulnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/multnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/node.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/opcodes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/output.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/parse1.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/parse2.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/parse3.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/parseHelper.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/phase.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/phaseX.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/postaloc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/reg_split.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/regalloc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/regmask.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/rootnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/runtime.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/split_if.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/stringopts.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/subnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/superword.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/type.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/vectornode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/precompiled/precompiled.hpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/evmCompat.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/forte.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jni.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jniCheck.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jniFastGetField.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvm.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiEnv.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiEnvBase.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiEventController.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiExport.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiExtensions.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiImpl.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiRawMonitor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiTagMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiThreadState.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiTrace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiUtil.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/methodComparator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/methodHandles.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/nativeLookup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/perf.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/privilegedStack.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/unsafe.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/wbtestmethods/parserTests.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/whitebox.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/aprofiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/arguments.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/atomic.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/basicLock.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/biasedLocking.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/compilationPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/deoptimization.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/dtraceJSDT.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/fieldDescriptor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/fieldType.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/fprofiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/frame.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/globals.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/handles.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/icache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/init.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/interfaceSupport.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/java.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/javaCalls.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/jniHandles.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/jniPeriodicChecker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/memprofiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/monitorChunk.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/mutex.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/mutexLocker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/objectMonitor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/orderAccess.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/os.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/osThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/park.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/perfData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/perfMemory.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/reflection.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/reflectionUtils.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/relocator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/rframe.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/safepoint.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/serviceThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/sharedRuntime.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/signature.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/stackValue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/stackValueCollection.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/statSampler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/stubCodeGenerator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/stubRoutines.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/sweeper.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/synchronizer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/task.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/thread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/threadLocalStorage.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/timer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/unhandledOops.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vframe.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vframeArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vframe_hp.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/virtualspace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vmStructs.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vmThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vm_operations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vm_version.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>JRE_RELEASE_VERSION="version"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/services/attachListener.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/classLoadingService.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/diagnosticArgument.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/diagnosticCommand.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/diagnosticFramework.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/dtraceAttacher.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/g1MemoryPool.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/gcNotifier.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/heapDumper.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/lowMemoryDetector.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/management.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memBaseline.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memPtr.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memRecorder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memReporter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memSnapshot.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memTrackWorker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memTracker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memoryManager.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memoryPool.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memoryService.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/nmtDCmd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/psMemoryPool.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/runtimeService.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/threadService.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/accessFlags.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/array.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/bitMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/constantTag.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/copy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/debug.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/decoder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/decoder_elf.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/elfFile.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/elfStringTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/elfSymbolTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/errorReporter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/events.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/exceptions.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/globalDefinitions.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/growableArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/hashtable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/histogram.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/intHisto.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/numberSeq.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/ostream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/preserveException.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/quickSort.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/sizes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/taskqueue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/utf8.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/vmError.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/workgroup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/xmlstream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <folder path="$SRC/build">
-        <cTool>
-          <incDir>
-            <pElem>/usr/X11/include</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/build/linux-x86_64-normal-server-release">
-        <ccTool>
-          <preprocessorList>
-            <Elem>LINUX</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_linux</Elem>
-            <Elem>_REENTRANT</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot">
-        <cTool>
-          <incDir>
-            <pElem>../../hotspot/src/os/posix/launcher</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/tools/launcher</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/bsd_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/bsd/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
-            <Elem>GAMMA</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>LAUNCHER_TYPE="gamma"</Elem>
-            <Elem>LINK_INTO_LIBJVM</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_gcc</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_bsd_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_bsd_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_bsd</Elem>
-            <Elem>_ALLBSD_SOURCE</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/hotspot/agent">
-        <cTool>
-          <incDir>
-            <pElem>../../hotspot/agent/src/os/linux</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-            <pElem>${IDE_ALT_BOOTDIR}include</pElem>
-            <pElem>${IDE_ALT_BOOTDIR}include/linux</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>_FILE_OFFSET_BITS=64</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os/linux">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>_REENTRANT</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_linux</Elem>
-            <Elem>_REENTRANT</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os_cpu/linux_x86">
-        <ccTool>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_linux</Elem>
-            <Elem>_REENTRANT</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/adlc">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/adlc</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ASSERT</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_linux</Elem>
-            <Elem>_REENTRANT</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ArrayReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="Agent.cpp"</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/back">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/transport/export</pElem>
-            <pElem>../../jdk/src/share/back/export</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/src/solaris/back</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>JDWP_LOGGING</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/bin">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LIBARCHNAME="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="java.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="agent_util.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/agent_util">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/compiledMethodLoad">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/gctest">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="gctest.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/heapTracker">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="heapTracker.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/heapViewer">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="heapViewer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/hprof">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="debug_malloc.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/java_crw_demo">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
-            <pElem>../../jdk/src/solaris/demo/jvmti/hprof</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="java_crw_demo.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/minst">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="minst.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/mtrace">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="mtrace.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/versionCheck">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="versionCheck.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/instrument">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/instrument</pElem>
-            <pElem>../../jdk/src/solaris/instrument</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>NO_JPLIS_LOGGING</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="EncodingSupport.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DirectAudioDevice.c"</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="bands.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/com">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>X_ARCH=X_AMD64</Elem>
-            <Elem>X_PLATFORM=X_LINUX</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>FULL</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/common">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="check_code.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java">
-        <cTool>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="FileInputStream.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/io">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/lang">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_acos.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/lang/fdlibm">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/lang/ref">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Finalizer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/lang/reflect">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Array.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/net">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="DatagramPacket.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/nio">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Bits.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/security">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="AccessController.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/util">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AtomicLong.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/util/concurrent">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/util/zip">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="compress.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/util/zip/zlib-1.2.5">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debug_assert.c"</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="AlternateSubstSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt">
-        <cTool>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/debug">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/giflib">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="dgif_lib.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/image">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="img_colors.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/image/cvutils">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/image/gif">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="gifdecoder.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/image/jpeg">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="imageioJPEG.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/libpng">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="png.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/medialib">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="awt_ImagingLib.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/splashscreen">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="java_awt_SplashScreen.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/utility">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="rect.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/font">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="AccelGlyphCache.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>/usr/include/freetype2</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS</Elem>
-            <Elem>LE_STANDALONE</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="LCMS.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d/cmm">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d/loops">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="AlphaMacros.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d/opengl">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="OGLBlitLoops.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d/pipe">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="BufferedMaskBlit.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/management">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="ClassLoadingImpl.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/misc">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="GC.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/nio">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/reflect">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="ConstantPool.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="ec.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
-            <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security/ec">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
-            <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MP_API_COMPATIBLE</Elem>
-            <Elem>NSS_ECC_MORE_THAN_SUITE_B</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security/jgss">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="GSSLibStub.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security/pkcs11">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/pkcs11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
-            <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_convert.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security/smartcardio">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="pcsc.c"</Elem>
-            <Elem>__sun_jdk</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/tracing">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="JVM.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/npt">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="npt.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/transport">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/transport/socket</pElem>
-            <pElem>../../jdk/src/solaris/transport/socket</pElem>
-            <pElem>../../jdk/src/share/back/export</pElem>
-            <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="socketTransport.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris">
-        <cTool>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="exec_md.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/back">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/transport/export</pElem>
-            <pElem>../../jdk/src/share/back/export</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/src/solaris/back</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>JDWP_LOGGING</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/bin">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="ergo.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/demo">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/instrument">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/instrument</pElem>
-            <pElem>../../jdk/src/solaris/instrument</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_JPLIS_LOGGING</Elem>
-            <Elem>THIS_FILE="EncodingSupport_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LinuxOperatingSystem.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/com">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/com/sun/management">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/com/sun/media">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
-            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_CommonUtils.c"</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-            <Elem>X_ARCH=X_AMD64</Elem>
-            <Elem>X_PLATFORM=X_LINUX</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Unix.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/common">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="jdk_util_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Console_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/io">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/lang">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="ProcessEnvironment_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/net">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/nio">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/util">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="FileSystemPreferences.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_sys.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/awt/splashscreen">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/font">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>/usr/include/freetype2</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS</Elem>
-            <Elem>LE_STANDALONE</Elem>
-            <Elem>THIS_FILE="X11FontScaler.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/java2d">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="GLXGraphicsConfig.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/java2d/x11">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11FontScaler_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/management">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/net">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/net/sdp">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SdpSupport.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/net/spi">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DefaultProxySelector.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/nio">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SctpChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/nio/ch">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/nio/ch/sctp">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/nio/ch/sctp</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/nio/fs">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GnomeFileTypeDetector.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/security">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="NativeFunc.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/security/jgss">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/security/pkcs11">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/pkcs11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
-            <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/security/smartcardio">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="pcsc_md.c"</Elem>
-            <Elem>__sun_jdk</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/tools">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/tracing">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/util">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="HostLocaleProviderAdapter_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/xawt">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="XToolkit.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/npt">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="utf_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/transport">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/transport/socket</pElem>
-            <pElem>../../jdk/src/solaris/transport/socket</pElem>
-            <pElem>../../jdk/src/share/back/export</pElem>
-            <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="socket_md.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-    </conf>
-    <conf name="Linux_64" type="0">
-      <toolsSet>
-        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
-        <compilerSet>default</compilerSet>
-      </toolsSet>
-      <codeAssistance>
-        <envVariables>
-          <Elem>IDE_ALT_BOOTDIR</Elem>
-        </envVariables>
-        <transientMacros>
-          <Elem>FULL_VERSION="version"</Elem>
-          <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-          <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-          <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-          <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-          <Elem>JDK_MAJOR_VERSION="version"</Elem>
-          <Elem>JDK_MICRO_VERSION="version"</Elem>
-          <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          <Elem>JRE_RELEASE_VERSION="version"</Elem>
-        </transientMacros>
-      </codeAssistance>
-      <makefileType>
-        <makeTool>
-          <buildCommandWorkingDir>../..</buildCommandWorkingDir>
-          <buildCommand>${MAKE} -f Makefile images</buildCommand>
-          <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
-          <executablePath></executablePath>
-          <ccTool>
-            <preprocessorList>
-              <Elem>LINUX</Elem>
-              <Elem>_GNU_SOURCE</Elem>
-              <Elem>_REENTRANT</Elem>
-            </preprocessorList>
-          </ccTool>
-        </makeTool>
-      </makefileType>
-      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_clone.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_expand.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_format.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_gen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_misc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_peephole.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_pipeline.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/dfa_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/jvmtifiles/bytecodeInterpreterWithChecks.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/jvmtifiles/jvmtiEnter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/jvmtifiles/jvmtiEnterTrace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/linux-x86_64-normal-server-release/jdk/gensrc_x11wrappers/sizer.64.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/agent/src/os/linux/LinuxDebuggerLocal.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/agent/src/os/linux/libproc_impl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/agent/src/os/linux/ps_core.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/agent/src/os/linux/ps_proc.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/agent/src/os/linux/salibelf.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/agent/src/os/linux/symtab.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/agent/src/share/native/sadis.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/assembler_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/bytecodes_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_FrameMap_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_LinearScan_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c2_init_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/debug_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/depChecker_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/frame_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/icBuffer_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/icache_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/interpreter_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/jniFastGetField_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/metaspaceShared_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/methodHandles_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/nativeInst_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/register_definitions_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/register_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/relocInfo_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/runtime_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/vm_version_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/vmreg_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/vtableStubs_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/attachListener_linux.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/chaitin_linux.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/decoder_linux.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/dtraceJSDT_linux.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/jsig.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/jvm_linux.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/mutex_linux.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/osThread_linux.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/os_linux.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/perfMemory_linux.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/stubRoutines_linux.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/threadCritical_linux.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/linux/vm/vmError_linux.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/posix/launcher/java_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/posix/vm/os_posix.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/linux_x86/vm/vm_version_linux_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/tools/launcher/java.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/tools/launcher/jli_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/tools/launcher/wildcard.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/adlparse.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/archDesc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/arena.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/dfa.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/dict2.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/filebuff.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/forms.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/formsopt.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/formssel.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/main.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/output_c.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/output_h.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/asm/assembler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/asm/codeBuffer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/asm/register.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_CFGPrinter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Canonicalizer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Compilation.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Compiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Defs.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_FrameMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_GraphBuilder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_IR.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Instruction.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_LIR.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_LIRAssembler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_LIRGenerator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_LinearScan.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Optimizer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_RangeCheckElimination.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Runtime1.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_ValueMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_ValueSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_ValueStack.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_ValueType.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_globals.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciBaseObject.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciCallSite.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciConstant.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciConstantPoolCache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciEnv.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciExceptionHandler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciField.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciFlags.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciInstance.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciInstanceKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMemberName.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMetadata.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMethod.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMethodBlocks.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMethodData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMethodHandle.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciNullObject.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciObjArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciObjArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciObject.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciObjectFactory.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciReplay.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciSignature.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciStreams.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciSymbol.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciType.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciTypeArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciTypeFlow.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciUtilities.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/altHashing.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/bytecodeAssembler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classFileError.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classFileParser.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classFileStream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classLoader.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classLoaderData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/defaultMethods.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/dictionary.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/genericSignatures.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/javaAssertions.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/javaClasses.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/loaderConstraints.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/metadataOnStackMark.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/placeholders.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/resolutionErrors.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/stackMapFrame.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/stackMapTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/symbolTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/systemDictionary.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/verificationType.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/verifier.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/vmSymbols.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/codeBlob.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/codeCache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/compiledIC.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/compressedStream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/debugInfo.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/debugInfoRec.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/dependencies.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/exceptionHandlerTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/icBuffer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/location.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/nmethod.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/oopRecorder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/pcDesc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/relocInfo.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/scopeDesc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/stubs.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/vmreg.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/vtableStubs.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/abstractCompiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/compileBroker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/compileLog.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/compilerOracle.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/disassembler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/methodLiveness.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/oopMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1Log.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1_globals.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/allocationStats.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_interface/collectedHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_interface/gcCause.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodeStream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodeTracer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/cppInterpreter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/interpreter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/interpreterRuntime.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/invocationCounter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/linkResolver.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/oopMapCache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/rewriter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/templateInterpreter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/templateTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/libadt/dict.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/libadt/port.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/libadt/set.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/libadt/vectset.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/allocation.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/barrierSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/binaryTreeDictionary.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/blockOffsetTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/cardTableModRefBS.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/cardTableRS.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/collectorPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/defNewGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/filemap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/freeBlockDictionary.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/freeList.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/gcLocker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/genCollectedHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/genMarkSweep.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/genRemSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/generation.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/generationSpec.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/heap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/heapInspection.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/iterator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/memRegion.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metablock.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metachunk.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metaspace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metaspaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metaspaceShared.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/oopFactory.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/referencePolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/referenceProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/resourceArea.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/sharedHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/space.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/specialized_oop_closures.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/tenuredGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/universe.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/annotations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/arrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/arrayOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/compiledICHolder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/constMethod.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/constantPool.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/cpCache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/generateOopMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceClassLoaderKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceMirrorKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceRefKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/klass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/klassVtable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/markOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/metadata.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/method.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/methodData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/objArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/objArrayOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/oop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/oopsHierarchy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/symbol.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/typeArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/typeArrayOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/addnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/block.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/buildOopMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/bytecodeInfo.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/c2_globals.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/c2compiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/callGenerator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/callnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/cfgnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/chaitin.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/classes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/coalesce.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/compile.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/connode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/divnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/doCall.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/domgraph.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/escape.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/gcm.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/generateOptoStub.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/graphKit.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/idealGraphPrinter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/idealKit.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/ifg.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/ifnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/indexSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/lcm.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/library_call.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/live.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/locknode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopPredicate.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopTransform.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopUnswitch.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopopts.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/machnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/macro.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/matcher.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/memnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/mulnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/multnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/node.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/opcodes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/output.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/parse1.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/parse2.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/parse3.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/parseHelper.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/phase.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/phaseX.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/postaloc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/reg_split.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/regalloc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/regmask.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/rootnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/runtime.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/split_if.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/stringopts.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/subnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/superword.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/type.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/vectornode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/precompiled/precompiled.hpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/evmCompat.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/forte.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jni.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jniCheck.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jniFastGetField.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvm.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiEnv.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiEnvBase.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiEventController.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiExport.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiExtensions.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiImpl.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiRawMonitor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiTagMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiThreadState.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiTrace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiUtil.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/methodComparator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/methodHandles.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/nativeLookup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/perf.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/privilegedStack.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/unsafe.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/wbtestmethods/parserTests.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/whitebox.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/aprofiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/arguments.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/atomic.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/basicLock.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/biasedLocking.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/compilationPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/deoptimization.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/dtraceJSDT.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/fieldDescriptor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/fieldType.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/fprofiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/frame.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/globals.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/handles.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/icache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/init.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/interfaceSupport.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/java.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/javaCalls.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/jniHandles.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/jniPeriodicChecker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/memprofiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/monitorChunk.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/mutex.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/mutexLocker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/objectMonitor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/orderAccess.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/os.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/osThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/park.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/perfData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/perfMemory.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/reflection.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/reflectionUtils.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/relocator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/rframe.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/safepoint.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/serviceThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/sharedRuntime.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/signature.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/stackValue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/stackValueCollection.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/statSampler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/stubCodeGenerator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/stubRoutines.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/sweeper.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/synchronizer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/task.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/thread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/threadLocalStorage.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/timer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/unhandledOops.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vframe.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vframeArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vframe_hp.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/virtualspace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vmStructs.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vmThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vm_operations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vm_version.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>JRE_RELEASE_VERSION="version"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/services/attachListener.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/classLoadingService.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/diagnosticArgument.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/diagnosticCommand.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/diagnosticFramework.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/dtraceAttacher.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/g1MemoryPool.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/gcNotifier.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/heapDumper.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/lowMemoryDetector.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/management.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memBaseline.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memPtr.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memRecorder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memReporter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memSnapshot.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memTrackWorker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memTracker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memoryManager.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memoryPool.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memoryService.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/nmtDCmd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/psMemoryPool.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/runtimeService.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/threadService.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/accessFlags.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/array.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/bitMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/constantTag.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/copy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/debug.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/decoder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/decoder_elf.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/elfFile.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/elfStringTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/elfSymbolTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/errorReporter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/events.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/exceptions.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/globalDefinitions.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/growableArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/hashtable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/histogram.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/intHisto.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/numberSeq.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/ostream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/preserveException.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/quickSort.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/sizes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/taskqueue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/utf8.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/vmError.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/workgroup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/xmlstream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/back/ArrayReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/back/ArrayTypeImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ArrayTypeImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ClassLoaderReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ClassLoaderReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ClassObjectReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ClassObjectReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ClassTypeImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ClassTypeImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/EventRequestImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="EventRequestImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/FieldImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FieldImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/FrameID.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FrameID.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/MethodImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MethodImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ObjectReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ObjectReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ReferenceTypeImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ReferenceTypeImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/SDE.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SDE.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/StackFrameImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="StackFrameImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/StringReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="StringReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ThreadGroupReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThreadGroupReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ThreadReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThreadReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/VirtualMachineImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="VirtualMachineImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/bag.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="bag.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/classTrack.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="classTrack.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/commonRef.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="commonRef.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/debugDispatch.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debugDispatch.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/debugInit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debugInit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/debugLoop.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debugLoop.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/error_messages.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="error_messages.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/eventFilter.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="eventFilter.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/eventHandler.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="eventHandler.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/eventHelper.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="eventHelper.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/inStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="inStream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/invoker.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="invoker.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/log_messages.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="log_messages.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/outStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="outStream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/standardHandlers.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="standardHandlers.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/stepControl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="stepControl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/stream.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="stream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/threadControl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="threadControl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/transport.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="transport.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/util.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/java.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/jli_util.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="jli_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/main.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/linux/bin</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
-            <Elem>JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", }</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>LAUNCHER_NAME="openjdk"</Elem>
-            <Elem>NEVER_ACT_AS_SERVER_CLASS_MACHINE</Elem>
-            <Elem>PROGNAME="javac"</Elem>
-            <Elem>THIS_FILE="main.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/parse_manifest.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="parse_manifest.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/splashscreen_stubs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_stubs.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/version_comp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="version_comp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/wildcard.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="wildcard.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/agent_util/agent_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/compiledMethodLoad/compiledMethodLoad.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/gctest/gctest.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/heapTracker/heapTracker.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/heapViewer/heapViewer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/debug_malloc.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_blocks.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_blocks.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_check.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_check.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_class.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_class.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_cpu.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_cpu.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_error.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_error.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_event.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_event.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_frame.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_frame.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_init.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_init.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_io.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_io.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_ioname.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_ioname.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_listener.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_listener.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_loader.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_loader.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_monitor.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_monitor.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_object.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_object.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_reference.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_reference.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_site.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_site.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_stack.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_stack.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_string.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_string.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_table.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_table.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_tag.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_tag.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_tls.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_tls.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_trace.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_trace.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_tracker.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_tracker.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/minst/minst.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/mtrace/mtrace.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/versionCheck/versionCheck.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/waiters/Agent.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/waiters/Monitor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Monitor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/waiters/Thread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Thread.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/waiters/waiters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="waiters.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/EncodingSupport.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/instrument/InstrumentationImplNativeMethods.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="InstrumentationImplNativeMethods.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/InvocationAdapter.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="InvocationAdapter.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/JPLISAgent.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="JPLISAgent.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/JPLISAssert.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="JPLISAssert.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/JarFacade.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="JarFacade.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/JavaExceptions.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="JavaExceptions.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/PathCharsValidator.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PathCharsValidator.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/Reentrancy.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Reentrancy.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/Utilities.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Utilities.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>THIS_FILE="bytes.cpp"</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>THIS_FILE="coding.cpp"</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>THIS_FILE="jni.cpp"</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="main.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>THIS_FILE="unpack.cpp"</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>THIS_FILE="utils.cpp"</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>THIS_FILE="zip.cpp"</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/DirectAudioDeviceProvider.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DirectAudioDeviceProvider.c"</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiInDevice.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MidiInDevice.c"</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiInDeviceProvider.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MidiInDeviceProvider.c"</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiOutDevice.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MidiOutDevice.c"</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiOutDeviceProvider.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MidiOutDeviceProvider.c"</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/Platform.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Platform.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/PlatformMidi.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PlatformMidi.c"</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/PortMixer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PortMixer.c"</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/PortMixerProvider.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PortMixerProvider.c"</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/Utilities.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Utilities.c"</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/check_code.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/check_format.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="check_format.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/check_version.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="check_version.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/jdk_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="jdk_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/jio.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="jio.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/jni_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="jni_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/verify_stub.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="verify_stub.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/io/FileInputStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/io/ObjectInputStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ObjectInputStream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/io/ObjectOutputStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ObjectOutputStream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/io/ObjectStreamClass.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ObjectStreamClass.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/io/RandomAccessFile.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="RandomAccessFile.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/io/io_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="io_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Class.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Class.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/ClassLoader.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="ClassLoader.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Compiler.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Compiler.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Double.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Double.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Float.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Float.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Object.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Object.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Package.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Package.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/ResourceBundle.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="ResourceBundle.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Runtime.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Runtime.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/SecurityManager.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="SecurityManager.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Shutdown.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Shutdown.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/StrictMath.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="StrictMath.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/String.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="String.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/System.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="System.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Thread.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Thread.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Throwable.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Throwable.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_acos.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_asin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_asin.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_atan2.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_atan2.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_atanh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_atanh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_cosh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_cosh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_exp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_exp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_fmod.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_fmod.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_hypot.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_hypot.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_log.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_log.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_log10.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_log10.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_pow.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_pow.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_rem_pio2.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_rem_pio2.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_remainder.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_remainder.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_scalb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_scalb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_sinh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_sinh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_sqrt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_sqrt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_cos.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="k_cos.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_rem_pio2.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="k_rem_pio2.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_sin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="k_sin.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_standard.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="k_standard.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_tan.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="k_tan.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_atan.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_atan.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_cbrt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_cbrt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_ceil.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_ceil.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_copysign.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_copysign.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_cos.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_cos.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_expm1.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_expm1.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_fabs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_fabs.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_finite.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_finite.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_floor.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_floor.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_frexp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_frexp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_ilogb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_ilogb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_isnan.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_isnan.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_ldexp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_ldexp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_lib_version.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_lib_version.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_log1p.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_log1p.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_logb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_logb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_matherr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_matherr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_modf.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_modf.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_nextafter.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_nextafter.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_rint.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_rint.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_scalbn.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_scalbn.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_signgam.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_signgam.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_significand.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_significand.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_sin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_sin.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_tan.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_tan.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_tanh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_tanh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_acos.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_acos.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_asin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_asin.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_atan2.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_atan2.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_atanh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_atanh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_cosh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_cosh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_exp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_exp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_fmod.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_fmod.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_hypot.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_hypot.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_log.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_log.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_log10.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_log10.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_pow.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_pow.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_remainder.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_remainder.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_scalb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_scalb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_sinh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_sinh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_sqrt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_sqrt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/ref/Finalizer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/reflect/Array.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/reflect/Executable.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Executable.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/reflect/Proxy.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Proxy.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/net/DatagramPacket.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/net/Inet4Address.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Inet4Address.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/net/Inet6Address.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Inet6Address.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/net/InetAddress.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="InetAddress.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/net/net_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="net_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/nio/Bits.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/security/AccessController.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/util/TimeZone.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="TimeZone.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/concurrent/atomic/AtomicLong.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/Adler32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Adler32.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>DEBUG</Elem>
-          </undefinedList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/CRC32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="CRC32.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>DEBUG</Elem>
-          </undefinedList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/Deflater.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Deflater.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>DEBUG</Elem>
-          </undefinedList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/Inflater.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Inflater.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>DEBUG</Elem>
-          </undefinedList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/ZipFile.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="ZipFile.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>DEBUG</Elem>
-          </undefinedList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zip_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="zip_util.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>DEBUG</Elem>
-          </undefinedList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/compress.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/deflate.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="deflate.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzclose.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gzclose.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzlib.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gzlib.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzread.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gzread.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzwrite.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gzwrite.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/infback.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="infback.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/inffast.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="inffast.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/inflate.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="inflate.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/inftrees.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="inftrees.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/trees.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="trees.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/uncompr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="uncompr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/zadler32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="zadler32.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/zcrc32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="zcrc32.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/zutil.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="zutil.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/debug/debug_assert.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/debug/debug_mem.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debug_mem.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/debug/debug_trace.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debug_trace.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/debug/debug_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debug_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/giflib/dgif_lib.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/giflib/gif_err.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gif_err.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/giflib/gifalloc.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gifalloc.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="BufImgSurfaceData.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/DataBufferNative.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="DataBufferNative.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/awt_ImageRep.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="awt_ImageRep.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/awt_parseImage.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="awt_parseImage.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/cvutils/img_colors.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/cvutils/img_globals.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="img_globals.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/dither.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="dither.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/gif/gifdecoder.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/imageInitIDs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="imageInitIDs.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcapimin.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcapistd.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jccoefct.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jccolor.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jccolor.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcdctmgr.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jchuff.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jchuff.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcinit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcinit.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcmainct.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcmarker.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcmaster.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcomapi.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcparam.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcparam.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcphuff.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcprepct.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcsample.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcsample.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jctrans.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jctrans.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdapimin.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdapistd.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdcoefct.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdcolor.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jddctmgr.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdhuff.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdinput.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdinput.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdmainct.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdmarker.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdmaster.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdmerge.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdphuff.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdpostct.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdsample.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdsample.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdtrans.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jerror.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jerror.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jfdctflt.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jfdctfst.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jfdctint.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jidctflt.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jidctfst.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctint.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jidctint.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctred.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jidctred.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jmemmgr.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jmemnobs.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="jpegdecoder.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jquant1.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jquant1.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jquant2.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jquant2.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jutils.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jutils.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/png.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngerror.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngerror.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngget.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngget.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngmem.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngmem.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngpread.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngpread.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngread.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngread.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngrio.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngrio.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngrtran.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngrtran.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngrutil.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngrutil.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngset.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngset.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngtrans.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngtrans.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwio.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngwio.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwrite.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngwrite.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwtran.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngwtran.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwutil.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngwutil.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffineEdge.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_D64.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_BC_D64.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_BC_F32.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_S32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_BC_S32.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_D64.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_BL_D64.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_F32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_BL_F32.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_BL_S32.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_NN.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN_Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_NN_Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageClipping.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageColorTrue2Index.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv2x2_f.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvClearEdge_Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Fp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvClearEdge_Fp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvCopyEdge_Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvKernelConvert.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvKernelConvert.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvMxN.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvMxN_Fp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvMxN_ext.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_16ext.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_16nw.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_32nw.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_8ext.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_8nw.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_D64nw.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_F32nw.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_F32nw.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_u16ext.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_u16nw.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageCopy_Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageCreate.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageDivTables.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageFilters.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageLookUp_64.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageLookUp_Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageScanPoly.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageScanPoly.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageUtils.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BC.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffineIndex_BC.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BL.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffineIndex_BL.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_BC.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_BC_S16.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_U16.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_BC_U16.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_BL.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_S16.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_BL_S16.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_U16.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_BL_U16.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_NN.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_NN.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageConvClearEdge.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvCopyEdge.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageConvCopyEdge.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvVersion.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageConvVersion.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv_f.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageConv_f.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageCopy.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageLookUp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageLookUp_f.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1_U8.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageThresh1_U8.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_sys.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_sys.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_gfx_impl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_gif.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_impl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_jpeg.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_png.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/utility/rect.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/AccelGlyphCache.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/DrawGlyphList.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>/usr/include/freetype2</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS</Elem>
-            <Elem>LE_STANDALONE</Elem>
-            <Elem>THIS_FILE="DrawGlyphList.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/FontInstanceAdapter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FontInstanceAdapter.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/freetypeScaler.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>/usr/include/freetype2</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS</Elem>
-            <Elem>LE_STANDALONE</Elem>
-            <Elem>THIS_FILE="freetypeScaler.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/AnchorTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AnchorTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ArabicLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ArabicShaping.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ArabicShaping.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/CanonData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="CanonData.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/CanonShaping.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="CanonShaping.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ClassDefinitionTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ClassDefinitionTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ContextualGlyphSubstProc.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ContextualSubstSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/CoverageTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="CoverageTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="CursiveAttachmentSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/DeviceTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DeviceTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ExtensionSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/Features.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Features.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GDEFMarkFilter.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GXLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GXLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphDefinitionTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphDefinitionTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphIterator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphIterator.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphLookupTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphLookupTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphPositionAdjustments.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphPositionAdjustments.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphPositioningTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphPositioningTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphPosnLookupProc.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphSubstLookupProc.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphSubstitutionTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphSubstitutionTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/HanLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="HanLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/HangulLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="HangulLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/IndicClassTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IndicClassTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IndicLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IndicRearrangementProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/IndicReordering.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IndicReordering.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/KernTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="KernTable.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/KhmerLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="KhmerLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/KhmerReordering.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="KhmerReordering.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LEFontInstance.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LEFontInstance.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LEGlyphStorage.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LEInsertionList.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LEInsertionList.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LigatureSubstProc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LigatureSubstProc.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LigatureSubstSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LookupProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LookupProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LookupTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LookupTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/Lookups.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Lookups.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MPreFixups.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MPreFixups.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MarkArrays.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MarkArrays.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MarkToBasePosnSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MarkToLigaturePosnSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MarkToMarkPosnSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MirroredCharData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MirroredCharData.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MorphTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MorphTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MultipleSubstSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/NonContextualGlyphSubstProc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="NonContextualGlyphSubstProc.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OpenTypeLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OpenTypeUtilities.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PairPositioningSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ScriptAndLanguage.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ScriptAndLanguageTags.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SegmentArrayProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SegmentSingleProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SegmentSingleProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ShapingTypeData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ShapingTypeData.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SimpleArrayProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SimpleArrayProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SinglePositioningSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SingleSubstitutionSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SingleTableProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SingleTableProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/StateTableProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="StateTableProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SubstitutionLookups.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SubstitutionLookups.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SubtableProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SubtableProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SunLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ThaiLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThaiLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ThaiShaping.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThaiShaping.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ThaiStateTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThaiStateTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/TibetanLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="TibetanLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/TibetanReordering.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="TibetanReordering.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="TrimmedArrayProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ValueRecords.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ValueRecords.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/sunFont.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>/usr/include/freetype2</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS</Elem>
-            <Elem>LE_STANDALONE</Elem>
-            <Elem>THIS_FILE="sunFont.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/Disposer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="Disposer.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/SurfaceData.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="SurfaceData.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/Trace.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="Trace.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmscam02.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmscgats.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmscnvrt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmserr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsgamma.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsgmt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmshalf.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmshalf.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsintrp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsio0.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsio1.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmslut.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsmd5.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsmtrx.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsnamed.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsopt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmspack.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmspcs.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsplugin.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsps2.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmssamp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmssm.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmstypes.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsvirt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmswtpnt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsxform.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/AlphaMacros.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/AlphaMath.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AlphaMath.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Any3Byte.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Any3Byte.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Any4Byte.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Any4Byte.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/AnyByte.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AnyByte.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/AnyInt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AnyInt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/AnyShort.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AnyShort.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Blit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Blit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/BlitBg.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="BlitBg.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteBinary1Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ByteBinary1Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteBinary2Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ByteBinary2Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteBinary4Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ByteBinary4Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteGray.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ByteGray.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteIndexed.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ByteIndexed.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawLine.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DrawLine.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawParallelogram.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DrawParallelogram.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawPath.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DrawPath.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawPolygons.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DrawPolygons.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawRect.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DrawRect.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/FillParallelogram.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FillParallelogram.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/FillPath.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FillPath.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/FillRect.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FillRect.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/FillSpans.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FillSpans.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/FourByteAbgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FourByteAbgr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/FourByteAbgrPre.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FourByteAbgrPre.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GraphicsPrimitiveMgr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Index12Gray.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Index12Gray.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Index8Gray.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Index8Gray.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/IntArgb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IntArgb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/IntArgbBm.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IntArgbBm.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/IntArgbPre.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IntArgbPre.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/IntBgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IntBgr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/IntRgb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IntRgb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/IntRgbx.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IntRgbx.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/MapAccelFunc.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MapAccelFunc.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/MaskBlit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MaskBlit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/MaskFill.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MaskFill.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ProcessPath.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ProcessPath.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ScaledBlit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ScaledBlit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ThreeByteBgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThreeByteBgr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/TransformHelper.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="TransformHelper.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Ushort4444Argb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort555Rgb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Ushort555Rgb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort555Rgbx.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Ushort555Rgbx.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort565Rgb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Ushort565Rgb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/UshortGray.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="UshortGray.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/UshortIndexed.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="UshortIndexed.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLBufImgOps.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLBufImgOps.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLContext.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLContext.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLFuncs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLFuncs.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLMaskBlit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLMaskBlit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLMaskFill.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLMaskFill.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLPaints.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLPaints.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLRenderQueue.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLRenderer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLRenderer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLSurfaceData.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLTextRenderer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLVertexCache.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLVertexCache.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="BufferedRenderPipe.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/pipe/Region.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Region.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ShapeSpanIterator.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SpanClipRenderer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/ClassLoadingImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/Flag.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Flag.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/GarbageCollectorImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GarbageCollectorImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/GcInfoBuilder.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GcInfoBuilder.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/HotSpotDiagnostic.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="HotSpotDiagnostic.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/HotspotThread.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="HotspotThread.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/MemoryImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MemoryImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/MemoryManagerImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MemoryManagerImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/MemoryPoolImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MemoryPoolImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/ThreadImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThreadImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/VMManagementImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="VMManagementImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/management.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="management.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/GC.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/MessageUtils.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MessageUtils.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/NativeSignalHandler.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="NativeSignalHandler.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/Signal.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Signal.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/VM.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="VM.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/VMSupport.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="VMSupport.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/Version.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Version.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/reflect/ConstantPool.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/reflect/NativeAccessors.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="NativeAccessors.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/reflect/Reflection.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Reflection.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/ECC_JNI.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_163.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ec2_163.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_193.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ec2_193.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_233.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ec2_233.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_aff.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ec2_aff.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_mont.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ec2_mont.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec_naf.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ec_naf.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecdecode.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecdecode.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl_curve.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecl_curve.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl_gf.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecl_gf.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl_mult.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecl_mult.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_192.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_192.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_224.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_224.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_256.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_256.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_384.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_384.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_521.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_521.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_aff.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_aff.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_jac.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_jac.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_jm.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_jm.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_mont.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_mont.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/mp_gf2m.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="mp_gf2m.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/mpi.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="mpi.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/mplogic.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="mplogic.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/mpmontg.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="mpmontg.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/oid.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="oid.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/secitem.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="secitem.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/jgss/wrapper/NativeUtil.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="NativeUtil.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/j2secmod.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="j2secmod.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_crypt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_digest.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_dual.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_general.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_keymgmt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_mutex.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_objmgmt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_sessmgmt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_sign.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/smartcardio/pcsc.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/tracing/dtrace/JVM.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/npt/npt.c" ex="false" tool="0" flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/npt/utf.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="utf.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/transport/socket/socketTransport.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/back/exec_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/back/linker_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="linker_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/bin/ergo.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>LIBARCHNAME="amd64"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/bin/ergo_i586.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>LIBARCHNAME="amd64"</Elem>
-            <Elem>THIS_FILE="ergo_i586.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/bin/java_md_common.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>LIBARCHNAME="amd64"</Elem>
-            <Elem>THIS_FILE="java_md_common.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/bin/java_md_solinux.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>LIBARCHNAME="amd64"</Elem>
-            <Elem>THIS_FILE="java_md_solinux.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/bin/jexec.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="jexec.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/demo/jvmti/hprof/hprof_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/instrument/EncodingSupport_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/instrument/FileSystemSupport_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileSystemSupport_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/management/LinuxOperatingSystem.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="UnixOperatingSystem_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_MidiIn.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_MidiOut.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_MidiUtils.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_PCM.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_PCMUtils.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_Ports.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_Ports.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/security/auth/module/Unix.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/common/jdk_util_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/common/jni_util_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="jni_util_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/Console_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/FileDescriptor_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileDescriptor_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/FileInputStream_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileInputStream_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/FileOutputStream_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileOutputStream_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/RandomAccessFile_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="RandomAccessFile_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/UnixFileSystem_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="UnixFileSystem_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/canonicalize_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="canonicalize_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/io_util_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="io_util_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/java/lang/UNIXProcess_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="UNIXProcess_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/lang/java_props_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="java_props_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/Inet4AddressImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/Inet6AddressImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Inet6AddressImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/InetAddressImplFactory.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="InetAddressImplFactory.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/NetworkInterface.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="NetworkInterface.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PlainDatagramSocketImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/PlainSocketImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PlainSocketImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/SocketInputStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SocketInputStream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/SocketOutputStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SocketOutputStream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/linux_close.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="linux_close.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/net_util_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="net_util_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/nio/MappedByteBuffer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/java/util/FileSystemPreferences.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/java/util/TimeZone_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="TimeZone_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/util/logging.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="logging.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/CUPSfuncs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="CUPSfuncs.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/HeadlessToolkit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS=true</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="HeadlessToolkit.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/VDrawingArea.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS=true</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="VDrawingArea.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/X11Color.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="X11Color.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_AWTEvent.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_AWTEvent.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_DrawingSurface.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_Event.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_Event.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_Font.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_Font.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_GraphicsEnv.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_InputMethod.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_InputMethod.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_Insets.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_Insets.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="awt_LoadLibrary.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_Mlib.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="awt_Mlib.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_Plugin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_Plugin.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_Robot.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_Robot.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_UNIXToolkit.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_util.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/fontpath.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="fontpath.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/gtk2_interface.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="gtk2_interface.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/initIDs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="initIDs.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/jawt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="jawt.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/list.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="list.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/multiVis.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="multiVis.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/multi_font.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="multi_font.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/robot_common.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="robot_common.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="sun_awt_X11_GtkFileDialogPeer.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/swing_GTKEngine.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="swing_GTKEngine.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/swing_GTKStyle.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="swing_GTKStyle.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/font/X11FontScaler.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/font/X11TextRenderer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11TextRenderer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GLXSurfaceData.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11PMBlitLoops.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11Renderer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11SurfaceData.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11TextRenderer_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="XRBackendNative.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="XRSurfaceData.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/management/FileSystemImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/net/sdp/SdpSupport.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/EPoll.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="EPoll.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="EPollArrayWrapper.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/EPollPort.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="EPollPort.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/FileKey.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileKey.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/IOUtil.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="IOUtil.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/InheritedChannel.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="InheritedChannel.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/NativeThread.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="NativeThread.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/Net.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Net.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/PollArrayWrapper.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/SocketDispatcher.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="SocketDispatcher.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SctpNet.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/sctp/SctpServerChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SctpServerChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="LinuxNativeDispatcher.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="LinuxWatchService.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="MagicFileTypeDetector.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="UnixCopyFile.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="UnixNativeDispatcher.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="genUnixConstants.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="j2secmod_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/xawt/XToolkit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/xawt/XWindow.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="XWindow.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/xawt/XlibWrapper.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="XlibWrapper.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/xawt/awt_Desktop.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="awt_Desktop.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/xawt/gnome_interface.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gnome_interface.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/npt/utf_md.c" ex="false" tool="0" flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/transport/socket/socket_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <folder path="$SRC/build">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-          </incDir>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>COMPILER1</Elem>
-            <Elem>COMPILER2</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_gcc</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_linux</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>__EXCEPTIONS</Elem>
-            <Elem>__GXX_RTTI</Elem>
-          </undefinedList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot">
-        <cTool>
-          <preprocessorList>
-            <Elem>_GNU_SOURCE</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>COMPILER1</Elem>
-            <Elem>COMPILER2</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_gcc</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_linux</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>__EXCEPTIONS</Elem>
-            <Elem>__GXX_RTTI</Elem>
-          </undefinedList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/agent">
-        <cTool>
-          <incDir>
-            <pElem>../../hotspot/agent/src/os/linux</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-            <pElem>${IDE_ALT_BOOTDIR}/include</pElem>
-            <pElem>${IDE_ALT_BOOTDIR}/include/linux</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>_FILE_OFFSET_BITS=64</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/cpu">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os/linux">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>_REENTRANT</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os/posix">
-        <cTool>
-          <incDir>
-            <pElem>../../hotspot/src/os/posix/launcher</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/tools/launcher</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
-            <Elem>GAMMA</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>LAUNCHER_TYPE="gamma"</Elem>
-            <Elem>LINK_INTO_LIBJVM</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_gcc</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_linux</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os_cpu">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share">
-        <cTool>
-          <incDir>
-            <pElem>../../hotspot/src/os/posix/launcher</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/tools/launcher</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
-            <Elem>GAMMA</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>LAUNCHER_TYPE="gamma"</Elem>
-            <Elem>LINK_INTO_LIBJVM</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_gcc</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_linux</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/adlc">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/adlc</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ASSERT</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/asm">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/c1">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/ci">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/classfile">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/code">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/compiler">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/gc_implementation">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/gc_interface">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/interpreter">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/libadt">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/memory">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/oops">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/opto">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/precompiled">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/prims">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/runtime">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/services">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/utilities">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ArrayReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="Agent.cpp"</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/back">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/transport/export</pElem>
-            <pElem>../../jdk/src/share/back/export</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/src/solaris/back</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>JDWP_LOGGING</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/bin">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LIBARCHNAME="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="java.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="agent_util.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/agent_util">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/compiledMethodLoad">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/gctest">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="gctest.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/heapTracker">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="heapTracker.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/heapViewer">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="heapViewer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/hprof">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="debug_malloc.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/java_crw_demo">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
-            <pElem>../../jdk/src/solaris/demo/jvmti/hprof</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="java_crw_demo.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/minst">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="minst.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/mtrace">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="mtrace.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/versionCheck">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="versionCheck.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/instrument">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/instrument</pElem>
-            <pElem>../../jdk/src/solaris/instrument</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>NO_JPLIS_LOGGING</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="EncodingSupport.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DirectAudioDevice.c"</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="bands.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/com">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>X_ARCH=X_AMD64</Elem>
-            <Elem>X_PLATFORM=X_LINUX</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>FULL</Elem>
-            <Elem>PRODUCT</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/common">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="check_code.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java">
-        <cTool>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="FileInputStream.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/io">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/lang">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_acos.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/lang/fdlibm">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/lang/ref">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Finalizer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/lang/reflect">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Array.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/net">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="DatagramPacket.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/nio">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Bits.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/security">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="AccessController.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/util">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AtomicLong.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/util/concurrent">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/util/zip">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="compress.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/util/zip/zlib-1.2.5">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debug_assert.c"</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="AlternateSubstSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt">
-        <cTool>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/debug">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/giflib">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="dgif_lib.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/image">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="img_colors.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/image/cvutils">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/image/gif">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="gifdecoder.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/image/jpeg">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="imageioJPEG.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/libpng">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="png.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/medialib">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="awt_ImagingLib.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/splashscreen">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="java_awt_SplashScreen.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/utility">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="rect.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/font">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="AccelGlyphCache.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>/usr/include/freetype2</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS</Elem>
-            <Elem>LE_STANDALONE</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="LCMS.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d/cmm">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d/loops">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="AlphaMacros.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d/opengl">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="OGLBlitLoops.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d/pipe">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>THIS_FILE="BufferedMaskBlit.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/management">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="ClassLoadingImpl.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/misc">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="GC.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/nio">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/reflect">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="ConstantPool.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="ec.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
-            <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security/ec">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
-            <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MP_API_COMPATIBLE</Elem>
-            <Elem>NSS_ECC_MORE_THAN_SUITE_B</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security/jgss">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="GSSLibStub.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security/pkcs11">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/pkcs11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
-            <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_convert.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security/smartcardio">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="pcsc.c"</Elem>
-            <Elem>__sun_jdk</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/tracing">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="JVM.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/npt">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="npt.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/transport">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/transport/socket</pElem>
-            <pElem>../../jdk/src/solaris/transport/socket</pElem>
-            <pElem>../../jdk/src/share/back/export</pElem>
-            <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="socketTransport.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris">
-        <cTool>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>THIS_FILE="exec_md.c"</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LARGEFILE64_SOURCE</Elem>
-            <Elem>_LITTLE_ENDIAN</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-            <Elem>amd64</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/back">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/transport/export</pElem>
-            <pElem>../../jdk/src/share/back/export</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/src/solaris/back</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>JDWP_LOGGING</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/bin">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="ergo.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/demo">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/instrument">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/instrument</pElem>
-            <pElem>../../jdk/src/solaris/instrument</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_JPLIS_LOGGING</Elem>
-            <Elem>THIS_FILE="EncodingSupport_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LinuxOperatingSystem.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/com">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/com/sun/management">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/com/sun/media">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
-            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_CommonUtils.c"</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
-            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-            <Elem>X_ARCH=X_AMD64</Elem>
-            <Elem>X_PLATFORM=X_LINUX</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Unix.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/common">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="jdk_util_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Console_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/io">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/lang">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="ProcessEnvironment_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/net">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/nio">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/util">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="FileSystemPreferences.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_sys.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/awt/splashscreen">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/include</pElem>
-            <pElem>/usr/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/font">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>/usr/include/freetype2</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS</Elem>
-            <Elem>LE_STANDALONE</Elem>
-            <Elem>THIS_FILE="X11FontScaler.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/java2d">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="GLXGraphicsConfig.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/java2d/x11">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11FontScaler_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/management">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/net">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/net/sdp">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SdpSupport.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/net/spi">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DefaultProxySelector.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/nio">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SctpChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/nio/ch">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/nio/ch/sctp">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/nio/ch/sctp</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/nio/fs">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GnomeFileTypeDetector.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/security">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="NativeFunc.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/security/jgss">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/security/pkcs11">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/pkcs11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
-            <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/security/smartcardio">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="pcsc_md.c"</Elem>
-            <Elem>__sun_jdk</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/tools">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/tracing">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/util">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="HostLocaleProviderAdapter_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/xawt">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="XToolkit.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/npt">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="utf_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/transport">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/transport/socket</pElem>
-            <pElem>../../jdk/src/solaris/transport/socket</pElem>
-            <pElem>../../jdk/src/share/back/export</pElem>
-            <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="socket_md.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-    </conf>
-    <conf name="Solaris_64" type="0">
-      <toolsSet>
-        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
-        <compilerSet>default</compilerSet>
-      </toolsSet>
-      <codeAssistance>
-        <envVariables>
-          <Elem>IDE_ALT_BOOTDIR</Elem>
-        </envVariables>
-        <transientMacros>
-          <Elem>FULL_VERSION="version"</Elem>
-          <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-          <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-          <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-          <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-          <Elem>JDK_MAJOR_VERSION="version"</Elem>
-          <Elem>JDK_MICRO_VERSION="version"</Elem>
-          <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          <Elem>JRE_RELEASE_VERSION="version"</Elem>
-        </transientMacros>
-      </codeAssistance>
-      <makefileType>
-        <makeTool>
-          <buildCommandWorkingDir>../..</buildCommandWorkingDir>
-          <buildCommand>gmake -f Makefile images</buildCommand>
-          <cleanCommand>gmake -f Makefile clean</cleanCommand>
-          <executablePath></executablePath>
-        </makeTool>
-      </makefileType>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_clone.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_expand.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_format.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_gen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_misc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_peephole.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_pipeline.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/dfa_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/jvmtifiles/bytecodeInterpreterWithChecks.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/jvmtifiles/jvmtiEnter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/jvmtifiles/jvmtiEnterTrace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product/JvmOffsets.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../build/solaris-x86_64-normal-server-release/jdk/gensrc_x11wrappers/sizer.64.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/agent/src/os/solaris/proc/saproc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/agent/src/share/native/sadis.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/assembler_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/bytecodes_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_FrameMap_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_LinearScan_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/c2_init_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/debug_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/depChecker_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/frame_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/icBuffer_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/icache_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/interpreter_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/jniFastGetField_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/metaspaceShared_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/methodHandles_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/nativeInst_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/register_definitions_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/register_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/relocInfo_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/runtime_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/vm_version_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/vmreg_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/cpu/x86/vm/vtableStubs_x86_64.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/posix/launcher/java_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/posix/vm/os_posix.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/add_gnu_debuglink/add_gnu_debuglink.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/solaris/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>COMPILER1</Elem>
-            <Elem>COMPILER2</Elem>
-            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>SPARC_WORKS</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_sparcWorks</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_solaris</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_Crun_inline_placement</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/os/solaris/dtrace/generateJvmOffsetsMain.c"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/os/solaris/dtrace/jvm_dtrace.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/dtrace/libjvm_db.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="../../hotspot/src/os/solaris/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/attachListener_solaris.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/chaitin_solaris.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/decoder_solaris.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/dtraceJSDT_solaris.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/jsig.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/jvm_solaris.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/mutex_solaris.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/osThread_solaris.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/os_solaris.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/perfMemory_solaris.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/stubRoutines_solaris.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/threadCritical_solaris.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os/solaris/vm/vmError_solaris.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/os_cpu/solaris_x86/vm/vm_version_solaris_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/tools/launcher/java.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/tools/launcher/jli_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/tools/launcher/wildcard.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/adlparse.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/archDesc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/arena.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/dfa.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/dict2.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/filebuff.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/forms.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/formsopt.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/formssel.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/main.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/output_c.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/adlc/output_h.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/asm/assembler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/asm/codeBuffer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/asm/register.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_CFGPrinter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Canonicalizer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Compilation.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Compiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Defs.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_FrameMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_GraphBuilder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_IR.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Instruction.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_LIR.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_LIRAssembler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_LIRGenerator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_LinearScan.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Optimizer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_RangeCheckElimination.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_Runtime1.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_ValueMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_ValueSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_ValueStack.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_ValueType.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/c1/c1_globals.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciBaseObject.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciCallSite.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciConstant.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciConstantPoolCache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciEnv.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciExceptionHandler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciField.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciFlags.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciInstance.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciInstanceKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMemberName.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMetadata.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMethod.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMethodBlocks.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMethodData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciMethodHandle.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciNullObject.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciObjArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciObjArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciObject.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciObjectFactory.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciReplay.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciSignature.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciStreams.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciSymbol.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciType.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciTypeArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciTypeFlow.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/ci/ciUtilities.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/altHashing.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/bytecodeAssembler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classFileError.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classFileParser.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classFileStream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classLoader.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/classLoaderData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/defaultMethods.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/dictionary.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/genericSignatures.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/javaAssertions.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/javaClasses.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/loaderConstraints.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/metadataOnStackMark.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/placeholders.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/resolutionErrors.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/stackMapFrame.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/stackMapTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/symbolTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/systemDictionary.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/verificationType.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/verifier.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/classfile/vmSymbols.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/codeBlob.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/codeCache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/compiledIC.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/compressedStream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/debugInfo.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/debugInfoRec.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/dependencies.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/exceptionHandlerTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/icBuffer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/location.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/nmethod.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/oopRecorder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/pcDesc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/relocInfo.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/scopeDesc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/stubs.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/vmreg.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/code/vtableStubs.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/abstractCompiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/compileBroker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/compileLog.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/compilerOracle.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/disassembler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/methodLiveness.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/compiler/oopMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1Log.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1_globals.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/allocationStats.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_interface/collectedHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/gc_interface/gcCause.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodeStream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodeTracer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/bytecodes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/cppInterpreter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/interpreter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/interpreterRuntime.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/invocationCounter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/linkResolver.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/oopMapCache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/rewriter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/templateInterpreter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/interpreter/templateTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/libadt/dict.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/libadt/port.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/libadt/set.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/libadt/vectset.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/allocation.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/barrierSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/binaryTreeDictionary.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/blockOffsetTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/cardTableModRefBS.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/cardTableRS.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/collectorPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/defNewGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/filemap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/freeBlockDictionary.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/freeList.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/gcLocker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/genCollectedHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/genMarkSweep.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/genRemSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/generation.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/generationSpec.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/heap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/heapInspection.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/iterator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/memRegion.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metablock.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metachunk.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metaspace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metaspaceCounters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/metaspaceShared.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/oopFactory.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/referencePolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/referenceProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/resourceArea.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/sharedHeap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/space.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/specialized_oop_closures.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/tenuredGeneration.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/memory/universe.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/annotations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/arrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/arrayOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/compiledICHolder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/constMethod.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/constantPool.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/cpCache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/generateOopMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceClassLoaderKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceMirrorKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/instanceRefKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/klass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/klassVtable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/markOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/metadata.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/method.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/methodData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/objArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/objArrayOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/oop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/oopsHierarchy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/symbol.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/typeArrayKlass.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/oops/typeArrayOop.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/addnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/block.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/buildOopMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/bytecodeInfo.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/c2_globals.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/c2compiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/callGenerator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/callnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/cfgnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/chaitin.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/classes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/coalesce.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/compile.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/connode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/divnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/doCall.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/domgraph.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/escape.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/gcm.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/generateOptoStub.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/graphKit.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/idealGraphPrinter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/idealKit.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/ifg.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/ifnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/indexSet.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/lcm.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/library_call.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/live.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/locknode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopPredicate.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopTransform.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopUnswitch.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/loopopts.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/machnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/macro.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/matcher.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/memnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/mulnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/multnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/node.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/opcodes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/adlc</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ASSERT</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/output.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/parse1.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/parse2.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/parse3.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/parseHelper.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/phase.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/phaseX.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/postaloc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/reg_split.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/regalloc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/regmask.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/rootnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/runtime.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/split_if.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/stringopts.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/subnode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/superword.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/type.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/opto/vectornode.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/evmCompat.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/forte.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jni.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jniCheck.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jniFastGetField.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvm.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiEnv.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiEnvBase.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiEventController.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiExport.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiExtensions.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiImpl.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiRawMonitor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiTagMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiThreadState.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiTrace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/jvmtiUtil.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/methodComparator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/methodHandles.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/nativeLookup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/perf.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/privilegedStack.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/unsafe.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/wbtestmethods/parserTests.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/prims/whitebox.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/aprofiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/arguments.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/atomic.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/basicLock.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/biasedLocking.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/compilationPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/deoptimization.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/dtraceJSDT.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/fieldDescriptor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/fieldType.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/fprofiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/frame.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/globals.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/handles.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/icache.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/init.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/interfaceSupport.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/java.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/javaCalls.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/jniHandles.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/jniPeriodicChecker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/memprofiler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/monitorChunk.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/mutex.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/mutexLocker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/objectMonitor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/orderAccess.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/os.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/osThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/park.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/perfData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/perfMemory.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/reflection.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/reflectionUtils.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/relocator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/rframe.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/safepoint.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/serviceThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/sharedRuntime.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/signature.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/stackValue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/stackValueCollection.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/statSampler.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/stubCodeGenerator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/stubRoutines.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/sweeper.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/synchronizer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/task.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/thread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/threadLocalStorage.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/timer.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/unhandledOops.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vframe.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vframeArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vframe_hp.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/virtualspace.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vmStructs.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vmThread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vm_operations.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/runtime/vm_version.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>JRE_RELEASE_VERSION="version"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../hotspot/src/share/vm/services/attachListener.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/classLoadingService.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/diagnosticArgument.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/diagnosticCommand.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/diagnosticFramework.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/dtraceAttacher.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/g1MemoryPool.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/gcNotifier.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/heapDumper.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/lowMemoryDetector.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/management.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memBaseline.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memPtr.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memRecorder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memReporter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memSnapshot.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memTrackWorker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memTracker.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memoryManager.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memoryPool.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/memoryService.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/nmtDCmd.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/psMemoryPool.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/runtimeService.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/services/threadService.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/accessFlags.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/array.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/bitMap.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/constantTag.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/copy.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/debug.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/decoder.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/decoder_elf.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/elfFile.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/elfStringTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/elfSymbolTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/errorReporter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/events.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/exceptions.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/globalDefinitions.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/growableArray.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/hashtable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/histogram.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/intHisto.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/numberSeq.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/ostream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/preserveException.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/quickSort.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/sizes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/taskqueue.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/utf8.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/vmError.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/workgroup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/xmlstream.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/make/tools/add_gnu_debuglink/add_gnu_debuglink.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/make/tools/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/back/ArrayReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/back/ArrayTypeImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ArrayTypeImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ClassLoaderReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ClassLoaderReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ClassObjectReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ClassObjectReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ClassTypeImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ClassTypeImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/EventRequestImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="EventRequestImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/FieldImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FieldImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/FrameID.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FrameID.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/MethodImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MethodImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ObjectReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ObjectReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ReferenceTypeImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ReferenceTypeImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/SDE.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SDE.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/StackFrameImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="StackFrameImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/StringReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="StringReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ThreadGroupReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThreadGroupReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/ThreadReferenceImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThreadReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/VirtualMachineImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="VirtualMachineImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/bag.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="bag.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/classTrack.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="classTrack.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/commonRef.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="commonRef.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/debugDispatch.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debugDispatch.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/debugInit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debugInit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/debugLoop.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debugLoop.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/error_messages.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="error_messages.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/eventFilter.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="eventFilter.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/eventHandler.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="eventHandler.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/eventHelper.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="eventHelper.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/inStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="inStream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/invoker.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="invoker.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/log_messages.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="log_messages.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/outStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="outStream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/standardHandlers.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="standardHandlers.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/stepControl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="stepControl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/stream.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="stream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/threadControl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="threadControl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/transport.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="transport.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/back/util.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/java.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>LIBARCH32NAME="i386"</Elem>
-            <Elem>LIBARCH64NAME="amd64"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/jli_util.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>LIBARCH32NAME="i386"</Elem>
-            <Elem>LIBARCH64NAME="amd64"</Elem>
-            <Elem>THIS_FILE="jli_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/main.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
-            <Elem>HAVE_GETHRTIME</Elem>
-            <Elem>JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", }</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>LAUNCHER_NAME="openjdk"</Elem>
-            <Elem>NEVER_ACT_AS_SERVER_CLASS_MACHINE</Elem>
-            <Elem>PROGNAME="javac"</Elem>
-            <Elem>THIS_FILE="main.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/parse_manifest.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>LIBARCH32NAME="i386"</Elem>
-            <Elem>LIBARCH64NAME="amd64"</Elem>
-            <Elem>THIS_FILE="parse_manifest.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/splashscreen_stubs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>LIBARCH32NAME="i386"</Elem>
-            <Elem>LIBARCH64NAME="amd64"</Elem>
-            <Elem>THIS_FILE="splashscreen_stubs.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/version_comp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>LIBARCH32NAME="i386"</Elem>
-            <Elem>LIBARCH64NAME="amd64"</Elem>
-            <Elem>THIS_FILE="version_comp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/bin/wildcard.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>LIBARCH32NAME="i386"</Elem>
-            <Elem>LIBARCH64NAME="amd64"</Elem>
-            <Elem>THIS_FILE="wildcard.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/agent_util/agent_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/compiledMethodLoad/compiledMethodLoad.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/gctest/gctest.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/heapTracker/heapTracker.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/heapViewer/heapViewer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/debug_malloc.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_blocks.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_blocks.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_check.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_check.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_class.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_class.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_cpu.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_cpu.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_error.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_error.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_event.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_event.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_frame.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_frame.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_init.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_init.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_io.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_io.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_ioname.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_ioname.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_listener.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_listener.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_loader.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_loader.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_monitor.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_monitor.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_object.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_object.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_reference.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_reference.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_site.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_site.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_stack.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_stack.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_string.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_string.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_table.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_table.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_tag.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_tag.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_tls.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_tls.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_trace.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_trace.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_tracker.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_tracker.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/minst/minst.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/mtrace/mtrace.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/versionCheck/versionCheck.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/waiters/Agent.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/waiters/Monitor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Monitor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/waiters/Thread.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Thread.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/demo/jvmti/waiters/waiters.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="waiters.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/EncodingSupport.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/instrument/InstrumentationImplNativeMethods.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="InstrumentationImplNativeMethods.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/InvocationAdapter.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="InvocationAdapter.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/JPLISAgent.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="JPLISAgent.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/JPLISAssert.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="JPLISAssert.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/JarFacade.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="JarFacade.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/JavaExceptions.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="JavaExceptions.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/PathCharsValidator.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PathCharsValidator.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/Reentrancy.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Reentrancy.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/instrument/Utilities.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Utilities.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>THIS_FILE="bytes.cpp"</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>THIS_FILE="coding.cpp"</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>THIS_FILE="jni.cpp"</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="main.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>THIS_FILE="unpack.cpp"</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>THIS_FILE="utils.cpp"</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>NO_ZLIB</Elem>
-            <Elem>THIS_FILE="zip.cpp"</Elem>
-            <Elem>UNPACK_JNI</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/DirectAudioDeviceProvider.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DirectAudioDeviceProvider.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiInDevice.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MidiInDevice.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiInDeviceProvider.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MidiInDeviceProvider.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiOutDevice.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MidiOutDevice.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiOutDeviceProvider.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MidiOutDeviceProvider.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/Platform.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Platform.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/PlatformMidi.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PlatformMidi.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/PortMixer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PortMixer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/PortMixerProvider.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PortMixerProvider.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/com/sun/media/sound/Utilities.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Utilities.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/check_code.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/check_format.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="check_format.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/check_version.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="check_version.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/jdk_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="jdk_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/jio.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="jio.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/jni_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="jni_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/common/verify_stub.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="verify_stub.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/io/FileInputStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/io/ObjectInputStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ObjectInputStream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/io/ObjectOutputStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ObjectOutputStream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/io/ObjectStreamClass.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ObjectStreamClass.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/io/RandomAccessFile.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="RandomAccessFile.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/io/io_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="io_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Class.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Class.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/ClassLoader.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="ClassLoader.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Compiler.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Compiler.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Double.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Double.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Float.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Float.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Object.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Object.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Package.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Package.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/ResourceBundle.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="ResourceBundle.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Runtime.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Runtime.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/SecurityManager.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="SecurityManager.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Shutdown.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Shutdown.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/StrictMath.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="StrictMath.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/String.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="String.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/System.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="System.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Thread.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Thread.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/Throwable.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Throwable.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_acos.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_asin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_asin.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_atan2.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_atan2.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_atanh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_atanh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_cosh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_cosh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_exp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_exp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_fmod.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_fmod.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_hypot.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_hypot.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_log.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_log.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_log10.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_log10.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_pow.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_pow.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_rem_pio2.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_rem_pio2.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_remainder.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_remainder.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_scalb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_scalb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_sinh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_sinh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_sqrt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_sqrt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_cos.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="k_cos.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_rem_pio2.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="k_rem_pio2.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_sin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="k_sin.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_standard.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="k_standard.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_tan.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="k_tan.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_atan.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_atan.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_cbrt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_cbrt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_ceil.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_ceil.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_copysign.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_copysign.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_cos.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_cos.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_expm1.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_expm1.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_fabs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_fabs.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_finite.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_finite.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_floor.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_floor.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_frexp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_frexp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_ilogb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_ilogb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_isnan.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_isnan.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_ldexp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_ldexp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_lib_version.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_lib_version.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_log1p.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_log1p.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_logb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_logb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_matherr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_matherr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_modf.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_modf.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_nextafter.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_nextafter.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_rint.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_rint.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_scalbn.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_scalbn.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_signgam.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_signgam.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_significand.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_significand.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_sin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_sin.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_tan.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_tan.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_tanh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="s_tanh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_acos.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_acos.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_asin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_asin.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_atan2.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_atan2.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_atanh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_atanh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_cosh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_cosh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_exp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_exp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_fmod.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_fmod.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_hypot.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_hypot.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_log.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_log.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_log10.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_log10.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_pow.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_pow.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_remainder.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_remainder.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_scalb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_scalb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_sinh.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_sinh.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_sqrt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="w_sqrt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/ref/Finalizer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/reflect/Array.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/reflect/Executable.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Executable.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/lang/reflect/Proxy.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Proxy.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/net/DatagramPacket.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/net/Inet4Address.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Inet4Address.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/net/Inet6Address.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Inet6Address.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/net/InetAddress.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="InetAddress.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/net/net_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="net_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/nio/Bits.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/security/AccessController.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/util/TimeZone.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="TimeZone.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/concurrent/atomic/AtomicLong.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/Adler32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Adler32.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>DEBUG</Elem>
-          </undefinedList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/CRC32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="CRC32.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>DEBUG</Elem>
-          </undefinedList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/Deflater.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Deflater.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>DEBUG</Elem>
-          </undefinedList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/Inflater.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Inflater.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>DEBUG</Elem>
-          </undefinedList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/ZipFile.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="ZipFile.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>DEBUG</Elem>
-          </undefinedList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zip_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="zip_util.c"</Elem>
-            <Elem>USE_MMAP</Elem>
-          </preprocessorList>
-          <undefinedList>
-            <Elem>DEBUG</Elem>
-          </undefinedList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/compress.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/deflate.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="deflate.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzclose.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gzclose.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzlib.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gzlib.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzread.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gzread.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzwrite.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gzwrite.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/infback.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="infback.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/inffast.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="inffast.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/inflate.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="inflate.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/inftrees.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="inftrees.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/trees.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="trees.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/uncompr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="uncompr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/zadler32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="zadler32.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/zcrc32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="zcrc32.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/zutil.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="zutil.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/debug/debug_assert.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/debug/debug_mem.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debug_mem.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/debug/debug_trace.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debug_trace.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/debug/debug_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debug_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/giflib/dgif_lib.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/giflib/gif_err.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gif_err.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/giflib/gifalloc.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gifalloc.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="BufImgSurfaceData.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/DataBufferNative.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="DataBufferNative.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/awt_ImageRep.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="awt_ImageRep.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/awt_parseImage.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="awt_parseImage.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/cvutils/img_colors.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/cvutils/img_globals.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="img_globals.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/dither.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="dither.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/gif/gifdecoder.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/imageInitIDs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="imageInitIDs.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcapimin.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcapistd.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jccoefct.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jccolor.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jccolor.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcdctmgr.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jchuff.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jchuff.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcinit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcinit.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcmainct.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcmarker.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcmaster.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcomapi.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcparam.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcparam.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcphuff.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcprepct.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcsample.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jcsample.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jctrans.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jctrans.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdapimin.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdapistd.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdcoefct.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdcolor.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jddctmgr.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdhuff.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdinput.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdinput.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdmainct.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdmarker.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdmaster.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdmerge.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdphuff.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdpostct.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdsample.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdsample.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jdtrans.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jerror.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jerror.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jfdctflt.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jfdctfst.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jfdctint.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jidctflt.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jidctfst.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctint.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jidctint.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctred.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jidctred.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jmemmgr.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jmemnobs.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="jpegdecoder.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jquant1.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jquant1.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jquant2.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jquant2.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jutils.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="jutils.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/png.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngerror.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngerror.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngget.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngget.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngmem.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngmem.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngpread.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngpread.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngread.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngread.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngrio.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngrio.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngrtran.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngrtran.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngrutil.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngrutil.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngset.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngset.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngtrans.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngtrans.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwio.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngwio.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwrite.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngwrite.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwtran.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngwtran.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwutil.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="pngwutil.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffineEdge.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_D64.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_BC_D64.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_BC_F32.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_S32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_BC_S32.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_D64.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_BL_D64.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_F32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_BL_F32.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_BL_S32.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_NN.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN_Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageAffine_NN_Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageClipping.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageColorTrue2Index.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv2x2_f.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvClearEdge_Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Fp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvClearEdge_Fp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvCopyEdge_Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvKernelConvert.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvKernelConvert.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvMxN.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvMxN_Fp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConvMxN_ext.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_16ext.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_16nw.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_32nw.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_8ext.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_8nw.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_D64nw.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_F32nw.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_F32nw.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_u16ext.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageConv_u16nw.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageCopy_Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageCreate.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageDivTables.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageFilters.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageLookUp_64.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageLookUp_Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageScanPoly.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageScanPoly.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_ImageUtils.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BC.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffineIndex_BC.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BL.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffineIndex_BL.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_BC.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_BC_S16.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_U16.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_BC_U16.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_BL.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_S16.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_BL_S16.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_U16.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_BL_U16.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_NN.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageAffine_NN.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageConvClearEdge.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvCopyEdge.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageConvCopyEdge.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvVersion.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageConvVersion.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv_f.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageConv_f.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageCopy.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageLookUp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageLookUp_f.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1_U8.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_c_ImageThresh1_U8.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_sys.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MLIB_NO_LIBSUNMATH</Elem>
-            <Elem>MLIB_OS64BIT</Elem>
-            <Elem>THIS_FILE="mlib_sys.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_gfx_impl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_gif.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_impl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_jpeg.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_png.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/awt/utility/rect.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/AccelGlyphCache.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/DrawGlyphList.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>/usr/include/freetype2</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS</Elem>
-            <Elem>LE_STANDALONE</Elem>
-            <Elem>THIS_FILE="DrawGlyphList.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/FontInstanceAdapter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FontInstanceAdapter.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/freetypeScaler.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>/usr/include/freetype2</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS</Elem>
-            <Elem>LE_STANDALONE</Elem>
-            <Elem>THIS_FILE="freetypeScaler.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/AnchorTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AnchorTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ArabicLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ArabicShaping.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ArabicShaping.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/CanonData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="CanonData.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/CanonShaping.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="CanonShaping.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ClassDefinitionTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ClassDefinitionTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ContextualGlyphSubstProc.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ContextualSubstSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/CoverageTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="CoverageTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="CursiveAttachmentSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/DeviceTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DeviceTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ExtensionSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/Features.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Features.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GDEFMarkFilter.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GXLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GXLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphDefinitionTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphDefinitionTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphIterator.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphIterator.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphLookupTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphLookupTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphPositionAdjustments.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphPositionAdjustments.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphPositioningTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphPositioningTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphPosnLookupProc.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphSubstLookupProc.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/GlyphSubstitutionTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GlyphSubstitutionTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/HanLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="HanLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/HangulLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="HangulLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/IndicClassTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IndicClassTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IndicLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IndicRearrangementProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/IndicReordering.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IndicReordering.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/KernTable.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="KernTable.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/KhmerLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="KhmerLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/KhmerReordering.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="KhmerReordering.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LEFontInstance.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LEFontInstance.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LEGlyphStorage.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LEInsertionList.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LEInsertionList.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LigatureSubstProc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LigatureSubstProc.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LigatureSubstSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LookupProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LookupProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/LookupTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="LookupTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/Lookups.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Lookups.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MPreFixups.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MPreFixups.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MarkArrays.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MarkArrays.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MarkToBasePosnSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MarkToLigaturePosnSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MarkToMarkPosnSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MirroredCharData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MirroredCharData.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MorphTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MorphTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MultipleSubstSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/NonContextualGlyphSubstProc.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="NonContextualGlyphSubstProc.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OpenTypeLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OpenTypeUtilities.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PairPositioningSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ScriptAndLanguage.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ScriptAndLanguageTags.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SegmentArrayProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SegmentSingleProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SegmentSingleProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ShapingTypeData.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ShapingTypeData.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SimpleArrayProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SimpleArrayProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SinglePositioningSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SingleSubstitutionSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SingleTableProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SingleTableProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/StateTableProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="StateTableProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SubstitutionLookups.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SubstitutionLookups.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SubtableProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SubtableProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SunLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ThaiLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThaiLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ThaiShaping.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThaiShaping.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ThaiStateTables.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThaiStateTables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/TibetanLayoutEngine.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="TibetanLayoutEngine.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/TibetanReordering.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="TibetanReordering.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="TrimmedArrayProcessor.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/layout/ValueRecords.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ValueRecords.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/font/sunFont.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>/usr/include/freetype2</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS</Elem>
-            <Elem>LE_STANDALONE</Elem>
-            <Elem>THIS_FILE="sunFont.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/Disposer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="Disposer.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/SurfaceData.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="SurfaceData.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/Trace.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="Trace.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmscam02.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmscgats.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmscnvrt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmserr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsgamma.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsgmt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmshalf.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmshalf.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsintrp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsio0.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsio1.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmslut.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsmd5.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsmtrx.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsnamed.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsopt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmspack.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmspcs.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsplugin.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsps2.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmssamp.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmssm.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmstypes.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsvirt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmswtpnt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="cmsxform.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/AlphaMacros.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/AlphaMath.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AlphaMath.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Any3Byte.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Any3Byte.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Any4Byte.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Any4Byte.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/AnyByte.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AnyByte.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/AnyInt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AnyInt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/AnyShort.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AnyShort.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Blit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Blit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/BlitBg.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="BlitBg.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteBinary1Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ByteBinary1Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteBinary2Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ByteBinary2Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteBinary4Bit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ByteBinary4Bit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteGray.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ByteGray.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteIndexed.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ByteIndexed.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawLine.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DrawLine.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawParallelogram.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DrawParallelogram.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawPath.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DrawPath.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawPolygons.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DrawPolygons.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawRect.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DrawRect.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/FillParallelogram.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FillParallelogram.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/FillPath.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FillPath.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/FillRect.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FillRect.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/FillSpans.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FillSpans.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/FourByteAbgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FourByteAbgr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/FourByteAbgrPre.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FourByteAbgrPre.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GraphicsPrimitiveMgr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Index12Gray.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Index12Gray.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Index8Gray.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Index8Gray.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/IntArgb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IntArgb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/IntArgbBm.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IntArgbBm.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/IntArgbPre.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IntArgbPre.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/IntBgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IntBgr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/IntRgb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IntRgb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/IntRgbx.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="IntRgbx.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/MapAccelFunc.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MapAccelFunc.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/MaskBlit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MaskBlit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/MaskFill.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MaskFill.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ProcessPath.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ProcessPath.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ScaledBlit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ScaledBlit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/ThreeByteBgr.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThreeByteBgr.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/TransformHelper.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="TransformHelper.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Ushort4444Argb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort555Rgb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Ushort555Rgb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort555Rgbx.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Ushort555Rgbx.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort565Rgb.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Ushort565Rgb.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/UshortGray.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="UshortGray.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/loops/UshortIndexed.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="UshortIndexed.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLBufImgOps.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLBufImgOps.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLContext.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLContext.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLFuncs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLFuncs.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLMaskBlit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLMaskBlit.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLMaskFill.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLMaskFill.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLPaints.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLPaints.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLRenderQueue.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLRenderer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLRenderer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLSurfaceData.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLTextRenderer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLVertexCache.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="OGLVertexCache.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="BufferedRenderPipe.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/pipe/Region.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Region.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ShapeSpanIterator.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SpanClipRenderer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/ClassLoadingImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/Flag.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Flag.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/GarbageCollectorImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GarbageCollectorImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/GcInfoBuilder.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GcInfoBuilder.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/HotSpotDiagnostic.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="HotSpotDiagnostic.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/HotspotThread.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="HotspotThread.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/MemoryImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MemoryImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/MemoryManagerImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MemoryManagerImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/MemoryPoolImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MemoryPoolImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/ThreadImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ThreadImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/VMManagementImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="VMManagementImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/management/management.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="management.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/GC.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/MessageUtils.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="MessageUtils.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/NativeSignalHandler.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="NativeSignalHandler.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/Signal.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Signal.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/VM.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="VM.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/VMSupport.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="VMSupport.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/misc/Version.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Version.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/reflect/ConstantPool.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/reflect/NativeAccessors.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="NativeAccessors.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/reflect/Reflection.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Reflection.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/ECC_JNI.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_163.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ec2_163.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_193.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ec2_193.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_233.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ec2_233.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_aff.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ec2_aff.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_mont.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ec2_mont.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec_naf.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ec_naf.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecdecode.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecdecode.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl_curve.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecl_curve.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl_gf.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecl_gf.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl_mult.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecl_mult.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_192.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_192.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_224.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_224.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_256.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_256.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_384.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_384.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_521.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_521.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_aff.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_aff.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_jac.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_jac.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_jm.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_jm.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_mont.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_mont.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/mp_gf2m.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="mp_gf2m.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/mpi.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="mpi.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/mplogic.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="mplogic.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/mpmontg.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="mpmontg.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/oid.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="oid.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/ec/impl/secitem.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="secitem.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/jgss/wrapper/NativeUtil.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="NativeUtil.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/j2secmod.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="j2secmod.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_crypt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_digest.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_dual.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_general.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_keymgmt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_mutex.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_objmgmt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_sessmgmt.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_sign.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_util.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/native/sun/security/smartcardio/pcsc.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/native/sun/tracing/dtrace/JVM.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/npt/npt.c" ex="false" tool="0" flavor2="0">
-      </item>
-      <item path="../../jdk/src/share/npt/utf.c" ex="false" tool="0" flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="utf.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/share/transport/socket/socketTransport.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/back/exec_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/back/linker_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="linker_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/bin/ergo.c" ex="false" tool="0" flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/bin/ergo_i586.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ergo_i586.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/bin/java_md_common.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="java_md_common.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/bin/java_md_solinux.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="java_md_solinux.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/demo/jni/Poller/Poller.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/demo/jvmti/hprof/hprof_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/instrument/EncodingSupport_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/instrument/FileSystemSupport_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileSystemSupport_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/management/SolarisOperatingSystem.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="UnixOperatingSystem_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Ports.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PLATFORM_API_SolarisOS_Ports.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PLATFORM_API_SolarisOS_Utils.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/security/auth/module/Solaris.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/com/sun/security/auth/module/Unix.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Unix.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/common/jdk_util_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/common/jni_util_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="jni_util_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/Console_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/FileDescriptor_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileDescriptor_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/FileInputStream_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileInputStream_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/FileOutputStream_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileOutputStream_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/RandomAccessFile_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="RandomAccessFile_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/UnixFileSystem_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="UnixFileSystem_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/canonicalize_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="canonicalize_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/io/io_util_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="io_util_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/java/lang/UNIXProcess_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="UNIXProcess_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/lang/java_props_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="java_props_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/Inet4AddressImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/Inet6AddressImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="Inet6AddressImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/InetAddressImplFactory.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="InetAddressImplFactory.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/NetworkInterface.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="NetworkInterface.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PlainDatagramSocketImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/PlainSocketImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="PlainSocketImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/SocketInputStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SocketInputStream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/SocketOutputStream.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SocketOutputStream.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/net/net_util_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="net_util_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/nio/MappedByteBuffer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/java/util/FileSystemPreferences.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/java/util/TimeZone_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="TimeZone_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/java/util/logging.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="logging.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/CUPSfuncs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="CUPSfuncs.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/HeadlessToolkit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS=true</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="HeadlessToolkit.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/VDrawingArea.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS=true</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="VDrawingArea.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/X11Color.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="X11Color.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_AWTEvent.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_AWTEvent.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_DrawingSurface.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_Event.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_Event.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_Font.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_Font.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_GraphicsEnv.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_InputMethod.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_InputMethod.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_Insets.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_Insets.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="awt_LoadLibrary.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_Mlib.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="awt_Mlib.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_Plugin.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_Plugin.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_Robot.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_Robot.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_UNIXToolkit.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/awt_util.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="awt_util.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/fontpath.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="fontpath.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/gtk2_interface.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="gtk2_interface.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/initIDs.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="initIDs.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/jawt.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="jawt.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/list.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="list.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/multiVis.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="multiVis.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/multi_font.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="multi_font.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/robot_common.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="robot_common.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="sun_awt_X11_GtkFileDialogPeer.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/swing_GTKEngine.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="swing_GTKEngine.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/awt/swing_GTKStyle.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="swing_GTKStyle.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/font/X11FontScaler.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/font/X11TextRenderer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11TextRenderer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GLXSurfaceData.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11PMBlitLoops.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11Renderer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11SurfaceData.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11TextRenderer_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="XRBackendNative.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="XRSurfaceData.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/management/FileSystemImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/net/sdp/SdpSupport.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="DevPollArrayWrapper.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/FileKey.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="FileKey.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/IOUtil.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="IOUtil.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/InheritedChannel.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="InheritedChannel.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/NativeThread.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="NativeThread.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/Net.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Net.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/PollArrayWrapper.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/SocketDispatcher.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="SocketDispatcher.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/SolarisEventPort.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="SolarisEventPort.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SctpNet.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/ch/sctp/SctpServerChannelImpl.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SctpServerChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="SolarisNativeDispatcher.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/SolarisWatchService.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="SolarisWatchService.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="UnixCopyFile.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="UnixNativeDispatcher.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="genSolarisConstants.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="genUnixConstants.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="j2secmod_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/tools/attach/SolarisVirtualMachine.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/xawt/XToolkit.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/xawt/XWindow.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="XWindow.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/xawt/XlibWrapper.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="XlibWrapper.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/xawt/awt_Desktop.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="awt_Desktop.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/native/sun/xawt/gnome_interface.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="gnome_interface.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </item>
-      <item path="../../jdk/src/solaris/npt/utf_md.c" ex="false" tool="0" flavor2="0">
-      </item>
-      <item path="../../jdk/src/solaris/transport/socket/socket_md.c"
-            ex="false"
-            tool="0"
-            flavor2="0">
-      </item>
-      <folder path="$SRC/build">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>__sparcv9</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <undefinedList>
-            <Elem>__EXCEPTIONS</Elem>
-            <Elem>__GXX_RTTI</Elem>
-          </undefinedList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/solaris/vm</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>COMPILER1</Elem>
-            <Elem>COMPILER2</Elem>
-            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>SPARC_WORKS</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_sparcWorks</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_solaris</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_Crun_inline_placement</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>TIERED</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot">
-        <cTool>
-          <preprocessorList>
-            <Elem>_GNU_SOURCE</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <undefinedList>
-            <Elem>__EXCEPTIONS</Elem>
-            <Elem>__GXX_RTTI</Elem>
-          </undefinedList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/agent">
-        <cTool>
-          <incDir>
-            <pElem>../../hotspot/agent/src/os/solaris/proc</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>${IDE_ALT_BOOTDIR}/include</pElem>
-            <pElem>${IDE_ALT_BOOTDIR}/include/solaris</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>SOLARIS_11_B159_OR_LATER</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/agent/src/os/solaris/proc</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>${IDE_ALT_BOOTDIR}/include</pElem>
-            <pElem>${IDE_ALT_BOOTDIR}/include/solaris</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>SOLARIS_11_B159_OR_LATER</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/agent/src/os">
-        <cTool>
-          <incDir>
-            <pElem>${IDE_ALT_BOOTDIR}/include/linux</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/cpu">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/solaris/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>COMPILER1</Elem>
-            <Elem>COMPILER2</Elem>
-            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>SPARC_WORKS</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_sparcWorks</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_solaris</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_Crun_inline_placement</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os/linux">
-        <cTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>_REENTRANT</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>LINUX</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_REENTRANT</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os/posix">
-        <cTool>
-          <incDir>
-            <pElem>../../hotspot/src/os/posix/launcher</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/tools/launcher</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/solaris/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
-            <Elem>GAMMA</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>LAUNCHER_TYPE="gamma"</Elem>
-            <Elem>LINK_INTO_LIBJVM</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>SPARC_WORKS</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_sparcWorks</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_solaris</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/solaris/vm</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>COMPILER1</Elem>
-            <Elem>COMPILER2</Elem>
-            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>SPARC_WORKS</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_sparcWorks</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_solaris</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_Crun_inline_placement</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os/solaris">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os/solaris/dtrace">
-        <cTool>
-          <preprocessorList>
-            <Elem>TIERED</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os/solaris/vm">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/solaris/vm</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>COMPILER1</Elem>
-            <Elem>COMPILER2</Elem>
-            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>SPARC_WORKS</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_sparcWorks</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_solaris</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_Crun_inline_placement</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os_cpu">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/solaris/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>COMPILER1</Elem>
-            <Elem>COMPILER2</Elem>
-            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>SPARC_WORKS</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_sparcWorks</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_solaris</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_Crun_inline_placement</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/os_cpu/linux_x86">
-        <ccTool>
-          <preprocessorList>
-            <Elem>LINUX</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share">
-        <cTool>
-          <incDir>
-            <pElem>../../hotspot/src/os/posix/launcher</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/tools/launcher</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/solaris/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
-            <Elem>GAMMA</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>LAUNCHER_TYPE="gamma"</Elem>
-            <Elem>LINK_INTO_LIBJVM</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>SPARC_WORKS</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_sparcWorks</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_solaris</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/solaris/vm</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>AMD64</Elem>
-            <Elem>COMPILER1</Elem>
-            <Elem>COMPILER2</Elem>
-            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>SPARC_WORKS</Elem>
-            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
-            <Elem>TARGET_ARCH_x86</Elem>
-            <Elem>TARGET_COMPILER_sparcWorks</Elem>
-            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
-            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
-            <Elem>TARGET_OS_FAMILY_solaris</Elem>
-            <Elem>_Crun_inline_placement</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/adlc">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/adlc</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ASSERT</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/asm">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/c1">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/ci">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/classfile">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/code">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/compiler">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/gc_implementation">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/gc_interface">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/interpreter">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/libadt">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/memory">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/oops">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/precompiled">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
-            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
-            <pElem>../../hotspot/src/os/linux/vm</pElem>
-            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>LINUX</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-            <Elem>_GNU_SOURCE</Elem>
-            <Elem>_LP64=1</Elem>
-            <Elem>_REENTRANT</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/prims">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/runtime">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/services">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/hotspot/src/share/vm/utilities">
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DTRACE_ENABLED</Elem>
-            <Elem>HAVE_DTRACE_H</Elem>
-            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
-            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
-            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
-            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>INCLUDE_TRACE</Elem>
-            <Elem>PRODUCT</Elem>
-            <Elem>VM_LITTLE_ENDIAN</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="add_gnu_debuglink.c"</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>CC_NOEX</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="Agent.cpp"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/make">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/make/tools/fix_empty_sec_hdr_flags">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="fix_empty_sec_hdr_flags.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="ArrayReferenceImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/back">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/transport/export</pElem>
-            <pElem>../../jdk/src/share/back/export</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/src/solaris/back</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>JDWP_LOGGING</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/bin">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>LIBARCHNAME="amd64"</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="java.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="agent_util.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/agent_util">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/compiledMethodLoad">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/gctest">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="gctest.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/heapTracker">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="heapTracker.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/heapViewer">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="heapViewer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/hprof">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="debug_malloc.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/java_crw_demo">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
-            <pElem>../../jdk/src/solaris/demo/jvmti/hprof</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="java_crw_demo.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/minst">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="minst.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/mtrace">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="mtrace.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/demo/jvmti/versionCheck">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="versionCheck.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/instrument">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/instrument</pElem>
-            <pElem>../../jdk/src/solaris/instrument</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>NO_JPLIS_LOGGING</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="EncodingSupport.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DirectAudioDevice.c"</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="bands.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/com">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>EXTRA_SOUND_JNI_LIBS=""</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-            <Elem>X_ARCH=X_AMD64</Elem>
-            <Elem>X_PLATFORM=X_SOLARIS</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>FULL</Elem>
-            <Elem>PRODUCT</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/common">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="check_code.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java">
-        <cTool>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="FileInputStream.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/io">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/lang">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="e_acos.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/lang/fdlibm">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/lang/ref">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Finalizer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/lang/reflect">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Array.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/net">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="DatagramPacket.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/nio">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="Bits.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/security">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="AccessController.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/util">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="AtomicLong.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/util/concurrent">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/util/zip">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="compress.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/java/util/zip/zlib-1.2.5">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="debug_assert.c"</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="AlternateSubstSubtables.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt">
-        <cTool>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/debug">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/giflib">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="dgif_lib.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/image">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="img_colors.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/image/cvutils">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/image/gif">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="gifdecoder.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/image/jpeg">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="imageioJPEG.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/libpng">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="png.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/medialib">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="awt_ImagingLib.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/splashscreen">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>THIS_FILE="java_awt_SplashScreen.c"</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/awt/utility">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="rect.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/font">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="AccelGlyphCache.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>/usr/include/freetype2</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>HEADLESS</Elem>
-            <Elem>LE_STANDALONE</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="LCMS.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d/cmm">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d/loops">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="AlphaMacros.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d/opengl">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>THIS_FILE="OGLBlitLoops.c"</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/java2d/pipe">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>THIS_FILE="BufferedMaskBlit.c"</Elem>
-            <Elem>__MEDIALIB_OLD_NAMES</Elem>
-            <Elem>__USE_J2D_NAMES</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/management">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="ClassLoadingImpl.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/misc">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="GC.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/nio">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/reflect">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="ConstantPool.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="ec.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
-            <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security/ec">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
-            <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>MP_API_COMPATIBLE</Elem>
-            <Elem>NSS_ECC_MORE_THAN_SUITE_B</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security/jgss">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="GSSLibStub.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security/pkcs11">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/pkcs11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
-            <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_convert.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/security/smartcardio">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="pcsc.c"</Elem>
-            <Elem>__sun_jdk</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/native/sun/tracing">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="JVM.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/npt">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="npt.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/share/transport">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/transport/socket</pElem>
-            <pElem>../../jdk/src/solaris/transport/socket</pElem>
-            <pElem>../../jdk/src/share/back/export</pElem>
-            <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="socketTransport.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>USE_MMAP</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="exec_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/back">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/transport/export</pElem>
-            <pElem>../../jdk/src/share/back/export</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/src/solaris/back</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>JDWP_LOGGING</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/bin">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>LIBARCH32NAME="i386"</Elem>
-            <Elem>LIBARCH64NAME="amd64"</Elem>
-            <Elem>LIBARCHNAME="amd64"</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="ergo.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/demo">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="Poller.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/demo/jni">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/democlasses/jni/Poller</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/demo/jvmti">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="hprof_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/instrument">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/instrument</pElem>
-            <pElem>../../jdk/src/solaris/instrument</pElem>
-            <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>NO_JPLIS_LOGGING</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="EncodingSupport_md.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SolarisOperatingSystem.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/com">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/com/sun/management">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/com/sun/media">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>EXTRA_SOUND_JNI_LIBS=""</Elem>
-            <Elem>THIS_FILE="PLATFORM_API_SolarisOS_PCM.c"</Elem>
-            <Elem>USE_DAUDIO=TRUE</Elem>
-            <Elem>USE_PORTS=TRUE</Elem>
-            <Elem>X_ARCH=X_AMD64</Elem>
-            <Elem>X_PLATFORM=X_SOLARIS</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Solaris.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/common">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="jdk_util_md.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="Console_md.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/io">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/lang">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="ProcessEnvironment_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/net">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/nio">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/java/util">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>THIS_FILE="FileSystemPreferences.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="splashscreen_sys.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/awt">
-        <cTool>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/awt/splashscreen">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
-            <pElem>/usr/openwin/include</pElem>
-            <pElem>/usr/openwin/include/X11/extensions</pElem>
-            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>PNG_NO_MMX_CODE</Elem>
-            <Elem>SPLASHSCREEN</Elem>
-            <Elem>WITH_X11</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/font">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>/usr/include/freetype2</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>HEADLESS</Elem>
-            <Elem>LE_STANDALONE</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="X11FontScaler.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/java2d">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="GLXGraphicsConfig.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/java2d/x11">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="X11FontScaler_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/management">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/net">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/net/sdp">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SdpSupport.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/net/spi">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="DefaultProxySelector.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/nio">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="SctpChannelImpl.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/nio/ch">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/nio/ch/sctp">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/nio/ch/sctp</pElem>
-            <pElem>../../jdk/src/share/native/java/net</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
-            <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/nio/fs">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="GnomeFileTypeDetector.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/security">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="NativeFunc.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/security/jgss">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/security/pkcs11">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/pkcs11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
-            <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_md.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/security/smartcardio">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>THIS_FILE="pcsc_md.c"</Elem>
-            <Elem>__sun_jdk</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/tools">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="SolarisVirtualMachine.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/tracing">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/util">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/io</pElem>
-            <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/src/share/native/java/nio</pElem>
-            <pElem>../../jdk/src/share/native/java/security</pElem>
-            <pElem>../../jdk/src/share/native/sun/misc</pElem>
-            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
-            <pElem>../../jdk/src/share/native/java/util</pElem>
-            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
-            <pElem>../../jdk/src/solaris/native/java/util</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
-            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="HostLocaleProviderAdapter_md.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/native/sun/xawt">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
-            <pElem>../../jdk/src/share/native/sun/font</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
-            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
-            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
-            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>FUNCPROTO=15</Elem>
-            <Elem>INTERNAL_BUILD</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>PACKAGE_PATH="/opt/local"</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="XToolkit.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>X11_PATH="/usr/X11R6"</Elem>
-            <Elem>XAWT</Elem>
-            <Elem>XAWT_HACK</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/npt">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/npt</pElem>
-            <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="utf_md.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="$SRC/jdk/src/solaris/transport">
-        <cTool>
-          <incDir>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
-            <pElem>../../jdk/src/share/javavm/export</pElem>
-            <pElem>../../jdk/src/solaris/javavm/export</pElem>
-            <pElem>../../jdk/src/share/native/common</pElem>
-            <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/src/share/transport/socket</pElem>
-            <pElem>../../jdk/src/solaris/transport/socket</pElem>
-            <pElem>../../jdk/src/share/back/export</pElem>
-            <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>ARCH="amd64"</Elem>
-            <Elem>BREAKPTS</Elem>
-            <Elem>MACRO_MEMSYS_OPS</Elem>
-            <Elem>NDEBUG</Elem>
-            <Elem>RELEASE=""</Elem>
-            <Elem>SOLARIS</Elem>
-            <Elem>THIS_FILE="socket_md.c"</Elem>
-            <Elem>TRACING</Elem>
-            <Elem>TRIMMED</Elem>
-            <Elem>USE_MMAP</Elem>
-            <Elem>_LITTLE_ENDIAN=</Elem>
-            <Elem>__solaris__</Elem>
-            <Elem>amd64</Elem>
-            <Elem>cpuIntel</Elem>
-            <Elem>i586</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-    </conf>
-  </confs>
-</configurationDescriptor>
diff --git a/common/nb_native/nbproject/project.xml b/common/nb_native/nbproject/project.xml
deleted file mode 100644
index 0f248c7..0000000
--- a/common/nb_native/nbproject/project.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.cnd.makeproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/make-project/1">
-            <name>OpenJDK (Native)</name>
-            <c-extensions>c,m</c-extensions>
-            <cpp-extensions>cc,cpp</cpp-extensions>
-            <header-extensions>ad,h,hpp,in_out</header-extensions>
-            <sourceEncoding>UTF-8</sourceEncoding>
-            <make-dep-projects/>
-            <sourceRootList>
-                <sourceRootElem>../..</sourceRootElem>
-            </sourceRootList>
-            <confList>
-                <confElem>
-                    <name>Mac_64</name>
-                    <type>0</type>
-                </confElem>
-                <confElem>
-                    <name>Linux_64</name>
-                    <type>0</type>
-                </confElem>
-                <confElem>
-                    <name>Solaris_64</name>
-                    <type>0</type>
-                </confElem>
-            </confList>
-        </data>
-    </configuration>
-</project>
diff --git a/common/src/fixpath.c b/common/src/fixpath.c
deleted file mode 100644
index a85bf4c..0000000
--- a/common/src/fixpath.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 2011, 2012, 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.
- */
-
-#include <Windows.h>
-#include <io.h>
-#include <stdio.h>
-#include <string.h>
-#include <malloc.h>
-
-void report_error()
-{
-  LPVOID lpMsgBuf;
-  DWORD dw = GetLastError();
-
-  FormatMessage(
-      FORMAT_MESSAGE_ALLOCATE_BUFFER |
-      FORMAT_MESSAGE_FROM_SYSTEM |
-      FORMAT_MESSAGE_IGNORE_INSERTS,
-      NULL,
-      dw,
-      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-      (LPTSTR) &lpMsgBuf,
-      0,
-      NULL);
-
-  fprintf(stderr,
-          "Could not start process!  Failed with error %d: %s\n",
-          dw, lpMsgBuf);
-
-  LocalFree(lpMsgBuf);
-}
-
-/*
- * Test if pos points to /cygdrive/_/ where _ can
- * be any character.
- */
-int is_cygdrive_here(int pos, char *in, int len)
-{
-  // Length of /cygdrive/c/ is 12
-  if (pos+12 > len) return 0;
-  if (in[pos+11]=='/' &&
-      in[pos+9]=='/' &&
-      in[pos+8]=='e' &&
-      in[pos+7]=='v' &&
-      in[pos+6]=='i' &&
-      in[pos+5]=='r' &&
-      in[pos+4]=='d' &&
-      in[pos+3]=='g' &&
-      in[pos+2]=='y' &&
-      in[pos+1]=='c' &&
-      in[pos+0]=='/') {
-    return 1;
-  }
-  return 0;
-}
-
-/*
- * Replace /cygdrive/_/ with _:/
- * Works in place since drive letter is always
- * shorter than /cygdrive/
- */
-char *replace_cygdrive_cygwin(char *in)
-{
-  int len = strlen(in);
-  char *out = malloc(len+1);
-  int i,j;
-
-  if (len < 12) {
-    strcpy(out, in);
-    return out;
-  }
-  for (i = 0, j = 0; i<len;) {
-    if (is_cygdrive_here(i, in, len)) {
-      out[j++] = in[i+10];
-      out[j++] = ':';
-      i+=11;
-    } else {
-      out[j] = in[i];
-      i++;
-      j++;
-    }
-  }
-  out[j] = 0;
-  return out;
-}
-
-void append(char **b, size_t *bl, size_t *u, char *add, size_t addlen)
-{
-  while ( (addlen+*u+1) > *bl) {
-    *bl *= 2;
-    *b = realloc(*b, *bl);
-  }
-  memcpy(*b+*u, add, addlen);
-  *u += addlen;
-}
-
-/*
- * Creates a new string from in where the first occurance of sub is
- * replaced by rep.
- */
-char *replace_substring(char *in, char *sub, char *rep)
-{
-  int in_len = strlen(in);
-  int sub_len = strlen(sub);
-  int rep_len = strlen(rep);
-  char *out = malloc(in_len - sub_len + rep_len + 1);
-  char *p;
-
-  if (!(p = strstr(in, sub))) {
-    // If sub isn't a substring of in, just return in.
-    return in;
-  }
-
-  // Copy characters from beginning of in to start of sub.
-  strncpy(out, in, p - in);
-  out[p - in] = '\0';
-
-  sprintf(out + (p - in), "%s%s", rep, p + sub_len);
-
-  return out;
-}
-
-char* msys_path_list; // @-separated list of paths prefix to look for
-char* msys_path_list_end; // Points to last \0 in msys_path_list.
-
-void setup_msys_path_list(char* argument)
-{
-  char* p;
-  char* drive_letter_pos;
-
-  msys_path_list = strdup(&argument[2]);
-  msys_path_list_end = &msys_path_list[strlen(msys_path_list)];
-
-  // Convert all at-sign (@) in path list to \0.
-  // @ was chosen as separator to minimize risk of other tools messing around with it
-  p = msys_path_list;
-  do {
-    if (p[1] == ':') {
-      // msys has mangled our path list, restore it from c:/... to /c/...
-      drive_letter_pos = p+1;
-      *drive_letter_pos = *p;
-      *p = '/';
-    }
-
-    // Look for an @ in the list
-    p = strchr(p, '@');
-    if (p != NULL) {
-      *p = '\0';
-      p++;
-    }
-  } while (p != NULL);
-}
-
-char *replace_cygdrive_msys(char *in)
-{
-  char* str;
-  char* prefix;
-  char* p;
-
-  str = strdup(in);
-
-  // For each prefix in the path list, search for it and replace /c/... with c:/...
-  for (prefix = msys_path_list; prefix < msys_path_list_end && prefix != NULL; prefix += strlen(prefix)+1) {
-    p=str;
-    while ((p = strstr(p, prefix))) {
-      char* drive_letter = p+1;
-      *p = *drive_letter;
-      *drive_letter = ':';
-      p++;
-    }
-  }
-
-  return str;
-}
-
-char*(*replace_cygdrive)(char *in) = NULL;
-
-char *files_to_delete[1024];
-int num_files_to_delete = 0;
-
-char *fix_at_file(char *in)
-{
-  char *tmpdir;
-  char name[2048];
-  char *atname;
-  char *buffer;
-  size_t buflen=65536;
-  size_t used=0;
-  size_t len;
-  int rc;
-  FILE *atout;
-  FILE *atin;
-  char block[2048];
-  size_t blocklen;
-  char *fixed;
-
-  atin = fopen(in+1, "r");
-  if (atin == NULL) {
-    fprintf(stderr, "Could not read at file %s\n", in+1);
-    exit(-1);
-  }
-
-  tmpdir = getenv("TMP");
-  if (tmpdir == NULL) {
-    tmpdir = "c:/cygwin/tmp";
-  }
-  _snprintf(name, sizeof(name), "%s\\atfile_XXXXXX", tmpdir);
-
-  rc = _mktemp_s(name, strlen(name)+1);
-  if (rc) {
-    fprintf(stderr, "Could not create temporary file name for at file!\n");
-    exit(-1);
-  }
-
-  atout = fopen(name, "w");
-  if (atout == NULL) {
-    fprintf(stderr, "Could not open temporary file for writing! %s\n", name);
-    exit(-1);
-  }
-
-  buffer = malloc(buflen);
-  while((blocklen = fread(block,1,sizeof(block),atin)) > 0) {
-    append(&buffer, &buflen, &used, block, blocklen);
-  }
-  buffer[used] = 0;
-  if (getenv("DEBUG_FIXPATH") != NULL) {
-    fprintf(stderr, "fixpath input from @-file %s: %s\n", &in[1], buffer);
-  }
-  fixed = replace_cygdrive(buffer);
-  if (getenv("DEBUG_FIXPATH") != NULL) {
-    fprintf(stderr, "fixpath converted to @-file %s is: %s\n", name, fixed);
-  }
-  fwrite(fixed, strlen(fixed), 1, atout);
-  fclose(atin);
-  fclose(atout);
-  free(fixed);
-  free(buffer);
-  files_to_delete[num_files_to_delete] = malloc(strlen(name)+1);
-  strcpy(files_to_delete[num_files_to_delete], name);
-  num_files_to_delete++;
-  atname = malloc(strlen(name)+2);
-  atname[0] = '@';
-  strcpy(atname+1, name);
-  return atname;
-}
-
-int main(int argc, char **argv)
-{
-    STARTUPINFO si;
-    PROCESS_INFORMATION pi;
-    unsigned short rc;
-
-    char *new_at_file;
-    char *old_at_file;
-    char *line;
-    int i;
-    DWORD exitCode;
-
-    if (argc<3 || argv[1][0] != '-' || (argv[1][1] != 'c' && argv[1][1] != 'm')) {
-        fprintf(stderr, "Usage: fixpath -c|m<path@path@...> /cygdrive/c/WINDOWS/notepad.exe /cygdrive/c/x/test.txt\n");
-        exit(0);
-    }
-
-    if (getenv("DEBUG_FIXPATH") != NULL) {
-      fprintf(stderr, "fixpath input line >%s<\n", strstr(GetCommandLine(), argv[1]));
-    }
-
-    if (argv[1][1] == 'c' && argv[1][2] == '\0') {
-      if (getenv("DEBUG_FIXPATH") != NULL) {
-        fprintf(stderr, "using cygwin mode\n");
-      }
-      replace_cygdrive = replace_cygdrive_cygwin;
-    } else if (argv[1][1] == 'm') {
-      if (getenv("DEBUG_FIXPATH") != NULL) {
-        fprintf(stderr, "using msys mode, with path list: %s\n", &argv[1][2]);
-      }
-      setup_msys_path_list(argv[1]);
-      replace_cygdrive = replace_cygdrive_msys;
-    } else {
-      fprintf(stderr, "Unknown mode: %s\n", argv[1]);
-      exit(-1);
-    }
-    line = replace_cygdrive(strstr(GetCommandLine(), argv[2]));
-
-    for (i=1; i<argc; ++i) {
-       if (argv[i][0] == '@') {
-          // Found at-file! Fix it!
-          old_at_file = replace_cygdrive(argv[i]);
-          new_at_file = fix_at_file(old_at_file);
-          line = replace_substring(line, old_at_file, new_at_file);
-       }
-    }
-
-    if (getenv("DEBUG_FIXPATH") != NULL) {
-      fprintf(stderr, "fixpath converted line >%s<\n", line);
-    }
-
-    ZeroMemory(&si,sizeof(si));
-    si.cb=sizeof(si);
-    ZeroMemory(&pi,sizeof(pi));
-
-    rc = CreateProcess(NULL,
-                       line,
-                       0,
-                       0,
-                       TRUE,
-                       0,
-                       0,
-                       0,
-                       &si,
-                       &pi);
-    if(!rc) {
-      // Could not start process for some reason.  Try to report why:
-      report_error();
-      exit(rc);
-    }
-
-    WaitForSingleObject(pi.hProcess,INFINITE);
-    GetExitCodeProcess(pi.hProcess,&exitCode);
-
-    if (getenv("DEBUG_FIXPATH") != NULL) {
-      for (i=0; i<num_files_to_delete; ++i) {
-        fprintf(stderr, "Not deleting temporary fixpath file %s\n",
-                files_to_delete[i]);
-      }
-    }
-    else {
-      for (i=0; i<num_files_to_delete; ++i) {
-        remove(files_to_delete[i]);
-      }
-    }
-
-    exit(exitCode);
-}
diff --git a/configure b/configure
deleted file mode 100644
index dbb1da1..0000000
--- a/configure
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2012, 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 thin wrapper which will call the real configure script, and
-# make sure that is called using bash.
-
-this_script_dir=`dirname $0`
-bash $this_script_dir/common/autoconf/configure "$@"
diff --git a/getModules.bat b/getModules.bat
deleted file mode 100644
index fd7f387..0000000
--- a/getModules.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-call git clone git@github.com:JetBrains/jdk8u_corba.git corba
-call git clone git@github.com:JetBrains/jdk8u_hotspot.git hotspot
-call git clone git@github.com:JetBrains/jdk8u_jaxp.git jaxp
-call git clone git@github.com:JetBrains/jdk8u_jaxws.git jaxws
-call git clone git@github.com:JetBrains/jdk8u_jdk.git jdk
-call git clone git@github.com:JetBrains/jdk8u_langtools.git langtools
-call git clone git@github.com:JetBrains/jdk8u_nashorn.git nashorn
-call git clone git@github.com:JetBrains/jdk8u_jb.git jb
\ No newline at end of file
diff --git a/getModules.sh b/getModules.sh
deleted file mode 100755
index b0cedcf..0000000
--- a/getModules.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-git clone git@github.com:JetBrains/jdk8u_corba.git corba
-git clone git@github.com:JetBrains/jdk8u_hotspot.git hotspot
-git clone git@github.com:JetBrains/jdk8u_jaxp.git jaxp
-git clone git@github.com:JetBrains/jdk8u_jaxws.git jaxws
-git clone git@github.com:JetBrains/jdk8u_jdk.git jdk
-git clone git@github.com:JetBrains/jdk8u_langtools.git langtools
-git clone git@github.com:JetBrains/jdk8u_nashorn.git nashorn
-git clone git@github.com:JetBrains/jdk8u_jb.git jb
diff --git a/make/HotspotWrapper.gmk b/make/HotspotWrapper.gmk
deleted file mode 100644
index 99a2b23..0000000
--- a/make/HotspotWrapper.gmk
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-# Include the legacy hotspot-spec.gmk (which in turns includes spec.gmk)
-BASE_SPEC:=$(SPEC)
-include $(dir $(SPEC))hotspot-spec.gmk
-include MakeBase.gmk
-
-# Inclusion of this pseudo-target will cause make to execute this file
-# serially, regardless of -j. Recursively called makefiles will not be
-# affected, however. This is required for correct dependency management.
-.NOTPARALLEL:
-
-default: all
-
-# Get all files except .hg or .git in the hotspot directory.
-HOTSPOT_FILES := $(shell $(FIND) -L $(HOTSPOT_TOPDIR) -name ".hg" -o -name ".git" -prune -o -print)
-
-# The old build creates hotspot output dir before calling hotspot and
-# not doing it breaks builds on msys.
-$(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp: $(HOTSPOT_FILES)
-	@$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
-	@($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -j1 $(HOTSPOT_MAKE_ARGS) SPEC=$(HOTSPOT_SPEC) BASE_SPEC=$(BASE_SPEC))
-	$(TOUCH) $@
-
-hotspot: $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp
-
-all: hotspot
-
-.PHONY: default all hotspot
diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
deleted file mode 100644
index 296d6b4..0000000
--- a/make/Javadoc.gmk
+++ /dev/null
@@ -1,1375 +0,0 @@
-# Copyright (c) 1997, 2015, 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.
-#
-
-include $(SPEC)
-include MakeBase.gmk
-
-.SUFFIXES: # Delete the default suffixes
-.SUFFIXES: .java
-
-#
-# Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
-#
-
-DOCSDIR=$(OUTPUT_ROOT)/docs
-TEMPDIR=$(OUTPUT_ROOT)/docstemp
-
-JDK_SHARE_SRC=$(JDK_TOPDIR)/src/share
-JDK_SHARE_CLASSES=$(JDK_SHARE_SRC)/classes
-
-JDK_IMPSRC = $(JDK_OUTPUTDIR)/impsrc
-
-JDK_GENSRC = $(JDK_OUTPUTDIR)/gensrc
-
-HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs
-
-BUILD_NUMBER=$(JDK_BUILD_NUMBER)
-
-JAVADOC_CMD = $(JAVA) \
-    -Xmx1024m \
-    -Djava.awt.headless=true \
-    $(NEW_JAVADOC) \
-    -bootclasspath $(JDK_OUTPUTDIR)/classes
-
-# Copyright year for beginning of Java and some of the apis
-# (Needed when creating the javadocs)
-FIRST_COPYRIGHT_YEAR = 1993
-DOMAPI_FIRST_COPYRIGHT_YEAR = 2005
-MIRROR_FIRST_COPYRIGHT_YEAR = 2004
-DOCLETAPI_FIRST_COPYRIGHT_YEAR = 1993
-TAGLETAPI_FIRST_COPYRIGHT_YEAR = 1993
-JDI_FIRST_COPYRIGHT_YEAR = 1999
-JAAS_FIRST_COPYRIGHT_YEAR = 1998
-JGSS_FIRST_COPYRIGHT_YEAR = 2000
-SMARTCARDIO_FIRST_COPYRIGHT_YEAR = 2005
-HTTPSERVER_FIRST_COPYRIGHT_YEAR = 2005
-MGMT_FIRST_COPYRIGHT_YEAR = 2003
-ATTACH_FIRST_COPYRIGHT_YEAR = 2005
-JCONSOLE_FIRST_COPYRIGHT_YEAR = 2006
-SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
-TRACING_FIRST_COPYRIGHT_YEAR = 2008
-TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
-NASHORNAPI_FIRST_COPYRIGHT_YEAR = 2014
-JNLP_FIRST_COPYRIGHT_YEAR = 1998
-PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
-JDKNET_FIRST_COPYRIGHT_YEAR = 2014
-JACCESSAPI_FIRST_COPYRIGHT_YEAR = 2002
-
-# Oracle name
-FULL_COMPANY_NAME = Oracle and/or its affiliates
-
-# Copyright address
-COMPANY_ADDRESS = 500 Oracle Parkway<br>Redwood Shores, CA 94065 USA.
-
-# The trademark symbol
-TRADEMARK = &trade;
-
-# Common copyright lines used
-# The word "Copyright" might optionally be a link to the file cpyr.html.
-# The first year of copyright may vary or not be available.
-# The address to the company might be optional.
-COMMA:= ,
-EMPTY:=
-SPACE:=$(EMPTY) $(EMPTY)
-COPYRIGHT_SYMBOL = &\#x00a9;
-# Macro to construct the copyright line
-# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
-define CopyrightLine # optionalurl optionalfirstyear optionaladdress
-$(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \
-$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
-$(FULL_COMPANY_NAME). $3 All rights reserved.
-endef
-
-# Url to root of documents
-DOCSDIR_URL = {@docroot}/$(GET2DOCSDIR)
-
-# Url to copyright html file
-COPYRIGHT_URL = $(DOCSDIR_URL)/legal/cpyr.html
-
-# Url to bug filing site
-BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/
-
-# Common line for how to submit a bug or rfe
-BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
-
-# Url to devdocs page
-# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
-DEV_DOCS_URL-7 = https://docs.oracle.com/javase/7/docs/index.html
-DEV_DOCS_URL-8 = https://docs.oracle.com/javase/8/docs/index.html
-DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
-DOCS_BASE_URL = https://docs.oracle.com/javase/7/docs
-
-# Common Java trademark line
-JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
-$(FULL_COMPANY_NAME) in the US and other countries.
-
-#################################################################
-# Macros:
-
-
-# List of all possible directories for javadoc to look for sources
-# NOTE: Quotes are required around sourcepath argument only on Windows.
-# Otherwise, you get "No packages or classes specified." due
-# to $(PATH_SEP) being interpreted as an end of
-# command (newline or shell ; character)
-ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
-    $(JDK_IMPSRC) \
-    $(JDK_GENSRC) \
-    $(JDK_OUTPUTDIR)/gendocsrc_rmic \
-    $(JDK_TOPDIR)/src/solaris/classes \
-    $(JDK_TOPDIR)/src/windows/classes \
-    $(NASHORN_TOPDIR)/src/ \
-    $(JDK_SHARE_SRC)/doc/stub
-
-# List of directories that actually exist
-ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
-
-# List with classpath separator between them
-EMPTY:=
-SPACE:= $(EMPTY) $(EMPTY)
-RELEASEDOCS_SOURCEPATH = \
-    $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS)))
-
-define prep-target
-	$(MKDIR) -p $(@D)
-	$(RM) $@
-endef
-
-# Prep for javadoc creation, assumes $@ is an index.html file
-define prep-javadoc
-	@if [ -f "$@" -a "$?" != "" ] ; then \
-	  $(ECHO) "# Dependencies have changed: $?"; \
-	fi
-	$(RM) -r $(@D)
-	$(MKDIR) -p $(@D)
-endef
-
-# A cache of the directories in ALL_SOURCE_DIRS
-DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache
-
-# Given a list of packages, return a list of files or dirs to be dependent on
-# (Currently only returning a list of directories)
-define PackageDependencies # packages
-  $(shell \
-      if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
-        for p in $1 ; do \
-          pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
-          $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
-        done; \
-      fi \
-  )
-endef
-
-# Given a list of packages, add packages that exist to $@, print summary
-define PackageFilter # packages
-	@if [ "$1" != "" ] ; then \
-	  for p in $1 ; do \
-	    pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
-	    found="false"; \
-	    for cp in $(ALL_SOURCE_DIRS) ; do \
-	      if [ -d $${cp}/$${pd} ] ; then \
-	        $(ECHO) "$${p}" >> $@; \
-	        found="true"; \
-	        break; \
-	      fi; \
-	    done; \
-	    if [ "$${found}" = "false" ] ; then \
-	      $(ECHO) "WARNING: Package not found: $${p}"; \
-	    fi; \
-	  done; \
-	fi
-endef
-
-# Print out a summary of the javadoc command about to be run
-define JavadocSummary # optionsfile packagesfile
-	@$(ECHO) "# Summary for $@"; \
-	$(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@#   @' $1; \
-	$(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@#   @' $2
-endef
-
-#
-# Temporary directory for javadoc creation
-#
-DOCSTMPDIR = $(TEMPDIR)/doctmp
-
-#
-# Different api directories created from root directory
-#
-COREAPI_DOCSDIR = $(DOCSDIR)/api
-JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
-JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
-PLATFORM_DOCSDIR = $(DOCSDIR)/platform
-
-# The non-core api javadocs need to be able to access the root of the core
-# api directory, so for jdk/api or jre/api to get to the core api/
-# directory we would use this:
-JDKJRE2COREAPI = ../../api
-
-# Common bottom argument
-define CommonBottom # year
-<font size="-1"><br> $(call CopyrightLine,,$1,)</font>
-endef
-
-# Common trademark bottom argument (Not sure why this is used sometimes)
-define CommonTrademarkBottom # year
-<font size="-1">\
-$(BUG_SUBMIT_LINE)<br>$(JAVA_TRADEMARK_LINE)<br>\
-$(call CopyrightLine,,$1,$(COMPANY_ADDRESS))\
-</font>
-endef
-
-# Common echo of option
-define OptionOnly # opt
-	$(PRINTF) "%s\n" "$1"
-endef
-define OptionPair # opt arg
-	$(PRINTF) "%s '%s'\n" "$1" '$2'
-endef
-define OptionTrip # opt arg arg
-	$(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
-endef
-
-# Core api bottom argument (with special sauce)
-COREAPI_BOTTOM = <font size="-1"> $(BUG_SUBMIT_LINE)\
-<br>For further API reference and developer documentation, \
-see <a href="$(DEV_DOCS_URL)" target="_blank">Java SE Documentation</a>. \
-That documentation contains more detailed, developer-targeted descriptions, \
-with conceptual overviews, definitions of terms, workarounds, \
-and working code examples.<br>\
-$(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
-Use is subject to <a href="http://download.oracle.com/otndocs/jcp/java_se-8-mrel-spec/license.html">license terms</a>. \
-Also see the <a target="_blank" href="http://www.oracle.com/technetwork/java/redist-137594.html">documentation redistribution policy</a>.\
-</font>
-
-# Common javadoc options used by all
-COMMON_JAVADOCFLAGS = \
-    -XDignore.symbol.file=true \
-    -quiet \
-    -use \
-    -keywords \
-    -Xdoclint:none \
-    -Xprofilespath $(JDK_TOPDIR)/make/profile-rtjar-includes.txt \
-    $(ADDITIONAL_JAVADOCFLAGS)
-
-ifdef OPENJDK
-  ADDITIONAL_JAVADOCFLAGS = \
-      -Xdocrootparent $(DOCS_BASE_URL)
-else
-  ADDITIONAL_JAVADOCFLAGS =
-endif
-
-# Draft used for non-fcs documents
-DRAFT_HEADER =
-ifneq ($(MILESTONE), fcs)
-  DRAFT_HEADER = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong>
-  DRAFT_BOTTOM = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong>
-  DRAFT_WINTITLE = $(BUILD_NUMBER)
-  # Early access top text (not used in FCS releases)
-  COREAPI_TOP_EARLYACCESS = \
-<div style="background-color: \#EEEEEE"> \
-<div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
-margin-left: 6px; margin-right: 6px; text-align: justify; \
-font-size: 80%; font-family: Helvetica, Arial, sans-serif; \
-font-weight: normal;"> \
-Please note that the specifications and other information \
-contained herein are not final and are subject to change. \
-The information is being made available to you solely for purpose of \
-evaluation. \
-</div> </div>
-
-endif
-
-#################################################################
-
-#
-# CORE_PKGS environment variable has been moved to the following file
-#
-include CORE_PKGS.gmk
-
-#
-# Load environment variables for API package names that are not part of
-# the Java SE platform
-#
-include NON_CORE_PKGS.gmk
-
-#################################################################
-
-#
-# Load custom Javadoc rules, if present
-#
--include $(CUSTOM_MAKE_DIR)/Javadoc.gmk
-
-#################################################################
-
-#
-# Default target is same as docs target, create core api and all others it can
-#
-
-all: docs
-docs: coredocs otherdocs
-
-#################################################################
-# Production Targets -- USE THESE TARGETS WHEN:
-# a) You're generating docs outside of release engineering's
-#    standard control build.
-# b) The docs will be pushed to the web and/or included in
-#    the downloaded doc bundle.
-#
-# See: Notes.html#releaseTargets
-# Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!)
-#
-
-sanitycheckcoredocs:
-	@$(ECHO) ""
-	@$(ECHO) "Building core api docs with these values:"
-	@$(ECHO) "    BUILD_NUMBER = $(BUILD_NUMBER)"
-	@$(ECHO) "    MILESTONE = $(MILESTONE)"
-	@$(ECHO) ""
-        ifeq ($(BUILD_NUMBER), b00)
-	  @$(ECHO) "ERROR: Build number must be defined"
-	  @$(ECHO) "MILESTONE is set to $(MILESTONE)"
-	  @$(ECHO) ""
-	  exit 1
-        endif
-
-#############################################################
-#
-# coredocs
-#
-COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
-$(JDK_MINOR_VERSION)<br>API Specification
-COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
-COREAPI_HEADER = \
-<strong>Java$(TRADEMARK)&nbsp;Platform<br>Standard&nbsp;Ed.&nbsp;$(JDK_MINOR_VERSION)</strong>
-
-# Java language specification cite
-TAG_JLS = jls:a:See <cite> \
-The Java&trade; Language Specification</cite>:
-
-# Overview file for core apis
-COREAPI_OVERVIEW = $(JDK_SHARE_CLASSES)/overview-core.html
-
-# The index.html, options, and packages files
-COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
-COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
-COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
-
-coredocs: $(COREAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(COREAPI_INDEX_FILE): GET2DOCSDIR=..
-
-# Run javadoc if the index file is out of date or missing
-$(COREAPI_INDEX_FILE): $(COREAPI_OPTIONS_FILE) $(COREAPI_PACKAGES_FILE)
-	$(prep-javadoc)
-	$(call JavadocSummary,$(COREAPI_OPTIONS_FILE),$(COREAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ISO-8859-1) ; \
-	  $(call OptionPair,-tag,beaninfo:X) ; \
-	  $(call OptionPair,-tag,revised:X) ; \
-	  $(call OptionPair,-tag,since.unbundled:X) ; \
-	  $(call OptionPair,-tag,spec:X) ; \
-	  $(call OptionPair,-tag,specdefault:X) ; \
-	  $(call OptionPair,-tag,Note:X) ; \
-	  $(call OptionPair,-tag,ToDo:X) ; \
-	  $(call OptionPair,-tag,apiNote:a:API Note:) ; \
-	  $(call OptionPair,-tag,implSpec:a:Implementation Requirements:) ; \
-	  $(call OptionPair,-tag,implNote:a:Implementation Note:) ; \
-	  $(call OptionPair,-tag,param) ; \
-	  $(call OptionPair,-tag,return) ; \
-	  $(call OptionPair,-tag,throws) ; \
-	  $(call OptionPair,-tag,since) ; \
-	  $(call OptionPair,-tag,version) ; \
-	  $(call OptionPair,-tag,serialData) ; \
-	  $(call OptionPair,-tag,factory) ; \
-	  $(call OptionPair,-tag,see) ; \
-	  $(call OptionPair,-tag,$(TAG_JLS)) ; \
-	  $(call OptionOnly,-splitIndex) ; \
-	  $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ; \
-	  $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	) >> $@
-        ifdef COREAPI_TOP_EARLYACCESS
-	  @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
-        endif
-
-# Create a file with the package names in it
-$(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(CORE_PKGS))
-
-#############################################################
-#
-# docletapidocs
-#
-
-ALL_OTHER_TARGETS += docletapidocs
-
-DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet
-DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-DOCLETAPI_DOCTITLE := Doclet API
-DOCLETAPI_WINDOWTITLE := Doclet API
-DOCLETAPI_HEADER := <strong>Doclet API</strong>
-DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
-DOCLETAPI_GROUPNAME := Packages
-DOCLETAPI_REGEXP := com.sun.javadoc
-# DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html
-DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options
-DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/docletapi.packages
-
-docletapidocs: $(DOCLETAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(DOCLETAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(DOCLETAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-breakiterator) ; \
-	  $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \
-	  $(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(DOCLETAPI_PKGS))
-
-#############################################################
-#
-# tagletapidocs
-#
-
-ALL_OTHER_TARGETS += tagletapidocs
-TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
-TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
-# TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
-
-# Temporary directory (special generation rules)
-TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
-
-# The index.html, options, and packages files
-TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
-TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
-TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
-
-tagletapidocs: $(TAGLETAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(RM) -r $(TAGLETAPI_TEMPDIR)
-	$(MKDIR) -p $(TAGLETAPI_TEMPDIR)
-	$(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \
-	    @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
-	cp -r $(TAGLETAPI_TEMPDIR)/com $(@D)
-	cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D)
-	$(RM) -r $(TAGLETAPI_TEMPDIR)
-
-# Create file with javadoc options in it
-$(TAGLETAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nonavbar) ; \
-	  $(call OptionOnly,-noindex) ; \
-	  $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(TAGLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TAGLETAPI_PKGS))
-	$(prep-target)
-	@($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@
-
-#############################################################
-#
-# domapidocs
-#
-
-ALL_OTHER_TARGETS += domapidocs
-
-DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom
-DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-DOMAPI_DOCTITLE := Common DOM API
-DOMAPI_WINDOWTITLE := Common DOM API
-DOMAPI_HEADER := <strong>Common DOM API</strong>
-DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
-DOMAPI_GROUPNAME := Packages
-DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
-# DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html
-DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options
-DOMAPI_PACKAGES_FILE = $(DOCSTMPDIR)/domapi.packages
-
-domapidocs: $(DOMAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(DOMAPI_INDEX_FILE): GET2DOCSDIR=$(DOMAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(DOMAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-splitIndex) ; \
-	  $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \
-	  $(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(DOMAPI_PKGS))
-
-#############################################################
-#
-# jpdadocs
-#
-
-ALL_OTHER_TARGETS += jpdadocs
-
-jpdadocs: jdidocs jdwpdocs jvmtidocs
-
-#############################################################
-#
-# jdidocs
-#
-
-ALL_OTHER_TARGETS += jdidocs
-
-JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi
-JDI2COREAPI := ../../$(JDKJRE2COREAPI)
-JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
-JDI_WINDOWTITLE := Java Debug Interface
-JDI_HEADER := <strong>Java Debug Interface</strong>
-JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
-JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html
-# JDI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html
-JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options
-JDI_PACKAGES_FILE = $(DOCSTMPDIR)/jdi.packages
-
-jdidocs: $(JDI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JDI_INDEX_FILE): GET2DOCSDIR=$(JDI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JDI_PKGS))
-
-#############################################################
-#
-# jdwpdocs
-#
-
-ALL_OTHER_TARGETS += jdwpdocs
-
-JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
-
-jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
-$(JDWP_DOCDIR)/jdwp-protocol.html : $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
-	$(MKDIR) -p $(@D)
-	$(RM) $@
-	$(CP) $< $@
-
-#############################################################
-#
-# jvmtidocs
-#
-
-ALL_OTHER_TARGETS += jvmtidocs
-
-JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti
-JVMTI_HTML = $(HOTSPOT_DIST)/docs/platform/jvmti/jvmti.html
-
-jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
-$(JVMTI_DOCDIR)/jvmti.html:
-	@$(prep-javadoc)
-	@if [ -f $(JVMTI_HTML) ] ; then \
-	  $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
-	  $(CP) $(JVMTI_HTML) $@; \
-	else \
-	  $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
-	fi
-
-#############################################################
-#
-# jaasdocs
-#
-
-ALL_OTHER_TARGETS += jaasdocs
-
-JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec
-JAAS2COREAPI := ../../../$(JDKJRE2COREAPI)
-JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service
-JAAS_WINDOWTITLE := Java Authentication and Authorization Service
-JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
-JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
-# JAAS_PKGS is located in NON_CORE_PKGS.gmk
-JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html
-
-# The index.html, options, and packages files
-JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
-JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options
-JAAS_PACKAGES_FILE = $(DOCSTMPDIR)/jaas.packages
-
-jaasdocs: $(JAAS_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JAAS_INDEX_FILE): GET2DOCSDIR=$(JAAS2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JAAS_PKGS))
-
-#############################################################
-#
-# jgssdocs
-#
-
-ALL_OTHER_TARGETS += jgssdocs
-
-JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec
-JGSS2COREAPI := ../../../$(JDKJRE2COREAPI)
-JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
-JGSS_WINDOWTITLE := Java GSS-API Utilities
-JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
-JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
-JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html
-# JGSS_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html
-JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options
-JGSS_PACKAGES_FILE = $(DOCSTMPDIR)/jgss.packages
-
-jgssdocs: $(JGSS_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JGSS_INDEX_FILE): GET2DOCSDIR=$(JGSS2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JGSS_PKGS))
-
-#############################################################
-#
-# smartcardiodocs
-#
-
-ALL_OTHER_TARGETS += smartcardiodocs
-
-SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec
-SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI)
-SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O
-SMARTCARDIO_WINDOWTITLE := Java Smart Card I/O
-SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong>
-SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR))
-# SMARTCARDIO_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html
-SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options
-SMARTCARDIO_PACKAGES_FILE = $(DOCSTMPDIR)/smartcardio.packages
-
-smartcardiodocs: $(SMARTCARDIO_INDEX_FILE)
-
-# Set relative location to core api document root
-$(SMARTCARDIO_INDEX_FILE): GET2DOCSDIR=$(SMARTCARDIO2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(SMARTCARDIO_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \
-	  $(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \
-	  $(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(SMARTCARDIO_PKGS))
-
-#############################################################
-#
-# httpserverdocs
-#
-
-ALL_OTHER_TARGETS += httpserverdocs
-
-HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec
-HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI)
-HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server
-HTTPSERVER_WINDOWTITLE := Java HTTP Server
-HTTPSERVER_HEADER := <strong>Java HTTP Server</strong>
-HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR))
-# HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk
-
-HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html
-HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options
-HTTPSERVER_PACKAGES_FILE = $(DOCSTMPDIR)/httpserver.packages
-
-httpserverdocs: $(HTTPSERVER_INDEX_HTML)
-
-# Set relative location to core api document root
-$(HTTPSERVER_INDEX_HTML): GET2DOCSDIR=$(HTTPSERVER2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(HTTPSERVER_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \
-	  $(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \
-	  $(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(HTTPSERVER_PKGS))
-
-#############################################################
-#
-# mgmtdocs
-#
-
-ALL_OTHER_TARGETS += mgmtdocs
-
-MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
-MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
-JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
-JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
-MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
-MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
-MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
-MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
-MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html
-# MGMT_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html
-MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options
-MGMT_PACKAGES_FILE = $(DOCSTMPDIR)/mgmt.packages
-
-mgmtdocs: $(MGMT_INDEX_FILE)
-
-# Set relative location to core api document root
-$(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	@if [ -f $(JVM_MIB_SRC) ] ; then \
-	  $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
-	  $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
-	else \
-	  $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
-	fi
-	$(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(MGMT_PKGS))
-
-#############################################################
-#
-# attachdocs
-#
-
-ALL_OTHER_TARGETS += attachdocs
-
-ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec
-ATTACH2COREAPI := ../../$(JDKJRE2COREAPI)
-ATTACH_DOCTITLE := Attach API
-ATTACH_WINDOWTITLE := Attach API
-ATTACH_HEADER := <strong>Attach API</strong>
-ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR))
-# ATTACH_PKGS is located in NON_CORE_PKGS.gmk
-
-ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html
-ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options
-ATTACH_PACKAGES_FILE = $(DOCSTMPDIR)/attach.packages
-
-attachdocs: $(ATTACH_INDEX_HTML)
-
-# Set relative location to core api document root
-$(ATTACH_INDEX_HTML): GET2DOCSDIR=$(ATTACH2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(ATTACH_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(ATTACH_PKGS))
-
-#############################################################
-#
-# jconsoledocs
-#
-
-ALL_OTHER_TARGETS += jconsoledocs
-
-JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec
-JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI)
-JCONSOLE_DOCTITLE := JConsole API
-JCONSOLE_WINDOWTITLE := JConsole API
-JCONSOLE_HEADER := <strong>JConsole API</strong>
-JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR))
-# JCONSOLE_PKGS is located in NON_CORE_PKGS.gmk
-
-JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html
-JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options
-JCONSOLE_PACKAGES_FILE = $(DOCSTMPDIR)/jconsole.packages
-
-jconsoledocs: $(JCONSOLE_INDEX_HTML)
-
-# Set relative location to core api document root
-$(JCONSOLE_INDEX_HTML): GET2DOCSDIR=$(JCONSOLE2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JCONSOLE_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JCONSOLE_PKGS))
-
-#############################################################
-#
-# treeapidocs
-#
-
-ALL_OTHER_TARGETS += treeapidocs
-
-TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree
-TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-TREEAPI_DOCTITLE := Compiler Tree API
-TREEAPI_WINDOWTITLE := Compiler Tree API
-TREEAPI_HEADER := <strong>Compiler Tree API</strong>
-TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR))
-TREEAPI_GROUPNAME := Packages
-TREEAPI_REGEXP := com.sun.source.*
-# TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html
-TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
-TREEAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
-
-treeapidocs: $(TREEAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(TREEAPI_INDEX_HTML): GET2DOCSDIR=$(TREEAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(TREEAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-tag,$(TAG_JLS)) ; \
-	  $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
-	  $(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(TREEAPI_PKGS))
-
-#############################################################
-#
-# nashornapidocs
-#
-
-ALL_OTHER_TARGETS += nashornapidocs
-
-NASHORNAPI_DOCDIR := $(JDK_API_DOCSDIR)/nashorn
-NASHORNAPI2COREAPI := ../$(JDKJRE2COREAPI)
-NASHORNAPI_DOCTITLE := Nashorn API
-NASHORNAPI_WINDOWTITLE := Nashorn API
-NASHORNAPI_HEADER := <strong>Nashorn API</strong>
-NASHORNAPI_BOTTOM := $(call CommonBottom,$(NASHORNAPI_FIRST_COPYRIGHT_YEAR))
-NASHORNAPI_GROUPNAME := Packages
-NASHORNAPI_REGEXP := jdk.nashorn.api.scripting.*
-
-# NASHORNAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-NASHORNAPI_INDEX_HTML = $(NASHORNAPI_DOCDIR)/index.html
-NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/nashornapi.options
-NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/nashornapi.packages
-
-nashornapidocs: $(NASHORNAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(NASHORNAPI_INDEX_HTML): GET2DOCSDIR=$(NASHORNAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(NASHORNAPI_INDEX_HTML): $(NASHORNAPI_OPTIONS_FILE) $(NASHORNAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(NASHORNAPI_OPTIONS_FILE),$(NASHORNAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(NASHORNAPI_OPTIONS_FILE) @$(NASHORNAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(NASHORNAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionPair,-doctitle,$(NASHORNAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(NASHORNAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(NASHORNAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-tag,$(TAG_JLS)) ; \
-	  $(call OptionPair,-bottom,$(NASHORNAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-group,$(NASHORNAPI_GROUPNAME),$(NASHORNAPI_REGEXP)); \
-	  $(call OptionTrip,-linkoffline,$(NASHORNAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(NASHORNAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(NASHORNAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(NASHORNAPI_PKGS))
-
-#############################################################
-#
-# sctpdocs
-#
-
-ALL_OTHER_TARGETS += sctpdocs
-
-SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec
-SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
-SCTPAPI_DOCTITLE := SCTP API
-SCTPAPI_WINDOWTITLE := SCTP API
-SCTPAPI_HEADER := <strong>SCTP API</strong>
-SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR))
-# SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html
-SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options
-SCTPAPI_PACKAGES_FILE = $(DOCSTMPDIR)/sctp.packages
-
-sctpdocs: $(SCTPAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(SCTPAPI_INDEX_HTML): GET2DOCSDIR=$(SCTPAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(SCTPAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(SCTPAPI_PKGS))
-
-#############################################################
-#
-# jaccessdocs - Java Accessibility Utilities
-#
-
-ALL_OTHER_TARGETS += jaccessdocs
-
-JACCESSAPI_DOCDIR := $(JRE_API_DOCSDIR)/accessibility/jaccess/spec
-JACCESSAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
-JACCESSAPI_DOCTITLE := JACCESS API
-JACCESSAPI_WINDOWTITLE := JACCESS API
-JACCESSAPI_HEADER := <strong>JACCESS API</strong>
-JACCESSAPI_BOTTOM := $(call CommonBottom,$(JACCESSAPI_FIRST_COPYRIGHT_YEAR))
-# JACCESSAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-JACCESSAPI_INDEX_HTML = $(JACCESSAPI_DOCDIR)/index.html
-JACCESSAPI_OPTIONS_FILE = $(DOCSTMPDIR)/jaccess.options
-JACCESSAPI_PACKAGES_FILE = $(DOCSTMPDIR)/jaccess.packages
-
-jaccessdocs: $(JACCESSAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(JACCESSAPI_INDEX_HTML): GET2DOCSDIR=$(JACCESSAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JACCESSAPI_INDEX_HTML): $(JACCESSAPI_OPTIONS_FILE) $(JACCESSAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JACCESSAPI_OPTIONS_FILE),$(JACCESSAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JACCESSAPI_OPTIONS_FILE) @$(JACCESSAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JACCESSAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(JACCESSAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JACCESSAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JACCESSAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JACCESSAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JACCESSAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JACCESSAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JACCESSAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JACCESSAPI_PKGS))
-
-#############################################################
-#
-# jdk.net docs
-#
-
-ALL_OTHER_TARGETS += jdknetdocs
-
-JDKNET_DOCDIR := $(JRE_API_DOCSDIR)/net/socketoptions/spec
-JDKNET2COREAPI := ../../../$(JDKJRE2COREAPI)
-JDKNET_DOCTITLE := jdk.net API
-JDKNET_WINDOWTITLE := jdk.net API
-JDKNET_HEADER := <strong>jdk.net API</strong>
-JDKNET_BOTTOM := $(call CommonBottom,$(JDKNET_FIRST_COPYRIGHT_YEAR))
-JDKNET_PKGS := jdk.net
-
-JDKNET_INDEX_HTML = $(JDKNET_DOCDIR)/index.html
-JDKNET_OPTIONS_FILE = $(DOCSTMPDIR)/jdknet.options
-JDKNET_PACKAGES_FILE = $(DOCSTMPDIR)/jdknet.packages
-
-jdknetdocs: $(JDKNET_INDEX_HTML)
-
-# Set relative location to core api document root
-$(JDKNET_INDEX_HTML): GET2DOCSDIR=$(JDKNET2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JDKNET_INDEX_HTML): $(JDKNET_OPTIONS_FILE) $(JDKNET_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JDKNET_OPTIONS_FILE),$(JDKNET_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JDKNET_OPTIONS_FILE) @$(JDKNET_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JDKNET_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionOnly,-Xdoclint:none) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(JDKNET_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JDKNET_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JDKNET_HEADER)$(DRAFT_HEADER)); \
-	  $(call OptionPair,-bottom,$(JDKNET_BOTTOM)$(DRAFT_BOTTOM)); \
-	  $(call OptionTrip,-linkoffline,$(JDKNET2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JDKNET_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDKNET_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JDKNET_PKGS))
-
-#############################################################
-#
-# Get a cache of all the directories
-
-$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
-	$(prep-target)
-	@for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
-	  $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
-	  $(FIND) $${cp} -type f >> $@; \
-	done
-
-#############################################################
-#release version of core packages ########
-
-# The rel-coredocs and rel-docs targets were added by Eric Armstrong. rel-coredocs
-# assumes the kind of large, 32-bit machine used in the javapubs group's docs-release
-# process. It specifies memory settings accordingly to maximize performance.
-#
-# The performance settings, like the sanity check, are most important for the core
-# docs--the platform APIs. Running javadoc on those APIs takes a significant amount
-# of time and memory. Setting the initial heap size as large as possible is important
-# to prevent thrashing as the heap grows. Setting the maximum as large as necessary
-# is also important to keep the job from failing.
-#
-#    -J-Xmx512 sets a maximum of 512, which became necessary in 6.0
-#    -J-Xms256 sets starting size to 256 (default is 8)
-#
-# rel-coredocs also includes a sanity check to help ensure that BUILD_NUMBER and
-# MILESTONE are specified properly when docs are built outside of the normal release
-# engineering process, with the intention of releasing them on the web or in a downloaded
-# docs bundle. (When invoked in release engineering's control build, the values are always
-# set properly. But when the targets are run by themselves, they default to b00 and
-# "internal"--which silently sabotage the result of a build that can take many hours
-# to complete.
-
-# Maximize performance and ensure that build number & milestone are set.
-
-rel-coredocs: sanitycheckcoredocs
-	$(MAKE) coredocs
-
-rel-docs: rel-coredocs $(ALL_OTHER_TARGETS)
-#
-# end of production targets
-
-otherdocs: $(ALL_OTHER_TARGETS)
-
-clean:
-	$(RM) -r $(DOCSDIR) $(DOCSTMPDIR)
-
-#############################################################
-# DEBUG TARGET
-# List the values defined in the makefile hierarchy, to make sure everything
-# is set properly, and to help identify values we can use instead of making new ones.
-# (Most of them come from common/shared/Defs.gmk)
-#
-# Notes:
-# * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value>
-# * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line
-#
-
-#############################################################
-.PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \
-    sanitycheckcoredocs $(ALL_OTHER_TARGETS)
diff --git a/make/Jprt.gmk b/make/Jprt.gmk
deleted file mode 100644
index b833f86..0000000
--- a/make/Jprt.gmk
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Copyright (c) 2012, 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.
-#
-
-# This file is contains targets utilities needed by JPRT.
-
-          ifdef ALT_BSDIFF_DIR
-	    @$(ECHO) " --with-bsdiff-dir=$(call UnixPath,$(ALT_BSDIFF_DIR)) " >> $@.tmp
-          endif
-ifndef JPRT_ARCHIVE_BUNDLE
-  JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
-endif
-ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
-  JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
-endif
-
-ifeq ($(SKIP_BOOT_CYCLE), false)
-  jprt_bundle: bootcycle-images
-endif
-
-# This target must be called in the context of a SPEC file
-jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
-	@$(call CheckIfMakeAtEnd)
-
-# This target must be called in the context of a SPEC file
-$(JPRT_ARCHIVE_BUNDLE): bundles
-	$(MKDIR) -p $(@D)
-	$(RM) $@
-	$(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
-
-SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
-SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
-SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
-SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
-
-# Bundle up the images
-bundles: all bundles-only
-bundles-only: start-make
-	@$(call TargetEnter)
-	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
-	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
-	$(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
-	if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
-	  $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
-	fi
-	@$(call TargetExit)
-
-# Copy images to one unified location regardless of platform etc.
-final-images: all final-images-only
-final-images-only: start-make
-	@$(call TargetEnter)
-	$(RM) -r $(BUILD_OUTPUT)/final-images
-	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
-	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
-	$(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/
-	$(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/
-        ifeq ($(OPENJDK_TARGET_OS),macosx)
-	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)
-	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)
-	  $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/
-	  $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/
-        endif
-	@$(call TargetExit)
-
-
-###########################################################################
-# Phony targets
-.PHONY: jprt_bundle bundles bundles-only final-images final-images-only
diff --git a/make/Main.gmk b/make/Main.gmk
deleted file mode 100644
index ecfae53..0000000
--- a/make/Main.gmk
+++ /dev/null
@@ -1,242 +0,0 @@
-#
-# Copyright (c) 2011, 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
-# 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.
-#
-
-### This is the main part of the Makefile, for the normal case with SPEC specifying a single existing spec.gmk file.
-
-# Now load the spec
-include $(SPEC)
-
-# Load the vital tools for all the makefiles.
-include $(SRC_ROOT)/make/common/MakeBase.gmk
-
-# Include the corresponding custom file, if present.
--include $(CUSTOM_MAKE_DIR)/Main.gmk
-
-### Clean up from previous run
-
-# Remove any build.log from a previous run, if they exist
-ifneq (,$(BUILD_LOG))
-  ifneq (,$(BUILD_LOG_PREVIOUS))
-    # Rotate old log
-    $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
-    $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
-  else
-    $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
-  endif
-  $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
-endif
-# Remove any javac server logs and port files. This
-# prevents a new make run to reuse the previous servers.
-ifneq (,$(SJAVAC_SERVER_DIR))
-  $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
-endif
-
-# Reset the build timers.
-$(eval $(call ResetAllTimers))
-
-# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
-# hence this workaround.
-MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
-
-### Main targets
-
-default: jdk
-	@$(call CheckIfMakeAtEnd)
-
-all: images docs
-	@$(call CheckIfMakeAtEnd)
-
-# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
-# is up to date after changes to configure
-$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
-	@$(ECHO) ERROR: $(SPEC) is not up to date
-	@$(ECHO) Please rerun configure!
-	@if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
-
-start-make: $(SPEC)
-	@$(call AtMakeStart)
-
-langtools: langtools-only
-langtools-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(LANGTOOLS_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildLangtools.gmk)
-	@$(call TargetExit)
-
-corba: langtools corba-only
-corba-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(CORBA_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildCorba.gmk)
-	@$(call TargetExit)
-
-jaxp: langtools jaxp-only
-jaxp-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JAXP_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxp.gmk)
-	@$(call TargetExit)
-
-jaxws: langtools jaxp jaxws-only
-jaxws-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JAXWS_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxws.gmk)
-	@$(call TargetExit)
-
-ifeq ($(BUILD_HOTSPOT),true)
-  hotspot: hotspot-only
-  hotspot-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
-	@$(call TargetExit)
-endif
-
-jdk: langtools hotspot corba jaxp jaxws jdk-only
-jdk-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
-	@$(call TargetExit)
-
-nashorn: jdk nashorn-only
-nashorn-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(NASHORN_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
-	@$(call TargetExit)
-
-demos: jdk demos-only
-demos-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos)
-	@$(call TargetExit)
-
-# Note: This double-colon rule is intentional, to support
-# custom make file integration.
-images:: source-tips demos nashorn images-only
-images-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
-	@$(call TargetExit)
-
-overlay-images: source-tips demos overlay-images-only
-overlay-images-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
-	@$(call TargetExit)
-
-profiles: source-tips jdk hotspot profiles-only
-profiles-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles)
-	@$(call TargetExit)
-
-install: images install-only
-install-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk install)
-	@$(call TargetExit)
-
-docs: jdk docs-only
-docs-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
-	@$(call TargetExit)
-
-sign-jars: jdk sign-jars-only
-sign-jars-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars)
-	@$(call TargetExit)
-
-bootcycle-images: images bootcycle-images-only
-bootcycle-images-only: start-make
-	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
-	@($(CD) $(SRC_ROOT) && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
-
-test: images test-only
-test-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
-	@$(call TargetExit)
-
-# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
-# used to track the exact sources used to build that image.
-source-tips: $(OUTPUT_ROOT)/source_tips
-$(OUTPUT_ROOT)/source_tips: FRC
-	@$(MKDIR) -p $(@D)
-	@$(RM) $@
-	@$(call GetSourceTips)
-
-
-# Remove everything, except the output from configure.
-clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs clean-test
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
-	@$(ECHO) Cleaned all build artifacts.
-
-# Remove everything, including configure configuration.
-# If the output directory was created by configure and now becomes empty, remove it as well.
-# FIXME: tmp should not be here, fix ResetTimers instead. And remove spec.sh!
-dist-clean: clean
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp javacservers)
-	@$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
-	  if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
-	    $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
-	  else \
-	    ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" && $(RM) -r $(OUTPUT_ROOT)) \
-	  fi \
-	)
-	@$(ECHO) Cleaned everything, you will have to re-run configure.
-
-clean-langtools:
-	$(call CleanComponent,langtools)
-clean-corba:
-	$(call CleanComponent,corba)
-clean-jaxp:
-	$(call CleanComponent,jaxp)
-clean-jaxws:
-	$(call CleanComponent,jaxws)
-clean-hotspot:
-	$(call CleanComponent,hotspot)
-clean-jdk:
-	$(call CleanComponent,jdk)
-clean-nashorn:
-	$(call CleanComponent,nashorn)
-clean-images:
-	$(call CleanComponent,images)
-clean-overlay-images:
-	$(call CleanComponent,overlay-images)
-clean-bootcycle-build:
-	$(call CleanComponent,bootcycle-build)
-clean-docs:
-	$(call CleanComponent,docs)
-	$(call CleanComponent,docstemp)
-clean-test:
-	$(call CleanComponent,testoutput)
-
-.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
-.PHONY: default all clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
-.PHONY: profiles profiles-only
-
-include $(root_dir)/make/Jprt.gmk
-
-FRC: # Force target
diff --git a/make/MakeHelpers.gmk b/make/MakeHelpers.gmk
deleted file mode 100644
index c999535..0000000
--- a/make/MakeHelpers.gmk
+++ /dev/null
@@ -1,306 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-################################################################
-#
-# This file contains helper functions for the top-level Makefile that does
-# not depend on the spec.gmk file having been read. (The purpose of this
-# file is ju to avoid cluttering the top-level Makefile.)
-#
-################################################################
-
-ifndef _MAKEHELPERS_GMK
-_MAKEHELPERS_GMK := 1
-
-##############################
-# Stuff to run at include time
-##############################
-
-# Find out which variables were passed explicitely on the make command line. These
-# will be passed on to sub-makes, overriding spec.gmk settings.
-MAKE_ARGS=$(foreach var,$(subst =command,,$(filter %=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))),$(var)=$($(var)))
-
-list_alt_overrides_with_origins=$(filter ALT_%=environment ALT_%=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))
-list_alt_overrides=$(subst =command,,$(subst =environment,,$(list_alt_overrides_with_origins)))
-
-# Store the build times in this directory.
-BUILDTIMESDIR=$(OUTPUT_ROOT)/tmp/buildtimes
-
-# Global targets are possible to run either with or without a SPEC. The prototypical
-# global target is "help".
-global_targets=help
-
-##############################
-# Functions
-##############################
-
-define CheckEnvironment
-        # Find all environment or command line variables that begin with ALT.
-	$(if $(list_alt_overrides),
-	  @$(PRINTF) "\nWARNING: You have the following ALT_ variables set:\n"
-	  @$(PRINTF) "$(foreach var,$(list_alt_overrides),$(var)=$$$(var))\n"
-	  @$(PRINTF) "ALT_ variables are deprecated and will be ignored. Please clean your environment.\n\n"
-	)
-endef
-
-### Functions for timers
-
-# Record starting time for build of a sub repository.
-define RecordStartTime
-	$(MKDIR) -p $(BUILDTIMESDIR)
-	$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$1
-	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$1_human_readable
-endef
-
-# Record ending time and calculate the difference and store it in a
-# easy to read format. Handles builds that cross midnight. Expects
-# that a build will never take 24 hours or more.
-define RecordEndTime
-	$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$1
-	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$1_human_readable
-	$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$1` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$1` $1 | \
-	    $(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
-	    M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
-	    > $(BUILDTIMESDIR)/build_time_diff_$1
-endef
-
-# Find all build_time_* files and print their contents in a list sorted
-# on the name of the sub repository.
-define ReportBuildTimes
-	$(BUILD_LOG_WRAPPER) $(PRINTF) -- "----- Build times -------\nStart %s\nEnd   %s\n%s\n%s\n-------------------------\n" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
-	    "`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | $(XARGS) $(CAT) | $(SORT) -k 2`" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`"
-endef
-
-define ResetAllTimers
-  $$(shell $(MKDIR) -p $(BUILDTIMESDIR) && $(RM) $(BUILDTIMESDIR)/build_time_*)
-endef
-
-define StartGlobalTimer
-	$(call RecordStartTime,TOTAL)
-endef
-
-define StopGlobalTimer
-	$(call RecordEndTime,TOTAL)
-endef
-
-### Functions for managing makefile structure (start/end of makefile and individual targets)
-
-# Do not indent this function, this will add whitespace at the start which the caller won't handle
-define GetRealTarget
-$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default))
-endef
-
-# Do not indent this function, this will add whitespace at the start which the caller won't handle
-define LastGoal
-$(strip $(lastword $(call GetRealTarget)))
-endef
-
-# Check if the current target is the final target, as specified by
-# the user on the command line. If so, call AtRootMakeEnd.
-define CheckIfMakeAtEnd
-        # Check if the current target is the last goal
-	$(if $(filter $@,$(call LastGoal)),$(call AtMakeEnd))
-        # If the target is 'foo-only', check if our goal was stated as 'foo'
-	$(if $(filter $@,$(call LastGoal)-only),$(call AtMakeEnd))
-endef
-
-# Hook to be called when starting to execute a top-level target
-define TargetEnter
-	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Starting $(patsubst %-only,%,$@)\n"
-	$(call RecordStartTime,$(patsubst %-only,%,$@))
-endef
-
-# Hook to be called when finish executing a top-level target
-define TargetExit
-	$(call RecordEndTime,$(patsubst %-only,%,$@))
-	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`"
-	$(call CheckIfMakeAtEnd)
-endef
-
-# Hook to be called as the very first thing when running a normal build
-define AtMakeStart
-	$(if $(findstring --jobserver,$(MAKEFLAGS)),$(error make -j is not supported, use make JOBS=n))
-	$(call CheckEnvironment)
-	@$(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
-	@$(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
-	$(call StartGlobalTimer)
-endef
-
-# Hook to be called as the very last thing for targets that are "top level" targets
-define AtMakeEnd
-	[ -f $(SJAVAC_SERVER_DIR)/server.port ] && echo Stopping sjavac server && $(TOUCH) $(SJAVAC_SERVER_DIR)/server.port.stop; true
-	$(call StopGlobalTimer)
-	$(call ReportBuildTimes)
-	@$(PRINTF) "Finished building $(PRODUCT_NAME) for target '$(call GetRealTarget)'\n"
-	$(call CheckEnvironment)
-endef
-
-### Functions for parsing and setting up make options from command-line
-
-define FatalError
-  # If the user specificed a "global" target (e.g. 'help'), do not exit but continue running
-  $$(if $$(filter-out $(global_targets),$$(call GetRealTarget)),$$(error Cannot continue))
-endef
-
-define ParseLogLevel
-  ifeq ($$(origin VERBOSE),undefined)
-    # Setup logging according to LOG (but only if VERBOSE is not given)
-
-    # If the "nofile" argument is given, act on it and strip it away
-    ifneq ($$(findstring nofile,$$(LOG)),)
-      # Reset the build log wrapper, regardless of other values
-      override BUILD_LOG_WRAPPER=
-      # COMMA is defined in spec.gmk, but that is not included yet
-      COMMA=,
-      # First try to remove ",nofile" if it exists
-      LOG_STRIPPED1=$$(subst $$(COMMA)nofile,,$$(LOG))
-      # Otherwise just remove "nofile"
-      LOG_STRIPPED2=$$(subst nofile,,$$(LOG_STRIPPED1))
-      # We might have ended up with a leading comma. Remove it
-      LOG_STRIPPED3=$$(strip $$(patsubst $$(COMMA)%,%,$$(LOG_STRIPPED2)))
-      LOG_LEVEL:=$$(LOG_STRIPPED3)
-    else
-      LOG_LEVEL:=$$(LOG)
-    endif
-
-    ifeq ($$(LOG_LEVEL),)
-      # Set LOG to "warn" as default if not set (and no VERBOSE given)
-      override LOG_LEVEL=warn
-    endif
-    ifeq ($$(LOG_LEVEL),warn)
-      VERBOSE=-s
-    else ifeq ($$(LOG_LEVEL),info)
-      VERBOSE=-s
-    else ifeq ($$(LOG_LEVEL),debug)
-      VERBOSE=
-    else ifeq ($$(LOG_LEVEL),trace)
-      VERBOSE=
-    else
-      $$(info Error: LOG must be one of: warn, info, debug or trace.)
-      $$(eval $$(call FatalError))
-    endif
-  else
-    # Provide resonable interpretations of LOG_LEVEL if VERBOSE is given.
-    ifeq ($(VERBOSE),)
-      LOG_LEVEL:=debug
-    else
-      LOG_LEVEL:=warn
-    endif
-    ifneq ($$(LOG),)
-      # We have both a VERBOSE and a LOG argument. This is OK only if this is a repeated call by ourselves,
-      # but complain if this is the top-level make call.
-      ifeq ($$(MAKELEVEL),0)
-        $$(info Cannot use LOG=$$(LOG) and VERBOSE=$$(VERBOSE) at the same time. Choose one.)
-        $$(eval $$(call FatalError))
-      endif
-    endif
-  endif
-endef
-
-define ParseConfAndSpec
-  ifneq ($$(filter-out $(global_targets),$$(call GetRealTarget)),)
-    # If we only have global targets, no need to bother with SPEC or CONF
-    ifneq ($$(origin SPEC),undefined)
-      # We have been given a SPEC, check that it works out properly
-      ifeq ($$(wildcard $$(SPEC)),)
-        $$(info Cannot locate spec.gmk, given by SPEC=$$(SPEC))
-        $$(eval $$(call FatalError))
-      endif
-      ifneq ($$(origin CONF),undefined)
-        # We also have a CONF argument. This is OK only if this is a repeated call by ourselves,
-        # but complain if this is the top-level make call.
-        ifeq ($$(MAKELEVEL),0)
-          $$(info Cannot use CONF=$$(CONF) and SPEC=$$(SPEC) at the same time. Choose one.)
-          $$(eval $$(call FatalError))
-        endif
-      endif
-      # ... OK, we're satisfied, we'll use this SPEC later on
-    else
-      # Find all spec.gmk files in the build output directory
-      output_dir=$$(root_dir)/build
-      all_spec_files=$$(wildcard $$(output_dir)/*/spec.gmk)
-      ifeq ($$(all_spec_files),)
-        $$(info No configurations found for $$(root_dir)! Please run configure to create a configuration.)
-        $$(eval $$(call FatalError))
-      endif
-      # Extract the configuration names from the path
-      all_confs=$$(patsubst %/spec.gmk,%,$$(patsubst $$(output_dir)/%,%,$$(all_spec_files)))
-
-      ifneq ($$(origin CONF),undefined)
-        # User have given a CONF= argument.
-        ifeq ($$(CONF),)
-          # If given CONF=, match all configurations
-          matching_confs=$$(strip $$(all_confs))
-        else
-          # Otherwise select those that contain the given CONF string
-          matching_confs=$$(strip $$(foreach var,$$(all_confs),$$(if $$(findstring $$(CONF),$$(var)),$$(var))))
-        endif
-        ifeq ($$(matching_confs),)
-          $$(info No configurations found matching CONF=$$(CONF))
-          $$(info Available configurations:)
-          $$(foreach var,$$(all_confs),$$(info * $$(var)))
-          $$(eval $$(call FatalError))
-        else
-          ifeq ($$(words $$(matching_confs)),1)
-            $$(info Building '$$(matching_confs)' (matching CONF=$$(CONF)))
-          else
-            $$(info Building target '$(call GetRealTarget)' in the following configurations (matching CONF=$$(CONF)):)
-            $$(foreach var,$$(matching_confs),$$(info * $$(var)))
-          endif
-        endif
-
-        # Create a SPEC definition. This will contain the path to one or more spec.gmk files.
-        SPEC=$$(addsuffix /spec.gmk,$$(addprefix $$(output_dir)/,$$(matching_confs)))
-      else
-        # No CONF or SPEC given, check the available configurations
-        ifneq ($$(words $$(all_spec_files)),1)
-          $$(info No CONF given, but more than one configuration found in $$(output_dir).)
-          $$(info Available configurations:)
-          $$(foreach var,$$(all_confs),$$(info * $$(var)))
-          $$(info Please retry building with CONF=<config pattern> (or SPEC=<specfile>))
-          $$(eval $$(call FatalError))
-        endif
-
-        # We found exactly one configuration, use it
-        SPEC=$$(strip $$(all_spec_files))
-      endif
-    endif
-  endif
-endef
-
-### Convenience functions from Main.gmk
-
-# Cleans the component given as $1
-define CleanComponent
-	@$(PRINTF) "Cleaning $1 build artifacts ..."
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r $1)
-	@$(PRINTF) " done\n"
-endef
-
-endif # _MAKEHELPERS_GMK
diff --git a/make/common/CORE_PKGS.gmk b/make/common/CORE_PKGS.gmk
deleted file mode 100644
index 9c85da6..0000000
--- a/make/common/CORE_PKGS.gmk
+++ /dev/null
@@ -1,300 +0,0 @@
-#
-# Copyright (c) 2001, 2011, 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.
-#
-
-# EXCLUDE_PKGS is the list of packages to exclude from the
-# Java API Specification. Do not add these to CORE_PKGS.
-# The concatenation of EXCLUDE_PKGS and CORE_PKGS
-# should make up the list of all packages under the
-# src/shared/classes directory of the JDK source tree.
-#
-EXCLUDE_PKGS = \
-    java.awt.peer \
-    java.awt.dnd.peer \
-    sun.* \
-    com.sun.* \
-    org.apache.* \
-    org.jcp.* \
-    org.w3c.dom.css \
-    org.w3c.dom.html \
-    org.w3c.dom.stylesheets \
-    org.w3c.dom.traversal \
-    org.w3c.dom.ranges \
-    org.omg.stub.javax.management.remote.rmi
-
-#
-# ACTIVE_JSR_PKGS are packages that are part of an active JSR process--
-# one that is doing its own review. These packages are not included when
-# creating diff pages for the platform's JCP process.
-#
-# (see /java/pubs/apisrc/jdk/6.0/beta/make/docs/active_jsr_pkgs)
-# Note:
-# This is a list of regular expressions. So foo.* matches "foo" and "foo.bar".
-#
-ACTIVE_JSR_PKGS= \
-    java.lang.invoke \
-    java.sql \
-    javax.activation \
-    javax.annotation.* \
-    javax.jws.* \
-    javax.lang.* \
-    javax.management.* \
-    javax.script \
-    javax.sql.* \
-    javax.tools.* \
-    javax.xml.* \
-    org.w3c.* \
-    org.xml.sax
-
-#
-# CORE_PKGS is the list of packages that form the
-# Java API Specification.
-#
-### ***IMPORTANT NOTE***
-### There is also a "REGEXP" variable in the docs/makefile that
-### determines which table the packages go in on the main page.
-### Currently, there is only table ("Platform Packages") and
-### everything goes in it, so REGEXP is "*". But if that policy
-### changes, packages added will need to be reflected in that
-### list of wildcard expressions, as well.
-###
-CORE_PKGS = \
-    java.applet \
-    java.awt \
-    java.awt.color \
-    java.awt.datatransfer \
-    java.awt.dnd \
-    java.awt.event \
-    java.awt.font \
-    java.awt.geom \
-    java.awt.im \
-    java.awt.im.spi \
-    java.awt.image \
-    java.awt.image.renderable \
-    java.awt.print \
-    java.beans \
-    java.beans.beancontext \
-    java.io \
-    java.lang \
-    java.lang.annotation \
-    java.lang.instrument \
-    java.lang.invoke \
-    java.lang.management \
-    java.lang.ref \
-    java.lang.reflect \
-    java.math \
-    java.net \
-    java.nio \
-    java.nio.channels \
-    java.nio.channels.spi \
-    java.nio.charset \
-    java.nio.charset.spi \
-    java.nio.file \
-    java.nio.file.attribute \
-    java.nio.file.spi \
-    java.rmi \
-    java.rmi.activation \
-    java.rmi.dgc \
-    java.rmi.registry \
-    java.rmi.server \
-    java.security \
-    java.security.acl \
-    java.security.cert \
-    java.security.interfaces \
-    java.security.spec \
-    java.sql \
-    java.text \
-    java.text.spi \
-    java.time \
-    java.time.chrono \
-    java.time.format \
-    java.time.temporal \
-    java.time.zone \
-    java.util \
-    java.util.concurrent \
-    java.util.concurrent.atomic \
-    java.util.concurrent.locks \
-    java.util.function \
-    java.util.jar \
-    java.util.logging \
-    java.util.prefs \
-    java.util.regex \
-    java.util.spi \
-    java.util.stream \
-    java.util.zip \
-    javax.accessibility \
-    javax.activation \
-    javax.activity \
-    javax.annotation \
-    javax.annotation.processing \
-    javax.crypto \
-    javax.crypto.interfaces \
-    javax.crypto.spec \
-    javax.imageio \
-    javax.imageio.event \
-    javax.imageio.metadata \
-    javax.imageio.plugins.jpeg \
-    javax.imageio.plugins.bmp \
-    javax.imageio.spi \
-    javax.imageio.stream \
-    javax.jws \
-    javax.jws.soap \
-    javax.lang.model \
-    javax.lang.model.element \
-    javax.lang.model.type \
-    javax.lang.model.util \
-    javax.management \
-    javax.management.loading \
-    javax.management.monitor \
-    javax.management.relation \
-    javax.management.openmbean \
-    javax.management.timer \
-    javax.management.modelmbean \
-    javax.management.remote \
-    javax.management.remote.rmi \
-    javax.naming \
-    javax.naming.directory \
-    javax.naming.event \
-    javax.naming.ldap \
-    javax.naming.spi \
-    javax.net \
-    javax.net.ssl \
-    javax.print \
-    javax.print.attribute \
-    javax.print.attribute.standard \
-    javax.print.event \
-    javax.rmi \
-    javax.rmi.CORBA \
-    javax.rmi.ssl \
-    javax.script \
-    javax.security.auth \
-    javax.security.auth.callback \
-    javax.security.auth.kerberos \
-    javax.security.auth.login \
-    javax.security.auth.spi \
-    javax.security.auth.x500 \
-    javax.security.cert \
-    javax.security.sasl \
-    javax.sound.sampled \
-    javax.sound.sampled.spi \
-    javax.sound.midi \
-    javax.sound.midi.spi \
-    javax.sql \
-    javax.sql.rowset \
-    javax.sql.rowset.serial \
-    javax.sql.rowset.spi \
-    javax.swing \
-    javax.swing.border \
-    javax.swing.colorchooser \
-    javax.swing.filechooser \
-    javax.swing.event \
-    javax.swing.table \
-    javax.swing.text \
-    javax.swing.text.html \
-    javax.swing.text.html.parser \
-    javax.swing.text.rtf \
-    javax.swing.tree \
-    javax.swing.undo \
-    javax.swing.plaf \
-    javax.swing.plaf.basic \
-    javax.swing.plaf.metal \
-    javax.swing.plaf.multi \
-    javax.swing.plaf.nimbus \
-    javax.swing.plaf.synth \
-    javax.tools \
-    javax.tools.annotation \
-    javax.transaction \
-    javax.transaction.xa \
-    javax.xml.parsers \
-    javax.xml.bind \
-    javax.xml.bind.annotation \
-    javax.xml.bind.annotation.adapters \
-    javax.xml.bind.attachment \
-    javax.xml.bind.helpers \
-    javax.xml.bind.util \
-    javax.xml.soap \
-    javax.xml.ws \
-    javax.xml.ws.handler \
-    javax.xml.ws.handler.soap \
-    javax.xml.ws.http \
-    javax.xml.ws.soap \
-    javax.xml.ws.spi \
-    javax.xml.ws.spi.http \
-    javax.xml.ws.wsaddressing \
-    javax.xml.transform \
-    javax.xml.transform.sax \
-    javax.xml.transform.dom \
-    javax.xml.transform.stax \
-    javax.xml.transform.stream \
-    javax.xml \
-    javax.xml.crypto \
-    javax.xml.crypto.dom \
-    javax.xml.crypto.dsig \
-    javax.xml.crypto.dsig.dom \
-    javax.xml.crypto.dsig.keyinfo \
-    javax.xml.crypto.dsig.spec \
-    javax.xml.datatype \
-    javax.xml.validation \
-    javax.xml.namespace \
-    javax.xml.xpath \
-    javax.xml.stream \
-    javax.xml.stream.events \
-    javax.xml.stream.util \
-    org.ietf.jgss \
-    org.omg.CORBA \
-    org.omg.CORBA.DynAnyPackage \
-    org.omg.CORBA.ORBPackage \
-    org.omg.CORBA.TypeCodePackage \
-    org.omg.stub.java.rmi \
-    org.omg.CORBA.portable \
-    org.omg.CORBA_2_3 \
-    org.omg.CORBA_2_3.portable \
-    org.omg.CosNaming \
-    org.omg.CosNaming.NamingContextExtPackage \
-    org.omg.CosNaming.NamingContextPackage \
-    org.omg.SendingContext \
-    org.omg.PortableServer \
-    org.omg.PortableServer.CurrentPackage \
-    org.omg.PortableServer.POAPackage \
-    org.omg.PortableServer.POAManagerPackage \
-    org.omg.PortableServer.ServantLocatorPackage \
-    org.omg.PortableServer.portable \
-    org.omg.PortableInterceptor \
-    org.omg.PortableInterceptor.ORBInitInfoPackage \
-    org.omg.Messaging \
-    org.omg.IOP \
-    org.omg.IOP.CodecFactoryPackage \
-    org.omg.IOP.CodecPackage \
-    org.omg.Dynamic \
-    org.omg.DynamicAny \
-    org.omg.DynamicAny.DynAnyPackage \
-    org.omg.DynamicAny.DynAnyFactoryPackage \
-    org.w3c.dom \
-    org.w3c.dom.events \
-    org.w3c.dom.bootstrap \
-    org.w3c.dom.ls \
-    org.w3c.dom.views \
-    org.xml.sax \
-    org.xml.sax.ext \
-    org.xml.sax.helpers
diff --git a/make/common/IdlCompilation.gmk b/make/common/IdlCompilation.gmk
deleted file mode 100644
index d816f23..0000000
--- a/make/common/IdlCompilation.gmk
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-PREFIXES=-pkgPrefix CORBA org.omg \
-    -pkgPrefix CosNaming org.omg \
-    -pkgPrefix CosTransactions org.omg \
-    -pkgPrefix CosTSInteroperation org.omg \
-    -pkgPrefix DynamicAny org.omg \
-    -pkgPrefix Dynamic org.omg \
-    -pkgPrefix IOP org.omg \
-    -pkgPrefix Messaging org.omg \
-    -pkgPrefix PortableInterceptor org.omg \
-    -pkgPrefix PortableServer org.omg \
-    -pkgPrefix activation com.sun.corba.se.spi \
-    -pkgPrefix GIOP com.sun.corba.se \
-    -pkgPrefix PortableActivationIDL com.sun.corba.se \
-    -pkgPrefix messages com.sun.corba.se
-
-define add_idl_package
-  # param 1 = MYPACKAGE
-  # param 2 = src root
-  # param 3 = gensrc root
-  # param 4 = source idl to compile
-  # param 5 = target idl package
-  # param 6 = delete these files that were output from the idlj
-  # param 7 = idls that match these patterns should be compiled with -oldImplBase
-  # param 8 = the idlj command
-  # Save the generated java files to a temporary directory so
-  # that we can find them and create proper dependencies.
-  # After that, we move them to the real gensrc target dir.
-  $4_TMPDIR:=tmp___$(subst /,_,$(patsubst $2/%,%,$4))___
-  ifneq ($$(filter $7,$4),)
-    $4_OLDIMPLBASE:=-oldImplBase
-    $4_OLDIMPLBASE_MSG:=with -oldImplBase
-  endif
-  $5 : $4
-	$(MKDIR) -p $3/$$($4_TMPDIR)
-	$(RM) -rf $3/$$($4_TMPDIR)
-	$(MKDIR) -p $(dir $5)
-	$(ECHO) $(LOG_INFO) Compiling IDL $(patsubst $2/%,%,$4)
-	$8 -td $3/$$($4_TMPDIR) \
-	    -i $2/org/omg/CORBA \
-	    -i $2/org/omg/PortableInterceptor \
-	    -i $2/org/omg/PortableServer \
-	    -D CORBA3 -corba 3.0 \
-	    -fall \
-	    $$($4_OLDIMPLBASE) \
-	    $(PREFIXES) \
-	    $4
-	$(RM) -f $$(addprefix $3/$$($4_TMPDIR)/,$6)
-	$(CP) -r $3/$$($4_TMPDIR)/* $3
-	($(CD) $3/$$($4_TMPDIR) && $(FIND) . -type f | $(SED) 's!\./!$3/!g' | $(NAWK) '{ print $$$$1 ": $4" }' > $5)
-	$(RM) -rf $3/$$($4_TMPDIR)
-endef
-
-define SetupIdlCompilation
-  # param 1 is for example BUILD_IDLS
-  # param 2,3,4,5,6,7,8 are named args.
-  #   IDLJ,SRC,BIN,INCLUDES,EXCLUDES,OLDIMPLBASES,DELETES
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupIdlCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupIdlCompilation, please update IdlCompilation.gmk))
-
-  # Find all existing java files and existing class files.
-  $$(eval $$(call MakeDir,$$($1_BIN)))
-  $1_SRCS := $$(shell find $$($1_SRC) -name "*.idl")
-  $1_BINS := $$(shell find $$($1_BIN) -name "*.java")
-  # Prepend the source/bin path to the filter expressions.
-  $1_SRC_INCLUDES := $$(addprefix $$($1_SRC)/,$$($1_INCLUDES))
-  $1_SRC_EXCLUDES := $$(addprefix $$($1_SRC)/,$$($1_EXCLUDES))
-  $1_BIN_INCLUDES := $$(addprefix $$($1_BIN)/,$$($1_INCLUDES))
-  $1_BIN_EXCLUDES := $$(addprefix $$($1_BIN)/,$$($1_EXCLUDES))
-  $1_OLDIMPLBASES := $$(addprefix $$($1_SRC)/,$$($1_OLDIMPLBASES))
-  # Now remove unwanted java/class files.
-  $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
-  $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
-  $1_BINS := $$(filter $$($1_BIN_INCLUDES),$$($1_BINS))
-  $1_BINS := $$(filter-out $$($1_BIN_EXCLUDES),$$($1_BINS))
-  $1 := $$(sort $$(patsubst $$($1_SRC)/%.idl,$$($1_BIN)/%.idl.d,$$($1_SRCS)))
-  # Now create the dependencies for each idl target.
-  $$(foreach p,$$($1),$$(eval $$(call add_idl_package,$1,$$($1_SRC),$$($1_BIN),$$(patsubst $$($1_BIN)/%.idl.d,$$($1_SRC)/%.idl,$$p),$$p,$$($1_DELETES),$$($1_OLDIMPLBASES),$$($1_IDLJ))))
-endef
-
-.SUFFIXES: .java .class .package
diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
deleted file mode 100644
index e474ea4..0000000
--- a/make/common/JavaCompilation.gmk
+++ /dev/null
@@ -1,594 +0,0 @@
-#
-# Copyright (c) 2011, 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.
-#
-
-# This makefile is much simpler now that it can use the smart javac wrapper
-# for dependency tracking between java packages and incremental compiles.
-# It could be even more simple if we added support for incremental jar updates
-# directly from the smart javac wrapper.
-
-# Cleaning/copying properties here is not a good solution. The properties
-# should be cleaned/copied by a annotation processor in sjavac.
-
-# When you read this source. Remember that $(sort ...) has the side effect
-# of removing duplicates. It is actually this side effect that is
-# desired whenever sort is used below!
-
-ifeq (,$(_MAKEBASE_GMK))
-  $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
-endif
-
-FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
-
-define SetupJavaCompiler
-  # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE
-  # This is the name of the compiler setup.
-  # param 2-9 are named args.
-  #   JVM:=The jvm used to run the javac/javah command
-  #   JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
-  #   FLAGS:=Flags to be supplied to javac
-  #   SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
-  #   SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above.
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupJavaCompiler($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompiler, please update JavaCompilation.gmk))
-
-  # The port file contains the tcp/ip on which the server listens
-  # and the cookie necessary to talk to the server.
-  $1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
-  # You can use a different JVM to run the background javac server.
-  ifeq ($$($1_SERVER_JVM),)
-    # It defaults to the same JVM that is used to start the javac command.
-    $1_SERVER_JVM:=$$($1_JVM)
-  endif
-endef
-
-define SetupArchive
-  # param 1 is for example ARCHIVE_MYPACKAGE
-  # param 2 are the dependecies
-  # param 3,4,5,6,7,8,9 are named args.
-  #   SRCS:=List of directories in where to find files to add to archive
-  #   SUFFIXES:=File suffixes to include in jar
-  #   INCLUDES:=List of directories/packages in SRCS that should be included
-  #   EXCLUDES:=List of directories/packages in SRCS that should be excluded
-  #   EXCLUDE_FILES:=List of files in SRCS that should be excluded
-  #   EXTRA_FILES:=List of files in SRCS that should be included regardless of suffix match.
-  #   JAR:=Jar file to create
-  #   MANIFEST:=Optional manifest file template.
-  #   JARMAIN:=Optional main class to add to manifest
-  #   JARINDEX:=true means generate the index in the jar file.
-  #   SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically
-  #       added to the archive.
-  #   EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest.
-  #   CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable
-
-  # NOTE: $2 is dependencies, not a named argument!
-  $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(findstring $(LOG_LEVEL),trace), $(info *[2] <dependencies> = $(strip $2)))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk))
-
-  $1_JARMAIN:=$(strip $$($1_JARMAIN))
-  $1_JARNAME:=$$(notdir $$($1_JAR))
-  $1_MANIFEST_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_manifest
-  $1_DELETESS_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletess
-  $1_DELETES_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletes
-  $1_BIN:=$$(dir $$($1_JAR))
-
-  ifeq (,$$($1_SUFFIXES))
-    # No suffix was set, default to classes.
-    $1_SUFFIXES:=.class
-  endif
-  # Convert suffixes to a find expression
-  $1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
-  # On windows, a lot of includes/excludes risk making the command line too long, so
-  # writing the grep patterns to files.
-  ifneq (,$$($1_INCLUDES))
-    $1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS), \
-        $$(addprefix $$(src)/,$$($1_INCLUDES)))
-    # If there are a lot of include patterns, output to file to shorten command lines
-    ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
-      $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
-    else
-      $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include $$(NEWLINE) \
-          $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \
-          >> $$($1_BIN)/_the.$$($1_JARNAME)_include)
-      $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include
-    endif
-  endif
-  ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
-    $1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
-        $$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))
-    # If there are a lot of include patterns, output to file to shorten command lines
-    ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
-      $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
-    else
-      $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude $$(NEWLINE) \
-          $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \
-          >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)
-      $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude
-    endif
-  endif
-
-  # Check if this jar needs to have its index generated.
-  ifneq (,$$($1_JARINDEX))
-    $1_JARINDEX = (cd $$(dir $$@) && $(JAR) -i $$(notdir $$@))
-  else
-    $1_JARINDEX = true
-  endif
-  # When this macro is run in the same makefile as the java compilation, dependencies are
-  # transfered in make variables. When the macro is run in a different makefile than the
-  # java compilation, the dependencies need to be found in the filesystem.
-  ifneq (,$2)
-    $1_DEPS:=$2
-  else
-    $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \
-        $$(call CacheFind,$$($1_SRCS)))
-    ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
-      $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS))
-    endif
-    ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
-      $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS))
-    endif
-    # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command
-    # lines, but not here for use in make dependencies.
-    $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
-    ifeq (,$$($1_SKIP_METAINF))
-      $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
-    endif
-  endif
-
-  # Utility macros, to make the shell script receipt somewhat easier to decipher.
-
-  # The capture contents macro finds all files (matching the patterns, typically
-  # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
-  # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
-  $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      ( ( $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
-          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
-      $(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES) ) ) > \
-      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
-  # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
-  ifeq (,$$($1_SKIP_METAINF))
-    $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE))
-  endif
-  # The capture deletes macro finds all deleted files and concatenates them. The resulting file
-  # tells us what to remove from the jar-file.
-  $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
-  # The update contents macro updates the jar file with the previously capture contents.
-  # Use 'wc -w' to see if the contents file is empty.
-  $1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      (cd $$(src) && \
-       if [ "`$(WC) -w _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \
-         $(ECHO) "  updating" `$(WC) -l _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
-         $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \
-       fi) $$(NEWLINE))
-  # The s-variants of the above macros are used when the jar is created from scratch.
-  # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
-  $1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      ( ( $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
-          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
-      $$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES) ) ) > \
-      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
-
-  ifeq (,$$($1_SKIP_METAINF))
-    $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \
-        ($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \
-        $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
-  endif
-  $1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      (cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
-
-  # Use a slightly shorter name for logging, but with enough path to identify this jar.
-  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
-
-  ifneq (,$$($1_CHECK_COMPRESS_JAR))
-    $1_JAR_CREATE_OPTIONS := c0fm
-    $1_JAR_UPDATE_OPTIONS := u0f
-    ifeq ($(COMPRESS_JARS), true)
-      $1_JAR_CREATE_OPTIONS := cfm
-      $1_JAR_UPDATE_OPTIONS := uf
-    endif
-  else
-    $1_JAR_CREATE_OPTIONS := cfm
-    $1_JAR_UPDATE_OPTIONS := uf
-  endif
-
-  # Here is the rule that creates/updates the jar file.
-  $$($1_JAR) : $$($1_DEPS)
-	$(MKDIR) -p $$($1_BIN)
-	$$($1_GREP_INCLUDE_OUTPUT)
-	$$($1_GREP_EXCLUDE_OUTPUT)
-	$$(if $$($1_MANIFEST), \
-	  $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
-	      -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
-	, \
-	  $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
-	$$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))
-	$$(if $$($1_EXTRA_MANIFEST_ATTR),$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE))
-	$$(if $$(wildcard $$@), \
-	  $(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \
-	  $$($1_CAPTURE_CONTENTS) \
-	  $$($1_CAPTURE_METAINF) \
-	  $(RM) $$($1_DELETES_FILE) $$(NEWLINE) \
-	  $$($1_CAPTURE_DELETES) \
-	  $(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE) \
-	  if [ -s $$($1_DELETESS_FILE) ]; then \
-	    $(ECHO) "  deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \
-	    $(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \
-	  fi $$(NEWLINE) \
-	  $$($1_UPDATE_CONTENTS) true $$(NEWLINE) \
-	  $$($1_JARINDEX) && true \
-	, \
-	  $(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
-	  $$($1_SCAPTURE_CONTENTS) \
-	  $$($1_SCAPTURE_METAINF) \
-	  $$($1_SUPDATE_CONTENTS) \
-	  $$($1_JARINDEX) && true )
-
-endef
-
-define SetupZipArchive
-  # param 1 is for example ZIP_MYSOURCE
-  # param 2,3,4,5,6,7,8,9 are named args.
-  #   SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk))
-
-  # To avoid running find over too large sets of files, which causes make to crash
-  # on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set
-  # of directories to run find in, if available.
-  ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),)
-    $1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC), \
-        $$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
-  else
-    $1_FIND_LIST := $$($1_SRC)
-  endif
-
-  # Find all files in the source tree.
-  $1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST)))
-
-  # Filter on suffixes if set
-  ifneq ($$($1_SUFFIXES),)
-    $1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS))
-  endif
-
-  ifneq ($$($1_INCLUDES),)
-    ifneq ($$($1_SUFFIXES),)
-      $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \
-          $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES))))
-    else
-      $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
-    endif
-  endif
-  ifneq ($$($1_INCLUDE_FILES),)
-    $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
-  endif
-  ifneq ($$($1_EXCLUDES),)
-    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
-    $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
-    $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
-  endif
-
-  # Use a slightly shorter name for logging, but with enough path to identify this zip.
-  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_ZIP))
-
-  # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
-  # I.e. the zip -i and -x options should match the filtering done in the makefile.
-  # Explicitly excluded files can be given with absolute path. The patsubst solution
-  # isn't perfect but the likelyhood of an absolute path to match something in a src
-  # dir is very small.
-  # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
-  # and only fail if it's not.
-  $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
-	$(MKDIR) -p $$(@D)
-	$(ECHO) Updating $$($1_NAME)
-	$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true
-	$(TOUCH) $$@
-endef
-
-define add_file_to_copy
-  # param 1 = BUILD_MYPACKAGE
-  # parma 2 = The source file to copy.
-  $2_TARGET:=$2
-  # Remove the source prefix.
-  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
-  # Now we can setup the depency that will trigger the copying.
-  $$($1_BIN)$$($2_TARGET) : $2
-	$(MKDIR) -p $$(@D)
-	$(CP) $$< $$@
-	$(CHMOD) -f ug+w $$@
-
-  # And do not forget this target
-  $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
-endef
-
-
-# This macro is used only for properties files that are to be
-# copied over to the classes directory in cleaned form:
-# Previously this was inconsistently done in different repositories.
-# This is the new clean standard. Though it is to be superseded by
-# a standard annotation processor from with sjavac.
-define add_file_to_copy_and_clean
-  # param 1 = BUILD_MYPACKAGE
-  # parma 2 = The source file to copy and clean.
-  $2_TARGET:=$2
-  # Remove the source prefix.
-  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
-  # Now we can setup the depency that will trigger the copying.
-  $$($1_BIN)$$($2_TARGET) : $2
-	$(MKDIR) -p $$(@D)
-	$(CAT) $$< | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
-	    | $(SED) -f "$(SRC_ROOT)/make/common/support/unicode2x.sed" \
-	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
-	        -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
-	        -e 's/^[ \t]*//;s/[ \t]*$$$$//' \
-	        -e 's/\\=/=/' | LANG=C $(SORT) > $$@
-	$(CHMOD) -f ug+w $$@
-
-  # And do not forget this target
-  $1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($2_TARGET)
-endef
-
-define remove_string
-  $2 := $$(subst $1,,$$($2))
-endef
-
-define replace_space_with_pathsep
-  $1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2)))
-endef
-
-define SetupJavaCompilation
-  # param 1 is for example BUILD_MYPACKAGE
-  # param 2,3,4,5,6,7,8 are named args.
-  #   SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC
-  #   JVM:=path to ..bin/java
-  #   ADD_JAVAC_FLAGS:=javac flags to append to the default ones.
-  #   SRC:=one or more directories to search for sources
-  #   BIN:=store classes here
-  #   INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages.
-  #   EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages.
-  #   COPY:=.prp means copy all prp files to the corresponding package in BIN.
-  #   CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN.
-  #   COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo
-  #   SRCZIP:=Create a src.zip based on the found sources and copied files.
-  #   INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
-  #   EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
-  #       "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
-  #   JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete
-  #       source roots from SRC. This is sometimes needed when compiling specific subsets of the source.
-  #   HEADERS:=path to directory where all generated c-headers are written.
-  #   DEPENDS:=Extra dependecy
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupJavaCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompilation, please update JavaCompilation.gmk))
-
-  # Extract the info from the java compiler setup.
-  $1_JVM := $$($$($1_SETUP)_JVM)
-  $1_JAVAC := $$($$($1_SETUP)_JAVAC)
-  $1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS)
-  ifeq ($$($1_JAVAC),)
-    $$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP))
-  endif
-  $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
-  $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
-
-  # Handle addons and overrides.
-  $1_SRC:=$$(call ADD_SRCS,$$($1_SRC))
-  # Make sure the dirs exist.
-  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d)))
-  $$(eval $$(call MakeDir,$$($1_BIN)))
-  # Find all files in the source trees.
-  $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC)))
-  # Extract the java files.
-  ifneq ($$($1_EXCLUDE_FILES),)
-    $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
-  endif
-  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$(filter %.java,$$($1_ALL_SRCS)))
-  ifneq ($$($1_INCLUDE_FILES),)
-    $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
-    $1_SRCS := $$(filter $$($1_INCLUDE_FILES), $$($1_SRCS))
-  endif
-
-  # Now we have a list of all java files to compile: $$($1_SRCS)
-
-  # Create the corresponding smart javac wrapper command line.
-  $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix .*,$$(subst /,.,$$($1_EXCLUDES)))) \
-      $$(addprefix -i ,$$(addsuffix .*,$$(subst /,.,$$($1_INCLUDES)))) \
-      $$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \
-      $$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \
-      -src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))"
-
-  # Prepend the source/bin path to the filter expressions.
-  ifneq ($$($1_INCLUDES),)
-    $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
-    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
-  endif
-  ifneq ($$($1_EXCLUDES),)
-    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
-    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
-  endif
-
-  # Find all files to be copied from source to bin.
-  ifneq (,$$($1_COPY))
-    # Search for all files to be copied.
-    $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
-    # Copy these explicitly
-    $1_ALL_COPIES += $$($1_COPY_FILES)
-    # Copy must also respect filters.
-    ifneq (,$$($1_INCLUDES))
-      $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES))
-    endif
-    ifneq (,$$($1_EXCLUDES))
-      $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES))
-    endif
-    ifneq (,$$($1_EXCLUDE_FILES))
-      $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
-    endif
-    # All files below META-INF are always copied.
-    $1_ALL_COPIES += $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
-    ifneq (,$$($1_ALL_COPIES))
-      # Yep, there are files to be copied!
-      $1_ALL_COPY_TARGETS:=
-          $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
-      # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
-    endif
-  endif
-
-  # Find all property files to be copied and cleaned from source to bin.
-  ifneq (,$$($1_CLEAN))
-    # Search for all files to be copied.
-    $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
-    # Copy and clean must also respect filters.
-    ifneq (,$$($1_INCLUDES))
-      $1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS))
-    endif
-    ifneq (,$$($1_EXCLUDES))
-      $1_ALL_CLEANS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_CLEANS))
-    endif
-    ifneq (,$$($1_EXCLUDE_FILES))
-      $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_CLEANS))
-    endif
-    ifneq (,$$($1_ALL_CLEANS))
-      # Yep, there are files to be copied and cleaned!
-      $1_ALL_COPY_CLEAN_TARGETS:=
-          $$(foreach i,$$($1_ALL_CLEANS),$$(eval $$(call add_file_to_copy_and_clean,$1,$$i)))
-      # Now we can depend on $$($1_ALL_COPY_CLEAN_TARGETS) to copy all files!
-    endif
-  endif
-
-  # Prep the source paths.
-  ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),)
-    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE)))
-  else
-    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
-  endif
-
-  # Create a sed expression to remove the source roots and to replace / with .
-  # and remove .java at the end.
-  $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
-
-  ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
-    ifneq (,$$($1_HEADERS))
-      $1_HEADERS_ARG := -h $$($1_HEADERS)
-    endif
-
-    # Using sjavac to compile.
-    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state
-
-    # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be
-    # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
-    # and javac is simply replaced with sjavac.
-    $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC))
-
-    # Set the $1_REMOTE to spawn a background javac server.
-    $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
-
-    $$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS)
-	$(MKDIR) -p $$(@D)
-	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
-	$(ECHO) Compiling $1
-	($$($1_JVM) $$($1_SJAVAC) \
-	    $$($1_REMOTE) \
-	    -j $(JOBS) \
-	    --permit-unidentified-artifacts \
-	    --permit-sources-without-package \
-	    --compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \
-	    --log=$(LOG_LEVEL) \
-	    $$($1_SJAVAC_ARGS) \
-	    $$($1_FLAGS) \
-	    $$($1_HEADERS_ARG) \
-	    -d $$($1_BIN) && \
-	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
-  else
-    # Using plain javac to batch compile everything.
-    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.$1_batch
-
-    # When building in batch, put headers in a temp dir to filter out those that actually
-    # changed before copying them to the real header dir.
-    ifneq (,$$($1_HEADERS))
-      $1_HEADERS_ARG := -h $$($1_HEADERS).$1.tmp
-
-      $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
-		$(MKDIR) -p $$(@D)
-		for f in `ls $$($1_HEADERS).$1.tmp`; do \
-		  if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).$1.tmp/$$$$f`" != "" ]; then \
-		    $(CP) -f $$($1_HEADERS).$1.tmp/$$$$f $$($1_HEADERS)/$$$$f; \
-		  fi; \
-		done
-		$(RM) -r $$($1_HEADERS).$1.tmp
-		$(TOUCH) $$@
-
-      $1 += $$($1_HEADERS)/_the.$1_headers
-    endif
-
-    # When not using sjavac, pass along all sources to javac using an @file.
-    $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS)
-	$(MKDIR) -p $$(@D)
-	$(RM) $$($1_BIN)/_the.$1_batch $$($1_BIN)/_the.$1_batch.tmp
-	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
-	$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
-	($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
-	    -implicit:none -sourcepath "$$($1_SRCROOTSC)" \
-	    -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \
-	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
-
-  endif
-
-  # Check if a jar file was specified, then setup the rules for the jar.
-  ifneq (,$$($1_JAR))
-    # If no suffixes was explicitly set for this jar file.
-    # Use class and the cleaned/copied properties file suffixes as the default
-    # for the types of files to be put into the jar.
-    ifeq (,$$($1_SUFFIXES))
-      $1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY)
-    endif
-
-    $$(eval $$(call SetupArchive,ARCHIVE_$1,$$($1), \
-        SRCS:=$$($1_BIN), \
-        SUFFIXES:=$$($1_SUFFIXES), \
-        EXCLUDE:=$$($1_EXCLUDES), \
-        INCLUDES:=$$($1_INCLUDES), \
-        EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \
-        JAR:=$$($1_JAR), \
-        JARMAIN:=$$($1_JARMAIN), \
-        MANIFEST:=$$($1_MANIFEST), \
-        EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
-        JARINDEX:=$$($1_JARINDEX), \
-        HEADERS:=$$($1_HEADERS), \
-        SETUP:=$$($1_SETUP)))
-  endif
-
-  # Check if a srczip was specified, then setup the rules for the srczip.
-  ifneq (,$$($1_SRCZIP))
-    $$(eval $$(call SetupZipArchive,ARCHIVE_$1, \
-        SRC:=$$($1_SRC), \
-        ZIP:=$$($1_SRCZIP), \
-        INCLUDES:=$$($1_INCLUDES), \
-        EXCLUDES:=$$($1_EXCLUDES), \
-        EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
-  endif
-
-endef
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
deleted file mode 100644
index 2b276c6..0000000
--- a/make/common/MakeBase.gmk
+++ /dev/null
@@ -1,449 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-################################################################
-#
-# Check that GNU make and cygwin are recent enough.
-# Setup common utility functions.
-#
-################################################################
-
-ifndef _MAKEBASE_GMK
-_MAKEBASE_GMK := 1
-
-# If the variable that you want to send to stdout for piping into a file or otherwise,
-# is potentially long, for example the a list of file paths, eg a list of all package directories.
-# Then you need to use ListPathsSafely, which optimistically splits the output into several shell
-# calls as well as use compression on recurrent file paths segments, to get around the potential
-# command line length problem that exists in cygwin and other shells.
-compress_pre:=$(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-pre-compress.incl))
-compress_post:=$(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-post-compress.incl))
-compress_paths=$(compress_pre)\
-$(subst $(SRC_ROOT),X97,\
-$(subst $(OUTPUT_ROOT),X98,\
-$(subst X,X00,\
-$(subst $(SPACE),\n,$(strip $1)))))\
-$(compress_post)
-
-decompress_paths=$(SED) -f $(SRC_ROOT)/make/common/support/ListPathsSafely-uncompress.sed -e 's|X99|\\n|g' \
-    -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
-    -e 's|X00|X|g' | tr '\n' '$2'
-
-define ListPathsSafely_If
-	$(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
-endef
-
-define ListPathsSafely_Printf
-	$(if $(strip $($1_LPS$4)),$(if $(findstring $(LOG_LEVEL),trace),,@)printf \
-	    -- "$(strip $($1_LPS$4))\n" | $(decompress_paths) $3)
-endef
-
-# Receipt example:
-#   rm -f thepaths
-#   $(call ListPathsSafely,THEPATHS,\n, >> thepaths)
-# The \n argument means translate spaces into \n
-# if instead , , (a space) is supplied, then spaces remain spaces.
-define ListPathsSafely
-	$(if $(word 16001,$($1)),$(error Cannot list safely more than 16000 paths. $1 has $(words $($1)) paths!))
-	$(ECHO) $(LOG_DEBUG) Writing $(words $($1)) paths to '$3'
-	$(call ListPathsSafely_If,$1,$2,1,250)
-	$(call ListPathsSafely_If,$1,$2,251,500)
-	$(call ListPathsSafely_If,$1,$2,501,750)
-	$(call ListPathsSafely_If,$1,$2,751,1000)
-
-	$(call ListPathsSafely_If,$1,$2,1001,1250)
-	$(call ListPathsSafely_If,$1,$2,1251,1500)
-	$(call ListPathsSafely_If,$1,$2,1501,1750)
-	$(call ListPathsSafely_If,$1,$2,1751,2000)
-
-	$(call ListPathsSafely_If,$1,$2,2001,2250)
-	$(call ListPathsSafely_If,$1,$2,2251,2500)
-	$(call ListPathsSafely_If,$1,$2,2501,2750)
-	$(call ListPathsSafely_If,$1,$2,2751,3000)
-
-	$(call ListPathsSafely_If,$1,$2,3001,3250)
-	$(call ListPathsSafely_If,$1,$2,3251,3500)
-	$(call ListPathsSafely_If,$1,$2,3501,3750)
-	$(call ListPathsSafely_If,$1,$2,3751,4000)
-
-	$(call ListPathsSafely_If,$1,$2,4001,4250)
-	$(call ListPathsSafely_If,$1,$2,4251,4500)
-	$(call ListPathsSafely_If,$1,$2,4501,4750)
-	$(call ListPathsSafely_If,$1,$2,4751,5000)
-
-	$(call ListPathsSafely_If,$1,$2,5001,5250)
-	$(call ListPathsSafely_If,$1,$2,5251,5500)
-	$(call ListPathsSafely_If,$1,$2,5501,5750)
-	$(call ListPathsSafely_If,$1,$2,5751,6000)
-
-	$(call ListPathsSafely_If,$1,$2,6001,6250)
-	$(call ListPathsSafely_If,$1,$2,6251,6500)
-	$(call ListPathsSafely_If,$1,$2,6501,6750)
-	$(call ListPathsSafely_If,$1,$2,6751,7000)
-
-	$(call ListPathsSafely_If,$1,$2,7001,7250)
-	$(call ListPathsSafely_If,$1,$2,7251,7500)
-	$(call ListPathsSafely_If,$1,$2,7501,7750)
-	$(call ListPathsSafely_If,$1,$2,7751,8000)
-
-	$(call ListPathsSafely_If,$1,$2,8001,8250)
-	$(call ListPathsSafely_If,$1,$2,8251,8500)
-	$(call ListPathsSafely_If,$1,$2,8501,8750)
-	$(call ListPathsSafely_If,$1,$2,8751,9000)
-
-	$(call ListPathsSafely_If,$1,$2,9001,9250)
-	$(call ListPathsSafely_If,$1,$2,9251,9500)
-	$(call ListPathsSafely_If,$1,$2,9501,9750)
-	$(call ListPathsSafely_If,$1,$2,9751,10000)
-
-	$(call ListPathsSafely_If,$1,$2,10001,10250)
-	$(call ListPathsSafely_If,$1,$2,10251,10500)
-	$(call ListPathsSafely_If,$1,$2,10501,10750)
-	$(call ListPathsSafely_If,$1,$2,10751,11000)
-
-	$(call ListPathsSafely_If,$1,$2,11001,11250)
-	$(call ListPathsSafely_If,$1,$2,11251,11500)
-	$(call ListPathsSafely_If,$1,$2,11501,11750)
-	$(call ListPathsSafely_If,$1,$2,11751,12000)
-
-	$(call ListPathsSafely_If,$1,$2,12001,12250)
-	$(call ListPathsSafely_If,$1,$2,12251,12500)
-	$(call ListPathsSafely_If,$1,$2,12501,12750)
-	$(call ListPathsSafely_If,$1,$2,12751,13000)
-
-	$(call ListPathsSafely_If,$1,$2,13001,13250)
-	$(call ListPathsSafely_If,$1,$2,13251,13500)
-	$(call ListPathsSafely_If,$1,$2,13501,13750)
-	$(call ListPathsSafely_If,$1,$2,13751,14000)
-
-	$(call ListPathsSafely_If,$1,$2,14001,14250)
-	$(call ListPathsSafely_If,$1,$2,14251,14500)
-	$(call ListPathsSafely_If,$1,$2,14501,14750)
-	$(call ListPathsSafely_If,$1,$2,14751,15000)
-
-	$(call ListPathsSafely_If,$1,$2,15001,15250)
-	$(call ListPathsSafely_If,$1,$2,15251,15500)
-	$(call ListPathsSafely_If,$1,$2,15501,15750)
-	$(call ListPathsSafely_If,$1,$2,15751,16000)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,1)
-	$(call ListPathsSafely_Printf,$1,$2,$3,251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,1001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,1251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,1501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,1751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,2001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,2251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,2501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,2751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,3001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,3251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,3501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,3751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,4001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,4251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,4501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,4751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,5001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,5251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,5501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,5751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,6001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,6251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,6501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,6751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,7001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,7251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,7501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,7751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,8001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,8251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,8501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,8751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,9001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,9251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,9501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,9751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,10001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,10251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,10501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,10751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,11001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,11251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,11501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,11751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,12001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,12251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,12501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,12751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,13001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,13251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,13501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,13751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,14001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,14251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,14501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,14751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,15001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,15251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,15501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,15751)
-endef
-
-define ListPathsSafelyNow_IfPrintf
-  ifneq (,$$(word $4,$$($1)))
-    $$(eval $1_LPS$4:=$$(call compress_paths,$$(wordlist $4,$5,$$($1))))
-    $$(shell printf -- "$$(strip $$($1_LPS$4))\n" | $(decompress_paths) $3)
-  endif
-endef
-
-# And an non-receipt version:
-define ListPathsSafelyNow
-  ifneq (,$$(word 10001,$$($1)))
-    $$(error Cannot list safely more than 10000 paths. $1 has $$(words $$($1)) paths!)
-  endif
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1,250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,251,500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,501,750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,751,1000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1001,1250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1251,1500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1501,1750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1751,2000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2001,2250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2251,2500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2501,2750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2751,3000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3001,3250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3251,3500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3501,3750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3751,4000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4001,4250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4251,4500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4501,4750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4751,5000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5001,5250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5251,5500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5501,5750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5751,6000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6001,6250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6251,6500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6501,6750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6751,7000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7001,7250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7251,7500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7501,7750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7751,8000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8001,8250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8251,8500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8501,8750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8751,9000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9001,9250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9251,9500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9501,9750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9751,10000)
-
-endef
-
-# The source tips can come from the Mercurial repository, or in the files
-# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same
-# directory as the original $(HGDIR) directory.
-# These should not be := assignments, only used from the root Makefile.
-HG_VERSION = $(shell $(HG) version 2> /dev/null)
-HG_DIRECTORY=.hg
-HGTIP_FILENAME=.hgtip
-HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO
-REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \
-    $(shell $(CD) $(SRC_ROOT) ; ( $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) ; \
-        $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
-        2> /dev/null)))))
-
-# Emit the repo:tip pairs to $@
-define GetSourceTips
-	$(CD) $(SRC_ROOT) ; \
-	for i in $(REPO_LIST) IGNORE ; do \
-	  if [ "$${i}" = "IGNORE" ] ; then \
-	    continue; \
-	  elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
-	    $(PRINTF) " %s:%s" \
-	        "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \
-	  elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
-	    $(PRINTF) " %s:%s" \
-	        "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
-	  fi; \
-	done >> $@
-	$(PRINTF) "\n" >> $@
-endef
-
-# Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk
-define CreateHgTip
-	$(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \
-	$(ECHO) $1/$(HGTIP_FILENAME)
-endef
-
-define SetupLogging
-  ifeq ($$(LOG_LEVEL),trace)
-    # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
-    # For each target executed, will print
-    # Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer)
-    # but with a limit of 20 on <ALL NEWER PREREQUISITES>, to avoid cluttering logs too much
-    # (and causing a crash on Cygwin).
-    # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
-    # Only use time if it's GNU time which supports format and output file.
-    WRAPPER_SHELL:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash
-    SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
-  endif
-  # Never remove warning messages; this is just for completeness
-  LOG_WARN=
-  ifneq ($$(findstring $$(LOG_LEVEL),info debug trace),)
-    LOG_INFO=
-  else
-    LOG_INFO=> /dev/null
-  endif
-  ifneq ($$(findstring $$(LOG_LEVEL),debug trace),)
-    LOG_DEBUG=
-  else
-    LOG_DEBUG=> /dev/null
-  endif
-  ifneq ($$(findstring $$(LOG_LEVEL),trace),)
-    LOG_TRACE=
-  else
-    LOG_TRACE=> /dev/null
-  endif
-endef
-
-# Make sure logging is setup for everyone that includes MakeBase.gmk.
-$(eval $(call SetupLogging))
-
-# This is to be called by all SetupFoo macros
-define LogSetupMacroEntry
-  $(if $(27),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
-  $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
-endef
-
-# Make directory without forking mkdir if not needed
-define MakeDir
-  ifneq ($$(wildcard $1 $2 $3 $4 $5 $6 $7 $8 $9),$$(strip $1 $2 $3 $4 $5 $6 $7 $8 $9))
-    $$(shell $(MKDIR) -p $1 $2 $3 $4 $5 $6 $7 $8 $9)
-  endif
-endef
-
-ifeq ($(OPENJDK_TARGET_OS),solaris)
-  # On Solaris, if the target is a symlink and exists, cp won't overwrite.
-  # Cp has to operate in recursive mode to allow for -P flag, to preserve soft links. If the
-  # name of the target file differs from the source file, rename after copy.
-  define install-file
-	$(MKDIR) -p $(@D)
-	$(RM) '$@'
-	$(CP) -f -r -P '$<' '$(@D)'
-	if [ "$(@F)" != "$(<F)" ]; then $(MV) '$(@D)/$(<F)' '$@'; fi
-  endef
-else ifeq ($(OPENJDK_TARGET_OS),macosx)
-  # On mac, extended attributes sometimes creep into the source files, which may later
-  # cause the creation of ._* files which confuses testing. Clear these with xattr if
-  # set. Some files get their write permissions removed after being copied to the
-  # output dir. When these are copied again to images, xattr would fail. By only clearing
-  # attributes when they are present, failing on this is avoided.
-  define install-file
-	$(MKDIR) -p $(@D)
-	$(CP) -fRP '$<' '$@'
-	if [ -n "`$(XATTR) -l '$@'`" ]; then $(XATTR) -c '$@'; fi
-  endef
-else
-  define install-file
-	$(MKDIR) -p $(@D)
-	$(CP) -fP '$<' '$@'
-  endef
-endif
-
-# Convenience functions for working around make's limitations with $(filter ).
-containing = $(foreach v,$2,$(if $(findstring $1,$v),$v))
-not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v))
-
-################################################################################
-# In Cygwin, finds are very costly, both because of expensive forks and because
-# of bad file system caching. Find is used extensively in $(shell) commands to
-# find source files. This makes rerunning make with no or few changes rather
-# expensive. To speed this up, these two macros are used to cache the results
-# of simple find commands for reuse.
-#
-# Runs a find and stores both the directories where it was run and the results.
-# This macro can be called multiple times to add to the cache. Only finds files
-# with no filters.
-#
-# Needs to be called with $(eval )
-#
-# Param 1 - Dir to find in
-ifeq ($(OPENJDK_BUILD_OS),windows)
-  define FillCacheFind
-    FIND_CACHE_DIR += $1
-    FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $1 -type f -o -type l))
-  endef
-else
-  define FillCacheFind
-  endef
-endif
-
-# Mimics find by looking in the cache if all of the directories have been cached.
-# Otherwise reverts to shell find. This is safe to call on all platforms, even if
-# cache is deactivated.
-#
-# The extra - is needed when FIND_CACHE_DIR is empty but should be harmless.
-# Param 1 - Dirs to find in
-define CacheFind
-  $(if $(filter-out $(addsuffix %,- $(FIND_CACHE_DIR)),$1), \
-    $(shell $(FIND) $1 -type f -o -type l), \
-    $(filter $(addsuffix %,$1),$(FIND_CACHE)))
-endef
-
-################################################################################
-
-endif # _MAKEBASE_GMK
diff --git a/make/common/NON_CORE_PKGS.gmk b/make/common/NON_CORE_PKGS.gmk
deleted file mode 100644
index daa3b0d..0000000
--- a/make/common/NON_CORE_PKGS.gmk
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Copyright (c) 2002, 2015, 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.
-#
-
-#
-# This file contains the package names of all the "non-core"
-# API published in the Java 2 SDK documentation. "Non-core" means
-# it includes all published API outside of the JDK API specification.
-#
-# These environment variables are used by javadoc in
-# make/docs/Makefile and are referenced by the localization
-# team when determining which APIs to extract javadoc
-# comments from.
-
-DOMAPI_PKGS = com.sun.java.browser.dom \
-    org.w3c.dom \
-    org.w3c.dom.bootstrap \
-    org.w3c.dom.ls \
-    org.w3c.dom.ranges \
-    org.w3c.dom.traversal \
-    org.w3c.dom.html \
-    org.w3c.dom.stylesheets \
-    org.w3c.dom.css \
-    org.w3c.dom.events \
-    org.w3c.dom.views
-
-JDI_PKGS = com.sun.jdi \
-    com.sun.jdi.event \
-    com.sun.jdi.request \
-    com.sun.jdi.connect \
-    com.sun.jdi.connect.spi
-
-MGMT_PKGS = com.sun.management
-
-JAAS_PKGS = com.sun.security.auth \
-    com.sun.security.auth.callback \
-    com.sun.security.auth.login \
-    com.sun.security.auth.module
-
-JGSS_PKGS = com.sun.security.jgss
-
-OLD_JSSE_PKGS = com.sun.net.ssl
-
-HTTPSERVER_PKGS = com.sun.net.httpserver \
-    com.sun.net.httpserver.spi
-
-NIO_PKGS = com.sun.nio.file
-
-DOCLETAPI_PKGS = com.sun.javadoc
-
-TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
-
-TAGLETAPI_PKGS = com.sun.tools.doclets
-
-ATTACH_PKGS = com.sun.tools.attach \
-    com.sun.tools.attach.spi
-
-JCONSOLE_PKGS = com.sun.tools.jconsole
-
-TREEAPI_PKGS = com.sun.source.doctree \
-    com.sun.source.tree \
-    com.sun.source.util \
-    jdk
-
-NASHORNAPI_PKGS = jdk.nashorn.api.scripting
-
-SMARTCARDIO_PKGS = javax.smartcardio
-
-SCTPAPI_PKGS = com.sun.nio.sctp
-
-ifeq ($(PLATFORM), macosx)
-  APPLE_EXT_PKGS = com.apple.concurrent \
-      com.apple.eawt \
-      com.apple.eawt.event \
-      com.apple.eio
-endif
-
-JDK_PKGS = jdk \
-     jdk.net \
-     jdk.management.cmm
-
-JACCESSAPI_PKGS = com.sun.java.accessibility.util
-
-# non-core packages in rt.jar
-NON_CORE_PKGS = $(DOMAPI_PKGS) \
-    $(MGMT_PKGS) \
-    $(JAAS_PKGS) \
-    $(JGSS_PKGS) \
-    $(NIO_PKGS) \
-    $(OLD_JSSE_PKGS) \
-    $(HTTPSERVER_PKGS) \
-    $(SMARTCARDIO_PKGS) \
-    $(SCTPAPI_PKGS) \
-    $(APPLE_EXT_PKGS) \
-    $(JDK_PKGS) \
-    $(JACCESSAPI_PKGS)
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
deleted file mode 100644
index 670f911..0000000
--- a/make/common/NativeCompilation.gmk
+++ /dev/null
@@ -1,598 +0,0 @@
-#
-# Copyright (c) 2011, 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.
-#
-
-# When you read this source. Remember that $(sort ...) has the side effect
-# of removing duplicates. It is actually this side effect that is
-# desired whenever sort is used below!
-
-ifeq (,$(_MAKEBASE_GMK))
-  $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk)
-endif
-
-ifeq ($(COMPILER_TYPE),CC)
-  COMPILING_MSG=echo $(LOG_INFO) "Compiling $(notdir $1) (for $(notdir $2))"
-  LINKING_MSG=echo $(LOG_INFO) "Linking $1"
-  LINKING_EXE_MSG=echo $(LOG_INFO) "Linking executable $1"
-  ARCHIVING_MSG=echo $(LOG_INFO) "Archiving $1"
-else
-  COMPILING_MSG=
-  LINKING_MSG=
-  LINKING_EXE_MSG=
-  ARCHIVING_MSG=
-endif
-
-define add_native_source
-  # param 1 = BUILD_MYPACKAGE
-  # parma 2 = the source file name (..../alfa.c or .../beta.cpp)
-  # param 3 = the bin dir that stores all .o (.obj) and .d files.
-  # param 4 = the c flags to the compiler
-  # param 5 = the c compiler
-  # param 6 = the c++ flags to the compiler
-  # param 7 = the c++ compiler
-  # param 8 = the flags to the assembler
-
-  ifneq (,$$(filter %.c,$2))
-    # Compile as a C file
-    $1_$2_FLAGS=$4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
-    $1_$2_COMP=$5
-    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
-  else ifneq (,$$(filter %.m,$2))
-    # Compile as a objective-c file
-    $1_$2_FLAGS=-x objective-c $4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
-    $1_$2_COMP=$5
-    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
-  else ifneq (,$$(filter %.s,$2))
-    # Compile as assembler file
-    $1_$2_FLAGS=$8 -DTHIS_FILE='"$$(<F)"'
-    $1_$2_COMP=$(AS)
-    $1_$2_DEP_FLAG:=
-  else
-    # Compile as a C++ file
-    $1_$2_FLAGS=$6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c
-    $1_$2_COMP=$7
-    $1_$2_DEP_FLAG:=$(CXX_FLAG_DEPS)
-  endif
-  # Generate the .o (.obj) file name and place it in the bin dir.
-  $1_$2_OBJ:=$3/$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $2)))))
-  # Only continue if this object file hasn't been processed already. This lets the first found
-  # source file override any other with the same name.
-  ifeq (,$$(findstring $$($1_$2_OBJ),$$($1_OBJS_SO_FAR)))
-    $1_OBJS_SO_FAR+=$$($1_$2_OBJ)
-    ifeq (,$$(filter %.s,$2))
-      # And this is the dependency file for this obj file.
-      $1_$2_DEP:=$$(patsubst %$(OBJ_SUFFIX),%.d,$$($1_$2_OBJ))
-      # Include previously generated dependency information. (if it exists)
-      -include $$($1_$2_DEP)
-
-      ifeq ($(COMPILER_TYPE),CL)
-        $1_$2_DEBUG_OUT_FLAGS:=-Fd$$(patsubst %$(OBJ_SUFFIX),%.pdb,$$($1_$2_OBJ)) \
-            -Fm$$(patsubst %$(OBJ_SUFFIX),%.map,$$($1_$2_OBJ))
-      endif
-    endif
-
-    $$($1_$2_OBJ) : $2
-        ifeq ($(COMPILER_TYPE),CC)
-	  $$(call COMPILING_MSG,$2,$$($1_TARGET))
-          # The Sun studio compiler doesn't output the full path to the object file in the
-          # generated deps files. Fixing it with sed. If compiling assembly, don't try this.
-          ifeq ($(COMPILER_NAME)$$(filter %.s,$2),ossc)
-	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
-	    $(SED) 's|^$$(@F):|$$@:|' $$($1_$2_DEP).tmp > $$($1_$2_DEP)
-          else
-	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
-          endif
-        endif
-        # The Visual Studio compiler lacks a feature for generating make dependencies, but by
-        # setting -showIncludes, all included files are printed. These are filtered out and
-        # parsed into make dependences.
-        ifeq ($(COMPILER_TYPE),CL)
-	  ($$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
-	      $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 ; echo $$$$? > $$($1_$2_DEP).exitvalue) \
-	      | $(TEE) $$($1_$2_DEP).raw | $(GREP) -v "^Note: including file:" \
-	      && exit `cat $$($1_$2_DEP).exitvalue`
-	  $(RM) $$($1_$2_DEP).exitvalue
-	  ($(ECHO) $$@: \\ \
-	  && $(SED) -e '/^Note: including file:/!d' \
-	      -e 's|Note: including file: *||' \
-	      -e 's|\\|/|g' \
-	      -e 's|^\([a-zA-Z]\):|/cygdrive/\1|g' \
-	      -e '/$(subst /,\/,$(TOPDIR))/!d' \
-	      -e 's|$$$$| \\|g' \
-	      $$($1_$2_DEP).raw) > $$($1_$2_DEP)
-        endif
-  endif
-endef
-
-define SetupNativeCompilation
-  # param 1 is for example BUILD_MYPACKAGE
-  # param 2,3,4,5,6,7,8 are named args.
-  #   SRC one or more directory roots to scan for C/C++ files.
-  #   LANG C or C++
-  #   CFLAGS the compiler flags to be used, used both for C and C++.
-  #   CXXFLAGS the compiler flags to be used for c++, if set overrides CFLAGS.
-  #   LDFLAGS the linker flags to be used, used both for C and C++.
-  #   LDFLAGS_SUFFIX the linker flags to be added last on the commandline
-  #       typically the libraries linked to.
-  #   ARFLAGS the archiver flags to be used
-  #   OBJECT_DIR the directory where we store the object files
-  #   LIBRARY the resulting library file
-  #   PROGRAM the resulting exec file
-  #   INCLUDES only pick source from these directories
-  #   EXCLUDES do not pick source from these directories
-  #   INCLUDE_FILES only compile exactly these files!
-  #   EXCLUDE_FILES with these names
-  #   VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run
-  #   RC_FLAGS flags for RC.
-  #   MAPFILE mapfile
-  #   REORDER reorder file
-  #   DEBUG_SYMBOLS add debug symbols (if configured on)
-  #   CC the compiler to use, default is $(CC)
-  #   LDEXE the linker to use for linking executables, default is $(LDEXE)
-  #   OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26))
-  $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
-
-  ifneq (,$$($1_BIN))
-    $$(error BIN has been replaced with OBJECT_DIR)
-  endif
-
-  ifneq (,$$($1_LIB))
-    $$(error LIB has been replaced with LIBRARY)
-  endif
-
-  ifneq (,$$($1_EXE))
-    $$(error EXE has been replaced with PROGRAM)
-  endif
-
-  ifneq (,$$($1_LIBRARY))
-    ifeq (,$$($1_OUTPUT_DIR))
-      $$(error LIBRARY requires OUTPUT_DIR)
-    endif
-
-    ifneq ($$($1_LIBRARY),$(basename $$($1_LIBRARY)))
-      $$(error directory of LIBRARY should be specified using OUTPUT_DIR)
-    endif
-
-    ifneq (,$(findstring $(SHARED_LIBRARY_SUFFIX),$$($1_LIBRARY)))
-      $$(error LIBRARY should be specified without SHARED_LIBRARY_SUFFIX: $(SHARED_LIBRARY_SUFFIX))
-    endif
-
-    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_LIBRARY)))
-      $$(error LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
-    endif
-
-    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_LIBRARY)$(SHARED_LIBRARY_SUFFIX)
-    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
-
-  endif
-
-  ifneq (,$$($1_STATIC_LIBRARY))
-    ifeq (,$$($1_OUTPUT_DIR))
-      $$(error STATIC_LIBRARY requires OUTPUT_DIR)
-    endif
-
-    ifneq ($$($1_STATIC_LIBRARY),$(basename $$($1_STATIC_LIBRARY)))
-      $$(error directory of STATIC_LIBRARY should be specified using OUTPUT_DIR)
-    endif
-
-    ifneq (,$(findstring $(STATIC_LIBRARY_SUFFIX),$$($1_STATIC_LIBRARY)))
-      $$(error STATIC_LIBRARY should be specified without STATIC_LIBRARY_SUFFIX: $(STATIC_LIBRARY_SUFFIX))
-    endif
-
-    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_STATIC_LIBRARY)))
-      $$(error STATIC_LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
-    endif
-
-    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)$(STATIC_LIBRARY_SUFFIX)
-    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
-  endif
-
-  ifneq (,$$($1_PROGRAM))
-    ifeq (,$$($1_OUTPUT_DIR))
-      $$(error PROGRAM requires OUTPUT_DIR)
-    endif
-
-    ifneq ($$($1_PROGRAM),$(basename $$($1_PROGRAM)))
-      $$(error directory of PROGRAM should be specified using OUTPUT_DIR)
-    endif
-
-    ifneq (,$(findstring $(EXE_SUFFIX),$$($1_PROGRAM)))
-      $$(error PROGRAM should be specified without EXE_SUFFIX: $(EXE_SUFFIX))
-    endif
-
-    $1_BASENAME:=$$($1_PROGRAM)$(EXE_SUFFIX)
-    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
-
-  endif
-
-  ifeq (,$$($1_TARGET))
-    $$(error Neither PROGRAM, LIBRARY nor STATIC_LIBRARY has been specified for SetupNativeCompilation)
-  endif
-
-  ifeq (,$$($1_LANG))
-    $$(error You have to specify LANG for native compilation $1)
-  endif
-  ifeq (C,$$($1_LANG))
-    ifeq ($$($1_LDEXE),)
-      $1_LDEXE:=$(LDEXE)
-    endif
-    $1_LD:=$(LD)
-  else
-    ifeq (C++,$$($1_LANG))
-      $1_LD:=$(LDCXX)
-      $1_LDEXE:=$(LDEXECXX)
-    else
-      $$(error Unknown native language $$($1_LANG) for $1)
-    endif
-  endif
-
-  ifeq ($$($1_CC),)
-    $1_CC:=$(CC)
-  endif
-
-  # Make sure the dirs exist.
-  $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)))
-  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
-
-  # Find all files in the source trees. Sort to remove duplicates.
-  $1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC)))
-  # Extract the C/C++ files.
-  $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
-  $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
-  ifneq ($$($1_EXCLUDE_FILES),)
-    $1_EXCLUDE_FILES:=$$(addprefix %,$$($1_EXCLUDE_FILES))
-  endif
-  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter %.s %.c %.cpp %.m,$$($1_ALL_SRCS)))
-  ifneq (,$$(strip $$($1_INCLUDE_FILES)))
-    $1_SRCS := $$(filter $$($1_INCLUDE_FILES),$$($1_SRCS))
-  endif
-  ifeq (,$$($1_SRCS))
-    $$(error No sources found for $1 when looking inside the dirs $$($1_SRC))
-  endif
-  # There can be only a single bin dir root, no need to foreach over the roots.
-  $1_BINS := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX))
-  # Now we have a list of all c/c++ files to compile: $$($1_SRCS)
-  # and we have a list of all existing object files: $$($1_BINS)
-
-  # Prepend the source/bin path to the filter expressions. Then do the filtering.
-  ifneq ($$($1_INCLUDES),)
-    $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
-    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
-  endif
-  ifneq ($$($1_EXCLUDES),)
-    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
-    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
-  endif
-
-  # Calculate the expected output from compiling the sources (sort to remove duplicates. Also provides
-  # a reproducable order on the input files to the linker).
-  $1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_OBJECT_DIR)/,$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $$($1_SRCS))))))))
-  # Are there too many object files on disk? Perhaps because some source file was removed?
-  $1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS)))
-  # Clean out the superfluous object files.
-  ifneq ($$($1_SUPERFLUOUS_OBJS),)
-    $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
-  endif
-
-  # Pickup extra OPENJDK_TARGET_OS_API, OPENJDK_TARGET_OS, and/or OPENJDK_TARGET_OS plus
-  # OPENJDK_TARGET_CPU pair dependent variables for CFLAGS.
-  $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) \
-      $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU))
-  ifneq ($(DEBUG_LEVEL),release)
-    # Pickup extra debug dependent variables for CFLAGS
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_debug)
-  else
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_release)
-  endif
-
-  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.
-  $1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS))
-  ifneq ($(DEBUG_LEVEL),release)
-    # Pickup extra debug dependent variables for CXXFLAGS
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_debug)
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
-  else
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release)
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_release)
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
-  endif
-
-  ifeq ($$($1_CXXFLAGS),)
-    $1_CXXFLAGS:=$$($1_CFLAGS)
-  endif
-  ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
-    $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
-  endif
-
-  ifneq (,$$($1_DEBUG_SYMBOLS))
-    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
-      ifdef OPENJDK
-        # Always add debug symbols
-        $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
-        $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
-      else
-        # Programs don't get the debug symbols added in the old build. It's not clear if
-        # this is intentional.
-        ifeq ($$($1_PROGRAM),)
-          $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
-          $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
-        endif
-      endif
-    endif
-  endif
-
-  ifneq (,$$($1_REORDER))
-    $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
-    $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)
-  endif
-
-  ifeq (NONE, $$($1_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_NONE)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NONE)
-  else ifeq (LOW, $$($1_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_NORM)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NORM)
-  else ifeq (HIGH, $$($1_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_HI)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HI)
-  else ifeq (HIGHEST, $$($1_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_HIGHEST)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST)
-  else ifneq (, $$($1_OPTIMIZATION))
-    $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
-  endif
-
-  # Now call add_native_source for each source file we are going to compile.
-  $$(foreach p,$$($1_SRCS), \
-      $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
-          $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \
-          $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS))))
-
-  # On windows we need to create a resource file
-  ifeq ($(OPENJDK_TARGET_OS), windows)
-    ifneq (,$$($1_VERSIONINFO_RESOURCE))
-      $1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res
-      $$($1_RES): $$($1_VERSIONINFO_RESOURCE)
-		$(RC) $$($1_RC_FLAGS) $(CC_OUT_OPTION)$$@ $$($1_VERSIONINFO_RESOURCE)
-    endif
-    ifneq (,$$($1_MANIFEST))
-      $1_GEN_MANIFEST:=$$($1_OBJECT_DIR)/$$($1_PROGRAM).manifest
-      IMVERSIONVALUE:=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER)
-      $$($1_GEN_MANIFEST): $$($1_MANIFEST)
-		$(SED) 's%IMVERSION%$$(IMVERSIONVALUE)%g;s%PROGRAM%$$($1_PROGRAM)%g' $$< > $$@
-    endif
-  endif
-
-  # mapfile doesnt seem to be implemented on macosx (yet??)
-  ifneq ($(OPENJDK_TARGET_OS),macosx)
-    ifneq ($(OPENJDK_TARGET_OS),windows)
-      $1_REAL_MAPFILE:=$$($1_MAPFILE)
-      ifneq (,$$($1_REORDER))
-        $1_REAL_MAPFILE:=$$($1_OBJECT_DIR)/mapfile
-
-        $$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER)
-		$$(MKDIR) -p $$(@D)
-		$$(CP) $$($1_MAPFILE) $$@.tmp
-		$$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp
-		$$(MV) $$@.tmp $$@
-      endif
-    endif
-  endif
-
-  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables
-  # for LDFLAGS and LDFLAGS_SUFFIX
-  $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS))
-  $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
-  ifneq (,$$($1_REAL_MAPFILE))
-    $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
-  endif
-
-  $1 := $$($1_TARGET)
-  ifneq (,$$($1_LIBRARY))
-    # Generating a dynamic library.
-    $1_EXTRA_LDFLAGS+=$$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
-    ifeq ($(OPENJDK_TARGET_OS), windows)
-      $1_EXTRA_LDFLAGS+="-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib"
-    endif
-
-    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
-
-    ifneq (,$$($1_DEBUG_SYMBOLS))
-      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
-        ifeq ($(OPENJDK_TARGET_OS), windows)
-          $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_LIBRARY).pdb" \
-              "-map:$$($1_OBJECT_DIR)/$$($1_LIBRARY).map"
-        endif
-
-        ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
-          $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
-		$(CP) $$< $$@
-        endif
-
-        ifneq ($(OPENJDK_TARGET_OS), macosx)   # OBJCOPY is not used on MacOS X
-          ifneq ($(OPENJDK_TARGET_OS), windows)  # nor on Windows
-            ifeq ($(OPENJDK_TARGET_OS), solaris)
-              # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-              # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-              # empty section headers until a fixed $(OBJCOPY) is available.
-              # An empty section header has sh_addr == 0 and sh_size == 0.
-              # This problem has only been seen on Solaris X64, but we call this tool
-              # on all Solaris builds just in case.
-              #
-              # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-              # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-              $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
-				$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
-		$(RM) $$@
-		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
-		$(OBJCOPY) --only-keep-debug $$< $$@
-		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-            else # not solaris
-              $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
-		$(RM) $$@
-		$(OBJCOPY) --only-keep-debug $$< $$@
-		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-            endif # Touch to not retrigger rule on rebuild
-		$(TOUCH) $$@
-          endif # !windows
-        endif # !macosx
-
-        ifeq ($(ZIP_DEBUGINFO_FILES), true)
-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
-          $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
-
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET)
-		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$($1_LIBRARY).map $$($1_LIBRARY).pdb
-          else
-            $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) \
-                $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-          endif
-endif # no MacOS X support yet
-        else
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
-                $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
-          else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
-            $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-          endif
-        endif
-      endif
-    endif
-
-    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE)
-	$$(call LINKING_MSG,$$($1_BASENAME))
-	$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(LD_OUT_OPTION)$$@ \
-	$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
-	$$($1_EXTRA_LDFLAGS_SUFFIX)
-
-  endif
-
-  ifneq (,$$($1_STATIC_LIBRARY))
-    # Generating a static library, ie object file archive.
-    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES)
-	$$(call ARCHIVING_MSG,$$($1_LIBRARY))
-	$(AR) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_EXPECTED_OBJS) \
-	    $$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
-  endif
-
-  ifneq (,$$($1_PROGRAM))
-    # A executable binary has been specified, setup the target for it.
-    ifneq (,$$($1_DEBUG_SYMBOLS))
-      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
-        ifeq ($(OPENJDK_TARGET_OS), windows)
-          $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_PROGRAM).pdb" \
-              "-map:$$($1_OBJECT_DIR)/$$($1_PROGRAM).map"
-        endif
-
-        ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
-          $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
-		$(CP) $$< $$@
-        endif
-
-        ifneq ($(OPENJDK_TARGET_OS), macosx)   # OBJCOPY is not used on MacOS X
-          ifneq ($(OPENJDK_TARGET_OS), windows)  # nor on Windows
-            ifeq ($(OPENJDK_TARGET_OS), solaris)
-              # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-              # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-              # empty section headers until a fixed $(OBJCOPY) is available.
-              # An empty section header has sh_addr == 0 and sh_size == 0.
-              # This problem has only been seen on Solaris X64, but we call this tool
-              # on all Solaris builds just in case.
-              #
-              # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-              # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-              $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
-				$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
-		$(RM) $$@
-		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
-		$(OBJCOPY) --only-keep-debug $$< $$@
-		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-            else # not solaris
-              $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
-		$(RM) $$@
-		$(OBJCOPY) --only-keep-debug $$< $$@
-		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-            endif
-		$(TOUCH) $$@
-          endif # !windows
-        endif # !macosx
-
-        ifeq ($(ZIP_DEBUGINFO_FILES), true)
-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
-          $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
-
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET)
-		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$($1_PROGRAM).map $$($1_PROGRAM).pdb
-          else
-            $$($1_OBJECT_DIR)/$$(PROGRAM_PREFIX)$$($1_PROGRAM).diz : $$($1_TARGET) \
-                $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo
-		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
-          endif
-endif # no MacOS X support yet
-        else
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
-                $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
-          else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
-            $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
-          endif
-        endif
-      endif
-    endif
-
-    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
-
-    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST)
-	$$(call LINKING_EXE_MSG,$$($1_BASENAME))
-	$$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(EXE_OUT_OPTION)$$($1_TARGET) \
-	$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
-	$$($1_EXTRA_LDFLAGS_SUFFIX)
-        ifneq (,$$($1_GEN_MANIFEST))
-	  $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
-        endif
-        # This only works if the openjdk_codesign identity is present on the system. Let
-        # silently fail otherwise.
-        ifneq (,$(CODESIGN))
-          ifneq (,$$($1_CODESIGN))
-	    $(CODESIGN) -s openjdk_codesign $$@
-          endif
-        endif
-  endif
-endef
diff --git a/make/common/RMICompilation.gmk b/make/common/RMICompilation.gmk
deleted file mode 100644
index 2c87b70..0000000
--- a/make/common/RMICompilation.gmk
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# Copyright (c) 2011, 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.
-#
-
-define SetupRMICompilation
-  # param 1 is a name for a variable to depend on.
-  # param 2 and up are named args.
-  #   CLASSES:=List of classes to generate stubs for
-  #   CLASSES_DIR:=Directory where to look for classes
-  #   STUB_CLASSES_DIR:=Directory in where to put stub classes
-  #   RUN_V11:=Set to run rmic with -v1.1
-  #   RUN_V12:=Set to run rmic with -v1.2
-  #   RUN_IIOP:=Set to run rmic with -iiop
-  #   RUN_IIOP_STDPKG:=Set to run rmic with -iiop -standardPackage
-  #   KEEP_GENERATED:=Set to keep generated sources around
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupRMICompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
-
-  $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/_the.$1_rmic.generated
-
-  $1_CLASSES_SLASH := $$(subst .,/,$$($1_CLASSES))
-  $1_CLASS_FILES := $$(addprefix $$($1_CLASSES_DIR)/,$$(addsuffix .class,$$($1_CLASSES_SLASH)))
-  $1_STUB_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Stub.class,$$($1_CLASSES_SLASH)))
-  $1_TARGETS := $$($1_STUB_FILES)
-  $1_ARGS :=
-  ifneq (,$$($1_RUN_V11))
-    $1_SKEL_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Skel.class,$$($1_CLASSES_SLASH)))
-    $1_TARGETS += $$($1_SKEL_FILES)
-    $1_ARGS += -v1.1
-  endif
-  ifneq (,$$($1_RUN_V12))
-    $1_ARGS += -v1.2
-  endif
-
-  $1_TIE_BASE_FILES := $$(foreach f,$$($1_CLASSES_SLASH),$$(dir $$f)_$$(notdir $$f))
-  $1_TIE_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/org/omg/stub/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
-  $1_TIE_STDPKG_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
-
-  ifneq (,$$($1_RUN_IIOP))
-    $1_TARGETS += $$($1_TIE_FILES)
-    $1_ARGS += -iiop -emitPermissionCheck
-  endif
-  ifneq (,$$($1_RUN_IIOP_STDPKG))
-    $1_TARGETS += $$($1_TIE_STDPKG_FILES)
-    $1_ARGS2 := -iiop -emitPermissionCheck -standardPackage
-  endif
-
-  ifneq (,$$($1_KEEP_GENERATED))
-    $1_ARGS += -keepgenerated
-    $1_TARGETS += $$(subst .class,.java,$$($1_TARGETS))
-  endif
-
-  $1_DOLLAR_SAFE_CLASSES := $$(subst $$$$,\$$$$,$$($1_CLASSES))
-
-  $$($1_TARGETS): $$($1_DEP_FILE) $$($1_CLASS_FILES)
-
-  $$($1_DEP_FILE): $$($1_CLASS_FILES)
-	$(MKDIR) -p $$($1_STUB_CLASSES_DIR)
-	if [ "x$$($1_ARGS)" != "x" ]; then \
-	  $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS) for $$($1_DOLLAR_SAFE_CLASSES) && \
-	  $(RMIC) $$($1_ARGS) -classpath "$$($1_CLASSES_DIR)" \
-	      -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
-	fi;
-	if [ "x$$($1_ARGS2)" != "x" ]; then \
-	  $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS2) for $$($1_DOLLAR_SAFE_CLASSES) && \
-	  $(RMIC) $$($1_ARGS2) -classpath "$$($1_CLASSES_DIR)" \
-	      -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
-	fi;
-	$(TOUCH) $$@
-
-
-  $1 := $$($1_TARGETS) $$($1_DEP_FILE)
-
-endef
diff --git a/make/common/support/ListPathsSafely-post-compress.incl b/make/common/support/ListPathsSafely-post-compress.incl
deleted file mode 100644
index d8ccf22..0000000
--- a/make/common/support/ListPathsSafely-post-compress.incl
+++ /dev/null
@@ -1 +0,0 @@
-))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
diff --git a/make/common/support/ListPathsSafely-pre-compress.incl b/make/common/support/ListPathsSafely-pre-compress.incl
deleted file mode 100644
index 7230c6c..0000000
--- a/make/common/support/ListPathsSafely-pre-compress.incl
+++ /dev/null
@@ -1 +0,0 @@
-$(subst com,X01,$(subst org,X02,$(subst sun,X03,$(subst java,X04,$(subst javax,X05,$(subst sun/io,X06,$(subst com/sun,X07,$(subst java/io,X08,$(subst org/omg,X09,$(subst org/w3c,X10,$(subst org/xml,X11,$(subst sun/awt,X12,$(subst sun/net,X13,$(subst sun/nio,X14,$(subst sun/rmi,X15,$(subst java/awt,X16,$(subst java/net,X17,$(subst java/nio,X18,$(subst java/rmi,X19,$(subst META-INF,X20,$(subst sun/font,X21,$(subst sun/misc,X22,$(subst sun/text,X23,$(subst sun/util,X24,$(subst java/lang,X25,$(subst java/math,X26,$(subst java/text,X27,$(subst java/util,X28,$(subst javax/jws,X29,$(subst javax/net,X30,$(subst javax/rmi,X31,$(subst javax/xml,X32,$(subst sun/corba,X33,$(subst sun/print,X34,$(subst sun/swing,X35,$(subst java/beans,X36,$(subst javax/lang,X37,$(subst sun/applet,X38,$(subst sun/java2d,X39,$(subst java/applet,X40,$(subst javax/print,X41,$(subst javax/sound,X42,$(subst javax/swing,X43,$(subst javax/tools,X44,$(subst jdk/classes,X45,$(subst org/relaxng,X46,$(subst sun/reflect,X47,$(subst javax/crypto,X48,$(subst javax/naming,X49,$(subst jaxp/classes,X50,$(subst sun/security,X51,$(subst corba/classes,X52,$(subst java/security,X53,$(subst javax/imageio,X54,$(subst jdk/btclasses,X55,$(subst javax/activity,X56,$(subst javax/security,X57,$(subst jdk/newclasses,X58,$(subst sun/instrument,X59,$(subst sun/management,X60,$(subst corba/btclasses,X61,$(subst jdk/democlasses,X62,$(subst javax/activation,X63,$(subst javax/annotation,X64,$(subst javax/management,X65,$(subst javax/transaction,X66,$(subst jaxws/jaf_classes,X67,$(subst langtools/classes,X68,$(subst META-INF/services,X69,$(subst jdk/newdemoclasses,X70,$(subst javax/accessibility,X71,$(subst jaxws/jaxws_classes,X72,
diff --git a/make/common/support/ListPathsSafely-uncompress.sed b/make/common/support/ListPathsSafely-uncompress.sed
deleted file mode 100644
index cd6966c..0000000
--- a/make/common/support/ListPathsSafely-uncompress.sed
+++ /dev/null
@@ -1,72 +0,0 @@
-s|X01|com|g
-s|X02|org|g
-s|X03|sun|g
-s|X04|java|g
-s|X05|javax|g
-s|X06|sun/io|g
-s|X07|com/sun|g
-s|X08|java/io|g
-s|X09|org/omg|g
-s|X10|org/w3c|g
-s|X11|org/xml|g
-s|X12|sun/awt|g
-s|X13|sun/net|g
-s|X14|sun/nio|g
-s|X15|sun/rmi|g
-s|X16|java/awt|g
-s|X17|java/net|g
-s|X18|java/nio|g
-s|X19|java/rmi|g
-s|X20|META-INF|g
-s|X21|sun/font|g
-s|X22|sun/misc|g
-s|X23|sun/text|g
-s|X24|sun/util|g
-s|X25|java/lang|g
-s|X26|java/math|g
-s|X27|java/text|g
-s|X28|java/util|g
-s|X29|javax/jws|g
-s|X30|javax/net|g
-s|X31|javax/rmi|g
-s|X32|javax/xml|g
-s|X33|sun/corba|g
-s|X34|sun/print|g
-s|X35|sun/swing|g
-s|X36|java/beans|g
-s|X37|javax/lang|g
-s|X38|sun/applet|g
-s|X39|sun/java2d|g
-s|X40|java/applet|g
-s|X41|javax/print|g
-s|X42|javax/sound|g
-s|X43|javax/swing|g
-s|X44|javax/tools|g
-s|X45|jdk/classes|g
-s|X46|org/relaxng|g
-s|X47|sun/reflect|g
-s|X48|javax/crypto|g
-s|X49|javax/naming|g
-s|X50|jaxp/classes|g
-s|X51|sun/security|g
-s|X52|corba/classes|g
-s|X53|java/security|g
-s|X54|javax/imageio|g
-s|X55|jdk/btclasses|g
-s|X56|javax/activity|g
-s|X57|javax/security|g
-s|X58|jdk/newclasses|g
-s|X59|sun/instrument|g
-s|X60|sun/management|g
-s|X61|corba/btclasses|g
-s|X62|jdk/democlasses|g
-s|X63|javax/activation|g
-s|X64|javax/annotation|g
-s|X65|javax/management|g
-s|X66|javax/transaction|g
-s|X67|jaxws/jaf_classes|g
-s|X68|langtools/classes|g
-s|X69|META-INF/services|g
-s|X70|jdk/newdemoclasses|g
-s|X71|javax/accessibility|g
-s|X72|jaxws/jaxws_classes|g
diff --git a/make/common/support/unicode2x.sed b/make/common/support/unicode2x.sed
deleted file mode 100644
index 5188b97..0000000
--- a/make/common/support/unicode2x.sed
+++ /dev/null
@@ -1,100 +0,0 @@
-s/\\u0020/\x20/g
-s/\\u003A/\x3A/g
-s/\\u006B/\x6B/g
-s/\\u0075/\x75/g
-s/\\u00A0/\xA0/g
-s/\\u00A3/\xA3/g
-s/\\u00B0/\xB0/g
-s/\\u00B7/\xB7/g
-s/\\u00BA/\xBA/g
-s/\\u00BF/\xBF/g
-s/\\u00C0/\xC0/g
-s/\\u00C1/\xC1/g
-s/\\u00C2/\xC2/g
-s/\\u00C4/\xC4/g
-s/\\u00C5/\xC5/g
-s/\\u00C8/\xC8/g
-s/\\u00C9/\xC9/g
-s/\\u00CA/\xCA/g
-s/\\u00CD/\xCD/g
-s/\\u00CE/\xCE/g
-s/\\u00D3/\xD3/g
-s/\\u00D4/\xD4/g
-s/\\u00D6/\xD6/g
-s/\\u00DA/\xDA/g
-s/\\u00DC/\xDC/g
-s/\\u00DD/\xDD/g
-s/\\u00DF/\xDF/g
-s/\\u00E0/\xE0/g
-s/\\u00E1/\xE1/g
-s/\\u00E2/\xE2/g
-s/\\u00E3/\xE3/g
-s/\\u00E4/\xE4/g
-s/\\u00E5/\xE5/g
-s/\\u00E6/\xE6/g
-s/\\u00E7/\xE7/g
-s/\\u00E8/\xE8/g
-s/\\u00E9/\xE9/g
-s/\\u00EA/\xEA/g
-s/\\u00EB/\xEB/g
-s/\\u00EC/\xEC/g
-s/\\u00ED/\xED/g
-s/\\u00EE/\xEE/g
-s/\\u00EF/\xEF/g
-s/\\u00F1/\xF1/g
-s/\\u00F2/\xF2/g
-s/\\u00F3/\xF3/g
-s/\\u00F4/\xF4/g
-s/\\u00F5/\xF5/g
-s/\\u00F6/\xF6/g
-s/\\u00F9/\xF9/g
-s/\\u00FA/\xFA/g
-s/\\u00FC/\xFC/g
-s/\\u0020/\x20/g
-s/\\u003f/\x3f/g
-s/\\u006f/\x6f/g
-s/\\u0075/\x75/g
-s/\\u00a0/\xa0/g
-s/\\u00a3/\xa3/g
-s/\\u00b0/\xb0/g
-s/\\u00ba/\xba/g
-s/\\u00bf/\xbf/g
-s/\\u00c1/\xc1/g
-s/\\u00c4/\xc4/g
-s/\\u00c5/\xc5/g
-s/\\u00c8/\xc8/g
-s/\\u00c9/\xc9/g
-s/\\u00ca/\xca/g
-s/\\u00cd/\xcd/g
-s/\\u00d6/\xd6/g
-s/\\u00dc/\xdc/g
-s/\\u00dd/\xdd/g
-s/\\u00df/\xdf/g
-s/\\u00e0/\xe0/g
-s/\\u00e1/\xe1/g
-s/\\u00e2/\xe2/g
-s/\\u00e3/\xe3/g
-s/\\u00e4/\xe4/g
-s/\\u00e5/\xe5/g
-s/\\u00e7/\xe7/g
-s/\\u00e8/\xe8/g
-s/\\u00e9/\xe9/g
-s/\\u00ea/\xea/g
-s/\\u00eb/\xeb/g
-s/\\u00ec/\xec/g
-s/\\u00ed/\xed/g
-s/\\u00ee/\xee/g
-s/\\u00ef/\xef/g
-s/\\u00f0/\xf0/g
-s/\\u00f1/\xf1/g
-s/\\u00f2/\xf2/g
-s/\\u00f3/\xf3/g
-s/\\u00f4/\xf4/g
-s/\\u00f5/\xf5/g
-s/\\u00f6/\xf6/g
-s/\\u00f7/\xf7/g
-s/\\u00f8/\xf8/g
-s/\\u00f9/\xf9/g
-s/\\u00fa/\xfa/g
-s/\\u00fc/\xfc/g
-s/\\u00ff/\xff/g
diff --git a/make/devkit/Makefile b/make/devkit/Makefile
deleted file mode 100644
index a6a5ca9..0000000
--- a/make/devkit/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# Copyright (c) 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.
-#
-
-##########################################################################################
-#
-# This Makefile, together with Tools.gmk, can be used to compile a set of
-# gcc based cross compilation, portable, self contained packages, capable
-# of building OpenJDK.
-#
-# In addition to the makefiles, access to Oracle Linux installation
-# media is required. This has been tested against Oracle Enterprise Linux
-# 5.5. Set variables RPM_DIR_x86_64 and RPM_DIR_i686 respectively to point
-# to directory containing the RPMs.
-#
-# By default this Makefile will build crosstools for:
-# * i686-unknown-linux-gnu
-# * x86_64-unknown-linux-gnu
-# The x86_64 version of the compilers will work in multi arch mode and will
-# be able to compile 32bit binaries with the -m32 flag. This makes the
-# explicit cross compiler for i686 somewhat redundant and is a known issue.
-#
-# To build the full set of crosstools, use a command line looking like this:
-#
-# make tars RPM_DIR_x86_64=/tmp/oel55-x86_64/Server/ RPM_DIR_i686=/tmp/oel55-i686/Server/
-#
-# To create a x86_64 package without the redundant i686 cross compiler, do
-# like this:
-#
-# make tars platforms=x86_64-unknown-linux-gnu RPM_DIR_x86_64=/tmp/oel55-x86_64/Server/ RPM_DIR_i686=/tmp/oel55-i686/Server/
-
-#
-# Main makefile which iterates over all host and target platforms.
-#
-
-os := $(shell uname -o)
-cpu := x86_64
-#$(shell uname -p)
-
-#
-# This wrapper script can handle exactly these platforms
-#
-platforms := $(foreach p,x86_64 i686,$(p)-unknown-linux-gnu)
-#platforms := $(foreach p,x86_64,$(p)-unknown-linux-gnu)
-
-# Figure out what platform this is building on.
-me := $(cpu)-$(if $(findstring Linux,$(os)),unknown-linux-gnu)
-
-$(info Building on platform $(me))
-
-all compile : $(platforms)
-
-ifeq (,$(SKIP_ME))
-  $(foreach p,$(filter-out $(me),$(platforms)),$(eval $(p) : $$(me)))
-endif
-
-OUTPUT_ROOT = $(abspath ../../../build/devkit)
-RESULT = $(OUTPUT_ROOT)/result
-
-submakevars = HOST=$@ BUILD=$(me) \
-    RESULT=$(RESULT) PREFIX=$(RESULT)/$@ \
-    OUTPUT_ROOT=$(OUTPUT_ROOT)
-$(platforms) :
-	@echo 'Building compilers for $@'
-	@echo 'Targets: $(platforms)'
-	for p in $@ $(filter-out $@,$(platforms)); do \
-	  $(MAKE) -f Tools.gmk all $(submakevars) \
-	      TARGET=$$p || exit 1 ; \
-	done
-	@echo 'Building ccache program for $@'
-	$(MAKE) -f Tools.gmk ccache $(submakevars) TARGET=$@
-	@echo 'All done"'
-
-$(foreach a,i686 x86_64,$(eval $(a) : $(filter $(a)%,$(platforms))))
-
-ia32 : i686
-today := $(shell date +%Y%m%d)
-
-
-define Mktar
-  $(1)_tar = $$(RESULT)/sdk-$(1)-$$(today).tar.gz
-  $$($(1)_tar) : PLATFORM = $(1)
-  TARFILES += $$($(1)_tar)
-  $$($(1)_tar) : $(1) $$(shell find $$(RESULT)/$(1))
-endef
-
-$(foreach p,$(platforms),$(eval $(call Mktar,$(p))))
-
-tars : all $(TARFILES)
-onlytars : $(TARFILES)
-%.tar.gz :
-	@echo 'Creating compiler package $@'
-	cd $(RESULT)/$(PLATFORM) && tar -czf $@ *
-	touch $@
-
-clean :
-	rm -rf build result
-
-FORCE :
-.PHONY : $(configs) $(platforms)
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
deleted file mode 100644
index 457dacb..0000000
--- a/make/devkit/Tools.gmk
+++ /dev/null
@@ -1,473 +0,0 @@
-#
-# Copyright (c) 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.
-#
-
-##########################################################################################
-#
-# Workhorse makefile for creating ONE cross compiler
-# Needs either to be from BUILD -> BUILD OR have
-# BUILD -> HOST prebuilt
-#
-# NOTE: There is a bug here. We don't limit the
-# PATH when building BUILD -> BUILD, which means that
-# if you configure after you've once build the BUILD->BUILD
-# compiler THAT one will be picked up as the compiler for itself.
-# This is not so great, especially if you did a partial delete
-# of the target tree.
-#
-# Fix this...
-#
-
-$(info TARGET=$(TARGET))
-$(info HOST=$(HOST))
-$(info BUILD=$(BUILD))
-
-ARCH := $(word 1,$(subst -, ,$(TARGET)))
-
-##########################################################################################
-# Define external dependencies
-
-# Latest that could be made to work.
-gcc_ver := gcc-4.7.3
-binutils_ver := binutils-2.22
-ccache_ver := ccache-3.1.9
-mpfr_ver := mpfr-3.0.1
-gmp_ver := gmp-4.3.2
-mpc_ver := mpc-1.0.1
-
-GCC := http://ftp.gnu.org/pub/gnu/gcc/$(gcc_ver)/$(gcc_ver).tar.bz2
-BINUTILS := http://ftp.gnu.org/pub/gnu/binutils/$(binutils_ver).tar.bz2
-CCACHE := http://samba.org/ftp/ccache/$(ccache_ver).tar.gz
-MPFR := http://www.mpfr.org/${mpfr_ver}/${mpfr_ver}.tar.bz2
-GMP := http://ftp.gnu.org/pub/gnu/gmp/${gmp_ver}.tar.bz2
-MPC := http://www.multiprecision.org/mpc/download/${mpc_ver}.tar.gz
-
-# RPMs in OEL5.5
-RPM_LIST := \
-    kernel-headers \
-    glibc-2 glibc-headers glibc-devel \
-    cups-libs cups-devel \
-    libX11 libX11-devel \
-    xorg-x11-proto-devel \
-    alsa-lib alsa-lib-devel \
-    libXext libXext-devel \
-    libXtst libXtst-devel \
-    libXrender libXrender-devel \
-    freetype freetype-devel \
-    libXt libXt-devel \
-    libSM libSM-devel \
-    libICE libICE-devel \
-    libXi libXi-devel \
-    libXdmcp libXdmcp-devel \
-    libXau libXau-devel \
-    libgcc
-
-
-ifeq ($(ARCH),x86_64)
-  RPM_DIR ?= $(RPM_DIR_x86_64)
-  RPM_ARCHS := x86_64
-  ifeq ($(BUILD),$(HOST))
-    ifeq ($(TARGET),$(HOST))
-      # When building the native compiler for x86_64, enable mixed mode.
-      RPM_ARCHS += i386 i686
-    endif
-  endif
-else
-  RPM_DIR ?= $(RPM_DIR_i686)
-  RPM_ARCHS := i386 i686
-endif
-
-# Sort to remove duplicates
-RPM_FILE_LIST := $(sort $(foreach a,$(RPM_ARCHS),$(wildcard $(patsubst %,$(RPM_DIR)/%*$a.rpm,$(RPM_LIST)))))
-
-ifeq ($(RPM_FILE_LIST),)
-  $(error Found no RPMs, RPM_DIR must point to list of directories to search for RPMs)
-endif
-
-##########################################################################################
-# Define common directories and files
-
-# Ensure we have 32-bit libs also for x64. We enable mixed-mode.
-ifeq (x86_64,$(ARCH))
-  LIBDIRS := lib64 lib
-  CFLAGS_lib := -m32
-else
-  LIBDIRS := lib
-endif
-
-# Define directories
-RESULT := $(OUTPUT_ROOT)/result
-BUILDDIR := $(OUTPUT_ROOT)/$(HOST)/$(TARGET)
-PREFIX := $(RESULT)/$(HOST)
-TARGETDIR := $(PREFIX)/$(TARGET)
-SYSROOT := $(TARGETDIR)/sys-root
-DOWNLOAD := $(OUTPUT_ROOT)/download
-SRCDIR := $(OUTPUT_ROOT)/src
-
-# Marker file for unpacking rpms
-rpms := $(SYSROOT)/rpms_unpacked
-
-# Need to patch libs that are linker scripts to use non-absolute paths
-libs := $(SYSROOT)/libs_patched
-
-##########################################################################################
-# Unpack source packages
-
-# Generate downloading + unpacking of sources.
-define Download
-  $(1)_DIR = $(abspath $(SRCDIR)/$(basename $(basename $(notdir $($(1))))))
-  $(1)_CFG = $$($(1)_DIR)/configure
-  $(1)_FILE = $(DOWNLOAD)/$(notdir $($(1)))
-
-  $$($(1)_CFG) : $$($(1)_FILE)
-	mkdir -p $$(SRCDIR)
-	tar -C $$(SRCDIR) -x$$(if $$(findstring .gz, $$<),z,j)f $$<
-	$$(foreach p,$$(abspath $$(wildcard $$(notdir $$($(1)_DIR)).patch)), \
-	  echo PATCHING $$(p) ; \
-	  patch -d $$($(1)_DIR) -p1 -i $$(p) ; \
-	)
-	touch $$@
-
-  $$($(1)_FILE) :
-	wget -P $(DOWNLOAD) $$($(1))
-endef
-
-# Download and unpack all source packages
-$(foreach p,GCC BINUTILS CCACHE MPFR GMP MPC,$(eval $(call Download,$(p))))
-
-##########################################################################################
-# Unpack RPMS
-
-# Note. For building linux you should install rpm2cpio.
-define unrpm
-  $(SYSROOT)/$(notdir $(1)).unpacked \
-    : $(1)
-  $$(rpms) : $(SYSROOT)/$(notdir $(1)).unpacked
-endef
-
-%.unpacked :
-	$(info Unpacking target rpms and libraries from $<)
-	@(mkdir -p $(@D); \
-	cd $(@D); \
-	rpm2cpio $< | \
-	    cpio --extract --make-directories \
-	        -f \
-	        "./usr/share/doc/*" \
-	        "./usr/share/man/*" \
-	        "./usr/X11R6/man/*" \
-	        "*/X11/locale/*" \
-	    || die ; )
-	touch $@
-
-$(foreach p,$(RPM_FILE_LIST),$(eval $(call unrpm,$(p))))
-
-##########################################################################################
-
-# Note: MUST create a <sys-root>/usr/lib even if not really needed.
-# gcc will use a path relative to it to resolve lib64. (x86_64).
-# we're creating multi-lib compiler with 32bit libc as well, so we should
-# have it anyway, but just to make sure...
-# Patch libc.so and libpthread.so to force linking against libraries in sysroot
-# and not the ones installed on the build machine.
-$(libs) : $(rpms)
-	@echo Patching libc and pthreads
-	@(for f in `find $(SYSROOT) -name libc.so -o -name libpthread.so`; do \
-	  (cat $$f | sed -e 's|/usr/lib64/||g' \
-	      -e 's|/usr/lib/||g' \
-	      -e 's|/lib64/||g' \
-	      -e 's|/lib/||g' ) > $$f.tmp ; \
-	  mv $$f.tmp $$f ; \
-	done)
-	@mkdir -p $(SYSROOT)/usr/lib
-	@touch $@
-
-##########################################################################################
-
-# Define marker files for each source package to be compiled
-$(foreach t,binutils mpfr gmp mpc gcc ccache,$(eval $(t) = $(TARGETDIR)/$($(t)_ver).done))
-
-##########################################################################################
-
-# Default base config
-CONFIG = --target=$(TARGET) \
-    --host=$(HOST) --build=$(BUILD) \
-    --prefix=$(PREFIX)
-
-PATHEXT = $(RESULT)/$(BUILD)/bin:
-
-PATHPRE = PATH=$(PATHEXT)$(PATH)
-BUILDPAR = -j16
-
-# Default commands to when making
-MAKECMD =
-INSTALLCMD = install
-
-
-declare_tools = CC$(1)=$(2)gcc LD$(1)=$(2)ld AR$(1)=$(2)ar AS$(1)=$(2)as RANLIB$(1)=$(2)ranlib CXX$(1)=$(2)g++ OBJDUMP$(1)=$(2)objdump
-
-ifeq ($(HOST),$(BUILD))
-  ifeq ($(HOST),$(TARGET))
-    TOOLS = $(call declare_tools,_FOR_TARGET,)
-  endif
-endif
-
-TOOLS ?= $(call declare_tools,_FOR_TARGET,$(TARGET)-)
-
-##########################################################################################
-
-# Create a TARGET bfd + libiberty only.
-# Configure one or two times depending on mulitlib arch.
-# If multilib, the second should be 32-bit, and we resolve
-# CFLAG_<name> to most likely -m32.
-define mk_bfd
-  $$(info Libs for $(1))
-  $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile \
-      : CFLAGS += $$(CFLAGS_$(1))
-  $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile \
-      : LIBDIRS = --libdir=$(TARGETDIR)/$(1)
-
-  bfdlib += $$(TARGETDIR)/$$(binutils_ver)-$(subst /,-,$(1)).done
-  bfdmakes += $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile
-endef
-
-# Create one set of bfds etc for each multilib arch
-$(foreach l,$(LIBDIRS),$(eval $(call mk_bfd,$(l))))
-
-# Only build these two libs.
-$(bfdlib) : MAKECMD = all-libiberty all-bfd
-$(bfdlib) : INSTALLCMD = install-libiberty install-bfd
-
-# Building targets libbfd + libiberty. HOST==TARGET, i.e not
-# for a cross env.
-$(bfdmakes) : CONFIG = --target=$(TARGET) \
-    --host=$(TARGET) --build=$(BUILD) \
-    --prefix=$(TARGETDIR) \
-    --with-sysroot=$(SYSROOT) \
-    $(LIBDIRS)
-
-$(bfdmakes) : TOOLS = $(call declare_tools,_FOR_TARGET,$(TARGET)-) $(call declare_tools,,$(TARGET)-)
-
-##########################################################################################
-
-$(gcc) \
-    $(binutils) \
-    $(gmp) \
-    $(mpfr) \
-    $(mpc) \
-    $(bfdmakes) \
-    $(ccache) : ENVS += $(TOOLS)
-
-# libdir to work around hateful bfd stuff installing into wrong dirs...
-# ensure we have 64 bit bfd support in the HOST library. I.e our
-# compiler on i686 will know 64 bit symbols, BUT later
-# we build just the libs again for TARGET, then with whatever the arch
-# wants.
-$(BUILDDIR)/$(binutils_ver)/Makefile : CONFIG += --enable-64-bit-bfd --libdir=$(PREFIX)/$(word 1,$(LIBDIRS))
-
-# Makefile creation. Simply run configure in build dir.
-$(bfdmakes) \
-$(BUILDDIR)/$(binutils_ver)/Makefile \
-    : $(BINUTILS_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
-	      $(BINUTILS_CFG) \
-	      $(CONFIG) \
-	      --with-sysroot=$(SYSROOT) \
-	      --disable-nls \
-	      --program-prefix=$(TARGET)- \
-	      --enable-multilib \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-$(BUILDDIR)/$(mpfr_ver)/Makefile \
-    : $(MPFR_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
-	      $(MPFR_CFG) \
-	      $(CONFIG) \
-	      --program-prefix=$(TARGET)- \
-	      --enable-shared=no \
-	      --with-gmp=$(PREFIX) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-$(BUILDDIR)/$(gmp_ver)/Makefile \
-    : $(GMP_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
-	      $(GMP_CFG) \
-	      --host=$(HOST) --build=$(BUILD) \
-	      --prefix=$(PREFIX) \
-	      --disable-nls \
-	      --program-prefix=$(TARGET)- \
-	      --enable-shared=no \
-	      --with-mpfr=$(PREFIX) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-$(BUILDDIR)/$(mpc_ver)/Makefile \
-    : $(MPC_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
-	      $(MPC_CFG) \
-	      $(CONFIG) \
-	      --program-prefix=$(TARGET)- \
-	      --enable-shared=no \
-	      --with-mpfr=$(PREFIX) \
-	      --with-gmp=$(PREFIX) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-# Only valid if glibc target -> linux
-# proper destructor handling for c++
-ifneq (,$(findstring linux,$(TARGET)))
-  $(BUILDDIR)/$(gcc_ver)/Makefile : CONFIG += --enable-__cxa_atexit
-endif
-
-# Want:
-# c,c++
-# shared libs
-# multilib (-m32/-m64 on x64)
-# skip native language.
-# and link and assemble with the binutils we created
-# earlier, so --with-gnu*
-$(BUILDDIR)/$(gcc_ver)/Makefile \
-    : $(GCC_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) $(GCC_CFG) $(EXTRA_CFLAGS) \
-	      $(CONFIG) \
-	      --with-sysroot=$(SYSROOT) \
-	      --enable-languages=c,c++ \
-	      --enable-shared \
-	      --enable-multilib \
-	      --disable-nls \
-	      --with-gnu-as \
-	      --with-gnu-ld \
-	      --with-mpfr=$(PREFIX) \
-	      --with-gmp=$(PREFIX) \
-	      --with-mpc=$(PREFIX) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-# need binutils for gcc
-$(gcc) : $(binutils)
-
-# as of 4.3 or so need these for doing config
-$(BUILDDIR)/$(gcc_ver)/Makefile : $(gmp) $(mpfr) $(mpc)
-$(mpfr) : $(gmp)
-$(mpc) : $(gmp) $(mpfr)
-
-##########################################################################################
-# very straightforward. just build a ccache. it is only for host.
-$(BUILDDIR)/$(ccache_ver)/Makefile \
-    : $(CCACHE_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	@( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) $(CCACHE_CFG) \
-	      $(CONFIG) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-gccpatch = $(TARGETDIR)/gcc-patched
-
-##########################################################################################
-# For some reason cpp is not created as a target-compiler
-ifeq ($(HOST),$(TARGET))
-  $(gccpatch) : $(gcc) link_libs
-	@echo -n 'Creating compiler symlinks...'
-	@for f in cpp; do \
-	  if [ ! -e $(PREFIX)/bin/$(TARGET)-$$f ]; \
-	  then \
-	    cd $(PREFIX)/bin && \
-	    ln -s $$f $(TARGET)-$$f ; \
-	  fi \
-	done
-	@touch $@
-	@echo 'done'
-
-  ##########################################################################################
-  # Ugly at best. Seems that when we compile host->host compiler, that are NOT
-  # the BUILD compiler, the result will not try searching for libs in package root.
-  # "Solve" this by create links from the target libdirs to where they are.
-  link_libs:
-	@echo -n 'Creating library symlinks...'
-	@$(foreach l,$(LIBDIRS), \
-	for f in `cd $(PREFIX)/$(l) && ls`; do \
-	  if [ ! -e $(TARGETDIR)/$(l)/$$f ]; then \
-	    mkdir -p $(TARGETDIR)/$(l) && \
-	    cd $(TARGETDIR)/$(l)/ && \
-	    ln -s $(if $(findstring /,$(l)),../,)../../$(l)/$$f $$f; \
-	  fi \
-	done;)
-	@echo 'done'
-else
-  $(gccpatch) :
-	@echo 'done'
-endif
-
-##########################################################################################
-# Build in two steps.
-# make <default>
-# make install.
-# Use path to our build hosts cross tools
-# Always need to build cross tools for build host self.
-$(TARGETDIR)/%.done : $(BUILDDIR)/%/Makefile
-	$(info Building $(basename $@). Log in $(<D)/log.build)
-	$(PATHPRE) $(ENVS) $(MAKE) $(BUILDPAR) -f $< -C $(<D) $(MAKECMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.build 2>&1
-	@echo -n 'installing...'
-	$(PATHPRE) $(MAKE) $(INSTALLPAR) -f $< -C $(<D) $(INSTALLCMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.install 2>&1
-	@touch $@
-	@echo 'done'
-
-##########################################################################################
-
-bfdlib : $(bfdlib)
-binutils : $(binutils)
-rpms : $(rpms)
-libs : $(libs)
-sysroot : rpms libs
-gcc : sysroot $(gcc) $(gccpatch)
-all : binutils gcc bfdlib
-
-# this is only built for host. so separate.
-ccache : $(ccache)
-
-.PHONY : gcc all binutils bfdlib link_libs rpms libs sysroot
diff --git a/make/jprt.properties b/make/jprt.properties
deleted file mode 100644
index d7988ff..0000000
--- a/make/jprt.properties
+++ /dev/null
@@ -1,489 +0,0 @@
-#
-# Copyright (c) 2006, 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
-# 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.
-#
-
-##############
-#
-# Global settings
-#
-
-# The current release name
-my.jdk.update.version=66
-jprt.tools.default.release=jdk8u60
-
-# Check if this is the equivalent of a hotspot push job
-# Interpret -testset hotspot to mean exactly that
-my.is.hotspot.job.hotspot=true
-my.is.hotspot.job=${my.is.hotspot.job.${jprt.test.set}}
-
-# Disable syncing the source after builds and tests are done
-jprt.sync.push=${my.is.hotspot.job ? false : true}
-
-# Directories to be excluded from the source bundles
-jprt.bundle.exclude.src.dirs=build dist webrev
-
-# Use configure when building
-jprt.build.use.configure=true
-
-# Set make target to use for different build flavors
-jprt.build.flavor.debugOpen.target=jprt_bundle
-jprt.build.flavor.fastdebug.target=jprt_bundle
-jprt.build.flavor.product.target=jprt_bundle
-jprt.build.flavor.productOpen.target=jprt_bundle
-
-# Use these configure args to define debug level
-jprt.debug.build.configure.args=--with-debug-level=slowdebug
-jprt.fastdebug.build.configure.args=--with-debug-level=fastdebug
-jprt.product.build.configure.args=--with-debug-level=release
-jprt.debugOpen.build.configure.args=${jprt.debug.build.configure.args} --enable-openjdk-only
-jprt.fastdebugOpen.build.configure.args=${jprt.fastdebug.build.configure.args} --enable-openjdk-only
-jprt.productOpen.build.configure.args=${jprt.product.build.configure.args} --enable-openjdk-only
-
-# Select build flavors and build targets
-jprt.build.flavors=${my.is.hotspot.job ? ${my.build.flavors.hotspot} : ${my.build.flavors.default}}
-jprt.build.targets=${my.is.hotspot.job ? ${my.build.targets.hotspot} : ${my.build.targets.default}}
-
-# Select test targets - jprt default for jprt.test.set is "default"
-jprt.test.targets=${my.test.targets.${jprt.test.set}}
-jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}}
-
-# 7155453: Work-around to prevent popups on OSX from blocking test completion
-# but the work-around is added to all platforms to be consistent
-jprt.jbb.options=-Djava.awt.headless=true
-
-########
-#
-# Build options (generic)
-#
-
-# Configure args common to all builds
-# Also allows for additional, testset specific configure arguments to be set
-jprt.build.configure.args=						\
-    --with-boot-jdk=$ALT_BOOTDIR					\
-    --with-jobs=$ALT_PARALLEL_COMPILE_JOBS				\
-    --with-update-version=${my.jdk.update.version}			\
-    ${my.additional.build.configure.args.${jprt.test.set}}
-
-# i586 is often cross-compiled from 64-bit machines, so need to set target bits explicitly
-jprt.i586.build.configure.args=						\
-    --with-target-bits=32
-
-# i586 platforms have both client and server, but to allow for overriding the exact configuration
-# on a per-build flavor basis the value is set for the individual build flavors
-# All other platforms only build server, which is the default setting from configure
-my.i586.default.build.configure.args=					\
-    --with-jvm-variants=client,server
-jprt.i586.debug.build.configure.args=					\
-    ${my.i586.default.build.configure.args}				\
-    ${jprt.debug.build.configure.args}
-jprt.i586.fastdebug.build.configure.args=				\
-    ${my.i586.default.build.configure.args}				\
-    ${jprt.fastdebug.build.configure.args}
-jprt.i586.product.build.configure.args=					\
-    ${my.i586.default.build.configure.args}				\
-    ${jprt.product.build.configure.args}
-jprt.i586.debugOpen.build.configure.args=				\
-    ${my.i586.default.build.configure.args}				\
-    ${jprt.debugOpen.build.configure.args}
-jprt.i586.fastdebugOpen.build.configure.args=				\
-    ${my.i586.default.build.configure.args}				\
-    ${jprt.fastdebugOpen.build.configure.args}
-jprt.i586.productOpen.build.configure.args=				\
-    ${my.i586.default.build.configure.args}				\
-    ${jprt.productOpen.build.configure.args}
-
-########
-#
-# Build targets and options (default/jdk)
-#
-
-# The default build flavors
-my.build.flavors.default=fastdebug,product
-
-# Standard list of jprt build targets for this source tree
-my.build.targets.default=						\
-    solaris_sparcv9_5.10-{product|fastdebug},				\
-    solaris_x64_5.10-{product|fastdebug},				\
-    linux_i586_2.6-{product|fastdebug},					\
-    linux_x64_2.6-{product|fastdebug},					\
-    macosx_x64_10.7-{product|fastdebug},				\
-    windows_i586_6.1-{product|fastdebug},				\
-    windows_x64_6.1-{product|fastdebug}
-
-# Test target list (no fastdebug & limited c2 testing)
-my.test.target.set=							\
-    solaris_sparcv9_5.10-product-c2-TESTNAME,				\
-    solaris_x64_5.10-product-c2-TESTNAME,				\
-    linux_i586_2.6-product-{c1|c2}-TESTNAME,				\
-    linux_x64_2.6-product-c2-TESTNAME,					\
-    macosx_x64_10.7-product-c2-TESTNAME,				\
-    windows_i586_6.1-product-c1-TESTNAME,				\
-    windows_x64_6.1-product-c2-TESTNAME
-
-# Default vm test targets (testset=default)
-my.test.targets.default=						\
-    ${my.test.target.set:TESTNAME=jvm98},				\
-    ${my.test.target.set:TESTNAME=scimark}
-
-# Default jdk test targets (testset=default)
-my.make.rule.test.targets.default=					\
-    ${my.test.target.set:TESTNAME=langtools_jtreg},			\
-    ${my.test.target.set:TESTNAME=jdk_lang},				\
-    ${my.test.target.set:TESTNAME=jdk_math},				\
-    ${my.test.target.set:TESTNAME=jdk_util}
-    
-# Default vm test targets (testset=core)
-my.test.targets.core=
-
-# Core jdk test targets (testset=core)
-my.make.rule.test.targets.core=						\
-    ${my.test.target.set:TESTNAME=jdk_lang},				\
-    ${my.test.target.set:TESTNAME=jdk_math},				\
-    ${my.test.target.set:TESTNAME=jdk_util},				\
-    ${my.test.target.set:TESTNAME=jdk_io},				\
-    ${my.test.target.set:TESTNAME=jdk_net},				\
-    ${my.test.target.set:TESTNAME=jdk_nio},				\
-    ${my.test.target.set:TESTNAME=jdk_security1},			\
-    ${my.test.target.set:TESTNAME=jdk_security2},			\
-    ${my.test.target.set:TESTNAME=jdk_security3},			\
-    ${my.test.target.set:TESTNAME=jdk_security4},			\
-    ${my.test.target.set:TESTNAME=jdk_rmi},				\
-    ${my.test.target.set:TESTNAME=jdk_text},				\
-    ${my.test.target.set:TESTNAME=jdk_time},				\
-    ${my.test.target.set:TESTNAME=jdk_other},				\
-    ${my.test.target.set:TESTNAME=core_tools}
-
-# Svc vm test targets (testset=svc)
-my.test.targets.svc=
-
-# Core jdk test targets (testset=svc)
-my.make.rule.test.targets.svc=						\
-    ${my.test.target.set:TESTNAME=jdk_management},			\
-    ${my.test.target.set:TESTNAME=jdk_instrument},			\
-    ${my.test.target.set:TESTNAME=jdk_jmx},				\
-    ${my.test.target.set:TESTNAME=jdk_jdi},				\
-    ${my.test.target.set:TESTNAME=jdk_jfr},				\
-    ${my.test.target.set:TESTNAME=jdk_rm},				\
-    ${my.test.target.set:TESTNAME=svc_tools}
-
-# All vm test targets (testset=all)
-my.test.targets.all=							\
-    ${my.test.targets.default},						\
-    ${my.test.target.set:TESTNAME=runThese},				\
-    ${my.test.target.set:TESTNAME=jbb_default}
-
-# All jdk test targets (testset=all)
-my.make.rule.test.targets.all=						\
-    ${my.make.rule.test.targets.core},					\
-    ${my.make.rule.test.targets.svc},					\
-    ${my.test.target.set:TESTNAME=jdk_awt},				\
-    ${my.test.target.set:TESTNAME=jdk_beans1},				\
-    ${my.test.target.set:TESTNAME=jdk_beans2},				\
-    ${my.test.target.set:TESTNAME=jdk_beans3},				\
-    ${my.test.target.set:TESTNAME=jdk_sound},				\
-    ${my.test.target.set:TESTNAME=jdk_swing}
-
-# PIT vm test targets (testset=pit)
-my.test.targets.pit=							\
-   ${my.test.targets.all}
-
-# PIT jdk test targets (testset=pit)
-my.make.rule.test.targets.pit=						\
-    ${my.test.target.set:TESTNAME=langtools_jtreg},			\
-    ${my.make.rule.test.targets.core},					\
-    ${my.make.rule.test.targets.svc}
-
-# JCK test targets in test/Makefile (no windows)
-my.test.target.set.jck=							\
-    solaris_sparcv9_5.10-product-c2-JCK7TESTRULE,			\
-    solaris_x64_5.10-product-c2-JCK7TESTRULE,				\
-    linux_i586_2.6-product-c1-JCK7TESTRULE,				\
-    linux_x64_2.6-product-c2-JCK7TESTRULE
-
-# JCK testset targets
-my.make.rule.test.targets.jck=						\
-    ${my.test.target.set.jck:JCK7TESTRULE=jck7devtools},		\
-    ${my.test.target.set.jck:JCK7TESTRULE=jck7runtime},			\
-    ${my.test.target.set.jck:JCK7TESTRULE=jck7compiler}
-
-
-#############
-#
-# Hotspot related settings (testset=hotspot)
-#
-
-# The hotspot build flavors
-my.build.flavors.hotspot=						\
-    debugOpen,fastdebug,product,productOpen,				\
-    ${my.additional.build.flavors.hotspot}
-
-# Platforms built for hotspot push jobs
-my.build.targets.hotspot=						\
-    solaris_sparcv9_5.10-{product|fastdebug|optimized},			\
-    solaris_x64_5.10-{product|fastdebug},				\
-    linux_i586_2.6-{product|fastdebug},					\
-    linux_x64_2.6-{product|fastdebug|optimized},			\
-    macosx_x64_10.7-{product|fastdebug},				\
-    windows_i586_6.1-{product|fastdebug},				\
-    windows_x64_6.1-{product|fastdebug|optimized},			\
-    solaris_x64_5.10-{debugOpen},					\
-    linux_x64_2.6-{productOpen},					\
-    ${my.additional.build.targets.hotspot}
-
-# Tests to run on the various platforms for hotspot push jobs
-my.test.targets.hotspot.solaris.sparcv9=				\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-jvm98,			\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-jvm98_nontiered,	\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-scimark,		\
-    solaris_sparcv9_5.10-product-c2-runThese,				\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_SerialGC,	\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_ParallelGC,	\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_ParNewGC,	\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_CMS,		\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_G1,		\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_ParOldGC,	\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_SerialGC,		\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_ParallelGC,	\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_ParNewGC,		\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_CMS,		\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_G1,		\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_ParOldGC,		\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_default_nontiered,	\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_SerialGC,		\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_ParallelGC,		\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_CMS,		\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_G1,			\
-    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_ParOldGC
-
-my.test.targets.hotspot.solaris.x64=					\
-    solaris_x64_5.10-{product|fastdebug}-c2-jvm98,			\
-    solaris_x64_5.10-{product|fastdebug}-c2-jvm98_nontiered,		\
-    solaris_x64_5.10-{product|fastdebug}-c2-scimark,			\
-    solaris_x64_5.10-product-c2-runThese,				\
-    solaris_x64_5.10-product-c2-runThese_Xcomp,				\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCBasher_SerialGC,		\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCBasher_ParallelGC,	\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCBasher_ParNewGC,		\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCBasher_CMS,		\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCBasher_G1,		\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCBasher_ParOldGC,		\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_SerialGC,		\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_ParallelGC,		\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_ParNewGC,		\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_CMS,			\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_G1,			\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_ParOldGC,		\
-    solaris_x64_5.10-{product|fastdebug}-c2-jbb_default_nontiered,	\
-    solaris_x64_5.10-{product|fastdebug}-c2-jbb_SerialGC,		\
-    solaris_x64_5.10-{product|fastdebug}-c2-jbb_ParallelGC,		\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_CMS,			\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_G1,			\
-    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_ParOldGC
-
-my.test.targets.hotspot.linux.i586=					\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-jvm98,			\
-    linux_i586_2.6-{product|fastdebug}-c2-jvm98_nontiered,		\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-scimark,			\
-    linux_i586_2.6-product-c1-runThese_Xcomp,				\
-    linux_i586_2.6-fastdebug-c1-runThese_Xshare,			\
-    linux_i586_2.6-fastdebug-c2-runThese_Xcomp,				\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC,	\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC,	\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC,	\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_CMS,		\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_G1,		\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC,	\
-    linux_i586_2.6-product-{c1|c2}-GCOld_SerialGC,			\
-    linux_i586_2.6-product-{c1|c2}-GCOld_ParallelGC,			\
-    linux_i586_2.6-product-{c1|c2}-GCOld_ParNewGC,			\
-    linux_i586_2.6-product-{c1|c2}-GCOld_CMS,				\
-    linux_i586_2.6-product-{c1|c2}-GCOld_G1,				\
-    linux_i586_2.6-product-{c1|c2}-GCOld_ParOldGC,			\
-    linux_i586_2.6-{product|fastdebug}-c1-jbb_SerialGC,			\
-    linux_i586_2.6-{product|fastdebug}-c2-jbb_default_nontiered,	\
-    linux_i586_2.6-{product|fastdebug}-c1-jbb_ParallelGC,		\
-    linux_i586_2.6-{product|fastdebug}-c1-jbb_CMS,			\
-    linux_i586_2.6-{product|fastdebug}-c1-jbb_G1,			\
-    linux_i586_2.6-{product|fastdebug}-c1-jbb_ParOldGC
-
-my.test.targets.hotspot.linux.x64=					\
-    linux_x64_2.6-{product|fastdebug}-c2-jvm98,				\
-    linux_x64_2.6-{product|fastdebug}-c2-jvm98_nontiered,		\
-    linux_x64_2.6-{product|fastdebug}-c2-scimark,			\
-    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_SerialGC,		\
-    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
-    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParNewGC,		\
-    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_CMS,			\
-    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_G1,			\
-    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParOldGC,		\
-    linux_x64_2.6-{product|fastdebug}-c2-GCOld_SerialGC,		\
-    linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParallelGC,		\
-    linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParNewGC,		\
-    linux_x64_2.6-{product|fastdebug}-c2-GCOld_CMS,			\
-    linux_x64_2.6-{product|fastdebug}-c2-GCOld_G1,			\
-    linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParOldGC,		\
-    linux_x64_2.6-{product|fastdebug}-c2-jbb_default_nontiered,		\
-    linux_x64_2.6-{product|fastdebug}-c2-jbb_ParallelGC,		\
-    linux_x64_2.6-{product|fastdebug}-c2-jbb_G1,			\
-    linux_x64_2.6-{product|fastdebug}-c2-jbb_ParOldGC
-
-my.test.targets.hotspot.macosx.x64=					\
-    macosx_x64_10.7-{product|fastdebug}-c2-jvm98,			\
-    macosx_x64_10.7-{product|fastdebug}-c2-jvm98_nontiered,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-scimark,			\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_SerialGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParNewGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_CMS,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_G1,			\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParOldGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCOld_SerialGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParallelGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParNewGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCOld_CMS,			\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCOld_G1,			\
-    macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParOldGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-jbb_default_nontiered,	\
-    macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParallelGC,		\
-    macosx_x64_10.7-{product|fastdebug}-c2-jbb_G1,			\
-    macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParOldGC
-
-my.test.targets.hotspot.windows.i586=					\
-    windows_i586_6.1-{product|fastdebug}-{c1|c2}-jvm98,			\
-    windows_i586_6.1-{product|fastdebug}-c2-jvm98_nontiered,		\
-    windows_i586_6.1-{product|fastdebug}-{c1|c2}-scimark,		\
-    windows_i586_6.1-product-{c1|c2}-runThese,				\
-    windows_i586_6.1-product-{c1|c2}-runThese_Xcomp,			\
-    windows_i586_6.1-fastdebug-c1-runThese_Xshare,			\
-    windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC,	\
-    windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC,	\
-    windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC,	\
-    windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_CMS,		\
-    windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_G1,		\
-    windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC,	\
-    windows_i586_6.1-product-{c1|c2}-GCOld_SerialGC,			\
-    windows_i586_6.1-product-{c1|c2}-GCOld_ParallelGC,			\
-    windows_i586_6.1-product-{c1|c2}-GCOld_ParNewGC,			\
-    windows_i586_6.1-product-{c1|c2}-GCOld_CMS,				\
-    windows_i586_6.1-product-{c1|c2}-GCOld_G1,				\
-    windows_i586_6.1-product-{c1|c2}-GCOld_ParOldGC,			\
-    windows_i586_6.1-{product|fastdebug}-{c1|c2}-jbb_default,		\
-    windows_i586_6.1-{product|fastdebug}-c2-jbb_default_nontiered,	\
-    windows_i586_6.1-product-{c1|c2}-jbb_ParallelGC,			\
-    windows_i586_6.1-product-{c1|c2}-jbb_CMS,				\
-    windows_i586_6.1-product-{c1|c2}-jbb_G1,				\
-    windows_i586_6.1-product-{c1|c2}-jbb_ParOldGC
-
-my.test.targets.hotspot.windows.x64=					\
-    windows_x64_6.1-{product|fastdebug}-c2-jvm98,			\
-    windows_x64_6.1-{product|fastdebug}-c2-jvm98_nontiered,		\
-    windows_x64_6.1-{product|fastdebug}-c2-scimark,			\
-    windows_x64_6.1-product-c2-runThese,				\
-    windows_x64_6.1-product-c2-runThese_Xcomp,				\
-    windows_x64_6.1-{product|fastdebug}-c2-GCBasher_SerialGC,		\
-    windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
-    windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParNewGC,		\
-    windows_x64_6.1-{product|fastdebug}-c2-GCBasher_CMS,		\
-    windows_x64_6.1-{product|fastdebug}-c2-GCBasher_G1,			\
-    windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParOldGC,		\
-    windows_x64_6.1-{product|fastdebug}-c2-GCOld_SerialGC,		\
-    windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParallelGC,		\
-    windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParNewGC,		\
-    windows_x64_6.1-{product|fastdebug}-c2-GCOld_CMS,			\
-    windows_x64_6.1-{product|fastdebug}-c2-GCOld_G1,			\
-    windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParOldGC,		\
-    windows_x64_6.1-{product|fastdebug}-c2-jbb_default,			\
-    windows_x64_6.1-{product|fastdebug}-c2-jbb_default_nontiered,	\
-    windows_x64_6.1-product-c2-jbb_CMS,					\
-    windows_x64_6.1-product-c2-jbb_ParallelGC,				\
-    windows_x64_6.1-product-c2-jbb_G1,					\
-    windows_x64_6.1-product-c2-jbb_ParOldGC
-
-# Some basic "smoke" tests for OpenJDK builds
-my.test.targets.hotspot.open=						\
-    solaris_x64_5.10-{productOpen|fastdebugOpen}-c2-jvm98,		\
-    linux_x64_2.6-{productOpen|fastdebugOpen}-c2-jvm98
-
-# The complete list of test targets for jprt
-my.test.targets.hotspot=						\
-  ${my.test.targets.hotspot.open},					\
-  ${my.test.targets.hotspot.solaris.sparcv9},				\
-  ${my.test.targets.hotspot.solaris.x64},				\
-  ${my.test.targets.hotspot.linux.i586},				\
-  ${my.test.targets.hotspot.linux.x64},					\
-  ${my.test.targets.hotspot.macosx.x64},				\
-  ${my.test.targets.hotspot.windows.i586},				\
-  ${my.test.targets.hotspot.windows.x64},				\
-  ${my.test.targets.hotspot.solaris.sparcv9},				\
-  ${my.test.targets.hotspot.solaris.x64},				\
-  ${my.test.targets.hotspot.linux.x64},					\
-  ${my.test.targets.hotspot.windows.i586},				\
-  ${my.test.targets.hotspot.windows.x64},				\
-  ${my.additional.test.targets.hotspot}
-
-
-# Make file based test targets
-
-my.make.rule.test.targets.hotspot.clienttests=				\
-  linux_i586_2.6-*-c1-hotspot_clienttest,				\
-  windows_i586_6.1-*-c1-hotspot_clienttest
-
-my.make.rule.test.targets.hotspot.servertests=				\
-  solaris_sparcv9_5.10-*-c2-hotspot_servertest,				\
-  solaris_x64_5.10-*-c2-hotspot_servertest,				\
-  linux_i586_2.6-*-c2-hotspot_servertest,				\
-  linux_x64_2.6-*-c2-hotspot_servertest,				\
-  macosx_x64_10.7-*-c2-hotspot_servertest,				\
-  windows_i586_6.1-*-c2-hotspot_servertest,				\
-  windows_x64_6.1-*-c2-hotspot_servertest
-
-my.make.rule.test.targets.hotspot.internalvmtests=			\
-  solaris_sparcv9_5.10-fastdebug-c2-hotspot_internalvmtests,		\
-  solaris_x64_5.10-fastdebug-c2-hotspot_internalvmtests,		\
-  linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests,			\
-  linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests,			\
-  macosx_x64_10.7-fastdebug-c2-hotspot_internalvmtests,			\
-  windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests,		\
-  windows_x64_6.1-fastdebug-c2-hotspot_internalvmtests
-
-my.make.rule.test.targets.hotspot.reg.group=				\
-  solaris_sparcv9_5.10-{product|fastdebug}-c2-GROUP,            	\
-  solaris_x64_5.10-{product|fastdebug}-c2-GROUP,		        \
-  linux_i586_2.6-{product|fastdebug}-c2-GROUP,				\
-  linux_x64_2.6-{product|fastdebug}-c2-GROUP,				\
-  windows_i586_6.1-{product|fastdebug}-c2-GROUP,			\
-  windows_x64_6.1-{product|fastdebug}-c2-GROUP,				\
-  linux_i586_2.6-{product|fastdebug}-c1-GROUP,				\
-  windows_i586_6.1-{product|fastdebug}-c1-GROUP
-
-my.make.rule.test.targets.hotspot=					\
-  ${my.make.rule.test.targets.hotspot.clienttests},			\
-  ${my.make.rule.test.targets.hotspot.servertests},			\
-  ${my.make.rule.test.targets.hotspot.internalvmtests},			\
-  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_wbapitest},	\
-  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler},	\
-  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc},		\
-  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime},		\
-  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability},	\
-  ${my.additional.make.rule.test.targets.hotspot}
diff --git a/make/scripts/hgforest.sh b/make/scripts/hgforest.sh
deleted file mode 100644
index f30d3eb..0000000
--- a/make/scripts/hgforest.sh
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2009, 2012, 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.
-#
-
-# Shell script for a fast parallel forest command
-command="$1"
-pull_extra_base="$2"
-
-tmp=/tmp/forest.$$
-rm -f -r ${tmp}
-mkdir -p ${tmp}
-
-# Remove tmp area on A. B. Normal termination
-trap 'rm -f -r ${tmp}' KILL
-trap 'rm -f -r ${tmp}' EXIT
-
-# Only look in specific locations for possible forests (avoids long searches)
-pull_default=""
-repos=""
-repos_extra=""
-if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
-  subrepos="corba jaxp jaxws langtools jdk hotspot nashorn"
-  if [ -f .hg/hgrc ] ; then
-    pull_default=`hg paths default`
-    if [ "${pull_default}" = "" ] ; then
-      echo "ERROR: Need initial clone with 'hg paths default' defined"
-      exit 1
-    fi
-  fi
-  if [ "${pull_default}" = "" ] ; then
-    echo "ERROR: Need initial repository to use this script"
-    exit 1
-  fi
-  for i in ${subrepos} ; do
-    if [ ! -f ${i}/.hg/hgrc ] ; then
-      repos="${repos} ${i}"
-    fi
-  done
-  if [ "${pull_extra_base}" != "" ] ; then
-    subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/make/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs"
-    pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'`
-    pull_extra="${pull_extra_base}/${pull_default_tail}"
-    for i in ${subrepos_extra} ; do
-      if [ ! -f ${i}/.hg/hgrc ] ; then
-        repos_extra="${repos_extra} ${i}"
-      fi
-    done
-  fi
-  at_a_time=2
-  # Any repos to deal with?
-  if [ "${repos}" = "" -a "${repos_extra}" = "" ] ; then
-    echo "No repositories to clone."
-    exit
-  fi
-else
-  hgdirs=`ls -d ./.hg ./*/.hg ./*/*/.hg ./*/*/*/.hg ./*/*/*/*/.hg 2>/dev/null`
-  # Derive repository names from the .hg directory locations
-  for i in ${hgdirs} ; do
-    repos="${repos} `echo ${i} | sed -e 's@/.hg$@@'`"
-  done
-  at_a_time=8
-  # Any repos to deal with?
-  if [ "${repos}" = "" ] ; then
-    echo "No repositories to process."
-    exit
-  fi
-fi
-
-# Echo out what repositories we will clone
-echo "# Repos: ${repos} ${repos_extra}"
-
-# Run the supplied command on all repos in parallel, save output until end
-n=0
-for i in ${repos} ; do
-  echo "Starting on ${i}"
-  n=`expr ${n} '+' 1`
-  (
-    (
-      if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
-        pull_newrepo="`echo ${pull_default}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`"
-        cline="hg clone ${pull_newrepo} ${i}"
-        echo "# ${cline}"
-        ( eval "${cline}" )
-      else
-        cline="hg $*"
-        echo "# cd ${i} && ${cline}"
-        ( cd ${i} && eval "${cline}" )
-      fi
-      echo "# exit code $?"
-    ) > ${tmp}/repo.${n} 2>&1 ; cat ${tmp}/repo.${n} ) &
-  if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then
-    sleep 5
-  fi
-done
-# Wait for all hg commands to complete
-wait
-
-if [ "${repos_extra}" != "" ] ; then
-  for i in ${repos_extra} ; do
-    echo "Starting on ${i}"
-    n=`expr ${n} '+' 1`
-    (
-      (
-          pull_newextrarepo="`echo ${pull_extra}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`"
-          cline="hg clone ${pull_newextrarepo} ${i}"
-          echo "# ${cline}"
-          ( eval "${cline}" )
-        echo "# exit code $?"
-      ) > ${tmp}/repo.${n} 2>&1 ; cat ${tmp}/repo.${n} ) &
-    if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then
-      sleep 5
-    fi
-  done
-  # Wait for all hg commands to complete
-  wait
-fi
-
-# Cleanup
-rm -f -r ${tmp}
-
-# Terminate with exit 0 all the time (hard to know when to say "failed")
-exit 0
-
diff --git a/make/scripts/lic_check.sh b/make/scripts/lic_check.sh
deleted file mode 100644
index c166115..0000000
--- a/make/scripts/lic_check.sh
+++ /dev/null
@@ -1,224 +0,0 @@
-#! /bin/sh -f
-#
-# Copyright (c) 2012, 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 script checks a copyright notice.
-#
-# The script should be located in the main jdk repository under make/scripts.
-# It works with the templates in the make/templates directory of the jdk source.
-#
-# Usage: "lic_check.sh [-gpl] or [-gplcp] or [-bsd] file(s)"
-
-script_directory=`dirname $0`
-script_name=`basename $0`
-first_option=$1
-
-# parse the first argument
-
-case "$1" in
-	"-gpl")
-		header="gpl-header"
-		;;
-	"-gplcp")
-		header="gpl-cp-header"
-		;;
-	"-bsd")
-		header="bsd-header"
-                ;;
-	*)
-		echo "Usage: $0 [-gpl] or [-gplcp] or [-bsd] file(s)" 1>&2
-		exit 1
-		;;
-esac
-shift
-
-#initialize error status
-error_status=0
-
-# determine and set the absolute path for the script directory
-D=`dirname "${script_directory}"`
-B=`basename "${script_directory}"`
-script_dir="`cd \"${D}\" 2>/dev/null && pwd || echo \"${D}\"`/${B}"
-
-# set up a variable for the templates directory
-template_dir=${script_dir}/../templates
-
-# Check existence of the template directory.
-if [ ! -d ${template_dir} ] ; then
-        echo "ERROR: The templates directory "${template_dir}" doesn't exist." 1>&2
-        exit 1
-fi
-
-# set the temporary file location
-tmpfile=/tmp/source_file.$$
-rm -f ${tmpfile}
-
-# check number of lines in the template file
-lines=`cat ${template_dir}/${header} | wc -l`
-
-# the template file has one empty line at the end, we need to ignore it
-lines=`expr ${lines} - 1`
-
-# A loop through the all script parameters:
-#
-# 1. Given a set of source files and a license template header, read a file name of each source file.
-# 2. Check if a given file exists. When a directory is encountered, dive in and process all sources in those directories.
-# 3. Read each line of the given file and check it for a copyright string.
-# 4. If a copyright string found, check the correctness of the years format in the string and replace years with %YEARS%.
-# 5. Continue reading the file until the number of lines is equal to the length of the license template header ($lines) and remove a comment prefix for each line.
-# 6. Store the result (the license header from a given file) into a temporary file.
-# 7. If a temporary file is not empty, compare it with a template file to verify if the license text is the same as in a template.
-# 8. Produce a error in case a temporary file is empty, it means we didn't find a copyright string, or it's not correct
-#
-while [ "$#" -gt "0" ] ; do
-	touch ${tmpfile}
-
-	# In case of the directory as a parameter check recursively every file inside.
-	if [ -d $1 ] ; then
-		curdir=`pwd`
-		cd $1
-		echo "*** Entering directory: "`pwd`
-		echo "***"
-		files=`ls .`
-		sh ${script_dir}/${script_name} ${first_option} ${files}
-		status=$?
-		if [ ${error_status} -ne 1 ] ; then
-			error_status=${status}
-		fi
-		cd ${curdir}
-		shift
-		continue
-	else
-		echo "### Checking copyright notice in the file: "$1
-		echo "###"
-	fi
-
-	# Check the existence of the source file.
-	if [ ! -f $1 ] ; then
-        	echo "ERROR: The source file "$1" doesn't exist." 1>&2
-		error_status=1
-		shift
-        	continue
-	fi
-
-	# read the source file and determine where the header starts, then get license header without prefix
-	counter=0
-	while read line ; do
-		# remove windows "line feed" character from the line (if any)
-		line=`echo "${line}" | tr -d '\r'`
-		# check if the given line contains copyright
-		check_copyright=`echo "${line}" | grep "Copyright (c) "`
-		if [ "${check_copyright}" != "" ] ; then
-			# determine the comment prefix
-			prefix=`echo "${line}" | cut -d "C" -f 1`
-			# remove prefix (we use "_" as a sed delimiter, since the prefix could be like //)
-			copyright_without_prefix=`echo "${line}" | sed s_"^${prefix}"__g`
-			# copyright years
-			year1=`echo "${copyright_without_prefix}" | cut -d " " -f 3`
-			year2=`echo "${copyright_without_prefix}" | cut -d " " -f 4`
-			# Processing the first year in the copyright string
-			length=`expr "${year1}" : '.*'`
-			if [ ${length} -ne 5 ] ; then
-        			break
-			fi
-			check_year1=`echo ${year1} | egrep "19[0-9][0-9],|2[0-9][0-9][0-9],"`
-			if [ "${check_year1}" = "" ] ; then
-        			break
-			fi
-			# Processing the second year in the copyright string
-			if [ "${year2}" != "Oracle" ] ; then
-        			length=`expr "${year2}" : '.*'`
-        			if [ ${length} -ne 5 ] ; then
-                			break
-        			else
-                			check_year2=`echo ${year2} | egrep "19[0-9][0-9],|2[0-9][0-9][0-9],"`
-                			if [ "${check_year2}" = "" ] ; then
-                        			break
-                			fi
-        			fi
-			fi
-
-			# copyright string without copyright years
-			no_years=`echo "${copyright_without_prefix}" | sed 's/[0-9,]*//g'`
-			# copyright string before years
-			before_years=`echo "${no_years}" | cut -d "O" -f 1`
-			# copyright string after years
-			after_years=`echo "${no_years}" | cut -d ")" -f 2`
-			# form a new copyright string with %YEARS%
-			new_copyright=`echo ${before_years}"%YEARS%"${after_years}`
-			# save the new copyright string to a file
-			echo "${new_copyright}" > ${tmpfile}
-			# start counting the lines
-                       	counter=1
-			# move to the next line
-			continue
-		fi
-		if [ ${counter} -ne 0 ] ; then
-			# this should be a license header line, hence increment counter
-			counter=`expr ${counter} + 1`
-			# record a string without a prefix to a file
-			newline=`echo "${line}" | sed s_"^${prefix}"__`
-
-			# we need to take care of the empty lines in the header, i.e. check the prefix without spaces
-			trimmed_prefix=`echo "${prefix}" | tr -d " "`
-			trimmed_line=`echo "${line}"  | tr -d " "`
-			if [ "${trimmed_line}" = "${trimmed_prefix}" ] ; then
-				echo "" >> ${tmpfile}
-			else
-				echo "${newline}" >> ${tmpfile}
-			fi
-		fi
-		# stop reading lines when a license header ends and add an empty line to the end
-		if [ ${counter} -eq ${lines} ] ; then
-			echo "" >> ${tmpfile}
-			break
-		fi
-	done < $1
-
-	# compare the license header with a template file
-	if [ -s ${tmpfile} ] ; then
-		diff -c ${tmpfile} ${template_dir}/${header} 1>&2
-		if [ "$?" = "0" ] ; then
-			echo "SUCCESS: The license header for "`pwd`"/"$1" has been verified."
-			echo "###"
-		else
-			echo "ERROR: License header is not correct in "`pwd`"/"$1 1>&2
-			echo "See diffs above. " 1>&2
-			echo "###" 1>&2
-			echo "" 1>&2
-			error_status=1
-		fi
-	else
-		# If we don't have a temporary file, there is a problem with a copyright string (or no copyright string)
-		echo "ERROR: Copyright string is not correct or missing in "`pwd`"/"$1 1>&2
-		echo "###" 1>&2
-		echo "" 1>&2
-		error_status=1
-	fi
-	rm -f ${tmpfile}
-	shift
-done
-if [ ${error_status} -ne 0 ] ; then
-	exit 1
-fi
diff --git a/make/scripts/normalizer.pl b/make/scripts/normalizer.pl
deleted file mode 100644
index 184248a..0000000
--- a/make/scripts/normalizer.pl
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/usr/bin/perl
-
-#
-# Copyright (c) 2009, 2012, 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.
-#
-
-#
-# Parses java files:
-#   1. Removes from the end of lines spaces and TABs
-#   2. Replaces TABs by spaces
-#   3. Replaces all NewLine separators by Unix NewLine separators
-#   4. Makes one and only one empty line at the end of each file
-
-if ($#ARGV < 0) {
-    &usage;
-    
-    die;
-}
-
-use Cwd 'abs_path';
-
-my @extensions = ("java");
-
-# Read options
-my $dirpos = 0;
-
-while ($dirpos < $#ARGV) {
-    if ($ARGV[$dirpos] eq "-e") {
-        @extensions = split(/,/, $ARGV[$dirpos + 1]);
-    } else {
-        last;
-    }
-
-    $dirpos += 2;
-}
-
-if ($dirpos > $#ARGV) {
-    &usage;
-
-    die;
-}
-
-use Cwd;
-my $currdir = getcwd;
-
-my $allfiles = 0;
-
-my $filecount = 0;
-
-my @tabvalues;
-
-# Init tabvalues
-push (@tabvalues, " ");
-
-for (my $i = 1; $i < 8; $i++) {
-    push(@tabvalues, $tabvalues[$i - 1] . " ");
-}
-
-open(FILELIST, ">$currdir/filelist") or die "Failed while open $currdir/filelist: $!\n";
-
-while ($dirpos <= $#ARGV) {
-    use File::Find;
-
-    find(\&parse_file, abs_path($ARGV[$dirpos]));
-
-    $dirpos += 1;
-}
-
-close(FILELIST);
-
-use Cwd 'chdir';
-chdir $currdir;
-
-print "Checked $allfiles file(s)\n";
-print "Modified $filecount file(s)\n";
-print "See results in the file $currdir/filelist\n";
-
-sub parse_file {
-    my $filename = $File::Find::name;
-
-    # Skip directories
-    return if -d;
-    
-    # Skip SCCS files
-    return if ($filename =~ /\/SCCS\//);
-
-    # Skip files with invalid extensions
-    my $accepted = 0;
-    foreach my $ext (@extensions) {
-        if ($_ =~ /\.$ext$/i) {
-            $accepted = 1;
-
-            last;
-        }
-    }
-    return if ($accepted == 0);
-
-    use File::Basename;
-    my $dirname = dirname($filename);
-
-    use Cwd 'chdir';
-    chdir $dirname;
-
-    open(FILE, $filename) or die "Failed while open $filename: $!\n";
-    
-    # Read file
-    my @content;
-    my $line;
-    my $emptylinescount = 0;
-    my $modified = 0;
-    
-    while ($line = <FILE>) {
-        my $originalline = $line;
-
-        # Process line
-        
-        # Remove from the end of the line spaces and return character
-        while ($line =~ /\s$/) {
-            chop($line);
-        }
-
-        # Replace TABs
-        for (my $i = 0; $i < length($line); $i++) {
-            if (substr($line, $i, 1) =~ /\t/) {
-                $line = substr($line, 0, $i) . $tabvalues[7 - ($i % 8)] . substr($line, $i + 1);
-            }
-        }
-        
-        if (length($line) == 0) {
-            $emptylinescount++;
-        } else {
-            while ($emptylinescount > 0) {
-                push(@content, "");
-                
-                $emptylinescount--;
-            }
-            
-            push(@content, $line);
-        }
-
-        if ($originalline ne ($line . "\n")) {
-            $modified = 1;
-        }
-
-    }
-    
-    $allfiles++;
-    
-    if ($emptylinescount > 0) {
-        $modified = 1;
-    }
-
-    close(FILE);
-    
-    if ($modified != 0) {
-        # Write file
-        open(FILE, ">$filename") or die "Failed while open $filename: $!\n";
-    
-        for (my $i = 0; $i <= $#content; $i++) {
-            print FILE "$content[$i]\n";
-        }
-    
-        close(FILE);
-
-        # Print name from current dir
-        if (index($filename, $currdir) == 0) {
-           print FILELIST substr($filename, length($currdir) + 1);
-        } else {
-           print FILELIST $filename;
-        }
-        print FILELIST "\n";
-
-        $filecount++;
-
-        print "$filename: modified\n";
-    }
-}
-
-sub usage {
-    print "Usage:\n";
-    print "  normalizer.pl [-options] <dir> [dir2 dir3 ...]\n";
-    print "  Available options:\n";
-    print "    -e    comma separated files extensions. By default accepts only java files\n";
-    print "\n";
-    print "Examples:\n";
-    print "  normalizer.pl -e c,cpp,h,hpp .\n";
-}
-
-
diff --git a/make/scripts/update_copyright_year.sh b/make/scripts/update_copyright_year.sh
deleted file mode 100644
index a3df5d0..0000000
--- a/make/scripts/update_copyright_year.sh
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/bin/bash -f
-
-#
-# Copyright (c) 2010, 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.
-#
-
-# Script to update the Copyright YEAR range in Mercurial sources.
-#  (Originally from xdono, Thanks!)
-
-if [ "`uname -s`" = "SunOS" ] ; then
-  awk=nawk
-else
-  awk=awk
-fi
-
-# Stop on any error
-set -e
-
-# Temp area
-tmp=/tmp/`basename $0`.${USER}.$$
-rm -f -r ${tmp}
-mkdir -p ${tmp}
-total=0
-
-# This year or supplied year
-if [ "$1" != "" ] ; then
-  year="$1"
-else
-  year=`date +%Y`
-fi
-
-# Return true if it makes sense to edit this file
-saneFileToCheck()
-{
-  if [ "$1" != "" -a -f $1 ] ; then
-    isText=`file "$1" | egrep -i '(text|source)' | cat`
-    hasCopyright=`grep 'Copyright' "$1" | cat`
-    lastLineCount=`tail -1 "$1" | wc -l`
-    if [ "${isText}" != ""  \
-         -a "${hasCopyright}" != "" \
-	 -a ${lastLineCount} -eq 1 ] ; then
-      echo "true"
-    else
-      echo "false"
-    fi
-  else
-    echo "false"
-  fi
-}
-
-# Update the copyright year on a file
-updateFile() # file
-{
-  changed="false"
-  if [ `saneFileToCheck "$1"` = "true" ] ; then
-    copyright="Copyright (c)"
-    company="Oracle"
-    rm -f $1.OLD
-    mv $1 $1.OLD
-    cat $1.OLD | \
-      sed -e "s@\(${copyright} [12][0-9][0-9][0-9],\) [12][0-9][0-9][0-9], ${company}@\1 ${year}, ${company}@" | \
-      sed -e "s@\(${copyright} [12][0-9][0-9][0-9],\) ${company}@\1 ${year}, ${company}@" | \
-      sed -e "s@${copyright} ${year}, ${year}, ${company}@${copyright} ${year}, ${company}@"  \
-      > $1
-    if ! diff -b -w $1.OLD $1 > /dev/null ; then \
-      changed="true"
-      rm -f $1.OLD
-    else
-      rm -f $1
-      mv $1.OLD $1
-    fi
-  fi
-  echo "${changed}"
-}
-
-# Update the copyright year on all files changed by this changeset
-updateChangesetFiles() # changeset
-{
-  count=0
-  files=${tmp}/files.$1
-  rm -f ${files}
-  hg log --rev $1 -v --template '{files}\n' | expand \
-    | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}' \
-    > ${files}
-  if [ -f "${files}" -a -s "${files}" ] ; then
-    copyright="Copyright (c)"
-    company="Oracle"
-    fcount=`cat ${files}| wc -l`
-    for i in `cat ${files}` ; do
-      if [ `updateFile "${i}"` = "true" ] ; then
-        count=`expr ${count} '+' 1`
-      fi
-    done
-    if [ ${count} -gt 0 ] ; then
-      printf "  UPDATED year on %d of %d files.\n" ${count} ${fcount}
-      total=`expr ${total} '+' ${count}`
-    else
-      printf "  None of the %d files were changed.\n" ${fcount}
-    fi
-  else
-    printf "  ERROR: No files changed in the changeset? Must be a mistake.\n"
-    set -x
-    ls -al ${files}
-    hg log --rev $1 -v --template '{files}\n'
-    hg log --rev $1 -v --template '{files}\n' | expand \
-      | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}'
-    set +x
-    exit 1
-  fi
-  rm -f ${files}
-}
-
-# Check if repository is clean
-previous=`hg status|wc -l`
-if [ ${previous} -ne 0 ] ; then
-  echo "WARNING: This repository contains previously edited working set files."
-  echo "  hg status | wc -l = `hg status | wc -l`"
-fi
-
-# Get all changesets this year
-all_changesets=${tmp}/all_changesets
-rm -f ${all_changesets}
-hg log --no-merges -v -d "${year}-01-01 to ${year}-12-31" --template '{node}\n' > ${all_changesets}
-
-# Check changeset to see if it is Copyright only changes, filter changesets
-if [ -s ${all_changesets} ] ; then
-  echo "Changesets made in ${year}: `cat ${all_changesets} | wc -l`"
-  index=0
-  cat ${all_changesets} | while read changeset ; do
-    index=`expr ${index} '+' 1`
-    desc=${tmp}/desc.${changeset}
-    rm -f ${desc}
-    echo "------------------------------------------------"
-    hg log --rev ${changeset} --template '{desc}\n' > ${desc}
-    printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`"
-    if [ "${year}" = "2010" ] ; then
-      if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then
-        printf "  EXCLUDED tag changeset.\n"
-      elif cat ${desc} | fgrep -i rebrand > /dev/null ; then
-        printf "  EXCLUDED rebrand changeset.\n"
-      elif cat ${desc} | fgrep -i copyright > /dev/null ; then
-        printf "  EXCLUDED copyright changeset.\n"
-      else
-        updateChangesetFiles ${changeset}
-      fi
-    else
-      if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then
-        printf "  EXCLUDED tag changeset.\n"
-      elif cat ${desc} | fgrep -i "copyright year" > /dev/null ; then
-        printf "  EXCLUDED copyright year changeset.\n"
-      else
-        updateChangesetFiles ${changeset}
-      fi
-    fi
-    rm -f ${desc}
-  done
-fi
-
-if [ ${total} -gt 0 ] ; then
-   echo "---------------------------------------------"
-   echo "Updated the copyright year on a total of ${total} files."
-   if [ ${previous} -eq 0 ] ; then
-     echo "This count should match the count of modified files in the repository: hg status -m"
-   else
-     echo "WARNING: This repository contained previously edited working set files."
-   fi
-   echo "  hg status -m | wc -l = `hg status -m | wc -l`"
-else
-   echo "---------------------------------------------"
-   echo "No files were changed"
-   if [ ${previous} -ne 0 ] ; then
-     echo "WARNING: This repository contained previously edited working set files."
-   fi
-   echo "  hg status -m | wc -l = `hg status -m | wc -l`"
-fi
-
-# Cleanup
-rm -f -r ${tmp}
-exit 0
-
diff --git a/make/scripts/webrev.ksh b/make/scripts/webrev.ksh
deleted file mode 100644
index d61b3d7..0000000
--- a/make/scripts/webrev.ksh
+++ /dev/null
@@ -1,2783 +0,0 @@
-#!/bin/ksh -p
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
-# Use is subject to license terms.
-#
-# This script takes a file list and a workspace and builds a set of html files
-# suitable for doing a code review of source changes via a web page.
-# Documentation is available via 'webrev -h'.
-#
-
-WEBREV_UPDATED=25.1-hg+openjdk.java.net
-
-HTML='<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n'
-
-FRAMEHTML='<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n'
-
-STDHEAD='<meta charset="utf-8">
-<meta http-equiv="cache-control" content="no-cache" />
-<meta http-equiv="Pragma" content="no-cache" />
-<meta http-equiv="Expires" content="-1" />
-<!--
-   Note to customizers: the body of the webrev is IDed as SUNWwebrev
-   to allow easy overriding by users of webrev via the userContent.css
-   mechanism available in some browsers.
-
-   For example, to have all "removed" information be red instead of
-   brown, set a rule in your userContent.css file like:
-
-       body#SUNWwebrev span.removed { color: red ! important; }
--->
-<style type="text/css" media="screen">
-body {
-    background-color: #eeeeee;
-}
-hr {
-    border: none 0;
-    border-top: 1px solid #aaa;
-    height: 1px;
-}
-div.summary {
-    font-size: .8em;
-    border-bottom: 1px solid #aaa;
-    padding-left: 1em;
-    padding-right: 1em;
-}
-div.summary h2 {
-    margin-bottom: 0.3em;
-}
-div.summary table th {
-    text-align: right;
-    vertical-align: top;
-    white-space: nowrap;
-}
-span.lineschanged {
-    font-size: 0.7em;
-}
-span.oldmarker {
-    color: red;
-    font-size: large;
-    font-weight: bold;
-}
-span.newmarker {
-    color: green;
-    font-size: large;
-    font-weight: bold;
-}
-span.removed {
-    color: brown;
-}
-span.changed {
-    color: blue;
-}
-span.new {
-    color: blue;
-    font-weight: bold;
-}
-a.print { font-size: x-small; }
-
-</style>
-
-<style type="text/css" media="print">
-pre { font-size: 0.8em; font-family: courier, monospace; }
-span.removed { color: #444; font-style: italic }
-span.changed { font-weight: bold; }
-span.new { font-weight: bold; }
-span.newmarker { font-size: 1.2em; font-weight: bold; }
-span.oldmarker { font-size: 1.2em; font-weight: bold; }
-a.print {display: none}
-hr { border: none 0; border-top: 1px solid #aaa; height: 1px; }
-</style>
-'
-
-#
-# UDiffs need a slightly different CSS rule for 'new' items (we don't
-# want them to be bolded as we do in cdiffs or sdiffs).
-#
-UDIFFCSS='
-<style type="text/css" media="screen">
-span.new {
-    color: blue;
-    font-weight: normal;
-}
-</style>
-'
-
-#
-# input_cmd | html_quote | output_cmd
-# or
-# html_quote filename | output_cmd
-#
-# Make a piece of source code safe for display in an HTML <pre> block.
-#
-html_quote()
-{
-	sed -e "s/&/\&amp;/g" -e "s/&amp;#\([x]*[0-9A-Fa-f]\{2,5\}\);/\&#\1;/g" -e "s/</\&lt;/g" -e "s/>/\&gt;/g" "$@" | expand
-}
-
-#
-# input_cmd | html_quote | output_cmd
-# or
-# html_dequote filename | output_cmd
-#
-# Replace HTML entities with literals
-#
-html_dequote()
-{
-	sed -e "s/&quot;/\"/g" -e "s/&apos;/\'/g" -e "s/&amp;/\&/g" -e "s/&lt;/<'/g" -e "s/&gt;/>/g" "$@" | expand
-}
-
-#
-# input_cmd | bug2url | output_cmd
-#
-# Scan for bugids and insert <a> links to the relevent bug database.
-#
-bug2url()
-{
-	sed -e 's|[0-9]\{5,\}|<a href=\"'$BUGURL$IDPREFIX'&\">&</a>|g'
-}
-
-#
-# strip_unchanged <infile> | output_cmd
-#
-# Removes chunks of sdiff documents that have not changed. This makes it
-# easier for a code reviewer to find the bits that have changed.
-#
-# Deleted lines of text are replaced by a horizontal rule. Some
-# identical lines are retained before and after the changed lines to
-# provide some context.  The number of these lines is controlled by the
-# variable C in the $AWK script below.
-#
-# The script detects changed lines as any line that has a "<span class="
-# string embedded (unchanged lines have no particular class and are not
-# part of a <span>).  Blank lines (without a sequence number) are also
-# detected since they flag lines that have been inserted or deleted.
-#
-strip_unchanged()
-{
-	$AWK '
-	BEGIN	{ C = c = 20 }
-	NF == 0 || /span class=/ {
-		if (c > C) {
-			c -= C
-			inx = 0
-			if (c > C) {
-				print "\n</pre><hr></hr><pre>"
-				inx = c % C
-				c = C
-			}
-
-			for (i = 0; i < c; i++)
-				print ln[(inx + i) % C]
-		}
-		c = 0;
-		print
-		next
-	}
-	{	if (c >= C) {
-			ln[c % C] = $0
-			c++;
-			next;
-		}
-		c++;
-		print
-	}
-	END	{ if (c > (C * 2)) print "\n</pre><hr></hr>" }
-
-	' $1
-}
-
-#
-# sdiff_to_html
-#
-# This function takes two files as arguments, obtains their diff, and
-# processes the diff output to present the files as an HTML document with
-# the files displayed side-by-side, differences shown in color.  It also
-# takes a delta comment, rendered as an HTML snippet, as the third
-# argument.  The function takes two files as arguments, then the name of
-# file, the path, and the comment.  The HTML will be delivered on stdout,
-# e.g.
-#
-#   $ sdiff_to_html old/usr/src/tools/scripts/webrev.sh \
-#         new/usr/src/tools/scripts/webrev.sh \
-#         webrev.sh usr/src/tools/scripts \
-#         '<a href="https://bugs.openjdk.java.net/browse/JDK-1234567">
-#          JDK-1234567</a> my bugid' > <file>.html
-#
-# framed_sdiff() is then called which creates $2.frames.html
-# in the webrev tree.
-#
-# FYI: This function is rather unusual in its use of awk.  The initial
-# diff run produces conventional diff output showing changed lines mixed
-# with editing codes.  The changed lines are ignored - we're interested in
-# the editing codes, e.g.
-#
-#      8c8
-#      57a61
-#      63c66,76
-#      68,93d80
-#      106d90
-#      108,110d91
-#
-#  These editing codes are parsed by the awk script and used to generate
-#  another awk script that generates HTML, e.g the above lines would turn
-#  into something like this:
-#
-#      BEGIN { printf "<pre>\n" }
-#      function sp(n) {for (i=0;i<n;i++)printf "\n"}
-#      function wl(n) {printf "<font color=%s>%4d %s </font>\n", n, NR, $0}
-#      NR==8           {wl("#7A7ADD");next}
-#      NR==54          {wl("#7A7ADD");sp(3);next}
-#      NR==56          {wl("#7A7ADD");next}
-#      NR==57          {wl("black");printf "\n"; next}
-#        :               :
-#
-#  This script is then run on the original source file to generate the
-#  HTML that corresponds to the source file.
-#
-#  The two HTML files are then combined into a single piece of HTML that
-#  uses an HTML table construct to present the files side by side.  You'll
-#  notice that the changes are color-coded:
-#
-#   black     - unchanged lines
-#   blue      - changed lines
-#   bold blue - new lines
-#   brown     - deleted lines
-#
-#  Blank lines are inserted in each file to keep unchanged lines in sync
-#  (side-by-side).  This format is familiar to users of sdiff(1) or
-#  Teamware's filemerge tool.
-#
-sdiff_to_html()
-{
-	diff -b $1 $2 > /tmp/$$.diffs
-
-	TNAME=$3
-	TPATH=$4
-	COMMENT=$5
-
-	#
-	#  Now we have the diffs, generate the HTML for the old file.
-	#
-	$AWK '
-	BEGIN	{
-		printf "function sp(n) {for (i=0;i<n;i++)printf \"\\n\"}\n"
-		printf "function removed() "
-		printf "{printf \"<span class=\\\"removed\\\">%%4d %%s</span>\\n\", NR, $0}\n"
-		printf "function changed() "
-		printf "{printf \"<span class=\\\"changed\\\">%%4d %%s</span>\\n\", NR, $0}\n"
-		printf "function bl() {printf \"%%4d %%s\\n\", NR, $0}\n"
-}
-	/^</	{next}
-	/^>/	{next}
-	/^---/	{next}
-
-	{
-	split($1, a, /[cad]/) ;
-	if (index($1, "a")) {
-		if (a[1] == 0) {
-			n = split(a[2], r, /,/);
-			if (n == 1)
-				printf "BEGIN\t\t{sp(1)}\n"
-			else
-				printf "BEGIN\t\t{sp(%d)}\n",\
-				(r[2] - r[1]) + 1
-			next
-		}
-
-		printf "NR==%s\t\t{", a[1]
-		n = split(a[2], r, /,/);
-		s = r[1];
-		if (n == 1)
-			printf "bl();printf \"\\n\"; next}\n"
-		else {
-			n = r[2] - r[1]
-			printf "bl();sp(%d);next}\n",\
-			(r[2] - r[1]) + 1
-		}
-		next
-	}
-	if (index($1, "d")) {
-		n = split(a[1], r, /,/);
-		n1 = r[1]
-		n2 = r[2]
-		if (n == 1)
-			printf "NR==%s\t\t{removed(); next}\n" , n1
-		else
-			printf "NR==%s,NR==%s\t{removed(); next}\n" , n1, n2
-		next
-	}
-	if (index($1, "c")) {
-		n = split(a[1], r, /,/);
-		n1 = r[1]
-		n2 = r[2]
-		final = n2
-		d1 = 0
-		if (n == 1)
-			printf "NR==%s\t\t{changed();" , n1
-		else {
-			d1 = n2 - n1
-			printf "NR==%s,NR==%s\t{changed();" , n1, n2
-		}
-		m = split(a[2], r, /,/);
-		n1 = r[1]
-		n2 = r[2]
-		if (m > 1) {
-			d2  = n2 - n1
-			if (d2 > d1) {
-				if (n > 1) printf "if (NR==%d)", final
-				printf "sp(%d);", d2 - d1
-			}
-		}
-		printf "next}\n" ;
-
-		next
-	}
-	}
-
-	END	{ printf "{printf \"%%4d %%s\\n\", NR, $0 }\n" }
-	' /tmp/$$.diffs > /tmp/$$.file1
-
-	#
-	#  Now generate the HTML for the new file
-	#
-	$AWK '
-	BEGIN	{
-		printf "function sp(n) {for (i=0;i<n;i++)printf \"\\n\"}\n"
-		printf "function new() "
-		printf "{printf \"<span class=\\\"new\\\">%%4d %%s</span>\\n\", NR, $0}\n"
-		printf "function changed() "
-		printf "{printf \"<span class=\\\"changed\\\">%%4d %%s</span>\\n\", NR, $0}\n"
-		printf "function bl() {printf \"%%4d %%s\\n\", NR, $0}\n"
-	}
-
-	/^</	{next}
-	/^>/	{next}
-	/^---/	{next}
-
-	{
-	split($1, a, /[cad]/) ;
-	if (index($1, "d")) {
-		if (a[2] == 0) {
-			n = split(a[1], r, /,/);
-			if (n == 1)
-				printf "BEGIN\t\t{sp(1)}\n"
-			else
-				printf "BEGIN\t\t{sp(%d)}\n",\
-				(r[2] - r[1]) + 1
-			next
-		}
-
-		printf "NR==%s\t\t{", a[2]
-		n = split(a[1], r, /,/);
-		s = r[1];
-		if (n == 1)
-			printf "bl();printf \"\\n\"; next}\n"
-		else {
-			n = r[2] - r[1]
-			printf "bl();sp(%d);next}\n",\
-			(r[2] - r[1]) + 1
-		}
-		next
-	}
-	if (index($1, "a")) {
-		n = split(a[2], r, /,/);
-		n1 = r[1]
-		n2 = r[2]
-		if (n == 1)
-			printf "NR==%s\t\t{new() ; next}\n" , n1
-		else
-			printf "NR==%s,NR==%s\t{new() ; next}\n" , n1, n2
-		next
-	}
-	if (index($1, "c")) {
-		n = split(a[2], r, /,/);
-		n1 = r[1]
-		n2 = r[2]
-		final = n2
-		d2 = 0;
-		if (n == 1) {
-			final = n1
-			printf "NR==%s\t\t{changed();" , n1
-		} else {
-			d2 = n2 - n1
-			printf "NR==%s,NR==%s\t{changed();" , n1, n2
-		}
-		m = split(a[1], r, /,/);
-		n1 = r[1]
-		n2 = r[2]
-		if (m > 1) {
-			d1  = n2 - n1
-			if (d1 > d2) {
-				if (n > 1) printf "if (NR==%d)", final
-				printf "sp(%d);", d1 - d2
-			}
-		}
-		printf "next}\n" ;
-		next
-	}
-	}
-	END	{ printf "{printf \"%%4d %%s\\n\", NR, $0 }\n" }
-	' /tmp/$$.diffs > /tmp/$$.file2
-
-	#
-	# Post-process the HTML files by running them back through $AWK
-	#
-	html_quote < $1 | $AWK -f /tmp/$$.file1 > /tmp/$$.file1.html
-
-	html_quote < $2 | $AWK -f /tmp/$$.file2 > /tmp/$$.file2.html
-
-	#
-	# Now combine into a valid HTML file and side-by-side into a table
-	#
-	print "$HTML<head>$STDHEAD"
-	print "<title>$WNAME Sdiff $TPATH </title>"
-	print "</head><body id=\"SUNWwebrev\">"
-	print "<h2>$TPATH/$TNAME</h2>"
-        print "<a class=\"print\" href=\"javascript:print()\">Print this page</a>"
-	print "<pre>$COMMENT</pre>\n"
-	print "<table><tr valign=\"top\">"
-	print "<td><pre>"
-
-	strip_unchanged /tmp/$$.file1.html
-
-	print "</pre></td><td><pre>"
-
-	strip_unchanged /tmp/$$.file2.html
-
-	print "</pre></td>"
-	print "</tr></table>"
-	print "</body></html>"
-
-	framed_sdiff $TNAME $TPATH /tmp/$$.file1.html /tmp/$$.file2.html \
-	    "$COMMENT"
-}
-
-
-#
-# framed_sdiff <filename> <filepath> <lhsfile> <rhsfile> <comment>
-#
-# Expects lefthand and righthand side html files created by sdiff_to_html.
-# We use insert_anchors() to augment those with HTML navigation anchors,
-# and then emit the main frame.  Content is placed into:
-#
-#    $WDIR/DIR/$TNAME.lhs.html
-#    $WDIR/DIR/$TNAME.rhs.html
-#    $WDIR/DIR/$TNAME.frames.html
-#
-# NOTE: We rely on standard usage of $WDIR and $DIR.
-#
-function framed_sdiff
-{
-	typeset TNAME=$1
-	typeset TPATH=$2
-	typeset lhsfile=$3
-	typeset rhsfile=$4
-	typeset comments=$5
-	typeset RTOP
-
-	# Enable html files to access WDIR via a relative path.
-	RTOP=$(relative_dir $TPATH $WDIR)
-
-	# Make the rhs/lhs files and output the frameset file.
-	print "$HTML<head>$STDHEAD" > $WDIR/$DIR/$TNAME.lhs.html
-
-	cat >> $WDIR/$DIR/$TNAME.lhs.html <<-EOF
-	    <script type="text/javascript" src="$RTOP/ancnav.js"></script>
-	    </head>
-	    <body id="SUNWwebrev" onkeypress="keypress(event);">
-	    <a name="0"></a>
-	    <pre>$comments</pre><hr></hr>
-	EOF
-
-	cp $WDIR/$DIR/$TNAME.lhs.html $WDIR/$DIR/$TNAME.rhs.html
-
-	insert_anchors $lhsfile >> $WDIR/$DIR/$TNAME.lhs.html
-	insert_anchors $rhsfile >> $WDIR/$DIR/$TNAME.rhs.html
-
-	close='</body></html>'
-
-	print $close >> $WDIR/$DIR/$TNAME.lhs.html
-	print $close >> $WDIR/$DIR/$TNAME.rhs.html
-
-	print "$FRAMEHTML<head>$STDHEAD" > $WDIR/$DIR/$TNAME.frames.html
-	print "<title>$WNAME Framed-Sdiff " \
-	    "$TPATH/$TNAME</title> </head>" >> $WDIR/$DIR/$TNAME.frames.html
-	cat >> $WDIR/$DIR/$TNAME.frames.html <<-EOF
-	  <frameset rows="*,60">
-	    <frameset cols="50%,50%">
-	      <frame src="$TNAME.lhs.html" scrolling="auto" name="lhs" />
-	      <frame src="$TNAME.rhs.html" scrolling="auto" name="rhs" />
-	    </frameset>
-	  <frame src="$RTOP/ancnav.html" scrolling="no" marginwidth="0"
-	   marginheight="0" name="nav" />
-	  <noframes>
-            <body id="SUNWwebrev">
-	      Alas 'frames' webrev requires that your browser supports frames
-	      and has the feature enabled.
-            </body>
-	  </noframes>
-	  </frameset>
-	</html>
-	EOF
-}
-
-
-#
-# fix_postscript
-#
-# Merge codereview output files to a single conforming postscript file, by:
-# 	- removing all extraneous headers/trailers
-#	- making the page numbers right
-#	- removing pages devoid of contents which confuse some
-#	  postscript readers.
-#
-# From Casper.
-#
-function fix_postscript
-{
-	infile=$1
-
-	cat > /tmp/$$.crmerge.pl << \EOF
-
-	print scalar(<>);		# %!PS-Adobe---
-	print "%%Orientation: Landscape\n";
-
-	$pno = 0;
-	$doprint = 1;
-
-	$page = "";
-
-	while (<>) {
-		next if (/^%%Pages:\s*\d+/);
-
-		if (/^%%Page:/) {
-			if ($pno == 0 || $page =~ /\)S/) {
-				# Header or single page containing text
-				print "%%Page: ? $pno\n" if ($pno > 0);
-				print $page;
-				$pno++;
-			} else {
-				# Empty page, skip it.
-			}
-			$page = "";
-			$doprint = 1;
-			next;
-		}
-
-		# Skip from %%Trailer of one document to Endprolog
-		# %%Page of the next
-		$doprint = 0 if (/^%%Trailer/);
-		$page .= $_ if ($doprint);
-	}
-
-	if ($page =~ /\)S/) {
-		print "%%Page: ? $pno\n";
-		print $page;
-	} else {
-		$pno--;
-	}
-	print "%%Trailer\n%%Pages: $pno\n";
-EOF
-
-	$PERL /tmp/$$.crmerge.pl < $infile
-}
-
-
-#
-# input_cmd | insert_anchors | output_cmd
-#
-# Flag blocks of difference with sequentially numbered invisible
-# anchors.  These are used to drive the frames version of the
-# sdiffs output.
-#
-# NOTE: Anchor zero flags the top of the file irrespective of changes,
-# an additional anchor is also appended to flag the bottom.
-#
-# The script detects changed lines as any line that has a "<span
-# class=" string embedded (unchanged lines have no class set and are
-# not part of a <span>.  Blank lines (without a sequence number)
-# are also detected since they flag lines that have been inserted or
-# deleted.
-#
-function insert_anchors
-{
-	$AWK '
-	function ia() {
-		# This should be able to be a singleton <a /> but that
-		# seems to trigger a bug in firefox a:hover rule processing
-		printf "<a name=\"%d\" id=\"anc%d\"></a>", anc, anc++;
-	}
-
-	BEGIN {
-		anc=1;
-		inblock=1;
-		printf "<pre>\n";
-	}
-	NF == 0 || /^<span class=/ {
-		if (inblock == 0) {
-			ia();
-			inblock=1;
-		}
-		print;
-		next;
-	}
-	{
-		inblock=0;
-		print;
-	}
-	END {
-		ia();
-
-		printf "<b style=\"font-size: large; color: red\">";
-		printf "--- EOF ---</b>"
-        	for(i=0;i<8;i++) printf "\n\n\n\n\n\n\n\n\n\n";
-		printf "</pre>"
-		printf "<form name=\"eof\">";
-		printf "<input name=\"value\" value=\"%d\" type=\"hidden\" />",
-		    anc - 1;
-		printf "</form>";
-	}
-	' $1
-}
-
-
-#
-# relative_dir
-#
-# Print a relative return path from $1 to $2.  For example if
-# $1=/tmp/myreview/raw_files/usr/src/tools/scripts and $2=/tmp/myreview,
-# this function would print "../../../../".
-#
-# In the event that $1 is not in $2 a warning is printed to stderr,
-# and $2 is returned-- the result of this is that the resulting webrev
-# is not relocatable.
-#
-function relative_dir
-{
-    d1=$1
-    d2=$2
-    if [[ "$d1" == "." ]]; then
-	print "."
-    else
-	typeset cur="${d1##$d2?(/)}"
-	typeset ret=""
-	if [[ $d2 == $cur ]]; then   # Should never happen.
-		# Should never happen.
-		print -u2 "\nWARNING: relative_dir: \"$1\" not relative "
-		print -u2 "to \"$2\".  Check input paths.  Framed webrev "
-		print -u2 "will not be relocatable!"
-		print $2
-		return
-	fi
-
-	while [[ -n ${cur} ]];
-	do
-		cur=${cur%%*(/)*([!/])}
-		if [[ -z $ret ]]; then
-			ret=".."
-		else
-			ret="../$ret"
-		fi
-	done
-	print $ret
-    fi
-}
-
-
-#
-# frame_nav_js
-#
-# Emit javascript for frame navigation
-#
-function frame_nav_js
-{
-cat << \EOF
-var myInt;
-var scrolling=0;
-var sfactor = 3;
-var scount=10;
-
-function scrollByPix() {
-	if (scount<=0) {
-		sfactor*=1.2;
-		scount=10;
-	}
-	parent.lhs.scrollBy(0,sfactor);
-	parent.rhs.scrollBy(0,sfactor);
-	scount--;
-}
-
-function scrollToAnc(num) {
-
-	// Update the value of the anchor in the form which we use as
-	// storage for this value.  setAncValue() will take care of
-	// correcting for overflow and underflow of the value and return
-	// us the new value.
-	num = setAncValue(num);
-
-	// Set location and scroll back a little to expose previous
-	// lines.
-	//
-	// Note that this could be improved: it is possible although
-	// complex to compute the x and y position of an anchor, and to
-	// scroll to that location directly.
-	//
-	parent.lhs.location.replace(parent.lhs.location.pathname + "#" + num);
-	parent.rhs.location.replace(parent.rhs.location.pathname + "#" + num);
-
-	parent.lhs.scrollBy(0,-30);
-	parent.rhs.scrollBy(0,-30);
-}
-
-function getAncValue()
-{
-	return (parseInt(parent.nav.document.diff.real.value));
-}
-
-function setAncValue(val)
-{
-	if (val <= 0) {
-		val = 0;
-		parent.nav.document.diff.real.value = val;
-		parent.nav.document.diff.display.value = "BOF";
-		return (val);
-	}
-
-	//
-	// The way we compute the max anchor value is to stash it
-	// inline in the left and right hand side pages-- it's the same
-	// on each side, so we pluck from the left.
-	//
-	maxval = parent.lhs.document.eof.value.value;
-	if (val < maxval) {
-		parent.nav.document.diff.real.value = val;
-		parent.nav.document.diff.display.value = val.toString();
-		return (val);
-	}
-
-	// this must be: val >= maxval
-	val = maxval;
-	parent.nav.document.diff.real.value = val;
-	parent.nav.document.diff.display.value = "EOF";
-	return (val);
-}
-
-function stopScroll() {
-	if (scrolling==1) {
-		clearInterval(myInt);
-		scrolling=0;
-	}
-}
-
-function startScroll() {
-	stopScroll();
-	scrolling=1;
-	myInt=setInterval("scrollByPix()",10);
-}
-
-function handlePress(b) {
-
-	switch (b) {
-	    case 1 :
-		scrollToAnc(-1);
-		break;
-	    case 2 :
-		scrollToAnc(getAncValue() - 1);
-		break;
-	    case 3 :
-		sfactor=-3;
-		startScroll();
-		break;
-	    case 4 :
-		sfactor=3;
-		startScroll();
-		break;
-	    case 5 :
-		scrollToAnc(getAncValue() + 1);
-		break;
-	    case 6 :
-		scrollToAnc(999999);
-		break;
-	}
-}
-
-function handleRelease(b) {
-	stopScroll();
-}
-
-function keypress(ev) {
-	var keynum;
-	var keychar;
-
-	if (window.event) { // IE
-		keynum = ev.keyCode;
-	} else if (ev.which) { // non-IE
-		keynum = ev.which;
-	}
-
-	keychar = String.fromCharCode(keynum);
-
-	if (keychar == "k") {
-		handlePress(2);
-		return (0);
-	} else if (keychar == "j" || keychar == " ") {
-		handlePress(5);
-		return (0);
-	}
-	return (1);
-}
-
-function ValidateDiffNum(){
-	val = parent.nav.document.diff.display.value;
-	if (val == "EOF") {
-		scrollToAnc(999999);
-		return;
-	}
-
-	if (val == "BOF") {
-		scrollToAnc(0);
-		return;
-	}
-
-        i=parseInt(val);
-        if (isNaN(i)) {
-                parent.nav.document.diff.display.value = getAncValue();
-        } else {
-                scrollToAnc(i);
-        }
-        return false;
-}
-
-EOF
-}
-
-#
-# frame_navigation
-#
-# Output anchor navigation file for framed sdiffs.
-#
-function frame_navigation
-{
-	print "$HTML<head>$STDHEAD"
-
-	cat << \EOF
-<title>Anchor Navigation</title>
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta http-equiv="Content-Type" content="text/html" />
-
-<style type="text/css">
-    div.button td { padding-left: 5px; padding-right: 5px;
-		    background-color: #eee; text-align: center;
-		    border: 1px #444 outset; cursor: pointer; }
-    div.button a { font-weight: bold; color: black }
-    div.button td:hover { background: #ffcc99; }
-</style>
-EOF
-
-	print "<script type=\"text/javascript\" src=\"ancnav.js\"></script>"
-
-	cat << \EOF
-</head>
-<body id="SUNWwebrev" bgcolor="#eeeeee" onload="document.diff.real.focus();"
-	onkeypress="keypress(event);">
-    <noscript lang="javascript">
-      <center>
-	<p><big>Framed Navigation controls require Javascript</big><br />
-	Either this browser is incompatable or javascript is not enabled</p>
-      </center>
-    </noscript>
-    <table width="100%" border="0" align="center">
-	<tr>
-          <td valign="middle" width="25%">Diff navigation:
-          Use 'j' and 'k' for next and previous diffs; or use buttons
-          at right</td>
-	  <td align="center" valign="top" width="50%">
-	    <div class="button">
-	      <table border="0" align="center">
-                  <tr>
-		    <td>
-		      <a onMouseDown="handlePress(1);return true;"
-			 onMouseUp="handleRelease(1);return true;"
-			 onMouseOut="handleRelease(1);return true;"
-			 onClick="return false;"
-			 title="Go to Beginning Of file">BOF</a></td>
-		    <td>
-		      <a onMouseDown="handlePress(3);return true;"
-			 onMouseUp="handleRelease(3);return true;"
-			 onMouseOut="handleRelease(3);return true;"
-			 title="Scroll Up: Press and Hold to accelerate"
-			 onClick="return false;">Scroll Up</a></td>
-		    <td>
-		      <a onMouseDown="handlePress(2);return true;"
-			 onMouseUp="handleRelease(2);return true;"
-			 onMouseOut="handleRelease(2);return true;"
-			 title="Go to previous Diff"
-			 onClick="return false;">Prev Diff</a>
-		    </td></tr>
-
-		  <tr>
-		    <td>
-		      <a onMouseDown="handlePress(6);return true;"
-			 onMouseUp="handleRelease(6);return true;"
-			 onMouseOut="handleRelease(6);return true;"
-			 onClick="return false;"
-			 title="Go to End Of File">EOF</a></td>
-		    <td>
-		      <a onMouseDown="handlePress(4);return true;"
-			 onMouseUp="handleRelease(4);return true;"
-			 onMouseOut="handleRelease(4);return true;"
-			 title="Scroll Down: Press and Hold to accelerate"
-			 onClick="return false;">Scroll Down</a></td>
-		    <td>
-		      <a onMouseDown="handlePress(5);return true;"
-			 onMouseUp="handleRelease(5);return true;"
-			 onMouseOut="handleRelease(5);return true;"
-			 title="Go to next Diff"
-			 onClick="return false;">Next Diff</a></td>
-		  </tr>
-              </table>
-	    </div>
-	  </td>
-	  <th valign="middle" width="25%">
-	    <form action="" name="diff" onsubmit="return ValidateDiffNum();">
-		<input name="display" value="BOF" size="8" type="text" />
-		<input name="real" value="0" size="8" type="hidden" />
-	    </form>
-	  </th>
-	</tr>
-    </table>
-  </body>
-</html>
-EOF
-}
-
-
-
-#
-# diff_to_html <filename> <filepath> { U | C } <comment>
-#
-# Processes the output of diff to produce an HTML file representing either
-# context or unified diffs.
-#
-diff_to_html()
-{
-	TNAME=$1
-	TPATH=$2
-	DIFFTYPE=$3
-	COMMENT=$4
-
-	print "$HTML<head>$STDHEAD"
-	print "<title>$WNAME ${DIFFTYPE}diff $TPATH</title>"
-
-	if [[ $DIFFTYPE == "U" ]]; then
-		print "$UDIFFCSS"
-	fi
-
-	cat <<-EOF
-	</head>
-	<body id="SUNWwebrev">
-	<h2>$TPATH</h2>
-        <a class="print" href="javascript:print()">Print this page</a>
-	<pre>$COMMENT</pre>
-        <pre>
-EOF
-
-	html_quote | $AWK '
-	/^--- new/	{ next }
-	/^\+\+\+ new/	{ next }
-	/^--- old/	{ next }
-	/^\*\*\* old/	{ next }
-	/^\*\*\*\*/	{ next }
-	/^-------/	{ printf "<center><h1>%s</h1></center>\n", $0; next }
-	/^\@\@.*\@\@$/	{ printf "</pre><hr /><pre>\n";
-			  printf "<span class=\"newmarker\">%s</span>\n", $0;
-			  next}
-
-	/^\*\*\*/	{ printf "<hr /><span class=\"oldmarker\">%s</span>\n", $0;
-			  next}
-	/^---/		{ printf "<span class=\"newmarker\">%s</span>\n", $0;
-			  next}
-	/^\+/		{printf "<span class=\"new\">%s</span>\n", $0; next}
-	/^!/		{printf "<span class=\"changed\">%s</span>\n", $0; next}
-	/^-/		{printf "<span class=\"removed\">%s</span>\n", $0; next}
-			{printf "%s\n", $0; next}
-	'
-
-	print "</pre></body></html>\n"
-}
-
-
-#
-# source_to_html { new | old } <filename>
-#
-# Process a plain vanilla source file to transform it into an HTML file.
-#
-source_to_html()
-{
-	WHICH=$1
-	TNAME=$2
-
-	print "$HTML<head>$STDHEAD"
-	print "<title>$WHICH $TNAME</title>"
-	print "<body id=\"SUNWwebrev\">"
-	print "<pre>"
-	html_quote | $AWK '{line += 1 ; printf "%4d %s\n", line, $0 }'
-	print "</pre></body></html>"
-}
-
-comments_from_mercurial()
-{
-	fmt=$1
-	pfile=$PWS/$2
-	cfile=$CWS/$3
-
-        logdir=`dirname $cfile`
-        logf=`basename $cfile`
-        if [ -d $logdir ]; then
-            ( cd $logdir;
-	        active=`hg status $logf 2>/dev/null`
-                # If the output from 'hg status' is not empty, it means the file
-                # hasn't been committed, so don't fetch comments.
-	        if [[ -z $active ]] ; then
-                    if [[ -n $ALL_CREV ]]; then
-                        rev_opt=
-                        for rev in $ALL_CREV; do
-                            rev_opt="$rev_opt --rev $rev"
-                        done
-                        comm=`hg log $rev_opt --follow --template 'rev {rev} : {desc}\n' $logf`
-                    elif [[ -n $FIRST_CREV ]]; then
-		        comm=`hg log --rev $FIRST_CREV:tip --follow --template 'rev {rev} : {desc}\n' $logf`
-                    else
-		        comm=`hg log -l1 --follow --template 'rev {rev} : {desc}\n' $logf`
-                    fi
-	        else
-	            comm=""
-	        fi
-	        if [[ $fmt == "text" ]]; then
-	            print "$comm"
-	            return
-	        fi
-
-	        print "$comm" | html_quote | bug2url
-                )
-        fi
-}
-
-
-#
-# getcomments {text|html} filepath parentpath
-#
-# Fetch the comments depending on what SCM mode we're in.
-#
-getcomments()
-{
-	typeset fmt=$1
-	typeset p=$2
-	typeset pp=$3
-
-	comments_from_mercurial $fmt $pp $p
-}
-
-#
-# printCI <total-changed> <inserted> <deleted> <modified> <unchanged>
-#
-# Print out Code Inspection figures similar to sccs-prt(1) format.
-#
-function printCI
-{
-	integer tot=$1 ins=$2 del=$3 mod=$4 unc=$5
-	typeset str
-	if (( tot == 1 )); then
-		str="line"
-	else
-		str="lines"
-	fi
-	printf '%d %s changed: %d ins; %d del; %d mod; %d unchg' \
-	    $tot $str $ins $del $mod $unc
-}
-
-
-#
-# difflines <oldfile> <newfile>
-#
-# Calculate and emit number of added, removed, modified and unchanged lines,
-# and total lines changed, the sum of added + removed + modified.
-#
-function difflines
-{
-	integer tot mod del ins unc err
-	typeset filename
-
-	eval $( diff -e $1 $2 | $AWK '
-	# Change range of lines: N,Nc
-	/^[0-9]*,[0-9]*c$/ {
-		n=split(substr($1,1,length($1)-1), counts, ",");
-		if (n != 2) {
-		    error=2
-		    exit;
-		}
-		#
-		# 3,5c means lines 3 , 4 and 5 are changed, a total of 3 lines.
-		# following would be 5 - 3 = 2! Hence +1 for correction.
-		#
-		r=(counts[2]-counts[1])+1;
-
-		#
-		# Now count replacement lines: each represents a change instead
-		# of a delete, so increment c and decrement r.
-		#
-		while (getline != /^\.$/) {
-			c++;
-			r--;
-		}
-		#
-		# If there were more replacement lines than original lines,
-		# then r will be negative; in this case there are no deletions,
-		# but there are r changes that should be counted as adds, and
-		# since r is negative, subtract it from a and add it to c.
-		#
-		if (r < 0) {
-			a-=r;
-			c+=r;
-		}
-
-		#
-		# If there were more original lines than replacement lines, then
-		# r will be positive; in this case, increment d by that much.
-		#
-		if (r > 0) {
-			d+=r;
-		}
-		next;
-	}
-
-	# Change lines: Nc
-	/^[0-9].*c$/ {
-		# The first line is a replacement; any more are additions.
-		if (getline != /^\.$/) {
-			c++;
-			while (getline != /^\.$/) a++;
-		}
-		next;
-	}
-
-	# Add lines: both Na and N,Na
-	/^[0-9].*a$/ {
-		while (getline != /^\.$/) a++;
-		next;
-	}
-
-	# Delete range of lines: N,Nd
-	/^[0-9]*,[0-9]*d$/ {
-		n=split(substr($1,1,length($1)-1), counts, ",");
-		if (n != 2) {
-			error=2
-			exit;
-		}
-		#
-		# 3,5d means lines 3 , 4 and 5 are deleted, a total of 3 lines.
-		# following would be 5 - 3 = 2! Hence +1 for correction.
-		#
-		r=(counts[2]-counts[1])+1;
-		d+=r;
-		next;
-	}
-
-	# Delete line: Nd.   For example 10d says line 10 is deleted.
-	/^[0-9]*d$/ {d++; next}
-
-	# Should not get here!
-	{
-		error=1;
-		exit;
-	}
-
-	# Finish off - print results
-	END {
-		printf("tot=%d;mod=%d;del=%d;ins=%d;err=%d\n",
-		    (c+d+a), c, d, a, error);
-	}' )
-
-	# End of $AWK, Check to see if any trouble occurred.
-	if (( $? > 0 || err > 0 )); then
-		print "Unexpected Error occurred reading" \
-		    "\`diff -e $1 $2\`: \$?=$?, err=" $err
-		return
-	fi
-
-	# Accumulate totals
-	(( TOTL += tot ))
-	(( TMOD += mod ))
-	(( TDEL += del ))
-	(( TINS += ins ))
-	# Calculate unchanged lines
-	unc=`wc -l < $1`
-	if (( unc > 0 )); then
-		(( unc -= del + mod ))
-		(( TUNC += unc ))
-	fi
-	# print summary
-	print "<span class=\"lineschanged\">\c"
-	printCI $tot $ins $del $mod $unc
-	print "</span>"
-}
-
-function outgoing_from_mercurial_forest
-{
-    hg foutgoing --template 'rev: {rev}\n' $OUTPWS | $FILTER | $AWK '
-        BEGIN           {ntree=0}
-        /^comparing/    {next}
-        /^no changes/   {next}
-        /^searching/    {next}
-	/^\[.*\]$/	{tree=substr($1,2,length($1)-2);
-                         trees[ntree++] = tree;
-                         revs[tree]=-1;
-                         next}
-        /^rev:/   {rev=$2+0;
-                   if (revs[tree] == -1 || rev < revs[tree])
-                        { revs[tree] = rev; };
-                  next;}
-        END       {for (tree in trees)
-                        { rev=revs[trees[tree]];
-                          if (rev > 0)
-                                {printf("%s %d\n",trees[tree],rev-1)}
-                        }}' | while read LINE
-    do
-        set - $LINE
-        TREE=$1
-        REV=$2
-        A=`hg -R $CWS/$TREE log --rev $REV --template '{node}'`
-        FSTAT_OPT="--rev $A"
-        print "Revision: $A $REV" >> $FLIST
-        treestatus $TREE
-    done
-}
-
-function flist_from_mercurial_forest
-{
-    rm -f $FLIST
-    if [ -z "$Nflag" ]; then
-        print " File list from hg foutgoing $PWS ..."
-        outgoing_from_mercurial_forest
-        HG_LIST_FROM_COMMIT=1
-    fi
-    if [ ! -f $FLIST ]; then
-        # hg commit hasn't been run see what is lying around
-        print "\n No outgoing, perhaps you haven't commited."
-        print " File list from hg fstatus -mard ...\c"
-        FSTAT_OPT=
-        fstatus
-        HG_LIST_FROM_COMMIT=
-    fi
-    print " Done."
-}
-
-#
-# Used when dealing with the result of 'hg foutgoing'
-# When now go down the tree and generate the change list
-#
-function treestatus
-{
-    TREE=$1
-    HGCMD="hg -R $CWS/$TREE status $FSTAT_OPT"
-
-    $HGCMD -mdn 2>/dev/null | $FILTER | while read F
-    do
-        echo $TREE/$F
-    done >> $FLIST
-
-    # Then all the added files
-    # But some of these could have been "moved" or renamed ones or copied ones
-    # so let's make sure we get the proper info
-    # hg status -aC will produce something like:
-    #	A subdir/File3
-    #	A subdir/File4
-    #	  File4
-    #	A subdir/File5
-    # The first and last are simple addition while the middle one
-    # is a move/rename or a copy.  We can't distinguish from a rename vs a copy
-    # without also getting the status of removed files.  The middle case above
-    # is a rename if File4 is also shown a being removed.  If File4 is not a
-    # removed file, then the middle case is a copy from File4 to subdir/File4
-    # FIXME - we're not distinguishing copy from rename
-    $HGCMD -aC | $FILTER | while read LINE; do
-	ldone=""
-	while [ -z "$ldone" ]; do
-	    ldone="1"
-	    set - $LINE
-	    if [ $# -eq 2 -a "$1" == "A" ]; then
-		AFILE=$2
-		if read LINE2; then
-		    set - $LINE2
-		    if [ $# -eq 1 ]; then
-			echo $TREE/$AFILE $TREE/$1 >>$FLIST
-		    elif [ $# -eq 2 ]; then
-			echo $TREE/$AFILE >>$FLIST
-			LINE=$LINE2
-			ldone=""
-		    fi
-		else
-		    echo $TREE/$AFILE >>$FLIST
-		fi
-	    fi
-	done
-    done
-    $HGCMD -rn | $FILTER | while read RFILE; do
-	grep "$TREE/$RFILE" $FLIST >/dev/null
-	if [ $? -eq 1 ]; then
-	    echo $TREE/$RFILE >>$FLIST
-	fi
-    done
-}
-
-function fstatus
-{
-    #
-    # forest extension is still being changed. For instance the output
-    # of fstatus used to no prepend the tree path to filenames, but
-    # this has changed recently. AWK code below does try to handle both
-    # cases
-    #
-    hg fstatus -mdn $FSTAT_OPT 2>/dev/null | $FILTER | $AWK '
-	/^\[.*\]$/	{tree=substr($1,2,length($1)-2); next}
-	$1 != ""	{n=index($1,tree);
-			 if (n == 0)
-				{ printf("%s/%s\n",tree,$1)}
-			 else
-				{ printf("%s\n",$1)}}' >> $FLIST
-
-    #
-    # There is a bug in the output of fstatus -aC on recent versions: it
-    # inserts a space between the name of the tree and the filename of the
-    # old file. e.g.:
-    #
-    # $ hg fstatus -aC
-    # [.]
-    #
-    # [MyWS]
-    # A MyWS/subdir/File2
-    #  MyWS/ File2
-    #
-    # [MyWS2]
-    #
-
-    hg fstatus -aC $FSTAT_OPT 2>/dev/null | $FILTER | $AWK '
-	/^\[.*\]$/	{tree=substr($1,2,length($1)-2); next}
-	/^A .*/		{n=index($2,tree);
-			 if (n == 0)
-				{ printf("A %s/%s\n",tree,$2)}
-			 else
-				{ printf("A %s\n",$2)};
-			 next}
-	/^ /		{n=index($1,tree);
-			 if (n == 0)
-				{ printf("%s/%s\n",tree,$1)}
-			 else
-				{ if (NF == 2)
-					printf("%s/%s\n",tree,$2)
-				  else
-					printf("%s\n",$1)
-				};
-			 next}
-	' | while read LINE; do
-	ldone=""
-	while [ -z "$ldone" ]; do
-	    ldone="1"
-	    set - $LINE
-	    if [ $# -eq 2 -a "$1" == "A" ]; then
-		AFILE=$2
-		if read LINE2; then
-		    set - $LINE2
-		    if [ $# -eq 1 ]; then
-			echo $AFILE $1 >>$FLIST
-		    elif [ $# -eq 2 ]; then
-			echo $AFILE >>$FLIST
-			LINE=$LINE2
-			ldone=""
-		    fi
-		else
-		    echo $AFILE >>$FLIST
-		fi
-	    fi
-	done
-    done
-    hg fstatus -rn $FSTAT_OPT 2>/dev/null | $FILTER | $AWK '
-	/^\[.*\]$/	{tree=substr($1,2,length($1)-2); next}
-	$1 != ""	{n=index($1,tree);
-			 if (n == 0)
-				{ printf("%s/%s\n",tree,$1)}
-			 else
-				{ printf("%s\n",$1)}}' | while read RFILE; do
-	grep "$RFILE" $FLIST >/dev/null
-	if [ $? -eq 1 ]; then
-	    echo $RFILE >>$FLIST
-	fi
-    done
-}
-
-#
-# flist_from_mercurial $PWS
-#
-# Only local file based repositories are supported at present
-# since even though we can determine the list from the parent finding
-# the changes is harder.
-#
-# We first look for any outgoing files, this is for when the user has
-# run hg commit.  If we don't find any then we look with hg status.
-#
-# We need at least one of default-push or default paths set in .hg/hgrc
-# If neither are set we don't know who to compare with.
-
-function flist_from_mercurial
-{
-#	if [ "${PWS##ssh://}" != "$PWS" -o \
-#	     "${PWS##http://}" != "$PWS" -o \
-#	     "${PWS##https://}" != "$PWS" ]; then
-#		print "Remote Mercurial repositories not currently supported."
-#		print "Set default and/or default-push to a local repository"
-#		exit
-#	fi
-    if [[ -n $forestflag ]]; then
-        HG_LIST_FROM_COMMIT=
-	flist_from_mercurial_forest
-    else
-        STATUS_REV=
-        if [[ -n $rflag ]]; then
-            STATUS_REV="--rev $PARENT_REV"
-        elif [[ -n $OUTREV ]]; then
-            STATUS_REV="--rev $OUTREV"
-        else
-            # hg commit hasn't been run see what is lying around
-            print "\n No outgoing, perhaps you haven't commited."
-        fi
-	# First let's list all the modified or deleted files
-
-	hg status $STATUS_REV -mdn | $FILTER > $FLIST
-
-	# Then all the added files
-	# But some of these could have been "moved" or renamed ones
-	# so let's make sure we get the proper info
-	# hg status -aC will produce something like:
-	#	A subdir/File3
-	#	A subdir/File4
-	#	  File4
-	#	A subdir/File5
-        # The first and last are simple addition while the middle one
-        # is a move/rename or a copy.  We can't distinguish from a rename vs a copy
-        # without also getting the status of removed files.  The middle case above
-        # is a rename if File4 is also shown a being removed.  If File4 is not a
-        # removed file, then the middle case is a copy from File4 to subdir/File4
-        # FIXME - we're not distinguishing copy from rename
-
-	hg status $STATUS_REV -aC | $FILTER >$FLIST.temp
-	while read LINE; do
-	    ldone=""
-	    while [ -z "$ldone" ]; do
-		ldone="1"
-		set - $LINE
-		if [ $# -eq 2 -a "$1" == "A" ]; then
-		    AFILE=$2
-		    if read LINE2; then
-			set - $LINE2
-			if [ $# -eq 1 ]; then
-			    echo $AFILE $1 >>$FLIST
-			elif [ $# -eq 2 ]; then
-			    echo $AFILE >>$FLIST
-			    LINE=$LINE2
-			    ldone=""
-			fi
-		    else
-			echo $AFILE >>$FLIST
-		    fi
-		fi
-	    done
-	done < $FLIST.temp
-	hg status $STATUS_REV -rn | $FILTER > $FLIST.temp
-	while read RFILE; do
-	    grep "$RFILE" $FLIST >/dev/null
-	    if [ $? -eq 1 ]; then
-		echo $RFILE >>$FLIST
-	    fi
-	done < $FLIST.temp
-	rm -f $FLIST.temp
-    fi
-}
-
-function env_from_flist
-{
-	[[ -r $FLIST ]] || return
-
-	#
-	# Use "eval" to set env variables that are listed in the file
-	# list.  Then copy those into our local versions of those
-	# variables if they have not been set already.
-	#
-	eval `sed -e "s/#.*$//" $FLIST | grep = `
-
-	[[ -z $codemgr_ws && -n $CODEMGR_WS ]] && codemgr_ws=$CODEMGR_WS
-
-	#
-	# Check to see if CODEMGR_PARENT is set in the flist file.
-	#
-	[[ -z $codemgr_parent && -n $CODEMGR_PARENT ]] && \
-	    codemgr_parent=$CODEMGR_PARENT
-}
-
-#
-# detect_scm
-#
-# We dynamically test the SCM type; this allows future extensions to
-# new SCM types
-#
-function detect_scm
-{
-	if hg root >/dev/null ; then
-		print "mercurial"
-	else
-		print "unknown"
-	fi
-}
-
-function look_for_prog
-{
-	typeset path
-	typeset ppath
-	typeset progname=$1
-
-	DEVTOOLS=
-	OS=`uname`
-	if [[ "$OS" == "SunOS" ]]; then
-	    DEVTOOLS="/java/devtools/`uname -p`/bin"
-	elif [[ "$OS" == "Linux" ]]; then
-	    DEVTOOLS="/java/devtools/linux/bin"
-	fi
-
-	ppath=$PATH
-	ppath=$ppath:/usr/sfw/bin:/usr/bin:/usr/sbin
-	ppath=$ppath:/opt/teamware/bin:/opt/onbld/bin
-	ppath=$ppath:/opt/onbld/bin/`uname -p`
-	ppath=$ppath:/java/devtools/share/bin:$DEVTOOLS
-
-	PATH=$ppath prog=`whence $progname`
-	if [[ -n $prog ]]; then
-		print $prog
-	fi
-}
-
-#
-# Find the parent for $1
-#
-function find_outrev
-{
-    crev=$1
-    prev=`hg log -r $crev --template '{parents}\n'`
-    if [[ -z "$prev" ]]
-    then
-	# No specific parent means previous changeset is parent
-	prev=`expr $crev - 1`
-    else
-	# Format is either of the following two:
-	# 546:7df6fcf1183b
-	# 548:16f1915bb5cd 547:ffaa4e775815
-	prev=`echo $prev | sed -e 's/\([0-9]*\):.*/\1/'`
-    fi
-    print $prev
-}
-
-function extract_ssh_infos
-{
-    CMD=$1
-    if expr "$CMD" : 'ssh://[^/]*@' >/dev/null; then
-	ssh_user=`echo $CMD | sed -e 's/ssh:\/\/\(.*\)@.*/\1/'`
-	ssh_host=`echo $CMD | sed -e 's/ssh:\/\/.*@\([^/]*\)\/.*/\1/'`
-	ssh_dir=`echo $CMD | sed -e 's/ssh:\/\/.*@[^/]*\/\(.*\)/\1/'`
-    else
-	ssh_user=
-	ssh_host=`echo $CMD | sed -e 's/ssh:\/\/\([^/]*\)\/.*/\1/'`
-	ssh_dir=`echo $CMD | sed -e 's/ssh:\/\/[^/]*\/\(.*\)/\1/'`
-    fi
-
-}
-
-function build_old_new_mercurial
-{
-	olddir=$1
-	newdir=$2
-	DIR=$3
-	F=$4
-	#
-	# new version of the file.
-	#
-	rm -rf $newdir/$DIR/$F
-	if [ -f $F ]; then
-	    cp $F  $newdir/$DIR/$F
-	fi
-
-	#
-	# Old version of the file.
-	#
-	rm -rf $olddir/$DIR/$F
-
-	if [ -n "$PWS" ]; then
-	    if expr "$PWS" : 'ssh://' >/dev/null
-	    then
-		extract_ssh_infos $PWS
-		if [ -n "$ssh_user" ]; then
-		    parent="ssh -l $ssh_user $ssh_host hg -R $ssh_dir --cwd $ssh_dir"
-		else
-		    parent="ssh $ssh_host hg -R $ssh_dir --cwd $ssh_dir"
-		fi
-	    else
-		parent="hg -R $PWS --cwd $PWS"
-	    fi
-	else
-	    parent=""
-	fi
-
-	if [ -z "$rename" ]; then
-	    if [ -n "$rflag" ]; then
-		parentrev=$PARENT_REV
-	    elif [ "$HG_LIST_FROM_COMMIT" -eq 1 ]; then
-                parentrev=$OUTREV
-	    else
-                if [[ -n $HG_BRANCH ]]; then
-                    parentrev=$HG_BRANCH
-                else
-		    parentrev="tip"
-                fi
-	    fi
-
-	    if [ -n "$parentrev" ]; then
-		if [ -z "$parent" ]; then
-		    hg cat --rev $parentrev --output $olddir/$DIR/$F $F 2>/dev/null
-		else
-		    # when specifying a workspace we have to provide
-		    # the full path
-		    $parent cat --rev $parentrev --output $olddir/$DIR/$F $DIR/$F 2>/dev/null
-		fi
-	    fi
-	else
-	    # It's a rename (or a move), or a copy, so let's make sure we move
-	    # to the right directory first, then restore it once done
-	    current_dir=`pwd`
-	    hg_root=`hg root`
-	    cd $CWS
-	    if [ -n "$rflag" ]; then
-		parentrev=$PARENT_REV
-	    elif [ "$HG_LIST_FROM_COMMIT" -eq 1 ]; then
-                parentrev=$OUTREV
-	    fi
-	    if [ -z "$parentrev" ]; then
-		parentrev=`hg log -l1 $PDIR/$PF | $AWK -F: '/changeset/ {print $2}'`
-	    fi
-	    if [ -n "$parentrev" ]; then
-		mkdir -p $olddir/$PDIR
-		if [ -z "$parent" ]; then
-		    hg cat -R $hg_root --rev $parentrev --output $olddir/$PDIR/$PF $PDIR/$PF 2>/dev/null
-		else
-		    $parent cat --rev $parentrev --output $olddir/$PDIR/$PF $PDIR/$PF 2>/dev/null
-		fi
-	    fi
-	    cd $current_dir
-	fi
-}
-
-function build_old_new
-{
-	if [[ $SCM_MODE == "mercurial" ]]; then
-		build_old_new_mercurial $@
-	fi
-}
-
-
-#
-# Usage message.
-#
-function usage
-{
-	print "Usage:\twebrev [options]
-	webrev [options] ( <file> | - )
-
-Options:
-	-v: Print the version of this tool.
-        -b: Do not ignore changes in the amount of white space.
-        -c <CR#>: Include link to CR (aka bugid) in the main page.
-	-i <filename>: Include <filename> in the index.html file.
-	-o <outdir>: Output webrev to specified directory.
-	-p <compare-against>: Use specified parent wkspc or basis for comparison
-        -u <username>: Use that username instead of 'guessing' one.
-	-m: Forces the use of Mercurial
-
-Mercurial only options:
-	-r rev: Compare against a specified revision
-	-N: Skip 'hg outgoing', use only 'hg status'
-	-f: Use the forest extension
-
-Arguments:
-	<file>: Optional file containing list of files to include in webrev
-        -: read list of files to include in webrev from standard input
-
-Environment:
-	WDIR: Control the output directory.
-	WEBREV_BUGURL: Control the URL prefix for bugids.
-
-"
-
-	exit 2
-}
-
-#
-#
-# Main program starts here
-#
-#
-LANG="C"
-LC_ALL="C"
-export LANG LC_ALL
-trap "rm -f /tmp/$$.* ; exit" 0 1 2 3 15
-
-set +o noclobber
-
-[[ -z $WDIFF ]] && WDIFF=`look_for_prog wdiff`
-[[ -z $CODEREVIEW ]] && CODEREVIEW=`look_for_prog codereview`
-[[ -z $PS2PDF ]] && PS2PDF=`look_for_prog ps2pdf`
-[[ -z $PERL ]] && PERL=`look_for_prog perl`
-[[ -z $SCCS ]] && SCCS=`look_for_prog sccs`
-[[ -z $AWK ]] && AWK=`look_for_prog nawk`
-[[ -z $AWK ]] && AWK=`look_for_prog gawk`
-[[ -z $AWK ]] && AWK=`look_for_prog awk`
-[[ -z $JAR ]] && JAR=`look_for_prog jar`
-[[ -z $ZIP ]] && ZIP=`look_for_prog zip`
-[[ -z $GETENT ]] && GETENT=`look_for_prog getent`
-[[ -z $WGET ]] && WGET=`look_for_prog wget`
-
-if uname | grep CYGWIN >/dev/null
-then
-        ISWIN=1
-        # Under windows mercurial outputs '\' instead of '/'
-        FILTER="tr '\\\\' '/'"
-else
-        FILTER="cat"
-fi
-
-if [[ ! -x $PERL ]]; then
-	print -u2 "Error: No perl interpreter found.  Exiting."
-	exit 1
-fi
-
-#
-# These aren't fatal, but we want to note them to the user.
-#
-# [[ ! -x $CODEREVIEW ]] && print -u2 "WARNING: codereview(1) not found."
-# [[ ! -x $PS2PDF ]] && print -u2 "WARNING: ps2pdf(1) not found."
-# [[ ! -x $WDIFF ]] && print -u2 "WARNING: wdiff not found."
-
-# Declare global total counters.
-integer TOTL TINS TDEL TMOD TUNC
-
-flist_mode=
-flist_file=
-bflag=
-iflag=
-oflag=
-pflag=
-uflag=
-Oflag=
-rflag=
-Nflag=
-forestflag=
-while getopts "c:i:o:p:r:u:mONvfb" opt
-do
-	case $opt in
-        b)      bflag=1;;
-
-	i)	iflag=1
-		INCLUDE_FILE=$OPTARG;;
-
-	o)	oflag=1
-		WDIR=$OPTARG;;
-
-	p)	pflag=1
-		codemgr_parent=$OPTARG;;
-
-	u)      uflag=1
-		username=$OPTARG;;
-
-        c)      if [[ -z $CRID ]]; then
-                   CRID=$OPTARG
-                else
-                   CRID="$CRID $OPTARG"
-                fi;;
-
-	m)	SCM_MODE="mercurial";;
-
-	O)	Oflag=1;; # ignored (bugs are now all visible at bugs.openjdk.java.net)
-
-	N)	Nflag=1;;
-
-	f)	forestflag=1;;
-
-	r)	rflag=1
-		PARENT_REV=$OPTARG;;
-
-	v)	print "$0 version: $WEBREV_UPDATED";;
-
-
-	?)	usage;;
-	esac
-done
-
-FLIST=/tmp/$$.flist
-HG_LIST_FROM_COMMIT=
-
-if [[ -n $forestflag && -n $rflag ]]; then
-    print "The -r <rev> flag is incompatible with the use of forests"
-    exit 2
-fi
-
-#
-# If this manually set as the parent, and it appears to be an earlier webrev,
-# then note that fact and set the parent to the raw_files/new subdirectory.
-#
-if [[ -n $pflag && -d $codemgr_parent/raw_files/new ]]; then
-	parent_webrev="$codemgr_parent"
-	codemgr_parent="$codemgr_parent/raw_files/new"
-fi
-
-shift $(($OPTIND - 1))
-
-if [[ $1 == "-" ]]; then
-	cat > $FLIST
-	flist_mode="stdin"
-	flist_done=1
-	shift
-elif [[ -n $1 ]]; then
-	if [[ ! -r $1 ]]; then
-		print -u2 "$1: no such file or not readable"
-		usage
-	fi
-	cat $1 > $FLIST
-	flist_mode="file"
-	flist_file=$1
-	flist_done=1
-	shift
-else
-	flist_mode="auto"
-fi
-
-#
-# Before we go on to further consider -l and -w, work out which SCM we think
-# is in use.
-#
-if [[ -z $SCM_MODE ]]; then
-    SCM_MODE=`detect_scm $FLIST`
-fi
-if [[ $SCM_MODE == "unknown" ]]; then
-       print -u2 "Unable to determine SCM type currently in use."
-       print -u2 "For mercurial: webrev runs 'hg root'."
-       exit 1
-fi
-
-print -u2 "   SCM detected: $SCM_MODE"
-
-
-if [[ $SCM_MODE == "mercurial" ]]; then
-    #
-    # determine Workspace and parent workspace paths
-    #
-    CWS=`hg root | $FILTER`
-    if [[ -n $pflag && -z "$PWS" ]]; then
-	OUTPWS=$codemgr_parent
-        # Let's try to expand it if it's an alias defined in [paths]
-        tmp=`hg path $OUTPWS 2>/dev/null | $FILTER`
-        if [[ -n $tmp ]]; then
-            OUTPWS="$tmp"
-        fi
-        if [[ -n $rflag ]]; then
-	    if expr "$codemgr_parent" : 'ssh://.*' >/dev/null; then
-	        PWS=$codemgr_parent
-	    else
-	        PWS=`hg -R "$codemgr_parent" root 2>/dev/null | $FILTER`
-	    fi
-        fi
-    fi
-    #
-    # OUTPWS is the parent repository to use when using 'hg outgoing'
-    #
-    if [[ -z $Nflag ]]; then
-        if [[ -n $forestflag ]]; then
-            #
-            # for forest we have to rely on properly set default and
-            # default-push because they can be different from the top one.
-            # unless of course it was explicitly specified with -p
-            if [[ -z $pflag ]]; then
-                OUTPWS=
-            fi
-        else
-            #
-            # Unfortunately mercurial is bugged and doesn't handle
-            # aliases correctly in 'hg path default'
-            # So let's do it ourselves. Sigh...
-            if [[ -z "$OUTPWS" ]]; then
-                OUTPWS=`grep default-push $CWS/.hg/hgrc | $AWK '{print $3}' | $FILTER`
-            fi
-            # Still empty, means no default-push
-            if [[ -z "$OUTPWS" ]]; then
-                OUTPWS=`grep 'default =' $CWS/.hg/hgrc | $AWK '{print $3}' | $FILTER`
-            fi
-            # Let's try to expand it if it's an alias defined in [paths]
-            tmp=`hg path $OUTPWS 2>/dev/null | $FILTER`
-            if [[ -n $tmp ]]; then
-                OUTPWS="$tmp"
-            fi
-        fi
-    fi
-    #
-    # OUTPWS may contain username:password, let's make sure we remove the
-    # sensitive information before we print out anything in the HTML
-    #
-    OUTPWS2=$OUTPWS
-    if [[ -n $OUTPWS ]]; then
-	if [[ `expr "$OUTPWS" : '.*://[^/]*@.*'` -gt 0 ]]; then
-	    # Remove everything between '://' and '@'
-	    OUTPWS2=`echo $OUTPWS | sed -e 's/\(.*:\/\/\).*@\(.*\)/\1\2/'`
-	fi
-    fi
-
-    if [[ -z $HG_BRANCH ]]; then
-        HG_BRANCH=`hg branch`
-        if [ "$HG_BRANCH" == "default" ]; then
-            #
-            # 'default' means no particular branch, so let's cancel that
-            #
-            HG_BRANCH=
-        fi
-    fi
-
-    if [[ -z $forestflag ]]; then
-        if [[ -z $Nflag ]]; then
-            #
-            # If no "-N", always do "hg outgoing" against parent
-            # repository to determine list of outgoing revisions.
-            #
-            ALL_CREV=`hg outgoing -q --template '{rev}\n' $OUTPWS | sort -n`
-            if [[ -n $ALL_CREV ]]; then
-                FIRST_CREV=`echo "$ALL_CREV" | head -1`
-                #
-                # If no "-r", choose revision to compare against by
-                # finding the latest revision not in the outgoing list.
-                #
-                if [[ -z $rflag ]]; then
-                    OUTREV=`find_outrev "$FIRST_CREV"`
-                    if [[ -n $OUTREV ]]; then
-                        HG_LIST_FROM_COMMIT=1
-                    fi
-                fi
-            fi
-        elif [[ -n $rflag ]]; then
-            #
-            # If skipping "hg outgoing" but still comparing against a
-            # specific revision (not the tip), set revision for comment
-            # accumulation.
-            #
-            FIRST_CREV=`hg log --rev $PARENT_REV --template '{rev}'`
-            FIRST_CREV=`expr $FIRST_CREV + 1`
-        fi
-    fi
-    #Let's check if a merge is needed, if so, issue a warning
-    PREV=`hg parent | grep '^tag:.*tip$'`
-    if [[ -z $PREV ]]; then
-        print "WARNING: parent rev is not tip. Maybe an update or merge is needed"
-    fi
-fi
-
-if [[ $flist_mode == "stdin" ]]; then
-	print -u2 " File list from: standard input"
-elif [[ $flist_mode == "file" ]]; then
-	print -u2 " File list from: $flist_file"
-fi
-
-if [[ $# -gt 0 ]]; then
-	print -u2 "WARNING: unused arguments: $*"
-fi
-
-if [[ $SCM_MODE == "mercurial" ]]; then
-    if [[ -z $flist_done ]]; then
-	flist_from_mercurial $PWS
-    fi
-fi
-
-#
-# If the user didn't specify a -i option, check to see if there is a
-# webrev-info file in the workspace directory.
-#
-if [[ -z $iflag && -r "$CWS/webrev-info" ]]; then
-	iflag=1
-	INCLUDE_FILE="$CWS/webrev-info"
-fi
-
-if [[ -n $iflag ]]; then
-	if [[ ! -r $INCLUDE_FILE ]]; then
-		print -u2 "include file '$INCLUDE_FILE' does not exist or is" \
-		    "not readable."
-		exit 1
-	else
-		#
-		# $INCLUDE_FILE may be a relative path, and the script alters
-		# PWD, so we just stash a copy in /tmp.
-		#
-		cp $INCLUDE_FILE /tmp/$$.include
-	fi
-fi
-
-#
-# Output directory.
-#
-if [[ -z $WDIR ]]; then
-    WDIR=$CWS/webrev
-else
-    # If the output directory doesn't end with '/webrev' or '/webrev/'
-    # then add '/webrev'. This is for backward compatibility
-    if ! expr $WDIR : '.*/webrev/\?$' >/dev/null
-    then
-	WDIR=$WDIR/webrev
-    fi
-fi
-# WDIR=${WDIR:-$CWS/webrev}
-
-#
-# Name of the webrev, derived from the workspace name; in the
-# future this could potentially be an option.
-#
-# Let's keep what's after the last '/'
-WNAME=${CWS##*/}
-
-#
-# If WDIR doesn't start with '/' or 'x:' prepend the current dir
-#
-if [ ${WDIR%%/*} ]; then
-    if [[ -n $ISWIN ]]; then
-        if [ ${WDIR%%[A-Za-z]:*} ]; then
-	    WDIR=$PWD/$WDIR
-        fi
-    else
-	WDIR=$PWD/$WDIR
-    fi
-fi
-
-if [[ ! -d $WDIR ]]; then
-	mkdir -p $WDIR
-	[[ $? != 0 ]] && exit 1
-fi
-
-#
-# Summarize what we're going to do.
-#
-print "      Workspace: $CWS"
-if [[ -n $parent_webrev ]]; then
-    print "Compare against: webrev at $parent_webrev"
-elif [[ -n $OUTPWS2 ]]; then
-    print "Compare against: $OUTPWS2"
-fi
-if [[ -n $HG_BRANCH ]]; then
-    print "         Branch: $HG_BRANCH"
-fi
-if [[ -n $rflag ]]; then
-        print "Compare against version: $PARENT_REV"
-fi
-[[ -n $INCLUDE_FILE ]] && print "      Including: $INCLUDE_FILE"
-print "      Output to: $WDIR"
-
-#
-# Save the file list in the webrev dir
-#
-[[ ! $FLIST -ef $WDIR/file.list ]] && cp $FLIST $WDIR/file.list
-
-#
-#    Bug IDs will be replaced by a URL.  Order of precedence
-#    is: default location, $WEBREV_BUGURL
-#
-BUGURL='https://bugs.openjdk.java.net/browse/'
-[[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL"
-IDPREFIX='JDK-'
-
-
-rm -f $WDIR/$WNAME.patch
-rm -f $WDIR/$WNAME.changeset
-rm -f $WDIR/$WNAME.ps
-rm -f $WDIR/$WNAME.pdf
-
-touch $WDIR/$WNAME.patch
-
-print "   Output Files:"
-
-#
-# Clean up the file list: Remove comments, blank lines and env variables.
-#
-sed -e "s/#.*$//" -e "/=/d" -e "/^[   ]*$/d" $FLIST > /tmp/$$.flist.clean
-FLIST=/tmp/$$.flist.clean
-
-#
-# Clean up residual raw files
-#
-if [ -d $WDIR/raw_files ]; then
-    rm -rf $WDIR/raw_files 2>/dev/null
-fi
-
-#
-# Should we ignore changes in white spaces when generating diffs?
-#
-if [[ -n $bflag ]]; then
-    DIFFOPTS="-t"
-else
-    DIFFOPTS="-bt"
-fi
-#
-# First pass through the files: generate the per-file webrev HTML-files.
-#
-while read LINE
-do
-	set - $LINE
-	P=$1
-
-        if [[ $1 == "Revision:" ]]; then
-            OUTREV=$2
-            continue
-        fi
-	#
-	# Normally, each line in the file list is just a pathname of a
-	# file that has been modified or created in the child.  A file
-	# that is renamed in the child workspace has two names on the
-	# line: new name followed by the old name.
-	#
-	oldname=""
-	oldpath=""
-	rename=
-	if [[ $# -eq 2 ]]; then
-		PP=$2			# old filename
-		oldname=" (was $PP)"
-		oldpath="$PP"
-		rename=1
-        	PDIR=${PP%/*}
-        	if [[ $PDIR == $PP ]]; then
-			PDIR="."   # File at root of workspace
-		fi
-
-		PF=${PP##*/}
-
-	        DIR=${P%/*}
-	        if [[ $DIR == $P ]]; then
-			DIR="."   # File at root of workspace
-		fi
-
-		F=${P##*/}
-        else
-	        DIR=${P%/*}
-	        if [[ "$DIR" == "$P" ]]; then
-			DIR="."   # File at root of workspace
-		fi
-
-		F=${P##*/}
-
-		PP=$P
-		PDIR=$DIR
-		PF=$F
-	fi
-
-        # Make the webrev directory if necessary as it may have been
-        # removed because it was empty
-        if [ ! -d $CWS/$DIR ]; then
-	    mkdir -p $CWS/$DIR
-        fi
-
-	COMM=`getcomments html $P $PP`
-
-	print "\t$P$oldname\n\t\t\c"
-
-	# Make the webrev mirror directory if necessary
-	mkdir -p $WDIR/$DIR
-
-	# cd to the directory so the names are short
-	cd $CWS/$DIR
-
-	#
-	# We stash old and new files into parallel directories in /tmp
-	# and do our diffs there.  This makes it possible to generate
-	# clean looking diffs which don't have absolute paths present.
-	#
-	olddir=$WDIR/raw_files/old
-	newdir=$WDIR/raw_files/new
-	mkdir -p $olddir
-	mkdir -p $newdir
-	mkdir -p $olddir/$PDIR
-	mkdir -p $newdir/$DIR
-
-	build_old_new $olddir $newdir $DIR $F
-
-	if [[ ! -f $F && ! -f $olddir/$DIR/$F ]]; then
-		print "*** Error: file not in parent or child"
-		continue
-	fi
-
-	cd $WDIR/raw_files
-	ofile=old/$PDIR/$PF
-	nfile=new/$DIR/$F
-
-	mv_but_nodiff=
-	cmp $ofile $nfile > /dev/null 2>&1
-	if [[ $? == 0 && $rename == 1 ]]; then
-		mv_but_nodiff=1
-	fi
-
-        #
-        # Cleaning up
-        #
-        rm -f $WDIR/$DIR/$F.cdiff.html
-        rm -f $WDIR/$DIR/$F.udiff.html
-        rm -f $WDIR/$DIR/$F.wdiff.html
-        rm -f $WDIR/$DIR/$F.sdiff.html
-        rm -f $WDIR/$DIR/$F-.html
-        rm -f $WDIR/$DIR/$F.html
-
-	its_a_jar=
-	if expr $F : '.*\.jar' \| $F : '.*\.zip' >/dev/null; then
-	    its_a_jar=1
-	    # It's a JAR or ZIP file, let's do it differently
-	    if [[ -z $JAR ]]; then
-		print "No access to jar, so can't produce diffs for jar or zip files"
-	    else
-		if [ -f $ofile ]; then
-		    $JAR -tvf $ofile >"$ofile".lst
-		fi
-		if [ -f $nfile ]; then
-		    $JAR -tvf $nfile >"$nfile".lst
-		fi
-
-		if [[ -f $ofile && -f $nfile && -z $mv_but_nodiff ]]; then
-
-		    ${CDIFFCMD:-diff -bt -C 5} $ofile.lst $nfile.lst > $WDIR/$DIR/$F.cdiff
-		    diff_to_html $F $DIR/$F "C" "$COMM" < $WDIR/$DIR/$F.cdiff \
-			> $WDIR/$DIR/$F.cdiff.html
-		    print " cdiffs\c"
-
-		    ${UDIFFCMD:-diff -bt -U 5} $ofile.lst $nfile.lst > $WDIR/$DIR/$F.udiff
-		    diff_to_html $F $DIR/$F "U" "$COMM" < $WDIR/$DIR/$F.udiff \
-			> $WDIR/$DIR/$F.udiff.html
-
-		    print " udiffs\c"
-
-		    if [[ -x $WDIFF ]]; then
-			$WDIFF -c "$COMM" \
-			    -t "$WNAME Wdiff $DIR/$F" $ofile.lst $nfile.lst > \
-			    $WDIR/$DIR/$F.wdiff.html 2>/dev/null
-			if [[ $? -eq 0 ]]; then
-			    print " wdiffs\c"
-			else
-			    print " wdiffs[fail]\c"
-			fi
-		    fi
-
-		    sdiff_to_html $ofile $nfile $F $DIR "$COMM" \
-			> $WDIR/$DIR/$F.sdiff.html
-		    print " sdiffs\c"
-
-		    print " frames\c"
-
-		    rm -f $WDIR/$DIR/$F.cdiff $WDIR/$DIR/$F.udiff
-
-		    difflines $ofile.lst $nfile.lst > $WDIR/$DIR/$F.count
-
-		elif [[ -f $ofile && -f $nfile && -n $mv_but_nodiff ]]; then
-		# renamed file: may also have differences
-		    difflines $ofile.lst $nfile.lst > $WDIR/$DIR/$F.count
-		elif [[ -f $nfile ]]; then
-		# new file: count added lines
-		    difflines /dev/null $nfile.lst > $WDIR/$DIR/$F.count
-		elif [[ -f $ofile ]]; then
-		# old file: count deleted lines
-		    difflines $ofile.lst /dev/null > $WDIR/$DIR/$F.count
-		fi
-	    fi
-	else
-
-	    #
-	    # If we have old and new versions of the file then run the
-	    # appropriate diffs.  This is complicated by a couple of factors:
-	    #
-	    #	- renames must be handled specially: we emit a 'remove'
-	    #	  diff and an 'add' diff
-	    #	- new files and deleted files must be handled specially
-	    #	- Solaris patch(1m) can't cope with file creation
-	    #	  (and hence renames) as of this writing.
-	    #   - To make matters worse, gnu patch doesn't interpret the
-	    #	  output of Solaris diff properly when it comes to
-	    #	  adds and deletes.  We need to do some "cleansing"
-	    #     transformations:
-	    # 	    [to add a file] @@ -1,0 +X,Y @@  -->  @@ -0,0 +X,Y @@
-	    #	    [to del a file] @@ -X,Y +1,0 @@  -->  @@ -X,Y +0,0 @@
-	    #
-	    cleanse_rmfile="sed 's/^\(@@ [0-9+,-]*\) [0-9+,-]* @@$/\1 +0,0 @@/'"
-	    cleanse_newfile="sed 's/^@@ [0-9+,-]* \([0-9+,-]* @@\)$/@@ -0,0 \1/'"
-
-            if [[ ! "$HG_LIST_FROM_COMMIT" -eq 1 || ! $flist_mode == "auto" ]];
-            then
-              # Only need to generate a patch file here if there are no commits in outgoing
-              # or if we've specified a file list
-              rm -f $WDIR/$DIR/$F.patch
-              if [[ -z $rename ]]; then
-                  if [ ! -f $ofile ]; then
-                      diff -u /dev/null $nfile | sh -c "$cleanse_newfile" \
-                          > $WDIR/$DIR/$F.patch
-                  elif [ ! -f $nfile ]; then
-                      diff -u $ofile /dev/null | sh -c "$cleanse_rmfile" \
-                          > $WDIR/$DIR/$F.patch
-                  else
-                      diff -u $ofile $nfile > $WDIR/$DIR/$F.patch
-                  fi
-              else
-                  diff -u $ofile /dev/null | sh -c "$cleanse_rmfile" \
-                      > $WDIR/$DIR/$F.patch
-
-                  diff -u /dev/null $nfile | sh -c "$cleanse_newfile" \
-                      >> $WDIR/$DIR/$F.patch
-
-              fi
-
-
-            #
-            # Tack the patch we just made onto the accumulated patch for the
-            # whole wad.
-            #
-              cat $WDIR/$DIR/$F.patch >> $WDIR/$WNAME.patch
-            fi
-
-            print " patch\c"
-
-	    if [[ -f $ofile && -f $nfile && -z $mv_but_nodiff ]]; then
-
-		${CDIFFCMD:-diff -bt -C 5} $ofile $nfile > $WDIR/$DIR/$F.cdiff
-		diff_to_html $F $DIR/$F "C" "$COMM" < $WDIR/$DIR/$F.cdiff \
-		    > $WDIR/$DIR/$F.cdiff.html
-		print " cdiffs\c"
-
-		${UDIFFCMD:-diff -bt -U 5} $ofile $nfile > $WDIR/$DIR/$F.udiff
-		diff_to_html $F $DIR/$F "U" "$COMM" < $WDIR/$DIR/$F.udiff \
-		    > $WDIR/$DIR/$F.udiff.html
-
-		print " udiffs\c"
-
-		if [[ -x $WDIFF ]]; then
-		    $WDIFF -c "$COMM" \
-			-t "$WNAME Wdiff $DIR/$F" $ofile $nfile > \
-			$WDIR/$DIR/$F.wdiff.html 2>/dev/null
-		    if [[ $? -eq 0 ]]; then
-			print " wdiffs\c"
-		    else
-			print " wdiffs[fail]\c"
-		    fi
-		fi
-
-		sdiff_to_html $ofile $nfile $F $DIR "$COMM" \
-		    > $WDIR/$DIR/$F.sdiff.html
-		print " sdiffs\c"
-
-		print " frames\c"
-
-		rm -f $WDIR/$DIR/$F.cdiff $WDIR/$DIR/$F.udiff
-
-		difflines $ofile $nfile > $WDIR/$DIR/$F.count
-
-	    elif [[ -f $ofile && -f $nfile && -n $mv_but_nodiff ]]; then
-		# renamed file: may also have differences
-		difflines $ofile $nfile > $WDIR/$DIR/$F.count
-	    elif [[ -f $nfile ]]; then
-		# new file: count added lines
-		difflines /dev/null $nfile > $WDIR/$DIR/$F.count
-	    elif [[ -f $ofile ]]; then
-		# old file: count deleted lines
-		difflines $ofile /dev/null > $WDIR/$DIR/$F.count
-	    fi
-	fi
-	#
-	# Now we generate the postscript for this file.  We generate diffs
-	# only in the event that there is delta, or the file is new (it seems
-	# tree-killing to print out the contents of deleted files).
-	#
-	if [[ -f $nfile ]]; then
-		ocr=$ofile
-		[[ ! -f $ofile ]] && ocr=/dev/null
-
-		if [[ -z $mv_but_nodiff ]]; then
-			textcomm=`getcomments text $P $PP`
-			if [[ -x $CODEREVIEW ]]; then
-				$CODEREVIEW -y "$textcomm" \
-				    -e $ocr $nfile \
-				    > /tmp/$$.psfile 2>/dev/null &&
-				    cat /tmp/$$.psfile >> $WDIR/$WNAME.ps
-				if [[ $? -eq 0 ]]; then
-					print " ps\c"
-				else
-					print " ps[fail]\c"
-				fi
-			fi
-		fi
-	fi
-
-	if [[ -f $ofile && -z $mv_but_nodiff ]]; then
-	    if [[ -n $its_a_jar ]]; then
-		source_to_html Old $P < $ofile.lst > $WDIR/$DIR/$F-.html
-	    else
-		source_to_html Old $P < $ofile > $WDIR/$DIR/$F-.html
-	    fi
-		print " old\c"
-	fi
-
-	if [[ -f $nfile ]]; then
-	    if [[ -n $its_a_jar ]]; then
-		source_to_html New $P < $nfile.lst > $WDIR/$DIR/$F.html
-	    else
-		source_to_html New $P < $nfile > $WDIR/$DIR/$F.html
-	    fi
-		print " new\c"
-	fi
-
-	print
-done < $FLIST
-
-# Create the new style mercurial patch here using hg export -r [all-revs] -g -o $CHANGESETPATH
-if [[ $SCM_MODE == "mercurial" ]]; then
-  if [[ "$HG_LIST_FROM_COMMIT" -eq 1 && $flist_mode == "auto" ]]; then
-    EXPORTCHANGESET="$WNAME.changeset"
-    CHANGESETPATH=${WDIR}/${EXPORTCHANGESET}
-    rm -f $CHANGESETPATH
-    touch $CHANGESETPATH
-    if [[ -n $ALL_CREV ]]; then
-      rev_opt=
-      for rev in $ALL_CREV; do
-        rev_opt="$rev_opt --rev $rev"
-      done
-    elif [[ -n $FIRST_CREV ]]; then
-      rev_opt="--rev $FIRST_CREV"
-    fi
-
-    if [[ -n $rev_opt ]]; then
-      (cd $CWS;hg export -g $rev_opt -o $CHANGESETPATH)
-      echo "Created changeset: $CHANGESETPATH" 1>&2
-      # Use it in place of the jdk.patch created above
-      rm -f $WDIR/$WNAME.patch
-    fi
-  set +x
-  fi
-fi
-
-frame_nav_js > $WDIR/ancnav.js
-frame_navigation > $WDIR/ancnav.html
-
-if [[ -f $WDIR/$WNAME.ps && -x $CODEREVIEW && -x $PS2PDF ]]; then
-	print " Generating PDF: \c"
-	fix_postscript $WDIR/$WNAME.ps | $PS2PDF - > $WDIR/$WNAME.pdf
-	print "Done."
-fi
-
-# Now build the index.html file that contains
-# links to the source files and their diffs.
-
-cd $CWS
-
-# Save total changed lines for Code Inspection.
-print "$TOTL" > $WDIR/TotalChangedLines
-
-print "     index.html: \c"
-INDEXFILE=$WDIR/index.html
-exec 3<&1			# duplicate stdout to FD3.
-exec 1<&-			# Close stdout.
-exec > $INDEXFILE		# Open stdout to index file.
-
-print "$HTML<head>"
-print "<meta name=\"scm\" content=\"$SCM_MODE\" />"
-print "$STDHEAD"
-print "<title>$WNAME</title>"
-print "</head>"
-print "<body id=\"SUNWwebrev\">"
-print "<div class=\"summary\">"
-print "<h2>Code Review for $WNAME</h2>"
-
-print "<table>"
-
-if [[ -z $uflag ]]; then
-    if [[ $SCM_MODE == "mercurial" ]]; then
-        #
-        # Let's try to extract the user name from the .hgrc file
-        #
-	username=`grep '^username' $HOME/.hgrc | sed 's/^username[ ]*=[ ]*\(.*\)/\1/'`
-    fi
-
-    if [[ -z $username ]]; then
-        #
-        # Figure out the username and gcos name.  To maintain compatibility
-        # with passwd(4), we must support '&' substitutions.
-        #
-	username=`id | cut -d '(' -f 2 | cut -d ')' -f 1`
-	if [[ -x $GETENT ]]; then
-	    realname=`$GETENT passwd $username | cut -d':' -f 5 | cut -d ',' -f 1`
-	fi
-	userupper=`print "$username" | sed 's/\<./\u&/g'`
-	realname=`print $realname | sed s/\&/$userupper/`
-    fi
-fi
-
-date="on `date`"
-
-if [[ -n "$username" && -n "$realname" ]]; then
-	print "<tr><th>Prepared by:</th>"
-	print "<td>$realname ($username) $date</td></tr>"
-elif [[ -n "$username" ]]; then
-	print "<tr><th>Prepared by:</th><td>$username $date</td></tr>"
-fi
-
-print "<tr><th>Workspace:</th><td>$CWS</td></tr>"
-if [[ -n $parent_webrev ]]; then
-        print "<tr><th>Compare against:</th><td>"
-	print "webrev at $parent_webrev"
-else
-    if [[ -n $OUTPWS2 ]]; then
-        print "<tr><th>Compare against:</th><td>"
-	print "$OUTPWS2"
-    fi
-fi
-print "</td></tr>"
-if [[ -n $rflag ]]; then
-    print "<tr><th>Compare against version:</th><td>$PARENT_REV</td></tr>"
-elif [[ -n $OUTREV ]]; then
-    if [[ -z $forestflag ]]; then
-        print "<tr><th>Compare against version:</th><td>$OUTREV</td></tr>"
-    fi
-fi
-if [[ -n $HG_BRANCH ]]; then
-    print "<tr><th>Branch:</th><td>$HG_BRANCH</td></tr>"
-fi
-
-print "<tr><th>Summary of changes:</th><td>"
-printCI $TOTL $TINS $TDEL $TMOD $TUNC
-print "</td></tr>"
-
-if [[ -f $WDIR/$WNAME.patch ]]; then
-  print "<tr><th>Patch of changes:</th><td>"
-  print "<a href=\"$WNAME.patch\">$WNAME.patch</a></td></tr>"
-elif [[ -f $CHANGESETPATH ]]; then
-  print "<tr><th>Changeset:</th><td>"
-  print "<a href=\"$EXPORTCHANGESET\">$EXPORTCHANGESET</a></td></tr>"
-fi
-
-if [[ -f $WDIR/$WNAME.pdf ]]; then
-	print "<tr><th>Printable review:</th><td>"
-	print "<a href=\"$WNAME.pdf\">$WNAME.pdf</a></td></tr>"
-fi
-
-if [[ -n "$iflag" ]]; then
-	print "<tr><th>Author comments:</th><td><div>"
-	cat /tmp/$$.include
-	print "</div></td></tr>"
-fi
-# Add links to referenced CRs, if any
-# URL has a <title> like:
-# <title>[#JDK-8024688] b106-lambda: j.u.Map.merge doesn&#39;t work as specified if contains key:null pair - Java Bug System</title>
-# we format this to:
-# JDK-8024688: b106-lambda: j.u.Map.merge doesn't work as specified if contains key:null pair
-if [[ -n $CRID ]]; then
-    for id in $CRID
-    do
-        #add "JDK-" to raw bug id for openjdk.java.net links.
-        id=`echo ${id} | sed 's/^\([0-9]\{5,\}\)$/JDK-\1/'`
-
-        print "<tr><th>Bug id:</th><td>"
-        url="${BUGURL}${id}"
-
-        if [[ -n $WGET ]]; then
-            msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\[#\(.*\)\] \(.*\) - Java Bug System<\/title>/\1 : \2/' | html_dequote | html_quote`
-        fi
-        if [[ -z $msg ]]; then
-            msg="${id}"
-        fi
-
-        print "<a href=\"$url\">$msg</a>"
-
-        print "</td></tr>"
-    done
-fi
-print "<tr><th>Legend:</th><td>"
-print "<b>Modified file</b><br><font color=red><b>Deleted file</b></font><br><font color=green><b>New file</b></font></td></tr>"
-print "</table>"
-print "</div>"
-
-#
-# Second pass through the files: generate the rest of the index file
-#
-while read LINE
-do
-	set - $LINE
-        if [[ $1 == "Revision:" ]]; then
-            FIRST_CREV=`expr $3 + 1`
-            continue
-        fi
-	P=$1
-
-	if [[ $# == 2 ]]; then
-		PP=$2
-		oldname=" <i>(was $PP)</i>"
-
-	else
-		PP=$P
-		oldname=""
-	fi
-
-	DIR=${P%/*}
-	if [[ $DIR == $P ]]; then
-		DIR="."   # File at root of workspace
-	fi
-
-	# Avoid processing the same file twice.
-	# It's possible for renamed files to
-	# appear twice in the file list
-
-	F=$WDIR/$P
-
-	print "<p><code>"
-
-	# If there's a diffs file, make diffs links
-
-        NODIFFS=
-	if [[ -f $F.cdiff.html ]]; then
-		print "<a href=\"$P.cdiff.html\">Cdiffs</a>"
-		print "<a href=\"$P.udiff.html\">Udiffs</a>"
-
-		if [[ -f $F.wdiff.html && -x $WDIFF ]]; then
-			print "<a href=\"$P.wdiff.html\">Wdiffs</a>"
-		fi
-
-		print "<a href=\"$P.sdiff.html\">Sdiffs</a>"
-
-		print "<a href=\"$P.frames.html\">Frames</a>"
-	else
-                NODIFFS=1
-		print " ------ ------ ------"
-
-		if [[ -x $WDIFF ]]; then
-			print " ------"
-		fi
-
-		print " ------"
-	fi
-
-	# If there's an old file, make the link
-
-        NOOLD=
-	if [[ -f $F-.html ]]; then
-		print "<a href=\"$P-.html\">Old</a>"
-	else
-                NOOLD=1
-		print " ---"
-	fi
-
-	# If there's an new file, make the link
-
-        NONEW=
-	if [[ -f $F.html ]]; then
-		print "<a href=\"$P.html\">New</a>"
-	else
-                NONEW=1
-		print " ---"
-	fi
-
-	if [[ -f $F.patch ]]; then
-		print "<a href=\"$P.patch\">Patch</a>"
-	else
-		print " -----"
-	fi
-
-	if [[ -f $WDIR/raw_files/new/$P ]]; then
-		print "<a href=\"raw_files/new/$P\">Raw</a>"
-	else
-		print " ---"
-	fi
-        print "</code>"
-        if [[ -n $NODIFFS && -z $oldname ]]; then
-            if [[ -n $NOOLD ]]; then
-                print "<font color=green><b>$P</b></font>"
-            elif [[ -n $NONEW ]]; then
-                print "<font color=red><b>$P</b></font>"
-            fi
-        else
-	    print "<b>$P</b> $oldname"
-        fi
-
-	print "</p><blockquote>\c"
-	# Insert delta comments if any
-	comments=`getcomments html $P $PP`
-	if [ -n "$comments" ]; then
-	    print "<pre>$comments</pre>"
-	fi
-
-	# Add additional comments comment
-
-	print "<!-- Add comments to explain changes in $P here -->"
-
-	# Add count of changes.
-
-	if [[ -f $F.count ]]; then
-	    cat $F.count
-	    rm $F.count
-	fi
-        print "</blockquote>"
-done < $FLIST
-
-print
-print
-print "<hr />"
-print "<p style=\"font-size: small\">"
-print "This code review page was prepared using <b>$0</b>"
-print "(vers $WEBREV_UPDATED)."
-print "</body>"
-print "</html>"
-
-if [[ -n $ZIP ]]; then
-    # Let's generate a zip file for convenience
-    cd $WDIR/..
-    if [ -f webrev.zip ]; then
-	rm webrev.zip
-    fi
-    $ZIP -r webrev webrev >/dev/null 2>&1
-fi
-
-exec 1<&-			# Close FD 1.
-exec 1<&3			# dup FD 3 to restore stdout.
-exec 3<&-			# close FD 3.
-
-print "Done."
-print "Output to: $WDIR"
diff --git a/make/templates/bsd-header b/make/templates/bsd-header
deleted file mode 100644
index cce4fa7..0000000
--- a/make/templates/bsd-header
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) %YEARS% 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.
-
diff --git a/make/templates/gpl-cp-header b/make/templates/gpl-cp-header
deleted file mode 100644
index 8c03edf..0000000
--- a/make/templates/gpl-cp-header
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) %YEARS% 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.
-
diff --git a/make/templates/gpl-header b/make/templates/gpl-header
deleted file mode 100644
index dffde47..0000000
--- a/make/templates/gpl-header
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (c) %YEARS% 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.
-
diff --git a/test/Makefile b/test/Makefile
deleted file mode 100644
index 89141cc..0000000
--- a/test/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# Copyright (c) 2010, 2011, 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.
-#
-
-#
-# Makefile to run tests from multiple sibling directories
-#
-
-# Root of the forest that was built
-TOPDIR=..
-
-# This makefile depends on the availability of sibling directories.
-LANGTOOLS_DIR=$(TOPDIR)/langtools
-JDK_DIR=$(TOPDIR)/jdk
-HOTSPOT_DIR=$(TOPDIR)/hotspot
-
-# Macro to run a test target in a subdir
-define SUBDIR_TEST # subdirectory target
-if [ -d $1 ] ; then \
-  if [ -r $1/test/Makefile ] ; then \
-    echo "$(MAKE) -k -C $1/test $2" ; \
-    $(MAKE) -k -C $1/test $2 ; \
-  else \
-    echo "ERROR: File does not exist: $1/test/Makefile"; \
-    exit 1; \
-  fi; \
-else \
-  echo "WARNING: No testing done, directory does not exist: $1"; \
-fi
-endef
-
-# Default test target (core)
-default: jdk_core langtools_jtreg
-
-# All testing
-all: jdk_all langtools_all
-
-# Test targets
-langtools_% :
-	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
-
-jdk_% core_%s svc_%:
-	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)
-
-hotspot_%:
-	@$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), TEST="$@" $@)
-
-#
-# jtreg_tests
-#
-# Invocation:
-#
-# make jtreg_tests TESTDIRS=<test-dirs>
-#
-# where <test-dirs> is something like '../<component>/test/runtime',
-# <component> in turn being one of the top level directories (for
-# example 'hotspot').
-#
-# The below will strip the path prefix and delegate to the
-# corresponding ../<component>/test/Makefile.
-
-ifneq ($(TESTDIRS),)
-# Extract the component from ../<component>/...
-COMPONENT=$(word 2,$(subst /, ,$(TESTDIRS)))
-
-# Strip off the ../<component>/test prefix and pass the rest as TESTDIRS
-# to the delegate Makefile
-TESTDIRS_TESTS=$(patsubst ../$(COMPONENT)/test/%,%,$(TESTDIRS))
-endif
-
-jtreg_tests:
-	@$(NO_STOPPING)$(call SUBDIR_TEST, $(TOPDIR)/$(COMPONENT), TESTDIRS=$(TESTDIRS_TESTS) $@)
-
-################################################################
-
-# Phony targets (e.g. these are not filenames)
-.PHONY: all clean
-
-################################################################
diff --git a/test/projects/mac/javaws/javaws.xcodeproj/project.pbxproj b/test/projects/mac/javaws/javaws.xcodeproj/project.pbxproj
deleted file mode 100644
index af0f920..0000000
--- a/test/projects/mac/javaws/javaws.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,476 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		DE113B7C1A365449007808D0 /* javaws.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = DE113B7B1A365449007808D0 /* javaws.1 */; };
-		DE6DD4481A3654F200B8A465 /* applicationIcon.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD43C1A3654F100B8A465 /* applicationIcon.c */; };
-		DE6DD4491A3654F200B8A465 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD43E1A3654F100B8A465 /* base64.c */; };
-		DE6DD44A1A3654F200B8A465 /* configurationFile.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4401A3654F100B8A465 /* configurationFile.c */; };
-		DE6DD44B1A3654F200B8A465 /* jfx_runtime.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4421A3654F100B8A465 /* jfx_runtime.c */; };
-		DE6DD44C1A3654F200B8A465 /* launcher.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4441A3654F200B8A465 /* launcher.c */; };
-		DE6DD44D1A3654F200B8A465 /* launchFile.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4461A3654F200B8A465 /* launchFile.c */; };
-		DE6DD4581A3654FA00B8A465 /* msgString.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD44E1A3654FA00B8A465 /* msgString.c */; };
-		DE6DD4591A3654FA00B8A465 /* propertyParser.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4501A3654FA00B8A465 /* propertyParser.c */; };
-		DE6DD45A1A3654FA00B8A465 /* splashFile.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4521A3654FA00B8A465 /* splashFile.c */; };
-		DE6DD45B1A3654FA00B8A465 /* system.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4541A3654FA00B8A465 /* system.c */; };
-		DE6DD45C1A3654FA00B8A465 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4561A3654FA00B8A465 /* util.c */; };
-		DE6DD4611A36550100B8A465 /* versionId.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD45D1A36550100B8A465 /* versionId.c */; };
-		DE6DD4621A36550100B8A465 /* xmlparser.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD45F1A36550100B8A465 /* xmlparser.c */; };
-		DE6DD4681A36555100B8A465 /* launcher_md.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4631A36555100B8A465 /* launcher_md.c */; };
-		DE6DD4691A36555100B8A465 /* splash_md.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4641A36555100B8A465 /* splash_md.c */; };
-		DE6DD46B1A36555100B8A465 /* system_md.c in Sources */ = {isa = PBXBuildFile; fileRef = DE6DD4661A36555100B8A465 /* system_md.c */; };
-		DE8B3C7A1A37A51900316F1D /* config.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C621A37A51900316F1D /* config.c */; };
-		DE8B3C7B1A37A51900316F1D /* configcache_pd.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C641A37A51900316F1D /* configcache_pd.c */; };
-		DE8B3C7C1A37A51900316F1D /* console.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C661A37A51900316F1D /* console.c */; };
-		DE8B3C7D1A37A51900316F1D /* dialogutils.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C681A37A51900316F1D /* dialogutils.c */; };
-		DE8B3C7E1A37A51900316F1D /* expirationdialog.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C6A1A37A51900316F1D /* expirationdialog.c */; };
-		DE8B3C811A37A51900316F1D /* MSystemProxyHandler.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C711A37A51900316F1D /* MSystemProxyHandler.c */; };
-		DE8B3C821A37A51900316F1D /* NetworkUtil.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C721A37A51900316F1D /* NetworkUtil.c */; };
-		DE8B3C831A37A51900316F1D /* Platform.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C741A37A51900316F1D /* Platform.c */; };
-		DE8B3C841A37A51900316F1D /* UnixDomainSocket.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C761A37A51900316F1D /* UnixDomainSocket.c */; };
-		DE8B3C851A37A51900316F1D /* UnixTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C771A37A51900316F1D /* UnixTime.cpp */; };
-		DE8B3C861A37A51900316F1D /* webstartblockdialog.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C791A37A51900316F1D /* webstartblockdialog.c */; };
-		DE8B3C961A37A7BF00316F1D /* BasicPerfStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C881A37A7BF00316F1D /* BasicPerfStore.cpp */; };
-		DE8B3C971A37A7BF00316F1D /* DeployPerf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C8B1A37A7BF00316F1D /* DeployPerf.cpp */; };
-		DE8B3C981A37A7BF00316F1D /* PerfHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C901A37A7BF00316F1D /* PerfHelper.cpp */; };
-		DE8B3C991A37A7BF00316F1D /* PerfLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C921A37A7BF00316F1D /* PerfLabel.cpp */; };
-		DE8B3C9D1A37A7C600316F1D /* secureArgs.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C9A1A37A7C600316F1D /* secureArgs.c */; };
-		DE8B3CA01A37A81000316F1D /* jfx_runtime.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3C9E1A37A81000316F1D /* jfx_runtime.c */; };
-		DE8B3CA21A37BFA300316F1D /* jfx_runtime_md.c in Sources */ = {isa = PBXBuildFile; fileRef = DE8B3CA11A37BFA300316F1D /* jfx_runtime_md.c */; };
-		DE8B3CA41A37C10000316F1D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8B3CA31A37C10000316F1D /* SystemConfiguration.framework */; };
-		DE8B3CA61A37D04900316F1D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8B3CA51A37D04900316F1D /* Security.framework */; };
-		DE8B3CA81A37D05300316F1D /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8B3CA71A37D05300316F1D /* ServiceManagement.framework */; };
-		DE8B3CAA1A38C48B00316F1D /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8B3CA91A38C48B00316F1D /* libiconv.dylib */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		DE113B741A365449007808D0 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-				DE113B7C1A365449007808D0 /* javaws.1 in CopyFiles */,
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		DE113B761A365449007808D0 /* javaws */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = javaws; sourceTree = BUILT_PRODUCTS_DIR; };
-		DE113B7B1A365449007808D0 /* javaws.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = javaws.1; sourceTree = "<group>"; };
-		DE6DD43C1A3654F100B8A465 /* applicationIcon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = applicationIcon.c; path = ../../../../../src/javaws/share/native/applicationIcon.c; sourceTree = "<group>"; };
-		DE6DD43D1A3654F100B8A465 /* applicationIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = applicationIcon.h; path = ../../../../../src/javaws/share/native/applicationIcon.h; sourceTree = "<group>"; };
-		DE6DD43E1A3654F100B8A465 /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = base64.c; path = ../../../../../src/javaws/share/native/base64.c; sourceTree = "<group>"; };
-		DE6DD43F1A3654F100B8A465 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = ../../../../../src/javaws/share/native/base64.h; sourceTree = "<group>"; };
-		DE6DD4401A3654F100B8A465 /* configurationFile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = configurationFile.c; path = ../../../../../src/javaws/share/native/configurationFile.c; sourceTree = "<group>"; };
-		DE6DD4411A3654F100B8A465 /* configurationFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = configurationFile.h; path = ../../../../../src/javaws/share/native/configurationFile.h; sourceTree = "<group>"; };
-		DE6DD4421A3654F100B8A465 /* jfx_runtime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jfx_runtime.c; path = ../../../../../src/javaws/share/native/jfx_runtime.c; sourceTree = "<group>"; };
-		DE6DD4431A3654F200B8A465 /* jfx_runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jfx_runtime.h; path = ../../../../../src/javaws/share/native/jfx_runtime.h; sourceTree = "<group>"; };
-		DE6DD4441A3654F200B8A465 /* launcher.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = launcher.c; path = ../../../../../src/javaws/share/native/launcher.c; sourceTree = "<group>"; };
-		DE6DD4451A3654F200B8A465 /* launcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = launcher.h; path = ../../../../../src/javaws/share/native/launcher.h; sourceTree = "<group>"; };
-		DE6DD4461A3654F200B8A465 /* launchFile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = launchFile.c; path = ../../../../../src/javaws/share/native/launchFile.c; sourceTree = "<group>"; };
-		DE6DD4471A3654F200B8A465 /* launchFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = launchFile.h; path = ../../../../../src/javaws/share/native/launchFile.h; sourceTree = "<group>"; };
-		DE6DD44E1A3654FA00B8A465 /* msgString.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = msgString.c; path = ../../../../../src/javaws/share/native/msgString.c; sourceTree = "<group>"; };
-		DE6DD44F1A3654FA00B8A465 /* msgString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = msgString.h; path = ../../../../../src/javaws/share/native/msgString.h; sourceTree = "<group>"; };
-		DE6DD4501A3654FA00B8A465 /* propertyParser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = propertyParser.c; path = ../../../../../src/javaws/share/native/propertyParser.c; sourceTree = "<group>"; };
-		DE6DD4511A3654FA00B8A465 /* propertyParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = propertyParser.h; path = ../../../../../src/javaws/share/native/propertyParser.h; sourceTree = "<group>"; };
-		DE6DD4521A3654FA00B8A465 /* splashFile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = splashFile.c; path = ../../../../../src/javaws/share/native/splashFile.c; sourceTree = "<group>"; };
-		DE6DD4531A3654FA00B8A465 /* splashFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = splashFile.h; path = ../../../../../src/javaws/share/native/splashFile.h; sourceTree = "<group>"; };
-		DE6DD4541A3654FA00B8A465 /* system.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = system.c; path = ../../../../../src/javaws/share/native/system.c; sourceTree = "<group>"; };
-		DE6DD4551A3654FA00B8A465 /* system.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = system.h; path = ../../../../../src/javaws/share/native/system.h; sourceTree = "<group>"; };
-		DE6DD4561A3654FA00B8A465 /* util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = util.c; path = ../../../../../src/javaws/share/native/util.c; sourceTree = "<group>"; };
-		DE6DD4571A3654FA00B8A465 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = util.h; path = ../../../../../src/javaws/share/native/util.h; sourceTree = "<group>"; };
-		DE6DD45D1A36550100B8A465 /* versionId.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = versionId.c; path = ../../../../../src/javaws/share/native/versionId.c; sourceTree = "<group>"; };
-		DE6DD45E1A36550100B8A465 /* versionId.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = versionId.h; path = ../../../../../src/javaws/share/native/versionId.h; sourceTree = "<group>"; };
-		DE6DD45F1A36550100B8A465 /* xmlparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xmlparser.c; path = ../../../../../src/javaws/share/native/xmlparser.c; sourceTree = "<group>"; };
-		DE6DD4601A36550100B8A465 /* xmlparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xmlparser.h; path = ../../../../../src/javaws/share/native/xmlparser.h; sourceTree = "<group>"; };
-		DE6DD4631A36555100B8A465 /* launcher_md.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = launcher_md.c; path = ../../../../../src/javaws/macosx/native/launcher_md.c; sourceTree = "<group>"; };
-		DE6DD4641A36555100B8A465 /* splash_md.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = splash_md.c; path = ../../../../../src/javaws/macosx/native/splash_md.c; sourceTree = "<group>"; };
-		DE6DD4661A36555100B8A465 /* system_md.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = system_md.c; path = ../../../../../src/javaws/macosx/native/system_md.c; sourceTree = "<group>"; };
-		DE6DD4671A36555100B8A465 /* system_md.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = system_md.h; path = ../../../../../src/javaws/macosx/native/system_md.h; sourceTree = "<group>"; };
-		DE8B3C5F1A3760E700316F1D /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
-		DE8B3C611A37A51900316F1D /* com_sun_deploy_net_proxy_MSystemProxyHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = com_sun_deploy_net_proxy_MSystemProxyHandler.h; path = ../../../../../src/common/unix/native/com_sun_deploy_net_proxy_MSystemProxyHandler.h; sourceTree = "<group>"; };
-		DE8B3C621A37A51900316F1D /* config.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = config.c; path = ../../../../../src/common/unix/native/config.c; sourceTree = "<group>"; };
-		DE8B3C631A37A51900316F1D /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../../../../../src/common/unix/native/config.h; sourceTree = "<group>"; };
-		DE8B3C641A37A51900316F1D /* configcache_pd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = configcache_pd.c; path = ../../../../../src/common/unix/native/configcache_pd.c; sourceTree = "<group>"; };
-		DE8B3C651A37A51900316F1D /* configcache_pd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = configcache_pd.h; path = ../../../../../src/common/unix/native/configcache_pd.h; sourceTree = "<group>"; };
-		DE8B3C661A37A51900316F1D /* console.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = console.c; path = ../../../../../src/common/unix/native/console.c; sourceTree = "<group>"; };
-		DE8B3C671A37A51900316F1D /* DeployPlatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeployPlatform.h; path = ../../../../../src/common/unix/native/DeployPlatform.h; sourceTree = "<group>"; };
-		DE8B3C681A37A51900316F1D /* dialogutils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dialogutils.c; path = ../../../../../src/common/unix/native/dialogutils.c; sourceTree = "<group>"; };
-		DE8B3C691A37A51900316F1D /* dialogutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dialogutils.h; path = ../../../../../src/common/unix/native/dialogutils.h; sourceTree = "<group>"; };
-		DE8B3C6A1A37A51900316F1D /* expirationdialog.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = expirationdialog.c; path = ../../../../../src/common/unix/native/expirationdialog.c; sourceTree = "<group>"; };
-		DE8B3C6B1A37A51900316F1D /* gnomevfs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gnomevfs.h; path = ../../../../../src/common/unix/native/gnomevfs.h; sourceTree = "<group>"; };
-		DE8B3C711A37A51900316F1D /* MSystemProxyHandler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = MSystemProxyHandler.c; path = ../../../../../src/common/unix/native/MSystemProxyHandler.c; sourceTree = "<group>"; };
-		DE8B3C721A37A51900316F1D /* NetworkUtil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = NetworkUtil.c; path = ../../../../../src/common/unix/native/NetworkUtil.c; sourceTree = "<group>"; };
-		DE8B3C731A37A51900316F1D /* NetworkUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkUtil.h; path = ../../../../../src/common/unix/native/NetworkUtil.h; sourceTree = "<group>"; };
-		DE8B3C741A37A51900316F1D /* Platform.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Platform.c; path = ../../../../../src/common/unix/native/Platform.c; sourceTree = "<group>"; };
-		DE8B3C751A37A51900316F1D /* SharedMemPerfHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedMemPerfHelper.h; path = ../../../../../src/common/unix/native/SharedMemPerfHelper.h; sourceTree = "<group>"; };
-		DE8B3C761A37A51900316F1D /* UnixDomainSocket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = UnixDomainSocket.c; path = ../../../../../src/common/unix/native/UnixDomainSocket.c; sourceTree = "<group>"; };
-		DE8B3C771A37A51900316F1D /* UnixTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnixTime.cpp; path = ../../../../../src/common/unix/native/UnixTime.cpp; sourceTree = "<group>"; };
-		DE8B3C781A37A51900316F1D /* UnixTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UnixTime.h; path = ../../../../../src/common/unix/native/UnixTime.h; sourceTree = "<group>"; };
-		DE8B3C791A37A51900316F1D /* webstartblockdialog.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = webstartblockdialog.c; path = ../../../../../src/common/unix/native/webstartblockdialog.c; sourceTree = "<group>"; };
-		DE8B3C871A37A7BF00316F1D /* BasicPerfHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BasicPerfHelper.h; path = ../../../../../src/common/share/native/BasicPerfHelper.h; sourceTree = "<group>"; };
-		DE8B3C881A37A7BF00316F1D /* BasicPerfStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BasicPerfStore.cpp; path = ../../../../../src/common/share/native/BasicPerfStore.cpp; sourceTree = "<group>"; };
-		DE8B3C891A37A7BF00316F1D /* BasicPerfStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BasicPerfStore.h; path = ../../../../../src/common/share/native/BasicPerfStore.h; sourceTree = "<group>"; };
-		DE8B3C8A1A37A7BF00316F1D /* configcache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = configcache.h; path = ../../../../../src/common/share/native/configcache.h; sourceTree = "<group>"; };
-		DE8B3C8B1A37A7BF00316F1D /* DeployPerf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DeployPerf.cpp; path = ../../../../../src/common/share/native/DeployPerf.cpp; sourceTree = "<group>"; };
-		DE8B3C8C1A37A7BF00316F1D /* DeployPerf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeployPerf.h; path = ../../../../../src/common/share/native/DeployPerf.h; sourceTree = "<group>"; };
-		DE8B3C8D1A37A7BF00316F1D /* DeployVersion.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = DeployVersion.hpp; path = ../../../../../src/common/share/native/DeployVersion.hpp; sourceTree = "<group>"; };
-		DE8B3C8E1A37A7BF00316F1D /* NativeLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NativeLock.h; path = ../../../../../src/common/share/native/NativeLock.h; sourceTree = "<group>"; };
-		DE8B3C8F1A37A7BF00316F1D /* NativeLocker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NativeLocker.h; path = ../../../../../src/common/share/native/NativeLocker.h; sourceTree = "<group>"; };
-		DE8B3C901A37A7BF00316F1D /* PerfHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerfHelper.cpp; path = ../../../../../src/common/share/native/PerfHelper.cpp; sourceTree = "<group>"; };
-		DE8B3C911A37A7BF00316F1D /* PerfHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerfHelper.h; path = ../../../../../src/common/share/native/PerfHelper.h; sourceTree = "<group>"; };
-		DE8B3C921A37A7BF00316F1D /* PerfLabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerfLabel.cpp; path = ../../../../../src/common/share/native/PerfLabel.cpp; sourceTree = "<group>"; };
-		DE8B3C931A37A7BF00316F1D /* PerfLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerfLabel.h; path = ../../../../../src/common/share/native/PerfLabel.h; sourceTree = "<group>"; };
-		DE8B3C941A37A7BF00316F1D /* PerfLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerfLib.h; path = ../../../../../src/common/share/native/PerfLib.h; sourceTree = "<group>"; };
-		DE8B3C951A37A7BF00316F1D /* PerfStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerfStore.h; path = ../../../../../src/common/share/native/PerfStore.h; sourceTree = "<group>"; };
-		DE8B3C9A1A37A7C600316F1D /* secureArgs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = secureArgs.c; path = ../../../../../src/common/share/native/secureArgs.c; sourceTree = "<group>"; };
-		DE8B3C9B1A37A7C600316F1D /* secureArgs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = secureArgs.h; path = ../../../../../src/common/share/native/secureArgs.h; sourceTree = "<group>"; };
-		DE8B3C9C1A37A7C600316F1D /* SystemTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemTime.h; path = ../../../../../src/common/share/native/SystemTime.h; sourceTree = "<group>"; };
-		DE8B3C9E1A37A81000316F1D /* jfx_runtime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jfx_runtime.c; path = ../../../../../src/javaws/share/native/jfx_runtime.c; sourceTree = "<group>"; };
-		DE8B3C9F1A37A81000316F1D /* jfx_runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jfx_runtime.h; path = ../../../../../src/javaws/share/native/jfx_runtime.h; sourceTree = "<group>"; };
-		DE8B3CA11A37BFA300316F1D /* jfx_runtime_md.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jfx_runtime_md.c; path = ../../../../../src/javaws/unix/native/jfx_runtime_md.c; sourceTree = "<group>"; };
-		DE8B3CA31A37C10000316F1D /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
-		DE8B3CA51A37D04900316F1D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
-		DE8B3CA71A37D05300316F1D /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
-		DE8B3CA91A38C48B00316F1D /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		DE113B731A365449007808D0 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DE8B3CAA1A38C48B00316F1D /* libiconv.dylib in Frameworks */,
-				DE8B3CA81A37D05300316F1D /* ServiceManagement.framework in Frameworks */,
-				DE8B3CA61A37D04900316F1D /* Security.framework in Frameworks */,
-				DE8B3CA41A37C10000316F1D /* SystemConfiguration.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		DE113B6D1A365449007808D0 = {
-			isa = PBXGroup;
-			children = (
-				DE8B3CA91A38C48B00316F1D /* libiconv.dylib */,
-				DE8B3CA71A37D05300316F1D /* ServiceManagement.framework */,
-				DE8B3CA51A37D04900316F1D /* Security.framework */,
-				DE8B3CA31A37C10000316F1D /* SystemConfiguration.framework */,
-				DE8B3C5F1A3760E700316F1D /* ApplicationServices.framework */,
-				DE113B781A365449007808D0 /* javaws */,
-				DE113B771A365449007808D0 /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		DE113B771A365449007808D0 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				DE113B761A365449007808D0 /* javaws */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		DE113B781A365449007808D0 /* javaws */ = {
-			isa = PBXGroup;
-			children = (
-				DE8B3C611A37A51900316F1D /* com_sun_deploy_net_proxy_MSystemProxyHandler.h */,
-				DE8B3C621A37A51900316F1D /* config.c */,
-				DE8B3C631A37A51900316F1D /* config.h */,
-				DE8B3C641A37A51900316F1D /* configcache_pd.c */,
-				DE8B3C651A37A51900316F1D /* configcache_pd.h */,
-				DE8B3C661A37A51900316F1D /* console.c */,
-				DE8B3C671A37A51900316F1D /* DeployPlatform.h */,
-				DE8B3C681A37A51900316F1D /* dialogutils.c */,
-				DE8B3C691A37A51900316F1D /* dialogutils.h */,
-				DE8B3C6A1A37A51900316F1D /* expirationdialog.c */,
-				DE8B3C6B1A37A51900316F1D /* gnomevfs.h */,
-				DE8B3C9A1A37A7C600316F1D /* secureArgs.c */,
-				DE8B3C9B1A37A7C600316F1D /* secureArgs.h */,
-				DE8B3C9C1A37A7C600316F1D /* SystemTime.h */,
-				DE8B3C711A37A51900316F1D /* MSystemProxyHandler.c */,
-				DE8B3C721A37A51900316F1D /* NetworkUtil.c */,
-				DE8B3C9E1A37A81000316F1D /* jfx_runtime.c */,
-				DE8B3C9F1A37A81000316F1D /* jfx_runtime.h */,
-				DE8B3C731A37A51900316F1D /* NetworkUtil.h */,
-				DE8B3C741A37A51900316F1D /* Platform.c */,
-				DE8B3C751A37A51900316F1D /* SharedMemPerfHelper.h */,
-				DE8B3C761A37A51900316F1D /* UnixDomainSocket.c */,
-				DE8B3C771A37A51900316F1D /* UnixTime.cpp */,
-				DE8B3C781A37A51900316F1D /* UnixTime.h */,
-				DE8B3C791A37A51900316F1D /* webstartblockdialog.c */,
-				DE6DD4631A36555100B8A465 /* launcher_md.c */,
-				DE6DD4641A36555100B8A465 /* splash_md.c */,
-				DE6DD4661A36555100B8A465 /* system_md.c */,
-				DE6DD4671A36555100B8A465 /* system_md.h */,
-				DE6DD45D1A36550100B8A465 /* versionId.c */,
-				DE6DD45E1A36550100B8A465 /* versionId.h */,
-				DE6DD45F1A36550100B8A465 /* xmlparser.c */,
-				DE6DD4601A36550100B8A465 /* xmlparser.h */,
-				DE6DD44E1A3654FA00B8A465 /* msgString.c */,
-				DE6DD44F1A3654FA00B8A465 /* msgString.h */,
-				DE6DD4501A3654FA00B8A465 /* propertyParser.c */,
-				DE6DD4511A3654FA00B8A465 /* propertyParser.h */,
-				DE6DD4521A3654FA00B8A465 /* splashFile.c */,
-				DE6DD4531A3654FA00B8A465 /* splashFile.h */,
-				DE6DD4541A3654FA00B8A465 /* system.c */,
-				DE6DD4551A3654FA00B8A465 /* system.h */,
-				DE6DD4561A3654FA00B8A465 /* util.c */,
-				DE6DD4571A3654FA00B8A465 /* util.h */,
-				DE6DD43C1A3654F100B8A465 /* applicationIcon.c */,
-				DE6DD43D1A3654F100B8A465 /* applicationIcon.h */,
-				DE6DD43E1A3654F100B8A465 /* base64.c */,
-				DE6DD43F1A3654F100B8A465 /* base64.h */,
-				DE6DD4401A3654F100B8A465 /* configurationFile.c */,
-				DE6DD4411A3654F100B8A465 /* configurationFile.h */,
-				DE8B3CA11A37BFA300316F1D /* jfx_runtime_md.c */,
-				DE6DD4421A3654F100B8A465 /* jfx_runtime.c */,
-				DE6DD4431A3654F200B8A465 /* jfx_runtime.h */,
-				DE6DD4441A3654F200B8A465 /* launcher.c */,
-				DE6DD4451A3654F200B8A465 /* launcher.h */,
-				DE6DD4461A3654F200B8A465 /* launchFile.c */,
-				DE6DD4471A3654F200B8A465 /* launchFile.h */,
-				DE8B3C871A37A7BF00316F1D /* BasicPerfHelper.h */,
-				DE8B3C881A37A7BF00316F1D /* BasicPerfStore.cpp */,
-				DE8B3C891A37A7BF00316F1D /* BasicPerfStore.h */,
-				DE8B3C8A1A37A7BF00316F1D /* configcache.h */,
-				DE8B3C8B1A37A7BF00316F1D /* DeployPerf.cpp */,
-				DE8B3C8C1A37A7BF00316F1D /* DeployPerf.h */,
-				DE8B3C8D1A37A7BF00316F1D /* DeployVersion.hpp */,
-				DE8B3C8E1A37A7BF00316F1D /* NativeLock.h */,
-				DE8B3C8F1A37A7BF00316F1D /* NativeLocker.h */,
-				DE8B3C901A37A7BF00316F1D /* PerfHelper.cpp */,
-				DE8B3C911A37A7BF00316F1D /* PerfHelper.h */,
-				DE8B3C921A37A7BF00316F1D /* PerfLabel.cpp */,
-				DE8B3C931A37A7BF00316F1D /* PerfLabel.h */,
-				DE8B3C941A37A7BF00316F1D /* PerfLib.h */,
-				DE8B3C951A37A7BF00316F1D /* PerfStore.h */,
-				DE113B7B1A365449007808D0 /* javaws.1 */,
-			);
-			path = javaws;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		DE113B751A365449007808D0 /* javaws */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DE113B7F1A365449007808D0 /* Build configuration list for PBXNativeTarget "javaws" */;
-			buildPhases = (
-				DE113B721A365449007808D0 /* Sources */,
-				DE113B731A365449007808D0 /* Frameworks */,
-				DE113B741A365449007808D0 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = javaws;
-			productName = javaws;
-			productReference = DE113B761A365449007808D0 /* javaws */;
-			productType = "com.apple.product-type.tool";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		DE113B6E1A365449007808D0 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0510;
-				ORGANIZATIONNAME = "___FULLUSERNAME___";
-			};
-			buildConfigurationList = DE113B711A365449007808D0 /* Build configuration list for PBXProject "javaws" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-			);
-			mainGroup = DE113B6D1A365449007808D0;
-			productRefGroup = DE113B771A365449007808D0 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				DE113B751A365449007808D0 /* javaws */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		DE113B721A365449007808D0 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DE8B3C851A37A51900316F1D /* UnixTime.cpp in Sources */,
-				DE8B3C831A37A51900316F1D /* Platform.c in Sources */,
-				DE6DD4491A3654F200B8A465 /* base64.c in Sources */,
-				DE8B3C7E1A37A51900316F1D /* expirationdialog.c in Sources */,
-				DE6DD45A1A3654FA00B8A465 /* splashFile.c in Sources */,
-				DE6DD4581A3654FA00B8A465 /* msgString.c in Sources */,
-				DE8B3C971A37A7BF00316F1D /* DeployPerf.cpp in Sources */,
-				DE6DD4611A36550100B8A465 /* versionId.c in Sources */,
-				DE6DD46B1A36555100B8A465 /* system_md.c in Sources */,
-				DE6DD44C1A3654F200B8A465 /* launcher.c in Sources */,
-				DE6DD4591A3654FA00B8A465 /* propertyParser.c in Sources */,
-				DE8B3C7D1A37A51900316F1D /* dialogutils.c in Sources */,
-				DE8B3C861A37A51900316F1D /* webstartblockdialog.c in Sources */,
-				DE6DD4621A36550100B8A465 /* xmlparser.c in Sources */,
-				DE6DD44B1A3654F200B8A465 /* jfx_runtime.c in Sources */,
-				DE6DD44A1A3654F200B8A465 /* configurationFile.c in Sources */,
-				DE8B3CA21A37BFA300316F1D /* jfx_runtime_md.c in Sources */,
-				DE8B3C7C1A37A51900316F1D /* console.c in Sources */,
-				DE8B3C9D1A37A7C600316F1D /* secureArgs.c in Sources */,
-				DE8B3CA01A37A81000316F1D /* jfx_runtime.c in Sources */,
-				DE6DD44D1A3654F200B8A465 /* launchFile.c in Sources */,
-				DE8B3C841A37A51900316F1D /* UnixDomainSocket.c in Sources */,
-				DE8B3C811A37A51900316F1D /* MSystemProxyHandler.c in Sources */,
-				DE6DD4681A36555100B8A465 /* launcher_md.c in Sources */,
-				DE6DD45C1A3654FA00B8A465 /* util.c in Sources */,
-				DE6DD4691A36555100B8A465 /* splash_md.c in Sources */,
-				DE8B3C7B1A37A51900316F1D /* configcache_pd.c in Sources */,
-				DE8B3C981A37A7BF00316F1D /* PerfHelper.cpp in Sources */,
-				DE8B3C961A37A7BF00316F1D /* BasicPerfStore.cpp in Sources */,
-				DE8B3C821A37A51900316F1D /* NetworkUtil.c in Sources */,
-				DE8B3C991A37A7BF00316F1D /* PerfLabel.cpp in Sources */,
-				DE8B3C7A1A37A51900316F1D /* config.c in Sources */,
-				DE6DD45B1A3654FA00B8A465 /* system.c in Sources */,
-				DE6DD4481A3654F200B8A465 /* applicationIcon.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		DE113B7D1A365449007808D0 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		DE113B7E1A365449007808D0 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				SDKROOT = macosx;
-			};
-			name = Release;
-		};
-		DE113B801A365449007808D0 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CONFIGURATION_BUILD_DIR = "../../../../../build/macosx-x86_64-normal-server-fastdebug/deploy/jre/bin";
-				FRAMEWORK_SEARCH_PATHS = "";
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					/System/Library/Frameworks/JavaVM.framework/Headers,
-				);
-				LIBRARY_SEARCH_PATHS = /System/Library/Frameworks/JavaVM.framework/Headers;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				USER_HEADER_SEARCH_PATHS = "../../../../src/common/macosx/native ../../../../src/javaws/share/native/version ../../../../src/common/share/native ../../../../../build/macosx-x86_64-normal-server-fastdebug/deploy/headers/common";
-			};
-			name = Debug;
-		};
-		DE113B811A365449007808D0 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "";
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					/System/Library/Frameworks/JavaVM.framework/Headers,
-				);
-				LIBRARY_SEARCH_PATHS = /System/Library/Frameworks/JavaVM.framework/Headers;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				USER_HEADER_SEARCH_PATHS = "../../../../src/common/macosx/native ../../../../src/javaws/share/native/version ../../../../src/common/share/native ../../../../../build/macosx-x86_64-normal-server-fastdebug/deploy/headers/common";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		DE113B711A365449007808D0 /* Build configuration list for PBXProject "javaws" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DE113B7D1A365449007808D0 /* Debug */,
-				DE113B7E1A365449007808D0 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		DE113B7F1A365449007808D0 /* Build configuration list for PBXNativeTarget "javaws" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DE113B801A365449007808D0 /* Debug */,
-				DE113B811A365449007808D0 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = DE113B6E1A365449007808D0 /* Project object */;
-}
diff --git a/test/projects/mac/javaws/javaws.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/test/projects/mac/javaws/javaws.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index c8b5dca..0000000
--- a/test/projects/mac/javaws/javaws.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:javaws.xcodeproj">
-   </FileRef>
-</Workspace>