--- a/make/defs.make	Tue Apr 01 14:09:03 2014 +0200
+++ b/make/defs.make	Tue Apr 01 13:57:07 2014 +0200
@@ -176,15 +176,11 @@
   HOST := $(shell uname -n)
 endif
 
-# If not SunOS, not Linux not BSD and not AIX, assume Windows
+# If not SunOS, not Linux and not BSD, assume Windows
 ifneq ($(OS), Linux)
   ifneq ($(OS), SunOS)
     ifneq ($(OS), bsd)
-      ifneq ($(OS), AIX)
-        OSNAME=windows
-      else
-        OSNAME=aix
-      endif
+      OSNAME=windows
     else
       OSNAME=bsd
     endif
@@ -273,7 +269,7 @@
 
   # 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)))
+  SRCARCH     = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc zero,$(ARCH)))
   ARCH/       = x86
   ARCH/sparc  = sparc
   ARCH/sparc64= sparc
@@ -299,11 +295,6 @@
       BUILDARCH = sparcv9
     endif
   endif
-  ifeq ($(BUILDARCH), ppc)
-    ifdef LP64
-      BUILDARCH = ppc64
-    endif
-  endif
 
   # LIBARCH is 1:1 mapping from BUILDARCH
   LIBARCH         = $(LIBARCH/$(BUILDARCH))
@@ -312,12 +303,12 @@
   LIBARCH/sparc   = sparc
   LIBARCH/sparcv9 = sparcv9
   LIBARCH/ia64    = ia64
-  LIBARCH/ppc64   = ppc64
+  LIBARCH/ppc64   = ppc
   LIBARCH/ppc     = ppc
   LIBARCH/arm     = arm
   LIBARCH/zero    = $(ZERO_LIBARCH)
 
-  LP64_ARCH = sparcv9 amd64 ia64 ppc64 zero
+  LP64_ARCH = sparcv9 amd64 ia64 zero
 endif
 
 # Required make macro settings for all platforms