Mercurial > hg > truffle

comparison make/linux/makefiles/vm.make @ 1010:354d3184f6b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6890308: integrate zero assembler hotspot changes Reviewed-by: never Contributed-by: gbenson@redhat.com
author never
date Tue, 13 Oct 2009 12:04:21 -0700
parents 6e76352f1f62
children 167c2986d91b
comparison
equal deleted inserted replaced
1009:03b336640699 1010:354d3184f6b2
38 38
39 # read a generated file defining the set of .o's and the .o .h dependencies 39 # read a generated file defining the set of .o's and the .o .h dependencies
40 include $(GENERATED)/Dependencies 40 include $(GENERATED)/Dependencies
41 41
42 # read machine-specific adjustments (%%% should do this via buildtree.make?) 42 # read machine-specific adjustments (%%% should do this via buildtree.make?)
43 include $(MAKEFILES_DIR)/$(BUILDARCH).make 43 ifeq ($(ZERO_BUILD), true)
44 include $(MAKEFILES_DIR)/zeroshark.make
45 else
46 include $(MAKEFILES_DIR)/$(BUILDARCH).make
47 endif
44 48
45 # set VPATH so make knows where to look for source files 49 # set VPATH so make knows where to look for source files
46 # Src_Dirs is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm 50 # Src_Dirs is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
47 # The incls directory contains generated header file lists for inclusion. 51 # The incls directory contains generated header file lists for inclusion.
48 # The adfiles directory contains ad_<arch>.[ch]pp. 52 # The adfiles directory contains ad_<arch>.[ch]pp.
122 126
123 mapfile_reorder : mapfile $(REORDERFILE) 127 mapfile_reorder : mapfile $(REORDERFILE)
124 rm -f $@ 128 rm -f $@
125 cat $^ > $@ 129 cat $^ > $@
126 130
127 STATIC_CXX = true 131 ifeq ($(ZERO_LIBARCH), ppc64)
132 STATIC_CXX = false
133 else
134 STATIC_CXX = true
135 endif
128 136
129 ifeq ($(LINK_INTO),AOUT) 137 ifeq ($(LINK_INTO),AOUT)
130 LIBJVM.o = 138 LIBJVM.o =
131 LIBJVM_MAPFILE = 139 LIBJVM_MAPFILE =
132 LIBS_VM = $(LIBS) 140 LIBS_VM = $(LIBS)
145 else 153 else
146 LIBS_VM += -lstdc++ 154 LIBS_VM += -lstdc++
147 endif 155 endif
148 156
149 LIBS_VM += $(LIBS) 157 LIBS_VM += $(LIBS)
158 endif
159 ifeq ($(ZERO_BUILD), true)
160 LIBS_VM += $(LIBFFI_LIBS)
150 endif 161 endif
151 162
152 LINK_VM = $(LINK_LIB.c) 163 LINK_VM = $(LINK_LIB.c)
153 164
154 # rule for building precompiled header 165 # rule for building precompiled header