make/aix/makefiles/defs.make

*** 43,65 ****
  else
    ARCH = ppc
  endif
  
  # PPC
! ifeq ($(ARCH), ppc)
!   #ARCH_DATA_MODEL = 32
!   PLATFORM         = aix-ppc
!   VM_PLATFORM      = aix_ppc
!   HS_ARCH          = ppc
! endif
! 
! # PPC64
! ifeq ($(ARCH), ppc64)
!   #ARCH_DATA_MODEL = 64
    MAKE_ARGS       += LP64=1
    PLATFORM         = aix-ppc64
    VM_PLATFORM      = aix_ppc64
    HS_ARCH          = ppc
  endif
  
  # On 32 bit aix we build server and client, on 64 bit just server.
  ifeq ($(JVM_VARIANTS),)
--- 43,61 ----
  else
    ARCH = ppc
  endif
  
  # PPC
! ifneq (,$(findstring $(ARCH), ppc))
!   if ($(ARCH_DATA_MODEL),64)
      MAKE_ARGS       += LP64=1
      PLATFORM         = aix-ppc64
      VM_PLATFORM      = aix_ppc64
+   else
+     PLATFORM         = aix-ppc
+     VM_PLATFORM      = aix_ppc
+   endif
    HS_ARCH          = ppc
  endif
  
  # On 32 bit aix we build server and client, on 64 bit just server.
  ifeq ($(JVM_VARIANTS),)