Mercurial > hg > graal-compiler

comparison make/Makefile @ 10277:aabf54ccedb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8008772: remove gamma launcher Reviewed-by: kvn, neliasso, ctornqvi
author twisti
date Mon, 06 May 2013 19:49:23 -0700
parents 1c6887c9afaa
children f2110083203d 164db61dbced
comparison
equal deleted inserted replaced
10276:f0bc60565ba8 10277:aabf54ccedb1
149 $(CD) $(OUTPUTDIR); \ 149 $(CD) $(OUTPUTDIR); \
150 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 150 $(MAKE) -f $(ABS_OS_MAKEFILE) \
151 $(MAKE_ARGS) BUILD_FLAVOR=product docs 151 $(MAKE_ARGS) BUILD_FLAVOR=product docs
152 endif 152 endif
153 153
154 # Output directories
155 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
156 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
157 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
158 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero
159 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark
160
154 # Build variation of hotspot 161 # Build variation of hotspot
155 $(C1_VM_TARGETS): 162 $(C1_VM_TARGETS):
156 $(CD) $(GAMMADIR)/make; \ 163 $(CD) $(GAMMADIR)/make; \
157 $(MAKE) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT) 164 $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT)
158 165
159 $(C2_VM_TARGETS): 166 $(C2_VM_TARGETS):
160 $(CD) $(GAMMADIR)/make; \ 167 $(CD) $(GAMMADIR)/make; \
161 $(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT) 168 $(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
162 169
163 $(ZERO_VM_TARGETS): 170 $(ZERO_VM_TARGETS):
164 $(CD) $(GAMMADIR)/make; \ 171 $(CD) $(GAMMADIR)/make; \
165 $(MAKE) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ \ 172 $(MAKE) BUILD_DIR=$(ZERO_DIR) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
166 generic_buildzero $(ALT_OUT)
167 173
168 $(SHARK_VM_TARGETS): 174 $(SHARK_VM_TARGETS):
169 $(CD) $(GAMMADIR)/make; \ 175 $(CD) $(GAMMADIR)/make; \
170 $(MAKE) BUILD_FLAVOR=$(@:%shark=%) VM_TARGET=$@ \ 176 $(MAKE) BUILD_DIR=$(SHARK_DIR) BUILD_FLAVOR=$(@:%shark=%) VM_TARGET=$@ generic_buildshark $(ALT_OUT)
171 generic_buildshark $(ALT_OUT)
172 177
173 $(MINIMAL1_VM_TARGETS): 178 $(MINIMAL1_VM_TARGETS):
174 $(CD) $(GAMMADIR)/make; \ 179 $(CD) $(GAMMADIR)/make; \
175 $(MAKE) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ \ 180 $(MAKE) BUILD_DIR=$(MINIMAL1_DIR) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ generic_buildminimal1 $(ALT_OUT)
176 generic_buildminimal1 $(ALT_OUT) 181
182 # Install hotspot script in build directory
183 HOTSPOT_SCRIPT=$(BUILD_DIR)/$(BUILD_FLAVOR)/hotspot
184 $(HOTSPOT_SCRIPT): $(GAMMADIR)/make/hotspot.script
185 $(QUIETLY) $(MKDIR) -p $(BUILD_DIR)/$(BUILD_FLAVOR)
186 $(QUIETLY) cat $< | sed -e 's|@@LIBARCH@@|$(LIBARCH)|g' | sed -e 's|@@JDK_IMPORT_PATH@@|$(JDK_IMPORT_PATH)|g' > $@
187 $(QUIETLY) chmod +x $@
177 188
178 # Build compiler1 (client) rule, different for platforms 189 # Build compiler1 (client) rule, different for platforms
179 generic_build1: 190 generic_build1: $(HOTSPOT_SCRIPT)
180 $(MKDIR) -p $(OUTPUTDIR) 191 $(MKDIR) -p $(OUTPUTDIR)
181 ifeq ($(OSNAME),windows) 192 ifeq ($(OSNAME),windows)
182 ifeq ($(ARCH_DATA_MODEL), 32) 193 ifeq ($(ARCH_DATA_MODEL), 32)
183 $(CD) $(OUTPUTDIR); \ 194 $(CD) $(OUTPUTDIR); \
184 $(NMAKE) -f $(ABS_OS_MAKEFILE) \ 195 $(NMAKE) -f $(ABS_OS_MAKEFILE) \
199 @$(ECHO) "No compiler1 ($(VM_TARGET)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)" 210 @$(ECHO) "No compiler1 ($(VM_TARGET)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
200 endif 211 endif
201 endif 212 endif
202 213
203 # Build compiler2 (server) rule, different for platforms 214 # Build compiler2 (server) rule, different for platforms
204 generic_build2: 215 generic_build2: $(HOTSPOT_SCRIPT)
205 $(MKDIR) -p $(OUTPUTDIR) 216 $(MKDIR) -p $(OUTPUTDIR)
206 ifeq ($(OSNAME),windows) 217 ifeq ($(OSNAME),windows)
207 $(CD) $(OUTPUTDIR); \ 218 $(CD) $(OUTPUTDIR); \
208 $(NMAKE) -f $(ABS_OS_MAKEFILE) \ 219 $(NMAKE) -f $(ABS_OS_MAKEFILE) \
209 Variant=compiler2 \ 220 Variant=compiler2 \
215 $(CD) $(OUTPUTDIR); \ 226 $(CD) $(OUTPUTDIR); \
216 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 227 $(MAKE) -f $(ABS_OS_MAKEFILE) \
217 $(MAKE_ARGS) $(VM_TARGET) 228 $(MAKE_ARGS) $(VM_TARGET)
218 endif 229 endif
219 230
220 generic_buildzero: 231 generic_buildzero: $(HOTSPOT_SCRIPT)
221 $(MKDIR) -p $(OUTPUTDIR) 232 $(MKDIR) -p $(OUTPUTDIR)
222 $(CD) $(OUTPUTDIR); \ 233 $(CD) $(OUTPUTDIR); \
223 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 234 $(MAKE) -f $(ABS_OS_MAKEFILE) \
224 $(MAKE_ARGS) $(VM_TARGET) 235 $(MAKE_ARGS) $(VM_TARGET)
225 236
226 generic_buildshark: 237 generic_buildshark: $(HOTSPOT_SCRIPT)
227 $(MKDIR) -p $(OUTPUTDIR) 238 $(MKDIR) -p $(OUTPUTDIR)
228 $(CD) $(OUTPUTDIR); \ 239 $(CD) $(OUTPUTDIR); \
229 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 240 $(MAKE) -f $(ABS_OS_MAKEFILE) \
230 $(MAKE_ARGS) $(VM_TARGET) 241 $(MAKE_ARGS) $(VM_TARGET)
231 242
232 generic_buildminimal1: 243 generic_buildminimal1: $(HOTSPOT_SCRIPT)
233 ifeq ($(JVM_VARIANT_MINIMAL1),true) 244 ifeq ($(JVM_VARIANT_MINIMAL1),true)
234 $(MKDIR) -p $(OUTPUTDIR) 245 $(MKDIR) -p $(OUTPUTDIR)
235 ifeq ($(ARCH_DATA_MODEL), 32) 246 ifeq ($(ARCH_DATA_MODEL), 32)
236 ifeq ($(OSNAME),windows) 247 ifeq ($(OSNAME),windows)
237 $(ECHO) "No ($(VM_TARGET)) for $(OSNAME) ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)" ; 248 $(ECHO) "No ($(VM_TARGET)) for $(OSNAME) ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)" ;
250 @$(ECHO) "Error: trying to build a minimal target but JVM_VARIANT_MINIMAL1 is not true." 261 @$(ECHO) "Error: trying to build a minimal target but JVM_VARIANT_MINIMAL1 is not true."
251 endif 262 endif
252 263
253 # Export file rule 264 # Export file rule
254 generic_export: $(EXPORT_LIST) 265 generic_export: $(EXPORT_LIST)
266
255 export_product: 267 export_product:
256 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 268 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) generic_export
257 generic_export
258 export_fastdebug: 269 export_fastdebug:
259 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 270 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
260 EXPORT_SUBDIR=/$(@:export_%=%) \
261 generic_export
262 export_debug: 271 export_debug:
263 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 272 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
264 EXPORT_SUBDIR=/$(@:export_%=%) \
265 generic_export
266 export_optimized: 273 export_optimized:
267 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 274 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
268 EXPORT_SUBDIR=/$(@:export_%=%) \ 275
269 generic_export
270 export_product_jdk:: 276 export_product_jdk::
271 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \ 277 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) generic_export
272 VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
273 generic_export
274 export_optimized_jdk:: 278 export_optimized_jdk::
275 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \ 279 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) generic_export
276 VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
277 generic_export
278 export_fastdebug_jdk:: 280 export_fastdebug_jdk::
279 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \ 281 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) generic_export
280 VM_SUBDIR=$(@:export_%_jdk=%) \
281 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
282 generic_export
283 export_debug_jdk:: 282 export_debug_jdk::
284 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=$(@:export_%_jdk=%) \ 283 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) generic_export
285 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
286 generic_export
287 284
288 # Export file copy rules 285 # Export file copy rules
289 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt 286 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
290 DOCS_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_docs 287 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
291 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1/$(VM_SUBDIR) 288 C1_BUILD_DIR =$(C1_DIR)/$(BUILD_FLAVOR)
292 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2/$(VM_SUBDIR) 289 C2_BUILD_DIR =$(C2_DIR)/$(BUILD_FLAVOR)
293 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1/$(VM_SUBDIR) 290 MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR)
294 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero/$(VM_SUBDIR) 291 ZERO_BUILD_DIR =$(ZERO_DIR)/$(BUILD_FLAVOR)
295 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark/$(VM_SUBDIR) 292 SHARK_BUILD_DIR =$(SHARK_DIR)/$(BUILD_FLAVOR)
296 293
297 # Server (C2) 294 # Server (C2)
298 ifeq ($(JVM_VARIANT_SERVER), true) 295 ifeq ($(JVM_VARIANT_SERVER), true)
299 # Common 296 # Common
300 $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz 297 $(EXPORT_SERVER_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz
301 $(install-file) 298 $(install-file)
302 $(EXPORT_LIB_DIR)/%.jar: $(C2_DIR)/../generated/%.jar 299 $(EXPORT_LIB_DIR)/%.jar: $(C2_BUILD_DIR)/../generated/%.jar
303 $(install-file) 300 $(install-file)
304 $(EXPORT_INCLUDE_DIR)/%: $(C2_DIR)/../generated/jvmtifiles/% 301 $(EXPORT_INCLUDE_DIR)/%: $(C2_BUILD_DIR)/../generated/jvmtifiles/%
305 $(install-file) 302 $(install-file)
306 # Windows 303 # Windows
307 $(EXPORT_SERVER_DIR)/%.dll: $(C2_DIR)/%.dll 304 $(EXPORT_SERVER_DIR)/%.dll: $(C2_BUILD_DIR)/%.dll
308 $(install-file) 305 $(install-file)
309 $(EXPORT_SERVER_DIR)/%.pdb: $(C2_DIR)/%.pdb 306 $(EXPORT_SERVER_DIR)/%.pdb: $(C2_BUILD_DIR)/%.pdb
310 $(install-file) 307 $(install-file)
311 $(EXPORT_SERVER_DIR)/%.map: $(C2_DIR)/%.map 308 $(EXPORT_SERVER_DIR)/%.map: $(C2_BUILD_DIR)/%.map
312 $(install-file) 309 $(install-file)
313 $(EXPORT_LIB_DIR)/%.lib: $(C2_DIR)/%.lib 310 $(EXPORT_LIB_DIR)/%.lib: $(C2_BUILD_DIR)/%.lib
314 $(install-file) 311 $(install-file)
315 $(EXPORT_JRE_BIN_DIR)/%.diz: $(C2_DIR)/%.diz 312 $(EXPORT_JRE_BIN_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz
316 $(install-file) 313 $(install-file)
317 $(EXPORT_JRE_BIN_DIR)/%.dll: $(C2_DIR)/%.dll 314 $(EXPORT_JRE_BIN_DIR)/%.dll: $(C2_BUILD_DIR)/%.dll
318 $(install-file) 315 $(install-file)
319 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(C2_DIR)/%.pdb 316 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(C2_BUILD_DIR)/%.pdb
320 $(install-file) 317 $(install-file)
321 $(EXPORT_JRE_BIN_DIR)/%.map: $(C2_DIR)/%.map 318 $(EXPORT_JRE_BIN_DIR)/%.map: $(C2_BUILD_DIR)/%.map
322 $(install-file) 319 $(install-file)
323 # Unix 320 # Unix
324 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 321 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
325 $(install-file) 322 $(install-file)
326 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 323 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
327 $(install-file) 324 $(install-file)
328 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 325 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
329 $(install-file) 326 $(install-file)
330 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo 327 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_BUILD_DIR)/%.debuginfo
331 $(install-file) 328 $(install-file)
332 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo 329 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_BUILD_DIR)/%.debuginfo
333 $(install-file) 330 $(install-file)
334 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo 331 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_BUILD_DIR)/%.debuginfo
335 $(install-file) 332 $(install-file)
336 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_DIR)/%.diz 333 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz
337 $(install-file) 334 $(install-file)
338 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_DIR)/%.diz 335 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_BUILD_DIR)/%.diz
339 $(install-file) 336 $(install-file)
340 endif 337 endif
341 338
342 # Client (C1) 339 # Client (C1)
343 ifeq ($(JVM_VARIANT_CLIENT), true) 340 ifeq ($(JVM_VARIANT_CLIENT), true)
344 # Common 341 # Common
345 $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz 342 $(EXPORT_CLIENT_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz
346 $(install-file) 343 $(install-file)
347 $(EXPORT_LIB_DIR)/%.jar: $(C1_DIR)/../generated/%.jar 344 $(EXPORT_LIB_DIR)/%.jar: $(C1_BUILD_DIR)/../generated/%.jar
348 $(install-file) 345 $(install-file)
349 $(EXPORT_INCLUDE_DIR)/%: $(C1_DIR)/../generated/jvmtifiles/% 346 $(EXPORT_INCLUDE_DIR)/%: $(C1_BUILD_DIR)/../generated/jvmtifiles/%
350 $(install-file) 347 $(install-file)
351 # Windows 348 # Windows
352 $(EXPORT_CLIENT_DIR)/%.dll: $(C1_DIR)/%.dll 349 $(EXPORT_CLIENT_DIR)/%.dll: $(C1_BUILD_DIR)/%.dll
353 $(install-file) 350 $(install-file)
354 $(EXPORT_CLIENT_DIR)/%.pdb: $(C1_DIR)/%.pdb 351 $(EXPORT_CLIENT_DIR)/%.pdb: $(C1_BUILD_DIR)/%.pdb
355 $(install-file) 352 $(install-file)
356 $(EXPORT_CLIENT_DIR)/%.map: $(C1_DIR)/%.map 353 $(EXPORT_CLIENT_DIR)/%.map: $(C1_BUILD_DIR)/%.map
357 $(install-file) 354 $(install-file)
358 $(EXPORT_LIB_DIR)/%.lib: $(C1_DIR)/%.lib 355 $(EXPORT_LIB_DIR)/%.lib: $(C1_BUILD_DIR)/%.lib
359 $(install-file) 356 $(install-file)
360 $(EXPORT_JRE_BIN_DIR)/%.diz: $(C1_DIR)/%.diz 357 $(EXPORT_JRE_BIN_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz
361 $(install-file) 358 $(install-file)
362 $(EXPORT_JRE_BIN_DIR)/%.dll: $(C1_DIR)/%.dll 359 $(EXPORT_JRE_BIN_DIR)/%.dll: $(C1_BUILD_DIR)/%.dll
363 $(install-file) 360 $(install-file)
364 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(C1_DIR)/%.pdb 361 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(C1_BUILD_DIR)/%.pdb
365 $(install-file) 362 $(install-file)
366 $(EXPORT_JRE_BIN_DIR)/%.map: $(C1_DIR)/%.map 363 $(EXPORT_JRE_BIN_DIR)/%.map: $(C1_BUILD_DIR)/%.map
367 $(install-file) 364 $(install-file)
368 # Unix 365 # Unix
369 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 366 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
370 $(install-file) 367 $(install-file)
371 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 368 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
372 $(install-file) 369 $(install-file)
373 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 370 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
374 $(install-file) 371 $(install-file)
375 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo 372 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_BUILD_DIR)/%.debuginfo
376 $(install-file) 373 $(install-file)
377 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo 374 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_BUILD_DIR)/%.debuginfo
378 $(install-file) 375 $(install-file)
379 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo 376 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_BUILD_DIR)/%.debuginfo
380 $(install-file) 377 $(install-file)
381 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_DIR)/%.diz 378 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz
382 $(install-file) 379 $(install-file)
383 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_DIR)/%.diz 380 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_BUILD_DIR)/%.diz
384 $(install-file) 381 $(install-file)
385 endif 382 endif
386 383
387 # Minimal1 384 # Minimal1
388 ifeq ($(JVM_VARIANT_MINIMAL1), true) 385 ifeq ($(JVM_VARIANT_MINIMAL1), true)
389 # Common 386 # Common
390 $(EXPORT_MINIMAL_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz 387 $(EXPORT_MINIMAL_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
391 $(install-file) 388 $(install-file)
392 $(EXPORT_LIB_DIR)/%.jar: $(MINIMAL1_DIR)/../generated/%.jar 389 $(EXPORT_LIB_DIR)/%.jar: $(MINIMAL1_BUILD_DIR)/../generated/%.jar
393 $(install-file) 390 $(install-file)
394 $(EXPORT_INCLUDE_DIR)/%: $(MINIMAL1_DIR)/../generated/jvmtifiles/% 391 $(EXPORT_INCLUDE_DIR)/%: $(MINIMAL1_BUILD_DIR)/../generated/jvmtifiles/%
395 $(install-file) 392 $(install-file)
396 # Windows 393 # Windows
397 $(EXPORT_MINIMAL_DIR)/%.dll: $(MINIMAL1_DIR)/%.dll 394 $(EXPORT_MINIMAL_DIR)/%.dll: $(MINIMAL1_BUILD_DIR)/%.dll
398 $(install-file) 395 $(install-file)
399 $(EXPORT_MINIMAL_DIR)/%.pdb: $(MINIMAL1_DIR)/%.pdb 396 $(EXPORT_MINIMAL_DIR)/%.pdb: $(MINIMAL1_BUILD_DIR)/%.pdb
400 $(install-file) 397 $(install-file)
401 $(EXPORT_MINIMAL_DIR)/%.map: $(MINIMAL1_DIR)/%.map 398 $(EXPORT_MINIMAL_DIR)/%.map: $(MINIMAL1_BUILD_DIR)/%.map
402 $(install-file) 399 $(install-file)
403 $(EXPORT_LIB_DIR)/%.lib: $(MINIMAL1_DIR)/%.lib 400 $(EXPORT_LIB_DIR)/%.lib: $(MINIMAL1_BUILD_DIR)/%.lib
404 $(install-file) 401 $(install-file)
405 $(EXPORT_JRE_BIN_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz 402 $(EXPORT_JRE_BIN_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
406 $(install-file) 403 $(install-file)
407 $(EXPORT_JRE_BIN_DIR)/%.dll: $(MINIMAL1_DIR)/%.dll 404 $(EXPORT_JRE_BIN_DIR)/%.dll: $(MINIMAL1_BUILD_DIR)/%.dll
408 $(install-file) 405 $(install-file)
409 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(MINIMAL1_DIR)/%.pdb 406 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(MINIMAL1_BUILD_DIR)/%.pdb
410 $(install-file) 407 $(install-file)
411 $(EXPORT_JRE_BIN_DIR)/%.map: $(MINIMAL1_DIR)/%.map 408 $(EXPORT_JRE_BIN_DIR)/%.map: $(MINIMAL1_BUILD_DIR)/%.map
412 $(install-file) 409 $(install-file)
413 # Unix 410 # Unix
414 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX) 411 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
415 $(install-file) 412 $(install-file)
416 $(EXPORT_MINIMAL_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX) 413 $(EXPORT_MINIMAL_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
417 $(install-file) 414 $(install-file)
418 $(EXPORT_MINIMAL_DIR)/64/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX) 415 $(EXPORT_MINIMAL_DIR)/64/%.$(LIBRARY_SUFFIX): $(MINIMAL1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
419 $(install-file) 416 $(install-file)
420 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo 417 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(MINIMAL1_BUILD_DIR)/%.debuginfo
421 $(install-file) 418 $(install-file)
422 $(EXPORT_MINIMAL_DIR)/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo 419 $(EXPORT_MINIMAL_DIR)/%.debuginfo: $(MINIMAL1_BUILD_DIR)/%.debuginfo
423 $(install-file) 420 $(install-file)
424 $(EXPORT_MINIMAL_DIR)/64/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo 421 $(EXPORT_MINIMAL_DIR)/64/%.debuginfo: $(MINIMAL1_BUILD_DIR)/%.debuginfo
425 $(install-file) 422 $(install-file)
426 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz 423 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
427 $(install-file) 424 $(install-file)
428 $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_DIR)/%.diz 425 $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
429 $(install-file) 426 $(install-file)
430 endif 427 endif
431 428
432 # Zero 429 # Zero
433 ifeq ($(JVM_VARIANT_ZERO), true) 430 ifeq ($(JVM_VARIANT_ZERO), true)
434 # Common 431 # Common
435 $(EXPORT_LIB_DIR)/%.jar: $(ZERO_DIR)/../generated/%.jar 432 $(EXPORT_LIB_DIR)/%.jar: $(ZERO_BUILD_DIR)/../generated/%.jar
436 $(install-file) 433 $(install-file)
437 $(EXPORT_INCLUDE_DIR)/%: $(ZERO_DIR)/../generated/jvmtifiles/% 434 $(EXPORT_INCLUDE_DIR)/%: $(ZERO_BUILD_DIR)/../generated/jvmtifiles/%
438 $(install-file) 435 $(install-file)
439 # Unix 436 # Unix
440 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) 437 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
441 $(install-file) 438 $(install-file)
442 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(ZERO_DIR)/%.debuginfo 439 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo
443 $(install-file) 440 $(install-file)
444 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(ZERO_DIR)/%.diz 441 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz
445 $(install-file) 442 $(install-file)
446 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) 443 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
447 $(install-file) 444 $(install-file)
448 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_DIR)/%.debuginfo 445 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo
449 $(install-file) 446 $(install-file)
450 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_DIR)/%.diz 447 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz
451 $(install-file) 448 $(install-file)
452 endif 449 endif
453 450
454 # Shark 451 # Shark
455 ifeq ($(JVM_VARIANT_ZEROSHARK), true) 452 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
456 # Common 453 # Common
457 $(EXPORT_LIB_DIR)/%.jar: $(SHARK_DIR)/../generated/%.jar 454 $(EXPORT_LIB_DIR)/%.jar: $(SHARK_BUILD_DIR)/../generated/%.jar
458 $(install-file) 455 $(install-file)
459 $(EXPORT_INCLUDE_DIR)/%: $(SHARK_DIR)/../generated/jvmtifiles/% 456 $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD_DIR)/../generated/jvmtifiles/%
460 $(install-file) 457 $(install-file)
461 # Unix 458 # Unix
462 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) 459 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
463 $(install-file) 460 $(install-file)
464 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo): $(SHARK_DIR)/%.debuginfo 461 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo): $(SHARK_BUILD_DIR)/%.debuginfo
465 $(install-file) 462 $(install-file)
466 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_DIR)/%.diz 463 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz
467 $(install-file) 464 $(install-file)
468 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) 465 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
469 $(install-file) 466 $(install-file)
470 $(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_DIR)/%.debuginfo 467 $(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_BUILD_DIR)/%.debuginfo
471 $(install-file) 468 $(install-file)
472 $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_DIR)/%.diz 469 $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz
473 $(install-file) 470 $(install-file)
474 endif 471 endif
475 472
476 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/% 473 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/%
477 $(install-file) 474 $(install-file)