equal
deleted
inserted
replaced
257 # BUILDARCH - build directory |
257 # BUILDARCH - build directory |
258 # LIBARCH - directory name in JDK/JRE |
258 # LIBARCH - directory name in JDK/JRE |
259 |
259 |
260 # Use uname output for SRCARCH, but deal with platform differences. If ARCH |
260 # Use uname output for SRCARCH, but deal with platform differences. If ARCH |
261 # is not explicitly listed below, it is treated as x86. |
261 # is not explicitly listed below, it is treated as x86. |
262 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc zero,$(ARCH))) |
262 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc ppc64 zero,$(ARCH))) |
263 ARCH/ = x86 |
263 ARCH/ = x86 |
264 ARCH/sparc = sparc |
264 ARCH/sparc = sparc |
265 ARCH/sparc64= sparc |
265 ARCH/sparc64= sparc |
266 ARCH/ia64 = ia64 |
266 ARCH/ia64 = ia64 |
267 ARCH/amd64 = x86 |
267 ARCH/amd64 = x86 |
283 ifeq ($(BUILDARCH), sparc) |
283 ifeq ($(BUILDARCH), sparc) |
284 ifdef LP64 |
284 ifdef LP64 |
285 BUILDARCH = sparcv9 |
285 BUILDARCH = sparcv9 |
286 endif |
286 endif |
287 endif |
287 endif |
|
288 ifeq ($(BUILDARCH), ppc) |
|
289 ifdef LP64 |
|
290 BUILDARCH = ppc64 |
|
291 endif |
|
292 endif |
288 |
293 |
289 # LIBARCH is 1:1 mapping from BUILDARCH |
294 # LIBARCH is 1:1 mapping from BUILDARCH |
290 LIBARCH = $(LIBARCH/$(BUILDARCH)) |
295 LIBARCH = $(LIBARCH/$(BUILDARCH)) |
291 LIBARCH/i486 = i386 |
296 LIBARCH/i486 = i386 |
292 LIBARCH/amd64 = amd64 |
297 LIBARCH/amd64 = amd64 |
293 LIBARCH/sparc = sparc |
298 LIBARCH/sparc = sparc |
294 LIBARCH/sparcv9 = sparcv9 |
299 LIBARCH/sparcv9 = sparcv9 |
295 LIBARCH/ia64 = ia64 |
300 LIBARCH/ia64 = ia64 |
296 LIBARCH/ppc64 = ppc |
301 LIBARCH/ppc64 = ppc64 |
297 LIBARCH/ppc = ppc |
302 LIBARCH/ppc = ppc |
298 LIBARCH/arm = arm |
303 LIBARCH/arm = arm |
299 LIBARCH/zero = $(ZERO_LIBARCH) |
304 LIBARCH/zero = $(ZERO_LIBARCH) |
300 |
305 |
301 LP64_ARCH = sparcv9 amd64 ia64 zero |
306 LP64_ARCH = sparcv9 amd64 ia64 ppc64 zero |
302 endif |
307 endif |
303 |
308 |
304 # Required make macro settings for all platforms |
309 # Required make macro settings for all platforms |
305 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR) |
310 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR) |
306 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) |
311 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) |