Fix issues on solaris.
--- a/make/lib/Awt2dLibraries.gmk Fri Apr 20 22:35:59 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk Thu Apr 26 15:32:54 2018 +0200
@@ -67,6 +67,11 @@
LIBMLIB_IMAGE_V_CFLAGS := -xarch=sparcvis -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
$(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
+ LIBMLIB_IMAGE_V_CFLAGS += -DMLIB_OS64BIT
+ endif
+
+
BUILD_LIBMLIB_IMAGE_V_EXFILES := \
awt_ImagingLib.c \
mlib_c_ImageAffine_BC.c \
@@ -94,7 +99,7 @@
$(LIBMLIB_IMAGE_V_CFLAGS), \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
- LIBS := -ljava -ljvm $(BUILD_LIBMLIB_LDLIBS), \
+ LIBS := -ljava -ljvm $(LIBM) $(LIBDL), \
))
$(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java)
--- a/make/lib/Lib-jdk.crypto.ec.gmk Fri Apr 20 22:35:59 2018 +0200
+++ b/make/lib/Lib-jdk.crypto.ec.gmk Thu Apr 26 15:32:54 2018 +0200
@@ -31,8 +31,8 @@
# On sol-sparc...all libraries are compiled with -xregs=no%appl
# (set in CFLAGS_REQUIRED_sparc) except libsunec.so
ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
- BUILD_LIBSUNEC_CFLAGS_JDKLIB := $(filter-out xregs=no%appl, $(CFLAGS_JDKLIB))
- BUILD_LIBSUNEC_CXXFLAGS_JDKLIB := $(filter-out xregs=no%appl, $(CXXFLAGS_JDKLIB))
+ BUILD_LIBSUNEC_CFLAGS_JDKLIB := $(filter-out -xregs=no%appl, $(CFLAGS_JDKLIB))
+ BUILD_LIBSUNEC_CXXFLAGS_JDKLIB := $(filter-out -xregs=no%appl, $(CXXFLAGS_JDKLIB))
else
BUILD_LIBSUNEC_CFLAGS_JDKLIB := $(CFLAGS_JDKLIB)
BUILD_LIBSUNEC_CXXFLAGS_JDKLIB := $(CXXFLAGS_JDKLIB)