Mercurial > hg > graal-compiler

comparison make/bsd/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
261 261
262 JVM_OBJ_FILES = $(Obj_Files) 262 JVM_OBJ_FILES = $(Obj_Files)
263 263
264 vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES)) 264 vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES))
265 265
266 mapfile : $(MAPFILE) vm.def 266 mapfile : $(MAPFILE) vm.def mapfile_ext
267 rm -f $@ 267 rm -f $@
268 awk '{ if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") \ 268 awk '{ if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") \
269 { system ("cat vm.def"); } \ 269 { system ("cat mapfile_ext"); system ("cat vm.def"); } \
270 else \ 270 else \
271 { print $$0 } \ 271 { print $$0 } \
272 }' > $@ < $(MAPFILE) 272 }' > $@ < $(MAPFILE)
273 273
274 mapfile_reorder : mapfile $(REORDERFILE) 274 mapfile_reorder : mapfile $(REORDERFILE)
275 rm -f $@ 275 rm -f $@
276 cat $^ > $@ 276 cat $^ > $@
277 277
278 vm.def: $(Res_Files) $(Obj_Files) 278 vm.def: $(Res_Files) $(Obj_Files)
279 sh $(GAMMADIR)/make/bsd/makefiles/build_vm_def.sh *.o > $@ 279 sh $(GAMMADIR)/make/bsd/makefiles/build_vm_def.sh *.o > $@
280
281 mapfile_ext:
282 rm -f $@
283 touch $@
284 if [ -f $(HS_ALT_MAKE)/bsd/makefiles/mapfile-ext ]; then \
285 cat $(HS_ALT_MAKE)/bsd/makefiles/mapfile-ext > $@; \
286 fi
280 287
281 STATIC_CXX = false 288 STATIC_CXX = false
282 289
283 ifeq ($(LINK_INTO),AOUT) 290 ifeq ($(LINK_INTO),AOUT)
284 LIBJVM.o = 291 LIBJVM.o =