diff -r 153791a0895c -r 93645a7dac66 jdk/makefiles/CompileNativeLibraries.gmk
--- a/jdk/makefiles/CompileNativeLibraries.gmk	Mon Jul 01 12:39:26 2013 -0700
+++ b/jdk/makefiles/CompileNativeLibraries.gmk	Tue Jul 02 14:25:56 2013 -0700
@@ -1327,11 +1327,12 @@
     BUILD_LIBFONTMANAGER_FONTLIB:=$(FREETYPE2_LIBS)
 endif
 
-LIBFONTMANAGER_OPTIMIZATION:=HIGHEST
+LIBFONTMANAGER_OPTIMIZATION:=HIGH
 
 ifeq ($(OPENJDK_TARGET_OS),windows)
     LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
 				    X11TextRenderer.c
+LIBFONTMANAGER_OPTIMIZATION:=HIGHEST
 else
     LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
 				    lcdglyph.c