--- old/make/CompileJavaClasses.gmk 2018-07-30 14:08:06.698736642 -0700 +++ new/make/CompileJavaClasses.gmk 2018-07-30 14:08:06.542736644 -0700 @@ -170,10 +170,6 @@ EXCLUDES += sun/applet endif -ifdef OPENJDK - EXCLUDES += sun/java2d/cmm/kcms -endif - # Used on windows and macosx ifeq (, $(filter $(OPENJDK_TARGET_OS), windows macosx)) EXFILES += sun/awt/AWTCharset.java --- old/make/CopyIntoClasses.gmk 2018-07-30 14:08:07.078736635 -0700 +++ new/make/CopyIntoClasses.gmk 2018-07-30 14:08:06.966736637 -0700 @@ -179,22 +179,12 @@ ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share) endif -ifndef OPENJDK - ALL_META-INF_DIRS += $(JDK_TOPDIR)/src/closed/share/classes/sun/java2d/cmm/kcms/META-INF -endif - SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS))) ifdef OPENJDK SRC_SERVICES_FILES := $(filter-out %sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine, $(SRC_SERVICES_FILES)) - SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES)) else SRC_SERVICES_FILES := $(filter-out %sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine, $(SRC_SERVICES_FILES)) - ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), linux-sparc) - SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES)) - else - SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES)) - endif endif # The number of services files are relatively few. If the increase in numbers, then --- old/make/lib/Awt2dLibraries.gmk 2018-07-30 14:08:07.398736630 -0700 +++ new/make/lib/Awt2dLibraries.gmk 2018-07-30 14:08:07.254736633 -0700 @@ -1089,59 +1089,6 @@ ########################################################################################## ifndef OPENJDK - - BUILD_LIBKCMS_EXCLUDE_FILES := - ifeq ($(OPENJDK_TARGET_OS), windows) - BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c - else - BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c - endif - - BUILD_LIBKCMS_FLAGS := $(CFLAGS_JDKLIB) - - ifeq ($(OPENJDK_TARGET_OS), solaris) - # This particular library uses a feature called PIC_CODE_SMALL (on solaris) - # implement it like this...since it's only used here - BUILD_LIBKCMS_FLAGS := $(patsubst -KPIC, -Kpic, $(BUILD_LIBKCMS_FLAGS)) - else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc) - BUILD_LIBKCMS_FLAGS := $(patsubst -fPIC, -fpic, $(BUILD_LIBKCMS_FLAGS)) - endif - - $(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \ - LIBRARY := kcms, \ - OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms, \ - LANG := C, \ - EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \ - OPTIMIZATION := LOW, \ - CFLAGS := $(BUILD_LIBKCMS_FLAGS) \ - -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \ - CFLAGS_linux := -Wno-missing-field-initializers, \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libkcms/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_linux := -lc -lpthread, \ - LDFLAGS_SUFFIX_solaris := -lc, \ - LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \ - LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=kcms.dll" \ - -D "JDK_INTERNAL_NAME=kcms" \ - -D "JDK_FTYPE=0x2L", \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkcms, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) - - $(BUILD_LIBKCMS): $(BUILD_LIBJAVA) - - BUILD_LIBRARIES += $(BUILD_LIBKCMS) - -endif - -########################################################################################## - -ifndef OPENJDK ifeq ($(OPENJDK_TARGET_OS), solaris) ifneq ($(OPENJDK_TARGET_CPU), x86_64) --- old/make/profile-includes.txt 2018-07-30 14:08:07.726736625 -0700 +++ new/make/profile-includes.txt 2018-07-30 14:08:07.590736627 -0700 @@ -321,7 +321,6 @@ jpeg \ jsound \ jsoundalsa \ - kcms \ mlib_image \ splashscreen \ t2k \ --- old/make/mapfiles/libkcms/mapfile-vers 2018-07-30 14:08:08.014736620 -0700 +++ /dev/null 2018-07-05 11:42:45.438466534 -0700 @@ -1,47 +0,0 @@ -# -# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# Define public interface. - -SUNWprivate_1.1 { - global: - Java_sun_java2d_cmm_kcms_CMM_cmmGetTagSize; - Java_sun_java2d_cmm_kcms_CMM_cmmGetNumComponents; - Java_sun_java2d_cmm_kcms_CMM_cmmColorConvert; - Java_sun_java2d_cmm_kcms_CMM_cmmInit; - Java_sun_java2d_cmm_kcms_CMM_cmmCombineTransforms; - Java_sun_java2d_cmm_kcms_CMM_cmmGetTagData; - Java_sun_java2d_cmm_kcms_CMM_cmmSetTagData; - Java_sun_java2d_cmm_kcms_CMM_cmmGetProfileData; - Java_sun_java2d_cmm_kcms_CMM_cmmFreeProfile; - Java_sun_java2d_cmm_kcms_CMM_cmmTerminate; - Java_sun_java2d_cmm_kcms_CMM_cmmLoadProfile; - Java_sun_java2d_cmm_kcms_CMM_cmmGetTransform; - Java_sun_java2d_cmm_kcms_CMM_cmmFreeTransform; - Java_sun_java2d_cmm_kcms_CMM_cmmGetProfileSize; - - local: - *; -};