Add Solaris helper object

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/Makefile.solaris b/Makefile.solaris
index b87a92f9e9489f5e8e2276dbfe2cc0a65b789862..bf9c90a9ff50c64a5f04dc2a3ad178b892512c77 100644 (file)
--- a/Makefile.solaris
+++ b/Makefile.solaris
@@ -4,7 +4,7 @@ PROGS   = fio
 SCRIPTS = fio_generate_plots
 OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o \
        eta.o verify.o memory.o io_u.o parse.o mutex.o options.o \
-       rbtree.o fifo.o smalloc.o filehash.o lib/strsep.o helpers.o
+       rbtree.o fifo.o smalloc.o filehash.o lib/strsep.o helpers.o solaris.o
 
 OBJS += crc/crc7.o
 OBJS += crc/crc16.o

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 175654e84bf49864c7dab08e3ad8906b45b8ca73..c6419d8370cfe1c7777cc575a3b86ba2cc18bf5c 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -103,17 +103,4 @@ static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
 #define FIO_MADV_FREE  MADV_FREE
 #endif
 
-/*
- * Some Solaris versions don't have posix_memalign(), provide a private
- * weak alternative
- */
-static inline int __weak posix_memalign(void **ptr, size_t align, size_t size)
-{
-       *ptr = memalign(align, size);
-       if (*ptr)
-               return 0;
-
-       return ENOMEM;
-}
-
 #endif

diff --git a/solaris.c b/solaris.c
new file mode 100644 (file)
index 0000000..869e8d8
--- /dev/null
+++ b/solaris.c
@@ -0,0 +1,16 @@
+#include <stdlib.h>
+#include <errno.h>
+#include "compiler/compiler.h"
+
+/*
+ * Some Solaris versions don't have posix_memalign(), provide a private
+ * weak alternative
+ */
+int __weak posix_memalign(void **ptr, size_t align, size_t size)
+{
+       *ptr = memalign(align, size);
+       if (*ptr)
+               return 0;
+
+       return ENOMEM;
+}