*** ./src/current/makefile.ORIG	Tue Jan 10 20:02:07 2017
--- ./src/current/makefile	Tue Jan 10 20:11:47 2017
***************
*** 253,261 ****
  # 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
--- 253,261 ----
  # largefile support.
  # 
  AIX:	iozone_AIX.o  libbif.o  fileop_AIX.o
! 	$(CC)  -O3 -qstrict $(LDFLAGS) iozone_AIX.o libbif.o \
  		-lpthreads -o iozone
! 	$(CC)  -O3 -qstrict -Dlinux fileop_AIX.o -o fileop
  
  # 
  # AIX-LF
***************
*** 264,273 ****
  # 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
  
  # AIX64
  # This version uses the 64 bit interfaces and is compiled as 64 bit code.
--- 264,273 ----
  # largefile support.
  # 
  AIX-LF:	iozone_AIX-LF.o  libbif.o   fileop_AIX-LF.o pit_server.o
! 	$(CC)  -O3 -qstrict $(LDFLAGS) iozone_AIX-LF.o libbif.o \
  		-lpthreads -o iozone
! 	$(CC)  -O3 -qstrict fileop_AIX-LF.o -o fileop
! 	$(CC)  -O3 -qstrict pit_server.o -o pit_server
  
  # AIX64
  # This version uses the 64 bit interfaces and is compiled as 64 bit code.
***************
*** 274,283 ****
  # 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
--- 274,283 ----
  # Has threads, async I/O but no largefile support.
  #
  AIX64:        iozone_AIX64.o libbif.o fileop_AIX64.o libasync.o pit_server.o
! 	$(CC) -q64 -O3 -qstrict $(LDFLAGS) iozone_AIX64.o libasync.o \
                libbif.o -lpthreads -o iozone
! 	$(CC) -q64 -O3 -qstrict $(LDFLAGS) -Dlinux fileop_AIX64.o -o fileop
! 	$(CC) -q32 -O3 -qstrict $(LDFLAGS) pit_server.o -o pit_server
  
  #
  # AIX64-LF
***************
*** 285,294 ****
  # 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 
--- 285,294 ----
  # 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
! 	$(CC) -q64 -O3 -qstrict $(LDFLAGS) iozone_AIX64-LF.o libasync.o \
                libbif.o -lpthreads -o iozone
! 	$(CC) -q64 -O3 -qstrict $(LDFLAGS) -Dlinux fileop_AIX64-LF.o -o fileop
! 	$(CC) -q32 -O3 -qstrict $(LDFLAGS) pit_server.o -o pit_server
  
  #
  # IRIX 32 bit build with threads, largefiles, async I/O 
***************
*** 831,843 ****
  	@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 ""
--- 831,843 ----
  	@echo ""
  	@echo "Building fileop for AIX64"
  	@echo ""
! 	$(CC) -q64 -c -O3 -qstrict $(CFLAGS) fileop.c -o fileop_AIX64.o
  
  fileop_AIX64-LF.o:    fileop.c
  	@echo ""
  	@echo "Building fileop for AIX64-LF"
  	@echo ""
! 	$(CC) -q64 -c -O3 -qstrict $(CFLAGS) fileop.c -o fileop_AIX64-LF.o
  
  fileop_bsdi.o:	fileop.c
  	@echo ""
***************
*** 1045,1053 ****
  	@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 
--- 1045,1053 ----
  	@echo ""
  	@echo "Building iozone for AIX"
  	@echo ""
! 	$(CC) -c -O3 -qstrict -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C  \
  		-DNAME='"AIX"' -DSHARED_MEM  $(CFLAGS) iozone.c -o iozone_AIX.o
! 	$(CC) -c -O3 -qstrict -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 
***************
*** 1054,1063 ****
  	@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
  
--- 1054,1063 ----
  	@echo ""
  	@echo "Building iozone for AIX with Large files"
  	@echo ""
! 	$(CC) -c -O3 -qstrict -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 -O3 -qstrict -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C  \
  		-DSHARED_MEM -D_LARGEFILE64_SOURCE -D_LARGE_FILES \
  		$(CFLAGS) libbif.c -o libbif.o
  
***************
*** 1065,1076 ****
  	@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
--- 1065,1076 ----
  	@echo ""
  	@echo "Building iozone for AIX64"
  	@echo ""
! 	$(CC) -q64 -c -O3 -qstrict -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C \
                -DASYNC_IO -DNAME='"AIX64"' -DSHARED_MEM \
                $(CFLAGS) iozone.c -o iozone_AIX64.o
! 	$(CC) -q64 -c -O3 -qstrict -D__AIX__ -D_NO_PROTO -Dunix -DHAVE_ANSIC_C \
                -DASYNC_IO -DSHARED_MEM $(CFLAGS) libbif.c -o libbif.o
! 	$(CC) -q64 -c -O3 -qstrict -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
                $(CFLAGS) libasync.c -o libasync.o
  
  iozone_AIX64-LF.o:    iozone.c libbif.c libasync.c
***************
*** 1077,1090 ****
  	@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
  
--- 1077,1090 ----
  	@echo ""
  	@echo "Building iozone for AIX64 with Large files"
  	@echo ""
! 	$(CC) -q64 -c -O3 -qstrict -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
! 	$(CC) -q64 -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) -q64 -c -O3 -qstrict -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
                -D_LARGEFILE64_SOURCE -D_LARGE_FILES \
                $(CFLAGS) libasync.c -o libasync.o
  
*** ./src/current/libbif.c.ORIG	Tue Jan 10 20:30:30 2017
--- ./src/current/libbif.c	Tue Jan 10 20:24:42 2017
***************
*** 23,30 ****
  #include <sys/fcntl.h>
  #endif
  
! #if defined(OSV5) || defined(linux) || defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__)
! #include <string.h>
  #endif
  
  #if defined(linux) || defined(__DragonFly__) || defined(IOZ_macosx) || defined(__NetBSD__)
--- 23,30 ----
  #include <sys/fcntl.h>
  #endif
  
! #if defined(OSV5) || defined(linux) || defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__AIX__)
! #include <strings.h>
  #endif
  
  #if defined(linux) || defined(__DragonFly__) || defined(IOZ_macosx) || defined(__NetBSD__)
*** ./src/current/iozone.c.ORIG	Fri Aug 19 21:13:38 2016
--- ./src/current/iozone.c	Tue Jan 10 23:00:03 2017
***************
*** 280,286 ****
  #include <stdio.h>
  #include <signal.h>
  
! #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris)
    #ifndef my_sig_t
    typedef void (*my_sig_t)(int);
    #endif
--- 280,286 ----
  #include <stdio.h>
  #include <signal.h>
  
! #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(__AIX__)
    #ifndef my_sig_t
    typedef void (*my_sig_t)(int);
    #endif
***************
*** 1001,1007 ****
  void begin(off64_t,long long);
  void record_command_line(int, char **);
  void show_help(void);		/* show development help          */
! #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris)
  my_sig_t signal_handler(void);	/* clean up if user interrupts us */
  #else
  sighandler_t signal_handler(void);	/* clean up if user interrupts us */
--- 1001,1007 ----
  void begin(off64_t,long long);
  void record_command_line(int, char **);
  void show_help(void);		/* show development help          */
! #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(__AIX__)
  my_sig_t signal_handler(void);	/* clean up if user interrupts us */
  #else
  sighandler_t signal_handler(void);	/* clean up if user interrupts us */
***************
*** 1877,1883 ****
  	argvsave=argv;
  
  #ifndef NO_SIGNAL
! #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris)
      	signal((int) SIGINT, (my_sig_t) signal_handler);   /* handle user interrupt */
      	signal((int) SIGTERM, (my_sig_t) signal_handler);  /* handle kill from shell */
  #else
--- 1877,1883 ----
  	argvsave=argv;
  
  #ifndef NO_SIGNAL
! #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(__AIX__)
      	signal((int) SIGINT, (my_sig_t) signal_handler);   /* handle user interrupt */
      	signal((int) SIGTERM, (my_sig_t) signal_handler);  /* handle kill from shell */
  #else
***************
*** 2613,2619 ****
  						printf("-+b  cannot parse sleep duration !!\n");
  						exit(400);
  					}
! 					*strchr(subarg,',') = '\0';
  					#ifdef NO_PRINT_LLD
  						sscanf(subarg,"%ld",(long long *)&burst_size_kb_64);
  					#else
--- 2613,2623 ----
  						printf("-+b  cannot parse sleep duration !!\n");
  						exit(400);
  					}
! 					{
! 					  char *myStrPtr;
! 					  myStrPtr = (char *) strchr(subarg,',');
! 					  *myStrPtr = '\0';
! 					}
  					#ifdef NO_PRINT_LLD
  						sscanf(subarg,"%ld",(long long *)&burst_size_kb_64);
  					#else
***************
*** 3610,3616 ****
  
  ******************************************************************/
  #ifdef HAVE_ANSIC_C
! #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris)
  my_sig_t signal_handler(void)
  #else
  sighandler_t signal_handler(void)
--- 3614,3620 ----
  
  ******************************************************************/
  #ifdef HAVE_ANSIC_C
! #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(__AIX__)
  my_sig_t signal_handler(void)
  #else
  sighandler_t signal_handler(void)