--- a/.hgtags	Thu Aug 27 23:31:53 2015 +0100
+++ b/.hgtags	Sun Oct 04 09:43:12 2015 +0100
@@ -50,6 +50,7 @@
 9596dff460935f09684c11d156ce591f92584f0d jdk7-b73
 1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74
 2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75
+83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12
 8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76
 0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77
 acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78
@@ -63,6 +64,7 @@
 ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86
 409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87
 f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88
+681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13
 6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89
 71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90
 97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91
@@ -111,6 +113,7 @@
 3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134
 9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135
 ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136
+8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14
 a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137
 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138
 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139
@@ -123,6 +126,7 @@
 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
 d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
+fb7fb3071b642334520e5b9f4a87ce28717af61c icedtea-2.0-branchpoint
 cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02
 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03
 baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04
@@ -141,6 +145,7 @@
 f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12
 f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13
 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21
+58f6a950cd726220e81eddb126ca5c57e3b368f2 icedtea-2.1-branchpoint
 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u3-b02
 0ffc4995457773085f61c39f6d33edc242b41bcf jdk7u3-b03
 f6de36b195cd315646213c7affd2cc15702edbfb jdk7u3-b04
@@ -157,6 +162,7 @@
 8919b2b02fcba65f833c68374f3bfdd9bc3ba814 jdk7u4-b10
 4672e092f0968d503dc37f860b15ae7e2653f8d7 jdk7u4-b11
 a4bf6a1aff54a98e9ff2b3fb53c719f658bec677 jdk7u4-b12
+e3537a4f75c7fcca16c349c3175bb0cdc2fbc29c icedtea-2.2-branchpoint
 56eb9150d9ffdb71c47d72871e8ecc98b5f402de jdk7u4-b13
 0e55881c2ee2984048c179d1e031cefb56a36bec jdk7u4-b14
 0bea057f7ce1577e1b0306f2027c057e35394398 jdk7u5-b01
@@ -186,11 +192,15 @@
 21d2313dfeac8c52a04b837d13958c86346a4b12 jdk7u6-b10
 13d3c624291615593b4299a273085441b1dd2f03 jdk7u6-b11
 f0be10a26af08c33d9afe8fe51df29572d431bac jdk7u6-b12
+e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b01
+e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b02
+e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b03
 fcebf337f5c1d342973573d9c6f758443c8aefcf jdk7u6-b13
 35b2699c6243e9fb33648c2c25e97ec91d0e3553 jdk7u6-b14
 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15
 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16
 66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17
+cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint
 6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18
 474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19
 32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20
@@ -258,11 +268,13 @@
 382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07
 7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08
 96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09
+85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint
 e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10
 db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11
 f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12
 5a52c6cc8db94b68eaacb42a9b4df30a40b09d82 jdk7u14-b13
 5febc4e479fad801424cdcce90a0d463a2ef9223 jdk7u14-b14
+d52538e72925a1da7b1fcff051b591beeb2452b4 ppc-aix-port-b04
 5fdb509d1f1a0533b14c61c92d77ff21e0ce2488 jdk7u14-b15
 1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01
 8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02
@@ -382,6 +394,7 @@
 ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
 164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30
 7f5cfaedb25c2c2774d6839810d6ae543557ca01 jdk7u45-b31
+849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
 ef7bdbe7f1fa42fd58723e541d9cdedcacb2649a jdk7u45-b33
 bcb3e939d046d75436c7c8511600b6edce42e6da jdk7u45-b34
 efbda7abd821f280ec3a3aa6819ad62d45595e55 jdk7u45-b35
@@ -430,8 +443,11 @@
 849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
 b19e375d9829daf207b1bdc7f908a3e1d548462c jdk7u60-b01
 954e1616449af74f68aed57261cbeb62403377f1 jdk7u60-b02
+0d89cc5766d72e870eaf16696ec9b7b1ca4901fd icedtea-2.5pre01
+f75a642c2913e1ecbd22fc46812cffa2e7739169 icedtea-2.5pre02
 4170784840d510b4e8ae7ae250b92279aaf5eb25 jdk7u60-b03
 772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u60-b04
+702454ac1a074e81890fb07da06ebf00370e42ed icedtea-2.6pre01
 744287fccf3b2c4fba2abf105863f0a44c3bd4da jdk7u60-b05
 8f6db72756f3e4c3cca8731d20e978fb741846d2 jdk7u60-b06
 02f050bc5569fb058ace44ed705bbb0f9022a6fe jdk7u60-b07
@@ -441,7 +457,11 @@
 3cc64ba8cf85942929b15c5ef21360f96db3b99c jdk7u60-b11
 b79b8b1dc88faa73229b2bce04e979ff5ec854f5 jdk7u60-b12
 3dc3e59e9580dfdf95dac57c54fe1a4209401125 jdk7u60-b13
+2040d4afc89815f6bf54a597ff58a70798b68e3d icedtea-2.6pre02
+2950924c2b80dc4d3933a8ab15a0ebb39522da5a icedtea-2.6pre03
 a8b9c1929e50a9f3ae9ae1a23c06fa73a57afce3 jdk7u60-b14
+fa084876cf02f2f9996ad8a0ab353254f92c5564 icedtea-2.6pre04
+5f917c4b87a952a8bf79de08f3e2dd3e56c41657 icedtea-2.6pre05
 7568ebdada118da1d1a6addcf6316ffda21801fd jdk7u60-b15
 057caf9e0774e7c530c5710127f70c8d5f46deab jdk7u60-b16
 b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b17
@@ -581,10 +601,27 @@
 e5e807700ff84f7bd9159ebc828891ae3ddb859c jdk7u79-b15
 772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u80-b00
 6c307a0b7a94e002d8a2532ffd8146d6c53f42d3 jdk7u80-b01
+3eab691bd9ac5222c11dbabb7b5fbc8463c62df6 icedtea-2.6pre07
+f43a81252f827395020fe71099bfa62f2ca0de50 icedtea-2.6pre06
+cdf407c97754412b02ebfdda111319dbd3cb9ca9 icedtea-2.6pre08
 5bd6f3adf690dc2de8881b6f9f48336db4af7865 jdk7u80-b02
+55486a406d9f111eea8996fdf6144befefd86aff icedtea-2.6pre09
+cf836e0ed10de1179ec398a7db323e702b60ca35 icedtea-2.6pre10
+510234036e06ec8d7ed2a39ee11faf1b9a4257b0 icedtea-2.6pre11
 bcbd241df6cd0a643480c8de183c541a662dd506 jdk7u80-b03
+987d772301e91c896178f47f39d82d87e9da1e39 icedtea-2.6pre12
+a072de9f83ed85a6a86d052d13488009230d7d4b icedtea-2.6pre13
+ecf2ec173dd2c19b63d7cf543db23ec7d4f4732a icedtea-2.6pre14
+029dd486cd1a8f6d7684b1633aae41c613055dd2 icedtea-2.6pre15
+c802d4cdd4cbfa8116e4f612cf536de32d67221a icedtea-2.6pre16
+e1dd8fea9abd3663838008063715b4b7ab5a58a4 icedtea-2.6pre17
 04b56f4312b62d8bdf4eb1159132de8437994d34 jdk7u80-b04
 f40fb76025c798cab4fb0e1966be1bceb8234527 jdk7u80-b05
+bb9d09219d3e74954b46ad53cb99dc307e39e120 icedtea-2.6pre18
+4c600e18a7e415702f6a62073c8c60f6b2cbfc11 icedtea-2.6pre19
+1a60fa408f57762abe32f19e4f3d681fb9c4960b icedtea-2.6pre20
+5331b041c88950058f8bd8e9669b9763be6ee03f icedtea-2.6pre21
+a322987c412f5f8584b15fab0a4505b94c016c22 icedtea-2.6pre22
 335ee524dc68a42863f3fa3f081b781586e7ba2d jdk7u80-b06
 6f7b359c4e9f82cbd399edc93c3275c3e668d2ea jdk7u80-b07
 e6db2a97b3696fb5e7786b23f77af346a935a370 jdk7u80-b08
@@ -597,6 +634,12 @@
 d0cc1c8ace99283d7b2354d2c0e5cd58787163c8 jdk7u80-b30
 f2b4d5e42318ed93d35006ff7d1b3b0313b5a71f jdk7u80-b15
 f1ffea3bd4a4df0f74ce0c127aeacf6bd11ee612 jdk7u80-b32
+403eeedf70f4b0e3c88f094d324e5c85959610e2 icedtea-2.6pre23
+bc95d2472055d96a712db09ecd8ab42e52058481 icedtea-2.6pre24
+bc95d2472055d96a712db09ecd8ab42e52058481 icedtea-2.6.0
 1b20ca77fa98bb29d1f5601f027b3055e9eb28ee jdk7u85-b00
 dce5a828bdd56d228724f1e9c6253920f613cec5 jdk7u85-b01
+bc95d2472055d96a712db09ecd8ab42e52058481 icedtea-2.6-branchpoint
+9c6e1de67d7d26809d02c8ce3d6629503cb67d19 icedtea-2.7.0pre01
+b9a7cf56b4de072a3fec512687c8923d5f207692 icedtea-2.7.0pre02
 b22cdae823bac193338d928e86319cd3741ab5fd jdk7u85-b02

--- a/.jcheck/conf	Thu Aug 27 23:31:53 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup

--- a/make/Makefile	Thu Aug 27 23:31:53 2015 +0100
+++ b/make/Makefile	Sun Oct 04 09:43:12 2015 +0100
@@ -111,6 +111,10 @@
   ANT_OPTIONS += -Ddebug.classfiles=true
 endif
 
+ifeq ($(JAVAC_WARNINGS_FATAL), false)
+  ANT_OPTIONS += -Djavac.warnings.fatal=
+endif
+
 # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
 # and the somewhat misnamed CLASS_VERSION (-target NN)
 ifdef TARGET_CLASS_VERSION

--- a/make/build.properties	Thu Aug 27 23:31:53 2015 +0100
+++ b/make/build.properties	Sun Oct 04 09:43:12 2015 +0100
@@ -68,7 +68,8 @@
 # set the following to -version to verify the versions of javac being used
 javac.version.opt =
 # in time, there should be no exceptions to -Xlint:all
-javac.lint.opts = -Xlint:all,-deprecation -Werror
+javac.warnings.fatal = -Werror
+javac.lint.opts = -Xlint:all,-deprecation ${javac.warnings.fatal}
 
 # options for the <javadoc> task for javac
 #javadoc.jls3.url=http://java.sun.com/docs/books/jls/

--- a/make/build.xml	Thu Aug 27 23:31:53 2015 +0100
+++ b/make/build.xml	Sun Oct 04 09:43:12 2015 +0100
@@ -877,7 +877,7 @@
         </javac>
         <taskdef name="genstubs"
                  classname="GenStubs$$Ant"
-                 classpath="${build.toolclasses.dir}/"/>
+                 classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>
     </target>
 
     <target name="-def-javadoc-tool" depends="-check-target.java.home">

--- a/test/Makefile	Thu Aug 27 23:31:53 2015 +0100
+++ b/test/Makefile	Sun Oct 04 09:43:12 2015 +0100
@@ -33,6 +33,9 @@
   ifeq ($(ARCH), i386)
     ARCH=i586
   endif
+  ifeq ($(ARCH), ppc64le)
+    ARCH=ppc64
+  endif
 endif
 ifeq ($(OSNAME), Darwin)
   PLATFORM = bsd

Binary file test/tools/javac/T5090006/broken.jar has changed