Mercurial > hg > graal-jvmci-8

comparison make/solaris/makefiles/fastdebug.make @ 6948:e522a00b91aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
1 # 1 #
2 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
35 35
36 ifeq ("${Platform_compiler}", "sparcWorks") 36 ifeq ("${Platform_compiler}", "sparcWorks")
37 OPT_CFLAGS/SLOWER = -xO2 37 OPT_CFLAGS/SLOWER = -xO2
38 38
39 ifeq ($(COMPILER_REV_NUMERIC), 510) 39 ifeq ($(COMPILER_REV_NUMERIC), 510)
40 # Avoid apparent crash because of corrupted methodHandle in a tail call
41 OPT_CFLAGS/simpleThresholdPolicy.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
40 # CC 5.10 has bug XXXXX with -xO4 42 # CC 5.10 has bug XXXXX with -xO4
41 OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/SLOWER) 43 OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/SLOWER)
42 endif # COMPILER_REV_NUMERIC == 510 44 endif # COMPILER_REV_NUMERIC == 510
43 45
44 ifeq ($(COMPILER_REV_NUMERIC), 509) 46 ifeq ($(COMPILER_REV_NUMERIC), 509)
47 endif # COMPILER_NUMERIC_REV == 509 49 endif # COMPILER_NUMERIC_REV == 509
48 50
49 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) 51 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
50 # dtrace cannot handle tail call optimization (6672627, 6693876) 52 # dtrace cannot handle tail call optimization (6672627, 6693876)
51 OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) 53 OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
54 # this hangs in iropt now (7113504)
55 OPT_CFLAGS/compileBroker.o = $(OPT_CFLAGS/SLOWER)
52 endif # COMPILER_NUMERIC_REV >= 509 56 endif # COMPILER_NUMERIC_REV >= 509
53 57
54 ifeq ($(COMPILER_REV_NUMERIC), 505) 58 ifeq ($(COMPILER_REV_NUMERIC), 505)
55 # CC 5.5 has bug 4908364 with -xO4 (Fixed in 5.6) 59 # CC 5.5 has bug 4908364 with -xO4 (Fixed in 5.6)
56 OPT_CFLAGS/library_call.o = $(OPT_CFLAGS/SLOWER) 60 OPT_CFLAGS/library_call.o = $(OPT_CFLAGS/SLOWER)
111 CFLAGS += $(DEBUG_CFLAGS/BYFILE) 115 CFLAGS += $(DEBUG_CFLAGS/BYFILE)
112 116
113 # Linker mapfiles 117 # Linker mapfiles
114 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \ 118 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
115 $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug 119 $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug
120 #ifdef GRAAL
121 MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-graal
122 #endif
116 123
117 # This mapfile is only needed when compiling with dtrace support, 124 # This mapfile is only needed when compiling with dtrace support,
118 # and mustn't be otherwise. 125 # and mustn't be otherwise.
119 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) 126 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
120 127