make/linux/makefiles/defs.make

*** 67,77 ****
    VM_PLATFORM     = linux_ia64
    HS_ARCH         = ia64
  endif
  
  # sparc
! ifeq ($(ARCH), sparc64)
    ifeq ($(ARCH_DATA_MODEL), 64)
      ARCH_DATA_MODEL  = 64
      MAKE_ARGS        += LP64=1
      PLATFORM         = linux-sparcv9
      VM_PLATFORM      = linux_sparcv9
--- 67,77 ----
    VM_PLATFORM     = linux_ia64
    HS_ARCH         = ia64
  endif
  
  # sparc
! ifneq (,$(findstring $(ARCH), sparc))
    ifeq ($(ARCH_DATA_MODEL), 64)
      ARCH_DATA_MODEL  = 64
      MAKE_ARGS        += LP64=1
      PLATFORM         = linux-sparcv9
      VM_PLATFORM      = linux_sparcv9
*** 81,92 ****
      VM_PLATFORM      = linux_sparc
    endif
    HS_ARCH            = sparc
  endif
  
! # amd64/x86_64
! ifneq (,$(findstring $(ARCH), amd64 x86_64))
    ifeq ($(ARCH_DATA_MODEL), 64)
      ARCH_DATA_MODEL = 64
      MAKE_ARGS       += LP64=1
      PLATFORM        = linux-amd64
      VM_PLATFORM     = linux_amd64
--- 81,92 ----
      VM_PLATFORM      = linux_sparc
    endif
    HS_ARCH            = sparc
  endif
  
! # i686/i586 and amd64/x86_64
! ifneq (,$(findstring $(ARCH), amd64 x86_64 i686 i586))
    ifeq ($(ARCH_DATA_MODEL), 64)
      ARCH_DATA_MODEL = 64
      MAKE_ARGS       += LP64=1
      PLATFORM        = linux-amd64
      VM_PLATFORM     = linux_amd64
*** 99,138 ****
      # We have to reset ARCH to i686 since SRCARCH relies on it
      ARCH            = i686
    endif
  endif
  
- # i686/i586 ie 32-bit x86
- ifneq (,$(findstring $(ARCH), i686 i586))
-   ARCH_DATA_MODEL  = 32
-   PLATFORM         = linux-i586
-   VM_PLATFORM      = linux_i486
-   HS_ARCH          = x86
- endif
- 
  # ARM
  ifeq ($(ARCH), arm)
    ARCH_DATA_MODEL  = 32
    PLATFORM         = linux-arm
    VM_PLATFORM      = linux_arm
    HS_ARCH          = arm
  endif
  
  # PPC
! ifeq ($(ARCH), ppc)
    ARCH_DATA_MODEL  = 32
    PLATFORM         = linux-ppc
    VM_PLATFORM      = linux_ppc
!   HS_ARCH          = ppc
! endif
  
- # PPC64
- ifeq ($(ARCH), ppc64)
-   ARCH_DATA_MODEL  = 64
-   MAKE_ARGS        += LP64=1
-   PLATFORM         = linux-ppc64
-   VM_PLATFORM      = linux_ppc64
    HS_ARCH          = ppc
  endif
  
  # On 32 bit linux we build server and client, on 64 bit just server.
  ifeq ($(JVM_VARIANTS),)
--- 99,128 ----
      # We have to reset ARCH to i686 since SRCARCH relies on it
      ARCH            = i686
    endif
  endif
  
  # ARM
  ifeq ($(ARCH), arm)
    ARCH_DATA_MODEL  = 32
    PLATFORM         = linux-arm
    VM_PLATFORM      = linux_arm
    HS_ARCH          = arm
  endif
  
  # PPC
! ifneq (,$(findstring $(ARCH), ppc))
!   ifeq ($(ARCH_DATA_MODEL), 64)
!     MAKE_ARGS        += LP64=1
!     PLATFORM         = linux-ppc64
!     VM_PLATFORM      = linux_ppc64
!   else
      ARCH_DATA_MODEL  = 32
      PLATFORM         = linux-ppc
      VM_PLATFORM      = linux_ppc
!   endif
  
    HS_ARCH = ppc
  endif
  
  # On 32 bit linux we build server and client, on 64 bit just server.
  ifeq ($(JVM_VARIANTS),)