diff -r ea7576f76b3a -r 153791a0895c jdk/makefiles/CompileNativeLibraries.gmk
--- a/jdk/makefiles/CompileNativeLibraries.gmk	Fri Jun 28 19:37:48 2013 -0700
+++ b/jdk/makefiles/CompileNativeLibraries.gmk	Mon Jul 01 12:39:26 2013 -0700
@@ -1327,12 +1327,11 @@
     BUILD_LIBFONTMANAGER_FONTLIB:=$(FREETYPE2_LIBS)
 endif
 
-LIBFONTMANAGER_OPTIMIZATION:=HIGH
+LIBFONTMANAGER_OPTIMIZATION:=HIGHEST
 
 ifeq ($(OPENJDK_TARGET_OS),windows)
     LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
 				    X11TextRenderer.c
-    LIBFONTMANAGER_OPTIMIZATION:=LOW
 else
     LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
 				    lcdglyph.c