1.1 --- a/make/solaris/makefiles/product.make Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/make/solaris/makefiles/product.make Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -43,6 +43,8 @@
1.11 ifeq ($(COMPILER_REV_NUMERIC), 510)
1.12 # CC 5.10 has bug XXXXX with -xO4
1.13 OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/O2)
1.14 +# Avoid apparent crash because of corrupted methodHandle in a tail call
1.15 +OPT_CFLAGS/simpleThresholdPolicy.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
1.16 endif # COMPILER_REV_NUMERIC == 510
1.17
1.18 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
1.19 @@ -70,7 +72,6 @@
1.20 # and mustn't be otherwise.
1.21 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
1.22
1.23 -REORDERFILE = $(GAMMADIR)/make/solaris/makefiles/reorder_$(TYPE)_$(BUILDARCH)
1.24 endif
1.25
1.26 # If we can create .debuginfo files, then the VM is stripped in vm.make
1.27 @@ -79,5 +80,4 @@
1.28
1.29 G_SUFFIX =
1.30 SYSDEFS += -DPRODUCT
1.31 -SYSDEFS += $(REORDER_FLAG)
1.32 VERSION = optimized
