comparison make/defs.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 3908ad124838
comparison
equal deleted inserted replaced
1009:03b336640699 1010:354d3184f6b2
190 # BUILDARCH - build directory 190 # BUILDARCH - build directory
191 # LIBARCH - directory name in JDK/JRE 191 # LIBARCH - directory name in JDK/JRE
192 192
193 # Use uname output for SRCARCH, but deal with platform differences. If ARCH 193 # Use uname output for SRCARCH, but deal with platform differences. If ARCH
194 # is not explicitly listed below, it is treated as x86. 194 # is not explicitly listed below, it is treated as x86.
195 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64,$(ARCH))) 195 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 zero,$(ARCH)))
196 ARCH/ = x86 196 ARCH/ = x86
197 ARCH/sparc = sparc 197 ARCH/sparc = sparc
198 ARCH/sparc64= sparc 198 ARCH/sparc64= sparc
199 ARCH/ia64 = ia64 199 ARCH/ia64 = ia64
200 ARCH/amd64 = x86 200 ARCH/amd64 = x86
201 ARCH/x86_64 = x86 201 ARCH/x86_64 = x86
202 ARCH/zero = zero
202 203
203 # BUILDARCH is usually the same as SRCARCH, except for sparcv9 204 # BUILDARCH is usually the same as SRCARCH, except for sparcv9
204 BUILDARCH = $(SRCARCH) 205 BUILDARCH = $(SRCARCH)
205 ifeq ($(BUILDARCH), x86) 206 ifeq ($(BUILDARCH), x86)
206 ifdef LP64 207 ifdef LP64
220 LIBARCH/i486 = i386 221 LIBARCH/i486 = i386
221 LIBARCH/amd64 = amd64 222 LIBARCH/amd64 = amd64
222 LIBARCH/sparc = sparc 223 LIBARCH/sparc = sparc
223 LIBARCH/sparcv9 = sparcv9 224 LIBARCH/sparcv9 = sparcv9
224 LIBARCH/ia64 = ia64 225 LIBARCH/ia64 = ia64
225 226 LIBARCH/zero = $(ZERO_LIBARCH)
226 LP64_ARCH = sparcv9 amd64 ia64 227
228 LP64_ARCH = sparcv9 amd64 ia64 zero
227 endif 229 endif
228 230
229 # Required make macro settings for all platforms 231 # Required make macro settings for all platforms
230 MAKE_ARGS += JAVA_HOME=$(ABS_BOOTDIR) 232 MAKE_ARGS += JAVA_HOME=$(ABS_BOOTDIR)
231 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) 233 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR)