*** ./src/current/makefile.ORIG	Wed Oct  6 20:51:15 2010
--- ./src/current/makefile	Wed Oct  6 20:45:31 2010
***************
*** 24,29 ****
--- 24,31 ----
  	@echo "You must specify the target.        "
  	@echo "        ->   AIX                  (32bit)   <-"
  	@echo "        ->   AIX-LF               (32bit)   <-"
+ 	@echo "        ->   AIX64                (64bit)   <-"
+ 	@echo "        ->   AIX64-LF             (64bit)   <-"
  	@echo "        ->   bsdi                 (32bit)   <-" 
  	@echo "        ->   convex               (32bit)   <-" 
  	@echo "        ->   CrayX1               (32bit)   <-"
***************
*** 237,267 ****
  	$(CC)  -O3 -Dlinux fileop_linux-s390x.o -o fileop
  	$(CC)  -O3 -Dlinux pit_server.o -o pit_server
  
- 
  # 
  # AIX
! # I would have built with ASYNC_IO but the AIX machine does not have 
! # POSIX 1003.1b compliant async I/O header files.  Has threads, no
! # largefile support.
  # 
! AIX:	iozone_AIX.o  libbif.o  fileop_AIX.o
! 	$(CC)  -O $(LDFLAGS) iozone_AIX.o libbif.o \
! 		-lpthreads -o iozone
! 	$(CC)  -O -Dlinux fileop_AIX.o -o fileop
  
  # 
  # AIX-LF
! # I would have built with ASYNC_IO but the AIX machine does not have 
! # POSIX 1003.1b compliant async I/O header files.  Has threads, and
! # largefile support.
  # 
! AIX-LF:	iozone_AIX-LF.o  libbif.o   fileop_AIX-LF.o pit_server.o
! 	$(CC)  -O $(LDFLAGS) iozone_AIX-LF.o libbif.o \
! 		-lpthreads -o iozone
! 	$(CC)  -O fileop_AIX-LF.o -o fileop
! 	$(CC)  -O pit_server.o -o pit_server
  
  #
  # IRIX 32 bit build with threads, largefiles, async I/O 
  # This would like to be in 64 bit mode but it hangs whenever in 64 bit mode.
  # This version uses the 64 bit interfaces but is compiled as 32 bit code
--- 239,289 ----
  	$(CC)  -O3 -Dlinux fileop_linux-s390x.o -o fileop
  	$(CC)  -O3 -Dlinux pit_server.o -o pit_server
  
  # 
  # AIX
! # This version uses the 32 bit interfaces and is compiled as 32 bit code.
! # Has threads, async I/O but no largefile support.
  # 
! AIX:	iozone_AIX.o libbif.o fileop_AIX.o libasync.o pit_server.o
! 	$(CC) -q32 -O3 -qstrict $(LDFLAGS) iozone_AIX.o libasync.o \
! 		libbif.o -lpthreads -o iozone
! 	$(CC) -q32 -O3 -qstrict $(LDFLAGS) -Dlinux fileop_AIX.o -o fileop
! 	$(CC) -q32 -O3 -qstrict $(LDFLAGS) pit_server.o -o pit_server
  
  # 
  # AIX-LF
! # This version uses the 32 bit interfaces and is compiled as 32 bit code.
! # Has threads, async I/O and largefile support.
  # 
! AIX-LF:	iozone_AIX-LF.o libbif.o fileop_AIX-LF.o libasync.o pit_server.o
! 	$(CC) -q32 -O3 -qstrict $(LDFLAGS) iozone_AIX-LF.o libasync.o \
! 		libbif.o -lpthreads -o iozone
! 	$(CC) -q32 -O3 -qstrict $(LDFLAGS) -Dlinux fileop_AIX-LF.o -o fileop
! 	$(CC) -q32 -O3 -qstrict $(LDFLAGS) pit_server.o -o pit_server
  
  #
+ # AIX64
+ # This version uses the 64 bit interfaces and is compiled as 64 bit code.
+ # Has threads, async I/O but no largefile support.
+ #
+ AIX64:	iozone_AIX64.o libbif.o fileop_AIX64.o libasync.o pit_server.o
+ 	$(GCC) -maix64 -O3 $(LDFLAGS) iozone_AIX64.o libasync.o \
+ 		libbif.o -lpthreads -o iozone
+ 	$(GCC) -maix64 -O3 $(LDFLAGS) -Dlinux fileop_AIX64.o -o fileop
+ 	$(GCC) -maix32 -O3 $(LDFLAGS) pit_server.o -o pit_server
+ 
+ #
+ # AIX64-LF
+ # This version uses the 64 bit interfaces and is compiled as 64 bit code.
+ # Has threads, async I/O and largefile support.
+ #
+ AIX64-LF:	iozone_AIX64-LF.o libbif.o fileop_AIX64-LF.o libasync.o pit_server.o
+ 	$(GCC) -maix64 -O3 $(LDFLAGS) iozone_AIX64-LF.o libasync.o \
+ 		libbif.o -lpthreads -o iozone
+ 	$(GCC) -maix64 -O3 $(LDFLAGS) -Dlinux fileop_AIX64-LF.o -o fileop
+ 	$(GCC) -maix32 -O3 $(LDFLAGS) pit_server.o -o pit_server
+ 
+ #
  # IRIX 32 bit build with threads, largefiles, async I/O 
  # This would like to be in 64 bit mode but it hangs whenever in 64 bit mode.
  # This version uses the 64 bit interfaces but is compiled as 32 bit code
***************
*** 738,751 ****
  	@echo ""
  	@echo "Building fileop for AIX"
  	@echo ""
! 	$(CC) -c -O $(CFLAGS) fileop.c -o fileop_AIX.o
  
  fileop_AIX-LF.o:	fileop.c
  	@echo ""
  	@echo "Building fileop for AIX-LF"
  	@echo ""
! 	$(CC) -c -O $(CFLAGS) fileop.c -o fileop_AIX-LF.o
  
  fileop_bsdi.o:	fileop.c
  	@echo ""
  	@echo "Building fileop for BSDi"
--- 760,785 ----
  	@echo ""
  	@echo "Building fileop for AIX"
  	@echo ""
! 	$(CC) -q32 -c -O3 -qstrict $(CFLAGS) fileop.c -o fileop_AIX.o
  
  fileop_AIX-LF.o:	fileop.c
  	@echo ""
  	@echo "Building fileop for AIX-LF"
  	@echo ""
! 	$(CC) -q32 -c -O3 -qstrict $(CFLAGS) fileop.c -o fileop_AIX-LF.o
  
+ fileop_AIX64.o:	fileop.c
+ 	@echo ""
+ 	@echo "Building fileop for AIX64"
+ 	@echo ""
+ 	$(GCC) -maix64 -c -O3 $(CFLAGS) fileop.c -o fileop_AIX64.o
+ 
+ fileop_AIX64-LF.o:	fileop.c
+ 	@echo ""
+ 	@echo "Building fileop for AIX64-LF"
+ 	@echo ""
+ 	$(GCC) -maix64 -c -O3 $(CFLAGS) fileop.c -o fileop_AIX64-LF.o
+ 
  fileop_bsdi.o:	fileop.c
  	@echo ""
  	@echo "Building fileop for BSDi"
***************
*** 930,955 ****
  	$(CC) -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
  		-D_LARGEFILE64_SOURCE $(CFLAGS) libasync.c -o libasync.o
  
! 
! iozone_AIX.o:	iozone.c libbif.c 
  	@echo ""
  	@echo "Building iozone for AIX"
  	@echo ""
! 	$(CC) -c -O -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C  \
! 		-DNAME='"AIX"' -DSHARED_MEM  $(CFLAGS) iozone.c -o iozone_AIX.o
! 	$(CC) -c -O -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C  \
! 		-DSHARED_MEM $(CFLAGS) libbif.c -o libbif.o
  
! iozone_AIX-LF.o:	iozone.c libbif.c 
  	@echo ""
  	@echo "Building iozone for AIX with Large files"
  	@echo ""
! 	$(CC) -c -O -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C  \
! 		-DSHARED_MEM  -D_LARGEFILE64_SOURCE -D_LARGE_FILES \
! 		-DNAME='"AIX-LF"' $(CFLAGS) iozone.c -o iozone_AIX-LF.o
! 	$(CC) -c -O -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C  \
! 		-DSHARED_MEM -D_LARGEFILE64_SOURCE -D_LARGE_FILES \
  		$(CFLAGS) libbif.c -o libbif.o
  
  iozone_solaris.o:	iozone.c libasync.c libbif.c
  	@echo ""
--- 964,1023 ----
  	$(CC) -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
  		-D_LARGEFILE64_SOURCE $(CFLAGS) libasync.c -o libasync.o
  
! iozone_AIX.o:	iozone.c libbif.c libasync.c
  	@echo ""
  	@echo "Building iozone for AIX"
  	@echo ""
! 	$(CC) -q32 -c -O3 -qstrict -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C  \
! 		-DASYNC_IO \
! 		-DNAME='"AIX"' -DSHARED_MEM $(CFLAGS) iozone.c -o iozone_AIX.o
! 	$(CC) -q32 -c -O3 -qstrict -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C  \
! 		-DASYNC_IO -DSHARED_MEM $(CFLAGS) libbif.c -o libbif.o
! 	$(CC) -q32 -c -O3 -qstrict -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
! 		$(CFLAGS) libasync.c -o libasync.o
  
! iozone_AIX-LF.o:	iozone.c libbif.c libasync.c
  	@echo ""
  	@echo "Building iozone for AIX with Large files"
  	@echo ""
! 	$(CC) -q32 -c -O3 -qstrict -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C  \
! 		-DASYNC_IO \
! 		-DNAME='"AIX"' -DSHARED_MEM \
! 		-D_LARGEFILE64_SOURCE -D_LARGE_FILES \
! 		$(CFLAGS) iozone.c -o iozone_AIX-LF.o
! 	$(CC) -q32 -c -O3 -qstrict -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C  \
! 		-DASYNC_IO -DSHARED_MEM -D_LARGEFILE64_SOURCE -D_LARGE_FILES \
  		$(CFLAGS) libbif.c -o libbif.o
+ 	$(CC) -q32 -c -O3 -qstrict -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
+ 		-D_LARGEFILE64_SOURCE -D_LARGE_FILES \
+ 		$(CFLAGS) libasync.c -o libasync.o
+ 
+ iozone_AIX64.o:       iozone.c libbif.c libasync.c
+ 	@echo ""
+ 	@echo "Building iozone for AIX64"
+ 	@echo ""
+ 	$(GCC) -maix64 -c -O3 -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C \
+ 		-DASYNC_IO -DNAME='"AIX64"' -DSHARED_MEM \
+ 		$(CFLAGS) iozone.c -o iozone_AIX64.o
+ 	$(GCC) -maix64 -c -O3 -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C \
+ 		-DASYNC_IO -DSHARED_MEM $(CFLAGS) libbif.c -o libbif.o
+ 	$(GCC) -maix64 -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
+ 		$(CFLAGS) libasync.c -o libasync.o
+ 
+ iozone_AIX64-LF.o:    iozone.c libbif.c libasync.c
+ 	@echo ""
+ 	@echo "Building iozone for AIX64 with Large files"
+ 	@echo ""
+ 	$(GCC) -maix64 -c -O3 -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C \
+ 		-DASYNC_IO -DNAME='"AIX64-LF"' -DSHARED_MEM \
+ 		-D_LARGEFILE64_SOURCE -D_LARGE_FILES \
+ 		$(CFLAGS) iozone.c -o iozone_AIX64-LF.o
+ 	$(GCC) -maix64 -c -O3 -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C \
+ 		-DASYNC_IO -DSHARED_MEM -D_LARGEFILE64_SOURCE -D_LARGE_FILES \
+ 		$(CFLAGS) libbif.c -o libbif.o
+ 	$(GCC) -maix64 -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
+ 		-D_LARGEFILE64_SOURCE -D_LARGE_FILES \
+ 		$(CFLAGS) libasync.c -o libasync.o
  
  iozone_solaris.o:	iozone.c libasync.c libbif.c
  	@echo ""