The following changes since commit b9afd959477dbaee2d331b63b0a252bd8aaf6206:
gettid() for NetBSD (2011-07-12 23:49:16 +0200)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (1):
Fio 1.56
Michael Perzl (2):
Fix AIX compile
Fix AIX Makefile
Makefile | 4 ++--
init.c | 2 +-
lib/getopt.h | 8 +++-----
3 files changed, 6 insertions(+), 8 deletions(-)
---
Diff of recent changes:
diff --git a/Makefile b/Makefile
index 6626f1f..17c6527 100644
--- a/Makefile
+++ b/Makefile
@@ -43,8 +43,8 @@ endif
ifeq ($(UNAME), AIX)
SOURCE += fifo.c helpers.c lib/getopt_long.c engines/posixaio.c
LIBS += -lpthread -ldl -lrt
- CFLAGS += -rdynamic
CPPFLAGS += -D_LARGE_FILES -D__ppc__
+ LDFLAGS += -L/opt/freeware/lib -Wl,-blibpath:/opt/freeware/lib:/usr/lib:/lib -Wl,-bmaxdata:0x80000000
endif
ifeq ($(UNAME), HP-UX)
SOURCE += fifo.c helpers.c lib/getopt_long.c lib/strsep.c engines/posixaio.c
@@ -80,7 +80,7 @@ all: .depend $(PROGS) $(SCRIPTS)
$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $<
fio: $(OBJS)
- $(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
+ $(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
.depend: $(SOURCE)
$(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend
diff --git a/init.c b/init.c
index 4e7eb49..94b2b77 100644
--- a/init.c
+++ b/init.c
@@ -22,7 +22,7 @@
#include "lib/getopt.h"
-static char fio_version_string[] = "fio 1.55";
+static char fio_version_string[] = "fio 1.56";
#define FIO_RANDSEED (0xb1899bedUL)
diff --git a/lib/getopt.h b/lib/getopt.h
index 0dd4608..237cbae 100644
--- a/lib/getopt.h
+++ b/lib/getopt.h
@@ -1,9 +1,8 @@
-#ifndef _AIX
-#ifndef __hpux
+#if !(defined(_AIX) || defined(__hpux))
#include <getopt.h>
-#else /* _AIX */
+#else /* _AIX || __hpux */
#ifndef _GETOPT_H
#define _GETOPT_H
@@ -24,5 +23,4 @@ enum {
int getopt_long_only(int, char *const *, const char *, const struct option *, int *);
#endif /* _GETOPT_H */
-#endif /* __hpux */
-#endif /* _AIX */
+#endif /* _AIX || __hpux */
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
