common/makefiles/NativeCompilation.gmk

changeset 533
e175ecff1391
parent 494
e64f2cb57d05
child 557
d2c1f80118de
equal deleted inserted replaced
532:2795874efd16 533:e175ecff1391
300 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_release) 300 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_release)
301 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release) 301 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
302 endif 302 endif
303 303
304 ifneq (,$$($1_DEBUG_SYMBOLS)) 304 ifneq (,$$($1_DEBUG_SYMBOLS))
305 ifeq ($(ENABLE_DEBUG_SYMBOLS), yes) 305 ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
306 # Programs don't get the debug symbols added in the old build. It's not clear if 306 # Programs don't get the debug symbols added in the old build. It's not clear if
307 # this is intentional. 307 # this is intentional.
308 ifeq ($$($1_PROGRAM),) 308 ifeq ($$($1_PROGRAM),)
309 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS) 309 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
310 $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS) 310 $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
392 ifeq ($(OPENJDK_TARGET_OS), windows) 392 ifeq ($(OPENJDK_TARGET_OS), windows)
393 $1_EXTRA_LDFLAGS+="-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib" 393 $1_EXTRA_LDFLAGS+="-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib"
394 endif 394 endif
395 395
396 ifneq (,$$($1_DEBUG_SYMBOLS)) 396 ifneq (,$$($1_DEBUG_SYMBOLS))
397 ifeq ($(ENABLE_DEBUG_SYMBOLS), yes) 397 ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
398 ifeq ($(OPENJDK_TARGET_OS), windows) 398 ifeq ($(OPENJDK_TARGET_OS), windows)
399 $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_LIBRARY).pdb" \ 399 $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_LIBRARY).pdb" \
400 "-map:$$($1_OBJECT_DIR)/$$($1_LIBRARY).map" 400 "-map:$$($1_OBJECT_DIR)/$$($1_LIBRARY).map"
401 endif 401 endif
402 402
427 $(OBJCOPY) --only-keep-debug $$< $$@ 427 $(OBJCOPY) --only-keep-debug $$< $$@
428 $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< 428 $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
429 endif # Touch to not retrigger rule on rebuild 429 endif # Touch to not retrigger rule on rebuild
430 $(TOUCH) $$@ 430 $(TOUCH) $$@
431 431
432 ifeq ($(ZIP_DEBUGINFO_FILES), 1) 432 ifeq ($(ZIP_DEBUGINFO_FILES), true)
433 $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz 433 $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
434 434
435 ifeq ($(OPENJDK_TARGET_OS), windows) 435 ifeq ($(OPENJDK_TARGET_OS), windows)
436 $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) 436 $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET)
437 $(CD) $$($1_OBJECT_DIR) \ 437 $(CD) $$($1_OBJECT_DIR) \
470 endif 470 endif
471 471
472 ifneq (,$$($1_PROGRAM)) 472 ifneq (,$$($1_PROGRAM))
473 # A executable binary has been specified, setup the target for it. 473 # A executable binary has been specified, setup the target for it.
474 ifneq (,$$($1_DEBUG_SYMBOLS)) 474 ifneq (,$$($1_DEBUG_SYMBOLS))
475 ifeq ($(ENABLE_DEBUG_SYMBOLS), yes) 475 ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
476 ifeq ($(OPENJDK_TARGET_OS), windows) 476 ifeq ($(OPENJDK_TARGET_OS), windows)
477 $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_PROGRAM).pdb" \ 477 $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_PROGRAM).pdb" \
478 "-map:$$($1_OBJECT_DIR)/$$($1_PROGRAM).map" 478 "-map:$$($1_OBJECT_DIR)/$$($1_PROGRAM).map"
479 endif 479 endif
480 480
505 $(OBJCOPY) --only-keep-debug $$< $$@ 505 $(OBJCOPY) --only-keep-debug $$< $$@
506 $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< 506 $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
507 endif 507 endif
508 $(TOUCH) $$@ 508 $(TOUCH) $$@
509 509
510 ifeq ($(ZIP_DEBUGINFO_FILES), 1) 510 ifeq ($(ZIP_DEBUGINFO_FILES), true)
511 $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz 511 $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
512 512
513 ifeq ($(OPENJDK_TARGET_OS), windows) 513 ifeq ($(OPENJDK_TARGET_OS), windows)
514 $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET) 514 $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET)
515 $(CD) $$($1_OBJECT_DIR) \ 515 $(CD) $$($1_OBJECT_DIR) \

mercurial