equal
deleted
inserted
replaced
33 # libfdlibm is statically linked with libjava below and not delivered into the |
33 # libfdlibm is statically linked with libjava below and not delivered into the |
34 # product on its own. |
34 # product on its own. |
35 |
35 |
36 BUILD_LIBFDLIBM_OPTIMIZATION := NONE |
36 BUILD_LIBFDLIBM_OPTIMIZATION := NONE |
37 |
37 |
38 ifeq ($(OPENJDK_TARGET_OS), solaris) |
38 ifeq ($(call isTargetOs, solaris), true) |
39 BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
39 BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
40 endif |
40 endif |
41 |
41 |
42 # If FDLIBM_CFLAGS is non-empty we know that we can optimize |
42 # If FDLIBM_CFLAGS is non-empty we know that we can optimize |
43 # fdlibm when adding those extra C flags. Currently GCC, |
43 # fdlibm when adding those extra C flags. Currently GCC, |
66 )) |
66 )) |
67 |
67 |
68 ########################################################################################## |
68 ########################################################################################## |
69 |
69 |
70 LIBVERIFY_OPTIMIZATION := HIGH |
70 LIBVERIFY_OPTIMIZATION := HIGH |
71 ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), ) |
71 ifeq ($(call isTargetOs, solaris linux), true) |
72 ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true) |
72 ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true) |
73 LIBVERIFY_OPTIMIZATION := LOW |
73 LIBVERIFY_OPTIMIZATION := LOW |
74 endif |
74 endif |
75 endif |
75 endif |
76 |
76 |
90 |
90 |
91 ########################################################################################## |
91 ########################################################################################## |
92 |
92 |
93 LIBJAVA_CFLAGS := -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' |
93 LIBJAVA_CFLAGS := -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' |
94 |
94 |
95 ifeq ($(OPENJDK_TARGET_OS), macosx) |
95 ifeq ($(call isTargetOs, macosx), true) |
96 BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c |
96 BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c |
97 BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c |
97 BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c |
98 endif |
98 endif |
99 |
99 |
100 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \ |
100 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \ |
179 |
179 |
180 TARGETS += $(BUILD_LIBJIMAGE) |
180 TARGETS += $(BUILD_LIBJIMAGE) |
181 |
181 |
182 ########################################################################################## |
182 ########################################################################################## |
183 |
183 |
184 ifeq ($(OPENJDK_TARGET_OS), macosx) |
184 ifeq ($(call isTargetOs, macosx), true) |
185 LIBJLI_EXCLUDE_FILES += java_md_solinux.c |
185 LIBJLI_EXCLUDE_FILES += java_md_solinux.c |
186 endif |
186 endif |
187 |
187 |
188 ifeq ($(OPENJDK_TARGET_OS), windows) |
188 ifeq ($(call isTargetOs, windows), true) |
189 # Supply the name of the C runtime lib. |
189 # Supply the name of the C runtime lib. |
190 LIBJLI_CFLAGS += -DMSVCR_DLL_NAME='"$(notdir $(MSVCR_DLL))"' |
190 LIBJLI_CFLAGS += -DMSVCR_DLL_NAME='"$(notdir $(MSVCR_DLL))"' |
191 ifneq ($(MSVCP_DLL), ) |
191 ifneq ($(MSVCP_DLL), ) |
192 LIBJLI_CFLAGS += -DMSVCP_DLL_NAME='"$(notdir $(MSVCP_DLL))"' |
192 LIBJLI_CFLAGS += -DMSVCP_DLL_NAME='"$(notdir $(MSVCP_DLL))"' |
193 endif |
193 endif |
231 |
231 |
232 TARGETS += $(BUILD_LIBJLI) |
232 TARGETS += $(BUILD_LIBJLI) |
233 |
233 |
234 LIBJLI_SRC_DIRS := $(call FindSrcDirsForComponent, java.base, libjli) |
234 LIBJLI_SRC_DIRS := $(call FindSrcDirsForComponent, java.base, libjli) |
235 |
235 |
236 ifeq ($(OPENJDK_TARGET_OS), aix) |
236 ifeq ($(call isTargetOs, aix), true) |
237 # AIX also requires a static libjli because the compiler doesn't support '-rpath' |
237 # AIX also requires a static libjli because the compiler doesn't support '-rpath' |
238 $(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \ |
238 $(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \ |
239 NAME := jli_static, \ |
239 NAME := jli_static, \ |
240 TYPE := STATIC_LIBRARY, \ |
240 TYPE := STATIC_LIBRARY, \ |
241 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ |
241 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ |