make/defs.make

*** 256,278 ****
    #   BUILDARCH - build directory
    #   LIBARCH   - directory name in JDK/JRE
  
    # Use uname output for SRCARCH, but deal with platform differences. If ARCH
    # is not explicitly listed below, it is treated as x86.
!   SRCARCH     = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc ppc64 zero,$(ARCH)))
    ARCH/       = x86
    ARCH/sparc  = sparc
    ARCH/sparc64= sparc
    ARCH/ia64   = ia64
    ARCH/amd64  = x86
    ARCH/x86_64 = x86
    ARCH/ppc64  = ppc
    ARCH/ppc    = ppc
    ARCH/arm    = arm
    ARCH/zero   = zero
  
!   # BUILDARCH is usually the same as SRCARCH, except for sparcv9
    BUILDARCH = $(SRCARCH)
    ifeq ($(BUILDARCH), x86)
      ifdef LP64
        BUILDARCH = amd64
      else
--- 256,283 ----
    #   BUILDARCH - build directory
    #   LIBARCH   - directory name in JDK/JRE
  
    # Use uname output for SRCARCH, but deal with platform differences. If ARCH
    # is not explicitly listed below, it is treated as x86.
!   ARCH_FLAVOR = $(filter sparc sparc64 ia64 amd64 x86_64 arm ppc ppc64 ppc64le zero,$(ARCH))
!   ifeq (,$(ARCH_FLAVOR))
!     $(warning Unknown architecture $(ARCH), assuming x86)
!   endif
!   SRCARCH     = $(ARCH/$(ARCH_FLAVOR))
    ARCH/       = x86
    ARCH/sparc  = sparc
    ARCH/sparc64= sparc
    ARCH/ia64   = ia64
    ARCH/amd64  = x86
    ARCH/x86_64 = x86
    ARCH/ppc64  = ppc
+   ARCH/ppc64le= ppc
    ARCH/ppc    = ppc
    ARCH/arm    = arm
    ARCH/zero   = zero
  
!   # BUILDARCH is usually the same as SRCARCH, except for 32/64 difference
    BUILDARCH = $(SRCARCH)
    ifeq ($(BUILDARCH), x86)
      ifdef LP64
        BUILDARCH = amd64
      else
*** 284,295 ****
--- 289,304 ----
        BUILDARCH = sparcv9
      endif
    endif
    ifeq ($(BUILDARCH), ppc)
      ifdef LP64
+       ifeq ($(ARCH_FLAVOR),ppc64)
          BUILDARCH = ppc64
        else
+         BUILDARCH = ppc64le
+       endif
+     else
        BUILDARCH = ppc
      endif
    endif
  
    # LIBARCH is 1:1 mapping from BUILDARCH
*** 298,312 ****
    LIBARCH/amd64   = amd64
    LIBARCH/sparc   = sparc
    LIBARCH/sparcv9 = sparcv9
    LIBARCH/ia64    = ia64
    LIBARCH/ppc64   = ppc64
    LIBARCH/ppc     = ppc
    LIBARCH/arm     = arm
    LIBARCH/zero    = $(ZERO_LIBARCH)
  
!   LP64_ARCH = sparcv9 amd64 ia64 ppc64 zero
  endif
  
  # Required make macro settings for all platforms
  MAKE_ARGS += JAVA_HOME=$(ABS_BOOTDIR)
  MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR)
--- 307,322 ----
    LIBARCH/amd64   = amd64
    LIBARCH/sparc   = sparc
    LIBARCH/sparcv9 = sparcv9
    LIBARCH/ia64    = ia64
    LIBARCH/ppc64   = ppc64
+   LIBARCH/ppc64le = ppc64le
    LIBARCH/ppc     = ppc
    LIBARCH/arm     = arm
    LIBARCH/zero    = $(ZERO_LIBARCH)
  
!   LP64_ARCH = sparcv9 amd64 ia64 ppc64 ppc64le zero
  endif
  
  # Required make macro settings for all platforms
  MAKE_ARGS += JAVA_HOME=$(ABS_BOOTDIR)
  MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR)