Merge

6fb95220 · katleman · 7d56c742 · 5720054b · 6fb95220 · 6fb95220
11 changed file
--- a/makefiles/CompileLaunchers.gmk
+++ b/makefiles/CompileLaunchers.gmk
@@ -574,9 +574,7 @@ ifeq ($(OPENJDK_TARGET_OS), linux)
  BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
 endif
 ifeq ($(OPENJDK_TARGET_OS), solaris)
-  ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
-    BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
-  endif
+  BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
 endif

 # TODO:

--- a/makefiles/CompileNativeLibraries.gmk
+++ b/makefiles/CompileNativeLibraries.gmk
--- a/makefiles/CopyIntoClasses.gmk
+++ b/makefiles/CopyIntoClasses.gmk
@@ -91,7 +91,7 @@ ifndef OPENJDK
      $(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png
 endif

-ifndef OPENJDK
+ifeq ($(ENABLE_JFR), true)
  JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
  COPY_FILES += \
      $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd

--- a/makefiles/lib/Awt2dLibraries.gmk
+++ b/makefiles/lib/Awt2dLibraries.gmk
--- a/makefiles/lib/CoreLibraries.gmk
+++ b/makefiles/lib/CoreLibraries.gmk
--- a/makefiles/lib/NetworkingLibraries.gmk
+++ b/makefiles/lib/NetworkingLibraries.gmk
--- a/makefiles/lib/NioLibraries.gmk
+++ b/makefiles/lib/NioLibraries.gmk
--- a/makefiles/lib/PlatformLibraries.gmk
+++ b/makefiles/lib/PlatformLibraries.gmk
--- a/makefiles/lib/SecurityLibraries.gmk
+++ b/makefiles/lib/SecurityLibraries.gmk
--- a/makefiles/lib/ServiceabilityLibraries.gmk
+++ b/makefiles/lib/ServiceabilityLibraries.gmk
--- a/makefiles/lib/SoundLibraries.gmk
+++ b/makefiles/lib/SoundLibraries.gmk