diff --git a/make/sun/font/Makefile b/make/sun/font/Makefile
index 49497661ee479dc9f3a9c2acf3424f7fd9866de8..fd8c8a2c44840f5eb270dd823d927b0156f32765 100644
--- a/make/sun/font/Makefile
+++ b/make/sun/font/Makefile
@@ -36,7 +36,11 @@ PRODUCT = sun
 CPLUSPLUSLIBRARY=true
 
 # Use higher optimization level
+ifeq ($(PLATFORM), windows)
 OPTIMIZATION_LEVEL = HIGHEST
+else
+OPTIMIZATION_LEVEL = HIGHER
+endif
 
 include $(BUILDDIR)/common/Defs.gmk
 
diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibraries.gmk
index 0dd803cb4d8016b7a0541aeac722600fbc6f1d06..02bf3be808c5cc68d788be3c8051536c5f10f388 100644
--- a/makefiles/CompileNativeLibraries.gmk
+++ b/makefiles/CompileNativeLibraries.gmk
@@ -1327,11 +1327,12 @@ else
     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