stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds

Browse Source 
Build option FULL_DEBUG_SYMBOLS=0 only affects OPT builds. Finish enabling ENABLE_FULL_DEBUG_SYMBOLS flag on Windows.

Reviewed-by: ohair, jmelvin, sspitsyn
This commit is contained in:
Daniel D. Daugherty 2012-04-03 10:17:06 -07:00
parent e6f9fc68d1
commit 62756e9f1c
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
make/Defs-internal.gmk
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 1995, 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
@ -354,3 +354,12 @@ ifdef ANT_HOME
COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)" COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)"
endif endif
# When all repos support FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES,
# then these can be set here:
#ifdef FULL_DEBUG_SYMBOLS
# COMMON_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS)
#endif
#
#ifdef ZIP_DEBUGINFO_FILES
# COMMON_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
#endif

14
make/hotspot-rules.gmk
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2001, 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
@ -71,6 +71,7 @@ endif
ifeq ($(DEBUG_NAME), fastdebug) ifeq ($(DEBUG_NAME), fastdebug)
HOTSPOT_TARGET = all_fastdebug HOTSPOT_TARGET = all_fastdebug
endif endif
BUILD_FLAVOR=$(HOTSPOT_TARGET:all_%=%)
ifeq ($(ZERO_BUILD), true) ifeq ($(ZERO_BUILD), true)
ifeq ($(SHARK_BUILD), true) ifeq ($(SHARK_BUILD), true)
@ -83,6 +84,7 @@ endif
HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS) HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR) HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH) HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
# Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=? # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
# Or is there something wrong with hotspot/make/Makefile? # Or is there something wrong with hotspot/make/Makefile?
@ -93,6 +95,16 @@ ifeq ($(BUILD_LANGTOOLS), true)
HOTSPOT_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST) HOTSPOT_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
endif endif
# Move to COMMON_BUILD_ARGUMENTS when all repos support
# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES:
ifdef FULL_DEBUG_SYMBOLS
HOTSPOT_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS)
endif
ifdef ZIP_DEBUGINFO_FILES
HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
endif
hotspot-build:: hotspot-build::
$(MKDIR) -p $(HOTSPOT_OUTPUTDIR) $(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
$(MKDIR) -p $(HOTSPOT_EXPORT_PATH) $(MKDIR) -p $(HOTSPOT_EXPORT_PATH)

12
make/jdk-rules.gmk
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2001, 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
@ -70,6 +70,16 @@ endif
JDK_BUILD_ARGUMENTS += \ JDK_BUILD_ARGUMENTS += \
BUILD_HOTSPOT=$(BUILD_HOTSPOT) BUILD_HOTSPOT=$(BUILD_HOTSPOT)
# Move to COMMON_BUILD_ARGUMENTS when all repos support
# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES:
ifdef FULL_DEBUG_SYMBOLS
JDK_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS)
endif
ifdef ZIP_DEBUGINFO_FILES
JDK_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
endif
$(JDK_JAVA_EXE):: jdk-build $(JDK_JAVA_EXE):: jdk-build