make/defs.make

*** 283,303 ****
    #   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 ppc ppc64 ppc64le zero,$(ARCH)))
    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/zero   = zero
  
    # BUILDARCH is usually the same as SRCARCH, except for sparcv9
    BUILDARCH ?= $(SRCARCH)
    ifeq ($(BUILDARCH), x86)
      ifdef LP64
--- 283,304 ----
    #   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 ppc ppc64 ppc64le zero aarch64,$(ARCH)))
    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/zero   = zero
+   ARCH/aarch64 = aarch64
  
    # BUILDARCH is usually the same as SRCARCH, except for sparcv9
    BUILDARCH ?= $(SRCARCH)
    ifeq ($(BUILDARCH), x86)
      ifdef LP64
*** 324,340 ****
      LIBARCH      ?= $(LIBARCH/$(BUILDARCH))
    endif
    LIBARCH        ?= $(LIBARCH/$(BUILDARCH))
    LIBARCH/i486    = i386
    LIBARCH/amd64   = amd64
    LIBARCH/sparc   = sparc
    LIBARCH/sparcv9 = sparcv9
    LIBARCH/ia64    = ia64
    LIBARCH/ppc64   = ppc64
    LIBARCH/zero    = $(ZERO_LIBARCH)
  
!   LP64_ARCH += sparcv9 amd64 ia64 ppc64 zero
  endif
  
  # Required make macro settings for all platforms
  MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR)
  MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR)
--- 325,342 ----
      LIBARCH      ?= $(LIBARCH/$(BUILDARCH))
    endif
    LIBARCH        ?= $(LIBARCH/$(BUILDARCH))
    LIBARCH/i486    = i386
    LIBARCH/amd64   = amd64
+   LIBARCH/aarch64 = aarch64
    LIBARCH/sparc   = sparc
    LIBARCH/sparcv9 = sparcv9
    LIBARCH/ia64    = ia64
    LIBARCH/ppc64   = ppc64
    LIBARCH/zero    = $(ZERO_LIBARCH)
  
!   LP64_ARCH += sparcv9 amd64 ia64 ppc64 aarch64 zero
  endif
  
  # Required make macro settings for all platforms
  MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR)
  MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR)