--- a/common/autoconf/build-performance.m4	Thu Sep 05 10:58:25 2013 -0700
+++ b/common/autoconf/build-performance.m4	Thu Sep 12 12:29:17 2013 -0700
@@ -41,6 +41,9 @@
         # Looks like a MacOSX system
         NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk  '{print [$]5}'`
         FOUND_CORES=yes
+    elif test "x$OPENJDK_BUILD_OS" = xaix ; then
+        NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'`
+        FOUND_CORES=yes
     elif test -n "$NUMBER_OF_PROCESSORS"; then
         # On windows, look in the env
         NUM_CORES=$NUMBER_OF_PROCESSORS
@@ -69,8 +72,8 @@
         MEMORY_SIZE=`expr $MEMORY_SIZE / 1024`
         FOUND_MEM=yes
     elif test -x /usr/sbin/prtconf; then
-        # Looks like a Solaris system
-        MEMORY_SIZE=`/usr/sbin/prtconf | grep "Memory size" | awk '{ print [$]3 }'`
+        # Looks like a Solaris or AIX system
+        MEMORY_SIZE=`/usr/sbin/prtconf | grep "^Memory [[Ss]]ize" | awk '{ print [$]3 }'`
         FOUND_MEM=yes
     elif test -x /usr/sbin/system_profiler; then
         # Looks like a MacOSX system