1.1 --- a/make/defs.make Fri Jun 07 09:33:01 2013 -0700
1.2 +++ b/make/defs.make Mon Jun 10 11:30:51 2013 +0200
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -19,7 +19,7 @@
1.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1.12 # or visit www.oracle.com if you need additional information or have any
1.13 # questions.
1.14 -#
1.15 +#
1.16 #
1.17
1.18 # The common definitions for hotspot builds.
1.19 @@ -236,7 +236,7 @@
1.20 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
1.21 endif
1.22
1.23 -# The platform dependent defs.make defines platform specific variable such
1.24 +# The platform dependent defs.make defines platform specific variable such
1.25 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
1.26 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
1.27
1.28 @@ -258,7 +258,7 @@
1.29 # LIBARCH - directory name in JDK/JRE
1.30
1.31 # Use uname output for SRCARCH, but deal with platform differences. If ARCH
1.32 - # is not explicitly listed below, it is treated as x86.
1.33 + # is not explicitly listed below, it is treated as x86.
1.34 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc zero,$(ARCH)))
1.35 ARCH/ = x86
1.36 ARCH/sparc = sparc
1.37 @@ -337,8 +337,5 @@
1.38 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
1.39 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
1.40
1.41 -ifndef JAVASE_EMBEDDED
1.42 -EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h
1.43 -endif
1.44 +.PHONY: $(HS_ALT_MAKE)/defs.make
1.45
1.46 -.PHONY: $(HS_ALT_MAKE)/defs.make
