26 include LibCommon.gmk |
26 include LibCommon.gmk |
27 |
27 |
28 ################################################################################ |
28 ################################################################################ |
29 |
29 |
30 ifeq ($(ENABLE_INTREE_EC), true) |
30 ifeq ($(ENABLE_INTREE_EC), true) |
31 |
|
32 LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec |
|
33 BUILD_LIBSUNEC_FLAGS := $(addprefix -I, $(SUNEC_SRC)) |
|
34 |
|
35 # |
|
36 # On sol-sparc...all libraries are compiled with -xregs=no%appl |
31 # On sol-sparc...all libraries are compiled with -xregs=no%appl |
37 # (set in CFLAGS_REQUIRED_sparc) |
32 # (set in CFLAGS_REQUIRED_sparc) except libsunec.so |
38 # |
|
39 # except!!! libsunec.so |
|
40 # |
|
41 ECC_JNI_SOLSPARC_FILTER := |
|
42 ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc) |
33 ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc) |
43 ECC_JNI_SOLSPARC_FILTER := -xregs=no%appl |
34 BUILD_LIBSUNEC_CFLAGS_JDKLIB := $(filter-out xregs=no%appl, $(CFLAGS_JDKLIB)) |
|
35 BUILD_LIBSUNEC_CXXFLAGS_JDKLIB := $(filter-out xregs=no%appl, $(CXXFLAGS_JDKLIB)) |
|
36 else |
|
37 BUILD_LIBSUNEC_CFLAGS_JDKLIB := $(CFLAGS_JDKLIB) |
|
38 BUILD_LIBSUNEC_CXXFLAGS_JDKLIB := $(CXXFLAGS_JDKLIB) |
44 endif |
39 endif |
45 |
40 |
46 $(eval $(call SetupJdkLibrary, BUILD_LIBSUNEC, \ |
41 $(eval $(call SetupJdkLibrary, BUILD_LIBSUNEC, \ |
47 NAME := sunec, \ |
42 NAME := sunec, \ |
48 SRC := $(LIBSUNEC_SRC), \ |
|
49 TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
43 TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
50 OPTIMIZATION := LOW, \ |
44 OPTIMIZATION := LOW, \ |
51 CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \ |
45 CFLAGS := $(BUILD_LIBSUNEC_CFLAGS_JDKLIB) \ |
52 $(BUILD_LIBSUNEC_FLAGS) \ |
|
53 -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \ |
46 -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \ |
54 CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \ |
47 CXXFLAGS := $(BUILD_LIBSUNEC_CXXFLAGS_JDKLIB), \ |
55 $(BUILD_LIBSUNEC_FLAGS), \ |
|
56 DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough, \ |
48 DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough, \ |
57 DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \ |
49 DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \ |
58 LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \ |
50 LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \ |
59 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \ |
51 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \ |
60 LIBS := $(LIBCXX), \ |
52 LIBS := $(LIBCXX), \ |