equal
deleted
inserted
replaced
53 CFLAGS_aix := -qfloat=nomaf, \ |
53 CFLAGS_aix := -qfloat=nomaf, \ |
54 DISABLED_WARNINGS_gcc := sign-compare, \ |
54 DISABLED_WARNINGS_gcc := sign-compare, \ |
55 DISABLED_WARNINGS_microsoft := 4146 4244 4018, \ |
55 DISABLED_WARNINGS_microsoft := 4146 4244 4018, \ |
56 ARFLAGS := $(ARFLAGS), \ |
56 ARFLAGS := $(ARFLAGS), \ |
57 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
57 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
58 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
58 )) |
59 |
59 |
60 else |
60 else |
61 |
61 |
62 # On macosx the old build does partial (incremental) linking of fdlibm instead of |
62 # On macosx the old build does partial (incremental) linking of fdlibm instead of |
63 # a plain static library. |
63 # a plain static library. |
66 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
66 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
67 SRC := $(LIBFDLIBM_SRC), \ |
67 SRC := $(LIBFDLIBM_SRC), \ |
68 CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ |
68 CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ |
69 LDFLAGS := -nostdlib -r -arch x86_64, \ |
69 LDFLAGS := -nostdlib -r -arch x86_64, \ |
70 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
70 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
71 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
71 )) |
72 |
72 |
73 BUILD_LIBFDLIBM := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) |
73 BUILD_LIBFDLIBM := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) |
74 $(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC) |
74 $(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC) |
75 $(call install-file) |
75 $(call install-file) |
76 |
76 |
84 endif |
84 endif |
85 endif |
85 endif |
86 |
86 |
87 LIBVERIFY_OPTIMIZATION := HIGH |
87 LIBVERIFY_OPTIMIZATION := HIGH |
88 ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), ) |
88 ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), ) |
89 ifeq ($(ENABLE_DEBUG_SYMBOLS), true) |
89 ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true) |
90 LIBVERIFY_OPTIMIZATION := LOW |
90 LIBVERIFY_OPTIMIZATION := LOW |
91 endif |
91 endif |
92 endif |
92 endif |
93 |
93 |
94 $(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \ |
94 $(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \ |
108 -D "JDK_FNAME=verify.dll" \ |
108 -D "JDK_FNAME=verify.dll" \ |
109 -D "JDK_INTERNAL_NAME=verify" \ |
109 -D "JDK_INTERNAL_NAME=verify" \ |
110 -D "JDK_FTYPE=0x2L", \ |
110 -D "JDK_FTYPE=0x2L", \ |
111 REORDER := $(BUILD_LIBVERIFY_REORDER), \ |
111 REORDER := $(BUILD_LIBVERIFY_REORDER), \ |
112 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify, \ |
112 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify, \ |
113 DEBUG_SYMBOLS := true)) |
113 )) |
114 |
114 |
115 TARGETS += $(BUILD_LIBVERIFY) |
115 TARGETS += $(BUILD_LIBVERIFY) |
116 |
116 |
117 ########################################################################################## |
117 ########################################################################################## |
118 |
118 |
176 -D "JDK_FNAME=java.dll" \ |
176 -D "JDK_FNAME=java.dll" \ |
177 -D "JDK_INTERNAL_NAME=java" \ |
177 -D "JDK_INTERNAL_NAME=java" \ |
178 -D "JDK_FTYPE=0x2L", \ |
178 -D "JDK_FTYPE=0x2L", \ |
179 REORDER := $(LIBJAVA_REORDER), \ |
179 REORDER := $(LIBJAVA_REORDER), \ |
180 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava, \ |
180 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava, \ |
181 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
181 )) |
182 |
182 |
183 TARGETS += $(BUILD_LIBJAVA) |
183 TARGETS += $(BUILD_LIBJAVA) |
184 |
184 |
185 $(BUILD_LIBJAVA): $(BUILD_LIBVERIFY) |
185 $(BUILD_LIBJAVA): $(BUILD_LIBVERIFY) |
186 |
186 |
233 RC_FLAGS := $(RC_FLAGS) \ |
233 RC_FLAGS := $(RC_FLAGS) \ |
234 -D "JDK_FNAME=zip.dll" \ |
234 -D "JDK_FNAME=zip.dll" \ |
235 -D "JDK_INTERNAL_NAME=zip" \ |
235 -D "JDK_INTERNAL_NAME=zip" \ |
236 -D "JDK_FTYPE=0x2L", \ |
236 -D "JDK_FTYPE=0x2L", \ |
237 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libzip, \ |
237 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libzip, \ |
238 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
238 )) |
239 |
|
240 |
239 |
241 $(BUILD_LIBZIP): $(BUILD_LIBJAVA) |
240 $(BUILD_LIBZIP): $(BUILD_LIBJAVA) |
242 |
241 |
243 TARGETS += $(BUILD_LIBZIP) |
242 TARGETS += $(BUILD_LIBZIP) |
244 |
243 |
278 RC_FLAGS := $(RC_FLAGS) \ |
277 RC_FLAGS := $(RC_FLAGS) \ |
279 -D "JDK_FNAME=jimage.dll" \ |
278 -D "JDK_FNAME=jimage.dll" \ |
280 -D "JDK_INTERNAL_NAME=jimage" \ |
279 -D "JDK_INTERNAL_NAME=jimage" \ |
281 -D "JDK_FTYPE=0x2L", \ |
280 -D "JDK_FTYPE=0x2L", \ |
282 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjimage, \ |
281 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjimage, \ |
283 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
282 )) |
284 |
283 |
285 $(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA) |
284 $(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA) |
286 |
285 |
287 TARGETS += $(BUILD_LIBJIMAGE) |
286 TARGETS += $(BUILD_LIBJIMAGE) |
288 |
287 |
394 RC_FLAGS := $(RC_FLAGS) \ |
393 RC_FLAGS := $(RC_FLAGS) \ |
395 -D "JDK_FNAME=jli.dll" \ |
394 -D "JDK_FNAME=jli.dll" \ |
396 -D "JDK_INTERNAL_NAME=jli" \ |
395 -D "JDK_INTERNAL_NAME=jli" \ |
397 -D "JDK_FTYPE=0x2L", \ |
396 -D "JDK_FTYPE=0x2L", \ |
398 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli, \ |
397 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli, \ |
399 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
398 )) |
400 |
399 |
401 TARGETS += $(BUILD_LIBJLI) |
400 TARGETS += $(BUILD_LIBJLI) |
402 |
401 |
403 # On windows, the static library has the same suffix as the import library created by |
402 # On windows, the static library has the same suffix as the import library created by |
404 # with the shared library, so the static library is given a different name. No harm |
403 # with the shared library, so the static library is given a different name. No harm |
412 EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
411 EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
413 OPTIMIZATION := HIGH, \ |
412 OPTIMIZATION := HIGH, \ |
414 CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \ |
413 CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \ |
415 ARFLAGS := $(ARFLAGS), \ |
414 ARFLAGS := $(ARFLAGS), \ |
416 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ |
415 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ |
417 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
416 )) |
418 |
417 |
419 TARGETS += $(BUILD_LIBJLI_STATIC) |
418 TARGETS += $(BUILD_LIBJLI_STATIC) |
420 |
419 |
421 else ifeq ($(OPENJDK_TARGET_OS), macosx) |
420 else ifeq ($(OPENJDK_TARGET_OS), macosx) |
422 # |
421 # |
431 EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
430 EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
432 OPTIMIZATION := HIGH, \ |
431 OPTIMIZATION := HIGH, \ |
433 CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \ |
432 CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \ |
434 LDFLAGS := -nostdlib -r, \ |
433 LDFLAGS := -nostdlib -r, \ |
435 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ |
434 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ |
436 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
435 )) |
437 |
436 |
438 ifeq ($(STATIC_BUILD), true) |
437 ifeq ($(STATIC_BUILD), true) |
439 TARGETS += $(BUILD_LIBJLI_STATIC) |
438 TARGETS += $(BUILD_LIBJLI_STATIC) |
440 else |
439 else |
441 $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a: $(BUILD_LIBJLI_STATIC) |
440 $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a: $(BUILD_LIBJLI_STATIC) |