archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7188168: 7071904 broke the DEBUG_BINARIES option on Linux

Browse source 
Change DEBUG_BINARIES option logic to be more clear.

Reviewed-by: fparain, andrew
This commit is contained in:
Daniel D. Daugherty 2012-08-02 14:54:14 -07:00
parent 38a6055c37
commit 4a848cf3e5
2 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hotspot/make/linux/makefiles/adlc.make
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -133,8 +133,10 @@ $(GENERATEDFILES): refresh_adfiles
# Note that product files are updated via "mv", which is atomic. # Note that product files are updated via "mv", which is atomic.
TEMPDIR := $(OUTDIR)/mktmp$(shell echo $$$$) TEMPDIR := $(OUTDIR)/mktmp$(shell echo $$$$)
# Debuggable by default ifneq ($(DEBUG_BINARIES), true)
CFLAGS += -g # Debuggable by default (unless already done by DEBUG_BINARIES)
CFLAGS += -g
endif
# Pass -D flags into ADLC. # Pass -D flags into ADLC.
ADLCFLAGS += $(SYSDEFS) ADLCFLAGS += $(SYSDEFS)

41
hotspot/make/linux/makefiles/gcc.make
View file

@ -215,22 +215,26 @@ AOUT_FLAGS += -Xlinker -export-dynamic
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# Debug flags # Debug flags
# Use the stabs format for debugging information (this is the default # DEBUG_BINARIES uses full -g debug information for all configs
# on gcc-2.91). It's good enough, has all the information about line ifeq ($(DEBUG_BINARIES), true)
# numbers and local variables, and libjvm_g.so is only about 16M. CFLAGS += -g
# Change this back to "-g" if you want the most expressive format. else
# (warning: that could easily inflate libjvm_g.so to 150M!) # Use the stabs format for debugging information (this is the default
# Note: The Itanium gcc compiler crashes when using -gstabs. # on gcc-2.91). It's good enough, has all the information about line
DEBUG_CFLAGS/ia64 = -g # numbers and local variables, and libjvm_g.so is only about 16M.
DEBUG_CFLAGS/amd64 = -g # Change this back to "-g" if you want the most expressive format.
DEBUG_CFLAGS/arm = -g # (warning: that could easily inflate libjvm_g.so to 150M!)
DEBUG_CFLAGS/ppc = -g # Note: The Itanium gcc compiler crashes when using -gstabs.
DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) DEBUG_CFLAGS/ia64 = -g
ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) DEBUG_CFLAGS/amd64 = -g
DEBUG_CFLAGS += -gstabs DEBUG_CFLAGS/arm = -g
endif DEBUG_CFLAGS/ppc = -g
DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH))
ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
DEBUG_CFLAGS += -gstabs
endif
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
FASTDEBUG_CFLAGS/ia64 = -g FASTDEBUG_CFLAGS/ia64 = -g
FASTDEBUG_CFLAGS/amd64 = -g FASTDEBUG_CFLAGS/amd64 = -g
FASTDEBUG_CFLAGS/arm = -g FASTDEBUG_CFLAGS/arm = -g
@ -248,12 +252,7 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
ifeq ($(OPT_CFLAGS/$(BUILDARCH)),) ifeq ($(OPT_CFLAGS/$(BUILDARCH)),)
OPT_CFLAGS += -gstabs OPT_CFLAGS += -gstabs
endif endif
endif endif
# DEBUG_BINARIES overrides everything, use full -g debug information
ifeq ($(DEBUG_BINARIES), true)
DEBUG_CFLAGS = -g
CFLAGS += $(DEBUG_CFLAGS)
endif endif
# If we are building HEADLESS, pass on to VM # If we are building HEADLESS, pass on to VM