diff -r 05540393c325 make/build.properties
--- a/make/build.properties	Fri Feb 19 08:02:55 2010 -0800
+++ b/make/build.properties	Sun Mar 28 18:18:00 2010 -0400
@@ -34,6 +34,8 @@
 boot.javac = ${boot.java.home}/bin/javac
 boot.javac.source = 6
 boot.javac.target = 6
+#alt.java.home=${boot.java.home}
+alt.java.home=/Volumes/Data/Users/mfranz/developer/openjdk-bsd/bin/openjdk7-darwin-i386-20080820
 
 # This is the JDK used to run the product version of the tools,
 # for example, for testing. If you're building a complete JDK, specify that.
diff -r 05540393c325 make/build.xml
--- a/make/build.xml	Fri Feb 19 08:02:55 2010 -0800
+++ b/make/build.xml	Sun Mar 28 18:18:00 2010 -0400
@@ -622,7 +622,7 @@
         <javac fork="true"
                source="${boot.javac.source}"
                target="${boot.javac.target}"
-               executable="${boot.java.home}/bin/javac"
+               executable="${alt.java.home}/bin/javac"
                srcdir="${make.tools.dir}/GenStubs"
                destdir="${build.toolclasses.dir}/"
                classpath="${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>
diff -r 05540393c325 make/tools/GenStubs/GenStubs.java
--- a/make/tools/GenStubs/GenStubs.java	Fri Feb 19 08:02:55 2010 -0800
+++ b/make/tools/GenStubs/GenStubs.java	Sun Mar 28 18:18:00 2010 -0400
@@ -298,6 +298,7 @@
             tree.accept(this);
             ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
             for (JCTree def: tree.defs) {
+		/* Apple's JDK 6 does not have this so it cannot compile JDK7
                 if (def.getTag() == JCTree.IMPORT) {
                     JCImport imp = (JCImport) def;
                     if (imp.qualid.getTag() == JCTree.SELECT) {
@@ -307,7 +308,7 @@
                             continue;
                         }
                     }
-                }
+                }*/
                 defs.add(def);
             }
             return m.TopLevel(tree.packageAnnotations, tree.pid, defs.toList());
diff -r 05540393c325 src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Fri Feb 19 08:02:55 2010 -0800
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Sun Mar 28 18:18:00 2010 -0400
@@ -48,8 +48,17 @@
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Symtab;
 import com.sun.tools.javac.file.BaseFileObject;
-import com.sun.tools.javac.util.*;
 
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Name;
+import com.sun.tools.javac.util.List;
+import com.sun.tools.javac.util.Convert;
+import com.sun.tools.javac.util.JCDiagnostic;
+import com.sun.tools.javac.util.ListBuffer;
+import com.sun.tools.javac.util.Pair;
+import com.sun.tools.javac.util.Options;
+import com.sun.tools.javac.util.Names;
+import com.sun.tools.javac.util.Context;
 import static com.sun.tools.javac.code.Flags.*;
 import static com.sun.tools.javac.code.Kinds.*;
 import static com.sun.tools.javac.code.TypeTags.*;