Mon, 28 Jul 2014 15:06:38 -0700
8051344: JVM crashed in Compile::start() during method parsing w/ UseRTMDeopt turned on
Summary: call rtm_deopt() only if there were no compilation bailouts before.
Reviewed-by: kvn
duke@435 | 1 | # |
mikael@4153 | 2 | # Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. |
duke@435 | 3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | # |
duke@435 | 5 | # This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | # under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | # published by the Free Software Foundation. |
duke@435 | 8 | # |
duke@435 | 9 | # This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | # version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | # accompanied this code). |
duke@435 | 14 | # |
duke@435 | 15 | # You should have received a copy of the GNU General Public License version |
duke@435 | 16 | # 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | # |
trims@1907 | 19 | # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
trims@1907 | 20 | # or visit www.oracle.com if you need additional information or have any |
trims@1907 | 21 | # questions. |
duke@435 | 22 | # |
duke@435 | 23 | # |
duke@435 | 24 | |
duke@435 | 25 | # Sets make macros for making optimized version of Gamma VM |
duke@435 | 26 | # (This is the "product", not the "release" version.) |
duke@435 | 27 | |
duke@435 | 28 | # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make |
duke@435 | 29 | OPT_CFLAGS/DEFAULT= $(OPT_CFLAGS) |
duke@435 | 30 | OPT_CFLAGS/BYFILE = $(OPT_CFLAGS/$@)$(OPT_CFLAGS/DEFAULT$(OPT_CFLAGS/$@)) |
duke@435 | 31 | |
duke@435 | 32 | # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) |
ohair@593 | 33 | ifeq ("${Platform_compiler}", "sparcWorks") |
duke@435 | 34 | |
jiangli@3946 | 35 | ifeq ($(COMPILER_REV_NUMERIC), 510) |
jiangli@3946 | 36 | # CC 5.10 has bug XXXXX with -xO4 |
jiangli@3946 | 37 | OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/O2) |
jiangli@3946 | 38 | endif # COMPILER_REV_NUMERIC == 510 |
jiangli@3946 | 39 | |
jcoomes@1902 | 40 | ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) |
jcoomes@1902 | 41 | # dtrace cannot handle tail call optimization (6672627, 6693876) |
jcoomes@1902 | 42 | OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) |
jcoomes@1902 | 43 | endif # COMPILER_NUMERIC_REV >= 509 |
ohair@593 | 44 | |
ohair@593 | 45 | # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12) |
kvn@1268 | 46 | ifeq ($(COMPILER_REV_NUMERIC),508) |
duke@435 | 47 | OPT_CFLAGS/ciTypeFlow.o = $(OPT_CFLAGS/O2) |
kvn@865 | 48 | endif # COMPILER_REV_NUMERIC == 508 |
ohair@593 | 49 | |
duke@435 | 50 | endif # Platform_compiler == sparcWorks |
duke@435 | 51 | |
duke@435 | 52 | # If you set HOTSPARC_GENERIC=yes, you disable all OPT_CFLAGS settings |
duke@435 | 53 | CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE) |
duke@435 | 54 | |
duke@435 | 55 | # Linker mapfiles |
never@3095 | 56 | MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers |
duke@435 | 57 | |
duke@435 | 58 | # This mapfile is only needed when compiling with dtrace support, |
duke@435 | 59 | # and mustn't be otherwise. |
kamg@526 | 60 | MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) |
duke@435 | 61 | |
duke@435 | 62 | # Set the environment variable HOTSPARC_GENERIC to "true" |
duke@435 | 63 | # to inhibit the effect of the previous line on CFLAGS. |
duke@435 | 64 | |
duke@435 | 65 | VERSION = optimized |