From 5d8f37ad78fc66901af50c762029a501561f3b23 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Mon, 14 Sep 2009 14:32:27 -0700
Subject: Merge upstream QEMU 10.0.50 into the Android source tree.

This change integrates many changes from the upstream QEMU sources.
Its main purpose is to enable correct ARMv6 and ARMv7 support to the
Android emulator. Due to the nature of the upstream code base, this
unfortunately also required changes to many other parts of the source.

Note that to ensure easier integrations in the future, some source files
and directories that have heavy Android-specific customization have been
renamed with an -android suffix. The original files are still there for
easier integration tracking, but *never* compiled. For example:

  net.c        net-android.c
  qemu-char.c  qemu-char-android.c
  slirp/       slirp-android/
  etc...

Tested on linux-x86, darwin-x86 and windows host machines.
---
 android-configure.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'android-configure.sh')

diff --git a/android-configure.sh b/android-configure.sh
index 59ec9b4..3e5d654 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -395,7 +395,8 @@ echo "#define CONFIG_TRACE    1" >> $config_h
 if [ "$OS" != "windows" ] ; then
     echo "#define CONFIG_NAND_LIMITS  1" >> $config_h
 fi
-echo "#define QEMU_VERSION    \"0.8.2\"" >> $config_h
+echo "#define QEMU_VERSION    \"0.10.50\"" >> $config_h
+echo "#define QEMU_PKGVERSION \"Android\"" >> $config_h
 case "$CPU" in
     x86) CONFIG_CPU=I386
     ;;
@@ -418,12 +419,26 @@ case "$OS" in
     ;;
     *) CONFIG_OS=$OS
 esac
+
+case $OS in
+    linux-*|darwin-*)
+        echo "#define HAVE_IOVEC 1" >> $config_h
+        ;;
+esac
+
+case $OS in
+    linux-*)
+        echo "#define CONFIG_IOTHREAD 1" >> $config_h
+        ;;
+esac
+
 echo "#define CONFIG_$CONFIG_OS   1" >> $config_h
 if [ $BSD = 1 ] ; then
     echo "#define _BSD             1" >> $config_h
     echo "#define O_LARGEFILE      0" >> $config_h
     echo "#define MAP_ANONYMOUS    MAP_ANON" >> $config_h
 fi
+
 log "Generate   : $config_h"
 
 echo "Ready to go. Type 'make' to build emulator"
-- 
cgit v1.1