Mercurial > hg > truffle
comparison make/linux/makefiles/vm.make @ 1692:d2ede61b7a12
6976186: integrate Shark HotSpot changes
Summary: Shark is a JIT compiler for Zero that uses the LLVM compiler infrastructure.
Reviewed-by: kvn, twisti
Contributed-by: Gary Benson <gbenson@redhat.com>
author | twisti |
---|---|
date | Wed, 11 Aug 2010 05:51:21 -0700 |
parents | 126ea7725993 |
children | 2d26b0046e0d f95d63e2154a |
comparison
equal
deleted
inserted
replaced
1691:4a665be40fd3 | 1692:d2ede61b7a12 |
---|---|
1 # | 1 # |
2 # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 1999, 2010, 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. |
135 cat $^ > $@ | 135 cat $^ > $@ |
136 | 136 |
137 vm.def: $(Res_Files) $(Obj_Files) | 137 vm.def: $(Res_Files) $(Obj_Files) |
138 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@ | 138 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@ |
139 | 139 |
140 ifeq ($(ZERO_LIBARCH), ppc64) | 140 ifeq ($(SHARK_BUILD), true) |
141 STATIC_CXX = false | 141 STATIC_CXX = false |
142 else | 142 else |
143 STATIC_CXX = true | 143 ifeq ($(ZERO_LIBARCH), ppc64) |
144 STATIC_CXX = false | |
145 else | |
146 STATIC_CXX = true | |
147 endif | |
144 endif | 148 endif |
145 | 149 |
146 ifeq ($(LINK_INTO),AOUT) | 150 ifeq ($(LINK_INTO),AOUT) |
147 LIBJVM.o = | 151 LIBJVM.o = |
148 LIBJVM_MAPFILE = | 152 LIBJVM_MAPFILE = |
165 | 169 |
166 LIBS_VM += $(LIBS) | 170 LIBS_VM += $(LIBS) |
167 endif | 171 endif |
168 ifeq ($(ZERO_BUILD), true) | 172 ifeq ($(ZERO_BUILD), true) |
169 LIBS_VM += $(LIBFFI_LIBS) | 173 LIBS_VM += $(LIBFFI_LIBS) |
174 endif | |
175 ifeq ($(SHARK_BUILD), true) | |
176 LFLAGS_VM += $(LLVM_LDFLAGS) | |
177 LIBS_VM += $(LLVM_LIBS) | |
170 endif | 178 endif |
171 | 179 |
172 LINK_VM = $(LINK_LIB.c) | 180 LINK_VM = $(LINK_LIB.c) |
173 | 181 |
174 # rule for building precompiled header | 182 # rule for building precompiled header |