equal
deleted
inserted
replaced
27 |
27 |
28 ################################################################################ |
28 ################################################################################ |
29 |
29 |
30 ifeq ($(ENABLE_INTREE_EC), true) |
30 ifeq ($(ENABLE_INTREE_EC), true) |
31 |
31 |
32 LIBSUNEC_SRC := $(JDK_TOPDIR)/src/jdk.crypto.ec/share/native/libsunec |
32 LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec |
33 BUILD_LIBSUNEC_FLAGS := $(addprefix -I, $(SUNEC_SRC)) |
33 BUILD_LIBSUNEC_FLAGS := $(addprefix -I, $(SUNEC_SRC)) |
34 |
34 |
35 # |
35 # |
36 # On sol-sparc...all libraries are compiled with -xregs=no%appl |
36 # On sol-sparc...all libraries are compiled with -xregs=no%appl |
37 # (set in CFLAGS_REQUIRED_sparc) |
37 # (set in CFLAGS_REQUIRED_sparc) |
54 -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \ |
54 -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \ |
55 CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \ |
55 CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \ |
56 $(BUILD_LIBSUNEC_FLAGS), \ |
56 $(BUILD_LIBSUNEC_FLAGS), \ |
57 DISABLED_WARNINGS_gcc := sign-compare, \ |
57 DISABLED_WARNINGS_gcc := sign-compare, \ |
58 DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \ |
58 DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \ |
59 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \ |
59 MAPFILE := $(TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \ |
60 LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \ |
60 LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \ |
61 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \ |
61 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \ |
62 LIBS := $(LIBCXX), \ |
62 LIBS := $(LIBCXX), \ |
63 LIBS_linux := -lc, \ |
63 LIBS_linux := -lc, \ |
64 LIBS_solaris := -lc, \ |
64 LIBS_solaris := -lc, \ |