Mercurial > hg > graal-jvmci-8

comparison make/linux/makefiles/vm.make @ 20804:7848fc12602b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u40-b25
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 14:58:49 +0200
parents 8f2fb6bec986 f933a15469d4
children 5324104ac4f3
comparison
equal deleted inserted replaced
20184:84105dcdb05b 20804:7848fc12602b
247 247
248 JVM_OBJ_FILES = $(Obj_Files) 248 JVM_OBJ_FILES = $(Obj_Files)
249 249
250 vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES)) 250 vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES))
251 251
252 mapfile : $(MAPFILE) vm.def 252 mapfile : $(MAPFILE) vm.def mapfile_ext
253 rm -f $@ 253 rm -f $@
254 awk '{ if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") \ 254 awk '{ if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") \
255 { system ("cat vm.def"); } \ 255 { system ("cat mapfile_ext"); system ("cat vm.def"); } \
256 else \ 256 else \
257 { print $$0 } \ 257 { print $$0 } \
258 }' > $@ < $(MAPFILE) 258 }' > $@ < $(MAPFILE)
259 259
260 mapfile_reorder : mapfile $(REORDERFILE) 260 mapfile_reorder : mapfile $(REORDERFILE)
261 rm -f $@ 261 rm -f $@
262 cat $^ > $@ 262 cat $^ > $@
263 263
264 vm.def: $(Res_Files) $(Obj_Files) 264 vm.def: $(Res_Files) $(Obj_Files)
265 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@ 265 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
266
267 mapfile_ext:
268 rm -f $@
269 touch $@
270 if [ -f $(HS_ALT_MAKE)/linux/makefiles/mapfile-ext ]; then \
271 cat $(HS_ALT_MAKE)/linux/makefiles/mapfile-ext > $@; \
272 fi
266 273
267 ifeq ($(JVM_VARIANT_ZEROSHARK), true) 274 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
268 STATIC_CXX = false 275 STATIC_CXX = false
269 else 276 else
270 ifeq ($(ZERO_LIBARCH), ppc64) 277 ifeq ($(ZERO_LIBARCH), ppc64)