comparison make/defs.make @ 10405:f2110083203d

8005849: JEP 167: Event-Based JVM Tracing Reviewed-by: acorn, coleenp, sla Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
author sla
date Mon, 10 Jun 2013 11:30:51 +0200
parents 98f3af397705
children 836a62f43af9 f509b8f4699b faf0c78e906b
comparison
equal deleted inserted replaced
10404:d0add7016434 10405:f2110083203d
1 # 1 #
2 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2006, 2013, 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.
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 # 18 #
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 # or visit www.oracle.com if you need additional information or have any 20 # or visit www.oracle.com if you need additional information or have any
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 # The common definitions for hotspot builds. 25 # The common definitions for hotspot builds.
26 26
27 # Optionally include SPEC file generated by configure. 27 # Optionally include SPEC file generated by configure.
234 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM) 234 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
235 ifneq ($(ALT_JDK_IMAGE_DIR),) 235 ifneq ($(ALT_JDK_IMAGE_DIR),)
236 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR) 236 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
237 endif 237 endif
238 238
239 # The platform dependent defs.make defines platform specific variable such 239 # The platform dependent defs.make defines platform specific variable such
240 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined. 240 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
241 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make 241 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
242 242
243 # We are trying to put platform specific defintions 243 # We are trying to put platform specific defintions
244 # files to make/$(OSNAME)/makefiles dictory. However 244 # files to make/$(OSNAME)/makefiles dictory. However
256 # SRCARCH - where to find HotSpot cpu and os_cpu source files 256 # SRCARCH - where to find HotSpot cpu and os_cpu source files
257 # BUILDARCH - build directory 257 # BUILDARCH - build directory
258 # LIBARCH - directory name in JDK/JRE 258 # LIBARCH - directory name in JDK/JRE
259 259
260 # Use uname output for SRCARCH, but deal with platform differences. If ARCH 260 # Use uname output for SRCARCH, but deal with platform differences. If ARCH
261 # is not explicitly listed below, it is treated as x86. 261 # is not explicitly listed below, it is treated as x86.
262 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc zero,$(ARCH))) 262 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc zero,$(ARCH)))
263 ARCH/ = x86 263 ARCH/ = x86
264 ARCH/sparc = sparc 264 ARCH/sparc = sparc
265 ARCH/sparc64= sparc 265 ARCH/sparc64= sparc
266 ARCH/ia64 = ia64 266 ARCH/ia64 = ia64
335 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h 335 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h
336 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h 336 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h
337 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h 337 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
338 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h 338 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
339 339
340 ifndef JAVASE_EMBEDDED
341 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h
342 endif
343
344 .PHONY: $(HS_ALT_MAKE)/defs.make 340 .PHONY: $(HS_ALT_MAKE)/defs.make
341