--- a/.hgtags	Thu Mar 27 11:23:22 2014 -0700
+++ b/.hgtags	Wed Apr 16 19:41:08 2014 +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
@@ -191,6 +197,7 @@
 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15
 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16
 66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17
+cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint
 6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18
 474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19
 32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20
@@ -258,6 +265,7 @@
 382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07
 7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08
 96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09
+85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint
 e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10
 db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11
 f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12
@@ -335,6 +343,7 @@
 5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
 e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19
 86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20
+cbb9be4fb46d8dfd3a8c32dc693f9501a64b9a47 icedtea-2.4.0
 c31648d7a6ac692371f1e9abe95bc2856a7dc51c jdk7u14-b21
 eb1c9eacea1f07c07e7e700db624649d3573dae4 jdk7u14-b22
 e84535d2c292032669ac75a6a0afc5f23c708064 jdk7u40-b23
@@ -345,6 +354,7 @@
 9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28
 bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29
 0586afeb2caa0b4595bf5b306657a5dd1f0d121c jdk7u40-b30
+91c95fd8eea822b47bcebd7eed22fdf3c404dd62 icedtea-2.4.1
 9c343668b0a95e5510f715014884e5d45df9dfb0 jdk7u40-b31
 056f998e75f87a299808671ecc0d96e270f62dca jdk7u40-b32
 e36d8f754801c9d17585a9469f9b33f9799167f8 jdk7u40-b33
@@ -359,6 +369,7 @@
 765bea9bfcfc8c472df0a2daced5e576095f46ac jdk7u40-b42
 988ece7b686564084770e99ca26746c45ffb933f jdk7u40-b43
 a67dbf96bf86989d0392cc5b66e5d4139cbceec7 jdk7u40-b60
+06ea051f7ffe0f91213c8e7064ddb045c93ba1b4 icedtea-2.4.2
 b2e29b79e54e58349c1dbcf5449f67fc5d5a235a jdk7u40-b61
 94ea3d062a3c28c64a837fa8f999c6b6956ff7c4 jdk7u40-b62
 9bbfba4981e1db5016bbfbc23025763966021c26 jdk7u45-b01
@@ -380,6 +391,8 @@
 b9aeec6b9d5aac0746f8d1764a7740f8b83334ab jdk7u45-b17
 ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
 164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30
+3c8eb52a32ea6a119657487c40e24c21c1020e51 icedtea-2.4.3
+3d9f5aad3f497f5b2bedad6c77f5cacaf721648f icedtea-2.4.4
 7f5cfaedb25c2c2774d6839810d6ae543557ca01 jdk7u45-b31
 ef7bdbe7f1fa42fd58723e541d9cdedcacb2649a jdk7u45-b33
 bcb3e939d046d75436c7c8511600b6edce42e6da jdk7u45-b34
@@ -398,6 +411,10 @@
 c9d8d8793d9330d592190c334260ccf26c986df6 jdk7u51-b11
 5b44df2114e466da85c3816627bfcd1b59c6499d jdk7u51-b12
 4d0807934c302f2e35e6a5acc6cdc720c82b5671 jdk7u51-b13
+dabd37b7e2950b42c1c9550caea26522348cd7b4 icedtea-2.4.5
+06eeb77dac248eb62fed00aa25f9f9fa9b4df210 icedtea-2.4.6pre01
+06eeb77dac248eb62fed00aa25f9f9fa9b4df210 icedtea-2.4.6
+8c26a3c3912898619032a5d913ba81ebfa6e4e22 icedtea-2.4.7
 ada23e55d76a378cb2fc2cd7ffae8c147aaf0055 jdk7u51-b30
 e3d4896d52ab4ad0fc0b7a45d60340dbdcb8826d jdk7u51-b31
 5b44df2114e466da85c3816627bfcd1b59c6499d jdk7u55-b00

--- a/.jcheck/conf	Thu Mar 27 11:23:22 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup

--- a/make/Makefile	Thu Mar 27 11:23:22 2014 -0700
+++ b/make/Makefile	Wed Apr 16 19:41:08 2014 +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 Mar 27 11:23:22 2014 -0700
+++ b/make/build.properties	Wed Apr 16 19:41:08 2014 +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 Mar 27 11:23:22 2014 -0700
+++ b/make/build.xml	Wed Apr 16 19:41:08 2014 +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">

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