186 # executed multiple times. We reduce the noise by at least checking that |
186 # executed multiple times. We reduce the noise by at least checking that |
187 # BUILD_FLAVOR has been set. |
187 # BUILD_FLAVOR has been set. |
188 ifneq ($(BUILD_FLAVOR),) |
188 ifneq ($(BUILD_FLAVOR),) |
189 # FULL_DEBUG_SYMBOLS not created for individual static libraries |
189 # FULL_DEBUG_SYMBOLS not created for individual static libraries |
190 ifeq ($(STATIC_BUILD),false) |
190 ifeq ($(STATIC_BUILD),false) |
191 ifeq ($(BUILD_FLAVOR), product) |
191 ifeq ($(BUILD_FLAVOR), product) |
192 FULL_DEBUG_SYMBOLS ?= 1 |
192 FULL_DEBUG_SYMBOLS ?= 1 |
193 ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) |
193 ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) |
194 else |
194 else |
195 # debug variants always get Full Debug Symbols (if available) |
195 # debug variants always get Full Debug Symbols (if available) |
196 ENABLE_FULL_DEBUG_SYMBOLS = 1 |
196 ENABLE_FULL_DEBUG_SYMBOLS = 1 |
197 endif |
197 endif |
198 endif |
198 endif |
199 $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) |
199 $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) |
200 # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later |
200 # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later |
201 |
201 |
202 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
202 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
258 |
258 |
259 JDK_INCLUDE_SUBDIR=bsd |
259 JDK_INCLUDE_SUBDIR=bsd |
260 |
260 |
261 # Library suffix |
261 # Library suffix |
262 ifneq ($(STATIC_BUILD),true) |
262 ifneq ($(STATIC_BUILD),true) |
263 ifeq ($(OS_VENDOR),Darwin) |
263 ifeq ($(OS_VENDOR),Darwin) |
264 LIBRARY_SUFFIX=dylib |
264 LIBRARY_SUFFIX=dylib |
265 else |
265 else |
266 LIBRARY_SUFFIX=so |
266 LIBRARY_SUFFIX=so |
267 endif |
267 endif |
268 else |
268 else |
269 LIBRARY_SUFFIX=a |
269 LIBRARY_SUFFIX=a |
270 endif |
270 endif |
271 |
271 |
272 |
272 |
273 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html |
273 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html |
274 |
274 |
275 # jsig library not needed for static builds |
275 # jsig library not needed for static builds |
276 ifneq ($(STATIC_BUILD),true) |
276 ifneq ($(STATIC_BUILD),true) |
277 # client and server subdirectories have symbolic links to ../libjsig.so |
277 # client and server subdirectories have symbolic links to ../libjsig.so |
278 EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) |
278 EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) |
279 endif |
279 endif |
280 |
280 |
281 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
281 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
282 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
282 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
283 EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.diz |
283 EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.diz |
340 ifeq ($(STATIC_BUILD),true) |
340 ifeq ($(STATIC_BUILD),true) |
341 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.symbols |
341 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.symbols |
342 endif |
342 endif |
343 endif |
343 endif |
344 |
344 |
345 # Serviceability Binaries |
|
346 # No SA Support for PPC, IA64, ARM or zero |
|
347 ADD_SA_BINARIES/x86 = $(EXPORT_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ |
|
348 $(EXPORT_LIB_DIR)/sa-jdi.jar |
|
349 |
|
350 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
|
351 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
|
352 ADD_SA_BINARIES/x86 += $(EXPORT_LIB_ARCH_DIR)/libsaproc.diz |
|
353 else |
|
354 ifeq ($(OS_VENDOR), Darwin) |
|
355 ADD_SA_BINARIES/x86 += $(EXPORT_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM |
|
356 else |
|
357 ADD_SA_BINARIES/x86 += $(EXPORT_LIB_ARCH_DIR)/libsaproc.debuginfo |
|
358 endif |
|
359 endif |
|
360 endif |
|
361 |
|
362 ADD_SA_BINARIES/sparc = $(EXPORT_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ |
|
363 $(EXPORT_LIB_DIR)/sa-jdi.jar |
|
364 ADD_SA_BINARIES/universal = $(EXPORT_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ |
|
365 $(EXPORT_LIB_DIR)/sa-jdi.jar |
|
366 |
|
367 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
|
368 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
|
369 ADD_SA_BINARIES/universal += $(EXPORT_LIB_ARCH_DIR)/libsaproc.diz |
|
370 else |
|
371 ifeq ($(OS_VENDOR), Darwin) |
|
372 ADD_SA_BINARIES/universal += $(EXPORT_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM |
|
373 else |
|
374 ADD_SA_BINARIES/universal += $(EXPORT_LIB_ARCH_DIR)/libsaproc.debuginfo |
|
375 endif |
|
376 endif |
|
377 endif |
|
378 |
|
379 ADD_SA_BINARIES/ppc = |
|
380 ADD_SA_BINARIES/ia64 = |
|
381 ADD_SA_BINARIES/arm = |
|
382 ADD_SA_BINARIES/zero = |
|
383 |
|
384 EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH)) |
|
385 |
|
386 # Universal build settings |
345 # Universal build settings |
387 ifeq ($(OS_VENDOR), Darwin) |
346 ifeq ($(OS_VENDOR), Darwin) |
388 # Build universal binaries by default on Mac OS X |
347 # Build universal binaries by default on Mac OS X |
389 MACOSX_UNIVERSAL = true |
348 MACOSX_UNIVERSAL = true |
390 ifneq ($(ALT_MACOSX_UNIVERSAL),) |
349 ifneq ($(ALT_MACOSX_UNIVERSAL),) |
407 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR) |
366 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR) |
408 endif |
367 endif |
409 |
368 |
410 # Binaries to 'universalize' if built |
369 # Binaries to 'universalize' if built |
411 ifneq ($(STATIC_BUILD),true) |
370 ifneq ($(STATIC_BUILD),true) |
412 UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX) |
371 UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX) |
413 endif |
372 endif |
414 UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX) |
|
415 UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX) |
373 UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX) |
416 UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX) |
374 UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX) |
417 |
375 |
418 # Files to simply copy in place |
376 # Files to simply copy in place |
419 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/Xusage.txt |
377 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/Xusage.txt |
428 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
386 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
429 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
387 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
430 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.diz |
388 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.diz |
431 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.diz |
389 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.diz |
432 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.diz |
390 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.diz |
433 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libsaproc.diz |
|
434 else |
391 else |
435 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX).dSYM |
392 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX).dSYM |
436 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX).dSYM |
393 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX).dSYM |
437 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM |
394 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM |
438 UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM |
|
439 endif |
395 endif |
440 endif |
396 endif |
441 |
397 |
442 endif |
398 endif |
443 endif |
399 endif |