Mercurial > hg > truffle
diff make/solaris/makefiles/fastdebug.make @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 12 Nov 2012 23:14:12 +0100 |
| parents | 4d6c13994690 78b56e53050e |
| children | 989155e2d07a |
line wrap: on
line diff
--- a/make/solaris/makefiles/fastdebug.make Mon Nov 12 18:11:17 2012 +0100 +++ b/make/solaris/makefiles/fastdebug.make Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -37,6 +37,8 @@ OPT_CFLAGS/SLOWER = -xO2 ifeq ($(COMPILER_REV_NUMERIC), 510) +# Avoid apparent crash because of corrupted methodHandle in a tail call +OPT_CFLAGS/simpleThresholdPolicy.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) # CC 5.10 has bug XXXXX with -xO4 OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/SLOWER) endif # COMPILER_REV_NUMERIC == 510 @@ -49,6 +51,8 @@ ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) # dtrace cannot handle tail call optimization (6672627, 6693876) OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) +# this hangs in iropt now (7113504) +OPT_CFLAGS/compileBroker.o = $(OPT_CFLAGS/SLOWER) endif # COMPILER_NUMERIC_REV >= 509 ifeq ($(COMPILER_REV_NUMERIC), 505) @@ -113,6 +117,9 @@ # Linker mapfiles MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \ $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug +#ifdef GRAAL +MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-graal +#endif # This mapfile is only needed when compiling with dtrace support, # and mustn't be otherwise.