Mercurial > hg > graal-compiler
changeset 12357:36b1f3224948
Revert changes to globalDefinitions (needs more work) and disable CHECK_UNHANDLED_OOPS in fastdebug until it's fixed upstream
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 17:52:33 +0200 |
parents | 359f7e70ae7f |
children | c2407e223244 |
files | make/bsd/makefiles/fastdebug.make make/linux/makefiles/fastdebug.make make/solaris/makefiles/fastdebug.make make/windows/makefiles/fastdebug.make src/share/vm/utilities/globalDefinitions.hpp |
diffstat | 5 files changed, 16 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/make/bsd/makefiles/fastdebug.make Fri Oct 11 15:41:33 2013 +0200 +++ b/make/bsd/makefiles/fastdebug.make Fri Oct 11 17:52:33 2013 +0200 @@ -59,5 +59,6 @@ MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug VERSION = fastdebug -SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS +#SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS +SYSDEFS += -DASSERT PICFLAGS = DEFAULT
--- a/make/linux/makefiles/fastdebug.make Fri Oct 11 15:41:33 2013 +0200 +++ b/make/linux/makefiles/fastdebug.make Fri Oct 11 17:52:33 2013 +0200 @@ -59,5 +59,6 @@ MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug VERSION = optimized -SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS +#SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS +SYSDEFS += -DASSERT PICFLAGS = DEFAULT
--- a/make/solaris/makefiles/fastdebug.make Fri Oct 11 15:41:33 2013 +0200 +++ b/make/solaris/makefiles/fastdebug.make Fri Oct 11 17:52:33 2013 +0200 @@ -126,5 +126,6 @@ MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) VERSION = optimized -SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS +#SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS +SYSDEFS += -DASSERT PICFLAGS = DEFAULT
--- a/make/windows/makefiles/fastdebug.make Fri Oct 11 15:41:33 2013 +0200 +++ b/make/windows/makefiles/fastdebug.make Fri Oct 11 17:52:33 2013 +0200 @@ -38,7 +38,8 @@ !include ../local.make !include compile.make -CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION) /D "CHECK_UNHANDLED_OOPS" +#CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION) /D "CHECK_UNHANDLED_OOPS" +CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION) !include $(WorkSpace)/make/windows/makefiles/vm.make !include local.make
--- a/src/share/vm/utilities/globalDefinitions.hpp Fri Oct 11 15:41:33 2013 +0200 +++ b/src/share/vm/utilities/globalDefinitions.hpp Fri Oct 11 17:52:33 2013 +0200 @@ -809,20 +809,20 @@ CompLevel_full_profile = 3, // C1, invocation & backedge counters + mdo CompLevel_full_optimization = 4, // C2 or Shark -#if defined(COMPILER2) || defined(SHARK) || defined(GRAAL) - CompLevel_highest_tier = CompLevel_full_optimization, // pure C2, tiered or pure Graal -#elif defined(COMPILER1) - CompLevel_highest_tier = CompLevel_simple, // pure C1 +#if defined(COMPILER2) || defined(SHARK) + CompLevel_highest_tier = CompLevel_full_optimization, // pure C2 and tiered +#elif defined(COMPILER1) || defined(GRAAL) + CompLevel_highest_tier = CompLevel_simple, // pure C1 or Graal #else CompLevel_highest_tier = CompLevel_none, #endif #if defined(TIERED) CompLevel_initial_compile = CompLevel_full_profile // tiered -#elif defined(COMPILER1) - CompLevel_initial_compile = CompLevel_simple // pure C1 -#elif defined(COMPILER2) || defined(SHARK) || defined(GRAAL) - CompLevel_initial_compile = CompLevel_full_optimization // pure C2 or pure Graal +#elif defined(COMPILER1) || defined(GRAAL) + CompLevel_initial_compile = CompLevel_simple // pure C1 or Graal +#elif defined(COMPILER2) || defined(SHARK) + CompLevel_initial_compile = CompLevel_full_optimization // pure C2 #else CompLevel_initial_compile = CompLevel_none #endif