Mercurial > hg > truffle

comparison make/solaris/makefiles/product.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 da91efe96a93
children 989155e2d07a
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
1 # 1 #
2 # Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1999, 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.
41 ifeq ("${Platform_compiler}", "sparcWorks") 41 ifeq ("${Platform_compiler}", "sparcWorks")
42 42
43 ifeq ($(COMPILER_REV_NUMERIC), 510) 43 ifeq ($(COMPILER_REV_NUMERIC), 510)
44 # CC 5.10 has bug XXXXX with -xO4 44 # CC 5.10 has bug XXXXX with -xO4
45 OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/O2) 45 OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/O2)
46 # Avoid apparent crash because of corrupted methodHandle in a tail call
47 OPT_CFLAGS/simpleThresholdPolicy.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
46 endif # COMPILER_REV_NUMERIC == 510 48 endif # COMPILER_REV_NUMERIC == 510
47 49
48 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) 50 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
49 # dtrace cannot handle tail call optimization (6672627, 6693876) 51 # dtrace cannot handle tail call optimization (6672627, 6693876)
50 OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) 52 OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
62 # Set the environment variable HOTSPARC_GENERIC to "true" 64 # Set the environment variable HOTSPARC_GENERIC to "true"
63 # to inhibit the effect of the previous line on CFLAGS. 65 # to inhibit the effect of the previous line on CFLAGS.
64 66
65 # Linker mapfiles 67 # Linker mapfiles
66 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers 68 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers
69 ifdef GRAAL
70 MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-graal
71 endif
67 72
68 ifndef USE_GCC 73 ifndef USE_GCC
69 # This mapfile is only needed when compiling with dtrace support, 74 # This mapfile is only needed when compiling with dtrace support,
70 # and mustn't be otherwise. 75 # and mustn't be otherwise.
71 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) 76 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
72 77
73 REORDERFILE = $(GAMMADIR)/make/solaris/makefiles/reorder_$(TYPE)_$(BUILDARCH)
74 endif 78 endif
75 79
76 # If we can create .debuginfo files, then the VM is stripped in vm.make 80 # If we can create .debuginfo files, then the VM is stripped in vm.make
77 # and this macro is not used. 81 # and this macro is not used.
78 # LINK_LIB.CXX/POST_HOOK += $(STRIP_LIB.CXX/POST_HOOK) 82 # LINK_LIB.CXX/POST_HOOK += $(STRIP_LIB.CXX/POST_HOOK)
79 83
80 G_SUFFIX = 84 G_SUFFIX =
81 SYSDEFS += -DPRODUCT 85 SYSDEFS += -DPRODUCT
82 SYSDEFS += $(REORDER_FLAG)
83 VERSION = optimized 86 VERSION = optimized