--- ./openjdk/j2se/make/common/Release.gmk.orig 2007-12-21 18:58:57.000000000 +0000 +++ ./openjdk/j2se/make/common/Release.gmk 2007-12-21 19:03:26.000000000 +0000 @@ -952,7 +952,7 @@ @# lib/ct.sym @# $(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym - $(JAVAC_CMD) -XDprocess.packages -proc:only \ + $(JAVAC_CMD) -bootclasspath $(ABS_OUTPUTDIR) $(JAVAC_JVM_FLAGS) -XDprocess.packages -proc:only \ -processor com.sun.tools.javac.sym.CreateSymbols \ -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \ -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \ --- ./openjdk/j2se/make/common/BuildToolJar.gmk.orig 2007-12-21 18:14:24.000000000 +0000 +++ ./openjdk/j2se/make/common/BuildToolJar.gmk 2007-12-21 18:16:29.000000000 +0000 @@ -42,7 +42,7 @@ $(BUILDTOOL_ALL_FILES:%=$(BUILDTOOL_SOURCE_ROOT)/%) @$(prep-target) @$(MKDIR) -p $(BUILDTOOLCLASSDIR) - $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \ + $(BOOT_JAVAC_CMD) -cp "$(ABS_OUTPUTDIR)/classes" -d $(BUILDTOOLCLASSDIR) \ -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE) $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \ -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \ --- ./openjdk/j2se/make/common/Rules.gmk.orig 2007-12-21 04:43:54.000000000 +0000 +++ ./openjdk/j2se/make/common/Rules.gmk 2007-12-21 16:15:33.000000000 +0000 @@ -229,14 +229,14 @@ # Make sure all newer sources are compiled (in a batch) classes : $(CLASSES_INIT) .delete.classlist .compile.classlist -.compile.classlist : $(JAVA_SOURCE_LIST) +.compile.classlist : $(JAVA_SOURCE_LIST) @$(MKDIR) -p $(CLASSDESTDIR) @if [ `$(CAT) $(JAVA_SOURCE_LIST) | $(WC) -l` -ge 1 ] ; then \ $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ $(CAT) $(JAVA_SOURCE_LIST); \ $(ECHO) "# Running javac:"; \ - $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ - $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(ECHO) $(JAVAC_CMD) $(JAVAC_JVM_FLAGS) -cp "$(ABS_OUTPUTDIR)/classes" -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(JAVAC_CMD) $(JAVAC_JVM_FLAGS) -cp "$(ABS_OUTPUTDIR)/classes" -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ fi @$(java-vm-cleanup) --- ./openjdk/j2se/make/common/shared/Defs-java.gmk.orig 2007-12-21 14:53:56.000000000 +0000 +++ ./openjdk/j2se/make/common/shared/Defs-java.gmk 2007-12-22 04:52:11.000000000 +0000 @@ -115,6 +115,7 @@ JAVACFLAGS += $(CLASS_VERSION) JAVACFLAGS += -encoding ascii JAVACFLAGS += "-Xbootclasspath:$(CLASSBINDIR)" +JAVACFLAGS += -cp "$(ABS_OUTPUTDIR)/classes" JAVACFLAGS += $(OTHER_JAVACFLAGS) # Needed for javah @@ -128,20 +129,26 @@ DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar JAVAC_CMD = $(BOOT_JAVA_CMD) \ "-Xbootclasspath/p:$(JAVAC_JAR)" \ + -cp "$(ABS_OUTPUTDIR)/classes" \ -jar $(JAVAC_JAR) $(JAVACFLAGS) JAVAH_CMD = $(BOOT_JAVA_CMD) \ "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \ + -cp "$(ABS_OUTPUTDIR)/classes" \ -jar $(JAVAH_JAR) $(JAVAHFLAGS) JAVADOC_CMD = $(BOOT_JAVA_CMD) \ "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \ + -cp "$(ABS_OUTPUTDIR)/classes" \ -jar $(JAVADOC_JAR) else # If no explicit tools, use boot tools (add VM flags in this case) JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ + -cp "$(ABS_OUTPUTDIR)/classes" \ $(JAVACFLAGS) JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ + -cp "$(ABS_OUTPUTDIR)/classes" \ $(JAVAHFLAGS) - JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) + JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) \ + -cp "$(ABS_OUTPUTDIR)/classes" endif # Override of what javac to use (see deploy workspace) --- ./openjdk/j2se/make/common/Demo.gmk.orig 2007-12-21 17:48:51.000000000 +0000 +++ ./openjdk/j2se/make/common/Demo.gmk 2007-12-21 18:04:06.000000000 +0000 @@ -247,7 +247,7 @@ $(DEMO_RESOURCES:%=$(DEMO_JAR_IMAGE)/%) @$(prep-target) $(MKDIR) -p $(DEMO_JAR_IMAGE) - $(JAVAC_CMD) -d $(DEMO_JAR_IMAGE) -sourcepath $(DEMO_BUILD_SRCDIR) \ + $(JAVAC_CMD) $(JAVAC_JVM_FLAGS) -cp $(subst j2se,control,$(ABS_OUTPUTDIR))/classes -d $(DEMO_JAR_IMAGE) -sourcepath $(DEMO_BUILD_SRCDIR) \ @$(DEMO_JAVAC_INPUT) $(BOOT_JAR_CMD) -cfm $@ $(DEMO_MANIFEST) \ -C $(DEMO_JAR_IMAGE) . \ --- ./openjdk/j2se/make/Makefile.orig 2007-12-22 05:09:44.000000000 +0000 +++ ./openjdk/j2se/make/Makefile 2007-12-22 05:11:39.000000000 +0000 @@ -247,7 +247,7 @@ # # Docs # -OTHERSUBDIRS = docs +OTHERSUBDIRS = docs:: sanity-docs post-sanity-docs $(OTHERSUBDIRS-loop) --- ./openjdk/hotspot/src/share/vm/adlc/adlc.hpp.orig 2007-12-20 19:52:37.000000000 +0000 +++ ./openjdk/hotspot/src/share/vm/adlc/adlc.hpp 2007-12-20 19:52:48.000000000 +0000 @@ -35,7 +35,7 @@ #if _MSC_VER >= 1300 // Visual C++ 7.0 or later #include #else -#include +#include #endif #include "string.h" #include "ctype.h" --- ./openjdk/hotspot/src/share/vm/adlc/filebuff.hpp.orig 2007-12-20 19:53:19.000000000 +0000 +++ ./openjdk/hotspot/src/share/vm/adlc/filebuff.hpp 2007-12-20 19:53:44.000000000 +0000 @@ -30,7 +30,7 @@ #if _MSC_VER >= 1300 // Visual C++ 7.0 or later #include #else -#include +#include #endif // STRUCTURE FOR HANDLING INPUT AND OUTPUT FILES @@ -99,8 +99,8 @@ FileBuffRegion *copy(); // Deep copy FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input -// void print(std::ostream&); -// friend std::ostream& operator<< (std::ostream&, FileBuffRegion&); - void print(ostream&); - friend ostream& operator<< (ostream&, FileBuffRegion&); + void print(std::ostream&); + friend std::ostream& operator<< (std::ostream&, FileBuffRegion&); +// void print(ostream&); +// friend ostream& operator<< (ostream&, FileBuffRegion&); }; --- ./openjdk/hotspot/src/share/vm/adlc/filebuff.cpp.orig 2007-12-20 19:53:55.000000000 +0000 +++ ./openjdk/hotspot/src/share/vm/adlc/filebuff.cpp 2007-12-20 19:54:10.000000000 +0000 @@ -158,7 +158,7 @@ } //------------------------------expandtab-------------------------------------- -static int expandtab( ostream &os, int off, char c, char fill1, char fill2 ) { +static int expandtab( std::ostream &os, int off, char c, char fill1, char fill2 ) { if( c == '\t' ) { // Tab? do os << fill1; // Expand the tab; Output space while( (++off) & 7 ); // Expand to tab stop @@ -172,7 +172,7 @@ //------------------------------printline-------------------------------------- // Print and highlite a region of a line. Return the amount of highliting left // to do (i.e. highlite length minus length of line). -static int printline( ostream& os, const char *fname, int line, +static int printline( std::ostream& os, const char *fname, int line, const char *_sol, int skip, int len ) { // Display the entire tab-expanded line @@ -222,8 +222,8 @@ } //------------------------------print------------------------------------------ -//std::ostream& operator<< ( std::ostream& os, FileBuffRegion &br ) { -ostream& operator<< ( ostream& os, FileBuffRegion &br ) { +//std::std::ostream& operator<< ( std::std::ostream& os, FileBuffRegion &br ) { +std::ostream& operator<< ( std::ostream& os, FileBuffRegion &br ) { if( &br == NULL ) return os; // The empty buffer region FileBuffRegion *brp = &br; // Pointer to region while( brp ) { // While have chained regions @@ -238,8 +238,8 @@ // filename and line number to the left, and complete text lines to the right. // Selected portions (portions of a line actually in the FileBuffRegion are // underlined. Ellipses are used for long multi-line regions. -//void FileBuffRegion::print( std::ostream& os ) { -void FileBuffRegion::print( ostream& os ) { +//void FileBuffRegion::print( std::std::ostream& os ) { +void FileBuffRegion::print( std::ostream& os ) { if( !this ) return; // Nothing to print char *s = _bfr->get_line(); int skip = (int)(_offset - _sol); // Amount to skip to start of data --- ./Makefile.in.orig 2007-12-22 17:54:03.000000000 +0000 +++ ./Makefile.in 2007-12-22 17:54:19.000000000 +0000 @@ -240,7 +240,6 @@ patches/icedtea-graphics.patch \ patches/icedtea-antialias.patch \ patches/icedtea-paths.patch \ - patches/icedtea-debuginfo.patch \ patches/icedtea-ssl.patch \ patches/icedtea-license-headers.patch \ patches/icedtea-libpng.patch \