Mercurial > hg > truffle
diff make/solaris/makefiles/product.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 da91efe96a93 |
| children | 989155e2d07a |
line wrap: on
line diff
--- a/make/solaris/makefiles/product.make Mon Nov 12 18:11:17 2012 +0100 +++ b/make/solaris/makefiles/product.make Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 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 @@ -43,6 +43,8 @@ ifeq ($(COMPILER_REV_NUMERIC), 510) # CC 5.10 has bug XXXXX with -xO4 OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/O2) +# Avoid apparent crash because of corrupted methodHandle in a tail call +OPT_CFLAGS/simpleThresholdPolicy.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) endif # COMPILER_REV_NUMERIC == 510 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) @@ -64,13 +66,15 @@ # Linker mapfiles MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers +ifdef GRAAL +MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-graal +endif ifndef USE_GCC # This mapfile is only needed when compiling with dtrace support, # and mustn't be otherwise. MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) -REORDERFILE = $(GAMMADIR)/make/solaris/makefiles/reorder_$(TYPE)_$(BUILDARCH) endif # If we can create .debuginfo files, then the VM is stripped in vm.make @@ -79,5 +83,4 @@ G_SUFFIX = SYSDEFS += -DPRODUCT -SYSDEFS += $(REORDER_FLAG) VERSION = optimized