The following changes since commit 5be4c944e83b32c0c6842130df3dc1d46cd6eb1f:
Initialize global and non-static variables (2013-02-11 16:33:25 +0100)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Aaron Carroll (1):
configure: attempt to get Android going again
Makefile | 1 -
configure | 13 ++++++++++++-
os/os-android.h | 1 +
3 files changed, 13 insertions(+), 2 deletions(-)
---
Diff of recent changes:
diff --git a/Makefile b/Makefile
index 8a7410a..bb345ed 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,6 @@ ifeq ($(UNAME), Android)
SOURCE += diskutil.c fifo.c blktrace.c trim.c profiles/tiobench.c
LIBS += -ldl
LDFLAGS += -rdynamic
- CPPFLAGS += -DFIO_NO_HAVE_SHM_H
endif
ifeq ($(UNAME), SunOS)
LIBS += -lpthread -ldl -laio -lrt -lnsl -lsocket
diff --git a/configure b/configure
index 87cc1cf..8267e1c 100755
--- a/configure
+++ b/configure
@@ -161,7 +161,9 @@ if test "$show_help" = "yes" ; then
exit $exit_val
fi
-if check_define __linux__ ; then
+if check_define __ANDROID__ ; then
+ targetos="Android"
+elif check_define __linux__ ; then
targetos="Linux"
elif check_define __OpenBSD__ ; then
targetos='OpenBSD'
@@ -222,6 +224,15 @@ CYGWIN*)
echo "CC=$CC" >> $config_host_mak
echo "EXTFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
exit 0
+ ;;
+Android)
+ output_sym "CONFIG_32BIT"
+ output_sym "CONFIG_SOCKLEN_T"
+ output_sym "CONFIG_GETTIMEOFDAY"
+ output_sym "CONFIG_CLOCK_GETTIME"
+ echo "CC=$cc" >> $config_host_mak
+ echo "EXTFLAGS=$CFLAGS -include config-host.h -DFIO_NO_HAVE_SHM_H -D_GNU_SOURCE" >> $config_host_mak
+ exit 0
esac
if test ! -z "$cpu" ; then
diff --git a/os/os-android.h b/os/os-android.h
index e436f8f..cedfdaf 100644
--- a/os/os-android.h
+++ b/os/os-android.h
@@ -30,6 +30,7 @@
#define FIO_USE_GENERIC_INIT_RANDOM_STATE
#define FIO_HAVE_E4_ENG
#define FIO_HAVE_BYTEORDER_FUNCS
+#define FIO_HAVE_MMAP_HUGE
#define OS_MAP_ANON MAP_ANONYMOUS
--
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
