--- a/jdk/make/sun/Makefile	Wed Jun 24 14:49:31 2009 -0400
+++ b/jdk/make/sun/Makefile	Mon Jun 29 12:06:42 2009 -0400
@@ -58,11 +58,12 @@
 else
   RENDER_SUBDIR = dcpr
 endif
-SUBDIRS = jar security javazic misc jkernel net audio $(RENDER_SUBDIR) image \
-	  awt splashscreen $(XAWT_SUBDIR) \
+# nio need to be compiled before awt to have all charsets ready
+SUBDIRS = jar security javazic misc net audio $(RENDER_SUBDIR) image \
+	  nio awt splashscreen $(XAWT_SUBDIR) \
           $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
 	  font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
-	  jawt text nio launcher management $(ORG_SUBDIR) \
+	  jawt text launcher management $(ORG_SUBDIR) \
           native2ascii serialver tools jconsole tracing
 
 all build clean clobber::