comparison make/bsd/makefiles/gcc.make @ 13086:096c224171c4

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 20 Nov 2013 00:10:38 +0100
parents 8ba058ffbc2e f509b8f4699b
children f97c5ec83832
comparison
equal deleted inserted replaced
12782:92b7ec34ddfa 13086:096c224171c4
81 endif 81 endif
82 82
83 AS = $(CC) -c 83 AS = $(CC) -c
84 endif 84 endif
85 85
86 ifeq ($(OS_VENDOR), Darwin)
87 ifeq ($(DSYMUTIL),)
88 DSYMUTIL=dsymutil
89 endif
90 endif
86 91
87 ifeq ($(USE_CLANG), true) 92 ifeq ($(USE_CLANG), true)
88 CC_VER_MAJOR := $(shell $(CC) -v 2>&1 | grep version | sed "s/.*version \([0-9]*\.[0-9]*\).*/\1/" | cut -d'.' -f1) 93 CC_VER_MAJOR := $(shell $(CC) -v 2>&1 | grep version | sed "s/.*version \([0-9]*\.[0-9]*\).*/\1/" | cut -d'.' -f1)
89 CC_VER_MINOR := $(shell $(CC) -v 2>&1 | grep version | sed "s/.*version \([0-9]*\.[0-9]*\).*/\1/" | cut -d'.' -f2) 94 CC_VER_MINOR := $(shell $(CC) -v 2>&1 | grep version | sed "s/.*version \([0-9]*\.[0-9]*\).*/\1/" | cut -d'.' -f2)
90 else 95 else
448 DEBUG_CFLAGS/ppc = -g 453 DEBUG_CFLAGS/ppc = -g
449 DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) 454 DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH))
450 ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) 455 ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
451 DEBUG_CFLAGS += -gstabs 456 DEBUG_CFLAGS += -gstabs
452 endif 457 endif
458
459 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
460 FASTDEBUG_CFLAGS/ia64 = -g
461 FASTDEBUG_CFLAGS/amd64 = -g
462 FASTDEBUG_CFLAGS/arm = -g
463 FASTDEBUG_CFLAGS/ppc = -g
464 FASTDEBUG_CFLAGS += $(FASTDEBUG_CFLAGS/$(BUILDARCH))
465 ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),)
466 ifeq ($(USE_CLANG), true)
467 # Clang doesn't understand -gstabs
468 FASTDEBUG_CFLAGS += -g
469 else
470 FASTDEBUG_CFLAGS += -gstabs
471 endif
472 endif
473
474 OPT_CFLAGS/ia64 = -g
475 OPT_CFLAGS/amd64 = -g
476 OPT_CFLAGS/arm = -g
477 OPT_CFLAGS/ppc = -g
478 OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH))
479 ifeq ($(OPT_CFLAGS/$(BUILDARCH)),)
480 ifeq ($(USE_CLANG), true)
481 # Clang doesn't understand -gstabs
482 OPT_CFLAGS += -g
483 else
484 OPT_CFLAGS += -gstabs
485 endif
486 endif
487 endif
453 endif 488 endif
454 489
455 # If we are building HEADLESS, pass on to VM 490 # If we are building HEADLESS, pass on to VM
456 # so it can set the java.awt.headless property 491 # so it can set the java.awt.headless property
457 ifdef HEADLESS 492 ifdef HEADLESS