OpenJDK / portola / portola
changeset 2398:b0e6622ee72e
6604458: linux_x64-fastdebug-c2 fails on hyperbolic trig tests
Reviewed-by: tbell
| author | ohair |
|---|---|
| date | Tue, 31 Mar 2009 16:10:31 -0700 |
| parents | 0a3821d472a3 |
| children | 8152d21ae245 |
| files | jdk/make/common/Defs-linux.gmk jdk/make/common/Defs-solaris.gmk jdk/make/common/Defs-windows.gmk jdk/make/java/fdlibm/Makefile |
| diffstat | 4 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/common/Defs-linux.gmk Tue Mar 31 15:27:40 2009 -0700 +++ b/jdk/make/common/Defs-linux.gmk Tue Mar 31 16:10:31 2009 -0700 @@ -94,6 +94,9 @@ OPTIMIZATION_LEVEL = LOWER endif endif +ifndef FASTDEBUG_OPTIMIZATION_LEVEL + FASTDEBUG_OPTIMIZATION_LEVEL = LOWER +endif CC_OPT/NONE = CC_OPT/LOWER = -O2 @@ -173,8 +176,8 @@ # FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java ifeq ($(FASTDEBUG), true) - CFLAGS_DBG += $(CC_OPT/LOWER) - CXXFLAGS_DBG += $(CC_OPT/LOWER) + CFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) + CXXFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) endif CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \
--- a/jdk/make/common/Defs-solaris.gmk Tue Mar 31 15:27:40 2009 -0700 +++ b/jdk/make/common/Defs-solaris.gmk Tue Mar 31 16:10:31 2009 -0700 @@ -93,6 +93,9 @@ OPTIMIZATION_LEVEL = LOWER endif endif +ifndef FASTDEBUG_OPTIMIZATION_LEVEL + FASTDEBUG_OPTIMIZATION_LEVEL = LOWER +endif # # If -Xa is in CFLAGS_COMMON it will end up ahead of $(CC_OPT) for the @@ -143,8 +146,8 @@ # Performance/size of files should be about the same, maybe smaller. # ifeq ($(FASTDEBUG), true) - CFLAGS_DEBUG_OPTION = -g $(CC_OPT/LOWER) - CXXFLAGS_DEBUG_OPTION = -g0 $(CXX_OPT/LOWER) + CFLAGS_DEBUG_OPTION = -g $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) + CXXFLAGS_DEBUG_OPTION = -g0 $(CXX_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) endif CFLAGS_COMMON = -L$(OBJDIR)
--- a/jdk/make/common/Defs-windows.gmk Tue Mar 31 15:27:40 2009 -0700 +++ b/jdk/make/common/Defs-windows.gmk Tue Mar 31 16:10:31 2009 -0700 @@ -111,6 +111,9 @@ OPTIMIZATION_LEVEL = LOWER endif endif +ifndef FASTDEBUG_OPTIMIZATION_LEVEL + FASTDEBUG_OPTIMIZATION_LEVEL = LOWER +endif ifeq ($(CC_VERSION),msvc) # Visual Studio .NET 2003 or VS2003 compiler option definitions:
--- a/jdk/make/java/fdlibm/Makefile Tue Mar 31 15:27:40 2009 -0700 +++ b/jdk/make/java/fdlibm/Makefile Tue Mar 31 16:10:31 2009 -0700 @@ -45,6 +45,7 @@ ifeq ($(PLATFORM),windows) # Turn all optimizations off OPTIMIZATION_LEVEL = NONE + FASTDEBUG_OPTIMIZATION_LEVEL = NONE OTHER_CFLAGS = CPPFLAGS_DBG += -DLOGGING endif @@ -56,6 +57,7 @@ ifeq ($(PLATFORM),linux) # Turn all optimizations off OPTIMIZATION_LEVEL = NONE + FASTDEBUG_OPTIMIZATION_LEVEL = NONE endif #