From b63fce38344d587f716e6b042cf4b8347902b715 Mon Sep 17 00:00:00 2001
From: prr <unknown>
Date: Tue, 2 Jul 2013 14:25:56 -0700
Subject: [PATCH] 8019692: JDK build CC_OPT_HIGHEST setting isn't valid for Sun
 C++ compiler Reviewed-by: jgodinez

---
 make/sun/font/Makefile               | 4 ++++
 makefiles/CompileNativeLibraries.gmk | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/make/sun/font/Makefile b/make/sun/font/Makefile
index 49497661e..fd8c8a2c4 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 0dd803cb4..02bf3be80 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
-- 
GitLab