Mercurial > hg > truffle
annotate make/defs.make @ 21533:b118c9be1d1f
fixed regression preventing hosted CompileTheWorld from running (JBS:GRAAL-53)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Sun, 24 May 2015 14:44:28 +0200 |
| parents | 01319414783b |
| children | ccb1b1391192 |
| rev | line source |
|---|---|
| 0 | 1 # |
| 10405 | 2 # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 # | |
| 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 | |
| 7 # published by the Free Software Foundation. | |
| 8 # | |
| 9 # This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 # version 2 for more details (a copy is included in the LICENSE file that | |
| 13 # accompanied this code). | |
| 14 # | |
| 15 # You should have received a copy of the GNU General Public License version | |
| 16 # 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 # | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1185
diff
changeset
|
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1185
diff
changeset
|
20 # or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1185
diff
changeset
|
21 # questions. |
| 10405 | 22 # |
| 0 | 23 # |
| 24 | |
|
6854
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
25 # The common definitions for hotspot builds. |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
26 |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
27 # Optionally include SPEC file generated by configure. |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
28 ifneq ($(SPEC),) |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
29 include $(SPEC) |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
30 endif |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
31 |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
32 # Directory paths and user name |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
33 # Unless GAMMADIR is set on the command line, search upward from |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
34 # the current directory for a parent directory containing "src/share/vm". |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
35 # If that fails, look for $GAMMADIR in the environment. |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
36 # When the tree of subdirs is built, this setting is stored in each flags.make. |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
37 GAMMADIR := $(shell until ([ -d dev ]&&echo $${GAMMADIR:-/GAMMADIR/}) || ([ -d src/share/vm ]&&pwd); do cd ..; done) |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
38 HS_SRC_DIR=$(GAMMADIR)/src |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
39 HS_MAKE_DIR=$(GAMMADIR)/make |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
40 HS_BUILD_DIR=$(GAMMADIR)/build |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
41 |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
42 ifeq ($(USER),) |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
43 USER=$(USERNAME) |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
44 endif |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
45 |
|
6641
a9fed06c01d2
7154641: Servicability agent should work on platforms other than x86, sparc
bpittore
parents:
5946
diff
changeset
|
46 ifeq ($(HS_ALT_MAKE),) |
|
a9fed06c01d2
7154641: Servicability agent should work on platforms other than x86, sparc
bpittore
parents:
5946
diff
changeset
|
47 ifneq ($(OPENJDK),true) |
|
a9fed06c01d2
7154641: Servicability agent should work on platforms other than x86, sparc
bpittore
parents:
5946
diff
changeset
|
48 HS_ALT_MAKE=$(GAMMADIR)/make/closed |
|
a9fed06c01d2
7154641: Servicability agent should work on platforms other than x86, sparc
bpittore
parents:
5946
diff
changeset
|
49 else |
|
a9fed06c01d2
7154641: Servicability agent should work on platforms other than x86, sparc
bpittore
parents:
5946
diff
changeset
|
50 HS_ALT_MAKE=NO_SUCH_PATH |
|
a9fed06c01d2
7154641: Servicability agent should work on platforms other than x86, sparc
bpittore
parents:
5946
diff
changeset
|
51 endif |
|
a9fed06c01d2
7154641: Servicability agent should work on platforms other than x86, sparc
bpittore
parents:
5946
diff
changeset
|
52 endif |
|
a9fed06c01d2
7154641: Servicability agent should work on platforms other than x86, sparc
bpittore
parents:
5946
diff
changeset
|
53 |
|
6854
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
54 # |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
55 # Include alternate defs.make if it exists |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
56 # |
|
fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
6774
diff
changeset
|
57 -include $(HS_ALT_MAKE)/defs.make |
|
5897
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
4940
diff
changeset
|
58 |
| 0 | 59 # Default to verbose build logs (show all compile lines): |
| 60 MAKE_VERBOSE=y | |
| 61 | |
| 62 # Make macros for install files or preparing targets | |
| 63 CD=cd | |
| 64 CP=cp | |
| 65 ECHO=echo | |
| 66 GREP=grep | |
| 67 MKDIR=mkdir | |
| 68 MV=mv | |
| 69 PWD=pwd | |
| 70 RM=rm -f | |
| 71 SED=sed | |
| 72 TAR=tar | |
| 73 ZIPEXE=zip | |
| 74 | |
| 75 define install-file | |
| 76 @$(MKDIR) -p $(@D) | |
| 77 @$(RM) $@ | |
| 78 $(CP) $< $@ | |
| 79 endef | |
|
12859
f509b8f4699b
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
10405
diff
changeset
|
80 |
|
f509b8f4699b
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
10405
diff
changeset
|
81 # MacOS X strongly discourages 'cp -r' and provides 'cp -R' instead. |
|
f509b8f4699b
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
10405
diff
changeset
|
82 # May need to have a MacOS X specific definition of install-dir |
|
f509b8f4699b
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
10405
diff
changeset
|
83 # sometime in the future. |
|
f509b8f4699b
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
10405
diff
changeset
|
84 define install-dir |
|
f509b8f4699b
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
10405
diff
changeset
|
85 @$(MKDIR) -p $(@D) |
|
f509b8f4699b
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
10405
diff
changeset
|
86 @$(RM) -r $@ |
|
f509b8f4699b
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
10405
diff
changeset
|
87 $(CP) -r $< $@ |
|
f509b8f4699b
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
10405
diff
changeset
|
88 endef |
|
f509b8f4699b
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
10405
diff
changeset
|
89 |
| 0 | 90 define prep-target |
| 91 @$(MKDIR) -p $(@D) | |
| 92 @$(RM) $@ | |
| 93 endef | |
| 94 | |
|
5946
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
95 # Default values for JVM_VARIANT* variables if configure hasn't set |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
96 # it already. |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
97 ifeq ($(JVM_VARIANTS),) |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
98 ifeq ($(ZERO_BUILD), true) |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
99 ifeq ($(SHARK_BUILD), true) |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
100 JVM_VARIANTS:=zeroshark |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
101 JVM_VARIANT_ZEROSHARK:=true |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
102 else |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
103 JVM_VARIANTS:=zero |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
104 JVM_VARIANT_ZERO:=true |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
105 endif |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
106 else |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
107 # A default is needed |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
108 ifeq ($(BUILD_CLIENT_ONLY), true) |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
109 JVM_VARIANTS:=client |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
110 JVM_VARIANT_CLIENT:=true |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
111 endif |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
112 # Further defaults are platform and arch specific |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
113 endif |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
114 endif |
|
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5897
diff
changeset
|
115 |
| 0 | 116 # hotspot version definitions |
| 117 include $(GAMMADIR)/make/hotspot_version | |
| 118 | |
| 119 # Java versions needed | |
| 120 ifeq ($(PREVIOUS_JDK_VERSION),) | |
| 121 PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION) | |
| 122 endif | |
| 123 ifeq ($(JDK_MAJOR_VERSION),) | |
| 124 JDK_MAJOR_VERSION=$(JDK_MAJOR_VER) | |
| 125 endif | |
| 126 ifeq ($(JDK_MINOR_VERSION),) | |
| 127 JDK_MINOR_VERSION=$(JDK_MINOR_VER) | |
| 128 endif | |
| 129 ifeq ($(JDK_MICRO_VERSION),) | |
| 130 JDK_MICRO_VERSION=$(JDK_MICRO_VER) | |
| 131 endif | |
| 132 ifeq ($(JDK_MKTG_VERSION),) | |
| 133 JDK_MKTG_VERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION) | |
| 134 endif | |
| 135 ifeq ($(JDK_VERSION),) | |
| 136 JDK_VERSION=$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION) | |
| 137 endif | |
| 138 ifeq ($(FULL_VERSION),) | |
| 139 FULL_VERSION="$(JDK_VERSION)" | |
| 140 endif | |
| 141 | |
| 142 # FULL_VERSION is only used to define JRE_RELEASE_VERSION which is used | |
| 143 # as JRE version in VM -Xinternalversion output. | |
| 144 ifndef JRE_RELEASE_VERSION | |
| 145 JRE_RELEASE_VERSION=$(FULL_VERSION) | |
| 146 endif | |
| 147 | |
| 148 ifndef HOTSPOT_RELEASE_VERSION | |
| 149 HOTSPOT_RELEASE_VERSION=$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER) | |
| 150 endif | |
| 151 | |
| 152 ifdef HOTSPOT_BUILD_VERSION | |
|
1977
c7db7adb83b4
6987107: Add variable to add to but not modify non-fcs version string
ohair
parents:
1681
diff
changeset
|
153 # specified in command line |
| 0 | 154 else |
|
1977
c7db7adb83b4
6987107: Add variable to add to but not modify non-fcs version string
ohair
parents:
1681
diff
changeset
|
155 ifdef COOKED_BUILD_NUMBER |
|
c7db7adb83b4
6987107: Add variable to add to but not modify non-fcs version string
ohair
parents:
1681
diff
changeset
|
156 # JRE build |
|
c7db7adb83b4
6987107: Add variable to add to but not modify non-fcs version string
ohair
parents:
1681
diff
changeset
|
157 HOTSPOT_BUILD_VERSION= |
| 0 | 158 else |
|
1977
c7db7adb83b4
6987107: Add variable to add to but not modify non-fcs version string
ohair
parents:
1681
diff
changeset
|
159 ifdef USER_RELEASE_SUFFIX |
|
c7db7adb83b4
6987107: Add variable to add to but not modify non-fcs version string
ohair
parents:
1681
diff
changeset
|
160 HOTSPOT_BUILD_VERSION=internal-$(USER_RELEASE_SUFFIX) |
| 0 | 161 else |
| 162 HOTSPOT_BUILD_VERSION=internal | |
| 163 endif | |
| 164 endif | |
| 165 endif | |
| 166 | |
| 167 # Windows should have OS predefined | |
| 168 ifeq ($(OS),) | |
| 169 OS := $(shell uname -s) | |
| 3960 | 170 ifneq ($(findstring BSD,$(OS)),) |
| 171 OS=bsd | |
| 172 endif | |
| 173 ifeq ($(OS), Darwin) | |
| 174 OS=bsd | |
| 175 endif | |
| 0 | 176 HOST := $(shell uname -n) |
| 177 endif | |
| 178 | |
|
18041
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
179 # If not SunOS, not Linux not BSD and not AIX, assume Windows |
| 0 | 180 ifneq ($(OS), Linux) |
| 181 ifneq ($(OS), SunOS) | |
| 3960 | 182 ifneq ($(OS), bsd) |
|
18041
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
183 ifneq ($(OS), AIX) |
|
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
184 OSNAME=windows |
|
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
185 else |
|
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
186 OSNAME=aix |
|
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
187 endif |
| 3960 | 188 else |
| 189 OSNAME=bsd | |
| 190 endif | |
| 0 | 191 else |
| 192 OSNAME=solaris | |
| 193 endif | |
| 194 else | |
| 195 OSNAME=linux | |
| 196 endif | |
| 197 | |
| 198 # Determinations of default make arguments and platform specific settings | |
| 199 MAKE_ARGS= | |
| 200 | |
| 201 # ARCH_DATA_MODEL==64 is equivalent to LP64=1 | |
| 202 ifeq ($(ARCH_DATA_MODEL), 64) | |
| 203 ifndef LP64 | |
| 204 LP64 := 1 | |
| 205 endif | |
| 206 endif | |
| 207 | |
| 208 # Defaults set for product build | |
| 209 EXPORT_SUBDIR= | |
| 210 | |
| 211 # Change default /java path if requested | |
| 212 ifneq ($(ALT_SLASH_JAVA),) | |
| 213 SLASH_JAVA=$(ALT_SLASH_JAVA) | |
| 214 endif | |
| 215 | |
| 216 # Default OUTPUTDIR | |
| 217 OUTPUTDIR=$(HS_BUILD_DIR)/$(OSNAME) | |
| 218 ifneq ($(ALT_OUTPUTDIR),) | |
| 219 OUTPUTDIR=$(ALT_OUTPUTDIR) | |
| 220 endif | |
| 221 | |
| 222 # Find latest promoted JDK area | |
| 223 JDK_IMPORT_PATH=$(SLASH_JAVA)/re/j2se/$(JDK_VERSION)/promoted/latest/binaries/$(PLATFORM) | |
| 224 ifneq ($(ALT_JDK_IMPORT_PATH),) | |
| 225 JDK_IMPORT_PATH=$(ALT_JDK_IMPORT_PATH) | |
| 226 endif | |
| 227 | |
|
2237
b76d12f4ab2d
7018429: JPRT: Update Makefile to use ALT_JDK_TARGET_IMPORT_PATH for copying JDK
dholmes
parents:
1977
diff
changeset
|
228 # Other parts of JDK build may require an import JDK that can be executed |
|
b76d12f4ab2d
7018429: JPRT: Update Makefile to use ALT_JDK_TARGET_IMPORT_PATH for copying JDK
dholmes
parents:
1977
diff
changeset
|
229 # on the build host. For cross-compile builds we also need an import JDK |
|
b76d12f4ab2d
7018429: JPRT: Update Makefile to use ALT_JDK_TARGET_IMPORT_PATH for copying JDK
dholmes
parents:
1977
diff
changeset
|
230 # that matches the target arch, so for that we set ALT_JDK_TARGET_IMPORT_PATH |
|
b76d12f4ab2d
7018429: JPRT: Update Makefile to use ALT_JDK_TARGET_IMPORT_PATH for copying JDK
dholmes
parents:
1977
diff
changeset
|
231 ifneq ($(ALT_JDK_TARGET_IMPORT_PATH),) |
|
b76d12f4ab2d
7018429: JPRT: Update Makefile to use ALT_JDK_TARGET_IMPORT_PATH for copying JDK
dholmes
parents:
1977
diff
changeset
|
232 JDK_IMPORT_PATH=$(ALT_JDK_TARGET_IMPORT_PATH) |
|
b76d12f4ab2d
7018429: JPRT: Update Makefile to use ALT_JDK_TARGET_IMPORT_PATH for copying JDK
dholmes
parents:
1977
diff
changeset
|
233 endif |
|
b76d12f4ab2d
7018429: JPRT: Update Makefile to use ALT_JDK_TARGET_IMPORT_PATH for copying JDK
dholmes
parents:
1977
diff
changeset
|
234 |
| 0 | 235 # Find JDK used for javac compiles |
| 236 BOOTDIR=$(SLASH_JAVA)/re/j2se/$(PREVIOUS_JDK_VERSION)/latest/binaries/$(PLATFORM) | |
| 237 ifneq ($(ALT_BOOTDIR),) | |
| 238 BOOTDIR=$(ALT_BOOTDIR) | |
| 239 endif | |
| 240 | |
|
4865
481a9443f721
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
4800
diff
changeset
|
241 # Select name of the export directory and honor ALT overrides |
|
481a9443f721
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
4800
diff
changeset
|
242 EXPORT_PATH=$(OUTPUTDIR)/export-$(PLATFORM)$(EXPORT_SUBDIR) |
|
481a9443f721
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
4800
diff
changeset
|
243 ifneq ($(ALT_EXPORT_PATH),) |
|
481a9443f721
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
4800
diff
changeset
|
244 EXPORT_PATH=$(ALT_EXPORT_PATH) |
|
481a9443f721
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
4800
diff
changeset
|
245 endif |
|
481a9443f721
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
4800
diff
changeset
|
246 |
|
481a9443f721
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
4800
diff
changeset
|
247 # Default jdk image if one is created for you with create_jdk |
|
481a9443f721
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
4800
diff
changeset
|
248 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM) |
|
4940
f09ae3853e3b
7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents:
4865
diff
changeset
|
249 ifneq ($(ALT_JDK_IMAGE_DIR),) |
|
f09ae3853e3b
7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents:
4865
diff
changeset
|
250 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR) |
|
f09ae3853e3b
7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents:
4865
diff
changeset
|
251 endif |
|
4865
481a9443f721
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
4800
diff
changeset
|
252 |
| 10405 | 253 # The platform dependent defs.make defines platform specific variable such |
| 0 | 254 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined. |
|
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
255 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make |
| 0 | 256 |
| 257 # We are trying to put platform specific defintions | |
|
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
258 # files to make/$(OSNAME)/makefiles dictory. However |
| 0 | 259 # some definitions are common for both linux and solaris, |
| 260 # so we put them here. | |
| 261 ifneq ($(OSNAME),windows) | |
|
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
262 ABS_OUTPUTDIR := $(shell mkdir -p $(OUTPUTDIR); $(CD) $(OUTPUTDIR); $(PWD)) |
| 0 | 263 ABS_BOOTDIR := $(shell $(CD) $(BOOTDIR); $(PWD)) |
| 264 ABS_GAMMADIR := $(shell $(CD) $(GAMMADIR); $(PWD)) | |
|
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
265 ABS_OS_MAKEFILE := $(shell $(CD) $(HS_MAKE_DIR)/$(OSNAME); $(PWD))/Makefile |
| 0 | 266 |
| 267 # uname, HotSpot source directory, build directory and JDK use different names | |
| 268 # for CPU architectures. | |
| 269 # ARCH - uname output | |
| 270 # SRCARCH - where to find HotSpot cpu and os_cpu source files | |
| 271 # BUILDARCH - build directory | |
| 272 # LIBARCH - directory name in JDK/JRE | |
| 273 | |
| 274 # Use uname output for SRCARCH, but deal with platform differences. If ARCH | |
| 10405 | 275 # is not explicitly listed below, it is treated as x86. |
|
18041
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
276 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc ppc64 zero,$(ARCH))) |
| 0 | 277 ARCH/ = x86 |
| 278 ARCH/sparc = sparc | |
| 279 ARCH/sparc64= sparc | |
| 280 ARCH/ia64 = ia64 | |
| 281 ARCH/amd64 = x86 | |
| 282 ARCH/x86_64 = x86 | |
|
1681
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
283 ARCH/ppc64 = ppc |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
284 ARCH/ppc = ppc |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
285 ARCH/arm = arm |
| 1010 | 286 ARCH/zero = zero |
| 0 | 287 |
| 288 # BUILDARCH is usually the same as SRCARCH, except for sparcv9 | |
| 289 BUILDARCH = $(SRCARCH) | |
| 290 ifeq ($(BUILDARCH), x86) | |
| 291 ifdef LP64 | |
| 292 BUILDARCH = amd64 | |
| 293 else | |
| 294 BUILDARCH = i486 | |
| 295 endif | |
| 296 endif | |
| 297 ifeq ($(BUILDARCH), sparc) | |
| 298 ifdef LP64 | |
| 299 BUILDARCH = sparcv9 | |
| 300 endif | |
| 301 endif | |
|
18041
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
302 ifeq ($(BUILDARCH), ppc) |
|
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
303 ifdef LP64 |
|
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
304 BUILDARCH = ppc64 |
|
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
305 endif |
|
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
306 endif |
| 0 | 307 |
| 308 # LIBARCH is 1:1 mapping from BUILDARCH | |
| 309 LIBARCH = $(LIBARCH/$(BUILDARCH)) | |
| 310 LIBARCH/i486 = i386 | |
| 311 LIBARCH/amd64 = amd64 | |
| 312 LIBARCH/sparc = sparc | |
| 313 LIBARCH/sparcv9 = sparcv9 | |
| 314 LIBARCH/ia64 = ia64 | |
|
18041
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
315 LIBARCH/ppc64 = ppc64 |
|
1681
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
316 LIBARCH/ppc = ppc |
|
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
317 LIBARCH/arm = arm |
| 1010 | 318 LIBARCH/zero = $(ZERO_LIBARCH) |
| 0 | 319 |
|
18041
52b4284cb496
Merge with jdk8u20-b26
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16918
diff
changeset
|
320 LP64_ARCH = sparcv9 amd64 ia64 ppc64 zero |
| 0 | 321 endif |
| 322 | |
| 323 # Required make macro settings for all platforms | |
|
8780
98f3af397705
8006965: remove test_gamma and add dedicated test_* targets instead
twisti
parents:
6854
diff
changeset
|
324 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR) |
|
228
f232d7d67023
6717128: Using relative path for ALT_OUTPUTDIR does not work properly
xlu
parents:
198
diff
changeset
|
325 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) |
| 0 | 326 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR) |
| 327 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) | |
| 328 MAKE_ARGS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) | |
| 329 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) | |
| 330 | |
| 331 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile | |
| 332 # to overwrite the default definition since OS specific Makefile also | |
| 333 # includes this make/defs.make file. | |
| 334 MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) | |
| 335 | |
| 336 # Various export sub directories | |
| 337 EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include | |
| 338 EXPORT_DOCS_DIR = $(EXPORT_PATH)/docs | |
| 339 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib | |
| 340 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre | |
| 341 EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin | |
| 342 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib | |
|
16918
b03a16cc5245
add support for installing distribution jars into jre/lib/ext directory
Doug Simon <doug.simon@oracle.com>
parents:
16902
diff
changeset
|
343 EXPORT_JRE_LIB_EXT_DIR = $(EXPORT_JRE_LIB_DIR)/ext |
|
21040
12e94cba3696
Graal Loader: load all jars matching lib/graal/graal*.jar
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
18041
diff
changeset
|
344 EXPORT_JRE_LIB_GRAAL_DIR = $(EXPORT_JRE_LIB_DIR)/graal |
|
21099
3f51d02e536f
Make should export graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21040
diff
changeset
|
345 EXPORT_JRE_LIB_GRAAL_SERVICES_DIR = $(EXPORT_JRE_LIB_GRAAL_DIR)/services |
| 0 | 346 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH) |
| 347 | |
| 4006 | 348 # non-universal macosx builds need to appear universal |
| 349 ifeq ($(OS_VENDOR), Darwin) | |
| 350 ifneq ($(MACOSX_UNIVERSAL), true) | |
| 351 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR) | |
| 352 endif | |
| 353 endif | |
| 354 | |
| 0 | 355 # Common export list of files |
| 356 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h | |
|
1184
7fbf850d87b7
6580131: 3/4 CompiledMethodLoad events don't produce the expected extra notifications to describe inlining
dcubed
parents:
235
diff
changeset
|
357 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h |
| 0 | 358 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h |
| 359 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h | |
| 360 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h | |
|
21099
3f51d02e536f
Make should export graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21040
diff
changeset
|
361 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal-loader.jar |
|
3f51d02e536f
Make should export graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21040
diff
changeset
|
362 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/truffle.jar |
|
21040
12e94cba3696
Graal Loader: load all jars matching lib/graal/graal*.jar
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
18041
diff
changeset
|
363 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/graal.jar |
|
12e94cba3696
Graal Loader: load all jars matching lib/graal/graal*.jar
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
18041
diff
changeset
|
364 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/graal-truffle.jar |
|
21099
3f51d02e536f
Make should export graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21040
diff
changeset
|
365 |
|
3f51d02e536f
Make should export graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21040
diff
changeset
|
366 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.compiler.match.MatchStatementSet |
|
3f51d02e536f
Make should export graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21040
diff
changeset
|
367 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.hotspot.HotSpotBackendFactory |
|
3f51d02e536f
Make should export graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21040
diff
changeset
|
368 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.nodes.spi.ReplacementsProvider |
|
3f51d02e536f
Make should export graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21040
diff
changeset
|
369 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.phases.tiers.CompilerConfiguration |
|
3f51d02e536f
Make should export graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21040
diff
changeset
|
370 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.truffle.hotspot.nfi.RawNativeCallNodeFactory |
|
3f51d02e536f
Make should export graal service files
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21040
diff
changeset
|
371 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.truffle.OptimizedCallTargetInstrumentationFactory |
|
21527
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21099
diff
changeset
|
372 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.api.runtime.GraalRuntimeFactory |
|
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21099
diff
changeset
|
373 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.hotspot.jvmci.HotSpotJVMCIBackendFactory |
|
21533
b118c9be1d1f
fixed regression preventing hosted CompileTheWorld from running (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21531
diff
changeset
|
374 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.hotspot.jvmci.HotSpotVMEventListener |
|
21531
01319414783b
added extension point for post Option parsing actions and used it to remove another JVMCI to non-JVMCI dependency (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21527
diff
changeset
|
375 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.api.runtime.OptionsParsed |
|
4800
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
4006
diff
changeset
|
376 |
| 10405 | 377 .PHONY: $(HS_ALT_MAKE)/defs.make |
|
6641
a9fed06c01d2
7154641: Servicability agent should work on platforms other than x86, sparc
bpittore
parents:
5946
diff
changeset
|
378 |