[1.10, 1.11] Patch Approvals

[Dr Andrew John Hughes]

Hi all,

I need a few more patch approvals to get the delayed 1.10.7 and
1.11.2 releases out of the door.

Both 1.10 & 1.11 need this simple patch:

diff --git a/acinclude.m4 b/acinclude.m4
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1349,7 +1349,7 @@
     }
 }]
 EOF
-  if $JAVAC -cp . $JAVACFLAGS -source 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+  if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
     if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
       it_cv_dtdtype=no;
     else

which is already part of a larger patch on HEAD, so that the jaxws dtdtype patch
doesn't return a false positive when run with OpenJDK7 (javac will produce 1.7 bytecode
as there is no target option, and then java can't run it, causing a failure).

1.10 also needs the following:

1.  The dtdtype patch recreated so it still applies (simple regeneration against current source)
2.  Backport of 

changeset:   2713:737f39dbb69f
user:        Omair Majid <omajid at redhat.com>
date:        Wed Oct 26 19:28:49 2011 -0400
summary:     S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc

3.  Backport of

changeset:   2805:ddca483b3ed9
user:        Deepak Bhole <dbhole at redhat.com>
date:        Mon Jan 30 18:26:56 2012 -0500
summary:     Fixed build with GCC 4.7

to keep it building with modern dependencies.  I've checked and all patches apply
and build fine to both hs20 and the default hs19 HotSpot in 1.10.

Can I have approval to get these in?

Thanks,
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120510/98a35d38/attachment.bin