Mercurial > hg > graal-jvmci-8

comparison make/linux/makefiles/vm.make @ 23286:dd9cc155639c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u66-b17
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Thu, 07 Jan 2016 17:28:46 +0100
parents 1bbd4a7c274b ddce0b7cee93
children d9ae6a4319be
comparison
equal deleted inserted replaced
22786:ac649db7fec4 23286:dd9cc155639c
1 # 1 #
2 # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1999, 2015, 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.
43 43
44 # read machine-specific adjustments (%%% should do this via buildtree.make?) 44 # read machine-specific adjustments (%%% should do this via buildtree.make?)
45 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 45 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
46 include $(MAKEFILES_DIR)/zeroshark.make 46 include $(MAKEFILES_DIR)/zeroshark.make
47 else 47 else
48 include $(MAKEFILES_DIR)/$(BUILDARCH).make 48 BUILDARCH_MAKE = $(MAKEFILES_DIR)/$(BUILDARCH).make
49 -include $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make 49 ALT_BUILDARCH_MAKE = $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make
50 include $(if $(wildcard $(ALT_BUILDARCH_MAKE)),$(ALT_BUILDARCH_MAKE),$(BUILDARCH_MAKE))
50 endif 51 endif
51 52
52 # set VPATH so make knows where to look for source files 53 # set VPATH so make knows where to look for source files
53 # Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm 54 # Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
54 # The adfiles directory contains ad_<arch>.[ch]pp. 55 # The adfiles directory contains ad_<arch>.[ch]pp.
255 256
256 mapfile_reorder : mapfile $(REORDERFILE) 257 mapfile_reorder : mapfile $(REORDERFILE)
257 rm -f $@ 258 rm -f $@
258 cat $^ > $@ 259 cat $^ > $@
259 260
261 VMDEF_PAT = ^_ZTV
262 VMDEF_PAT := ^gHotSpotVM|$(VMDEF_PAT)
263 VMDEF_PAT := ^UseSharedSpaces$$|$(VMDEF_PAT)
264 VMDEF_PAT := ^_ZN9Arguments17SharedArchivePathE$$|$(VMDEF_PAT)
265
260 vm.def: $(Res_Files) $(Obj_Files) 266 vm.def: $(Res_Files) $(Obj_Files)
261 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@ 267 $(QUIETLY) $(NM) --defined-only $(Obj_Files) | sort -k3 -u | \
268 awk '$$3 ~ /$(VMDEF_PAT)/ { print "\t" $$3 ";" }' > $@
262 269
263 mapfile_ext: 270 mapfile_ext:
264 rm -f $@ 271 rm -f $@
265 touch $@ 272 touch $@
266 if [ -f $(HS_ALT_MAKE)/linux/makefiles/mapfile-ext ]; then \ 273 if [ -f $(HS_ALT_MAKE)/linux/makefiles/mapfile-ext ]; then \