Mercurial > hg > truffle

comparison make/linux/makefiles/vm.make @ 2491:0654ee04b214

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with OpenJDK.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Fri, 22 Apr 2011 15:30:53 +0200
parents 0cd39a385a72 3449f5e02cc4
children be4ca325525a
comparison
equal deleted inserted replaced
2490:29246b1d2d3c 2491:0654ee04b214
1 # 1 #
2 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1999, 2011, 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.
140 COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt) 140 COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt)
141 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto 141 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto
142 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt 142 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
143 COMPILER2_PATHS += $(GENERATED)/adfiles 143 COMPILER2_PATHS += $(GENERATED)/adfiles
144 144
145 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
146
145 # Include dirs per type. 147 # Include dirs per type.
146 Src_Dirs/CORE := $(CORE_PATHS) 148 Src_Dirs/CORE := $(CORE_PATHS)
147 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) 149 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)
148 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) 150 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)
149 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) 151 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)
150 Src_Dirs/ZERO := $(CORE_PATHS) 152 Src_Dirs/ZERO := $(CORE_PATHS)
151 Src_Dirs/SHARK := $(CORE_PATHS) 153 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS)
152 Src_Dirs := $(Src_Dirs/$(TYPE)) 154 Src_Dirs := $(Src_Dirs/$(TYPE))
153 155
154 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* 156 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
155 COMPILER1_SPECIFIC_FILES := c1_\* 157 COMPILER1_SPECIFIC_FILES := c1_\*
156 SHARK_SPECIFIC_FILES := shark 158 SHARK_SPECIFIC_FILES := shark