Security fixes are back; other fixes can go in. Time for build 18?

[Andrew John Hughes]

2009/12/8 Jonathan Gibbons <Jonathan.Gibbons at sun.com>:
> Andrew John Hughes wrote:
>
> 2009/12/8 Joseph D. Darcy <Joe.Darcy at sun.com>:
>
>
> Andrew John Hughes wrote:
>
>
> 2009/12/8 Kelly O'Hair <Kelly.Ohair at sun.com>:
>
>
>
> Jonathan Gibbons wrote:
>
>
>
> Andrew John Hughes wrote:
>
>
>
> Finally, during build, I just spotted another issue.  The langtools
> build wrongly passes -Werror to javac and this has been removed in the
> OpenJDK7 version.  It only shows up if you build OpenJDK6 with
> OpenJDK7, so it's minor but probably worth fixing.  I doubt that is
> the only building-with-7 issue though.
>
>
>
> Building OpenJDK6  "with"  OpenJDK7?
> You mean with an ALT_BOOTDIR=jdk7? Why?
>
>
>
>
> Why not? I happen to have a system install of OpenJDK7 m5 and not
> OpenJDK6 at present - the reason for that is exactly because you can't
> install 7 and then use it to build 6.  I've since been able to build
> OpenJDK6 using a recent build of IcedTea6 (which uses gcj to build).
> But surely 7 should be able to build 6?
>
>
>
> I suspect the build issue is that the JDK 7 Werror checking is more
> stringent than the OpenJDK 6 error checking and the OpenJDK 6 sources do not
> have the fixes necessary to build under JDK 7 using Werror although they do
> build under OpenJDK 6 with Werror.
>
> -Joe
>
>
>
> Indeed, the OJ7 version has this fix:
>
> changeset:   214:9d541fd2916b
> parent:      212:49281ea88125
> user:        jjg
> date:        Fri Feb 06 10:23:57 2009 -0800
> summary:     6595666: fix -Werror
>
> which includes actually documenting the option in the javac output.
> I missed Jonathan's later change because I was searching for Werror
> rather than checking that file.
> Can we backport the warning fixup?
>
>
> Fixing warnings in OpenJDK 6 langtools is a Good Idea.   However, it may not
> be sufficient to just backport the warning fixup, as we may need additional
> fixups in 6, for where the code is different between the two.
>
> -- Jon
>

The patch doesn't apply cleanly:

$ hg export -R ../../icedtea/langtools b4b1f7732289|hg import -
applying patch from stdin
patching file make/build.properties
Hunk #1 FAILED at 65
1 out of 1 hunks FAILED -- saving rejects to file make/build.properties.rej
unable to find 'src/share/classes/com/sun/tools/classfile/Annotation.java'
for patching
1 out of 1 hunks FAILED -- saving rejects to file
src/share/classes/com/sun/tools/classfile/Annotation.java.rej
unable to find 'src/share/classes/com/sun/tools/classfile/AttributeException.java'
for patching
1 out of 1 hunks FAILED -- saving rejects to file
src/share/classes/com/sun/tools/classfile/AttributeException.java.rej
unable to find 'src/share/classes/com/sun/tools/classfile/Code_attribute.java'
for patching
1 out of 1 hunks FAILED -- saving rejects to file
src/share/classes/com/sun/tools/classfile/Code_attribute.java.rej
unable to find 'src/share/classes/com/sun/tools/classfile/ConstantPool.java'
for patching
4 out of 4 hunks FAILED -- saving rejects to file
src/share/classes/com/sun/tools/classfile/ConstantPool.java.rej
unable to find 'src/share/classes/com/sun/tools/classfile/ConstantPoolException.java'
for patching
1 out of 1 hunks FAILED -- saving rejects to file
src/share/classes/com/sun/tools/classfile/ConstantPoolException.java.rej
unable to find 'src/share/classes/com/sun/tools/classfile/Descriptor.java'
for patching
1 out of 1 hunks FAILED -- saving rejects to file
src/share/classes/com/sun/tools/classfile/Descriptor.java.rej
unable to find 'src/share/classes/com/sun/tools/classfile/DescriptorException.java'
for patching
1 out of 1 hunks FAILED -- saving rejects to file
src/share/classes/com/sun/tools/classfile/DescriptorException.java.rej
unable to find 'src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java'
for patching
1 out of 1 hunks FAILED -- saving rejects to file
src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java.rej
patching file src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
Hunk #1 FAILED at 118
1 out of 1 hunks FAILED -- saving rejects to file
src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java.rej
patching file src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
Hunk #1 FAILED at 470
1 out of 1 hunks FAILED -- saving rejects to file
src/share/classes/com/sun/tools/javac/main/JavaCompiler.java.rej
unable to find 'src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java'
for patching
1 out of 1 hunks FAILED -- saving rejects to file
src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java.rej
unable to find 'src/share/classes/com/sun/tools/javap/InternalError.java'
for patching
1 out of 1 hunks FAILED -- saving rejects to file
src/share/classes/com/sun/tools/javap/InternalError.java.rej

Any pointers to the refactoring involved here before I go digging?
-- 
Andrew :-)

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

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8