make/defs.make

*** 284,308 ****
    #   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 aarch64 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/aarch64= aarch64
    ARCH/zero   = zero
  
    # BUILDARCH is usually the same as SRCARCH, except for sparcv9
!   BUILDARCH = $(SRCARCH)
    ifeq ($(BUILDARCH), x86)
      ifdef LP64
        BUILDARCH = amd64
      else
        BUILDARCH = i486
--- 284,306 ----
    #   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 ppc64 aarch64 zero,$(ARCH)))
    ARCH/       = x86
    ARCH/sparc  = sparc
    ARCH/sparc64= sparc
    ARCH/ia64   = ia64
    ARCH/amd64  = x86
    ARCH/x86_64 = x86
    ARCH/ppc64  = ppc
    ARCH/aarch64= aarch64
    ARCH/zero   = zero
  
    # BUILDARCH is usually the same as SRCARCH, except for sparcv9
!   BUILDARCH ?= $(SRCARCH)
    ifeq ($(BUILDARCH), x86)
      ifdef LP64
        BUILDARCH = amd64
      else
        BUILDARCH = i486
*** 318,337 ****
        BUILDARCH = ppc64
      endif
    endif
  
    # LIBARCH is 1:1 mapping from BUILDARCH
!   LIBARCH         = $(LIBARCH/$(BUILDARCH))
    LIBARCH/i486    = i386
    LIBARCH/amd64   = amd64
    LIBARCH/sparc   = sparc
    LIBARCH/sparcv9 = sparcv9
    LIBARCH/ia64    = ia64
    LIBARCH/ppc64   = ppc64
    LIBARCH/aarch64 = aarch64
-   LIBARCH/ppc     = ppc
-   LIBARCH/arm     = arm
    LIBARCH/zero    = $(ZERO_LIBARCH)
  
    LP64_ARCH = sparcv9 amd64 ia64 ppc64 aarch64 zero
  endif
  
--- 316,333 ----
        BUILDARCH = ppc64
      endif
    endif
  
    # LIBARCH is 1:1 mapping from BUILDARCH
!   LIBARCH        ?= $(LIBARCH/$(BUILDARCH))
    LIBARCH/i486    = i386
    LIBARCH/amd64   = amd64
    LIBARCH/sparc   = sparc
    LIBARCH/sparcv9 = sparcv9
    LIBARCH/ia64    = ia64
    LIBARCH/ppc64   = ppc64
    LIBARCH/aarch64 = aarch64
    LIBARCH/zero    = $(ZERO_LIBARCH)
  
    LP64_ARCH = sparcv9 amd64 ia64 ppc64 aarch64 zero
  endif