Mercurial > hg > graal-jvmci-8
comparison make/linux/makefiles/buildtree.make @ 1010:354d3184f6b2
6890308: integrate zero assembler hotspot changes
Reviewed-by: never
Contributed-by: gbenson@redhat.com
author | never |
---|---|
date | Tue, 13 Oct 2009 12:04:21 -0700 |
parents | 9c2ecc2ffb12 |
children | c18cbe5936b8 |
comparison
equal
deleted
inserted
replaced
1009:03b336640699 | 1010:354d3184f6b2 |
---|---|
61 QUIETLY$(MAKE_VERBOSE) = @ | 61 QUIETLY$(MAKE_VERBOSE) = @ |
62 | 62 |
63 # For now, until the compiler is less wobbly: | 63 # For now, until the compiler is less wobbly: |
64 TESTFLAGS = -Xbatch -showversion | 64 TESTFLAGS = -Xbatch -showversion |
65 | 65 |
66 ifdef USE_SUNCC | 66 ifeq ($(ZERO_BUILD), true) |
67 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc | 67 PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero |
68 else | 68 else |
69 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH) | 69 ifdef USE_SUNCC |
70 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc | |
71 else | |
72 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH) | |
73 endif | |
74 endif | |
75 | |
76 # Allow overriding of the arch part of the directory but default | |
77 # to BUILDARCH if nothing is specified | |
78 ifeq ($(VARIANTARCH),) | |
79 VARIANTARCH=$(BUILDARCH) | |
70 endif | 80 endif |
71 | 81 |
72 ifdef FORCE_TIERED | 82 ifdef FORCE_TIERED |
73 ifeq ($(VARIANT),tiered) | 83 ifeq ($(VARIANT),tiered) |
74 PLATFORM_DIR = $(OS_FAMILY)_$(BUILDARCH)_compiler2 | 84 PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_compiler2 |
75 else | 85 else |
76 PLATFORM_DIR = $(OS_FAMILY)_$(BUILDARCH)_$(VARIANT) | 86 PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT) |
77 endif | 87 endif |
78 else | 88 else |
79 PLATFORM_DIR = $(OS_FAMILY)_$(BUILDARCH)_$(VARIANT) | 89 PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT) |
80 endif | 90 endif |
81 | 91 |
82 # | 92 # |
83 # We do two levels of exclusion in the shared directory. | 93 # We do two levels of exclusion in the shared directory. |
84 # TOPLEVEL excludes are pruned, they are not recursively searched, | 94 # TOPLEVEL excludes are pruned, they are not recursively searched, |
319 DATA_MODE/i486 = 32 | 329 DATA_MODE/i486 = 32 |
320 DATA_MODE/sparc = 32 | 330 DATA_MODE/sparc = 32 |
321 DATA_MODE/sparcv9 = 64 | 331 DATA_MODE/sparcv9 = 64 |
322 DATA_MODE/amd64 = 64 | 332 DATA_MODE/amd64 = 64 |
323 DATA_MODE/ia64 = 64 | 333 DATA_MODE/ia64 = 64 |
334 DATA_MODE/zero = $(ARCH_DATA_MODEL) | |
324 | 335 |
325 JAVA_FLAG/32 = -d32 | 336 JAVA_FLAG/32 = -d32 |
326 JAVA_FLAG/64 = -d64 | 337 JAVA_FLAG/64 = -d64 |
327 | 338 |
328 WRONG_DATA_MODE_MSG = \ | 339 WRONG_DATA_MODE_MSG = \ |