archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 20:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7174861: all/OPT jdk build on Solaris with FDS enabled sets wrong options

Browse source 
Use CFLAGS_COMMON instead of CC_OPT and CXXFLAGS_COMMON instead of CXX_OPT for setting FDS options. FDS should also set OPTIMIZATION_LEVEL.

Reviewed-by: ihse, dholmes, ohair, dcubed
This commit is contained in:
Jonas Oreland 2012-06-06 13:16:37 -07:00
parent 8cccc8f99a
commit 43eb7b646e
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
jdk/make/common/Defs-solaris.gmk
View file

@ -231,18 +231,21 @@ endif
# optimization flags as used by FASTDEBUG. We also want all the # optimization flags as used by FASTDEBUG. We also want all the
# debug info in one place (-xs). # debug info in one place (-xs).
# #
CFLAGS_COMMON=
CXXFLAGS_COMMON=
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1) ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
ifeq ($(VARIANT), OPT) ifeq ($(VARIANT), OPT)
CC_OPT = -g -xs $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) OPTIMIZATION_LEVEL = $(FASTDEBUG_OPTIMIZATION_LEVEL)
CXX_OPT = -g0 -xs $(CXX_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) CFLAGS_COMMON += -g -xs
CXXFLAGS_COMMON += -g0 -xs
endif endif
CFLAGS_DEBUG_OPTION += -xs CFLAGS_DEBUG_OPTION += -xs
CXXFLAGS_DEBUG_OPTION += -xs CXXFLAGS_DEBUG_OPTION += -xs
endif endif
endif endif
CFLAGS_COMMON = -L$(OBJDIR) CFLAGS_COMMON += -L$(OBJDIR)
# Do not allow C99 language features like declarations in code etc. # Do not allow C99 language features like declarations in code etc.
CFLAGS_COMMON += -xc99=%none CFLAGS_COMMON += -xc99=%none